diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 687540921..60fbd3a6d 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -1,6 +1,4 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in" -source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in" -source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in" diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 8fe5c6aa5..6d475b202 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -101,6 +101,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="amd64" BR2_PACKAGE_HASSIO_MACHINE="intel-nuc" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_INTEL_E1000E=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 4d0ba6416..e2379cba0 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -82,9 +82,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -94,6 +95,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="odroid-c2" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y BR2_PACKAGE_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 913498242..11a6c61c7 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -82,9 +82,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -94,5 +95,6 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="odroid-c4" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 81c051387..a19317c76 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -82,9 +82,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -94,6 +95,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="odroid-n2" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y BR2_PACKAGE_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 4ee22611d..734a45efa 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -86,9 +86,10 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -98,6 +99,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armv7" BR2_PACKAGE_HASSIO_MACHINE="odroid-xu" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_HARDKERNEL_BOOT=y BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y BR2_PACKAGE_DOSFSTOOLS=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 6c7e6728f..9ace7b298 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -92,5 +92,6 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="amd64" BR2_PACKAGE_HASSIO_MACHINE="qemux86-64" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 493b6798f..2077587ed 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -85,8 +85,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -97,6 +98,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armhf" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_BCM43XX=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index ff7c854b0..683999b31 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -84,8 +84,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -96,5 +97,6 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armv7" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi2" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 889349324..e3670346a 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -85,8 +85,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -97,6 +98,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3-64" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_BCM43XX=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 37596a44f..7dcdb3a1d 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -85,8 +85,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -97,6 +98,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armv7" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_BCM43XX=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 4fea702ad..50307eac7 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -86,8 +86,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -98,6 +99,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_BCM43XX=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index c4bbf0b97..3e00b1613 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -86,8 +86,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -98,6 +99,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armv7" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_BCM43XX=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index b9226d53e..917cb92ee 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -84,8 +84,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -96,5 +97,6 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armhf" BR2_PACKAGE_HASSIO_MACHINE="raspberrypi" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index d71622049..20cfdb8c8 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -91,8 +91,9 @@ BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y @@ -103,6 +104,7 @@ BR2_PACKAGE_HASSIO=y BR2_PACKAGE_HASSIO_ARCH="armv7" BR2_PACKAGE_HASSIO_MACHINE="tinker" BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_BLUETOOTH_RTL8723=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y diff --git a/buildroot-external/package/apparmor/Config.in b/buildroot-external/package/apparmor/Config.in deleted file mode 100644 index 3703354c5..000000000 --- a/buildroot-external/package/apparmor/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_APPARMOR - bool "apparmor" - select BR2_PACKAGE_LIBAPPARMOR - help - AppArmor gives you network application security via mandatory - access control for programs, protecting against the exploitation - of software flaws and compromised systems. - - http://apparmor.net diff --git a/buildroot-external/package/apparmor/apparmor.mk b/buildroot-external/package/apparmor/apparmor.mk deleted file mode 100644 index 17a2b3386..000000000 --- a/buildroot-external/package/apparmor/apparmor.mk +++ /dev/null @@ -1,24 +0,0 @@ -############################################################# -# -# apparmor -# -############################################################# -APPARMOR_VERSION = v2.13.4 -APPARMOR_SITE = git://git.launchpad.net/apparmor -APPARMOR_LICENSE = GPL-2 -APPARMOR_LICENSE_FILES = LICENSE -APPARMOR_DEPENDENCIES = libapparmor - -define APPARMOR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) PATH=$(BR_PATH) $(MAKE) -C $(@D)/parser USE_SYSTEM=1 YACC=bison LEX=flex - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/profiles -endef - -define APPARMOR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/parser DESTDIR=$(TARGET_DIR) USE_SYSTEM=1 PREFIX=/usr install - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/profiles DESTDIR=$(TARGET_DIR) PREFIX=/usr install - - rm -rf $(TARGET_DIR)/usr/lib/apparmor -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/libapparmor/Config.in b/buildroot-external/package/libapparmor/Config.in deleted file mode 100644 index f2188d078..000000000 --- a/buildroot-external/package/libapparmor/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBAPPARMOR - bool "libapparmor" - help - AppArmor gives you network application security via mandatory - access control for programs, protecting against the exploitation - of software flaws and compromised systems. - - http://apparmor.net diff --git a/buildroot-external/package/libapparmor/libapparmor.mk b/buildroot-external/package/libapparmor/libapparmor.mk deleted file mode 100644 index 8033396ca..000000000 --- a/buildroot-external/package/libapparmor/libapparmor.mk +++ /dev/null @@ -1,18 +0,0 @@ -############################################################# -# -# libapparmor -# -############################################################# -LIBAPPARMOR_VERSION = v2.13.4 -LIBAPPARMOR_SITE = git://git.launchpad.net/apparmor -LIBAPPARMOR_LICENSE = GPL-2 -LIBAPPARMOR_LICENSE_FILES = LICENSE -LIBAPPARMOR_INSTALL_STAGING = YES -LIBAPPARMOR_INSTALL_TARGET = NO -LIBAPPARMOR_DEPENDENCIES = host-flex -LIBAPPARMOR_SUBDIR = libraries/libapparmor -LIBAPPARMOR_CONF_ENV = ac_cv_func_reallocarray=no -LIBAPPARMOR_AUTORECONF = YES -LIBAPPARMOR_CONF_OPTS = --enable-static - -$(eval $(autotools-package)) diff --git a/buildroot-external/patches/systemd/0001-Allow-hostname-on-ro.patch b/buildroot-external/patches/systemd/0001-Allow-hostname-on-ro.patch index 71f85f32c..d514fce32 100644 --- a/buildroot-external/patches/systemd/0001-Allow-hostname-on-ro.patch +++ b/buildroot-external/patches/systemd/0001-Allow-hostname-on-ro.patch @@ -1,25 +1,26 @@ -From 525b60af3320de3cc1f1145fe31a2de07b61faf6 Mon Sep 17 00:00:00 2001 +From ba87c495c416b65eca1d683ac980c2c8a673fcac Mon Sep 17 00:00:00 2001 +Message-Id: From: Pascal Vizeli Date: Sat, 28 Apr 2018 00:20:08 +0200 -Subject: [PATCH 1/1] Allow hostname on ro +Subject: [PATCH 1/2] Allow hostname on ro --- src/hostname/hostnamed.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index d9ad2fb..87fae35 100644 +index 7f6607a527..4baccf0b06 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -289,6 +289,7 @@ static int context_update_kernel_hostname(Context *c) { - static int context_write_data_static_hostname(Context *c) { +@@ -344,6 +344,7 @@ static int context_update_kernel_hostname( + static int context_write_data_static_hostname(Context *c) { assert(c); + FILE *f = NULL; if (isempty(c->data[PROP_STATIC_HOSTNAME])) { -@@ -297,7 +298,15 @@ static int context_write_data_static_hostname(Context *c) { +@@ -352,7 +353,15 @@ static int context_write_data_static_hostname(Context *c) { return 0; } @@ -32,10 +33,10 @@ index d9ad2fb..87fae35 100644 + fputs(c->data[PROP_STATIC_HOSTNAME], f); + fclose(f); + -+ return 0; ++ return 0; } static int context_write_data_machine_info(Context *c) { -- -2.7.4 +2.29.2 diff --git a/buildroot-external/patches/systemd/0002-time-wait-sync-log-inotify-errors.patch b/buildroot-external/patches/systemd/0002-time-wait-sync-log-errors-trying-to-watch-run-system.patch similarity index 67% rename from buildroot-external/patches/systemd/0002-time-wait-sync-log-inotify-errors.patch rename to buildroot-external/patches/systemd/0002-time-wait-sync-log-errors-trying-to-watch-run-system.patch index 35ae36b2d..33ffcb4ee 100644 --- a/buildroot-external/patches/systemd/0002-time-wait-sync-log-inotify-errors.patch +++ b/buildroot-external/patches/systemd/0002-time-wait-sync-log-errors-trying-to-watch-run-system.patch @@ -1,7 +1,10 @@ -From 4a4298ef78e943d36f3b8d8e78bfa21b1506961e Mon Sep 17 00:00:00 2001 +From b5cbe6f17866ce2aa0bd4ad41148df26152dfa22 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Aman Gupta Karmani Date: Mon, 12 Oct 2020 13:39:26 -0700 -Subject: [PATCH] time-wait-sync: log errors trying to watch +Subject: [PATCH 2/2] time-wait-sync: log errors trying to watch /run/systemd/timesync --- @@ -9,7 +12,7 @@ Subject: [PATCH] time-wait-sync: log errors trying to watch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/time-wait-sync/time-wait-sync.c b/src/time-wait-sync/time-wait-sync.c -index 96072445f6e..c8ec4850426 100644 +index e880f9e6b6..6672aea7f6 100644 --- a/src/time-wait-sync/time-wait-sync.c +++ b/src/time-wait-sync/time-wait-sync.c @@ -50,7 +50,7 @@ static void clock_state_release(ClockState *sp) { @@ -21,3 +24,6 @@ index 96072445f6e..c8ec4850426 100644 return sp->run_systemd_timesync_wd; } +-- +2.29.2 + diff --git a/buildroot-external/patches/systemd/0003-fix-inotify-watches.patch b/buildroot-external/patches/systemd/0003-fix-inotify-watches.patch deleted file mode 100644 index 30d322691..000000000 --- a/buildroot-external/patches/systemd/0003-fix-inotify-watches.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f6f4f5fe5395a57f10dd446c7266c53f0673eaac Mon Sep 17 00:00:00 2001 -From: Balaji Punnuru -Date: Thu, 9 Apr 2020 12:21:49 -0400 -Subject: [PATCH] util: return the correct correct wd from inotify helpers - -We need to propagate the acquired watch descriptors because our callers -are counting on them. - -[Lennart: this is split out of #15381 and simplified] ---- - src/basic/fs-util.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c -index 558cafbcaf5..ef3b5a51842 100644 ---- a/src/basic/fs-util.c -+++ b/src/basic/fs-util.c -@@ -692,28 +692,30 @@ int unlink_or_warn(const char *filename) { - - int inotify_add_watch_fd(int fd, int what, uint32_t mask) { - char path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int) + 1]; -- int r; -+ int wd; - - /* This is like inotify_add_watch(), except that the file to watch is not referenced by a path, but by an fd */ - xsprintf(path, "/proc/self/fd/%i", what); - -- r = inotify_add_watch(fd, path, mask); -- if (r < 0) -+ wd = inotify_add_watch(fd, path, mask); -+ if (wd < 0) - return -errno; - -- return r; -+ return wd; - } - - int inotify_add_watch_and_warn(int fd, const char *pathname, uint32_t mask) { -+ int wd; - -- if (inotify_add_watch(fd, pathname, mask) < 0) { -+ wd = inotify_add_watch(fd, pathname, mask); -+ if (wd < 0) { - if (errno == ENOSPC) - return log_error_errno(errno, "Failed to add a watch for %s: inotify watch limit reached", pathname); - - return log_error_errno(errno, "Failed to add a watch for %s: %m", pathname); - } - -- return 0; -+ return wd; - } - - static bool unsafe_transition(const struct stat *a, const struct stat *b) { diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset new file mode 100644 index 000000000..5767f596e --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/70-haos.preset @@ -0,0 +1 @@ +disable apparmor.service diff --git a/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand b/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand index 833a6299e..013416d9d 100755 --- a/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand +++ b/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand @@ -1,23 +1,44 @@ #!/bin/sh -# shellcheck disable=SC2039 # ============================================================================== # HassOS partition expander # ============================================================================== set -e DEVICE_CHILD="$(findfs LABEL="hassos-data")" -DEVICE_ROOT="/dev/$(lsblk -no pkname "${DEVICE_CHILD}")" -PART_NUM="${DEVICE_CHILD: -1}" +DEVICE_CHILD_NAME="$(basename "${DEVICE_CHILD}")" +DEVICE_ROOT_NAME="$(lsblk -no pkname "${DEVICE_CHILD}")" +DEVICE_ROOT="/dev/${DEVICE_ROOT_NAME}" +PART_NUM="$(cat "/sys/class/block/${DEVICE_CHILD_NAME}/partition")" -# Need resize -UNUSED=$(sfdisk -Fq "${DEVICE_ROOT}" | cut -d " " -f 3 | tail -1) -if [ -z "${UNUSED}" ] || [ "${UNUSED}" -le "16384" ]; then +# Get partition label type +PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")" +PART_LABEL="$(echo "${PART_TABLE}" | jq -r '.partitiontable.label')" + +if [ "${PART_LABEL}" = "gpt" ]; then + echo "[INFO] Detected GPT partition label" + # We cannot use .partitiontable.lastlba from the json output as we might + # still have the backup GPT not at the end of the disk. Calculate last + # usable LBA using disk size + LAST_USABLE_LBA=$(( $(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size") - 34 )) +else + echo "[INFO] Detected MBR partition label" + LAST_USABLE_LBA=$(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size") +fi + +# Calculate end of data partition +JQ_FILTER=".partitiontable.partitions[] | select ( .node == \"${DEVICE_CHILD}\" ) | .start + .size" +DATA_PARTITION_END="$(echo "${PART_TABLE}" | jq "${JQ_FILTER}")" + +# Need resize? Ignore everything less than 8MB since that could be partition +# alignment rounding... +UNUSED_BLOCKS=$(( LAST_USABLE_LBA - DATA_PARTITION_END )) +if [ "${UNUSED_BLOCKS}" -le "16384" ]; then echo "[INFO] No resize of data partition needed" exit 0 fi echo "[INFO] Update hassos-data partition ${PART_NUM}" -if sfdisk -dq "${DEVICE_ROOT}" | grep -q 'label: gpt'; then +if [ "${PART_LABEL}" = "gpt" ]; then sgdisk -e "${DEVICE_ROOT}" sgdisk -d "${PART_NUM}" \ -n "${PART_NUM}:0:0" \ diff --git a/buildroot-external/rootfs-overlay/usr/libexec/hassos-persists b/buildroot-external/rootfs-overlay/usr/libexec/hassos-persists index 305cdc95e..bac0d89fe 100755 --- a/buildroot-external/rootfs-overlay/usr/libexec/hassos-persists +++ b/buildroot-external/rootfs-overlay/usr/libexec/hassos-persists @@ -8,9 +8,9 @@ MACHINE_ID=$(cat /etc/machine-id) if [ -e /usr/sbin/fw_setenv ]; then # machine-id - if [ "$(fw_printenv -n MACHINE_ID)" != "${MACHINE_ID}" ]; then + if [ "$(fw_printenv -l /run -n MACHINE_ID)" != "${MACHINE_ID}" ]; then echo "[INFO] set machine-id to ${MACHINE_ID}" - fw_setenv MACHINE_ID "${MACHINE_ID}" + fw_setenv -l /run MACHINE_ID "${MACHINE_ID}" else echo "[INFO] machine-id is okay" fi diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index 147f91a69..6bebb0399 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -16,6 +16,9 @@ function fix_rootfs() { # Cleanup miscs rm -rf "${TARGET_DIR}/usr/lib/modules-load.d" + # systemd-update-done.service relies on writeable /var and /etc + rm -f "${TARGET_DIR}/usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service" + # Fix: permission for system connection files chmod 600 "${TARGET_DIR}/etc/NetworkManager/system-connections"/* diff --git a/buildroot-patches/0001-Docker-AppArmor-support.patch b/buildroot-patches/0001-Docker-AppArmor-support.patch index 6bb90865a..79a1400d9 100644 --- a/buildroot-patches/0001-Docker-AppArmor-support.patch +++ b/buildroot-patches/0001-Docker-AppArmor-support.patch @@ -1,7 +1,8 @@ -From a874e0babaeefacd8e3d04a9c056dd6f1121307d Mon Sep 17 00:00:00 2001 +From 8aa12f1835721959d0d1999fceee632404f28366 Mon Sep 17 00:00:00 2001 +Message-Id: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 -Subject: [PATCH 1/1] Docker: AppArmor support +Subject: [PATCH 1/7] Docker: AppArmor support Signed-off-by: Pascal Vizeli --- @@ -11,7 +12,7 @@ Signed-off-by: Pascal Vizeli 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index 69068e44f8..4dc0ef4672 100644 +index 71f9b4c065..e4a4105018 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \ @@ -23,7 +24,7 @@ index 69068e44f8..4dc0ef4672 100644 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index 24022f7107..14673f3183 100644 +index 8cedf307ba..370cfdbaee 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \ @@ -36,18 +37,18 @@ index 24022f7107..14673f3183 100644 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index acf61ab160..3432dd5fe0 100644 +index 3d177d23d5..d9e953c640 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk -@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace +@@ -10,7 +10,7 @@ RUNC_LICENSE = Apache-2.0 + RUNC_LICENSE_FILES = LICENSE RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - -RUNC_TAGS = cgo static_build +RUNC_TAGS = cgo static_build apparmor ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch index e9b27642a..267a90dbd 100644 --- a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch +++ b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch @@ -1,7 +1,10 @@ -From 73246b185df88a6e6d810e9f91fa54bea2bfcb05 Mon Sep 17 00:00:00 2001 +From 05fa58fbff93719044a9d1bb9e7c82d67068e346 Mon Sep 17 00:00:00 2001 +Message-Id: <05fa58fbff93719044a9d1bb9e7c82d67068e346.1605131156.git.stefan@agner.ch> +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 11:51:46 +0000 -Subject: [PATCH 1/1] rpi-firmware: Bump firmware +Subject: [PATCH 2/7] rpi-firmware: Bump firmware Signed-off-by: Pascal Vizeli --- @@ -10,27 +13,27 @@ Signed-off-by: Pascal Vizeli 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 59ab1da0c6..e3ba1bf99c 100644 +index 8730ec959b..49a600903c 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed --sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz -+sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz - sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom +-sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz ++sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz + sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index 6fee60b08c..2177ca9859 100644 +index 8b2b2c7154..fe7a099407 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ --RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5 +-RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44 +RPI_FIRMWARE_VERSION = 2ba11f2a07760588546821aed578010252c9ecb3 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0003-network-manager-wpa_supplicant.patch b/buildroot-patches/0003-network-manager-wpa_supplicant.patch index ffdb2c868..ed5ff5fa8 100644 --- a/buildroot-patches/0003-network-manager-wpa_supplicant.patch +++ b/buildroot-patches/0003-network-manager-wpa_supplicant.patch @@ -1,7 +1,10 @@ -From 297ba4e3286e590bd1c2d2e6ec778a84748b5807 Mon Sep 17 00:00:00 2001 +From d1f588ab003b001079b6fab1cfd5d43401989b3b Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 14:32:45 +0000 -Subject: [PATCH 1/1] network-manager: wpa_supplicant +Subject: [PATCH 3/7] network-manager: wpa_supplicant Signed-off-by: Pascal Vizeli --- @@ -10,7 +13,7 @@ Signed-off-by: Pascal Vizeli 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in -index e6a3f5f04f..accea923af 100644 +index 7d44768460..218dc860ff 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -15,8 +15,9 @@ config BR2_PACKAGE_NETWORK_MANAGER @@ -26,7 +29,7 @@ index e6a3f5f04f..accea923af 100644 select BR2_PACKAGE_LIBNDP help diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index 56b768cdef..727cfb98a4 100644 +index 3dc3188f32..2a04b00cee 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz @@ -35,9 +38,9 @@ index 56b768cdef..727cfb98a4 100644 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ - libgcrypt wireless_tools util-linux host-intltool readline libndp + libgcrypt wpa_supplicant util-linux host-intltool readline libndp - # Even though the COPYING file only contains the GPL-2.0 text, many - # parts of network-manager are under LGPL-2.0. See the "Legal" section - # of the CONTRIBUTING file for details. + NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) + NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING + -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0004-Fix-dhcp-client.patch b/buildroot-patches/0004-Fix-dhcp-client.patch index 60a460764..df419cb06 100644 --- a/buildroot-patches/0004-Fix-dhcp-client.patch +++ b/buildroot-patches/0004-Fix-dhcp-client.patch @@ -1,7 +1,10 @@ -From 0e0679ca2ab40de3b6b629901909385c310010b1 Mon Sep 17 00:00:00 2001 +From fe8fec1b597f65938376451c7cf84a462c492fd9 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:01:44 +0000 -Subject: [PATCH 1/1] Fix dhcp client +Subject: [PATCH 4/7] Fix dhcp client Signed-off-by: Pascal Vizeli --- @@ -9,7 +12,7 @@ Signed-off-by: Pascal Vizeli 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk -index 335c631119..518e8a4681 100644 +index ad59804d3b..f1ffa81d9a 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -76,8 +76,7 @@ endif @@ -23,5 +26,5 @@ index 335c631119..518e8a4681 100644 install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch index b48de8b2f..c5da38c90 100644 --- a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch +++ b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch @@ -1,7 +1,10 @@ -From d2abd5e12736237ae381ab09cab12a222b22d8f0 Mon Sep 17 00:00:00 2001 +From baba5ba468fe84e1a85818dd5a2a111e1391d822 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:05:21 +0000 -Subject: [PATCH 1/1] rpi: use latest wifi driver +Subject: [PATCH 5/7] rpi: use latest wifi driver Signed-off-by: Pascal Vizeli --- @@ -10,23 +13,23 @@ Signed-off-by: Pascal Vizeli 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -index 5de9e0f13f..90aa03218f 100644 +index b8931d2c45..68e33debba 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated --sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -+sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz - sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +-sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz ++sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -index 9dd1854b9a..0c697bddbe 100644 +index 6be02509fe..0c697bddbe 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,14 +4,14 @@ # ################################################################################ --RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +-RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) +RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639 +RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) @@ -41,5 +44,5 @@ index 9dd1854b9a..0c697bddbe 100644 $(eval $(generic-package)) -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0006-odroid-ux4-firmware.patch b/buildroot-patches/0006-ODROID-XU4-video-firmware.patch similarity index 62% rename from buildroot-patches/0006-odroid-ux4-firmware.patch rename to buildroot-patches/0006-ODROID-XU4-video-firmware.patch index b1705efaa..d44dea7dd 100644 --- a/buildroot-patches/0006-odroid-ux4-firmware.patch +++ b/buildroot-patches/0006-ODROID-XU4-video-firmware.patch @@ -1,5 +1,18 @@ +From 502b35edadbac3d51c3f37b4c74917ffff6f1332 Mon Sep 17 00:00:00 2001 +Message-Id: <502b35edadbac3d51c3f37b4c74917ffff6f1332.1605131156.git.stefan@agner.ch> +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +From: Stefan Agner +Date: Wed, 11 Nov 2020 22:16:10 +0100 +Subject: [PATCH 6/7] ODROID-XU4: video firmware + +--- + package/linux-firmware/Config.in | 6 ++++++ + package/linux-firmware/linux-firmware.mk | 6 ++++++ + 2 files changed, 12 insertions(+) + diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in -index 6b182dc6..8e3be238 100644 +index 9b999034da..d3b7a2b79b 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -44,6 +44,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO @@ -16,7 +29,7 @@ index 6b182dc6..8e3be238 100644 menu "Bluetooth firmware" diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index 86e1d1e7..6453c402 100644 +index d9ad942903..5474377a36 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a* @@ -32,3 +45,6 @@ index 86e1d1e7..6453c402 100644 # Intel Wireless Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) LINUX_FIRMWARE_FILES += intel/ibt-* +-- +2.29.2 + diff --git a/buildroot-patches/0007-docker-proxy-Bump-version.patch b/buildroot-patches/0007-docker-proxy-Bump-version.patch index 2367535a0..826e78fd9 100644 --- a/buildroot-patches/0007-docker-proxy-Bump-version.patch +++ b/buildroot-patches/0007-docker-proxy-Bump-version.patch @@ -1,7 +1,10 @@ -From aec12d6fc55c1c444ff9d226ec4748d27673c8a2 Mon Sep 17 00:00:00 2001 +From 14cd8a7e9eec46e0cdd243db17827335de2803c5 Mon Sep 17 00:00:00 2001 +Message-Id: <14cd8a7e9eec46e0cdd243db17827335de2803c5.1605131156.git.stefan@agner.ch> +In-Reply-To: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> +References: <8aa12f1835721959d0d1999fceee632404f28366.1605131156.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 7 May 2020 09:02:05 +0000 -Subject: [PATCH 1/1] docker-proxy: Bump version +Subject: [PATCH 7/7] docker-proxy: Bump version Signed-off-by: Pascal Vizeli --- @@ -19,7 +22,7 @@ index 58de697929..1416db4042 100644 +sha256 2e1fdcc401a22d53103be6cfb5475c40af9f9a82a996ec6d508e0994dc2c5e4a docker-proxy-1ea375d2b54d2e914e41970a04553ad55ef39b62.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk -index 8843266c30..1ab84159d1 100644 +index 6600b24ed9..d0e940db93 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -4,8 +4,8 @@ @@ -34,5 +37,5 @@ index 8843266c30..1ab84159d1 100644 DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -- -2.17.1 +2.29.2 diff --git a/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch b/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch deleted file mode 100644 index 561d4851c..000000000 --- a/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 40e0bf4c0c36970f8e94591fdb0a5a8910bf9859 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 12 May 2020 22:33:53 +0200 -Subject: [PATCH 1/1] linux: forcibly disable use of gcc plugins - -The soon-to-be-released linux 5.7 has changed the way it detects the -ability of gcc to use plugins, when it dropped support for gcc 4.7 or -older [0]. - -To detect the ability to use gcc plugins, the kernel has to check -whether the host gcc is capable enough to build them. - -When we call one of the configurator for the Linux kernel, we explicitly -pass a value of HOSTCC=$(HOSTCC_NOCCACHE), because there might be a -discrepancy between the ncurses headers and libraries as found by the -Linux kconfig build [1] [2]. - -But then, when we build the kernel, we pass another value to use [3] -HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" which boils down to -roughly: gcc -I.../host/include -L.../host/lib -Wl,-rpath,.../host/lib -This is needed so that at build time, the kernel can build host tools -that link with our openssl et al. - -So, the two HOSTCC we pass to the kernel may have different behaviours. -For example, on a machine where gmp is missing in the system, it is -available in $(O)/host/ when using an internal toolchain (and under a -few other conditions). - -In that case, when configuring the kernel, it decides that the host -compiler can't build plugins, so the dependencies of CONFIG_GCC_PLUGINS -are not met, and that option is not present in the linux' .config file -(neither as "=y" nor as "is not set"). But then, when we build the -kernel, the host compiler suddenly becomes capable of building the -plugins, and the internal syncconfig run by the kernel will notice that -the dependencies of CONFIG_GCC_PLUGINS are now met, and that the user -shall decide on its value. And this blocks a build on an interactive -console (abbreviated): - - * Restart config... - * GCC plugins - GCC plugins (GCC_PLUGINS) [Y/n/?] (NEW) _ - -But most problematic is the behaviour when run in a shell that is not -interactiove (e.g. a CI job or such) (abbreviated): - - * Restart config... - * GCC plugins - GCC plugins (GCC_PLUGINS) [Y/n/?] (NEW) - Error in reading or end of file. - Generate some entropy during boot and runtime (GCC_PLUGIN_LATENT_ENTROPY) [N/y/?] (NEW) - Error in reading or end of file. - Randomize layout of sensitive kernel structures (GCC_PLUGIN_RANDSTRUCT) [N/y/?] (NEW) - Error in reading or end of file. - * Memory initialization - Initialize kernel stack variables at function entry - > 1. no automatic initialization (weakest) (INIT_STACK_NONE) - 2. zero-init structs marked for userspace (weak) (GCC_PLUGIN_STRUCTLEAK_USER) (NEW) - 3. zero-init structs passed by reference (strong) (GCC_PLUGIN_STRUCTLEAK_BYREF) (NEW) - 4. zero-init anything passed by reference (very strong) (GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) (NEW) - choice[1-4?]: - Error in reading or end of file. - Poison kernel stack before returning from syscalls (GCC_PLUGIN_STACKLEAK) [N/y/?] (NEW) - Error in reading or end of file. - Enable heap memory zeroing on allocation by default (INIT_ON_ALLOC_DEFAULT_ON) [N/y/?] n - Enable heap memory zeroing on free by default (INIT_ON_FREE_DEFAULT_ON) [N/y/?] n - -The most obvious and simple solution would be to unconditionally disable -gcc plugins altogether, in the KCONFIG_FIXUP hook. But that can't work -either, because after applying the fixups, we call olddefconfig (or the -likes) with the incapable HOSTCC, so the disabled option would be removed -anyway, and we'd be back to square one. - -So, in addition to the above, we also forcibly hack the same call just -before actually building the kernel. - -Note that the two are needed: the one in the fixups is needed for those -that have a system that already allows building gcc plugins, and the -second is needed in the other case, where the system does not allow it -but would work with our additional headers and libs in $(O)/host/. The -two ensure there is a very similar experience in the two situations. - -Forcibly disabling the use of gcc plugins is not a regression on our -side: it has never been possible to do so so far. We're now making sure -that can't work by accident. - -Reported-by: Ganesh , -Reported-by: Heiko Thiery -Signed-off-by: Yann E. MORIN -Cc: Michael Walle -Cc: Peter Korsgaard -Cc: Thomas Petazzoni -Cc: Arnout Vandecappelle -Tested-by: Heiko Thiery -Signed-off-by: Thomas Petazzoni ---- - linux/linux.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/linux/linux.mk b/buildroot/linux/linux.mk -index ae1edbeb..5a1cb42e 100644 ---- a/linux/linux.mk -+++ b/linux/linux.mk -@@ -408,6 +408,7 @@ define LINUX_KCONFIG_FIXUP_CMDS - $(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224,$(@D)/.config)) -+ $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config) - endef - - ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) -@@ -467,7 +468,10 @@ endif - # '$(LINUX_TARGET_NAME)' targets separately because calling them in - # the same $(MAKE) invocation has shown to cause parallel build - # issues. -+# The call to disable gcc-plugins is a stop-gap measure: -+# http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html - define LINUX_BUILD_CMDS -+ $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config) - $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ - cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ - ) --- -2.17.1 \ No newline at end of file diff --git a/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch b/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch deleted file mode 100644 index 8d2534988..000000000 --- a/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 921d8ba2bd2cedf30582d9be8fb4dcf57061f42d Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Thu, 6 Aug 2020 10:15:32 +0000 -Subject: [PATCH 1/1] package/rauc: bump version to 1.4 - -Signed-off-by: Pascal Vizeli ---- - package/rauc/rauc.hash | 6 +++--- - package/rauc/rauc.mk | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash -index 54760347c7..51f37f6cb8 100644 ---- a/package/rauc/rauc.hash -+++ b/package/rauc/rauc.hash -@@ -1,4 +1,4 @@ - # Locally calculated, after verifying against --# https://github.com/rauc/rauc/releases/download/v1.2/rauc-1.2.tar.xz.asc --sha256 224683fc1fac50ccb89128aa786445cd8e26bb25deafd4410e0807187376e661 rauc-1.2.tar.xz --sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING -+# https://github.com/rauc/rauc/releases/download/v1.3/rauc-1.4.tar.xz.asc -+sha256 85aabf214cd93a37f7ad0b3aaad89eb94facf0f3ebf6e2edca945acbca9b0967 rauc-1.4.tar.xz -+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING -diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk -index 5a208e07ae..1915c783aa 100644 ---- a/package/rauc/rauc.mk -+++ b/package/rauc/rauc.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RAUC_VERSION = 1.2 -+RAUC_VERSION = 1.4 - RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) - RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz - RAUC_LICENSE = LGPL-2.1 --- -2.17.1 - diff --git a/buildroot/.gitlab-ci.yml b/buildroot/.gitlab-ci.yml index c838ff3c2..e85ac3203 100644 --- a/buildroot/.gitlab-ci.yml +++ b/buildroot/.gitlab-ci.yml @@ -1,512 +1,23 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -# The .gitlab-ci.yml file is generated from .gitlab-ci.yml.in. -# It needs to be regenerated every time a defconfig is added, using -# "make .gitlab-ci.yml". image: buildroot/base:20200814.2228 -.check_base: - rules: - - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/ || $CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/' - when: never - - when: always +stages: + - generate-gitlab-ci + - build -check-DEVELOPERS: - extends: .check_base - # get-developers should print just "No action specified"; if it prints - # anything else, it's a parse error. - # The initial ! is removed by YAML so we need to quote it. - script: - - "! utils/get-developers | grep -v 'No action specified'" +generate-gitlab-ci-yml: + stage: generate-gitlab-ci + script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml + artifacts: + paths: + - generated-gitlab-ci.yml -check-flake8: - extends: .check_base - before_script: - # Help flake8 to find the Python files without .py extension. - - find * -type f -name '*.py' > files.txt - - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt - - sort -u files.txt | tee files.processed - script: - - python3 -m flake8 --statistics --count --max-line-length=132 $(cat files.processed) - after_script: - - wc -l files.processed - -check-gitlab-ci.yml: - extends: .check_base - script: - - mv .gitlab-ci.yml .gitlab-ci.yml.orig - - make .gitlab-ci.yml - - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml - -check-package: - extends: .check_base - script: - - make check-package - -.defconfig_base: - script: - - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - - make ${DEFCONFIG_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } - artifacts: - when: always - expire_in: 2 weeks - paths: - - .config - - build.log - - output/images/ - - output/build/build-time.log - - output/build/packages-file-list.txt - - output/build/*/.config - -.defconfig: - extends: .defconfig_base - # Running the defconfigs for every push is too much, so limit to - # explicit triggers through the API. - rules: - # For tags, create a pipeline. - - if: '$CI_COMMIT_TAG' - # For pipeline created by using a trigger token. - - if: '$CI_PIPELINE_TRIGGERED' - # For the branch or tag name named *-defconfigs, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-defconfigs$/' - before_script: - - DEFCONFIG_NAME=${CI_JOB_NAME} - -one-defconfig: - extends: .defconfig_base - rules: - # For the branch or tag name named *-*_defconfigs, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/' - before_script: - - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') - -.runtime_test_base: - # Keep build directories so the rootfs can be an artifact of the job. The - # runner will clean up those files for us. - # Multiply every emulator timeout by 10 to avoid sporadic failures in - # elastic runners. - script: - - echo "Starting runtime test ${TEST_CASE_NAME}" - - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} - artifacts: - when: always - expire_in: 2 weeks - paths: - - test-output/*.log - - test-output/*/.config - - test-output/*/images/* - -.runtime_test: - extends: .runtime_test_base - # Running the runtime tests for every push is too much, so limit to - # explicit triggers through the API. - rules: - # For tags, create a pipeline. - - if: '$CI_COMMIT_TAG' - # For pipeline created by using a trigger token. - - if: '$CI_PIPELINE_TRIGGERED' - # For the branch or tag name named *-runtime-tests, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-runtime-tests$/' - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} - -one-runtime_test: - extends: .runtime_test_base - rules: - - if: '$CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/' - before_script: - - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') -aarch64_efi_defconfig: { extends: .defconfig } -acmesystems_aria_g25_128mb_defconfig: { extends: .defconfig } -acmesystems_aria_g25_256mb_defconfig: { extends: .defconfig } -acmesystems_arietta_g25_128mb_defconfig: { extends: .defconfig } -acmesystems_arietta_g25_256mb_defconfig: { extends: .defconfig } -amarula_a64_relic_defconfig: { extends: .defconfig } -amarula_vyasa_rk3288_defconfig: { extends: .defconfig } -andes_ae3xx_defconfig: { extends: .defconfig } -arcturus_ucls1012a_defconfig: { extends: .defconfig } -arcturus_ucp1020_defconfig: { extends: .defconfig } -arm_foundationv8_defconfig: { extends: .defconfig } -arm_juno_defconfig: { extends: .defconfig } -armadeus_apf27_defconfig: { extends: .defconfig } -armadeus_apf28_defconfig: { extends: .defconfig } -armadeus_apf51_defconfig: { extends: .defconfig } -asus_tinker_rk3288_defconfig: { extends: .defconfig } -at91sam9260eknf_defconfig: { extends: .defconfig } -at91sam9g20dfc_defconfig: { extends: .defconfig } -at91sam9g45m10ek_defconfig: { extends: .defconfig } -at91sam9rlek_defconfig: { extends: .defconfig } -at91sam9x5ek_defconfig: { extends: .defconfig } -at91sam9x5ek_dev_defconfig: { extends: .defconfig } -at91sam9x5ek_mmc_defconfig: { extends: .defconfig } -at91sam9x5ek_mmc_dev_defconfig: { extends: .defconfig } -atmel_sama5d27_som1_ek_mmc_dev_defconfig: { extends: .defconfig } -atmel_sama5d2_xplained_mmc_defconfig: { extends: .defconfig } -atmel_sama5d2_xplained_mmc_dev_defconfig: { extends: .defconfig } -atmel_sama5d3_xplained_defconfig: { extends: .defconfig } -atmel_sama5d3_xplained_dev_defconfig: { extends: .defconfig } -atmel_sama5d3_xplained_mmc_defconfig: { extends: .defconfig } -atmel_sama5d3_xplained_mmc_dev_defconfig: { extends: .defconfig } -atmel_sama5d3xek_defconfig: { extends: .defconfig } -atmel_sama5d4_xplained_defconfig: { extends: .defconfig } -atmel_sama5d4_xplained_dev_defconfig: { extends: .defconfig } -atmel_sama5d4_xplained_mmc_defconfig: { extends: .defconfig } -atmel_sama5d4_xplained_mmc_dev_defconfig: { extends: .defconfig } -bananapi_m1_defconfig: { extends: .defconfig } -bananapi_m2_plus_defconfig: { extends: .defconfig } -bananapi_m2_ultra_defconfig: { extends: .defconfig } -bananapi_m64_defconfig: { extends: .defconfig } -bananapro_defconfig: { extends: .defconfig } -beagleboardx15_defconfig: { extends: .defconfig } -beaglebone_defconfig: { extends: .defconfig } -beaglebone_qt5_defconfig: { extends: .defconfig } -beagleboneai_defconfig: { extends: .defconfig } -beelink_gs1_defconfig: { extends: .defconfig } -chromebook_snow_defconfig: { extends: .defconfig } -ci20_defconfig: { extends: .defconfig } -csky_gx6605s_defconfig: { extends: .defconfig } -cubieboard2_defconfig: { extends: .defconfig } -engicam_imx6qdl_icore_defconfig: { extends: .defconfig } -engicam_imx6qdl_icore_qt5_defconfig: { extends: .defconfig } -engicam_imx6qdl_icore_rqs_defconfig: { extends: .defconfig } -engicam_imx6ul_geam_defconfig: { extends: .defconfig } -engicam_imx6ul_isiot_defconfig: { extends: .defconfig } -freescale_imx28evk_defconfig: { extends: .defconfig } -freescale_imx6dlsabreauto_defconfig: { extends: .defconfig } -freescale_imx6dlsabresd_defconfig: { extends: .defconfig } -freescale_imx6qsabreauto_defconfig: { extends: .defconfig } -freescale_imx6qsabresd_defconfig: { extends: .defconfig } -freescale_imx6sxsabresd_defconfig: { extends: .defconfig } -freescale_imx7dsabresd_defconfig: { extends: .defconfig } -freescale_imx8mmevk_defconfig: { extends: .defconfig } -freescale_imx8mqevk_defconfig: { extends: .defconfig } -freescale_imx8qxpmek_defconfig: { extends: .defconfig } -freescale_p1025twr_defconfig: { extends: .defconfig } -freescale_t1040d4rdb_defconfig: { extends: .defconfig } -freescale_t2080_qds_rdb_defconfig: { extends: .defconfig } -friendlyarm_nanopi_a64_defconfig: { extends: .defconfig } -friendlyarm_nanopi_neo2_defconfig: { extends: .defconfig } -friendlyarm_nanopi_neo_plus2_defconfig: { extends: .defconfig } -galileo_defconfig: { extends: .defconfig } -grinn_chiliboard_defconfig: { extends: .defconfig } -grinn_liteboard_defconfig: { extends: .defconfig } -hifive_unleashed_defconfig: { extends: .defconfig } -imx23evk_defconfig: { extends: .defconfig } -imx6-sabreauto_defconfig: { extends: .defconfig } -imx6-sabresd_defconfig: { extends: .defconfig } -imx6-sabresd_qt5_defconfig: { extends: .defconfig } -imx6slevk_defconfig: { extends: .defconfig } -imx6sx-sdb_defconfig: { extends: .defconfig } -imx6ulevk_defconfig: { extends: .defconfig } -imx6ulpico_defconfig: { extends: .defconfig } -imx7d-sdb_defconfig: { extends: .defconfig } -imx7dpico_defconfig: { extends: .defconfig } -imx8mmpico_defconfig: { extends: .defconfig } -imx8mpico_defconfig: { extends: .defconfig } -lafrite_defconfig: { extends: .defconfig } -lego_ev3_defconfig: { extends: .defconfig } -licheepi_zero_defconfig: { extends: .defconfig } -linksprite_pcduino_defconfig: { extends: .defconfig } -minnowboard_max-graphical_defconfig: { extends: .defconfig } -minnowboard_max_defconfig: { extends: .defconfig } -mx25pdk_defconfig: { extends: .defconfig } -mx51evk_defconfig: { extends: .defconfig } -mx53loco_defconfig: { extends: .defconfig } -mx6cubox_defconfig: { extends: .defconfig } -mx6sx_udoo_neo_defconfig: { extends: .defconfig } -mx6udoo_defconfig: { extends: .defconfig } -nanopi_m1_defconfig: { extends: .defconfig } -nanopi_m1_plus_defconfig: { extends: .defconfig } -nanopi_neo_defconfig: { extends: .defconfig } -nexbox_a95x_defconfig: { extends: .defconfig } -nitrogen6sx_defconfig: { extends: .defconfig } -nitrogen6x_defconfig: { extends: .defconfig } -nitrogen7_defconfig: { extends: .defconfig } -nitrogen8m_defconfig: { extends: .defconfig } -odroidxu4_defconfig: { extends: .defconfig } -olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig } -olimex_a13_olinuxino_defconfig: { extends: .defconfig } -olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig } -olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig } -olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig } -olimex_a33_olinuxino_defconfig: { extends: .defconfig } -olimex_a64_olinuxino_defconfig: { extends: .defconfig } -olimex_imx233_olinuxino_defconfig: { extends: .defconfig } -openblocks_a6_defconfig: { extends: .defconfig } -orangepi_lite2_defconfig: { extends: .defconfig } -orangepi_lite_defconfig: { extends: .defconfig } -orangepi_one_defconfig: { extends: .defconfig } -orangepi_one_plus_defconfig: { extends: .defconfig } -orangepi_pc2_defconfig: { extends: .defconfig } -orangepi_pc_defconfig: { extends: .defconfig } -orangepi_pc_plus_defconfig: { extends: .defconfig } -orangepi_plus_defconfig: { extends: .defconfig } -orangepi_prime_defconfig: { extends: .defconfig } -orangepi_r1_defconfig: { extends: .defconfig } -orangepi_win_defconfig: { extends: .defconfig } -orangepi_zero_defconfig: { extends: .defconfig } -orangepi_zero_plus2_defconfig: { extends: .defconfig } -pandaboard_defconfig: { extends: .defconfig } -pc_x86_64_bios_defconfig: { extends: .defconfig } -pc_x86_64_efi_defconfig: { extends: .defconfig } -pine64_defconfig: { extends: .defconfig } -pine64_sopine_defconfig: { extends: .defconfig } -qemu_aarch64_virt_defconfig: { extends: .defconfig } -qemu_arm_versatile_defconfig: { extends: .defconfig } -qemu_arm_versatile_nommu_defconfig: { extends: .defconfig } -qemu_arm_vexpress_defconfig: { extends: .defconfig } -qemu_arm_vexpress_tz_defconfig: { extends: .defconfig } -qemu_csky610_virt_defconfig: { extends: .defconfig } -qemu_csky807_virt_defconfig: { extends: .defconfig } -qemu_csky810_virt_defconfig: { extends: .defconfig } -qemu_csky860_virt_defconfig: { extends: .defconfig } -qemu_m68k_mcf5208_defconfig: { extends: .defconfig } -qemu_m68k_q800_defconfig: { extends: .defconfig } -qemu_microblazebe_mmu_defconfig: { extends: .defconfig } -qemu_microblazeel_mmu_defconfig: { extends: .defconfig } -qemu_mips32r2_malta_defconfig: { extends: .defconfig } -qemu_mips32r2el_malta_defconfig: { extends: .defconfig } -qemu_mips32r6_malta_defconfig: { extends: .defconfig } -qemu_mips32r6el_malta_defconfig: { extends: .defconfig } -qemu_mips64_malta_defconfig: { extends: .defconfig } -qemu_mips64el_malta_defconfig: { extends: .defconfig } -qemu_mips64r6_malta_defconfig: { extends: .defconfig } -qemu_mips64r6el_malta_defconfig: { extends: .defconfig } -qemu_nios2_10m50_defconfig: { extends: .defconfig } -qemu_or1k_defconfig: { extends: .defconfig } -qemu_ppc64_e5500_defconfig: { extends: .defconfig } -qemu_ppc64_pseries_defconfig: { extends: .defconfig } -qemu_ppc64le_pseries_defconfig: { extends: .defconfig } -qemu_ppc_g3beige_defconfig: { extends: .defconfig } -qemu_ppc_mac99_defconfig: { extends: .defconfig } -qemu_ppc_mpc8544ds_defconfig: { extends: .defconfig } -qemu_ppc_virtex_ml507_defconfig: { extends: .defconfig } -qemu_riscv32_virt_defconfig: { extends: .defconfig } -qemu_riscv64_virt_defconfig: { extends: .defconfig } -qemu_sh4_r2d_defconfig: { extends: .defconfig } -qemu_sh4eb_r2d_defconfig: { extends: .defconfig } -qemu_sparc64_sun4u_defconfig: { extends: .defconfig } -qemu_sparc_ss10_defconfig: { extends: .defconfig } -qemu_x86_64_defconfig: { extends: .defconfig } -qemu_x86_defconfig: { extends: .defconfig } -qemu_xtensa_lx60_defconfig: { extends: .defconfig } -qemu_xtensa_lx60_nommu_defconfig: { extends: .defconfig } -raspberrypi0_defconfig: { extends: .defconfig } -raspberrypi0w_defconfig: { extends: .defconfig } -raspberrypi2_defconfig: { extends: .defconfig } -raspberrypi3_64_defconfig: { extends: .defconfig } -raspberrypi3_defconfig: { extends: .defconfig } -raspberrypi3_qt5we_defconfig: { extends: .defconfig } -raspberrypi4_64_defconfig: { extends: .defconfig } -raspberrypi4_defconfig: { extends: .defconfig } -raspberrypi_defconfig: { extends: .defconfig } -riotboard_defconfig: { extends: .defconfig } -rock64_defconfig: { extends: .defconfig } -roseapplepi_defconfig: { extends: .defconfig } -s6lx9_microboard_defconfig: { extends: .defconfig } -sheevaplug_defconfig: { extends: .defconfig } -snps_aarch64_vdk_defconfig: { extends: .defconfig } -snps_arc700_axs101_defconfig: { extends: .defconfig } -snps_archs38_axs103_defconfig: { extends: .defconfig } -snps_archs38_haps_defconfig: { extends: .defconfig } -snps_archs38_hsdk_defconfig: { extends: .defconfig } -snps_archs38_vdk_defconfig: { extends: .defconfig } -socrates_cyclone5_defconfig: { extends: .defconfig } -solidrun_clearfog_defconfig: { extends: .defconfig } -solidrun_clearfog_gt_8k_defconfig: { extends: .defconfig } -solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig } -solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig } -stm32f429_disco_defconfig: { extends: .defconfig } -stm32f469_disco_defconfig: { extends: .defconfig } -stm32mp157c_dk2_defconfig: { extends: .defconfig } -toradex_apalis_imx6_defconfig: { extends: .defconfig } -ts4900_defconfig: { extends: .defconfig } -ts5500_defconfig: { extends: .defconfig } -ts7680_defconfig: { extends: .defconfig } -wandboard_defconfig: { extends: .defconfig } -warp7_defconfig: { extends: .defconfig } -warpboard_defconfig: { extends: .defconfig } -zynq_microzed_defconfig: { extends: .defconfig } -zynq_zc706_defconfig: { extends: .defconfig } -zynq_zed_defconfig: { extends: .defconfig } -zynqmp_zcu106_defconfig: { extends: .defconfig } -tests.boot.test_atf.TestATFAllwinner: { extends: .runtime_test } -tests.boot.test_atf.TestATFMarvell: { extends: .runtime_test } -tests.boot.test_atf.TestATFVexpress: { extends: .runtime_test } -tests.core.test_file_capabilities.TestFileCapabilities: { extends: .runtime_test } -tests.core.test_hardening.TestFortifyConserv: { extends: .runtime_test } -tests.core.test_hardening.TestFortifyNone: { extends: .runtime_test } -tests.core.test_hardening.TestRelro: { extends: .runtime_test } -tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test } -tests.core.test_hardening.TestSspNone: { extends: .runtime_test } -tests.core.test_hardening.TestSspStrong: { extends: .runtime_test } -tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test } -tests.core.test_root_password.TestRootPassword: { extends: .runtime_test } -tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test } -tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test } -tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test } -tests.core.test_timezone.TestNoTimezone: { extends: .runtime_test } -tests.download.test_git.TestGitHash: { extends: .runtime_test } -tests.download.test_git.TestGitRefs: { extends: .runtime_test } -tests.fs.test_ext.TestExt2: { extends: .runtime_test } -tests.fs.test_ext.TestExt2r1: { extends: .runtime_test } -tests.fs.test_ext.TestExt3: { extends: .runtime_test } -tests.fs.test_ext.TestExt4: { extends: .runtime_test } -tests.fs.test_f2fs.TestF2FS: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660Grub2External: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660Grub2Internal: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660SyslinuxExternal: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: { extends: .runtime_test } -tests.fs.test_iso9660.TestIso9660SyslinuxInternal: { extends: .runtime_test } -tests.fs.test_jffs2.TestJffs2: { extends: .runtime_test } -tests.fs.test_squashfs.TestSquashfs: { extends: .runtime_test } -tests.fs.test_ubi.TestUbi: { extends: .runtime_test } -tests.fs.test_yaffs2.TestYaffs2: { extends: .runtime_test } -tests.init.test_busybox.TestInitSystemBusyboxRo: { extends: .runtime_test } -tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } -tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } -tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } -tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test } -tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test } -tests.package.test_atop.TestAtop: { extends: .runtime_test } -tests.package.test_crudini.TestCrudiniPy2: { extends: .runtime_test } -tests.package.test_crudini.TestCrudiniPy3: { extends: .runtime_test } -tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test } -tests.package.test_dropbear.TestDropbear: { extends: .runtime_test } -tests.package.test_glxinfo.TestGlxinfo: { extends: .runtime_test } -tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } -tests.package.test_libftdi1.TestPythonPy2Libftdi1: { extends: .runtime_test } -tests.package.test_libftdi1.TestPythonPy3Libftdi1: { extends: .runtime_test } -tests.package.test_lpeg.TestLuaLPeg: { extends: .runtime_test } -tests.package.test_lpeg.TestLuajitLPeg: { extends: .runtime_test } -tests.package.test_lsqlite3.TestLuaLsqlite3: { extends: .runtime_test } -tests.package.test_lsqlite3.TestLuajitLsqlite3: { extends: .runtime_test } -tests.package.test_lua.TestLua: { extends: .runtime_test } -tests.package.test_lua.TestLuajit: { extends: .runtime_test } -tests.package.test_lua_cqueues.TestLuaLuaCqueues: { extends: .runtime_test } -tests.package.test_lua_cqueues.TestLuajitLuaCqueues: { extends: .runtime_test } -tests.package.test_lua_curl.TestLuaLuacURL: { extends: .runtime_test } -tests.package.test_lua_curl.TestLuajitLuacURL: { extends: .runtime_test } -tests.package.test_lua_gd.TestLuaLuaGD: { extends: .runtime_test } -tests.package.test_lua_gd.TestLuajitLuaGD: { extends: .runtime_test } -tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test } -tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test } -tests.package.test_lua_sdl2.TestLuaLuaSDL2: { extends: .runtime_test } -tests.package.test_lua_sdl2.TestLuajitLuaSDL2: { extends: .runtime_test } -tests.package.test_lua_utf8.TestLuaUtf8: { extends: .runtime_test } -tests.package.test_lua_utf8.TestLuajitUtf8: { extends: .runtime_test } -tests.package.test_luaexpat.TestLuaLuaExpat: { extends: .runtime_test } -tests.package.test_luaexpat.TestLuajitLuaExpat: { extends: .runtime_test } -tests.package.test_luafilesystem.TestLuaLuaFileSystem: { extends: .runtime_test } -tests.package.test_luafilesystem.TestLuajitLuaFileSystem: { extends: .runtime_test } -tests.package.test_luaossl.TestLuaLuaossl: { extends: .runtime_test } -tests.package.test_luaossl.TestLuajitLuaossl: { extends: .runtime_test } -tests.package.test_luaposix.TestLuaLuaPosix: { extends: .runtime_test } -tests.package.test_luaposix.TestLuajitLuaPosix: { extends: .runtime_test } -tests.package.test_luasec.TestLuaLuaSec: { extends: .runtime_test } -tests.package.test_luasec.TestLuajitLuaSec: { extends: .runtime_test } -tests.package.test_luasocket.TestLuaLuaSocket: { extends: .runtime_test } -tests.package.test_luasocket.TestLuajitLuaSocket: { extends: .runtime_test } -tests.package.test_luasyslog.TestLuaLuasyslog: { extends: .runtime_test } -tests.package.test_luasyslog.TestLuajitLuasyslog: { extends: .runtime_test } -tests.package.test_luvi.TestLuvi: { extends: .runtime_test } -tests.package.test_lxc.TestLxc: { extends: .runtime_test } -tests.package.test_lzlib.TestLuaLzlib: { extends: .runtime_test } -tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test } -tests.package.test_opkg.TestOpkg: { extends: .runtime_test } -tests.package.test_perl.TestPerl: { extends: .runtime_test } -tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } -tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test } -tests.package.test_perl_encode_detect.TestPerlEncodeDetect: { extends: .runtime_test } -tests.package.test_perl_gdgraph.TestPerlGDGraph: { extends: .runtime_test } -tests.package.test_perl_io_socket_multicast.TestPerlIOSocketMulticast: { extends: .runtime_test } -tests.package.test_perl_io_socket_ssl.TestPerlIOSocketSSL: { extends: .runtime_test } -tests.package.test_perl_libwww_perl.TestPerllibwwwperl: { extends: .runtime_test } -tests.package.test_perl_mail_dkim.TestPerlMailDKIM: { extends: .runtime_test } -tests.package.test_perl_x10.TestPerlX10: { extends: .runtime_test } -tests.package.test_perl_xml_libxml.TestPerlXMLLibXML: { extends: .runtime_test } -tests.package.test_prosody.TestProsodyLua51: { extends: .runtime_test } -tests.package.test_prosody.TestProsodyLuajit: { extends: .runtime_test } -tests.package.test_python.TestPython2: { extends: .runtime_test } -tests.package.test_python.TestPython3: { extends: .runtime_test } -tests.package.test_python_argh.TestPythonPy2Argh: { extends: .runtime_test } -tests.package.test_python_argh.TestPythonPy3Argh: { extends: .runtime_test } -tests.package.test_python_attrs.TestPythonPy2Attrs: { extends: .runtime_test } -tests.package.test_python_attrs.TestPythonPy3Attrs: { extends: .runtime_test } -tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_test } -tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test } -tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test } -tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test } -tests.package.test_python_avro.TestPythonAvro: { extends: .runtime_test } -tests.package.test_python_bitstring.TestPythonPy2Bitstring: { extends: .runtime_test } -tests.package.test_python_bitstring.TestPythonPy3Bitstring: { extends: .runtime_test } -tests.package.test_python_can.TestPythonPy2Can: { extends: .runtime_test } -tests.package.test_python_can.TestPythonPy3Can: { extends: .runtime_test } -tests.package.test_python_cbor.TestPythonPy2Cbor: { extends: .runtime_test } -tests.package.test_python_cbor.TestPythonPy3Cbor: { extends: .runtime_test } -tests.package.test_python_click.TestPythonPy2Click: { extends: .runtime_test } -tests.package.test_python_click.TestPythonPy3Click: { extends: .runtime_test } -tests.package.test_python_constantly.TestPythonPy2Constantly: { extends: .runtime_test } -tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtime_test } -tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } -tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } -tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } -tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test } -tests.package.test_python_gitdb2.TestPythonPy2Gitdb2: { extends: .runtime_test } -tests.package.test_python_gitdb2.TestPythonPy3Gitdb2: { extends: .runtime_test } -tests.package.test_python_gobject.TestPythonPy2Gobject: { extends: .runtime_test } -tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } -tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } -tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test } -tests.package.test_python_passlib.TestPythonPy3Passlib: { extends: .runtime_test } -tests.package.test_python_pexpect.TestPythonPy2Pexpect: { extends: .runtime_test } -tests.package.test_python_pexpect.TestPythonPy3Pexpect: { extends: .runtime_test } -tests.package.test_python_pynacl.TestPythonPy2Pynacl: { extends: .runtime_test } -tests.package.test_python_pynacl.TestPythonPy3Pynacl: { extends: .runtime_test } -tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test } -tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: { extends: .runtime_test } -tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: { extends: .runtime_test } -tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: { extends: .runtime_test } -tests.package.test_python_smmap2.TestPythonPy2Smmap2: { extends: .runtime_test } -tests.package.test_python_smmap2.TestPythonPy3Smmap2: { extends: .runtime_test } -tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: { extends: .runtime_test } -tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test } -tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test } -tests.package.test_python_twisted.TestPythonPy2Twisted: { extends: .runtime_test } -tests.package.test_python_twisted.TestPythonPy3Twisted: { extends: .runtime_test } -tests.package.test_python_txaio.TestPythonPy2Txaio: { extends: .runtime_test } -tests.package.test_python_txaio.TestPythonPy3Txaio: { extends: .runtime_test } -tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_test } -tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test } -tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test } -tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test } -tests.package.test_rings.TestLuaRings: { extends: .runtime_test } -tests.package.test_rings.TestLuajitRings: { extends: .runtime_test } -tests.package.test_rust.TestRust: { extends: .runtime_test } -tests.package.test_rust.TestRustBin: { extends: .runtime_test } -tests.package.test_syslog_ng.TestSyslogNg: { extends: .runtime_test } -tests.package.test_tmux.TestTmux: { extends: .runtime_test } -tests.package.test_turbolua.TestLuajitTurbolua: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainCCache: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainCtngMusl: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainLinaroArm: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: { extends: .runtime_test } -tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: { extends: .runtime_test } -tests.utils.test_check_package.TestCheckPackage: { extends: .runtime_test } +buildroot-pipeline: + stage: build + trigger: + include: + - artifact: generated-gitlab-ci.yml + job: generate-gitlab-ci-yml + strategy: depend diff --git a/buildroot/.gitlab-ci.yml.in b/buildroot/.gitlab-ci.yml.in deleted file mode 100644 index 08a714f32..000000000 --- a/buildroot/.gitlab-ci.yml.in +++ /dev/null @@ -1,126 +0,0 @@ -# Configuration for Gitlab-CI. -# Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -# The .gitlab-ci.yml file is generated from .gitlab-ci.yml.in. -# It needs to be regenerated every time a defconfig is added, using -# "make .gitlab-ci.yml". - -image: buildroot/base:20200814.2228 - -.check_base: - rules: - - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/ || $CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/' - when: never - - when: always - -check-DEVELOPERS: - extends: .check_base - # get-developers should print just "No action specified"; if it prints - # anything else, it's a parse error. - # The initial ! is removed by YAML so we need to quote it. - script: - - "! utils/get-developers | grep -v 'No action specified'" - -check-flake8: - extends: .check_base - before_script: - # Help flake8 to find the Python files without .py extension. - - find * -type f -name '*.py' > files.txt - - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt - - sort -u files.txt | tee files.processed - script: - - python3 -m flake8 --statistics --count --max-line-length=132 $(cat files.processed) - after_script: - - wc -l files.processed - -check-gitlab-ci.yml: - extends: .check_base - script: - - mv .gitlab-ci.yml .gitlab-ci.yml.orig - - make .gitlab-ci.yml - - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml - -check-package: - extends: .check_base - script: - - make check-package - -.defconfig_base: - script: - - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - - make ${DEFCONFIG_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } - artifacts: - when: always - expire_in: 2 weeks - paths: - - .config - - build.log - - output/images/ - - output/build/build-time.log - - output/build/packages-file-list.txt - - output/build/*/.config - -.defconfig: - extends: .defconfig_base - # Running the defconfigs for every push is too much, so limit to - # explicit triggers through the API. - rules: - # For tags, create a pipeline. - - if: '$CI_COMMIT_TAG' - # For pipeline created by using a trigger token. - - if: '$CI_PIPELINE_TRIGGERED' - # For the branch or tag name named *-defconfigs, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-defconfigs$/' - before_script: - - DEFCONFIG_NAME=${CI_JOB_NAME} - -one-defconfig: - extends: .defconfig_base - rules: - # For the branch or tag name named *-*_defconfigs, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/' - before_script: - - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') - -.runtime_test_base: - # Keep build directories so the rootfs can be an artifact of the job. The - # runner will clean up those files for us. - # Multiply every emulator timeout by 10 to avoid sporadic failures in - # elastic runners. - script: - - echo "Starting runtime test ${TEST_CASE_NAME}" - - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} - artifacts: - when: always - expire_in: 2 weeks - paths: - - test-output/*.log - - test-output/*/.config - - test-output/*/images/* - -.runtime_test: - extends: .runtime_test_base - # Running the runtime tests for every push is too much, so limit to - # explicit triggers through the API. - rules: - # For tags, create a pipeline. - - if: '$CI_COMMIT_TAG' - # For pipeline created by using a trigger token. - - if: '$CI_PIPELINE_TRIGGERED' - # For the branch or tag name named *-runtime-tests, create a pipeline. - - if: '$CI_COMMIT_REF_NAME =~ /^.*-runtime-tests$/' - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} - -one-runtime_test: - extends: .runtime_test_base - rules: - - if: '$CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/' - before_script: - - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 77e274f5c..4f7864c0e 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,591 @@ +2020.11-rc1, released November 4th, 2020 + + Fixes all over the tree and new features. + + Architectures: Support for IBM s390x + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC + 32. Binutils 2.35.1 added, now defaulting to 2.34. ARC + 2020.09-release toolchain. GCC 7.x dropped. RISC-V support for + uclibc-ng. Support for Bootlin external toolchains. + + SELinux support improvements: File security contexts are now + set when the file systems are created, so there is no need to + run restorecon on first boot / read only rootfs is supported. + An optimized / stripped refpolicy SELinux policy is now + used. Packages can enable additional refpolicy modules using + _SELINUX_MODULES. + + support/scripts/cve-checker: Utility script to check for known + CVEs in just the packages enabled in a Buildroot configuration + rather than all packages, by passing the output of 'make + show-info' to it. + + Go: Modules handling. The module name must be specified using + _GOMOD. + + BR2_EXTERNAL: Support for defining skeleton and init system + packages in external trees. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + New defconfigs: Acer chromebook elm, Friendlyarm nanopc-t4 and + nanopi-m4, Hardkernel odroid-c2, Kontron SMARC-sAL28, NXP + imx8mqevk, Orangepi RK3399 and zero+, PCengines APU2, Pine64 + rockpro64, QEMU s390x, Raxda rockpi-n8, + + New packages: altera-stapl, asn1c, babeltrace2, cukinia, + easyframes, environment-setup, frr, graphicsmagick, htpdate, + ipcalc, libbacktrace, libblockdev, libbytesize, librelp, + libuev, makedumpfile, meson-tools, mg, mrp, multipath-tools, + netcalc, odroidc2-firmware, php-xdebug, python-aiofiles, + python-ansicolors, python-boto3, python-botocore, + python-bsdiff4, python-crayons, python-iniconfig, + python-intelhex, python-ipdb, python-jmespath, + python-m2crypto, python-opcua-asyncio, python-packaging, + python-piexif, python-pluggy, python-pytest, + python-s3transfer, python-xmodem, qprint, qt5lottie, + qt5remoteobjects, re2, redir, s390-tools, sentry-cli, + sentry-native, timescaledb, tinyhttpd, uhd, uredir, watchdog, + wayland-utils, weston-imx + + Removed packages: amd-catalyst, bellagio, gqview, libcroco, + nvidia-tegra23, opencv + + Issues resolved (http://bugs.uclibc.org): + + #11811: lsblk (util-linux) should depend on libudev if available + #11931: Bugs in support/scripts/apply-patches.sh + #12301: systemd-journal-gatewayd: config options broken + #12911: usb_modeswitch installation race condition + #13236: Can't compile linux 5.4.8 (with gcc 10 on host) + #13286: The system hangs in vmware workstation on the line.. + +2020.08.1, released October 12th, 2020 + + Important / security related fixes. + + Fixes for various compilation issues with GCC 10.x. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + fs/jffs2: Now correctly handles xattrs + + Updated/fixed packages: acpica, afboot-stm32, alsa-utils, + apparmor, bandwidthd, barebox, bash, bison, brotli, + cifs-utils, cups, dhcpcd, dhcpdump, docker-cli, docker-engine, + ecryptfs-utils, efl, fail2ban, fbterm, ffmpeg, fontconfig, + freetype, gcc, gdb, ghostscript, gnupg2, gnutls, go, gqview, + gst1-plugins-base, gst1-plugins-ugly, ipmitool, jbig2dec, + kexec, lcdproc, libcamera, libhtp, libnetconf2, libraw, + libssh, libxml2, libxml-parser-perl, libzip, linux-headers, + live555, localedef, ltp-testsuite, lua, matchbox, memcached, + memtester, mesa3d, meson, minidlna, mongodb, mongrel2, motion, + mraa, mtd, musepack, neardal, netatalk, netperf, netsniff-ng, + nginx, nodejs, nss-pam-ldapd, open-plc-utils, openswan, + opentyrian, openvmtools, php, postgresql, python, + python-aenum, python-cycler, python-engineio, python-fire, + python-pymodbus, python-scapy, python-semver, + python-sentry-sdk, python-socketio, python-texttable, + python-tinyrpc, python-txtorcon, python3, qt5base, quagga, + read-edid, redis, rsh-redone, runc, samba4, socketcand, + strace, supertux, suricata, systemd, ti-utils, trinity, + uclibc, usb_modeswitch, vlc, vsftpd, wampcc, + wayland-protocols, wireguard-linux-compat, wireshark, wlroots, + wolfssl, w_scan, xerces, xfsprogs, xdriver-xf86-video-ati, + xserver_xorg-server, ympd, zeromq, zlib-ng, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + #13236: Can't compile linux 5.4.8 (with gcc 10 on host) + +2020.08, released September 1st, 2020 + + Various fixes. + + Updated/fixed packages: am33x-cm3, avahi, bluez-tools, + busybox, chocolate-doom, collectd, dhcp, docker-cli, domoticz, + gobject-introspection, graphite2, haproxy, ibm-sw-tpm2, + imagemagick, libeXosip2, libressl, lxc, mbedtls, menu-cache, + mongodb, mosquitto, nvidia-driver, paho-mqtt-c, pixz, + postgresql, python-django, rtty, squid, stress-ng, systemd, + trousers, uclibc, wireshark, wolfssl, zbar + +2020.08-rc3, released August 28th, 2020 + + Fixes all over the tree. + + Infrastructure: Ensure RPATH entries that may be needed for + dlopen() are not dropped by patchelf. + + Toolchain: Drop old GCC 6 based external Sourcery AMD64 + toolchain. + + Updated/fixed packages: assimp, davfs2, dillo, glibc, + gnuradio, hostapd, ibm-sw-tpm2, ipmitool, json-c, libroxml, + linux, mender, netopeer2, openal, openjpeg, python-matplotlib, + ripgrep, shadowsocks-libev, trousers, xlib_libX11, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13141: Target-finalize fail with "depmod: ERROR: Bad version passed" + +2020.08-rc2, released August 24th, 2020 + + Fixes all over the tree, including a number of fixes for + compilation with GCC-10. + + Toolchain: Disallow building uClibc-ng for RISC-V 64-bit, + because of issues with a missing __riscv_flush_icache() + implementation. + + Defconfigs: CI20: Use mainline Linux and U-boot. Update + Microchip sama5d27_wlsom1_ek_mmc_dev to use bluez5-utils + instead of (the removed) legacy bluez-utils + + Updated/fixed packages: 18xx-ti-utils, aircrack-ng, apache, + atest, bandwidthd, bellagio, bind, bird, bluez-alsa, boost, + c-periphery, capnproto, chrony, collectd, cpio, cvs, + dieharder, domoticz, dovecot, dovecot-pigeonhole, drbd-utils, + dump1090, efl, elixir, f2fs-tools, feh, fluidsynth, fping, + gdbm, gdk-pixbuf, ghostscript, gst1-plugins-bad, + gstreamer1-editing-services, htop, ibm-sw-tpm2, ifplugd, + iftop, igd2-for-linux, ima-evm-utils, iprutils, iputils, + keepalived, kmsxx, libabseil-cpp, libcamera, libcurl, + libfuse3, libnss, librtlsdr, libubox, libunwind, live555, + lttng-tools, luabitop, mender-artifact, minizip, + mjpg-streamer, mpd, mpv, mtd, ncftp, open-lldp, openal, + opencv, opencv3, openfpgaloader, optee-os, owfs, php, + pistache, prosody, pulseview, python-decorator, + python-gunicorn, python-rpi-gpio, python-spidev, + python3-decorator, python3-mako, python3-pyselftools, qt5, + qt5webengine, rauc, redis, ripgrep, rtl8188eu, rtl8821au, + setools, smstools3, supertux, tftpd, tpm2-abrmd, + wpa_supplicant, xen, xlib_libX11, xserver_xorg-server + + New packages: python3-cython, python3-pycryptodomex + + Issues resolved (http://bugs.uclibc.org): + + #12876: nodejs fails to build when host-icu has been built before + #13111: python-gunicorn: missing dependency on python-setuptools + #13121: wpa_supplicant fails to build without libopenssl enabled + #13146: raspberrypi3_defconfig: "Inappropriate ioctl for device".. + #13156: package live555 new license + #13166: python-rpi-gpio: does not work against aarch64, unint.. + +2020.08-rc1, released August 6th, 2020 + + Toolchain: + + - GCC 10.x added, GCC 9.x is the default + - binutils 2.34 added, binutils 2.33 is the default, binutils + 2.31 removed + - glibc updated to 2.31 + - ARC toolchain components updated to 2020.03-release. + - Enable uClibc-ng usage for RISC-V 64-bit + + Infrastructure: + + - qmake-package was fixed to be compatible with + BR2_PER_PACKAGE_DIRECTORIES + - complete rewrite of the Gitlab CI Yaml configuration file, + now generated directly by the Gitlab CI pipeline itselfs + + Misc: + + - cargo and cargo-bin packages removed, as cargo is now part + of Rust itself + + Filesystem: ubinize configuration files can now use + BINARIES_DIR to refer to the $(O)/images directory. + + New packages: bitwise, earlyoom, fuse-overlayfs, gloox, + kodi-pvr-octonet, kodi-pvr-zattoo, libabseil-cpp, libcutl, + libnids, libnpupnp, libodb, libodb-boost, libodb-mysql, + libodb-pgsql, mbpfan, netopeer2, odb, parprouted, + python-colorzero, python-gpiozero, python-pybind, python-yatl, + python3-decorator, qt5quicktimeline, resiprocate, ttyd, + unclutter-xfixes, urandom-scripts, + + New defconfigs: bananapi_m2_zero, freescale_imx8mnevk, + globalscale_espressobin, imx6ullevk, + microchip_sama5d27_wlsom1_ek, rock_pi_4, rock_pi_n10 + + Removed packages: cargo, cargo-bin, + kodi-peripheral-steamcontroller + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_DIRECTORIES + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13021: Minor code error when building granite-0.4.1 + #13026: rpi-firmware: must not rename start files + #13046: Optimize for fast -Ofast is not compliant + #13081: host-e2fsprogs attempts to create udev rules.d on build host if not exists + #13101: BR audit2allow support + +2020.05.3, released October 12th, 2020 + + Important / security related fixes. + + meson: Correct SDK cross-compilation.conf file when + per-package builds were used to build SDK. + + systemd: Use /run rather than /var/run for PID files in units. + + Toolchain: use Secure-PLT rather than BSS-PLT for PowerPC 32. + + Fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) are now run + after all finalization hooks (including pre-rootfs) to ensure + they can override any late configuration done by packages. + + support/script/pycompile: Rework logic to ensure .pyc files + contain absolute target paths, fixing code inspection at + runtime when executed with cwd != '/'. + + support/scripts/setlocalversion: Correct Mercurial output to + match behaviour with Git. + + support/scripts/apply-patches.sh: Use patch + --no-backup-if-mismatch, so we no longer blindly have to + remove *.orig files after patching, fixing issues with + packages containing such files. + + Updated/fixed packages: alsa-utils, apparmor, avahi, + bandwidthd, barebox, bash, bison, brotli, busybox, cifs-utils, + cryptsetup, cups, dhcpcd, dhcpdump, docker-cli, docker-engine, + ecryptfs-utils, efl, fail2ban, freetype, gcc, gdb, + ghostscript, gnutls, go, graphite2, gst1-plugins-base, + gst1-plugins-ugly, imagemagick, ipmitool, jbig2dec, libhtp, + libraw, libssh, libxml2, libxml-parser-perl, linux-headers, + localedef, lua, mbedtls, memcached, mesa3d, meson, minidlna, + mongodb, nginx, nodejs, nss-pam-ldapd, openvmtools, + paho-mqtt-c, php, postgresql, python, python-aenum, + python-django, python-engineio, python-fire, python-pymodbus, + python-scapy, python-semver, python-sentry-sdk, + python-socketio, python-texttable, python-tinyrpc, + python-txtorcon, python3, qt5base, rsh-redone, runc, samba4, + strace, supertux, suricata, systemd, uclibc, usb_modeswitch, + vlc, vsftpd, wayland-protocols, wireguard-linux-compat, + wireshark, wlroots, wolfssl, xserver_xorg-server, ympd, + zeromq, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12911: usb_modeswitch installation race condition + #13251: cryptsetup does not work on branch 2020.02 following.. + +2020.05.2, released August 29th, 2020 + + Important / security related fixes. + + Infrastructure: Ensure RPATH entries that may be needed for + dlopen() are not dropped by patchelf. + + BR_VERSION_FULL/setlocalversion (used by make print-version + and /etc/os-release): Properly handle local git tags + + Updated/fixed packages: apache, assimp, at91bootstrap3, bind, + boost, busybox, capnproto, cegui, chrony, collectd, cpio, + cryptsetup, cups, cvs, dbus, docker-engine, domoticz, dovecot, + dovecot-pigeonhole, dropbear, efl, elixir, f2fs-tools, ffmpeg, + gd, gdk-pixbuf, ghostscript, glibc, gnuradio, grub2, + gst1-plugins-bad, gstreamer1-editing-services, hostapd, + ibm-sw-tpm2, iputils, jasper, json-c, libcurl, libressl, + libwebsockets, linux, live555, mesa3d, mongodb, mosquitto, + mpv, nodejs, opencv, opencv3, openfpgaloader, openjpeg, + patchelf, perl, php, postgresql, prosody, python-django, + python-gunicorn, python-matplotlib, ripgrep, rtl8188eu, + rtl8821au, ruby, shadowsocks-libev, squid, systemd, + tpm2-abrmd, tpm2-tools, trousers, uboot, webkitgtk, wireshark, + wolfssl, wpa_supplicant, wpewebkit, xen, xlib_libX11, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12876: nodejs fails to build when host-icu has been built before + #13111: python-gunicorn: missing dependency on python-setuptools + #13121: wpa_supplicant fails to build without libopenssl enabled + #13141: Target-finalize fail with "depmod: ERROR: Bad version passed" + #13156: package live555 new license + +2020.05.1, released July 25th, 2020 + + Important / security related fixes. + + Toolchain: + - Make external toolchain version check also work for + toolchains configured with --with-gcc-major-version-only + + - Do not handle SOURCE_DATE_EPOCH in toolchain wrapper if the + compiler supports it, fixing an issue with precompiled + headers + + - Ensure debug libs from external toolchains are not installed + into target if debugging is disabled + + Download: + - Correct reproducibility issue in handling of git submodules + for older git versions. + + - Fix file locking over NFS + + fs: Ensure cpio archive element order is reproducible + + Br2-external: Fix error reporting for invalid br2-external trees + + Per-package: + - Fix an issue with python3 sysconfig data not getting + correctly expanded + + - Fix per-package building for packages using the qmake + infrastructure + + Updated/fixed packages: a10disp, asterisk, bind, brltty, + cdrkit, clamav, cryptodev-linux, dbus, docker-cli, + docker-engine, dvb-apps, e2fsprogs, exim, exiv2, freerdp, gdb, + gdk-pixbuf, gerbera, gnutls, go, granite, grub2, gssdp, + gst1-plugins-good, gst1-plugins-ugly, gupnp, intel-microcode, + iproute2, irrlicht, iwd, jq, kodi, libcamera, libcec, + libconfuse, libcurl, libevdev, libhttpserver, libmicrohttpd, + libnss, libressl, libvncserver, libxml2, libxmlrpc, lxc, + mbedtls, mediastreamer, mesa3d, meson, minizip, mongodb, + mtools, mutt, nano, network-manager, nghttp2, ngircd, nodejs, + ntp, open-plc-utils, open2300, openjdk-bin, openssh, + oracle-mysql, paho-mqtt-c, pango, php, poco, prosody, putty, + python-greenlet, python-urllib3, python-validators, python3, + readline, redis, rpi-firmware, rtl8821au, samba4, sdl2, + sqlite, squid, strace, sunxi-mali-mainline-driver, syslog-ng, + systemd, tcpreplay, tinydtls, upmpdcli, upx, vlc, webkitgtk, + wireguard-linux-compat, wireshark, wpebackend-fdo, wpewebkit, + x11vnc, znc, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_.. + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13021: Minor code error when building granite-0.4.1 + #13026: rpi-firmware: must not rename start files + #13031: nodejs: RangeError at new ArrayBuffer() + #13046: Optimize for fast -Ofast is not compliant + +2020.05, released June 1st, 2020 + + Various fixes. + + Updated/fixed packages: arm-trusted-firmware, gcc, mp4v2, fmc, + fmlib, glib-networking, libusb-compat, linux, qt5webengine, + sysrepo, wampcc, xen + +2020.05-rc3, released May 29th, 2020 + + Fixes all over the tree. + + Infrastructure: Support checking download hashes for packages + coming from Subversion. + + Defconfigs: Increase boot partition size to 64MB for Freescale + boards to allow space for bigger kernels. + + Updated/fixed packages: audit, bind, dovecot, efl, erlang, + ffmpeg, fio, gerbera, gnupg, leveldb, lrzip, ltrace, matio, + mesa3d, mp4v2, prosody, qemu, qt5declarative, speexdsp, + systemd, tremor, uboot-tools, unbound, wireshark + + Removed packages: wiringpi + + Issues resolved (http://bugs.uclibc.org): + + #12361: Init system (systemd) kills login on Raspberry Pi Zero + #12686: recipe for target 'install_dev' failed (libcrypto.so..) + +2020.05-rc2, released May 22nd 2020 + + Fixes all over the tree. + + U-Boot: Support building with Python 3.x instead of Python + 2.x. Since U-Boot 2020.01, various U-Boot build scripts use + Python 3.x instead of Python 2.x, so add an option to pull in + host-python3 rather than host-python. Also fix a number of + defconfigs to use this new option. + + Updated/fixed packages: apparmor, binutils, bison, brltty, + c-icap, cegui, checkpolicy, clamav, crda, cvs, docker-cli, + docker-engine, domoticz, elf2flt, exfatprogs, fakeroot, + ffmpeg, freerdp, gcc, glibc, gnuconfig, irrlicht, kmod, + libexif, libpam-tacplus, libssh2, libv4l, libvncserver, + localedef, lrzip, mariadb, matchbox, mbuffer, mesa3d, + mesa3d-headers, meson, netsniff-ng, openldap, openocd, + optee-os, p7zip, paho-mqtt-c, php, piglit, pigz, + python-argon2-cffi, python-attrs, python-future, + python-markdown, python-pycryptodomex, python-pyqt5, qt5base, + rpi-firmware, rustc, squashfs, squid, stella, suricata, + systemd, uacme, uclibc, util-linux, vboot-utils + + New packages: python3-pyelftools + + Removed packages: ezxml, mtdev2tuio, python-pycrypto + + Issues resolved (http://bugs.uclibc.org): + + #10551: PowerPC SPE and Musl + #12256: package tar is outdated (1.29 is 3 years old) + #12271: python-iptables runtime dependencies + #12321: host-generic-package: PKG_DL_OPTS not used for host package + #12391: CMake-based host package fails to include output/host/include + #12431: ethernet no detected on nanopi neo 2 + #12521: RISCV RV32IA selected, RV64GC output + #12586: avahi failure + #12596: host-e2fsprogs: tune2fs incompatibility on older glibc.. + #12611: ntp hash is not matching with upstream 4.2.8p13 + #12626: PHP missing header files within 2020.02 + #12631: glibc support Power-PC SPE + #12656: bison fails to relocate with relocate-sdk.sh + #12661: cups problems in buildroot + #12686: recipe for target 'install_dev' failed (libcrypto.so:.. + #12691: host-rust build fails + #12761: Buildroot fails when building GCNano binaries for the STM.. + #12786: Systemd spawns two getty processes when the getty port.. + #12806: There are multiple issues in buildroot that faults cups.. + #12826: nodejs-12.16.1: error: 'uv_sleep' was not declared in.. + #12831: RPI-firmware package: DTB-overlay dependency + #12836: libunwind: package does not show up in menuconfig for.. + #12841: util-linux/sfdisk 2.35.1 fails on sector-size header + #12866: should we be disabling bash executable path caching? + #12886: GMP built in wrong order (?) + #12891: QEMU, libvirt-bin, qemu-kvm Package Support required + #12901: GStreamer doesn't build on 2020-05 rc1 with GObject.. + #12906: qt PrefixPath is wrong on 2020.05-rc1 + #12921: nodejs-12.16.1: error: overriding 'virtual icu_65::.. + +2020.05-rc1, released May 7th 2020 + + Addition of support for gobject-introspection: both the + gobject-introspection package itself, but also introspection + support was enabled in a number of other packages. + + Support for Qt 5.6 was dropped as its support was dropped + upstream, only one version of Qt is supported at the moment: + Qt 5.14.2. + + Addition of support for the apparmor Linux security module, by + adding the necessary user-space packages. + + Addition of a qmake package infrastructure, now used by most + Qt-related packages. + + The Luarocks package infrastructure has been extended to + support build host packages. + + The package infrastructure was improved to allow each package + to indicate the Linux kernel configuration options it needs. + + Addition of support for generating filesystem images using the + EROFS filesystem. + + The logic that calculates the list of files installed by each + package was reworked to be compatible with the top-level + parallel build functionality. + + Addition of a package for a pre-compiled ARM32 bare-metal + toolchain, which can be used to build ARM32 code in ARM64 + configurations, such as firmware/bootloader code. + + The Qemu defconfigs are now boot-tested in Qemu as part of the + Gitlab continuous integration. + + Toolchain: gcc 9.x bumped to 9.3.0, gcc 8.x bumped to 8.4.0, + gdb bumped to 8.3.1. + + New packages: apcupsd, apparmor, arm-gnu-a-toolchain, bearssl, + belle-sip, belr, cage, chartjs, erofs-utils, exfatprogs, + gobject-introspection, ibm-sw-tpm2, imx-seco, jbig2dec, + libapparmor, libiberty, libfuse3, libtextstyle, libudfread, + libuhttpd, libuwsc, lua-lyaml, matio, mbuffer, netdata, + openfpgaloader, perl-i18n, perl-locale-maketext-lexicon, + perl-lwp-protocol-https, + perl-mojolicious-plugin-authorization, + perl-mojolicious-plugin-cspheader, + perl-mojolicious-plugin-i18n, + perl-mojolicious-plugin-securityheader, perl-mozilla-ca, + perl-path-class, pistache, pkcs11-helper, prelink-cross, + python-argon2-cffi, python-canopen, python-cbor2, + python-filelock, python-flatbuffers, python-greenlet, + python-modbus-tk, python-pyalsa, python-pysftp, python-regex, + python-snappy, rtty, tinyproxy, udev-gentoo-scripts, unbound, + vuejs, wlroots. + + New defconfigs: freescale_imx6ullevk, freescale_imx8qmmek, + nanopi_neo4, nanopi_r1, nitrogen8mm, nitrogen8mn, olpc_xo1, + olpc_xo175, roc_rk3399_pc, stm32mp157a_dk1, zynq_qmtech + + Issues resolved (http://bugs.uclibc.org): + + #10386: Add an option to put all compiled executables that + show up on target/ in staging/ as well + #11866: iniramfs file system fails to boot using Grub on EFI x86_64 + #12666: Doesn't pick up a custom bash profile + #12696: Uboot 2020.01 Problem loading Linux kernel on Nano PI NEO + #12701: [patch] wpa_supplicant must depend on openssl + #12711: host-localedef 2.30-20 fails to compile on fedora 32 (gcc 10.0.1) + #12716: bio.h not found + #12726: systemctl preset-all failed for ctrl-alt-del.target + #12731: rtl8188eu not buildung for banana pi M1 (glib, systemd, 4.18.12) + #12746: "sysdig" package description points to + http://sysdig.org, which bounces to malware site + #12751: OpenJdk package installation issues on target + #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 + #12811: bootstrap stuck and no login prompt + 2020.02.7, released October 12th, 2020 Important / security related fixes. @@ -128,14 +716,14 @@ intel-microcode, iproute2, irrlicht, iwd, jq, kodi, libcamera, libconfuse, libcurl, libglib2, libhttpserver, libmicrohttpd, libopenssl, libvncserver, libxml2, libxmlrpc, lxc, mbedtls, - mesa3d, meson, mtools, mutt, nghttp2, ngircd, nodejs, ntp, - open-plc-utils, open2300, openjdk-bin, openssh, oracle-mysql, - paho-mqtt-c, pcre, php, poco, prosody, putty, python-twisted, - python-urllib3, python-validators, python3, qt5xmlpatterns, - redis, rpi-firmware, rtl8821au, samba4, sdl2, sqlite, squid, - syslog-ng, systemd, tcpreplay, tinydtls, upmpdcli, upx, vlc, - webkitgtk, wireguard-linux-compat, wireshark, wpebackend-fdo, - wpewebkit, zstd + mesa3d, meson, mongodb, mtools, mutt, nghttp2, ngircd, nodejs, + ntp, open-plc-utils, open2300, openjdk-bin, openssh, + oracle-mysql, paho-mqtt-c, pcre, php, poco, prosody, putty, + python-twisted, python-urllib3, python-validators, python3, + qt5xmlpatterns, redis, rpi-firmware, rtl8821au, samba4, sdl2, + sqlite, squid, syslog-ng, systemd, tcpreplay, tinydtls, + upmpdcli, upx, vlc, webkitgtk, wireguard-linux-compat, + wireshark, wpebackend-fdo, wpewebkit, zstd Issues resolved (http://bugs.uclibc.org): @@ -175,7 +763,6 @@ #12691: host-rust build fails #12831: RPI-firmware package: DTB-overlay dependency - 2020.02.2, released May 12th, 2020 Important / security related fixes. @@ -409,6 +996,81 @@ #12536: Linux-Headers extracting failure #12546: Ninja 1.10 build Error +2019.11.3, released April 10th, 2020 + + Important / security related fixes. + + core: Fix compatibility with make 4.3+. Also fixup /lib + references in libtool .la files, similar to how it is done for + /usr/*. + + toolchain: Fix kernel headers validation check for external + toolchains. + + fs/initramfs: fix show-info so it also shows the usual + rootfs-related variables. + + Updated/fixed packages: barebox-aux, bluez5_utils, busybox, + civetweb, cog, collectd, ffmpeg, gcc, gnutls, gssdp, gvfs, haproxy, + hiredis, hostapd, kmscube, libical, libopenssl, libsndfile, + linux-tools, llvm, monit, ntp, php, pure-ftpd, radvd, redis, + samba4, screen, sysdig, syslinux, syslog-ng, tor, uacme, + util-linux, vala, vlc, wpa_supplicant, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12746: "sysdig" package description points to http://sysdig.org, .. + +2019.11.2, released March 16th, 2020 + + Important / security related fixes. + + Core: Ensure package-file-lists data is correct after + incremental builds as well. + + Fix a race condition related to creating the output/staging + symlink on systems with coreutils < 8.27. + + Toolchain: ARC tools bumped to arc-2019.09. + + Br2-external: Fix patch handling when external linux-extension + packages are used. Fix compatibility with make 4.3+ + + Util-linux: Ensure that hwclock is built without GPLv3 + code. Notice that builds with hwclock has contained + GPLv3-licensed code since util-linux 2.30 (Buildroot 2017.08+) + + Updated/fixed packages: armadillo, at, bcm2835, binutils, + blktrace, bluez-alsa, bootstrap, brltty, busybox, cairo, + clamav, cog, cups, czmq, dnsmasq, docker-containerd, dovecot, + dovecot-pigeonhole, e2fsprogs, elf2flt, eudev, exim, exiv2, + fbgrab, gettext-tiny, glibc, go, grep, gst1-validate, guile, + imagemagick, jhead, jpeg-turbo, kvm-unit-tests, lapack, + libarchive, libcgroup, libdrm, libevent, libexif, libftdi1, + libgdiplus, libjpeg, libsigrok, libsndfile, libssh2, + libsvgtiny, libvncserver, libvorbis, libxml2, libxslt, linknx, + lxc, lz4, mariadb, mbedtls, meson, mongoose, mosquitto, musl, + ncurses, nodejs, ntfs-3g, ogre, opencv3, openjdk, openjpeg, + openrc, openswan, openvmtools, optee-test, patch, php, piglet, + postgresql, pppd, proftpd, pure-ftpd, python-django, + python-pyqt5, python-setuptools-scm-git-archive, python3, + qemu, qt5base, qt5tools, qt5virtualkeyboard, qt5webengine, + qwt, rdesktop, ruby, runc, samba4, shellinabox, + skeleton-init-openrc, smartmontools, spdlog, sqlcipher, squid, + suricata, swig, swupdate, sysklogd, taglib, thrift, + ti-cgt-pru, uclibc, util-linux, vorbis-tools, webkitgtk, + wireshark, wpebackend-fdo, wpewebkit, xen, + xserver_xorg-server, zeromq, zsh, zziplib + + Issues resolved (http://bugs.uclibc.org): + + #11996: opencv3 SIGILL on Cortex-A5 with VFPv4-D16 + #12331: meson issue + #12456: qtvirtualkeyboard: No such file or directory + #12461: libglib2 build files with deep directory structure + #12481: minicom fails when output directory path contains "m4" + #12606: fbgrab location has changed + 2019.11.1, released January 12th, 2020 Important / security related fixes. @@ -1106,6 +1768,66 @@ #11761: Building custom kernel 5.1-rc3 or later breaks on objtool #11816: Only selected coreutils binaries are installed +2019.02.11, released April 9th, 2020 + + Important / security related fixes. + + core: Fix compatibility with make 4.3+. Also fixup /lib + references in libtool .la files, similar to how it is done for + /usr/*. + + toolchain: Fix kernel headers validation check for external + toolchains. + + Updated/fixed packages: barebox-aux, bluez5_utils, busybox, + civetweb, collectd, ffmpeg, gcc, gnutls, gvfs, haproxy, + hiredis, kmscube, libical, libopenssl, libsndfile, + linux-tools, ntp, php, pure-ftpd, screen, sysdig, tor, + util-linux, vala, vlc, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12746: "sysdig" package description points to http://sysdig.org, .. + +2019.02.10, released March 16th, 2020 + + Important / security related fixes. + + Core: Ensure package-file-lists data is correct after + incremental builds as well. + + Fix a race condition related to creating the output/staging + symlink on systems with coreutils < 8.27. + + Br2-external: Fix compatibility with make 4.3+ + + Util-linux: Ensure that hwclock is built without GPLv3 + code. Notice that builds with hwclock has contained + GPLv3-licensed code since util-linux 2.30 (Buildroot 2017.08+) + + Updated/fixed packages: armadillo, at, binutils, blktrace, + bootstrap, busybox, cairo, cups, czmq, dnsmasq, + docker-containerd, dovecot, dovecot-pigeonhole, e2fsprogs, + eudev, exim, exiv2, fbgrab, grep, gst1-validate, guile, + imagemagick, jhead, kvm-unit-tests, lapack, libcgroup, + libftdi1, libjpeg, libsigrok, libsndfile, libssh2, libsvgtiny, + libvncserver, libvorbis, libxml2, libxslt, linux, lz4, + mariadb, mbedtls, meson, mfgtools, mongoose, ncurses, ntfs-3g, + opencv3, openjpeg, openswan, openvmtools, patch, php, + postgresql, pppd, proftpd, pure-ftpd, python-django, + python-pyqt5, python3, qemu, qt5base, qt5webengine, qwt, + rdesktop, ruby, runc, samba4, shellinabox, smartmontools, + sqlcipher, squid, swupdate, sysklogd, taglib, thrift, + ti-cgt-pru, uboot, util-linux, vorbis-tools, webkitgtk, + wireshark, xen, xserver_xorg-server, zeromq, zsh + + Issues resolved (http://bugs.uclibc.org): + + #11996: opencv3 SIGILL on Cortex-A5 with VFPv4-D16 + #12331: meson issue + #12461: libglib2 build files with deep directory structure + #12606: fbgrab location has changed + 2019.02.9, released January 12th, 2020 Important / security related fixes. diff --git a/buildroot/Config.in b/buildroot/Config.in index e2c1d2614..e35a78fb7 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -80,6 +80,11 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER config BR2_NEEDS_HOST_UTF8_LOCALE bool +# Hidden boolean selected by packages that need the host to have +# support for building gcc plugins +config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT + bool + source "arch/Config.in" menu "Build options" diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index e04853aea..9eb18907d 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -144,7 +144,228 @@ endif ############################################################################### -comment "Legacy options removed in 2020.02" +comment "Legacy options removed in 2020.11" + +config BR2_PACKAGE_OPENCV + bool "opencv package was removed" + select BR2_LEGACY + help + This package has been removed, use opencv3 instead. + +config BR2_PACKAGE_LIBCROCO + bool "libcroco package was removed" + select BR2_LEGACY + help + This package has been removed as it is affected by several + security issues such as CVE-2020-12825 which will never be + fixed as libcroco has been archived. + +config BR2_PACKAGE_BELLAGIO + bool "bellagio package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2011). + +config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY + bool "systemd-journal-gatewayd now in systemd-journal-remote" + select BR2_LEGACY + select BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + help + All system journal remote programs are now enabled using + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE. + +config BR2_TARGET_UBOOT_BOOT_SCRIPT + bool "u-boot script generation was moved" + select BR2_LEGACY + select BR2_PACKAGE_HOST_UBOOT_TOOLS + select BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + help + Migrated U-Boot script generation to uboot-tools + +# Note: BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE + string "The uboot script source string has been renamed" + depends on BR2_TARGET_UBOOT_BOOT_SCRIPT + help + Migrated U-Boot script generation to uboot-tools. + New option is named + BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE + +config BR2_TARGET_UBOOT_ENVIMAGE + bool "u-boot env generation was moved" + select BR2_LEGACY + select BR2_PACKAGE_HOST_UBOOT_TOOLS + select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools + +# Note: BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE + string "The uboot env image source string has been renamed" + depends on BR2_TARGET_UBOOT_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools. + New option is named + BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE + +# Note: BR2_TARGET_UBOOT_ENVIMAGE_SIZE is still referenced from +# package/uboot-tools/Config.in +config BR2_TARGET_UBOOT_ENVIMAGE_SIZE + string "The uboot env image size string has been renamed" + depends on BR2_TARGET_UBOOT_ENVIMAGE + help + Migrated U-Boot env generation to uboot-tools. + New option is named BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE + +config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT + bool "u-boot env generation was moved" + depends on BR2_TARGET_UBOOT_ENVIMAGE + select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT + help + Migrated U-Boot env generation to uboot-tools + +config BR2_PACKAGE_KISMET_CLIENT + bool "kismet client support was removed" + select BR2_LEGACY + help + Kismet client support was removed since version 2019-04-R1. + +config BR2_PACKAGE_KISMET_DRONE + bool "kismet drone support was removed" + select BR2_LEGACY + help + Kismet drone support was removed since version 2019-04-R1. + +config BR2_GCC_VERSION_7_X + bool "gcc 7.x support removed" + select BR2_LEGACY + help + Support for gcc version 7.x has been removed. The current + default version (9.x or later) has been selected instead. + +config BR2_PACKAGE_GST1_VALIDATE + bool "gst1-validate was moved to gst1-devtools" + select BR2_PACKAGE_GST1_DEVTOOLS + select BR2_LEGACY + help + This package has been removed, use gst1-devtools instead. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF + bool "gst1-plugins-bad yadif plugin was removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE + help + This plugin was removed with gst1-plugins-bad-1.18.0, the + same functionality has moved to gst1-plugins-good + deinterlace plugin (method=yadif). + +config BR2_PACKAGE_GQVIEW + bool "gqview package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2006). + +config BR2_PACKAGE_WESTON_IMX + bool "weston-imx package was removed" + select BR2_LEGACY + help + This package has been removed, use weston instead. + +config BR2_KERNEL_HEADERS_5_7 + bool "kernel headers version 5.7.x are no longer supported" + select BR2_LEGACY + help + Version 5.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_TINYHTTPD + bool "tinyhttpd package removed" + select BR2_LEGACY + help + The tinyhttpd package was removed as it is affected by + CVE-2002-1819 and is not maintained anymore (no release since + 2001). + +config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX + bool "X.org Enable AIGLX Extension" + select BR2_LEGACY + help + AIGLX Extension was removed in X.org X server version 1.19.0 + +config BR2_PACKAGE_AMD_CATALYST + bool "amd-catalyst" + select BR2_LEGACY + help + Current X.org server is incompatible with this driver. + +config BR2_PACKAGE_NVIDIA_TEGRA23 + bool "nvidia-tegra23 package removed" + select BR2_LEGACY + help + Current X.org server is incompatible with this driver. + +config BR2_GDB_VERSION_8_1 + bool "gdb 8.1.x has been removed" + select BR2_LEGACY + help + The 8.1.x version of gdb has been removed. Use a newer + version instead. + +comment "Legacy options removed in 2020.08" + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 + bool "toolchain-external-codesourcery-amd64 removed" + select BR2_LEGACY + help + The CodeSourcery toolchain for AMD64, in version 2016.11 was + dropped, due to it using a too old gcc 6.2.0 compiler which + caused issues compiling a number of recent packages + (e.g. Boost). CodeSourcery has stopped making newer versions + of this toolchain publicly available, so it was not possible + to update it. + +config BR2_KERNEL_HEADERS_5_6 + bool "kernel headers version 5.6.x are no longer supported" + select BR2_LEGACY + help + Version 5.6.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_5_5 + bool "kernel headers version 5.5.x are no longer supported" + select BR2_LEGACY + help + Version 5.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_BINUTILS_VERSION_2_31_X + bool "binutils version 2.31.1 support removed" + select BR2_LEGACY + help + Support for binutils version 2.31.1 has been removed. The + current default version (2.33.1 or later) has been selected + instead. + +config BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER + bool "kodi-peripheral-steamcontroller package was removed" + select BR2_LEGACY + help + This package is broken. + +comment "Legacy options removed in 2020.05" + +config BR2_PACKAGE_WIRINGPI + bool "wiringpi package removed" + select BR2_LEGACY + help + The author of wiringpi has deprecated the package, and + completely removed the git tree that was serving the + sources, with this message: + Please look for alternatives for wiringPi config BR2_PACKAGE_PYTHON_PYCRYPTO bool "python-pycrypto package removed" @@ -153,6 +374,79 @@ config BR2_PACKAGE_PYTHON_PYCRYPTO This package has been removed, use python-pycryptodomex instead. +config BR2_PACKAGE_MTDEV2TUIO + bool "mtdev2tuio package removed" + select BR2_LEGACY + help + The mtdev2tuio package was removed as it breaks the builds + every now and then and is not maintained upstream. + +config BR2_PACKAGE_EZXML + bool "ezxml package removed" + select BR2_LEGACY + help + The ezXML package was removed as it is affected by several + CVEs and is not maintained anymore (no release since 2006). + +config BR2_PACKAGE_COLLECTD_LVM + bool "lvm support in collectd was removed" + select BR2_LEGACY + help + collectd removed LVM plugin, liblvm2app has been deprecated + +config BR2_PACKAGE_PYTHON_PYASN + bool "duplicate python-pyasn1 package removed" + select BR2_LEGACY + select BR2_PACKAGE_PYTHON_PYASN1 + help + This package was a duplicate of python-pyasn1. + +config BR2_PACKAGE_PYTHON_PYASN_MODULES + bool "duplicate python-pyasn1-modules package removed" + select BR2_LEGACY + select BR2_PACKAGE_PYTHON_PYASN1_MODULES + help + This package was a duplicate of python-pyasn1-modules. + +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 + bool "duplicate QCA6174 firmware symbol removed" + select BR2_LEGACY + select BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 + help + This config symbol duplicates existing symbol for QCA6174 + firmware. + +config BR2_PACKAGE_QT5CANVAS3D + bool "qt5canvas3d was removed" + select BR2_LEGACY + help + This Qt5 module was removed by the upstream Qt project since + Qt 5.13, so the corresponding Buildroot package was removed + as well. + +config BR2_PACKAGE_KODI_LIBTHEORA + bool "libtheora support in Kodi was removed" + select BR2_LEGACY + help + Kodi does not need libtheora + +config BR2_PACKAGE_CEGUI06 + bool "BR2_PACKAGE_CEGUI06 was renamed" + select BR2_PACKAGE_CEGUI + select BR2_LEGACY + help + The BR2_PACKAGE_CEGUI06 config symbol was renamed to + BR2_PACKAGE_CEGUI. + +config BR2_GCC_VERSION_5_X + bool "gcc 5.x support removed" + select BR2_LEGACY + help + Support for gcc version 5.x has been removed. The current + default version (8.x or later) has been selected instead. + +comment "Legacy options removed in 2020.02" + config BR2_PACKAGE_JAMVM bool "jamvm removed" select BR2_LEGACY @@ -759,12 +1053,6 @@ config BR2_PACKAGE_PYTHON_PYQT The python-pyqt package was removed. Consider python-pyqt5 instead. -config BR2_PACKAGE_GNURADIO_QTGUI - bool "gnuradio gr-qtgui option removed" - select BR2_LEGACY - help - The gr-qtgui option was removed. - config BR2_PACKAGE_LUACRYPTO bool "luacrypto package removed" select BR2_LEGACY @@ -969,13 +1257,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT BR2_PACKAGE_DOCKER_CLI_STATIC, following the package split of docker-engine and docker-cli. -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "Modular X.org server was updated to version 1.20.0" - select BR2_LEGACY - select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - help - Modular X.org server was updated to version 1.20.0 - config BR2_PACKAGE_XPROTO_APPLEWMPROTO bool "xproto-applewmproto package replaced by xorgproto" select BR2_LEGACY @@ -3665,1134 +3946,6 @@ config BR2_TARGET_UBOOT_NETWORK help U-Boot's custom network settings options have been removed. -############################################################################### -comment "Legacy options removed in 2015.05" - -config BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K - bool "jffs2 16kB erasesize NAND flash option renamed" - select BR2_LEGACY - select BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K - help - The JFFS2 NAND flash options now longer include the page - size. - -config BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K - bool "jffs2 128kB erasesize NAND flash option renamed" - select BR2_LEGACY - select BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K - help - The JFFS2 NAND flash options now longer include the page - size. - -config BR2_PACKAGE_MONO_20 - bool "2.0/3.5 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_PACKAGE_MONO_40 - bool "4.0 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_PACKAGE_MONO_45 - bool "4.5 .Net Runtime" - select BR2_LEGACY - help - This option no longer exists, all versions of the .Net - runtime are now installed. - -config BR2_CIVETWEB_WITH_LUA - bool "civetweb lua option renamed" - select BR2_LEGACY - select BR2_PACKAGE_CIVETWEB_WITH_LUA - help - civetweb's lua option has been renamed to - BR2_PACKAGE_CIVETWEB_WITH_LUA to be aligned with how other - packages name options. - -config BR2_PACKAGE_TIFF_TIFF2PDF - bool "tiff utility-specific option removed" - select BR2_LEGACY - select BR2_PACKAGE_TIFF_UTILITIES - help - utility-specific options have been removed in favour of - the new option BR2_PACKAGE_TIFF_UTILITIES. - -config BR2_PACKAGE_TIFF_TIFFCP - bool "tiff utility-specific option removed" - select BR2_LEGACY - select BR2_PACKAGE_TIFF_UTILITIES - help - utility-specific options have been removed in favour of - the new option BR2_PACKAGE_TIFF_UTILITIES. - -config BR2_LINUX_KERNEL_EXT_RTAI_PATCH - bool "RTAI patch file path has been removed" - select BR2_LEGACY - help - This option has never worked, so it has been removed. - -config BR2_TARGET_GENERIC_PASSWD_DES - bool "Encoding passwords with DES has been removed" - select BR2_LEGACY - help - Paswords can now only be encoded with either of md5, sha256 or - sha512. The default is md5, which is stronger that DES (but - still pretty weak). - -config BR2_PACKAGE_GTK2_THEME_HICOLOR - bool "hicolor (default theme) is a duplicate" - select BR2_LEGACY - select BR2_PACKAGE_HICOLOR_ICON_THEME - help - The option was just a duplicate of hicolor icon theme. - -config BR2_PACKAGE_VALGRIND_PTRCHECK - bool "valgrind's PTRCheck was renamed to SGCheck" - select BR2_LEGACY - select BR2_PACKAGE_VALGRIND_SGCHECK - help - PTRCheck was renamed to SGCheck in valgrind - -############################################################################### -comment "Legacy options removed in 2015.02" - -config BR2_PACKAGE_LIBGC - bool "libgc package removed" - select BR2_LEGACY - select BR2_PACKAGE_BDWGC - help - libgc has been removed because we have the same package under - a different name, bdwgc. - -config BR2_PACKAGE_WDCTL - bool "util-linux' wdctl option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_UTIL_LINUX_WDCTL - help - util-linux' wdctl option has been renamed to - BR2_PACKAGE_UTIL_LINUX_WDCTL to be aligned with how the other - options are named. - -config BR2_PACKAGE_UTIL_LINUX_ARCH - bool "util-linux' arch option has been removed" - select BR2_LEGACY - help - util-linux' arch was dropped in util-linux 2.23, in favor of - the coreutils version. - -config BR2_PACKAGE_UTIL_LINUX_DDATE - bool "util-linux' ddate option has been removed" - select BR2_LEGACY - help - util-linux' ddate was dropped in util-linux 2.23. - -config BR2_PACKAGE_RPM_BZIP2_PAYLOADS - bool "rpm's bzip2 payloads option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_BZIP2 - help - The bzip2 payloads option rely entirely on the dependant - package bzip2. So, you need to select it to enable this - feature. - -config BR2_PACKAGE_RPM_XZ_PAYLOADS - bool "rpm's xz payloads option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_XZ - help - The xz payloads option rely entirely on the dependant package - xz. So, you need to select it to enable this feature. - -config BR2_PACKAGE_M4 - bool "m4 target package removed" - select BR2_LEGACY - help - The m4 target package has been removed, it's been - deprecated for some time now. - -config BR2_PACKAGE_FLEX_BINARY - bool "flex binary in target option removed" - select BR2_LEGACY - help - The flex binary in the target option has been removed. - It's been deprecated for some time now and is essentially a - development tool which isn't very useful in the target. - -config BR2_PACKAGE_BISON - bool "bison target package removed" - select BR2_LEGACY - help - The bison target package has been removed, it's been - deprecated for some time now and is essentially a development - tool which isn't very useful in the target. - -config BR2_PACKAGE_GOB2 - bool "gob2 target package removed" - select BR2_LEGACY - help - The gob2 target package has been removed, it's been - deprecated for some time now and was essentially useless - without a target toolchain. - -config BR2_PACKAGE_DISTCC - bool "distcc target package removed" - select BR2_LEGACY - help - The distcc target package has been removed, it's been - deprecated for some time now and was essentially useless - without a target toolchain. - -config BR2_PACKAGE_HASERL_VERSION_0_8_X - bool "haserl 0.8.x version removed" - select BR2_LEGACY - help - The 0.8.x version option for haserl has been removed since it - has been deprecated for some time now. - You should be able to use the 0.9.x version without issues. - -config BR2_PACKAGE_STRONGSWAN_TOOLS - bool "strongswan option has been removed" - select BR2_LEGACY - select BR2_PACKAGE_STRONGSWAN_PKI - select BR2_PACKAGE_STRONGSWAN_SCEP - help - The tools option has been removed upstream and the different - tools have been split between the pki and scep options, with - others deprecated. - -config BR2_PACKAGE_XBMC_ADDON_XVDR - bool "xbmc-addon-xvdr removed" - select BR2_LEGACY - help - According to the github project page: - https://github.com/pipelka/xbmc-addon-xvdr - this package is discontinued. - -config BR2_PACKAGE_XBMC_PVR_ADDONS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_PVR_ADDONS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_ALSA_LIB - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_ALSA_LIB - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_AVAHI - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_AVAHI - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_DBUS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_DBUS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBBLURAY - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBBLURAY - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_GOOM - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_GOOM - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_RSXS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_RSXS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBCEC - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBCEC - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBMICROHTTPD - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBMICROHTTPD - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBNFS - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBNFS - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_RTMPDUMP - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_RTMPDUMP - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBSHAIRPLAY - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBSHAIRPLAY - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBSMBCLIENT - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBSMBCLIENT - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBTHEORA - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBTHEORA - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBUSB - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBUSB - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_LIBVA - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_LIBVA - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PACKAGE_XBMC_WAVPACK - bool "xbmc options have been renamed" - select BR2_LEGACY - select BR2_PACKAGE_KODI_WAVPACK - help - The XBMC media center project was renamed to Kodi - entertainment center - -config BR2_PREFER_STATIC_LIB - bool "static library option renamed" - select BR2_LEGACY - help - The BR2_PREFER_STATIC_LIB was renamed to BR2_STATIC_LIBS. It - highlights the fact that the option no longer "prefers" - static libraries, but "enforces" static libraries (i.e - shared libraries are completely unused). - - Take care of updating the type of libraries you want under the - "Build options" menu. - -############################################################################### -comment "Legacy options removed in 2014.11" - -config BR2_x86_generic - bool "x86 generic variant has been removed" - select BR2_LEGACY - help - The generic x86 CPU variant has been removed. Use another - CPU variant instead. - -config BR2_GCC_VERSION_4_4_X - bool "gcc 4.4.x has been removed" - select BR2_LEGACY - help - The 4.4.x version of gcc has been removed. Use a newer - version instead. - -config BR2_sparc_sparchfleon - bool "sparchfleon CPU has been removed" - select BR2_LEGACY - help - The sparchfleon CPU was only supported in a patched gcc 4.4 - version. Its support has been removed in favor of the leon3 - CPU starting from gcc 4.8.x. - -config BR2_sparc_sparchfleonv8 - bool "sparchfleonv8 CPU has been removed" - select BR2_LEGACY - help - The sparchfleonv8 CPU was only supported in a patched gcc - 4.4 version. Its support has been removed in favor of the - leon3 CPU starting from gcc 4.8.x. - -config BR2_sparc_sparcsfleon - bool "sparcsfleon CPU has been removed" - select BR2_LEGACY - help - The sparcsfleon CPU was only supported in a patched gcc 4.4 - version. Its support has been removed in favor of the leon3 - CPU starting from gcc 4.8.x. - -config BR2_sparc_sparcsfleonv8 - bool "sparcsfleonv8 CPU has been removed" - select BR2_LEGACY - help - The sparcsfleonv8 CPU was only supported in a patched gcc - 4.4 version. Its support has been removed in favor of the - leon3 CPU starting from gcc 4.8.x. - -config BR2_PACKAGE_XLIB_LIBPCIACCESS - bool "xlib-libpciaccess option has been renamed" - depends on BR2_PACKAGE_XORG7 - select BR2_LEGACY - select BR2_PACKAGE_LIBPCIACCESS - help - libpciaccess neither depends on X11 nor Xlib. Thus the - package has been renamed BR2_PACKAGE_LIBPCIACCESS - -config BR2_PACKAGE_LINUX_FIRMWARE_XC5000 - bool "Xceive xc5000 option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_LINUX_FIRMWARE_XCx000 - help - The Xceive xc5000 option now also handles older firmwares from - Xceive (the xc4000 series), as well as new firmwares (the - xc5000c) from Cresta, who bought Xceive. - -config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 - bool "Chelsio T4 option has been renamed" - select BR2_LEGACY - select BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 - help - The Chelsio T4 option BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 - has been renamed to BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 - to better account for the fact that a T5 variant exists. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 - bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed" - select BR2_LEGACY - help - The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 was - renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7. You must - select it in: - Target packages -> Hardware handling -> - Firmware -> linux-firmware -> WiFi firmware -> - iwlwifi 3160/726x revision to use (revision 7) - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 - bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 has been renamed" - select BR2_LEGACY - help - The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 was - renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8. You must - select it in: - Target packages -> Hardware handling -> - Firmware -> linux-firmware -> WiFi firmware -> - iwlwifi 3160/726x revision to use (revision 8) - -############################################################################### -comment "Legacy options removed in 2014.08" - -config BR2_PACKAGE_LIBELF - bool "libelf has been removed" - select BR2_PACKAGE_ELFUTILS - select BR2_LEGACY - help - The libelf package provided an old version of the libelf - library and is deprecated. The libelf library is now provided - by the elfutils package. - -config BR2_KERNEL_HEADERS_3_8 - bool "kernel headers version 3.8.x are no longer supported" - select BR2_LEGACY - help - Version 3.8.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_PACKAGE_GETTEXT_TOOLS - bool "support for gettext-tools on target has been removed" - select BR2_LEGACY - help - The option to install the gettext utilities on the target - has been removed. This is not necessary as Buildroot is not - designed to provide a full development environment on the - target. gettext tools should be used on the build machine - instead. - -config BR2_PACKAGE_PROCPS - bool "procps has been replaced by procps-ng" - select BR2_PACKAGE_PROCPS_NG - select BR2_LEGACY - help - The procps package has been replaced by the equivalent - procps-ng. - -config BR2_BINUTILS_VERSION_2_20_1 - bool "binutils 2.20.1 has been removed" - select BR2_LEGACY - help - The 2.20.1 version of binutils has been removed. Use a newer - version instead. - -config BR2_BINUTILS_VERSION_2_21 - bool "binutils 2.21 has been removed" - select BR2_LEGACY - help - The 2.21 version of binutils has been removed. Use a newer - version instead. - -config BR2_BINUTILS_VERSION_2_23_1 - bool "binutils 2.23.1 has been removed" - select BR2_LEGACY - help - The 2.23.1 version of binutils has been removed. Use a newer - version instead. - -config BR2_UCLIBC_VERSION_0_9_32 - bool "uclibc 0.9.32 has been removed" - select BR2_LEGACY - help - The 0.9.32 version of uClibc has been removed. Use a newer - version instead. - -config BR2_GCC_VERSION_4_3_X - bool "gcc 4.3.x has been removed" - select BR2_LEGACY - help - The 4.3.x version of gcc has been removed. Use a newer - version instead. - -config BR2_GCC_VERSION_4_6_X - bool "gcc 4.6.x has been removed" - select BR2_LEGACY - help - The 4.6.x version of gcc has been removed. Use a newer - version instead. - -config BR2_GDB_VERSION_7_4 - bool "gdb 7.4 has been removed" - select BR2_LEGACY - help - The 7.4 version of gdb has been removed. Use a newer version - instead. - -config BR2_GDB_VERSION_7_5 - bool "gdb 7.5 has been removed" - select BR2_LEGACY - help - The 7.5 version of gdb has been removed. Use a newer version - instead. - -config BR2_BUSYBOX_VERSION_1_19_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_BUSYBOX_VERSION_1_20_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_BUSYBOX_VERSION_1_21_X - bool "busybox version selection has been removed" - select BR2_LEGACY - help - The possibility of selecting the Busybox version has been - removed. Use the latest version provided by the Busybox - package instead. - -config BR2_PACKAGE_LIBV4L_DECODE_TM6000 - bool "decode_tm6000" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_IR_KEYTABLE - bool "ir-keytable" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE - bool "v4l2-compliance" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_CTL - bool "v4l2-ctl" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -config BR2_PACKAGE_LIBV4L_V4L2_DBG - bool "v4l2-dbg" - select BR2_PACKAGE_LIBV4L_UTILS - select BR2_LEGACY - help - This libv4l option has been deprecated and replaced by a - single option to build all the libv4l utilities. - -############################################################################### -comment "Legacy options removed in 2014.05" - -config BR2_PACKAGE_EVTEST_CAPTURE - bool "evtest-capture support removed (dropped since evtest 1.31)" - select BR2_LEGACY - help - Support for evtest-capture has been removed (dropped from - evtest package since version 1.31), use evemu package - instead. - -config BR2_KERNEL_HEADERS_3_6 - bool "kernel headers version 3.6.x are no longer supported" - select BR2_LEGACY - help - Version 3.6.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_7 - bool "kernel headers version 3.7.x are no longer supported" - select BR2_LEGACY - help - Version 3.7.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_PACKAGE_VALA - bool "vala target package has been removed" - select BR2_LEGACY - help - The 'vala' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: the host vala package still exists. - -config BR2_TARGET_TZ_ZONELIST - default BR2_PACKAGE_TZDATA_ZONELIST if BR2_PACKAGE_TZDATA_ZONELIST != "" - -config BR2_PACKAGE_TZDATA_ZONELIST - string "tzdata: the timezone list option has been renamed" - help - The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to - BR2_TARGET_TZ_ZONELIST, and moved to the "System - configuration" menu. You'll need to select BR2_TARGET_TZ_INFO. - -config BR2_PACKAGE_TZDATA_ZONELIST_WRAP - bool - default y if BR2_PACKAGE_TZDATA_ZONELIST != "" - select BR2_LEGACY - -config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE - bool "Lua command-line editing none has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been - renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to - select it in the corresponding choice. - -config BR2_PACKAGE_LUA_INTERPRETER_READLINE - bool "Lua command-line editing using readline has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_READLINE option has been - renamed to BR2_PACKAGE_LUA_READLINE. You will have to select - it in the corresponding choice. - -config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE - bool "Lua command-line editing using linenoise has been renamed" - select BR2_LEGACY - help - The BR2_PACKAGE_LUA_INTERPRETER_LINENOISE option has been - renamed to BR2_PACKAGE_LUA_LINENOISE. You will have to select - it in the corresponding choice. - -config BR2_PACKAGE_DVB_APPS_UTILS - bool "dvb-apps utilities now built by default" - select BR2_LEGACY - help - The dvb-apps utilities are now always built when the dvb-apps - package is selected. - -config BR2_KERNEL_HEADERS_SNAP - bool "Local Linux snapshot support removed" - select BR2_LEGACY - help - Support for using a custom snapshot to install the Linux - kernel headers has been removed. - -config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV - bool "/dev management by udev removed" - select BR2_LEGACY - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - Therefore, if you are not using 'systemd' as init system, you - must choose 'Dynamic using eudev' in the '/dev management' - menu to get the same behaviour as in your old configuration. - - If you are using 'systemd', its internal implementation of - 'udev' will be used automatically. - - You must also check the packages depending on 'udev' are still - selected. - -config BR2_PACKAGE_UDEV - bool "udev is now a virtual package" - select BR2_LEGACY - select BR2_PACKAGE_HAS_UDEV - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - Your old configuration refers to packages depending on 'udev', - either for build or at runtime. - - Check that a 'udev' provider is selected. If you are not using - 'systemd' as init system, 'eudev' should be selected, which is - the case if '/dev management' is set to 'Dynamic using eudev'. - - If you are using 'systemd', its internal implementation of - 'udev' is used. - -config BR2_PACKAGE_UDEV_RULES_GEN - bool "udev rules generation handled by provider" - select BR2_LEGACY - select BR2_PACKAGE_EUDEV if !BR2_INIT_SYSTEMD - select BR2_PACKAGE_EUDEV_RULES_GEN if !BR2_INIT_SYSTEMD - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - If you are not using 'systemd' as init system, udev rules - generation will be handled by 'eudev'. Check that - '/dev management' is set to 'Dynamic using eudev' to get - the same behaviour as in your old configuration. - - If you are using 'systemd', it internal implementation of - 'udev' will generate the rules. - -config BR2_PACKAGE_UDEV_ALL_EXTRAS - bool "udev extras removed" - select BR2_LEGACY - help - The 'udev' package has been converted to a virtual package. - The providers for this feature are: 'eudev', 'systemd'. - - The option to enable the extra features of 'udev' (gudev, ...) - has been removed. These features are automatically enabled in - the 'udev' providers if the dependencies are selected. For - example, selecting 'libglib2' will trigger the build of gudev. - -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - bool "xlib-libpthread-stubs option has been renamed" - depends on BR2_PACKAGE_XORG7 - select BR2_LEGACY - select BR2_PACKAGE_LIBPTHREAD_STUBS - help - The pthread stubs neither depend on X11 nor Xlib. Thus the - package has been renamed BR2_PACKAGE_LIBPTHREAD_STUBS - -############################################################################### -comment "Legacy options removed in 2014.02" - -config BR2_sh2 - bool "sh2 support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH2 architecture was removed. - -config BR2_sh3 - bool "sh3 support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH3 architecture was removed. - -config BR2_sh3eb - bool "sh3eb support removed" - select BR2_LEGACY - help - Due to an inexistent user base and generally poor Linux - support, the support for the SH3eb architecture was removed. - -config BR2_KERNEL_HEADERS_3_1 - bool "kernel headers version 3.1.x are no longer supported" - select BR2_LEGACY - help - Version 3.1.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_3 - bool "kernel headers version 3.3.x are no longer supported" - select BR2_LEGACY - help - Version 3.3.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_KERNEL_HEADERS_3_5 - bool "kernel headers version 3.5.x are no longer supported" - select BR2_LEGACY - help - Version 3.5.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - -config BR2_GDB_VERSION_7_2 - bool "gdb 7.2.x is no longer supported" - select BR2_GDB_VERSION_7_6 - select BR2_LEGACY - help - Version 7.2.x of gdb has been deprecated for more than four - buildroot releases and is now removed. As an alternative, gdb - 7.5.x has been automatically selected in your configuration. - -config BR2_GDB_VERSION_7_3 - bool "gdb 7.3.x is no longer supported" - select BR2_GDB_VERSION_7_6 - select BR2_LEGACY - help - Version 7.3.x of gdb has been deprecated for more than four - buildroot releases and is now removed. As an alternative, gdb - 7.5.x has been automatically selected in your configuration. - -config BR2_PACKAGE_CCACHE - bool "ccache target package has been removed" - select BR2_LEGACY - help - The 'ccache' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: using ccache for speeding up builds is still supported. - -config BR2_HAVE_DOCUMENTATION - bool "support for documentation on target has been removed" - select BR2_LEGACY - help - Support for documentation on target has been removed since it - has been deprecated for more than four buildroot releases. - -config BR2_PACKAGE_AUTOMAKE - bool "automake target package has been removed" - select BR2_LEGACY - help - The 'automake' target package has been removed since it has - been deprecated for more than four buildroot releases. - Note: the host automake still exists. - -config BR2_PACKAGE_AUTOCONF - bool "autoconf target package has been removed" - select BR2_LEGACY - help - The 'autoconf' target package has been removed since it has - been deprecated for more than four buildroot releases. - Note: the host autoconf still exists. - -config BR2_PACKAGE_XSTROKE - bool "xstroke has been removed" - select BR2_LEGACY - help - The 'xstroke' package has been removed since it has been - deprecated for more than four buildroot releases. - -config BR2_PACKAGE_LZMA - bool "lzma target package has been removed" - select BR2_LEGACY - help - The 'lzma' target package has been removed since it has been - deprecated for more than four buildroot releases. - Note: generating lzma-compressed rootfs images is still - supported. - -config BR2_PACKAGE_TTCP - bool "ttcp has been removed" - select BR2_LEGACY - help - The 'ttcp' package has been removed since it has been - deprecated for more than four buildroot releases. - -config BR2_PACKAGE_LIBNFC_LLCP - bool "libnfc-llcp has been replaced by libllcp" - select BR2_LEGACY - select BR2_PACKAGE_LIBLLCP - help - The 'libnfc-llcp' package has been removed since upstream - renamed to 'libllcp'. We have added a new package for - 'libllcp' and bumped the version at the same time. - -config BR2_PACKAGE_MYSQL_CLIENT - bool "MySQL client renamed to MySQL" - select BR2_LEGACY - select BR2_PACKAGE_MYSQL - help - The option has been renamed BR2_PACKAGE_MYSQL - -config BR2_PACKAGE_SQUASHFS3 - bool "squashfs3 has been removed" - select BR2_LEGACY - select BR2_PACKAGE_SQUASHFS - help - The 'squashfs3' package has been removed since it has been - deprecated for more than four buildroot releases. Package - 'squashfs' (4) has been selected automatically as replacement. - -config BR2_TARGET_ROOTFS_SQUASHFS3 - bool "squashfs3 rootfs support has been removed" - select BR2_LEGACY - help - Together with the removal of the squashfs3 package, support - for squashfs3 root filesystems has been removed too. Squashfs - root filesystems will automatically use squashfs4 now. - -config BR2_PACKAGE_NETKITBASE - bool "netkitbase has been removed" - select BR2_LEGACY - help - The 'netkitbase' package has been removed since it has been - deprecated since 2012.11. This package provided 'inetd' - which is replaced by 'xinet' and 'ping' which is replaced by - 'busybox' or 'fping'. - -config BR2_PACKAGE_NETKITTELNET - bool "netkittelnet has been removed" - select BR2_LEGACY - help - The 'netkittelnet' package has been removed since it has - been deprecated since 2012.11. 'busybox' provides a telnet - client and should be used instead. - -config BR2_PACKAGE_LUASQL - bool "luasql has been replaced by luasql-sqlite3" - select BR2_PACKAGE_LUASQL_SQLITE3 - select BR2_LEGACY - help - The option has been renamed BR2_PACKAGE_LUASQL_SQLITE3. - -config BR2_PACKAGE_LUACJSON - bool "luacjson has been replaced by lua-cjson" - select BR2_PACKAGE_LUA_CJSON - select BR2_LEGACY - help - The option has been renamed BR2_PACKAGE_LUA_CJSON. - -############################################################################### -comment "Legacy options removed in 2013.11" - -config BR2_PACKAGE_LVM2_DMSETUP_ONLY - bool "lvm2's 'dmsetup only' option removed" - select BR2_LEGACY - help - The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which - led to problems with other packages that need the full lvm2 - suite. Therefore, the option has been replaced with the - positive BR2_PACKAGE_LVM2_STANDARD_INSTALL option. - -# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in -# in order to automatically propagate old configs - -config BR2_PACKAGE_QT_JAVASCRIPTCORE - bool "qt javascriptcore option removed" - select BR2_LEGACY - help - The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to - force the activation or disabling of the JIT compiler in the - Qt Javascript interpreter. However, the JIT compiler is not - available for all architectures, so forcing its activation - does not always work. Moreover, Qt knows by itself for which - architectures JIT support is possible, and will - automatically enable it if possible. - - Therefore, this option was in fact useless, and causing - build problems when enabled on architectures for which the - JIT support was not available. It has been removed, and - there is no replacement: Qt will enable JIT at compile time - when possible. - -config BR2_PACKAGE_MODULE_INIT_TOOLS - bool "module-init-tools replaced by kmod" - select BR2_PACKAGE_KMOD - select BR2_PACKAGE_KMOD_TOOLS - select BR2_LEGACY - help - The 'module-init-tools' package has been removed, since it - has been depracated upstream and replaced by 'kmod'. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL - string "u-boot: the git repository URL option has been renamed" - help - The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has - been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_URL. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP - bool - default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" - select BR2_LEGACY - -# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from -# boot/uboot/Config.in - -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION - string "u-boot: the git repository version option has been renamed" - help - The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has - been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION. - -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP - bool - default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" - select BR2_LEGACY - -# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from -# boot/uboot/Config.in - -config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL - string "linux: the git repository URL option has been renamed" - help - The option BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL has - been renamed to - BR2_LINUX_KERNEL_CUSTOM_REPO_URL. - -config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP - bool - default y if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != "" - select BR2_LEGACY - -# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL is still referenced from -# linux/Config.in - -config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION - string "linux: the git repository version option has been renamed" - help - The option BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION has - been renamed to - BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION. - -config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION_WRAP - bool - default y if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != "" - select BR2_LEGACY - -# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION is still referenced from -# linux/Config.in - -############################################################################### -comment "Legacy options removed in 2013.08" - -config BR2_ARM_OABI - bool "ARM OABI support has been removed" - select BR2_LEGACY - help - The support for the ARM OABI was deprecated since a while, - and has been removed completely from Buildroot. It is also - deprecated in upstream gcc, since gcc 4.7. People should - switch to EABI instead, which should not be a problem as - long as you don't have pre-built OABI binaries in your - system that you can't recompile. - -config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK - bool "dosfstools dosfsck renamed to fsck.fat" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT - help - dosfsck was renamed upstream to fsck.fat for consistency. - -config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL - bool "dosfstools dosfslabel renamed to fatlabel" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_FATLABEL - help - doslabel was renamed upstream to fatlabel for consistency. - -config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS - bool "dosfstools mkdosfs renamed to mkfs.fat" - select BR2_LEGACY - select BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT - help - mkdosfs was renamed upstream to mkfs.fat for consistency. - -config BR2_ELF2FLT - bool "the elf2flt option has been renamed" - select BR2_LEGACY - help - The BR2_ELF2FLT option has been renamed to - BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to - the package infrastructure. - -config BR2_VFP_FLOAT - bool "the ARM VFP floating point option has been renamed" - select BR2_LEGACY - help - Due to a major refactoring of the floating-point handling of - the ARM architecture support, the BR2_VFP_FLOAT option has - been replaced with a choice of options that allows to select - between various VFP versions/capabilities. - -config BR2_PACKAGE_GCC_TARGET - bool "gcc on the target filesystem has been removed" - select BR2_LEGACY - help - The support for gcc in the target filesystem was deprecated - since a while, and has been removed completely from Buildroot. - See Buildroot's documentation for more explanations. - -config BR2_HAVE_DEVFILES - bool "development files in target filesystem has been removed" - select BR2_LEGACY - help - The installation of the development files in the target - filesystem was deprecated since a while, and has been removed - completely from Buildroot. - See Buildroot's documentation for more explanations. - endmenu endif # !SKIP_LEGACY diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 5abdb916a..43cc1b55a 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -26,73 +26,18 @@ # infrastructure, and will be CC'ed on all patches that add or # modify packages that use this infrastructure. -N: Adam Duskett -F: package/audit/ -F: package/busybox/ -F: package/checkpolicy/ -F: package/cppdb/ -F: package/gstreamer1/gstreamer1/ -F: package/gstreamer1/gstreamer1-mm/ -F: package/gstreamer1/gst1-plugins-bad/ -F: package/gstreamer1/gst1-plugins-base/ -F: package/gstreamer1/gst1-plugins-good/ -F: package/gstreamer1/gst1-plugins-ugly/ -F: package/gstreamer1/gst1-vaapi/ -F: package/imx-usb-loader/ -F: package/janus-gateway/ -F: package/json-for-modern-cpp/ -F: package/libcpprestsdk/ -F: package/libressl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libwebsockets/ -F: package/mender-grubenv/ -F: package/nginx-naxsi/ -F: package/openjdk/ -F: package/openjdk-bin/ -F: package/php/ -F: package/policycoreutils/ -F: package/polkit/ -F: package/python3/ -F: package/python-aioredis/ -F: package/python-asgiref/ -F: package/python-channels/ -F: package/python-channels-redis/ -F: package/python-daphne/ -F: package/python-django-enumfields/ -F: package/python-flask-sqlalchemy/ -F: package/python-gitdb2/ -F: package/python-lockfile/ -F: package/python-mutagen/ -F: package/python-nested-dict/ -F: package/python-pbr/ -F: package/python-pip/ -F: package/python-psycopg2/ -F: package/python-smmap2/ -F: package/python-sqlalchemy/ -F: package/python-sqlparse/ -F: package/python-visitor/ -F: package/restorecond/ -F: package/refpolicy/ -F: package/selinux-python/ -F: package/semodule-utils/ -F: package/setools/ -F: package/sngrep/ -F: package/spidermonkey/ -F: package/systemd/ -F: support/testing/tests/package/test_python_gobject.py - N: Adam Heinrich F: package/jack1/ N: Adrian Perez de Castro F: package/brotli/ F: package/bubblewrap/ +F: package/cage/ F: package/cog/ F: package/libepoxy/ F: package/libwpe/ F: package/webkitgtk/ +F: package/wlroots/ F: package/woff2/ F: package/wpebackend-fdo/ F: package/wpewebkit/ @@ -102,6 +47,10 @@ N: Adrien Gallouët F: package/bird/ F: package/glorytun/ +N: Alejandro González +F: package/qprint/ +F: package/watchdog/ + N: Aleksander Morgado F: package/libmbim/ F: package/libqmi/ @@ -123,12 +72,25 @@ F: package/fastd/ F: package/libuecc/ F: package/putty/ +N: Alexander Egorenkov +F: package/makedumpfile/ +F: package/multipath-tools/ + +N: Alexander Egorenkov +F: arch/Config.in.s390x +F: board/qemu/s390x/ +F: configs/qemu_s390x_defconfig +F: package/s390-tools/ + N: Alexander Kurz F: package/minimodem/ N: Alexander Lukichev F: package/openpgm/ +N: Alexander Mukhin +F: package/tinyproxy/ + N: Alexander Sverdlin F: package/mini-snmpd/ @@ -185,13 +147,16 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: package/apparmor/ F: package/corkscrew/ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ +F: package/libapparmor/ F: package/libb64/ F: package/mender/ F: package/mender-artifact/ @@ -221,6 +186,10 @@ N: Antoine Ténart F: package/libselinux/ F: package/refpolicy/ F: package/wf111/ +F: support/testing/tests/core/test_selinux/ +F: support/testing/tests/core/test_selinux.py +F: support/testing/tests/init/test_systemd_selinux/ +F: support/testing/tests/init/test_systemd_selinux.py N: Antony Pavlov F: package/lsscsi/ @@ -259,6 +228,7 @@ F: configs/raspberrypi4_64_defconfig N: Asaf Kahlon F: package/collectd/ +F: package/libfuse3/ F: package/libuv/ F: package/python* F: package/snmpclitools/ @@ -280,9 +250,15 @@ F: package/luasec/ F: package/lua-ev/ F: package/orbit/ +N: Attila Wagner +F: package/python-canopen/ + N: Bartosz Bilas +F: board/stmicroelectronics/stm32mp157a-dk1/ +F: configs/stm32mp157a_dk1_defconfig F: package/python-esptool/ F: package/python-pyaes/ +F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ @@ -395,6 +371,7 @@ F: package/libsndfile/ F: package/libsoil/ F: package/libsoundtouch/ F: package/libsquish/ +F: package/libudfread/ F: package/liburiparser/ F: package/libva/ F: package/libva-intel-driver/ @@ -469,11 +446,16 @@ F: package/x264/ F: package/x265/ F: package/ytree/ F: package/znc/ +F: support/testing/tests/package/test_perl_html_parser.py N: Biagio Montaruli F: board/acmesystems/ F: configs/acmesystems_* +N: Bilal Wasim +F: board/chromebook/elm/ +F: configs/chromebook_elm_defconfig + N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ @@ -525,7 +507,9 @@ F: package/docker-cli/ F: package/docker-containerd/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/fuse-overlayfs/ F: package/go/ +F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk F: package/rtl8821au/ @@ -601,6 +585,12 @@ N: Cyril Bur F: arch/Config.in.powerpc F: package/kvm-unit-tests +N: Dagg Stompler +F: board/hardkernel/odroidc2/ +F: configs/odroidc2_defconfig +F: package/meson-tools/ +F: package/odroidc2-firmware/ + N: Daniel J. Leach F: package/dacapo/ @@ -618,6 +608,10 @@ F: package/redis/ N: Daniel Sangue F: package/libftdi1/ +N: Danilo Bargen +F: board/pcengines/apu2/ +F: configs/pcengines_apu2_defconfig + N: Danomi Manchego F: package/cjson/ F: package/jq/ @@ -645,6 +639,9 @@ F: package/openldap/ N: David du Colombier <0intro@gmail.com> F: package/x264/ +N: David GOUARIN +F: package/librelp/ + N: David Lechner F: board/lego/ev3/ F: configs/lego_ev3_defconfig @@ -653,6 +650,8 @@ F: package/brickd/ F: package/ev3dev-linux-drivers/ N: Davide Viti +F: board/friendlyarm/nanopi-r1/ +F: configs/nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -661,6 +660,9 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ +N: Derrick Lyndon Pallas +F: package/ipcalc/ + N: Dimitrios Siganos F: package/wireless-regdb/ @@ -668,7 +670,7 @@ N: Dominik Faessler F: package/logsurfer/ F: package/python-id3/ -N: Doug Kehn +N: Doug Kehn F: package/nss-pam-ldapd/ F: package/sp-oops-extract/ F: package/unscd/ @@ -683,8 +685,6 @@ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ -F: package/cargo-bin/ -F: package/cargo/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ @@ -771,9 +771,11 @@ F: configs/imx6-sabre* F: configs/imx6slevk_defconfig F: configs/imx6sx-sdb_defconfig F: configs/imx6ulevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig F: configs/mx53loco_defconfig @@ -799,6 +801,9 @@ F: package/libmaxminddb/ F: package/openzwave/ N: Fabrice Fontaine +F: package/bearssl/ +F: package/belle-sip/ +F: package/belr/ F: package/boinc/ F: package/cairo/ F: package/duktape/ @@ -836,6 +841,7 @@ F: package/libmatroska/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ +F: package/libnpupnp/ F: package/liboping/ F: package/libpfm4/ F: package/libraw/ @@ -862,6 +868,7 @@ F: package/pcmanfm/ F: package/python-backcall/ F: package/python-jedi/ F: package/python-parso/ +F: package/python-yatl/ F: package/rocksdb/ F: package/rygel/ F: package/safeclib/ @@ -871,6 +878,10 @@ F: package/tinydtls/ F: package/tinymembench/ F: package/whois/ +N: Fabrice Goucem +F: board/freescale/imx6ullevk/ +F: configs/freescale_imx6ullevk_defconfig + N: Falco Hyfing F: package/python-pymodbus/ @@ -945,6 +956,9 @@ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ F: package/qt5/qt5webkit-examples/ +N: Gao Xiang +F: package/erofs-utils/ + N: Gary Bisson F: board/boundarydevices/ F: configs/nitrogen* @@ -1005,6 +1019,7 @@ N: Grzegorz Blach F: fs/f2fs/ F: package/bluez5_utils-headers/ F: package/f2fs-tools/ +F: package/graphicsmagick/ F: package/pigpio/ F: package/python-aioblescan/ F: package/python-bluezero/ @@ -1025,8 +1040,10 @@ F: package/c-icap-modules/ F: package/sdl2/ N: Guillaume William Brs +F: package/libnids/ F: package/liquid-dsp/ F: package/pixiewps/ +F: package/python-pybind/ F: package/reaver/ N: Guo Ren @@ -1036,6 +1053,9 @@ F: board/qemu/csky F: configs/csky_* F: configs/qemu_csky* +N: Gustavo Heinz +F: package/python-m2crypto/ + N: Gustavo Pimentel F: configs/arm_juno_defconfig F: board/arm/juno/ @@ -1046,14 +1066,20 @@ F: package/gqrx/ F: package/gr-osmosdr/ F: package/librtlsdr/ F: package/libusbgx/ +F: package/matio/ F: package/python-cheetah/ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +F: package/uhd/ N: Heiko Thiery +F: package/altera-stapl/ +F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/ +F: package/linuxptp/ +F: package/netopeer2/ F: package/sysrepo/ N: Henrique Camargo @@ -1064,6 +1090,10 @@ F: package/gauche/ F: package/gmrender-resurrect/ F: package/squeezelite/ +N: Horatiu Vultur +F: package/easyframes/ +F: package/mrp/ + N: Ian Haylock F: package/python-rpi-gpio/ @@ -1119,6 +1149,8 @@ F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig N: James Hilliard +F: package/apcupsd/ +F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ @@ -1140,15 +1172,20 @@ F: package/python-aiojobs/ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ +F: package/python-argon2-cffi/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-brotli/ +F: package/python-cbor2/ F: package/python-cchardet/ +F: package/python-flatbuffers/ F: package/python-frozenlist/ +F: package/python-greenlet/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-yarl/ @@ -1192,6 +1229,9 @@ F: package/quota/ N: Jason Pruitt F: package/librtlsdr/ +N: Jean Burgat +F: package/openfpgaloader/ + N: Jens Kleintje F: package/gcnano-binaries/ @@ -1218,10 +1258,24 @@ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ +N: Jianhui Zhao +F: package/libuhttpd/ +F: package/libuwsc/ +F: package/rtty/ + +N: Joachim Wiberg +F: configs/globalscale_espressobin_defconfig +F: board/globalscale/espressobin/ +F: package/mg/ +F: package/netcalc/ + N: Joao Pinto F: board/synopsys/vdk/ F: configs/snps_aarch64_vdk_defconfig +N: Jochen Baltes +F: package/altera-stapl + N: Joel Carlson F: package/c-capnproto/ F: package/capnproto/ @@ -1264,6 +1318,7 @@ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ F: package/nginx-dav-ext/ +F: package/vuejs/ N: John Stile F: package/dhcpcd/ @@ -1314,6 +1369,7 @@ N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ +F: package/earlyoom/ F: package/gconf/ F: package/libnss/ F: package/lld/ @@ -1324,13 +1380,20 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-cli/ +F: package/sentry-native/ +F: package/unclutter-xfixes/ N: Joshua Henderson F: package/qt5/qt5wayland/ N: Jugurtha BELKALEM +F: package/python-aiofiles/ +F: package/python-crayons/ F: package/python-cycler/ F: package/python-matplotlib/ +F: package/python-opcua-asyncio/ +F: package/python-piexif/ N: Juha Rantanen F: package/acsccid/ @@ -1362,15 +1425,18 @@ F: board/technologic/ts7680/ F: configs/ts7680_defconfig F: package/paho-mqtt-c -N: Julien Olivain +N: Julien Olivain +F: board/qmtech/zynq/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-pyalsa/ N: Julien Viard de Galbert F: package/dieharder/ @@ -1379,6 +1445,10 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kamel Bouhara +F: package/libodb-boost/ +F: package/libodb-mysql/ + N: Karoly Kasza F: package/irqbalance/ F: package/openvmtools/ @@ -1471,10 +1541,16 @@ F: support/legal-info/ N: Lucas De Marchi F: package/fswebcam/ +N: Lubomir Rintel +F: board/olpc/ +F: configs/olpc_xo1_defconfig +F: configs/olpc_xo175_defconfig + N: Ludovic Desroches F: board/atmel/ F: configs/at91* F: configs/atmel_* +F: configs/microchip_* F: package/fb-test-app/ F: package/python-json-schema-validator/ F: package/python-keyring/ @@ -1482,15 +1558,17 @@ F: package/python-simplejson/ F: package/python-versiontools/ F: package/wilc1000-firmware/ +N: Maeva Manuel +F: board/freescale/imx8qmmek/ +F: configs/freescale_imx8qmmek_defconfig +F: package/freescale-imx/imx-seco/ + N: Mahyar Koshkouei F: package/ffmpeg/ F: package/mpv/ F: package/rpi-firmware/ F: package/rpi-userland/ -N: Mamatha Inamdar -F: package/nvme/ - N: Manuel Vögele F: package/python-pyqt5/ F: package/python-requests-toolbelt/ @@ -1502,7 +1580,9 @@ F: package/ecryptfs-utils/ N: Marcin Niestroj F: board/grinn/ +F: board/orangepi/orangepi-zero-plus/ F: configs/grinn_* +F: configs/orangepi_zero_plus_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ @@ -1510,8 +1590,19 @@ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ F: package/murata-cyw-fw/ +F: package/netdata/ +F: package/python-ansicolors/ +F: package/python-iniconfig/ +F: package/python-intelhex/ +F: package/python-packaging/ +F: package/python-pluggy/ +F: package/python-pytest/ +F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_pytest.py +F: support/testing/tests/package/test_netdata.py +F: support/testing/tests/package/test_python_pytest.py N: Marcus Folkesson F: package/libostree/ @@ -1523,6 +1614,8 @@ F: utils/config F: utils/diffconfig N: Marek Belisko +F: board/friendlyarm/nanopi-neo4/ +F: configs/nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ @@ -1640,6 +1733,7 @@ F: package/protobuf-c/ F: package/protobuf/ F: package/python-bunch/ F: package/python-colorama/ +F: package/python-filelock/ F: package/python-flask-cors/ F: package/python-iptables/ F: package/python-ipy/ @@ -1647,6 +1741,7 @@ F: package/python-posix-ipc/ F: package/python-pycairo/ F: package/python-pypcap/ F: package/python-pyrex/ +F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ F: package/raptor/ @@ -1678,7 +1773,6 @@ F: package/python-crossbar/ F: package/python-lmdb/ F: package/python-mistune/ F: package/python-netaddr/ -F: package/python-pyasn-modules/ F: package/python-pygments/ F: package/python-pynacl/ F: package/python-pytrie/ @@ -1693,6 +1787,9 @@ F: package/python-wsaccel/ N: Max Filippov F: arch/Config.in.xtensa +N: Maxim Kochetkov +F: package/timescaledb/ + N: Maxime Hadjinlian F: package/babeld/ F: package/dante/ @@ -1732,6 +1829,13 @@ N: Michael Fischer F: package/gnuplot/ F: package/sdl2/ +N: Michael Nosthoff +F: package/grpc/ +F: package/gtest/ +F: package/libabseil-cpp/ +F: package/protobuf/ +F: package/re2/ + N: Michael Rommel F: package/knock/ F: package/python-crc16/ @@ -1745,6 +1849,8 @@ F: package/jasper/ F: package/libstrophe/ N: Michael Walle +F: board/kontron/smarc-sal28/ +F: configs/kontron_smarc_sal28_defconfig F: package/libavl/ N: Michał Łyszczek @@ -1770,6 +1876,9 @@ F: package/libfribidi/ N: Min Xu F: package/shadowsocks-libev/ +N: Mircea Gliga +F: package/mbuffer/ + N: Mirza Krak F: package/mender/ F: package/mender-artifact/ @@ -1788,6 +1897,7 @@ F: package/libgudev/ N: Naumann Andreas F: package/evemu/ F: package/libevdev/ +F: package/pkg-qmake.mk N: Nicola Di Lieto F: package/uacme/ @@ -1796,13 +1906,14 @@ N: Nicholas Sielicki F: board/intel/galileo/ F: configs/galileo_defconfig +N: Nicolas Carrier +F: package/php-xdebug/ + N: Nicolas Cavallari F: package/libgit2/ N: Nicolas Serafini F: package/exiv2/ -F: package/nvidia-tegra23/nvidia-tegra23-binaries/ -F: package/nvidia-tegra23/nvidia-tegra23-codecs/ F: package/ofono/ N: Nikolay Dimitrov @@ -1852,6 +1963,9 @@ F: package/openjpeg/ N: Olivier Singla F: package/shellinabox/ +N: Owen Walpole +F: package/parprouted/ + N: Parnell Springmeyer F: package/scrypt/ @@ -1950,17 +2064,22 @@ F: package/dillo/ F: package/edid-decode/ F: package/ell/ F: package/ghostscript-fonts/ +F: package/gstreamer1/gst1-devtools/ F: package/gstreamer1/gst1-interpipe/ -F: package/gstreamer1/gst1-validate/ F: package/gstreamer1/gstreamer1-editing-services/ F: package/iwd/ F: package/libevdev/ +F: package/libuev/ F: package/log4cplus/ F: package/postgresql/ +F: package/python-colorzero/ +F: package/python-gpiozero/ F: package/qt5/ F: package/quotatool/ F: package/racehound/ -F: package/wiringpi/ +F: package/redir/ +F: package/uredir/ +F: package/wayland-utils/ N: Peter Thompson F: package/sdl2_gfx/ @@ -1990,6 +2109,7 @@ N: Philipp Richter F: package/libtorrent-rasterbar/ N: Philippe Proulx +F: package/babeltrace2/ F: package/lttng-babeltrace/ F: package/lttng-libust/ F: package/lttng-modules/ @@ -1997,6 +2117,9 @@ F: package/lttng-tools/ F: package/python-ipython/ F: package/liburcu/ +N: Philippe Reynes +F: package/ibm-sw-tpm2/ + N: Pierre Crokaert F: board/hardkernel/odroidxu4/ F: configs/odroidxu4_defconfig @@ -2019,6 +2142,7 @@ F: package/libxml2/ F: package/mongoose/ F: package/mxml/ F: package/numactl/ +F: package/python-modbus-tk/ F: package/python-periphery/ F: package/raspi-gpio/ F: package/sbc/ @@ -2051,7 +2175,18 @@ N: Rahul Jain F: package/uhttpd/ F: package/ustream-ssl/ +N: Ramon Fried +F: package/bitwise/ + +N: Raphaël Mélotte +F: package/jbig2dec/ +F: package/python-boto3/ +F: package/python-botocore/ +F: package/python-jmespath/ +F: package/python-s3transfer/ + N: Refik Tuzakli +F: package/freescale-imx/ F: package/paho-mqtt-cpp/ N: Rémi Rérolle @@ -2136,6 +2271,7 @@ F: package/waffle/ F: package/xenomai/ F: package/zziplib/ F: support/testing/tests/package/test_glxinfo.py +F: support/testing/tests/package/test_openssh.py F: toolchain/ N: Roman Gorbenkov @@ -2145,17 +2281,12 @@ N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ F: package/miraclecast/ -F: package/python-pyasn/ F: package/python-pysnmp/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ +F: package/resiprocate/ F: package/websocketpp/ -N: Ryan Coe -F: package/inadyn/ -F: package/libite/ -F: package/mariadb/ - N: Ryan Wilkins F: package/biosdevname/ @@ -2169,7 +2300,6 @@ F: package/clapack/ F: package/cwiid/ F: package/flite/ F: package/nginx/ -F: package/opencv/ F: package/opencv3/ F: package/openobex/ F: package/pkg-cmake.mk @@ -2214,8 +2344,7 @@ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig -F: configs/solidrun_macchiatobin_mainline_defconfig -F: configs/solidrun_macchiatobin_marvell_defconfig +F: configs/solidrun_macchiatobin_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ @@ -2226,6 +2355,8 @@ N: Sergio Prado F: board/toradex/apalis-imx6/ F: configs/toradex_apalis_imx6_defconfig F: package/aoetools/ +F: package/asn1c/ +F: package/azure-iot-sdk-c/ F: package/curlpp/ F: package/daq/ F: package/libgdiplus/ @@ -2238,6 +2369,9 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ +N: Shyam Saini +F: package/cukinia/ + N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ @@ -2281,6 +2415,9 @@ F: package/libvpx/ F: package/mesa3d-demos/ F: package/ti-gfx/ +N: Stefan Ott +F: package/unbound/ + N: Stefan Sørensen F: package/cracklib/ F: package/libpwquality/ @@ -2291,7 +2428,10 @@ F: package/cache-calibrator/ F: package/gtest/ F: package/libhttpserver/ F: package/mtdev/ -F: package/mtdev2tuio/ + +N: Stephane Viau +F: board/freescale/imx8mnevk/ +F: configs/freescale_imx8mnevk_defconfig N: Steve Calfee F: package/python-pymysql/ @@ -2314,6 +2454,28 @@ N: Steven Noonan F: package/hwloc/ F: package/powertop/ +N: Suniel Mahesh +F: board/firefly/ +F: board/friendlyarm/nanopc-t4 +F: board/friendlyarm/nanopi-m4 +F: board/orangepi/orangepi-rk3399 +F: board/pine64/rockpro64 +F: board/radxa/rockpi-4 +F: board/radxa/rockpi-n8 +F: board/radxa/rockpi-n10 +F: configs/nanopc_t4_defconfig +F: configs/nanopi_m4_defconfig +F: configs/orangepi_rk3399_defconfig +F: configs/roc_pc_rk3399_defconfig +F: configs/rock_pi_4_defconfig +F: configs/rock_pi_n8_defconfig +F: configs/rock_pi_n10_defconfig +F: configs/rockpro64_defconfig +F: package/arm-gnu-a-toolchain/ + +N: Sven Fischer +F: package/qt5/qt5remoteobjects/ + N: Sven Haardiek F: package/lcdproc/ F: package/python-influxdb/ @@ -2343,21 +2505,32 @@ F: package/civetweb/ N: Thomas De Schampheleire F: docs/manual/ F: package/cereal/ +F: package/chartjs/ F: package/libtelnet/ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ F: package/perl-crypt-openssl-aes/ +F: package/perl-i18n/ +F: package/perl-locale-maketext-lexicon/ +F: package/perl-lwp-protocol-https/ F: package/perl-math-prime-util/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ +F: package/perl-mojolicious-plugin-authorization/ +F: package/perl-mojolicious-plugin-cspheader/ +F: package/perl-mojolicious-plugin-i18n/ +F: package/perl-mojolicious-plugin-securityheader/ +F: package/perl-mozilla-ca/ F: package/perl-net-snmp/ F: package/perl-net-ssh2/ F: package/perl-net-telnet/ +F: package/perl-path-class/ F: package/pigz/ F: package/xenomai/ F: support/scripts/size-stats +F: support/testing/tests/package/test_perl_lwp_protocol_https.py F: utils/size-stats-compare F: toolchain/ @@ -2421,6 +2594,7 @@ F: package/scons/ F: package/squashfs/ F: package/wayland/ F: package/weston/ +F: support/testing/tests/boot/test_syslinux.py F: toolchain/ N: Timo Ketola @@ -2433,8 +2607,9 @@ F: package/python-avro/ F: package/redis/ F: package/waf/ F: support/testing/tests/package/test_crudini.py +F: support/testing/tests/package/test_redis.py -N: Trent Piepho +N: Trent Piepho F: package/libp11/ N: Tudor Holton @@ -2446,6 +2621,7 @@ F: package/tstools/ N: Vadim Kochan F: package/brcm-patchram-plus/ +F: package/frr/ F: package/gettext-tiny/ F: package/tinyssh/ @@ -2466,6 +2642,8 @@ F: package/nss-myhostname/ F: package/utp_com/ N: Vincent Stehlé +F: board/bananapi/bananapi-m2-zero/ +F: configs/bananapi_m2_zero_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ @@ -2485,6 +2663,8 @@ N: Wade Berrier F: package/ngrep/ N: Waldemar Brodkorb +F: package/mksh/ +F: package/ruby/ F: package/uclibc/ F: package/uclibc-ng-test/ @@ -2507,12 +2687,15 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Yair Ben Avraham +F: package/gloox/ + N: Yann E. MORIN F: board/friendlyarm/nanopi-neo/ F: configs/nanopi_neo_defconfig F: fs/squashfs/ F: package/asterisk/ -F: package/cegui06/ +F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ F: package/dtc/ @@ -2523,6 +2706,7 @@ F: package/keyutils/ F: package/libbsd/ F: package/libedit/ F: package/libgsm/ +F: package/libiberty/ F: package/libinput/ F: package/libiscsi/ F: package/libpri/ diff --git a/buildroot/Makefile b/buildroot/Makefile index bf17f52f8..5dc402e73 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.02.7 +export BR2_VERSION := 2020.11-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1602538000 +BR2_VERSION_EPOCH = 1604528000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -125,7 +125,7 @@ endif noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package + print-version olddefconfig distclean manual manual-% check-package check-flake8 # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -445,6 +445,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/riscv.*/riscv/ \ -e s/sh.*/sh/ \ + -e s/s390x/s390/ \ -e s/microblazeel/microblaze/) ZCAT := $(call qstrip,$(BR2_ZCAT)) @@ -701,8 +702,7 @@ LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST)) # in the whitelist file. If it doesn't, kill it. # Finally, specifically for X11, regenerate locale.dir from the whitelist. define PURGE_LOCALES - rm -f $(LOCALE_WHITELIST) - for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done + printf '%s\n' $(LOCALE_NOPURGE) locale-archive > $(LOCALE_WHITELIST) for dir in $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale); \ do \ @@ -753,10 +753,11 @@ target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ - $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake + $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ + $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ - \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f + \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f ifneq ($(BR2_PACKAGE_GDB),y) rm -rf $(TARGET_DIR)/usr/share/gdb endif @@ -1026,7 +1027,9 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) - @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) + @$(SED) '/^BR2_DEFCONFIG=/d' \ + -e '/^BR2_DL_DIR=/d' \ + $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) .PHONY: defconfig savedefconfig update-defconfig @@ -1208,14 +1211,17 @@ release: print-version: @echo $(BR2_VERSION_FULL) +check-flake8: + $(Q)git ls-tree -r --name-only HEAD \ + | xargs file \ + | grep 'Python script' \ + | cut -d':' -f1 \ + | xargs -- python3 -m flake8 --statistics --max-line-length=132 + check-package: find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \ -exec ./utils/check-package {} + -.PHONY: .gitlab-ci.yml -.gitlab-ci.yml: .gitlab-ci.yml.in - ./support/scripts/generate-gitlab-ci-yml $< > $@ - include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/buildroot/arch/Config.in b/buildroot/arch/Config.in index 94bd2150c..155403c36 100644 --- a/buildroot/arch/Config.in +++ b/buildroot/arch/Config.in @@ -219,6 +219,15 @@ config BR2_riscv https://riscv.org/ https://en.wikipedia.org/wiki/RISC-V +config BR2_s390x + bool "s390x" + select BR2_ARCH_IS_64 + select BR2_ARCH_HAS_MMU_MANDATORY + help + s390x is a big-endian architecture made by IBM. + http://www.ibm.com/ + http://en.wikipedia.org/wiki/IBM_System/390 + config BR2_sh bool "SuperH" select BR2_ARCH_HAS_MMU_OPTIONAL @@ -308,6 +317,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_9 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_10 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -453,6 +466,10 @@ if BR2_riscv source "arch/Config.in.riscv" endif +if BR2_s390x +source "arch/Config.in.s390x" +endif + if BR2_sh source "arch/Config.in.sh" endif diff --git a/buildroot/arch/Config.in.s390x b/buildroot/arch/Config.in.s390x new file mode 100644 index 000000000..ad866b421 --- /dev/null +++ b/buildroot/arch/Config.in.s390x @@ -0,0 +1,29 @@ +choice + prompt "Target Architecture Variant" + help + Specific CPU variant to use + +config BR2_s390x_z13 + bool "z13" + +config BR2_s390x_z14 + bool "z14" + +config BR2_s390x_z15 + bool "z15" + +endchoice + +config BR2_ARCH + default "s390x" if BR2_s390x + +config BR2_ENDIAN + default "BIG" + +config BR2_GCC_TARGET_ARCH + default "arch11" if BR2_s390x_z13 + default "arch12" if BR2_s390x_z14 + default "arch13" if BR2_s390x_z15 + +config BR2_READELF_ARCH_NAME + default "IBM S/390" if BR2_s390x diff --git a/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh b/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh new file mode 100755 index 000000000..f8ba78095 --- /dev/null +++ b/buildroot/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +mkdir -p ${TARGET_DIR}/lib/firmware +cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ +cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/buildroot/board/atmel/readme.txt b/buildroot/board/atmel/readme.txt index 4f90e4b4c..7ebb5e830 100644 --- a/buildroot/board/atmel/readme.txt +++ b/buildroot/board/atmel/readme.txt @@ -1,6 +1,6 @@ -This document explains how to set up a basic Buildroot system on various -Atmel boards. Additional details can also be found on the Linux4SAM website: -http://www.at91.com/linux4sam/bin/view/Linux4SAM/ +This document explains how to set up a basic Buildroot system on +various Atmel/Microchip boards. Additional details can also be found +on the Linux4SAM website: http://www.linux4sam.org This guide covers the following configurations: - at91sam9g45m10ek_defconfig @@ -19,6 +19,8 @@ This guide covers the following configurations: - atmel_sama5d4_xplained_mmc_dev_defconfig - atmel_sama5d2_xplained_mmc_defconfig - atmel_sama5d2_xplained_mmc_dev_defconfig + - microchip_sama5d27_wlsom1_ek_mmc_defconfig + - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig These configurations will use AT91Bootstrap, u-boot and a linux kernel from the git trees maintained by Atmel. @@ -29,23 +31,23 @@ tests the features of the SoC: - FFMPEG to record video from the ISI/ISC - I2C, SPI, CAN, etc. tools - modetest for LCD screens, HDMI -- Wilc1000 firmware for the Atmel Wireless sdio module +- Wilc1000/Wilc3000 firmware for the Atmel Wireless sdio module - SSH for convenience - GDB/GDB server for debug Configuring and building Buildroot ================================== -For most configurations listed above, the Buildroot configuration -assumes the system will be flashed on NAND. In this case, after -building Buildroot, follow the instructions in the "Flashing the NAND -using SAM-BA" section below. - -For the Xplained boards, an alternative Buildroot configuration is +For the Xplained/Evaluation Kit boards, the Buildroot configuration is provided to boot from an SD card. Those configurations are labeled as 'mmc'. In this case, after building Buildroot, follow the instructions in the "Preparing the SD card" section. +For the other configurations listed above, the Buildroot configuration +assumes the system will be flashed on NAND. In this case, after +building Buildroot, follow the instructions in the "Flashing the NAND +using SAM-BA" section below. + To configure and build Buildroot, run: make _defconfig @@ -144,10 +146,10 @@ lost. To copy the image on the SD card: dd if=output/images/sdcard.img of=/dev/mmcblk0 -Insert your SD card in your Xplained board, and enjoy. The default -U-Boot environment will load properly the kernel and Device Tree blob -from the first partition of the SD card, so everything works -automatically. +Insert your SD card in your Xplained/Evaluation Kit board, and +enjoy. The default U-Boot environment will load properly the kernel +and Device Tree blob from the first partition of the SD card, so +everything works automatically. By default a 16MB FAT partition is created. It contains at91bootstrap, u-boot, the kernel image and all dtb variants for your board. The dtb diff --git a/buildroot/board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg b/buildroot/board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg new file mode 100644 index 000000000..dce32524e --- /dev/null +++ b/buildroot/board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg @@ -0,0 +1,31 @@ +# Image for SD card boot on Microchip SAMA5D27 WLSOM1 EK +# +image boot.vfat { + vfat { + files = { + "zImage", + "at91-sama5d27_wlsom1_ek.dtb", + "boot.bin", + "u-boot.bin" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 1M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd b/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd new file mode 100644 index 000000000..081450935 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-zero/boot.cmd @@ -0,0 +1,7 @@ +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +mmc dev 0 +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun8i-h2-plus-bananapi-m2-zero.dtb + +bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/bananapi/bananapi-m2-zero/genimage.cfg b/buildroot/board/bananapi/bananapi-m2-zero/genimage.cfg new file mode 100644 index 000000000..e41f1f939 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-zero/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-h2-plus-bananapi-m2-zero.dtb", + "boot.scr" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/bananapi/bananapi-m2-zero/readme.txt b/buildroot/board/bananapi/bananapi-m2-zero/readme.txt new file mode 100644 index 000000000..9edd477f1 --- /dev/null +++ b/buildroot/board/bananapi/bananapi-m2-zero/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +Buildroot environment for the Bananapi M2 Zero. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Bananapi M2 Zero link: +http://www.banana-pi.org/m2z.html + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make bananapi_m2_zero_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your Bananapi M2 Zero and power it up. The console +is on the Debug UART on the CON3 header, with serial settings 115200 8N1. diff --git a/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch b/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch deleted file mode 100644 index 9443fdd56..000000000 --- a/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Tue, 9 Apr 2019 00:15:06 +0200 -Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some Allwinner H6 has a broken watchdog that doesn't -make the soc reboot. - -Use the R_WATCHDOG instead. - -Signed-off-by: Clément Péron -Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba ---- - plat/allwinner/common/sunxi_pm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c -index 1d2dc938..13e13532 100644 ---- a/plat/allwinner/common/sunxi_pm.c -+++ b/plat/allwinner/common/sunxi_pm.c -@@ -20,9 +20,9 @@ - #include - #include - --#define SUNXI_WDOG0_CTRL_REG (SUNXI_WDOG_BASE + 0x0010) --#define SUNXI_WDOG0_CFG_REG (SUNXI_WDOG_BASE + 0x0014) --#define SUNXI_WDOG0_MODE_REG (SUNXI_WDOG_BASE + 0x0018) -+#define SUNXI_WDOG0_CTRL_REG (SUNXI_R_WDOG_BASE + 0x0010) -+#define SUNXI_WDOG0_CFG_REG (SUNXI_R_WDOG_BASE + 0x0014) -+#define SUNXI_WDOG0_MODE_REG (SUNXI_R_WDOG_BASE + 0x0018) - - #define mpidr_is_valid(mpidr) ( \ - MPIDR_AFFLVL3_VAL(mpidr) == 0 && \ --- -2.20.1 - diff --git a/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch b/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch deleted file mode 100644 index 8e695f641..000000000 --- a/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch +++ /dev/null @@ -1,279 +0,0 @@ -From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Sun, 11 Aug 2019 22:38:57 +0200 -Subject: [PATCH] arm: dts: sync dts for Allwinner H6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Sync Kernel DTS for Allwinner H6 boards. - -Drop /omit-if-no-ref/ keyword as it's not supported by U-boot. - -commit Linux 5.3-rc4 - -Signed-off-by: Clément Péron ---- - arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++ - arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++ - arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++- - 3 files changed, 131 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -index 54b0882bed..0dc33c90dd 100644 ---- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts -+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts -@@ -14,6 +14,7 @@ - compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -21,6 +22,17 @@ - stdout-path = "serial0:115200n8"; - }; - -+ connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ - leds { - compatible = "gpio-leds"; - -@@ -41,6 +53,40 @@ - }; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_aldo2>; -+ status = "okay"; -+}; -+ -+&hdmi { -+ status = "okay"; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ -+&mdio { -+ ext_rgmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -@@ -57,6 +103,15 @@ - status = "okay"; - }; - -+&ohci0 { -+ status = "okay"; -+}; -+ -+&pio { -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -177,8 +232,29 @@ - }; - }; - -+&r_pio { -+ /* -+ * PL0 and PL1 are used for PMIC I2C -+ * don't enable the pl-supply else -+ * it will fail at boot -+ * -+ * vcc-pl-supply = <®_aldo1>; -+ */ -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; - status = "okay"; - }; -+ -+&usb2otg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb2phy { -+ usb0_vbus-supply = <®_vcc5v>; -+ status = "okay"; -+}; -diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts -index 4802902e12..1898345183 100644 ---- a/arch/arm/dts/sun50i-h6-pine-h64.dts -+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts -@@ -127,6 +127,12 @@ - status = "okay"; - }; - -+&pio { -+ vcc-pc-supply = <®_bldo2>; -+ vcc-pd-supply = <®_cldo1>; -+ vcc-pg-supply = <®_aldo1>; -+}; -+ - &r_i2c { - status = "okay"; - -@@ -243,10 +249,16 @@ - pcf8563: rtc@51 { - compatible = "nxp,pcf8563"; - reg = <0x51>; -+ interrupt-parent = <&r_intc>; -+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - #clock-cells = <0>; - }; - }; - -+&r_pio { -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_ph_pins>; -diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi -index e0dc4a05c1..a117f479ae 100644 ---- a/arch/arm/dts/sun50i-h6.dtsi -+++ b/arch/arm/dts/sun50i-h6.dtsi -@@ -101,7 +101,7 @@ - #size-cells = <1>; - ranges; - -- display-engine@1000000 { -+ bus@1000000 { - compatible = "allwinner,sun50i-h6-de3", - "allwinner,sun50i-a64-de2"; - reg = <0x1000000 0x400000>; -@@ -203,11 +203,32 @@ - #reset-cells = <1>; - }; - -+ dma: dma-controller@3002000 { -+ compatible = "allwinner,sun50i-h6-dma"; -+ reg = <0x03002000 0x1000>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; -+ clock-names = "bus", "mbus"; -+ dma-channels = <16>; -+ dma-requests = <46>; -+ resets = <&ccu RST_BUS_DMA>; -+ #dma-cells = <1>; -+ }; -+ - sid: sid@3006000 { - compatible = "allwinner,sun50i-h6-sid"; - reg = <0x03006000 0x400>; - }; - -+ watchdog: watchdog@30090a0 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x030090a0 0x20>; -+ interrupts = ; -+ /* Broken on some H6 boards */ -+ status = "disabled"; -+ }; -+ - pio: pinctrl@300b000 { - compatible = "allwinner,sun50i-h6-pinctrl"; - reg = <0x0300b000 0x400>; -@@ -243,6 +264,18 @@ - bias-pull-up; - }; - -+ /* -+ * /omit-if-no-ref/ isn't supported by U-boot -+ * keep this comment to avoid bad sync with Linux -+ */ -+ mmc1_pins: mmc1-pins { -+ pins = "PG0", "PG1", "PG2", "PG3", -+ "PG4", "PG5"; -+ function = "mmc1"; -+ drive-strength = <30>; -+ bias-pull-up; -+ }; -+ - mmc2_pins: mmc2-pins { - pins = "PC1", "PC4", "PC5", "PC6", - "PC7", "PC8", "PC9", "PC10", -@@ -294,6 +327,8 @@ - resets = <&ccu RST_BUS_MMC1>; - reset-names = "ahb"; - interrupts = ; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; -@@ -445,7 +480,6 @@ - resets = <&ccu RST_BUS_OHCI3>, - <&ccu RST_BUS_EHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -457,7 +491,6 @@ - <&ccu CLK_USB_OHCI3>; - resets = <&ccu RST_BUS_OHCI3>; - phys = <&usb2phy 3>; -- phy-names = "usb"; - status = "disabled"; - }; - -@@ -613,6 +646,13 @@ - #reset-cells = <1>; - }; - -+ r_watchdog: watchdog@7020400 { -+ compatible = "allwinner,sun50i-h6-wdt", -+ "allwinner,sun6i-a31-wdt"; -+ reg = <0x07020400 0x20>; -+ interrupts = ; -+ }; -+ - r_intc: interrupt-controller@7021000 { - compatible = "allwinner,sun50i-h6-r-intc", - "allwinner,sun6i-a31-r-intc"; --- -2.20.1 - diff --git a/buildroot/board/boundarydevices/common/boot.cmd b/buildroot/board/boundarydevices/common/boot.cmd index 760363da9..dbc3b3c37 100644 --- a/buildroot/board/boundarydevices/common/boot.cmd +++ b/buildroot/board/boundarydevices/common/boot.cmd @@ -9,9 +9,9 @@ if itest.s x51 == "x${imx_cpu}" ; then a_base=0x90000000 elif itest.s x53 == "x${imx_cpu}"; then a_base=0x70000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x80000000 -elif itest.s x8MQ == "x${imx_cpu}"; then +elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then a_base=0x40000000 kernelimage=Image bootcommand=booti @@ -43,10 +43,18 @@ if itest.s "x" == "x${fdt_file}" ; then fdt_file=imx6qp-${board}.dtb; elif itest.s x6SX == "x${imx_cpu}" ; then fdt_file=imx6sx-${board}${m4}.dtb; + elif itest.s x6ULL == "x${imx_cpu}" ; then + fdt_file=imx6ull-${board}.dtb; elif itest.s x7D == "x${imx_cpu}" ; then fdt_file=imx7d-${board}${m4}.dtb; elif itest.s x8MQ == "x${imx_cpu}" ; then fdt_file=imx8mq-${board}${m4}.dtb; + elif itest.s x8MM == "x${imx_cpu}" ; then + fdt_file=imx8mm-${board}${m4}.dtb; + elif itest.s x8MMQ == "x${imx_cpu}" ; then + fdt_file=imx8mm-${board}${m4}.dtb; + elif itest.s x8MNano == "x${imx_cpu}" ; then + fdt_file=imx8mn-${board}${m4}.dtb; elif itest.s x51 == "x${imx_cpu}" ; then fdt_file=imx51-${board}.dtb; elif itest.s x53 == "x${imx_cpu}" ; then @@ -63,7 +71,6 @@ fi if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then env import -t ${a_script} ${filesize} fi - setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board} if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then @@ -74,21 +81,20 @@ else exit; fi -fdt resize +fdt resize 4096 +if itest.s "x" != "x${cmd_board}" ; then + run cmd_board +fi if itest.s "x" != "x${cmd_custom}" ; then run cmd_custom fi if itest.s "x" != "x${cmd_hdmi}" ; then run cmd_hdmi - if itest.s x == x${allow_noncea} ; then - setenv bootargs ${bootargs} mxc_hdmi.only_cea=1; - echo "only CEA modes allowed on HDMI port"; - else + if itest.s x != x${allow_noncea} ; then setenv bootargs ${bootargs} mxc_hdmi.only_cea=0; echo "non-CEA modes allowed on HDMI, audio may be affected"; fi fi - if itest.s "x" != "x${cmd_lcd}" ; then run cmd_lcd fi diff --git a/buildroot/board/boundarydevices/common/post-image.sh b/buildroot/board/boundarydevices/common/post-image.sh index 9cca1b178..5c70d98e5 100755 --- a/buildroot/board/boundarydevices/common/post-image.sh +++ b/buildroot/board/boundarydevices/common/post-image.sh @@ -1,16 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg exit $? diff --git a/buildroot/board/boundarydevices/common/readme.txt b/buildroot/board/boundarydevices/common/readme.txt index 0625deef2..d1bb3fa59 100644 --- a/buildroot/board/boundarydevices/common/readme.txt +++ b/buildroot/board/boundarydevices/common/readme.txt @@ -1,6 +1,6 @@ Buildroot for Boundary Devices platforms: -https://boundarydevices.com/product-category/popular-sbc-and-som-modules/ +https://boundarydevices.com/nitrogen-sbcs-and-soms/ Here is the list of targeted platforms per defconfig: @@ -19,7 +19,19 @@ Here is the list of targeted platforms per defconfig: - nitrogen7_defconfig - Nitrogen7 -To install, simply copy the image to a uSD card: +- nitrogen8m_defconfig + - Nitrogen8M + - Nitrogen8M_SOM + +- nitrogen8mm_defconfig + - Nitrogen8MMini + - Nitrogen8MMini_SOM + +- nitrogen8mn_defconfig + - Nitrogen8MNano + - Nitrogen8MNano_SOM + +To install, simply copy the image to your storage (SD, eMMC, USB): $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/buildroot/board/boundarydevices/common/upgrade.cmd b/buildroot/board/boundarydevices/common/upgrade.cmd index 24b705eb7..ce32d77b5 100644 --- a/buildroot/board/boundarydevices/common/upgrade.cmd +++ b/buildroot/board/boundarydevices/common/upgrade.cmd @@ -13,11 +13,14 @@ if itest.s x51 == "x${imx_cpu}"; then a_base=0x92000000 elif itest.s x53 == "x${imx_cpu}"; then a_base=0x72000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x82000000 -elif itest.s x8MQ == "x${imx_cpu}"; then +elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}"; then a_base=0x42000000 offset=0x8400 +elif itest.s x8MNano == "x${imx_cpu}"; then + a_base=0x42000000 + offset=0x8000 fi qspi_match=1 @@ -56,6 +59,7 @@ mmc dev ${env_dev} ${env_part} mmc read ${a_uImage2} ${cntoffset} ${cntfile} if cmp.b ${a_uImage1} ${a_uImage2} ${filesize} ; then echo "------- U-Boot versions match" ; + echo "------- U-Boot upgrade NOT needed" ; exit ; fi @@ -134,7 +138,7 @@ fi if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then echo "------- U-Boot versions match" ; if itest.s "${qspi_match}" == "1" ; then - echo "------- upgrade not needed" ; + echo "------- U-Boot upgrade NOT needed" ; if itest.s "x" != "x${next}" ; then if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then source ${a_script} @@ -206,6 +210,12 @@ if itest.s "x" != "x${next}" ; then fi fi -while echo "---- U-Boot upgraded. Please reset the board" ; do - sleep 120 +if itest.s "xno" == "x${reset}" ; then + while echo "---- U-Boot upgraded. Please reset the board" ; do + sleep 120 + done +fi +echo "---- U-Boot upgraded. The board will now reset." +sleep 1 +reset done diff --git a/buildroot/board/chromebook/elm/kernel.args b/buildroot/board/chromebook/elm/kernel.args new file mode 100644 index 000000000..848e179d6 --- /dev/null +++ b/buildroot/board/chromebook/elm/kernel.args @@ -0,0 +1 @@ +root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd kern_guid=%U console=tty0 diff --git a/buildroot/board/chromebook/elm/kernel.its b/buildroot/board/chromebook/elm/kernel.its new file mode 100644 index 000000000..bc4b09eab --- /dev/null +++ b/buildroot/board/chromebook/elm/kernel.its @@ -0,0 +1,38 @@ +/dts-v1/; + +/ { + description = "Chrome OS kernel image with FDT"; + #address-cells = <1>; + + images { + kernel-1 { + data = /incbin/("Image"); + type = "kernel_noload"; + arch = "arm64"; + os = "linux"; + compression = "none"; + load = <0>; + entry = <0>; + }; + + fdt-1 { + description = "mt8173-elm.dtb"; + data = /incbin/("mt8173-elm.dtb"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + + hash-1 { + algo = "sha1"; + }; + }; + }; + + configurations { + default = "conf-1"; + conf-1 { + kernel = "kernel-1"; + fdt = "fdt-1"; + }; + }; +}; diff --git a/buildroot/board/chromebook/elm/linux.config b/buildroot/board/chromebook/elm/linux.config new file mode 100644 index 000000000..50402eae8 --- /dev/null +++ b/buildroot/board/chromebook/elm/linux.config @@ -0,0 +1,453 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_NUMA_BALANCING=y +CONFIG_MEMCG=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_USER_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_KALLSYMS_ALL=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +CONFIG_PROFILING=y +CONFIG_ARCH_MEDIATEK=y +CONFIG_ARM64_VA_BITS_48=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_NR_CPUS=4 +CONFIG_NUMA=y +CONFIG_SECCOMP=y +CONFIG_PARAVIRT=y +CONFIG_CRASH_DUMP=y +CONFIG_COMPAT=y +CONFIG_RANDOMIZE_BASE=y +# CONFIG_EFI is not set +# CONFIG_SUSPEND is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_CPUFREQ_DT=y +CONFIG_ARM_SCPI_CPUFREQ=y +CONFIG_ARM_MEDIATEK_CPUFREQ=y +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_JUMP_LABEL=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEBUG_FS is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_KSM=y +CONFIG_MEMORY_FAILURE=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_INET_UDP_DIAG=y +# CONFIG_IPV6 is not set +CONFIG_CFG80211=y +# CONFIG_CFG80211_DEFAULT_PS is not set +CONFIG_MAC80211=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_VEXPRESS_CONFIG=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_SST25L=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_DENALI_DT=y +CONFIG_MTD_SPI_NOR=y +CONFIG_SPI_CADENCE_QUADSPI=y +CONFIG_OF_OVERLAY=y +# CONFIG_BLK_DEV is not set +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_SAS_LIBSAS=y +CONFIG_SCSI_UFSHCD=y +CONFIG_SCSI_UFSHCD_PLATFORM=y +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_BLK_DEV_DM=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_NETDEVICES=y +# CONFIG_ETHERNET is not set +CONFIG_USB_RTL8152=y +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_WLAN_VENDOR_ADMTEK is not set +# CONFIG_WLAN_VENDOR_ATH is not set +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_ST is not set +# CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_CROS_EC=y +CONFIG_MOUSE_ELAN_I2C=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_ELAN=y +CONFIG_INPUT_MISC=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_AMBAKMI=y +CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_8250_MT6577=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LINFLEXUART=y +CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_GPIO=m +CONFIG_I2C_MT65XX=y +CONFIG_I2C_RK3X=y +CONFIG_I2C_CROS_EC_TUNNEL=y +CONFIG_I2C_SLAVE=y +CONFIG_SPI=y +CONFIG_SPI_NXP_FLEXSPI=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_MT65XX=y +CONFIG_SPI_PL022=y +CONFIG_SPI_ROCKCHIP=y +CONFIG_SPI_SPIDEV=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_MAX77620=y +CONFIG_GPIO_ALTERA=m +CONFIG_GPIO_DWAPB=y +CONFIG_GPIO_MB86S7X=y +CONFIG_GPIO_PL061=y +CONFIG_GPIO_XGENE=y +CONFIG_GPIO_MAX732X=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_MAX77620=y +CONFIG_POWER_AVS=y +CONFIG_POWER_RESET_BRCMSTB=y +CONFIG_POWER_RESET_XGENE=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_BATTERY_SBS=m +CONFIG_BATTERY_BQ27XXX=y +CONFIG_SENSORS_ARM_SCPI=y +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_DEVFREQ_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_WATCHDOG=y +CONFIG_MEDIATEK_WATCHDOG=y +CONFIG_MFD_BD9571MWV=y +CONFIG_MFD_AXP20X_I2C=y +CONFIG_MFD_HI6421_PMIC=y +CONFIG_MFD_MAX77620=y +CONFIG_MFD_MT6397=y +CONFIG_MFD_RK808=y +CONFIG_MFD_SEC_CORE=y +CONFIG_MFD_ROHM_BD718XX=y +CONFIG_REGULATOR_DEBUG=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_AXP20X=y +CONFIG_REGULATOR_BD718XX=y +CONFIG_REGULATOR_BD9571MWV=y +CONFIG_REGULATOR_DA9211=y +CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_HI6421V530=y +CONFIG_REGULATOR_MAX77620=y +CONFIG_REGULATOR_MAX8973=y +CONFIG_REGULATOR_MT6397=y +CONFIG_REGULATOR_PFUZE100=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_S2MPS11=y +CONFIG_REGULATOR_VCTRL=m +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_DRM=y +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_MALI_DISPLAY=m +CONFIG_DRM_PANEL_LVDS=m +CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m +CONFIG_DRM_DISPLAY_CONNECTOR=y +CONFIG_DRM_PARADE_PS8640=y +CONFIG_DRM_SII902X=m +CONFIG_DRM_THINE_THC63LVD1024=m +CONFIG_DRM_TI_SN65DSI86=m +CONFIG_DRM_ANALOGIX_ANX78XX=y +CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_MEDIATEK=y +CONFIG_DRM_MEDIATEK_HDMI=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_SIMPLE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_LP855X=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_MT8173=y +CONFIG_SND_SOC_MT8173_RT5650_RT5676=y +CONFIG_I2C_HID=m +CONFIG_USB_CONN_GPIO=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_MTU3=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_PL2303=y +CONFIG_USB_HSIC_USB3503=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_ETH=m +CONFIG_USB_ETH_EEM=y +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_FUSB302=m +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_MMC_SDHCI_CADENCE=y +CONFIG_MMC_SDHCI_F_SDH30=y +CONFIG_MMC_SPI=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_EXYNOS=y +CONFIG_MMC_DW_HI3798CV200=y +CONFIG_MMC_DW_K3=y +CONFIG_MMC_MTK=y +CONFIG_MMC_SDHCI_XENON=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_LEDS_SYSCON=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_RK808=m +CONFIG_RTC_DRV_PCF85363=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_S5M=y +CONFIG_RTC_DRV_DS3232=y +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_CROS_EC=y +CONFIG_RTC_DRV_PL031=y +CONFIG_DMADEVICES=y +CONFIG_FSL_EDMA=y +CONFIG_MV_XOR_V2=y +CONFIG_PL330_DMA=y +CONFIG_MTK_CQDMA=y +CONFIG_QCOM_HIDMA_MGMT=y +CONFIG_QCOM_HIDMA=y +# CONFIG_VIRTIO_MENU is not set +CONFIG_MFD_CROS_EC=y +CONFIG_CROS_EC_I2C=y +CONFIG_CROS_EC_SPI=y +CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_SCPI=y +CONFIG_COMMON_CLK_CS2000_CP=y +CONFIG_COMMON_CLK_S2MPS11=y +CONFIG_CLK_QORIQ=y +CONFIG_COMMON_CLK_XGENE=y +CONFIG_COMMON_CLK_PWM=y +CONFIG_COMMON_CLK_VC5=y +CONFIG_COMMON_CLK_MT6797_MMSYS=y +CONFIG_COMMON_CLK_MT6797_IMGSYS=y +CONFIG_COMMON_CLK_MT6797_VDECSYS=y +CONFIG_COMMON_CLK_MT6797_VENCSYS=y +CONFIG_HWSPINLOCK=y +CONFIG_ARM_MHU=y +CONFIG_PLATFORM_MHU=y +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y +CONFIG_MTK_IOMMU=y +CONFIG_REMOTEPROC=y +CONFIG_MTK_CMDQ=y +CONFIG_MTK_PMIC_WRAP=y +CONFIG_EXTCON_USB_GPIO=y +CONFIG_EXTCON_USBC_CROS_EC=y +CONFIG_IIO=y +CONFIG_MAX9611=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m +CONFIG_IIO_CROS_EC_LIGHT_PROX=m +CONFIG_SENSORS_ISL29018=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_MPL3115=m +CONFIG_PWM=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_MTK_DISP=y +CONFIG_PWM_MEDIATEK=y +CONFIG_PHY_XGENE=y +CONFIG_PHY_FSL_IMX8MQ_USB=y +CONFIG_PHY_MTK_TPHY=y +CONFIG_PHY_QCOM_USB_HS=y +CONFIG_PHY_SAMSUNG_USB2=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_INDEX=y +CONFIG_OVERLAY_FS_XINO_AUTO=y +CONFIG_OVERLAY_FS_METACOPY=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +CONFIG_CONFIGFS_FS=y +CONFIG_PSTORE=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_SECURITY=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_XXHASH=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_CCREE=m +CONFIG_PACKING=y +CONFIG_INDIRECT_PIO=y +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=y +CONFIG_LIBCRC32C=m +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=32 +CONFIG_IRQ_POLL=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +CONFIG_STACKTRACE=y +# CONFIG_FTRACE is not set +# CONFIG_STRICT_DEVMEM is not set \ No newline at end of file diff --git a/buildroot/board/chromebook/elm/patches/linux/0001-drm-bridge_connector-Set-default-status-connected-fo.patch b/buildroot/board/chromebook/elm/patches/linux/0001-drm-bridge_connector-Set-default-status-connected-fo.patch new file mode 100644 index 000000000..f03739189 --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0001-drm-bridge_connector-Set-default-status-connected-fo.patch @@ -0,0 +1,35 @@ +From 510d0ad0ce1b51c072309ba12dfb024fc2c3dbac Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra +Date: Wed, 26 Aug 2020 10:15:22 +0200 +Subject: [PATCH 1/5] drm/bridge_connector: Set default status connected for + eDP connectors + +In an eDP application, HPD is not required and on most bridge chips +useless. If HPD is not used, we need to set initial status as connected, +otherwise the connector created by the drm_bridge_connector API remains +in an unknown state. + +Reviewed-by: Laurent Pinchart +Acked-by: Sam Ravnborg +Signed-off-by: Enric Balletbo i Serra +Reviewed-by: Bilal Wasim +Tested-by: Bilal Wasim +--- + drivers/gpu/drm/drm_bridge_connector.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c +index c6994fe673f3..a58cbde59c34 100644 +--- a/drivers/gpu/drm/drm_bridge_connector.c ++++ b/drivers/gpu/drm/drm_bridge_connector.c +@@ -187,6 +187,7 @@ drm_bridge_connector_detect(struct drm_connector *connector, bool force) + case DRM_MODE_CONNECTOR_DPI: + case DRM_MODE_CONNECTOR_LVDS: + case DRM_MODE_CONNECTOR_DSI: ++ case DRM_MODE_CONNECTOR_eDP: + status = connector_status_connected; + break; + default: +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/patches/linux/0002-drm-bridge-ps8640-Get-the-EDID-from-eDP-control.patch b/buildroot/board/chromebook/elm/patches/linux/0002-drm-bridge-ps8640-Get-the-EDID-from-eDP-control.patch new file mode 100644 index 000000000..5f7517c7b --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0002-drm-bridge-ps8640-Get-the-EDID-from-eDP-control.patch @@ -0,0 +1,50 @@ +From cc0f2fea61fb34ca84e4812a615e0035d812aa8b Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra +Date: Wed, 26 Aug 2020 10:15:23 +0200 +Subject: [PATCH 2/5] drm/bridge: ps8640: Get the EDID from eDP control + +The PS8640 DSI-to-eDP bridge can retrieve the EDID, so implement the +.get_edid callback and set the flag to indicate the core to use it. + +Reviewed-by: Laurent Pinchart +Acked-by: Sam Ravnborg +Signed-off-by: Enric Balletbo i Serra +--- + drivers/gpu/drm/bridge/parade-ps8640.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c +index 4b099196afeb..13755d278db6 100644 +--- a/drivers/gpu/drm/bridge/parade-ps8640.c ++++ b/drivers/gpu/drm/bridge/parade-ps8640.c +@@ -242,8 +242,18 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge, + return ret; + } + ++static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge, ++ struct drm_connector *connector) ++{ ++ struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); ++ ++ return drm_get_edid(connector, ++ ps_bridge->page[PAGE0_DP_CNTL]->adapter); ++} ++ + static const struct drm_bridge_funcs ps8640_bridge_funcs = { + .attach = ps8640_bridge_attach, ++ .get_edid = ps8640_bridge_get_edid, + .post_disable = ps8640_post_disable, + .pre_enable = ps8640_pre_enable, + }; +@@ -294,6 +304,8 @@ static int ps8640_probe(struct i2c_client *client) + + ps_bridge->bridge.funcs = &ps8640_bridge_funcs; + ps_bridge->bridge.of_node = dev->of_node; ++ ps_bridge->bridge.ops = DRM_BRIDGE_OP_EDID; ++ ps_bridge->bridge.type = DRM_MODE_CONNECTOR_eDP; + + ps_bridge->page[PAGE0_DP_CNTL] = client; + +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/patches/linux/0003-drm-bridge-ps8640-Return-an-error-for-incorrect-atta.patch b/buildroot/board/chromebook/elm/patches/linux/0003-drm-bridge-ps8640-Return-an-error-for-incorrect-atta.patch new file mode 100644 index 000000000..5f52c4542 --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0003-drm-bridge-ps8640-Return-an-error-for-incorrect-atta.patch @@ -0,0 +1,35 @@ +From 62afc499fc46c8018f40733c31a675b28f0717d8 Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra +Date: Wed, 26 Aug 2020 10:15:24 +0200 +Subject: [PATCH 3/5] drm/bridge: ps8640: Return an error for incorrect attach + flags + +Bridge drivers that implement the new model only shall return an error +from their attach() handler when the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag +is not set. So make sure we return an error because only the new +drm_bridge model is supported. + +Reviewed-by: Sam Ravnborg +Signed-off-by: Enric Balletbo i Serra +--- + drivers/gpu/drm/bridge/parade-ps8640.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c +index 13755d278db6..ce3e8b2da8c9 100644 +--- a/drivers/gpu/drm/bridge/parade-ps8640.c ++++ b/drivers/gpu/drm/bridge/parade-ps8640.c +@@ -200,6 +200,10 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge, + .channel = 0, + .node = NULL, + }; ++ ++ if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) ++ return -EINVAL; ++ + /* port@0 is ps8640 dsi input port */ + in_ep = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1); + if (!in_ep) +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/patches/linux/0004-drm-bridge-ps8640-Print-an-error-if-VDO-control-fail.patch b/buildroot/board/chromebook/elm/patches/linux/0004-drm-bridge-ps8640-Print-an-error-if-VDO-control-fail.patch new file mode 100644 index 000000000..4ef074a6c --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0004-drm-bridge-ps8640-Print-an-error-if-VDO-control-fail.patch @@ -0,0 +1,58 @@ +From 4897262a71cbf55d726d9174f5f646897dc13704 Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra +Date: Wed, 26 Aug 2020 10:15:25 +0200 +Subject: [PATCH 4/5] drm/bridge: ps8640: Print an error if VDO control fails + +Print an error message inside ps8640_bridge_vdo_control() function when +it fails so we can simplify a bit the callers, they will only need to +check the error code. + +Reviewed-by: Sam Ravnborg +Signed-off-by: Enric Balletbo i Serra +--- + drivers/gpu/drm/bridge/parade-ps8640.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c +index ce3e8b2da8c9..9f7b7a9c53c5 100644 +--- a/drivers/gpu/drm/bridge/parade-ps8640.c ++++ b/drivers/gpu/drm/bridge/parade-ps8640.c +@@ -82,8 +82,11 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge, + ret = i2c_smbus_write_i2c_block_data(client, PAGE3_SET_ADD, + sizeof(vdo_ctrl_buf), + vdo_ctrl_buf); +- if (ret < 0) ++ if (ret < 0) { ++ DRM_ERROR("failed to %sable VDO: %d\n", ++ ctrl == ENABLE ? "en" : "dis", ret); + return ret; ++ } + + return 0; + } +@@ -150,10 +153,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge) + } + + ret = ps8640_bridge_vdo_control(ps_bridge, ENABLE); +- if (ret) { +- DRM_ERROR("failed to enable VDO: %d\n", ret); ++ if (ret) + goto err_regulators_disable; +- } + + /* Switch access edp panel's edid through i2c */ + ret = i2c_smbus_write_byte_data(client, PAGE2_I2C_BYPASS, +@@ -175,9 +176,7 @@ static void ps8640_post_disable(struct drm_bridge *bridge) + struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); + int ret; + +- ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE); +- if (ret < 0) +- DRM_ERROR("failed to disable VDO: %d\n", ret); ++ ps8640_bridge_vdo_control(ps_bridge, DISABLE); + + gpiod_set_value(ps_bridge->gpio_reset, 1); + gpiod_set_value(ps_bridge->gpio_powerdown, 1); +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/patches/linux/0005-drm-bridge-ps8640-Rework-power-state-handling.patch b/buildroot/board/chromebook/elm/patches/linux/0005-drm-bridge-ps8640-Rework-power-state-handling.patch new file mode 100644 index 000000000..f682600d1 --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0005-drm-bridge-ps8640-Rework-power-state-handling.patch @@ -0,0 +1,162 @@ +From 5bb60fe7c748a0aae2bdbab10e73b2dc48c09dda Mon Sep 17 00:00:00 2001 +From: Enric Balletbo i Serra +Date: Wed, 26 Aug 2020 10:15:26 +0200 +Subject: [PATCH 5/5] drm/bridge: ps8640: Rework power state handling + +The get_edid() callback can be triggered anytime by an ioctl, i.e + + drm_mode_getconnector (ioctl) + -> drm_helper_probe_single_connector_modes + -> drm_bridge_connector_get_modes + -> ps8640_bridge_get_edid + +Actually if the bridge pre_enable() function was not called before +get_edid(), the driver will not be able to get the EDID properly and +display will not work until a second get_edid() call is issued and if +pre_enable() is called before. The side effect of this, for example, is +that you see anything when `Frecon` starts, neither the splash screen, +until the graphical session manager starts. + +To fix this we need to make sure that all we need is enabled before +reading the EDID. This means the following: + +1. If get_edid() is called before having the device powered we need to + power on the device. In such case, the driver will power off again the + device. + +2. If get_edid() is called after having the device powered, all should + just work. We added a powered flag in order to avoid recurrent calls + to ps8640_bridge_poweron() and unneeded delays. + +3. This seems to be specific for this device, but we need to make sure + the panel is powered on before do a power on cycle on this device. + Otherwise the device fails to retrieve the EDID. + +Signed-off-by: Enric Balletbo i Serra +--- + drivers/gpu/drm/bridge/parade-ps8640.c | 64 +++++++++++++++++++++++--- + 1 file changed, 58 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c +index 9f7b7a9c53c5..c5d76e209bda 100644 +--- a/drivers/gpu/drm/bridge/parade-ps8640.c ++++ b/drivers/gpu/drm/bridge/parade-ps8640.c +@@ -65,6 +65,7 @@ struct ps8640 { + struct regulator_bulk_data supplies[2]; + struct gpio_desc *gpio_reset; + struct gpio_desc *gpio_powerdown; ++ bool powered; + }; + + static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e) +@@ -91,13 +92,15 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge, + return 0; + } + +-static void ps8640_pre_enable(struct drm_bridge *bridge) ++static void ps8640_bridge_poweron(struct ps8640 *ps_bridge) + { +- struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); + struct i2c_client *client = ps_bridge->page[PAGE2_TOP_CNTL]; + unsigned long timeout; + int ret, status; + ++ if (ps_bridge->powered) ++ return; ++ + ret = regulator_bulk_enable(ARRAY_SIZE(ps_bridge->supplies), + ps_bridge->supplies); + if (ret < 0) { +@@ -164,6 +167,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge) + goto err_regulators_disable; + } + ++ ps_bridge->powered = true; ++ + return; + + err_regulators_disable: +@@ -171,12 +176,12 @@ static void ps8640_pre_enable(struct drm_bridge *bridge) + ps_bridge->supplies); + } + +-static void ps8640_post_disable(struct drm_bridge *bridge) ++static void ps8640_bridge_poweroff(struct ps8640 *ps_bridge) + { +- struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); + int ret; + +- ps8640_bridge_vdo_control(ps_bridge, DISABLE); ++ if (!ps_bridge->powered) ++ return; + + gpiod_set_value(ps_bridge->gpio_reset, 1); + gpiod_set_value(ps_bridge->gpio_powerdown, 1); +@@ -184,6 +189,28 @@ static void ps8640_post_disable(struct drm_bridge *bridge) + ps_bridge->supplies); + if (ret < 0) + DRM_ERROR("cannot disable regulators %d\n", ret); ++ ++ ps_bridge->powered = false; ++} ++ ++static void ps8640_pre_enable(struct drm_bridge *bridge) ++{ ++ struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); ++ int ret; ++ ++ ps8640_bridge_poweron(ps_bridge); ++ ++ ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE); ++ if (ret < 0) ++ ps8640_bridge_poweroff(ps_bridge); ++} ++ ++static void ps8640_post_disable(struct drm_bridge *bridge) ++{ ++ struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); ++ ++ ps8640_bridge_vdo_control(ps_bridge, DISABLE); ++ ps8640_bridge_poweroff(ps_bridge); + } + + static int ps8640_bridge_attach(struct drm_bridge *bridge, +@@ -249,9 +276,34 @@ static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge, + struct drm_connector *connector) + { + struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); ++ bool poweroff = !ps_bridge->powered; ++ struct edid *edid; ++ ++ /* ++ * When we end calling get_edid() triggered by an ioctl, i.e ++ * ++ * drm_mode_getconnector (ioctl) ++ * -> drm_helper_probe_single_connector_modes ++ * -> drm_bridge_connector_get_modes ++ * -> ps8640_bridge_get_edid ++ * ++ * We need to make sure that what we need is enabled before reading ++ * EDID, for this chip, we need to do a full poweron, otherwise it will ++ * fail. ++ */ ++ drm_bridge_chain_pre_enable(bridge); + +- return drm_get_edid(connector, ++ edid = drm_get_edid(connector, + ps_bridge->page[PAGE0_DP_CNTL]->adapter); ++ ++ /* ++ * If we call the get_edid() function without having enabled the chip ++ * before, return the chip to its original power state. ++ */ ++ if (poweroff) ++ drm_bridge_chain_post_disable(bridge); ++ ++ return edid; + } + + static const struct drm_bridge_funcs ps8640_bridge_funcs = { +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/patches/linux/0006-Revert-drm-mediatek-dsi-Fix-scrolling-of-panel-with-.patch b/buildroot/board/chromebook/elm/patches/linux/0006-Revert-drm-mediatek-dsi-Fix-scrolling-of-panel-with-.patch new file mode 100644 index 000000000..43bffe526 --- /dev/null +++ b/buildroot/board/chromebook/elm/patches/linux/0006-Revert-drm-mediatek-dsi-Fix-scrolling-of-panel-with-.patch @@ -0,0 +1,41 @@ +From 51109530891c981b681816152bd205724deabcca Mon Sep 17 00:00:00 2001 +From: Jitao Shi +Date: Sat, 10 Oct 2020 15:09:09 +0800 +Subject: [PATCH] Revert "drm/mediatek: dsi: Fix scrolling of panel with small + hfp or hbp" + +This reverts commit 35bf948f1edbf507f6e57e0879fa6ea36d2d2930. + +Signed-off-by: Jitao Shi +Reviewed-by: Bilal Wasim +Tested-by: Bilal Wasim +--- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c +index 80b7a082e874..16fd99dcdacf 100644 +--- a/drivers/gpu/drm/mediatek/mtk_dsi.c ++++ b/drivers/gpu/drm/mediatek/mtk_dsi.c +@@ -466,13 +466,14 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi) + horizontal_sync_active_byte = (vm->hsync_len * dsi_tmp_buf_bpp - 10); + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) +- horizontal_backporch_byte = vm->hback_porch * dsi_tmp_buf_bpp; ++ horizontal_backporch_byte = ++ (vm->hback_porch * dsi_tmp_buf_bpp - 10); + else +- horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) * +- dsi_tmp_buf_bpp; ++ horizontal_backporch_byte = ((vm->hback_porch + vm->hsync_len) * ++ dsi_tmp_buf_bpp - 10); + + data_phy_cycles = timing->lpx + timing->da_hs_prepare + +- timing->da_hs_zero + timing->da_hs_exit; ++ timing->da_hs_zero + timing->da_hs_exit + 3; + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) { + if ((vm->hfront_porch + vm->hback_porch) * dsi_tmp_buf_bpp > +-- +2.25.1 + diff --git a/buildroot/board/chromebook/elm/readme.txt b/buildroot/board/chromebook/elm/readme.txt new file mode 100644 index 000000000..b63e7e8bc --- /dev/null +++ b/buildroot/board/chromebook/elm/readme.txt @@ -0,0 +1,56 @@ +Mediatek MT8173 aka Chromebook Elm +================================== + +This file describes booting the Chromebook from an SD card containing +Buildroot kernel and rootfs, using the original bootloader. This is +the least invasive way to get Buildroot onto the devices and a good +starting point. + +The bootloader will only boot a kernel from a GPT partition marked +bootable with cgpt tool from vboot-utils package. +The kernel image must be signed using futility from the same package. +The signing part is done by sign.sh script in this directory. + +It does not really matter where rootfs is as long as the kernel is able +to find it, but this particular configuration assumes the kernel is on +partition 1 and rootfs is on partition 2 of the SD card. +Make sure to check kernel.args if you change this. + +Making the boot media +--------------------- +Start by configuring and building the images. + + make chromebook_elm_defconfig + make menuconfig # if necessary + make + +The important files are: + + uImage.kpart (kernel and device tree, signed) + rootfs.tar + bootsd.img (SD card image containing both kernel and rootfs) + +Write the image directly to some SD card. +WARNING: make sure there is nothing important on that card, +and double-check the device name! + + SD=/dev/mmcblk1 # may be /dev/sdX on some hosts + dd if=output/images/bootsd.img of=$SD + +Switching to developer mode and booting from SD +----------------------------------------------- +Power Chromebook down, then power it up while holding Esc+F3. +BEWARE: switching to developer mode deletes all user data. +Create backups if you need them. + +While in developer mode, Chromebook will boot into a white screen saying +"OS verification is off". + +Press Ctrl-D at this screen to boot Chromium OS from eMMC. +Press Ctrl-U at this screen to boot from SD (or USB) +Press Power to power it off. +Do NOT press Space unless you mean it. +This will switch it back to normal mode. + +The is no way to get rid of the white screen without re-flashing the bootloader. + diff --git a/buildroot/board/chromebook/elm/sign.sh b/buildroot/board/chromebook/elm/sign.sh new file mode 100755 index 000000000..af1f9d21c --- /dev/null +++ b/buildroot/board/chromebook/elm/sign.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +# This script creates u-boot FIT image containing the kernel and the DT, +# then signs it using futility from vboot-utils. +# The resulting file is called uImage.kpart. + +BOARD_DIR=$(dirname $0)/${BOARD_NAME} +mkimage=$HOST_DIR/bin/mkimage +futility=$HOST_DIR/bin/futility +devkeys=$HOST_DIR/share/vboot/devkeys + +run() { echo "$@"; "$@"; } +die() { echo "$@" >&2; exit 1; } +test -f $BINARIES_DIR/Image || \ + die "No kernel image found" +test -x $mkimage || \ + die "No mkimage found (host-uboot-tools has not been built?)" +test -x $futility || \ + die "No futility found (host-vboot-utils has not been built?)" + +# kernel.its references Image and mt8173-elm.dtb, and all three +# files must be in current directory for mkimage. +run cp $BOARD_DIR/kernel.its $BINARIES_DIR/kernel.its || exit 1 +echo "# entering $BINARIES_DIR for the next command" +(cd $BINARIES_DIR && run $mkimage -f kernel.its uImage.itb) || exit 1 + +# futility requires non-empty file to be supplied with --bootloader +# even if it does not make sense for the target platform. +echo > $BINARIES_DIR/dummy.txt + +run $futility vbutil_kernel \ + --keyblock $devkeys/kernel.keyblock \ + --signprivate $devkeys/kernel_data_key.vbprivk \ + --arch aarch64 \ + --version 1 \ + --config $BOARD_DIR/kernel.args \ + --vmlinuz $BINARIES_DIR/uImage.itb \ + --bootloader $BINARIES_DIR/dummy.txt \ + --pack $BINARIES_DIR/uImage.kpart || exit 1 + +rm -f $BINARIES_DIR/kernel.its $BINARIES_DIR/dummy.txt diff --git a/buildroot/board/chromebook/snow/mksd.sh b/buildroot/board/chromebook/mksd.sh similarity index 100% rename from buildroot/board/chromebook/snow/mksd.sh rename to buildroot/board/chromebook/mksd.sh diff --git a/buildroot/board/firefly/roc-rk3399-pc/extlinux.conf b/buildroot/board/firefly/roc-rk3399-pc/extlinux.conf new file mode 100644 index 000000000..50a358fad --- /dev/null +++ b/buildroot/board/firefly/roc-rk3399-pc/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399RocPC linux + kernel /boot/Image + devicetree /boot/rk3399-roc-pc.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/buildroot/board/firefly/roc-rk3399-pc/genimage.cfg b/buildroot/board/firefly/roc-rk3399-pc/genimage.cfg new file mode 100644 index 000000000..966c86927 --- /dev/null +++ b/buildroot/board/firefly/roc-rk3399-pc/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + size = 30M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/firefly/roc-rk3399-pc/post-build.sh b/buildroot/board/firefly/roc-rk3399-pc/post-build.sh new file mode 100755 index 000000000..1f5ff6a61 --- /dev/null +++ b/buildroot/board/firefly/roc-rk3399-pc/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/firefly/roc-rk3399-pc/readme.txt b/buildroot/board/firefly/roc-rk3399-pc/readme.txt new file mode 100644 index 000000000..8a6f1cdee --- /dev/null +++ b/buildroot/board/firefly/roc-rk3399-pc/readme.txt @@ -0,0 +1,40 @@ +Libre Computer Board ROC-RK3399-PC +=================================== + +Build: + + $ make roc_pc_rk3399_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── idbloader.img +├── Image +├── rk3399-roc-pc.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device + +Serial console +-------------- + +Baudrate for this board is 1500000 + +Wiki link: +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/roc-rk3399-pc.html diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template b/buildroot/board/freescale/common/imx/genimage.cfg.template index 2a7036a7d..61b09bde9 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template @@ -9,6 +9,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 index 75f182be6..568920508 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -9,6 +9,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_spl b/buildroot/board/freescale/common/imx/genimage.cfg.template_spl index d2d810777..3b0667c38 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_spl +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_spl @@ -9,6 +9,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh index 45c648e36..cb7c37bfc 100755 --- a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -9,19 +9,26 @@ main () fi if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin else ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin diff --git a/buildroot/board/freescale/common/imx/post-image.sh b/buildroot/board/freescale/common/imx/post-image.sh index 138ea7b12..06ccaac3a 100755 --- a/buildroot/board/freescale/common/imx/post-image.sh +++ b/buildroot/board/freescale/common/imx/post-image.sh @@ -38,6 +38,8 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then diff --git a/buildroot/board/freescale/common/mxs/genimage.cfg.template b/buildroot/board/freescale/common/mxs/genimage.cfg.template index e094fb7f2..c9da45282 100644 --- a/buildroot/board/freescale/common/mxs/genimage.cfg.template +++ b/buildroot/board/freescale/common/mxs/genimage.cfg.template @@ -8,6 +8,7 @@ image boot.vfat { vfat { + label = "boot" files = { %FILES% } diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch similarity index 54% rename from buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch rename to buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch index d57875f84..a9f88c264 100644 --- a/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch +++ b/buildroot/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch @@ -1,4 +1,4 @@ -From 90ecc0ad14337898b75843efc6530fc4a34f7808 Mon Sep 17 00:00:00 2001 +From e9a88fddc149fc52cdc5a8997f9fd3a29416c643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Tue, 12 Aug 2014 10:17:31 +0200 Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode @@ -14,23 +14,24 @@ This patch tells u-boot to tell the kernel to boot into /init (instead of buildroot system entirely through USB. Signed-off-by: Vincent Stehlé +Signed-off-by: Julien Olivain --- - include/configs/mx6sabre_common.h | 2 +- + include/configs/imx_env.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h -index 93d4c4b..d2e7efd 100644 ---- a/include/configs/mx6sabre_common.h -+++ b/include/configs/mx6sabre_common.h -@@ -52,7 +52,7 @@ +diff --git a/include/configs/imx_env.h b/include/configs/imx_env.h +index c03748d93f..aa1a8bf488 100644 +--- a/include/configs/imx_env.h ++++ b/include/configs/imx_env.h +@@ -29,7 +29,7 @@ - #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \ + #define CONFIG_MFG_ENV_SETTINGS_DEFAULT \ + "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ + "rdinit=/init " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ + "clk_ignore_unused "\ + "\0" \ + "kboot="MFG_BOOT_CMD"\0"\ -- -2.1.4 +2.26.2 diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch deleted file mode 100644 index b8989cb96..000000000 --- a/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 -From: Trent Piepho -Date: Fri, 6 Apr 2018 17:11:27 -0700 -Subject: [PATCH] imx: Create distinct pre-processed mkimage config files - -Each imx image is created by a separate sub-make and during this process -the mkimage config file is run though cpp. - -The cpp output is to the same file no matter what imx image is being -created. - -This means if two imx images are generated in parallel they will attempt -to independently produce the same pre-processed mkimage config file at -the same time. - -Avoid the problem by making the pre-processed config file name unique -based on the imx image it will be used in. This way each image will -create a unique config file and they won't clobber each other when run -in parallel. - -This should fixed the build bug referenced in b5b0e4e3 ("imximage: -Remove failure when no IVT offset is found"). - -Cc: Breno Lima -Cc: Thomas Petazzoni -Cc: Fabio Estevam -Signed-off-by: Trent Piepho -Tested-by: Fabio Estevam -[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] -Signed-off-by: Fabio Estevam ---- - arch/arm/imx-common/Makefile | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile -index d862258..f1bae8d 100644 ---- a/arch/arm/imx-common/Makefile -+++ b/arch/arm/imx-common/Makefile -@@ -69,9 +69,11 @@ endif - quiet_cmd_cpp_cfg = CFGS $@ - cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< - --IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp -+# mkimage source config file -+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) - --$(IMX_CONFIG): %.cfgtmp: % FORCE -+# How to create a cpp processed config file, they all use the same source -+%.cfgout: $(IMX_CONFIG) FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cpp_cfg) - -@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim - -e $(CONFIG_SYS_TEXT_BASE) - u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log - --u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - ifeq ($(CONFIG_OF_SEPARATE),y) -@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i - -e $(CONFIG_SYS_TEXT_BASE) - u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log - --u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - endif - - MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ - -e $(CONFIG_SPL_TEXT_BASE) -- - SPL: MKIMAGEOUTPUT = SPL.log - --SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ -@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ - spl/u-boot-nand-spl.imx: SPL FORCE - $(call if_changed,u-boot-nand-spl_imx) - --targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) -+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) --- -2.7.4 - diff --git a/buildroot/board/freescale/imx6ullevk/readme.txt b/buildroot/board/freescale/imx6ullevk/readme.txt new file mode 100644 index 000000000..77acec261 --- /dev/null +++ b/buildroot/board/freescale/imx6ullevk/readme.txt @@ -0,0 +1,71 @@ +**************************** +Freescale i.MX6ULL EVK board +**************************** + +This file documents the Buildroot support for the Freescale i.MX6ULL EVK board. + +Build +===== + +First, configure Buildroot for your i.MX6ULL EVK board: + +In order to to do so there are two supported options: + + make freescale_imx6ullevk_defconfig + +if you plan to use NXP provided U-Boot and kernel. + +or + + make imx6ullevk_defconfig + +if you plan to use mainline U-Boot and mainline kernel. + +Build all components: + + make + +You will find in output/images/ the following files: + - boot.vfat + - imx6ull-14x14-evk.dtb + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot.imx + - zImage + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=./output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template. + +Boot the i.MX6ULL EVK board +=========================== + +To boot your newly created system (refer to the i.MX 6ULL EVK Quick Start Guide [1] for guidance): +- insert the SD card in the micro SD slot of the board; +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + +References +========== +[1] https://www.nxp.com/files-static/32bit/doc/brochure/IMX6ULLQSG.pdf diff --git a/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch deleted file mode 100644 index b8989cb96..000000000 --- a/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 -From: Trent Piepho -Date: Fri, 6 Apr 2018 17:11:27 -0700 -Subject: [PATCH] imx: Create distinct pre-processed mkimage config files - -Each imx image is created by a separate sub-make and during this process -the mkimage config file is run though cpp. - -The cpp output is to the same file no matter what imx image is being -created. - -This means if two imx images are generated in parallel they will attempt -to independently produce the same pre-processed mkimage config file at -the same time. - -Avoid the problem by making the pre-processed config file name unique -based on the imx image it will be used in. This way each image will -create a unique config file and they won't clobber each other when run -in parallel. - -This should fixed the build bug referenced in b5b0e4e3 ("imximage: -Remove failure when no IVT offset is found"). - -Cc: Breno Lima -Cc: Thomas Petazzoni -Cc: Fabio Estevam -Signed-off-by: Trent Piepho -Tested-by: Fabio Estevam -[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] -Signed-off-by: Fabio Estevam ---- - arch/arm/imx-common/Makefile | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile -index d862258..f1bae8d 100644 ---- a/arch/arm/imx-common/Makefile -+++ b/arch/arm/imx-common/Makefile -@@ -69,9 +69,11 @@ endif - quiet_cmd_cpp_cfg = CFGS $@ - cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< - --IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp -+# mkimage source config file -+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) - --$(IMX_CONFIG): %.cfgtmp: % FORCE -+# How to create a cpp processed config file, they all use the same source -+%.cfgout: $(IMX_CONFIG) FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cpp_cfg) - -@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim - -e $(CONFIG_SYS_TEXT_BASE) - u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log - --u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - ifeq ($(CONFIG_OF_SEPARATE),y) -@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i - -e $(CONFIG_SYS_TEXT_BASE) - u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log - --u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - endif - - MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ - -e $(CONFIG_SPL_TEXT_BASE) -- - SPL: MKIMAGEOUTPUT = SPL.log - --SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE -+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE - $(call if_changed,mkimage) - - MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ -@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ - spl/u-boot-nand-spl.imx: SPL FORCE - $(call if_changed,u-boot-nand-spl_imx) - --targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) -+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) --- -2.7.4 - diff --git a/buildroot/board/freescale/imx8mnevk/readme.txt b/buildroot/board/freescale/imx8mnevk/readme.txt new file mode 100644 index 000000000..d7700568f --- /dev/null +++ b/buildroot/board/freescale/imx8mnevk/readme.txt @@ -0,0 +1,73 @@ +*************************** +Freescale i.MX8MN EVK board +*************************** + +This file documents the Buildroot support for the i.MX8M Nano EVK board. + +Build +===== + +First, configure Buildroot for the i.MX8MN EVK board: + + make freescale_imx8mnevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - ddr4_201810_fw.bin + - ddr_fw.bin + - fsl-imx8mn-ddr4-evk.dtb + - Image + - imx8-boot-sd.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot.imx + - u-boot.itb + - u-boot-nodtb.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8MN EVK board +========================== + +To boot your newly created system (refer to the i.MX8MNano EVK Quick Start Guide +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows (X = "don't care"): +SW1101: 1100XXXXXX [D1-D10] +SW1102: XXXXXXXXXX [D1-D10] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + +References +========== +[1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-nano-applications-processor:8MNANOD4-EVK diff --git a/buildroot/board/freescale/imx8mqevk/readme.txt b/buildroot/board/freescale/imx8mqevk/readme.txt index e60eba4cb..61fb2bc80 100644 --- a/buildroot/board/freescale/imx8mqevk/readme.txt +++ b/buildroot/board/freescale/imx8mqevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MQ EVK board: +If you want to use the NXP kernel: + make freescale_imx8mqevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mqevk_defconfig + Build all components: make diff --git a/buildroot/board/freescale/imx8qmmek/readme.txt b/buildroot/board/freescale/imx8qmmek/readme.txt new file mode 100644 index 000000000..b6bb3c476 --- /dev/null +++ b/buildroot/board/freescale/imx8qmmek/readme.txt @@ -0,0 +1,76 @@ +*************************** +Freescale i.MX8QM MEK board +*************************** + +This file documents the Buildroot support for the NXP i.MX8QM MEK board. + +You will find a reference to the board on nxp.com: +https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/i.mx-8quadmax-multisensory-enablement-kit-mek:MCIMX8QM-CPU + +You can also find the get started guide here: +https://www.nxp.com/document/guide/get-started-with-the-i.mx-8quadmax-mek:GS-iMX-8QM-MEK + +Build +===== + +First, configure Buildroot for the i.MX8QM MEK board: + +$ make freescale_imx8qmmek_defconfig + +Build all components: + +$ make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - fsl-imx8qm-mek.dtb + - Image + - imx8-boot-sd.bin + - mkimg.commit + - mx8qm-mek-scfw-tcm.bin + - mx8qm-val-scfw-tcm.bin + - mx8qm-a0-ddr4-scfw-tcm.bin + - mx8qm-a0-mek-scfw-tcm.bin + - mx8qm-a0-val-scfw-tcm.bin + - mx8qm-ddr4-scfw-tcm.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf.bin + - u-boot.bin + - u-boot-hash.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8QM MEK board +========================== + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the boot switch as follows: +SW2: OFF OFF ON ON OFF OFF +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf b/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf new file mode 100644 index 000000000..31c6b30d3 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopc-t4/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_NanoPC_T4 linux + kernel /Image + devicetree /rk3399-nanopc-t4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rootwait diff --git a/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg b/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg new file mode 100644 index 000000000..b3202f75d --- /dev/null +++ b/buildroot/board/friendlyarm/nanopc-t4/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-nanopc-t4.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/friendlyarm/nanopc-t4/post-build.sh b/buildroot/board/friendlyarm/nanopc-t4/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopc-t4/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopc-t4/readme.txt b/buildroot/board/friendlyarm/nanopc-t4/readme.txt new file mode 100644 index 000000000..6259c9e75 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopc-t4/readme.txt @@ -0,0 +1,45 @@ +FriendlyARM NANOPC-T4 +===================== + +Build: + + $ make nanopc_t4_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-nanopc-t4.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device + +Serial console +-------------- + +Baudrate for this board is 1500000 + +Login: +------ +Apply power and press the PWR button for 3 sec. Enter 'root' as login user, and the prompt is ready. + +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/npc_t4.html diff --git a/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf b/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf new file mode 100644 index 000000000..fb24f09eb --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-m4/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_NANOPI_M4 linux + kernel /Image + devicetree /rk3399-nanopi-m4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg b/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg new file mode 100644 index 000000000..f14d493a9 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-m4/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-nanopi-m4.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/friendlyarm/nanopi-m4/post-build.sh b/buildroot/board/friendlyarm/nanopi-m4/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-m4/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-m4/readme.txt b/buildroot/board/friendlyarm/nanopi-m4/readme.txt new file mode 100644 index 000000000..4a606cf97 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-m4/readme.txt @@ -0,0 +1,45 @@ +FriendlyARM NANOPI-M4 +===================== + +Build: + + $ make nanopi_m4_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-nanopi-m4.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device + +Serial console +-------------- + +Baudrate for this board is 1500000 + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf b/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf new file mode 100644 index 000000000..91eef67fb --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo4/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi Neo4 linux + kernel /boot/Image + devicetree /boot/rk3399-nanopi-neo4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait diff --git a/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg new file mode 100644 index 000000000..966c86927 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo4/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + size = 30M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh new file mode 100755 index 000000000..1f5ff6a61 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo4/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-neo4/readme.txt b/buildroot/board/friendlyarm/nanopi-neo4/readme.txt new file mode 100644 index 000000000..07e349145 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo4/readme.txt @@ -0,0 +1,53 @@ +Intro +===== + +NanoPi Neo4 is a RK3399 SoC based ARM64 board. + + +Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4 +Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html + +Build +===== + +Run NanoPi Neo4 configuration + + $ make nanopi_neo4_defconfig + +To build, run make comamnd. + + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.bin +├── bl31.elf +├── Image +├── rk3399-nanopi-neo4.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +├── u-boot.itb +├── u-boot-spl-dtb.bin +├── u-boot-tpl-dtb.bin +├── u-boot-tpl-dtb.img +└── u-boot-tpl-spl-dtb.img + +Creating bootable SD card: +========================= + +Simply invoke (as root) + + # dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device + +Serial console +-------------- + +Baudrate for this board is 1500000 diff --git a/buildroot/board/friendlyarm/nanopi-r1/boot.cmd b/buildroot/board/friendlyarm/nanopi-r1/boot.cmd new file mode 100644 index 000000000..9f0cdbfe5 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/boot.cmd @@ -0,0 +1,8 @@ +setenv fdt_high ffffffff + +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-r1.dtb + +bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg b/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg new file mode 100644 index 000000000..6f5f35dcd --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/genimage.cfg @@ -0,0 +1,36 @@ +# Minimal SD card image for the NanoPi M1 +# +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-h3-nanopi-r1.dtb", + "boot.scr" + } + } + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config b/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config new file mode 100644 index 000000000..206b3810a --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/kernel/linux-extras.config @@ -0,0 +1,2 @@ +# USB ethernet +CONFIG_USB_RTL8152=y diff --git a/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts b/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts new file mode 100644 index 000000000..ca15a57be --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2019 Igor Pecovnik + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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 file 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. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "sun8i-h3-nanopi.dtsi" + +/ { + model = "FriendlyElec NanoPi-R1"; + compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; + + aliases { + serial1 = &uart3; + ethernet0 = &emac; + ethernet1 = &emac; + ethernet2 = &sdio_wifi; + }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + }; + + reg_gmac_3v3: gmac-3v3 { + compatible = "regulator-fixed"; + regulator-name = "gmac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + enable-active-high; + gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + }; + + leds { + /delete-node/ status; + /delete-node/ pwr; + led1 { + label = "LED1"; + gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + + led2 { + label = "LED2"; + gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; + default-state = "off"; + linux,default-trigger = "netdev"; + }; + + led3 { + label = "LED3"; + gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; + default-state = "off"; + linux,default-trigger = "netdev"; + }; + }; + + r_gpio_keys { + compatible = "gpio-keys"; + input-name = "k1"; + pinctrl-names = "default"; + pinctrl-0 = <&sw_r_npi>; + + /delete-node/ k1; + reset { + label = "reset"; + linux,code = ; + gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; + phy-mode = "rgmii"; + + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; + +&mmc1 { + vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; + + sdio_wifi: sdio_wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + interrupt-parent = <&pio>; + interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ + interrupt-names = "host-wake"; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&usb_otg { + dr_mode = "peripheral"; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; diff --git a/buildroot/board/friendlyarm/nanopi-r1/readme.txt b/buildroot/board/friendlyarm/nanopi-r1/readme.txt new file mode 100644 index 000000000..0ff63df3c --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/readme.txt @@ -0,0 +1,29 @@ +NanoPi R1 + +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi R1. With the current configuration +it will bring-up the board, and allow access through the serial console. + +How to build it +=============== + +Configure Buildroot: + + $ make nanopi_r1_defconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig b/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig new file mode 100644 index 000000000..e028b41a4 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig @@ -0,0 +1,22 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MACPWR="PD6" +# CONFIG_VIDEO_DE2 is not set +CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CLK_FREQ=480000000 +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts b/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts new file mode 100644 index 000000000..9c3c574e0 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2019 Igor Pecovnik + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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 file 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. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "sun8i-h3-nanopi.dtsi" + +/ { + model = "FriendlyARM NanoPi R1"; + compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; + + reg_gmac_3v3: gmac-3v3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + regulator-name = "gmac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + enable-active-high; + gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + }; + +}; + +&ehci0 { + status = "okay"; +}; + +&pio { + gmac_power_pin_nanopi: gmac_power_pin@0 { + pins = "PD6"; + function = "gpio_out"; + }; +}; + +&ohci0 { + status = "okay"; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; + phy-mode = "rgmii"; + + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; diff --git a/buildroot/board/globalscale/espressobin/genimage.cfg b/buildroot/board/globalscale/espressobin/genimage.cfg new file mode 100644 index 000000000..360c8f098 --- /dev/null +++ b/buildroot/board/globalscale/espressobin/genimage.cfg @@ -0,0 +1,11 @@ +# Minimal image, no U-boot since v3/v5 cannot boot from sdcard, see +# readme.txt for details on configuring the on-board u-boot. +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/globalscale/espressobin/linux-extras.config b/buildroot/board/globalscale/espressobin/linux-extras.config new file mode 100644 index 000000000..7ce0a495c --- /dev/null +++ b/buildroot/board/globalscale/espressobin/linux-extras.config @@ -0,0 +1,14 @@ +# +# The Espressobin has a switchcore with full support in the kernel. +# This fragment enables DSA and its drivers, inclding VLAN aware bridge +# support to allow users to easily set up a LAN switch + WAN interface. +# +CONFIG_NET_DSA=m +CONFIG_VLAN_8021Q=y + +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y + +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_PTP=y diff --git a/buildroot/board/globalscale/espressobin/readme.txt b/buildroot/board/globalscale/espressobin/readme.txt new file mode 100644 index 000000000..c5af7e3c9 --- /dev/null +++ b/buildroot/board/globalscale/espressobin/readme.txt @@ -0,0 +1,90 @@ +Marvell ESPRESSObin +=================== + +This default configuration allows you to quickly get up and running with +the Marvell ESPRESSObin board by Globalscale Technologies Inc. + +The ESPRESSObin is based on the Marvell Armada 88F3720 SoC, coupled with +a Marvell 88E6341 switch core "Topaz", with three exposed gigabit ports. + + _________________________ + |# U W L L U #| + |# S A A A S #| + |# B N N N B #| + |# 0 1 #| + |# Mini #| + |# -PCI #| + |# #| + |# 5 #| + |#__V___usb_PWR_SATA__SW_#| + + Fig 1: Overview of board + +Notice difference in Ethernet port layout compared to the Globalscale +docs. They order the ports; LAN2, LAN1, WAN (left to right in figure +above). For more information, see http://espressobin.net + + +Building +-------- + + $ make globalscale_espressobin_defconfig + $ make + +This generates the kernel image, the devicetree binary, the rootfs as a +tar.gz, and a filesystem image containing everything. + +All build artifacts are located in `output/images/` + + +Booting +------- + +To boot, you need a UART connection, using the on-board micro USB port +set to 115200 8N1. + +By default, the ESPRESSObin comes with a pre-flashed U-Boot set up to +load the kernel, device-tree and rootfs from SPI NOR flash. The board +jumpers can be changed to boot from different sources, see the quick +start guide for each board revision for details: + +- ftp://downloads.globalscaletechnologies.com/Downloads/Espressobin/ESPRESSObin%20V5/ +- ftp://downloads.globalscaletechnologies.com/Downloads/Espressobin/ESPRESSObin%20V7/ + +Note: the v5, and earlier, cannot boot from sdcard, so you have to set +up the factory U-Boot to boot into Buildroot: + +1. Flash rootfs image to sdcard drive, your `of=` device may differ: + + $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=1M + $ sync + +2. Boot board from SPI NOR, interrupt boot by pressing any key ... +3. Check with `printenv` that the default setup is OK, otherwise ensure + the following are set, and define `bootcmd` for automatic boot: + + > setenv kernel_addr 0x5000000 + > setenv fdt_addr 0x1800000 + > setenv fdt_name boot/armada-3720-espressobin.dtb + > setenv console console=ttyMV0,115200 earlycon=ar3700_uart,0xd0012000 + > setenv bootcmd 'mmc dev 0; ext4load mmc 0:1 $kernel_addr $image_name;ext4load mmc 0:1 $fdt_addr $fdt_name;setenv bootargs $console root=/dev/mmcblk0p1 rw rootwait; booti $kernel_addr - $fdt_addr' + +4. Call the boot command, or `reset` the board to start: + + > run bootcmd + + +Networking +---------- + +To enable Ethernet networking, load the `mv88e6xxx` kernel module, and +bring up each respective interface needed: + + # modprobe mv88e6xxx + # ifconfig wan up + +A more advanced scenario is setting up switching between the ports using +the Linux bridge. The kernel switchdev layer, and DSA driver, ensure +switch functions are "offloaded" to the HW switch, i.e., all traffic +between LAN ports never reach the CPU. For this you need the iproute2 +suite of tools. diff --git a/buildroot/board/grinn/chiliboard/post-image.sh b/buildroot/board/grinn/chiliboard/post-image.sh deleted file mode 100755 index 1a076eecb..000000000 --- a/buildroot/board/grinn/chiliboard/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/buildroot/board/grinn/liteboard/post-image.sh b/buildroot/board/grinn/liteboard/post-image.sh deleted file mode 100755 index 1a076eecb..000000000 --- a/buildroot/board/grinn/liteboard/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/buildroot/board/hardkernel/odroidc2/boot.cmd b/buildroot/board/hardkernel/odroidc2/boot.cmd new file mode 100644 index 000000000..d800a6d44 --- /dev/null +++ b/buildroot/board/hardkernel/odroidc2/boot.cmd @@ -0,0 +1,11 @@ +setenv kernel_filename "Image" +setenv fdt_filename "meson-gxbb-odroidc2.dtb" +setenv bootargs "console=ttyAML0,115200n8 earlyprintk root=/dev/mmcblk1p2 rootwait rw" + +echo > Loading Kernel... +fatload mmc 0:1 ${kernel_addr_r} ${kernel_filename} +echo > Loading FDT... +fatload mmc 0:1 ${fdt_addr_r} ${fdt_filename} + +echo > Booting System... +booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/buildroot/board/hardkernel/odroidc2/genimage.cfg b/buildroot/board/hardkernel/odroidc2/genimage.cfg new file mode 100644 index 000000000..f49c1deaf --- /dev/null +++ b/buildroot/board/hardkernel/odroidc2/genimage.cfg @@ -0,0 +1,38 @@ +image boot.vfat { + vfat { + files = { + "Image", + "meson-gxbb-odroidc2.dtb", + "boot.scr" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition bl1 { + in-partition-table = "no" + image = "bl1.bin.hardkernel" + offset = 0 + } + + partition u-boot { + in-partition-table = "no" + image = "uboot-odc2.img" + offset = 49664 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/hardkernel/odroidc2/post-image.sh b/buildroot/board/hardkernel/odroidc2/post-image.sh new file mode 100755 index 000000000..eb6fd4f09 --- /dev/null +++ b/buildroot/board/hardkernel/odroidc2/post-image.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +${HOST_DIR}/bin/fip_create \ + --bl30 ${BINARIES_DIR}/bl30.bin \ + --bl301 ${BINARIES_DIR}/bl301.bin \ + --bl31 ${BINARIES_DIR}/bl31.bin \ + --bl33 ${BINARIES_DIR}/u-boot.bin \ + ${BINARIES_DIR}/fip.bin + +${HOST_DIR}/bin/fip_create --dump ${BINARIES_DIR}/fip.bin + +cat ${BINARIES_DIR}/bl2.package ${BINARIES_DIR}/fip.bin \ + > ${BINARIES_DIR}/boot_new.bin + +${HOST_DIR}/bin/amlbootsig ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img + +dd if=${BINARIES_DIR}/u-boot.img of=${BINARIES_DIR}/uboot-odc2.img bs=512 skip=96 + +support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg diff --git a/buildroot/board/hardkernel/odroidc2/readme.txt b/buildroot/board/hardkernel/odroidc2/readme.txt new file mode 100644 index 000000000..24847827a --- /dev/null +++ b/buildroot/board/hardkernel/odroidc2/readme.txt @@ -0,0 +1,64 @@ +ODROID-C2 + +Intro +===== +To be able to use ODROID-C2 board with the images generated by +Buildroot, you have to prepare the SDCard or eMMC. + +How to build it +=============== + + $ make odroidc2_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build rootfs image: + + $ make + +Note: you will need to have access to the network, since Buildroot will +download the packages' sources. + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- bl1.bin.hardkernel + +-- bl2.package + +-- bl301.bin + +-- bl30.bin + +-- bl31.bin + +-- boot_new.bin + +-- boot.scr [1] + +-- boot.vfat + +-- fip.bin + +-- Image [2] + +-- meson-gxbb-odroidc2.dtb + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.bin + +-- u-boot.img + +-- uboot-odc2.img [3] + +[1] This is the ODROID-C2 configuration file used in u-boot. +[2] This is the ODROID-C2 kernel image file which will be booted. +[3] This is the ODROID-C2 signed u-boot image which will be used. + +How to write the SD card or eMMC +================================ + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Insert the SDcard into your ODROID-C2, and power it up. Your new system +should come up now. diff --git a/buildroot/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload b/buildroot/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload new file mode 100755 index 000000000..8d694a733 --- /dev/null +++ b/buildroot/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload @@ -0,0 +1,23 @@ +#!/bin/sh +# + +load_drivers() +{ + echo "Loading needed modules..." + for file in $(echo "dwmac_generic dwmac-meson8b meson_dw_hdmi meson_gxbb_wdt"); do + modprobe ${file} + done +} + +case "$1" in + start) + load_drivers + ;; + stop) + ;; + restart|reload) + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/buildroot/board/kontron/smarc-sal28/extlinux.conf b/buildroot/board/kontron/smarc-sal28/extlinux.conf new file mode 100644 index 000000000..bf60bc379 --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait diff --git a/buildroot/board/kontron/smarc-sal28/genimage.cfg b/buildroot/board/kontron/smarc-sal28/genimage.cfg new file mode 100644 index 000000000..9ef37de75 --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/genimage.cfg @@ -0,0 +1,11 @@ +image sdcard-emmc.img { + hdimage { + gpt = true + } + + partition rootfs { + offset = 2M + image = rootfs.ext4 + partition-uuid = %PARTUUID% + } +} diff --git a/buildroot/board/kontron/smarc-sal28/post-build.sh b/buildroot/board/kontron/smarc-sal28/post-build.sh new file mode 100755 index 000000000..bf8861f6a --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/buildroot/board/kontron/smarc-sal28/readme.txt b/buildroot/board/kontron/smarc-sal28/readme.txt new file mode 100644 index 000000000..231c751b6 --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/readme.txt @@ -0,0 +1,80 @@ +Kontron SMARC-sAL28 +=================== + +How to build it +=============== + +Configure Buildroot: + + $ make kontron_smarc_sal28_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + +Copying the image to a storage device +===================================== + +Buildroot builds an image which can be written to the internal eMMC +storage, a SD card or an USB thumb drive. You can use the following +command on your host: + + $ sudo dd if=output/images/sdcard-emmc.img of=/dev/sdx bs=1M + +Where /dev/sdx is the corresponding block device of your SD card or USB +thumb drive. To flash it on your internal eMMC use the following command on +the board: + + # dd if=sdcard-emmc.img of=/dev/mmcblk1 bs=1M + +Be sure you have not booted from the internal eMMC in this case! + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. Consult the vendor documentation on how to use the +DIP switches to select specific boot devices. To use the bootloader +environment set the boot_targets correspondingly. E.g.: + + # setenv boot_targets usb0 + +To boot from an USB thumb drive. + +The device tree is loaded according to the filename in fdtfile. The +following command will set the default device tree, which works on almost +all variants (with less features of course): + + # setenv fdtfile freescale/fsl-ls1028a-kontron-sl28.dtb + +Set this to a device tree which fits your board variant. + +Connect your serial cable to SER1 and open your favorite terminal emulation +program (baudrate 115200, 8n1). E.g.: + + $ picocom -b 115200 /dev/ttyUSB0 + +You will get a warning reported by fdisk when you examine the SD card. +This is because the genimage.cfg file doesn't specify the SD card size +(as people will naturally have different sized cards), so the +secondary GPT header is placed after the rootfs rather than at the end +of the disk where it is expected to be. + +You will see something like this at boot time: + +[ 4.552797] GPT:Primary header thinks Alt. header is not at the end of the disk. +[ 4.560237] GPT:266272 != 7864319 +[ 4.563565] GPT:Alternate GPT header not at the end of the disk. +[ 4.569596] GPT:266272 != 7864319 +[ 4.572925] GPT: Use GNU Parted to correct GPT errors. + +What does not work +================== + +For reasons unknown, the network card doesn't work if you use the original +vendor bootloader. Board support patches for upstream u-boot are currently +pending. Stay tuned. diff --git a/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-enetc-networking.rules b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-enetc-networking.rules new file mode 100644 index 000000000..8774bc558 --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-enetc-networking.rules @@ -0,0 +1,8 @@ +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME="eno0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME="eno1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME="eno2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME="eno3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME="eno0vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME="eno0vf1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME="eno1vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME="eno1vf1" diff --git a/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-felix-networking.rules b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-felix-networking.rules new file mode 100644 index 000000000..917c0244a --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/70-felix-networking.rules @@ -0,0 +1,6 @@ +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" diff --git a/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/71-smarc-networking.rules b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/71-smarc-networking.rules new file mode 100644 index 000000000..8c946b05f --- /dev/null +++ b/buildroot/board/kontron/smarc-sal28/rootfs_overlay/etc/udev/rules.d/71-smarc-networking.rules @@ -0,0 +1,19 @@ +# Map the GBE0 and GBE1 names from the SMARC standard to the network +# interfaces. This depends on the variant of the board. + +# get the variant compatible string +PROGRAM=="/bin/grep '^kontron,sl28-var[1-4]$' /sys/firmware/devicetree/base/compatible", ENV{sl28_compatible}="%c" + +# variant 1 +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", ENV{sl28_compatible}=="kontron,sl28-var1", NAME="gbe0" + +# variant 2 +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", ENV{sl28_compatible}=="kontron,sl28-var2", NAME="gbe0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", ENV{sl28_compatible}=="kontron,sl28-var2", NAME="gbe1" + +# variant 3 +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", ENV{sl28_compatible}=="kontron,sl28-var3", NAME="gbe0" + +# variant 4 +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", ENV{sl28_compatible}=="kontron,sl28-var4", NAME="gbe0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", ENV{sl28_compatible}=="kontron,sl28-var4", NAME="gbe1" diff --git a/buildroot/board/olpc/genimage.cfg b/buildroot/board/olpc/genimage.cfg new file mode 100644 index 000000000..baafe3171 --- /dev/null +++ b/buildroot/board/olpc/genimage.cfg @@ -0,0 +1,9 @@ +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/olpc/linux.config b/buildroot/board/olpc/linux.config new file mode 100644 index 000000000..538f7c594 --- /dev/null +++ b/buildroot/board/olpc/linux.config @@ -0,0 +1,71 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CFG80211=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +CONFIG_RFKILL=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_GPIO_SYSFS=y +CONFIG_NETDEVICES=y +CONFIG_LIBERTAS=m +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900 +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TABLET=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_POWER_SUPPLY=y +CONFIG_BATTERY_OLPC=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_DRM=y +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FB_SIMPLE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_FONTS=y +CONFIG_FONT_TER16x32=y diff --git a/buildroot/board/olpc/olpc.fth b/buildroot/board/olpc/olpc.fth new file mode 100644 index 000000000..b4cbecf11 --- /dev/null +++ b/buildroot/board/olpc/olpc.fth @@ -0,0 +1,47 @@ +\ OLPC XO boot script + +: (visible) " unfreeze visible" evaluate ; +' (visible) catch drop forget (visible) + +" /aliases" find-device " last" get-property +abort" No last alias" +" /pci/sd@c" 2over substring? if " root=/dev/mmcblk0p1 " to boot-file then +" /sd/sdhci@d4280000" 2over substring? if " root=/dev/mmcblk1p1 " to boot-file then +" /pci/usb@" 2over substring? if " root=/dev/sda1 " to boot-file then +" /usb@" 2over substring? if " root=/dev/sda1 " to boot-file then +" /pci/nandflash@c" 2over substring? if " root=/dev/mtdblock0 rootfstype=jffs2 " to boot-file then +2drop + +root-device " compatible" get-property dend if 0 0 then ( compatible$ ) +" olpc,xo-1.75" 2over sindex -1 > if ( compatible$ ) + \ Version check on XO-1.75 + " mrvl,mmp2" 2over sindex -1 = if ( compatible$ ) + 2drop ( ) + cr + ." Firmware Q4E00 or newer is needed to boot a Devicetree enabled kernel." cr + cr + ." One way to update is to copy http://dev.laptop.org/~quozl/q4e00ja.rom" cr + ." to a FAT partition on a USB flash stick and run ""flash u:\q4e00ja.rom""" cr + cr + ." Aborting boot." cr + " show-sad" evaluate + abort + then +then ( compatible$ ) + +" mmp" 2swap sindex -1 > if + \ A Marvell MMP-based machine + " last:\boot\zImage" to boot-device + boot-file " console=ttyS2,115200 " $cat2 to boot-file +else + \ Assume XO-1 + " last:\boot\bzImage" to boot-device + boot-file " console=ttyS0,115200 reboot=pci " $cat2 to boot-file +then + +\ Pick a terminal that looks better on the XO screen +root-device " architecture" get-property dend if 0 0 else 1- then +" OLPC" $= if boot-file " fbcon=font:TER16x32 vt.color=0xf0 " $cat2 to boot-file then + +boot-file " console=tty0 rootwait" $cat2 to boot-file +boot diff --git a/buildroot/board/olpc/post-build.sh b/buildroot/board/olpc/post-build.sh new file mode 100755 index 000000000..4d4cf9708 --- /dev/null +++ b/buildroot/board/olpc/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +install -m 0644 -D $BOARD_DIR/olpc.fth $TARGET_DIR/boot/olpc.fth diff --git a/buildroot/board/olpc/readme.txt b/buildroot/board/olpc/readme.txt new file mode 100644 index 000000000..f1110c82c --- /dev/null +++ b/buildroot/board/olpc/readme.txt @@ -0,0 +1,98 @@ +OLPC XO Laptops +=============== + +This document explains how to build and run images that run on the OLPC +XO laptops. + +Supported models +---------------- + +* OLPC XO-1 + The original NS Geode based OLPC laptop, uses the x86 architecture. + Can be booted either from an internal MTD device formatted with JFFS2 + or from a FAT or EXT4 partition on a SD card or a USB flash stick. + +* OLPC XO-7.5 + The ARM-based laptop. Needs a recent enough firmware to provide a good + enough flattened device tree to the kernel. Can be from a FAT or EXT4 + partition on a internal eMMC, a SD card or a USB flash stick. + +Configure and build +=================== + + $ make olpc_xo1_defconfig # Configure for XO-1 + +or: + + $ make olpc_xo175_defconfig # Configure for XO-1.75 + +Then: + + $ make menuconfig # Customize the build configuration + $ make # Build + +Preparing the machine +===================== + +Firmware security +----------------- + +Most OLPC machines were shipped with the security system that disallows +booting unsigned software. If this is the case with your machine, in order +to run the image you've built on it you'll need to get a developer key and +deactivate the security system. + +The procedure is descriped in the OLPC wiki: +http://wiki.laptop.org/go/Activation_and_Developer_Keys + +Firmware upgrade +---------------- + +It is always preferrable to use an up to date firmware. The firmware images +are available at http://wiki.laptop.org/go/Firmware. For the XO-1.75 laptop +to boot the mainline kernel a firmware Q4E00JA or newer is needed. You can +get it at http://dev.laptop.org/~quozl/q4e00ja.rom. + +To update the firmware, place the .rom file on to your bootable media, +connect a charged battery pack and a wall adapter, and enter the Open +Firmware prompt by pressing ESC during the early boot (needs an unlocked +laptop -- see "Firmware security" above). Then use the "flash" command +to update the firmware: + + ok flash ext:\q4e00ja.rom \ Flash the "q4e00ja.rom" from the SD card + ok flash u:\q4e00ja.rom \ Flash the "q4e00ja.rom" from USB stick + +Create the bootable SD card or USB flash stick +============================================== + +When the build is finished, an image file called "sdcard.img" will be created. +It is suitable for writing directly to a SD card, USB flash stick or (on a +XO-1.75) the internal eMMC flash. + +Before writing the image, please double check that you're using the right +device (e.g. with "lsblk" command). Doing the following will DESTROY ALL DATA +that's currently on the media. + + # cat output/images/sdcard.img >/dev/ + +Flashing the JFFS2 image (XO-1 only) +==================================== + +Unlike XO-1.75, the internal NAND flash on XO-1 is accessed without a +FTL and needs a flash-friendly filesystem. A build configured for XO-1 +creates a file named "root.jffs2" that can be written to it. + +One way to write it is from the Open Firmware prompt. First, partition +and format a USB flash disk with a FAT file system and place the +"root.jffs2" file onto it. Then power on the machine, enter the +Open Firmware port by pressing the ESC key and run the following: + + ok patch noop ?open-crcs copy-nand \ Disable CRC check + ok copy-nand u:\root.jffs2 + +Booting the machine +=================== + +Once your machine is unlocked, it will automatically boot from your media +wherever it will detect it attached to the USB bus or the SD card slot, +otherwise it will proceed booting from the internal flash. diff --git a/buildroot/board/olpc/xo-1.75/linux.config b/buildroot/board/olpc/xo-1.75/linux.config new file mode 100644 index 000000000..937cc38bd --- /dev/null +++ b/buildroot/board/olpc/xo-1.75/linux.config @@ -0,0 +1,55 @@ +CONFIG_ARCH_MMP=y +CONFIG_MACH_MMP2_DT=y +CONFIG_MACH_MMP3_DT=y +CONFIG_USB_EHCI_MV_U2O=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=16 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_SENSORS_LIS3_SPI=y +CONFIG_SERIO_OLPC_APSP=y +CONFIG_REGULATOR_88PG86X=m +CONFIG_MEDIA_PLATFORM_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_MMP_CAMERA=y +CONFIG_DRM_ARMADA=y +CONFIG_DRM_CHRONTEL_CH7033=m +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_SIMPLE_BRIDGE=m +CONFIG_DRM_ETNAVIV=m +CONFIG_USB_EHCI_MV=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_PXAV3=y +CONFIG_OLPC_XO175=y +CONFIG_OLPC_XO175_EC=y +CONFIG_PHY_PXA_USB=y +CONFIG_PHY_MMP3_USB=y +CONFIG_CRYPTO_LZO=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MTD_SPI_NOR=m +CONFIG_SRAM=y +CONFIG_I2C_PXA=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPI=y +CONFIG_SPI_PXA2XX=y +CONFIG_SPI_SLAVE=y +CONFIG_SND_SOC=y +CONFIG_SND_MMP_SOC_SSPA=y +CONFIG_SND_SOC_RT5631=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_PWRSEQ_SD8787=m +CONFIG_RTC_DRV_DS1307=y +CONFIG_DMADEVICES=y +CONFIG_MMP_TDMA=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ZFORCE=y +CONFIG_COMMON_CLK_MMP2_AUDIO=y diff --git a/buildroot/board/olpc/xo-1/linux.config b/buildroot/board/olpc/xo-1/linux.config new file mode 100644 index 000000000..12919471a --- /dev/null +++ b/buildroot/board/olpc/xo-1/linux.config @@ -0,0 +1,80 @@ +# CONFIG_64BIT is not set +CONFIG_IOSF_MBI=y +CONFIG_MGEODE_LX=y +CONFIG_X86_MSR=y +CONFIG_HZ_100=y +CONFIG_KEXEC=y +CONFIG_CMDLINE_BOOL=y +CONFIG_ACPI=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_OLPC=y +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y +# CONFIG_VIRTUALIZATION is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_CMA=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=0 +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_GENERIC=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_CAFE=y +CONFIG_MTD_UBI=y +CONFIG_CS5535_MFGPT=y +CONFIG_CS5535_CLOCK_EVENT_SRC=y +CONFIG_MOUSE_PS2_OLPC=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_VIA is not set +CONFIG_NVRAM=y +CONFIG_SCx200_ACB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_GPIO_CS5535=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_GEODE_WDT=y +CONFIG_MFD_CS5535=y +CONFIG_MFD_MAX8925=y +CONFIG_VIDEO_CAFE_CCIC=y +CONFIG_FB_TILEBLITTING=y +CONFIG_FB_VESA=y +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=y +CONFIG_BACKLIGHT_MAX8925=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_CS5535AUDIO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_OHCI_HCD=y +CONFIG_MMC_SDHCI_PCI=y +CONFIG_STAGING=y +CONFIG_FB_OLPC_DCON=y +CONFIG_XO1_RFKILL=y +CONFIG_RESET_CONTROLLER=y +CONFIG_GENERIC_PHY=y +CONFIG_PROC_KCORE=y +CONFIG_HUGETLBFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_WBUF_VERIFY=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_UBIFS_FS=y +CONFIG_PCI=y +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m diff --git a/buildroot/board/orangepi/orangepi-pc/linux.fragment b/buildroot/board/orangepi/orangepi-pc/linux.fragment index 581b715bd..602e42776 100644 --- a/buildroot/board/orangepi/orangepi-pc/linux.fragment +++ b/buildroot/board/orangepi/orangepi-pc/linux.fragment @@ -2,4 +2,3 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_REGULATOR_SY8106A=y CONFIG_DRM_SUN8I_DW_HDMI=y CONFIG_SUN8I_DE2_CCU=y -CONFIG_SND_SUN8I_CODEC_ANALOG=y diff --git a/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf b/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf new file mode 100644 index 000000000..510962516 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-rk3399/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_ROCKPRO64 linux + kernel /Image + devicetree /rk3399-orangepi.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg b/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg new file mode 100644 index 000000000..21272c28f --- /dev/null +++ b/buildroot/board/orangepi/orangepi-rk3399/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-orangepi.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/orangepi/orangepi-rk3399/post-build.sh b/buildroot/board/orangepi/orangepi-rk3399/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-rk3399/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/orangepi/orangepi-rk3399/readme.txt b/buildroot/board/orangepi/orangepi-rk3399/readme.txt new file mode 100644 index 000000000..197e1fb44 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-rk3399/readme.txt @@ -0,0 +1,56 @@ +Orangepi Rk3399 +================ +http://www.orangepi.org/Orange%20Pi%20RK3399/ + +Build: +====== + $ make orangepi_rk3399_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-orangepi.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== +Orangepi-RK3399 by default boots from emmc. For SD card boot to +happen, emmc should be empty. If emmc happens to have any bootable +image then erase emmc so that bootrom will look for a proper image in SD. + +emmc can be erased once after booted into linux as shown in below link. + +https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html + +Serial console: +--------------- + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/orangepi.html diff --git a/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd b/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd new file mode 100644 index 000000000..18c4d521a --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero-plus/boot.cmd @@ -0,0 +1,6 @@ +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +fatload mmc 0 $kernel_addr_r Image +fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb + +booti $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg b/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg new file mode 100644 index 000000000..ec15898dd --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero-plus/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "sun50i-h5-orangepi-zero-plus.dtb", + "boot.scr" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "sunxi-spl.bin" + offset = 8192 + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.itb" + offset = 40K + size = 1M # 1MB - 40K + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/orangepi/orangepi-zero-plus/readme.txt b/buildroot/board/orangepi/orangepi-zero-plus/readme.txt new file mode 100644 index 000000000..5556eae89 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-zero-plus/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Orangepi Zero Plus. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Orangepi Zero Plus link: +http://www.orangepi.org/OrangePiZeroPlus/ + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make orangepi_zero_plus_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Orangepi Zero Plus and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/pc/genimage-efi.cfg b/buildroot/board/pc/genimage-efi.cfg index ea15ae5cf..ec7e85b06 100644 --- a/buildroot/board/pc/genimage-efi.cfg +++ b/buildroot/board/pc/genimage-efi.cfg @@ -10,7 +10,8 @@ image efi-part.vfat { image = "bzImage" } } - size = 16777216 + # 16MB - 32KB + size = 16744448 } image disk.img { @@ -22,7 +23,6 @@ image disk.img { image = "efi-part.vfat" partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b offset = 32768 - size = 16777216 bootable = true } @@ -30,6 +30,5 @@ image disk.img { partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a partition-uuid = UUID_TMP image = "rootfs.ext2" - offset = 16809984 } } diff --git a/buildroot/board/pcengines/apu2/isolinux.cfg b/buildroot/board/pcengines/apu2/isolinux.cfg new file mode 100644 index 000000000..cb19b5a89 --- /dev/null +++ b/buildroot/board/pcengines/apu2/isolinux.cfg @@ -0,0 +1,6 @@ +serial 0 115200 +default 1 +label 1 + kernel __KERNEL_PATH__ + initrd __INITRD_PATH__ + append root=/dev/sr0 console=ttyS0,115200n8 diff --git a/buildroot/board/pcengines/apu2/linux.config b/buildroot/board/pcengines/apu2/linux.config new file mode 100644 index 000000000..5e3593b01 --- /dev/null +++ b/buildroot/board/pcengines/apu2/linux.config @@ -0,0 +1,51 @@ +CONFIG_SYSVIPC=y +CONFIG_CGROUPS=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_ATA_PIIX=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_IGB=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +# CONFIG_WLAN is not set +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_SOUND=y +CONFIG_SND=y +# CONFIG_SND_PCI is not set +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/buildroot/board/pcengines/apu2/readme.txt b/buildroot/board/pcengines/apu2/readme.txt new file mode 100644 index 000000000..9da1b802c --- /dev/null +++ b/buildroot/board/pcengines/apu2/readme.txt @@ -0,0 +1,40 @@ +Intro +===== + +This is a board configuration for the apu2 platform by PC Engines. + +https://pcengines.ch/apu2.htm + +Since the apu2 does not have any graphical output, the default configuration +will ensure that the kernel output as well as the login prompt will be sent to +the serial port. + +How to build +============ + +The provided defconfig creates a hybrid isolinux image that can be booted from +either an USB stick or a CD. + + $ make pcengines_apu2_defconfig + $ make + +How to write to an USB stick +============================ + +Once the build process is finished you will have an image +called "rootfs.iso9660" in the output/images/ directory. + +Copy the bootable "rootfs.iso9660" onto the USB stick with "dd": + + $ sudo dd if=output/images/rootfs.iso9660 of=/dev/sdX bs=1M conv=fsync + $ sudo sync + +How to connect to the apu2 +========================== + +Connect to the DB9 serial port of the apu2 board (either directly or through a +USB adapter) with a baudrate of 115200. + +For example with miniterm (part of pyserial): + + $ miniterm.py -f direct /dev/ttyUSB0 115200 diff --git a/buildroot/board/pine64/rockpro64/extlinux.conf b/buildroot/board/pine64/rockpro64/extlinux.conf new file mode 100644 index 000000000..ea081a1f0 --- /dev/null +++ b/buildroot/board/pine64/rockpro64/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_ROCKPRO64 linux + kernel /Image + devicetree /rk3399-rockpro64.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/buildroot/board/pine64/rockpro64/genimage.cfg b/buildroot/board/pine64/rockpro64/genimage.cfg new file mode 100644 index 000000000..0ba25c0ee --- /dev/null +++ b/buildroot/board/pine64/rockpro64/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-rockpro64.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/pine64/rockpro64/post-build.sh b/buildroot/board/pine64/rockpro64/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/pine64/rockpro64/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/pine64/rockpro64/readme.txt b/buildroot/board/pine64/rockpro64/readme.txt new file mode 100644 index 000000000..de8697010 --- /dev/null +++ b/buildroot/board/pine64/rockpro64/readme.txt @@ -0,0 +1,60 @@ +PINE64 ROCKPro64 +================ +https://www.pine64.org/rockpro64/ + +Build: +====== + $ make rockpro64_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-rockpro64.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== +RockPro64 has a 40-pin PI-2 GPIO Bus. + +Connect a jumper between pin 23 and pin 25 for SD card boot. + +Serial console: +--------------- +The pin layout for serial console on PI-2 GPIO Bus is as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Initially connect pin 6 and pin 8(transmit). Apply power to RockPro64, once the +power is on then connect pin 10(receive). + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rockpro64.html diff --git a/buildroot/board/qemu/aarch64-virt/linux.config b/buildroot/board/qemu/aarch64-virt/linux.config index c9f2708ad..02e0812ff 100644 --- a/buildroot/board/qemu/aarch64-virt/linux.config +++ b/buildroot/board/qemu/aarch64-virt/linux.config @@ -5,13 +5,15 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_TASKSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_PROFILING=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_COMPAT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_BLK_DEV_BSGLIB=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_BINFMT_MISC=y -CONFIG_COMPAT=y +CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=y @@ -23,6 +25,8 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_BRIDGE=m CONFIG_NET_SCHED=y CONFIG_VSOCKETS=y +CONFIG_PCI=y +CONFIG_PCI_HOST_GENERIC=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -38,17 +42,25 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y -CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y CONFIG_PL320_MBOX=y +CONFIG_ARM_SMMU_V3=y CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VIRTIO_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y diff --git a/buildroot/board/qemu/aarch64-virt/readme.txt b/buildroot/board/qemu/aarch64-virt/readme.txt index f868905d9..db35a3a7a 100644 --- a/buildroot/board/qemu/aarch64-virt/readme.txt +++ b/buildroot/board/qemu/aarch64-virt/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 + qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 # qemu_aarch64_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/arm-versatile/readme.txt b/buildroot/board/qemu/arm-versatile/readme.txt index f3a9e1ab4..223bd55c0 100644 --- a/buildroot/board/qemu/arm-versatile/readme.txt +++ b/buildroot/board/qemu/arm-versatile/readme.txt @@ -1,12 +1,10 @@ Run the emulation with: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user + qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user # qemu_arm_versatile_defconfig Or for the noMMU emulation: - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 + qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 # qemu_arm_versatile_nommu_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/arm-vexpress-tz/readme.txt b/buildroot/board/qemu/arm-vexpress-tz/readme.txt index 35ff018ae..b235ba5cd 100644 --- a/buildroot/board/qemu/arm-vexpress-tz/readme.txt +++ b/buildroot/board/qemu/arm-vexpress-tz/readme.txt @@ -29,8 +29,6 @@ number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" brings network support that is used i.e. in OP-TEE regression tests. -Tested with QEMU 2.12.0, and 3.1.0. - -- Boot Details -- diff --git a/buildroot/board/qemu/arm-vexpress/readme.txt b/buildroot/board/qemu/arm-vexpress/readme.txt index 7f7b43a3b..8d1bb72f8 100644 --- a/buildroot/board/qemu/arm-vexpress/readme.txt +++ b/buildroot/board/qemu/arm-vexpress/readme.txt @@ -1,11 +1,9 @@ Run the emulation with: - qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user + qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user # qemu_arm_vexpress_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. If you want to emulate more cores change "-smp 1" to "-smp 2" for dual-core or even "smp -4" for a quad-core configuration. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/csky/readme.txt b/buildroot/board/qemu/csky/readme.txt index 89d68aafb..5e4cb1871 100644 --- a/buildroot/board/qemu/csky/readme.txt +++ b/buildroot/board/qemu/csky/readme.txt @@ -1,12 +1,15 @@ Run with qemu: For ck860 smp: - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux + qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux # qemu_csky860_virt_defconfig -For ck810/ck807: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux +For ck807: + qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky807_virt_defconfig + +For ck810: + qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky810_virt_defconfig For ck610: - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux + qemu-system-cskyv1 -M virt -nographic -kernel vmlinux # qemu_csky610_virt_defconfig The login prompt will appear in the terminal that started Qemu. Username is root and no password. diff --git a/buildroot/board/qemu/m68k-mcf5208/readme.txt b/buildroot/board/qemu/m68k-mcf5208/readme.txt index d1c908680..79bf7146a 100644 --- a/buildroot/board/qemu/m68k-mcf5208/readme.txt +++ b/buildroot/board/qemu/m68k-mcf5208/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel output/images/vmlinux -nographic + qemu-system-m68k -M mcf5208evb -cpu m5208 -kernel output/images/vmlinux -nographic # qemu_m68k_mcf5208_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/m68k-q800/readme.txt b/buildroot/board/qemu/m68k-q800/readme.txt index b516bacdf..f1db57d52 100644 --- a/buildroot/board/qemu/m68k-q800/readme.txt +++ b/buildroot/board/qemu/m68k-q800/readme.txt @@ -1,8 +1,5 @@ Run the emulation with: - qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" + qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0" # qemu_m68k_q800_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k -You need following branch: q800-v2.11.0 diff --git a/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch new file mode 100644 index 000000000..eb3859f85 --- /dev/null +++ b/buildroot/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch @@ -0,0 +1,34 @@ +From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Apr 2020 09:49:11 +0200 +Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision + +Patch added for the kernel 3.14 +- fix networking in Qemu using a small patch +- disable DTS, because linux.bin does not include any DTB the + default Qemu included DTB is used and this is okay and works fine + +https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 + +[Romain: convert to git format] +Signed-off-by: Romain Naour +Cc: Waldemar Brodkorb +--- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +index 0de52e70abcc..d8c13140ca77 100644 +--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c ++++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { + { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, + { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, + { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, ++ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, + { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, + { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, + { /* end of list */ }, +-- +2.25.3 + diff --git a/buildroot/board/qemu/microblazebe-mmu/readme.txt b/buildroot/board/qemu/microblazebe-mmu/readme.txt index 4f52baff1..7bb986422 100644 --- a/buildroot/board/qemu/microblazebe-mmu/readme.txt +++ b/buildroot/board/qemu/microblazebe-mmu/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio + qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio # qemu_microblazebe_mmu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch b/buildroot/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch deleted file mode 100644 index 756bfaea9..000000000 --- a/buildroot/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c ---- linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2014-03-31 05:40:15.000000000 +0200 -+++ linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2014-04-11 22:53:42.000000000 +0200 -@@ -1249,6 +1249,7 @@ - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, diff --git a/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch new file mode 100644 index 000000000..eb3859f85 --- /dev/null +++ b/buildroot/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch @@ -0,0 +1,34 @@ +From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Apr 2020 09:49:11 +0200 +Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision + +Patch added for the kernel 3.14 +- fix networking in Qemu using a small patch +- disable DTS, because linux.bin does not include any DTB the + default Qemu included DTB is used and this is okay and works fine + +https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 + +[Romain: convert to git format] +Signed-off-by: Romain Naour +Cc: Waldemar Brodkorb +--- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +index 0de52e70abcc..d8c13140ca77 100644 +--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c ++++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { + { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, + { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, + { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, ++ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, + { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, + { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, + { /* end of list */ }, +-- +2.25.3 + diff --git a/buildroot/board/qemu/microblazeel-mmu/readme.txt b/buildroot/board/qemu/microblazeel-mmu/readme.txt index 0b0f330a5..20fa0072e 100644 --- a/buildroot/board/qemu/microblazeel-mmu/readme.txt +++ b/buildroot/board/qemu/microblazeel-mmu/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio + qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio # qemu_microblazeel_mmu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch b/buildroot/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch deleted file mode 100644 index 756bfaea9..000000000 --- a/buildroot/board/qemu/microblazeel-mmu/xilinx-xemaclite.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c ---- linux-3.14.orig/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2014-03-31 05:40:15.000000000 +0200 -+++ linux-3.14/drivers/net/ethernet/xilinx/xilinx_emaclite.c 2014-04-11 22:53:42.000000000 +0200 -@@ -1249,6 +1249,7 @@ - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, diff --git a/buildroot/board/qemu/mips32r2-malta/readme.txt b/buildroot/board/qemu/mips32r2-malta/readme.txt index 9ff3c4b81..db1db65b1 100644 --- a/buildroot/board/qemu/mips32r2-malta/readme.txt +++ b/buildroot/board/qemu/mips32r2-malta/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user + qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips32r2el-malta/readme.txt b/buildroot/board/qemu/mips32r2el-malta/readme.txt index 745bfea60..4dc0e64e0 100644 --- a/buildroot/board/qemu/mips32r2el-malta/readme.txt +++ b/buildroot/board/qemu/mips32r2el-malta/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user + qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch new file mode 100644 index 000000000..801efb5d0 --- /dev/null +++ b/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -0,0 +1,149 @@ +From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Jul 2020 11:46:01 +0200 +Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From [1] +"GCC 10 (PR 91233) won't silently allow registers that are not architecturally +available to be present in the clobber list anymore, resulting in build failure +for mips*r6 targets in form of: +... +.../sysdep.h:146:2: error: the register ‘lo’ cannot be clobbered in ‘asm’ for the current target + 146 | __asm__ volatile ( \ + | ^~~~~~~ + +This is because base R6 ISA doesn't define hi and lo registers w/o DSP extension. +This patch provides the alternative clobber list for r6 targets that won't include +those registers." + +Since kernel 5.4 and mips support for generic vDSO [2], the kernel fail to build +for mips r6 cpus with gcc 10 for the same reason as glibc. + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=020b2a97bb15f807c0482f0faee2184ed05bcad8 +[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24640f233b466051ad3a5d2786d2951e43026c9d + +Signed-off-by: Romain Naour +--- + arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h +index 0ae9b4cbc153..ea600e0ebfe7 100644 +--- a/arch/mips/include/asm/vdso/gettimeofday.h ++++ b/arch/mips/include/asm/vdso/gettimeofday.h +@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( + register long nr asm("v0") = __NR_gettimeofday; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (tv), "r" (tz), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (tv), "r" (tz), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( + register long nr asm("v0") = __NR_clock_gettime; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( + register long nr asm("v0") = __NR_clock_getres; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +-- +2.25.4 + diff --git a/buildroot/board/qemu/mips32r6-malta/readme.txt b/buildroot/board/qemu/mips32r6-malta/readme.txt index 6a026b216..9ad4959f0 100644 --- a/buildroot/board/qemu/mips32r6-malta/readme.txt +++ b/buildroot/board/qemu/mips32r6-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips32r6_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch new file mode 100644 index 000000000..801efb5d0 --- /dev/null +++ b/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -0,0 +1,149 @@ +From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Jul 2020 11:46:01 +0200 +Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From [1] +"GCC 10 (PR 91233) won't silently allow registers that are not architecturally +available to be present in the clobber list anymore, resulting in build failure +for mips*r6 targets in form of: +... +.../sysdep.h:146:2: error: the register ‘lo’ cannot be clobbered in ‘asm’ for the current target + 146 | __asm__ volatile ( \ + | ^~~~~~~ + +This is because base R6 ISA doesn't define hi and lo registers w/o DSP extension. +This patch provides the alternative clobber list for r6 targets that won't include +those registers." + +Since kernel 5.4 and mips support for generic vDSO [2], the kernel fail to build +for mips r6 cpus with gcc 10 for the same reason as glibc. + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=020b2a97bb15f807c0482f0faee2184ed05bcad8 +[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24640f233b466051ad3a5d2786d2951e43026c9d + +Signed-off-by: Romain Naour +--- + arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h +index 0ae9b4cbc153..ea600e0ebfe7 100644 +--- a/arch/mips/include/asm/vdso/gettimeofday.h ++++ b/arch/mips/include/asm/vdso/gettimeofday.h +@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( + register long nr asm("v0") = __NR_gettimeofday; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (tv), "r" (tz), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (tv), "r" (tz), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( + register long nr asm("v0") = __NR_clock_gettime; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( + register long nr asm("v0") = __NR_clock_getres; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +-- +2.25.4 + diff --git a/buildroot/board/qemu/mips32r6el-malta/readme.txt b/buildroot/board/qemu/mips32r6el-malta/readme.txt index f69fd21af..96c9dc88b 100644 --- a/buildroot/board/qemu/mips32r6el-malta/readme.txt +++ b/buildroot/board/qemu/mips32r6el-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic + qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic # qemu_mips32r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips64-malta/readme.txt b/buildroot/board/qemu/mips64-malta/readme.txt index ea3a92541..7432dac1a 100644 --- a/buildroot/board/qemu/mips64-malta/readme.txt +++ b/buildroot/board/qemu/mips64-malta/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips64el-malta/readme.txt b/buildroot/board/qemu/mips64el-malta/readme.txt index 144da9383..f67ac91ac 100644 --- a/buildroot/board/qemu/mips64el-malta/readme.txt +++ b/buildroot/board/qemu/mips64el-malta/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" + qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch new file mode 100644 index 000000000..ad2647e62 --- /dev/null +++ b/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -0,0 +1,149 @@ +From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Jul 2020 11:46:01 +0200 +Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From [1] +"GCC 10 (PR 91233) won't silently allow registers that are not architecturally +available to be present in the clobber list anymore, resulting in build failure +for mips*r6 targets in form of: +... +.../sysdep.h:146:2: error: the register ‘lo’ cannot be clobbered in ‘asm’ for the current target + 146 | __asm__ volatile ( \ + | ^~~~~~~ + +This is because base R6 ISA doesn't define hi and lo registers w/o DSP extension. +This patch provides the alternative clobber list for r6 targets that won't include +those registers." + +Since kernel 5.4 and mips support for generic vDSO [2], the kernel fail to build +for mips r6 cpus with gcc 10 for the same reason as glibc. + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=020b2a97bb15f807c0482f0faee2184ed05bcad8 +[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24640f233b466051ad3a5d2786d2951e43026c9d + +Signed-off-by: Romain Naour +--- + arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h +index 0ae9b4cbc153..ea600e0ebfe7 100644 +--- a/arch/mips/include/asm/vdso/gettimeofday.h ++++ b/arch/mips/include/asm/vdso/gettimeofday.h +@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( + register long nr asm("v0") = __NR_gettimeofday; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (tv), "r" (tz), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (tv), "r" (tz), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( + register long nr asm("v0") = __NR_clock_gettime; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( + register long nr asm("v0") = __NR_clock_getres; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +-- +2.25.4 + diff --git a/buildroot/board/qemu/mips64r6-malta/readme.txt b/buildroot/board/qemu/mips64r6-malta/readme.txt index cfa16fd86..252a54319 100644 --- a/buildroot/board/qemu/mips64r6-malta/readme.txt +++ b/buildroot/board/qemu/mips64r6-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch new file mode 100644 index 000000000..ad2647e62 --- /dev/null +++ b/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -0,0 +1,149 @@ +From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 25 Jul 2020 11:46:01 +0200 +Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From [1] +"GCC 10 (PR 91233) won't silently allow registers that are not architecturally +available to be present in the clobber list anymore, resulting in build failure +for mips*r6 targets in form of: +... +.../sysdep.h:146:2: error: the register ‘lo’ cannot be clobbered in ‘asm’ for the current target + 146 | __asm__ volatile ( \ + | ^~~~~~~ + +This is because base R6 ISA doesn't define hi and lo registers w/o DSP extension. +This patch provides the alternative clobber list for r6 targets that won't include +those registers." + +Since kernel 5.4 and mips support for generic vDSO [2], the kernel fail to build +for mips r6 cpus with gcc 10 for the same reason as glibc. + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=020b2a97bb15f807c0482f0faee2184ed05bcad8 +[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24640f233b466051ad3a5d2786d2951e43026c9d + +Signed-off-by: Romain Naour +--- + arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h +index 0ae9b4cbc153..ea600e0ebfe7 100644 +--- a/arch/mips/include/asm/vdso/gettimeofday.h ++++ b/arch/mips/include/asm/vdso/gettimeofday.h +@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( + register long nr asm("v0") = __NR_gettimeofday; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (tv), "r" (tz), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (tv), "r" (tz), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( + #endif + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( + register long nr asm("v0") = __NR_clock_gettime; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( + register long nr asm("v0") = __NR_clock_getres; + register long error asm("a3"); + ++#if MIPS_ISA_REV >= 6 ++ asm volatile( ++ " syscall\n" ++ : "=r" (ret), "=r" (error) ++ : "r" (clkid), "r" (ts), "r" (nr) ++ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", ++ "$14", "$15", "$24", "$25", "memory"); ++#else + asm volatile( + " syscall\n" + : "=r" (ret), "=r" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", + "$14", "$15", "$24", "$25", "hi", "lo", "memory"); ++#endif + + return error ? -ret : ret; + } +-- +2.25.4 + diff --git a/buildroot/board/qemu/mips64r6el-malta/readme.txt b/buildroot/board/qemu/mips64r6el-malta/readme.txt index 61a6ceb5f..e9d02e772 100644 --- a/buildroot/board/qemu/mips64r6el-malta/readme.txt +++ b/buildroot/board/qemu/mips64r6el-malta/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic + qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/nios2-10m50/linux.fragment b/buildroot/board/qemu/nios2-10m50/linux.fragment index 76c864f5c..c7647cee8 100644 --- a/buildroot/board/qemu/nios2-10m50/linux.fragment +++ b/buildroot/board/qemu/nios2-10m50/linux.fragment @@ -1,3 +1,3 @@ # Embed the DTB in the kernel image CONFIG_NIOS2_DTB_SOURCE_BOOL=y -CONFIG_NIOS2_DTB_SOURCE="arch/nios2/boot/dts/10m50_devboard.dts" +CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" diff --git a/buildroot/board/qemu/nios2-10m50/readme.txt b/buildroot/board/qemu/nios2-10m50/readme.txt index 44cbcb08a..f8f8f3b3a 100644 --- a/buildroot/board/qemu/nios2-10m50/readme.txt +++ b/buildroot/board/qemu/nios2-10m50/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-nios2 -kernel output/images/vmlinux -nographic + qemu-system-nios2 -kernel output/images/vmlinux -nographic # qemu_nios2_10m50_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0. diff --git a/buildroot/board/qemu/or1k/readme.txt b/buildroot/board/qemu/or1k/readme.txt index df6b467e8..2ea797440 100644 --- a/buildroot/board/qemu/or1k/readme.txt +++ b/buildroot/board/qemu/or1k/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-or1k -kernel output/images/vmlinux -nographic + qemu-system-or1k -kernel output/images/vmlinux -nographic # qemu_or1k_defconfig The login prompt will appear in the terminal that started Qemu. Ethernet support is not working, yet. - -Tested with QEMU 2.12.0. diff --git a/buildroot/board/qemu/post-image.sh b/buildroot/board/qemu/post-image.sh new file mode 100755 index 000000000..9a4d21627 --- /dev/null +++ b/buildroot/board/qemu/post-image.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +QEMU_BOARD_DIR="$(dirname $0)" +DEFCONFIG_NAME="$(basename $2)" +README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" +START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" + +if [[ "${DEFCONFIG_NAME}" =~ ^"qemu_*" ]]; then + # Not a Qemu defconfig, can't test. + exit 0 +fi + +# Search for "# qemu_*_defconfig" tag in all readme.txt files. +# Qemu command line on multilines using back slash are accepted. +QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '${DEFCONFIG_NAME}'$/!d; s/#.*//' ${README_FILES}) + +if [ -z "${QEMU_CMD_LINE}" ]; then + # No Qemu cmd line found, can't test. + exit 0 +fi + +# Replace output/images path by ${IMAGE_DIR} since the script +# will be in the same directory as the kernel and the rootfs images. +QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images/\${IMAGE_DIR\}}" + +# Remove -serial stdio if present, keep it as default args +DEFAULT_ARGS="$(sed -r -e '/-serial stdio/!d; s/.*(-serial stdio).*/\1/' <<<"${QEMU_CMD_LINE}")" +QEMU_CMD_LINE="${QEMU_CMD_LINE//-serial stdio/}" + +# Disable graphical output and redirect serial I/Os to console +case ${DEFCONFIG_NAME} in + (qemu_sh4eb_r2d_defconfig|qemu_sh4_r2d_defconfig) + # Special case for SH4 + SERIAL_ARGS="-serial stdio -display none" + ;; + (*) + SERIAL_ARGS="-nographic" + ;; +esac + +cat <<-_EOF_ > "${START_QEMU_SCRIPT}" + #!/bin/sh + IMAGE_DIR="\${0%/*}/" + + if [ "\${1}" = "serial-only" ]; then + EXTRA_ARGS='${SERIAL_ARGS}' + else + EXTRA_ARGS='${DEFAULT_ARGS}' + fi + + export PATH="${HOST_DIR}/bin:\${PATH}" + exec ${QEMU_CMD_LINE} \${EXTRA_ARGS} +_EOF_ + +chmod +x "${START_QEMU_SCRIPT}" diff --git a/buildroot/board/qemu/ppc-g3beige/readme.txt b/buildroot/board/qemu/ppc-g3beige/readme.txt index 608814ee3..e6c9c2016 100644 --- a/buildroot/board/qemu/ppc-g3beige/readme.txt +++ b/buildroot/board/qemu/ppc-g3beige/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user + qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user # qemu_ppc_g3beige_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/ppc-mac99/readme.txt b/buildroot/board/qemu/ppc-mac99/readme.txt index a8a18db5b..fb94a7837 100644 --- a/buildroot/board/qemu/ppc-mac99/readme.txt +++ b/buildroot/board/qemu/ppc-mac99/readme.txt @@ -1,5 +1,3 @@ Run the emulation with: - qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" - -Tested with QEMU 3.1.0 + qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" # qemu_ppc_mac99_defconfig diff --git a/buildroot/board/qemu/ppc-mpc8544ds/readme.txt b/buildroot/board/qemu/ppc-mpc8544ds/readme.txt index 172aad562..d34d64c33 100644 --- a/buildroot/board/qemu/ppc-mpc8544ds/readme.txt +++ b/buildroot/board/qemu/ppc-mpc8544ds/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user + qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user # qemu_ppc_mpc8544ds_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/ppc-virtex-ml507/readme.txt b/buildroot/board/qemu/ppc-virtex-ml507/readme.txt index 6178ace81..feb4b2d7d 100644 --- a/buildroot/board/qemu/ppc-virtex-ml507/readme.txt +++ b/buildroot/board/qemu/ppc-virtex-ml507/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb + qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb # qemu_ppc_virtex_ml507_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/ppc64-e5500/readme.txt b/buildroot/board/qemu/ppc64-e5500/readme.txt index 808076698..61d51f7f4 100644 --- a/buildroot/board/qemu/ppc64-e5500/readme.txt +++ b/buildroot/board/qemu/ppc64-e5500/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic + qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic # qemu_ppc64_e5500_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/ppc64-pseries/readme.txt b/buildroot/board/qemu/ppc64-pseries/readme.txt index 6a3e96a2e..cbd3c6ca2 100644 --- a/buildroot/board/qemu/ppc64-pseries/readme.txt +++ b/buildroot/board/qemu/ppc64-pseries/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses + qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64_pseries_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/ppc64le-pseries/readme.txt b/buildroot/board/qemu/ppc64le-pseries/readme.txt index 2728675df..8ee72ea6c 100644 --- a/buildroot/board/qemu/ppc64le-pseries/readme.txt +++ b/buildroot/board/qemu/ppc64le-pseries/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses +qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig The login prompt will appear in the terminal window. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch b/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch deleted file mode 100644 index e0dfaa150..000000000 --- a/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Tue, 16 Apr 2019 09:03:41 -0700 -Subject: [PATCH] Revert "riscv: Use latest system call ABI" - -This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b. - -The latest RISC-V 32bit glibc submission doesn't work with this patch, -so let's revert it. This revert can be reverted when the glibc -submission is updated to work on the 5.1 kernel. - -Signed-off-by: Alistair Francis ---- - arch/riscv/Kconfig | 1 + - arch/riscv/include/uapi/asm/unistd.h | 5 ++++- - arch/riscv/kernel/vdso/Makefile | 2 -- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig -index eb56c82d8aa1..43dd2680c696 100644 ---- a/arch/riscv/Kconfig -+++ b/arch/riscv/Kconfig -@@ -11,6 +11,7 @@ config 32BIT - - config RISCV - def_bool y -+ select ARCH_32BIT_OFF_T if !64BIT - # even on 32-bit, physical (and DMA) addresses are > 32-bits - select PHYS_ADDR_T_64BIT - select OF -diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h -index 0e2eeeb1fd27..486a288b454c 100644 ---- a/arch/riscv/include/uapi/asm/unistd.h -+++ b/arch/riscv/include/uapi/asm/unistd.h -@@ -17,8 +17,11 @@ - - #ifdef __LP64__ - #define __ARCH_WANT_NEW_STAT --#define __ARCH_WANT_SET_GET_RLIMIT - #endif /* __LP64__ */ -+#define __ARCH_WANT_SET_GET_RLIMIT -+#ifndef __LP64__ -+#define __ARCH_WANT_TIME32_SYSCALLS -+#endif - - #include - -diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile -index fec62b24df89..eed1c137f618 100644 ---- a/arch/riscv/kernel/vdso/Makefile -+++ b/arch/riscv/kernel/vdso/Makefile -@@ -2,11 +2,9 @@ - - # Symbols present in the vdso - vdso-syms = rt_sigreturn --ifdef CONFIG_64BIT - vdso-syms += gettimeofday - vdso-syms += clock_gettime - vdso-syms += clock_getres --endif - vdso-syms += getcpu - vdso-syms += flush_icache - --- -2.21.0 - diff --git a/buildroot/board/qemu/riscv32-virt/readme.txt b/buildroot/board/qemu/riscv32-virt/readme.txt index 5d7c1988d..32b433351 100644 --- a/buildroot/board/qemu/riscv32-virt/readme.txt +++ b/buildroot/board/qemu/riscv32-virt/readme.txt @@ -1,7 +1,5 @@ Run Linux in emulation with: - qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1 diff --git a/buildroot/board/qemu/riscv64-virt/readme.txt b/buildroot/board/qemu/riscv64-virt/readme.txt index c075cc464..747a9ea67 100644 --- a/buildroot/board/qemu/riscv64-virt/readme.txt +++ b/buildroot/board/qemu/riscv64-virt/readme.txt @@ -1,7 +1,5 @@ Run Linux in emulation with: - qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 3.1 diff --git a/buildroot/board/qemu/s390x/readme.txt b/buildroot/board/qemu/s390x/readme.txt new file mode 100644 index 000000000..63e899c76 --- /dev/null +++ b/buildroot/board/qemu/s390x/readme.txt @@ -0,0 +1,8 @@ +Run the emulation with: + + qemu-system-s390x -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 \ + -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw \ + -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" -display none -serial mon:stdio \ + -net nic,model=virtio -net user # qemu_s390x_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch b/buildroot/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch deleted file mode 100644 index 36c82d84e..000000000 --- a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 15 Jun 2018 17:43:38 +0200 -Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for - (H)SCIF -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel) - -The last Qemu kernel update [1] introduced a regresion in sh4 SCIF -serial device. Some keyboard presses are very slow to be taken into -account, perhaps not even taken into account at all. This would -explain why our test infrastructure doesn’t manage to login as root -[2][3][4]. - -git bisect reported a kernel patch from 4.11, increasing RX FIFO -trigger defaults value for sh-sci (H)SCIF. The kernel patch itself -looks good but the Qemu emulation is not ready to handle this new -setting. - -From Qemu (2.12.0): target/sh4/README.sh4 -"Configuration of the second serial port (SCIF) is supported. FIFO -handling infrastructure has been started but is not completed yet." - -In order to be able to test sh4 architecture with newer kernel, -revert to the old behaviour. - -[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd -[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425 -[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427 -[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426 - -Signed-off-by: Romain Naour -Cc: Thomas Petazzoni ---- - drivers/tty/serial/sh-sci.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index ab757546c6db..138e4dec44fb 100644 ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev, - sci_port->rx_trigger = 32; - break; - case PORT_SCIF: -- if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) -- /* RX triggering not implemented for this IP */ -- sci_port->rx_trigger = 1; -- else -- sci_port->rx_trigger = 8; -+ /* RX triggering not implemented in Qemu emulation */ -+ sci_port->rx_trigger = 1; - break; - default: - sci_port->rx_trigger = 1; --- -2.14.4 - diff --git a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch b/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch new file mode 100644 index 000000000..7543767a5 --- /dev/null +++ b/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch @@ -0,0 +1,32 @@ +From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 21 Dec 2019 11:52:04 +0100 +Subject: [PATCH] arch/sh: vmlinux.scr + +Building the kernel using a toolchain built with Binutils 2.33.1 prevent +booting a sh4 system under Qemu. +Apply the patch provided by Alan Modra [2] that fix alignment of rodata. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e +[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html + +Signed-off-by: Romain Naour +--- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr +index 862d74808236..dd292b4b9082 100644 +--- a/arch/sh/boot/compressed/vmlinux.scr ++++ b/arch/sh/boot/compressed/vmlinux.scr +@@ -1,6 +1,6 @@ + SECTIONS + { +- .rodata..compressed : { ++ .rodata..compressed : ALIGN(8) { + input_len = .; + LONG(input_data_end - input_data) input_data = .; + *(.data) +-- +2.24.1 + diff --git a/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch b/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch new file mode 100644 index 000000000..1faffea63 --- /dev/null +++ b/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch @@ -0,0 +1,32 @@ +From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 21 Dec 2019 11:54:07 +0100 +Subject: [PATCH] include/asm-generic: vmlinux.lds.h + +Building the kernel using a toolchain built with Binutils 2.33.1 prevent +booting a sh4 system under Qemu. +Apply the patch provided by Alan Modra [2] that fix alignment of rodata. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e +[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html + +Signed-off-by: Romain Naour +--- + include/asm-generic/vmlinux.lds.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h +index d7701d466b60..1aa33597e91e 100644 +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h +@@ -306,6 +306,7 @@ + */ + #ifndef RO_AFTER_INIT_DATA + #define RO_AFTER_INIT_DATA \ ++ . = ALIGN(8); \ + __start_ro_after_init = .; \ + *(.data..ro_after_init) \ + __end_ro_after_init = .; +-- +2.24.1 + diff --git a/buildroot/board/qemu/sh4-r2d/readme.txt b/buildroot/board/qemu/sh4-r2d/readme.txt index dd80953b9..b0799e47a 100644 --- a/buildroot/board/qemu/sh4-r2d/readme.txt +++ b/buildroot/board/qemu/sh4-r2d/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch deleted file mode 100644 index 36c82d84e..000000000 --- a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 15 Jun 2018 17:43:38 +0200 -Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for - (H)SCIF -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel) - -The last Qemu kernel update [1] introduced a regresion in sh4 SCIF -serial device. Some keyboard presses are very slow to be taken into -account, perhaps not even taken into account at all. This would -explain why our test infrastructure doesn’t manage to login as root -[2][3][4]. - -git bisect reported a kernel patch from 4.11, increasing RX FIFO -trigger defaults value for sh-sci (H)SCIF. The kernel patch itself -looks good but the Qemu emulation is not ready to handle this new -setting. - -From Qemu (2.12.0): target/sh4/README.sh4 -"Configuration of the second serial port (SCIF) is supported. FIFO -handling infrastructure has been started but is not completed yet." - -In order to be able to test sh4 architecture with newer kernel, -revert to the old behaviour. - -[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd -[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425 -[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427 -[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426 - -Signed-off-by: Romain Naour -Cc: Thomas Petazzoni ---- - drivers/tty/serial/sh-sci.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index ab757546c6db..138e4dec44fb 100644 ---- a/drivers/tty/serial/sh-sci.c -+++ b/drivers/tty/serial/sh-sci.c -@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev, - sci_port->rx_trigger = 32; - break; - case PORT_SCIF: -- if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) -- /* RX triggering not implemented for this IP */ -- sci_port->rx_trigger = 1; -- else -- sci_port->rx_trigger = 8; -+ /* RX triggering not implemented in Qemu emulation */ -+ sci_port->rx_trigger = 1; - break; - default: - sci_port->rx_trigger = 1; --- -2.14.4 - diff --git a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch new file mode 100644 index 000000000..7543767a5 --- /dev/null +++ b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch @@ -0,0 +1,32 @@ +From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 21 Dec 2019 11:52:04 +0100 +Subject: [PATCH] arch/sh: vmlinux.scr + +Building the kernel using a toolchain built with Binutils 2.33.1 prevent +booting a sh4 system under Qemu. +Apply the patch provided by Alan Modra [2] that fix alignment of rodata. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e +[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html + +Signed-off-by: Romain Naour +--- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr +index 862d74808236..dd292b4b9082 100644 +--- a/arch/sh/boot/compressed/vmlinux.scr ++++ b/arch/sh/boot/compressed/vmlinux.scr +@@ -1,6 +1,6 @@ + SECTIONS + { +- .rodata..compressed : { ++ .rodata..compressed : ALIGN(8) { + input_len = .; + LONG(input_data_end - input_data) input_data = .; + *(.data) +-- +2.24.1 + diff --git a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch new file mode 100644 index 000000000..445b71f40 --- /dev/null +++ b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch @@ -0,0 +1,27 @@ +From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 21 Dec 2019 11:54:07 +0100 +Subject: [PATCH] include/asm-generic: vmlinux.lds.h + +https://www.sourceware.org/ml/binutils/2019-12/msg00112.html + +Signed-off-by: Romain Naour +--- + include/asm-generic/vmlinux.lds.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h +index d7701d466b60..1aa33597e91e 100644 +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h +@@ -306,6 +306,7 @@ + */ + #ifndef RO_AFTER_INIT_DATA + #define RO_AFTER_INIT_DATA \ ++ . = ALIGN(8); \ + __start_ro_after_init = .; \ + *(.data..ro_after_init) \ + __end_ro_after_init = .; +-- +2.24.1 + diff --git a/buildroot/board/qemu/sh4eb-r2d/readme.txt b/buildroot/board/qemu/sh4eb-r2d/readme.txt index e71a9bce9..9f3dd8b20 100644 --- a/buildroot/board/qemu/sh4eb-r2d/readme.txt +++ b/buildroot/board/qemu/sh4eb-r2d/readme.txt @@ -1,8 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user + qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/sparc-ss10/readme.txt b/buildroot/board/qemu/sparc-ss10/readme.txt index 33833c2d3..d624b82d9 100644 --- a/buildroot/board/qemu/sparc-ss10/readme.txt +++ b/buildroot/board/qemu/sparc-ss10/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user + qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user # qemu_sparc_ss10_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/sparc64-sun4u/readme.txt b/buildroot/board/qemu/sparc64-sun4u/readme.txt index f2e6e81a8..17d8cbdf9 100644 --- a/buildroot/board/qemu/sparc64-sun4u/readme.txt +++ b/buildroot/board/qemu/sparc64-sun4u/readme.txt @@ -1,7 +1,5 @@ Run the emulation with: - qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user + qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user # qemu_sparc64_sun4u_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/x86/linux.config b/buildroot/board/qemu/x86/linux.config index 79f7537d8..a4da99ff4 100644 --- a/buildroot/board/qemu/x86/linux.config +++ b/buildroot/board/qemu/x86/linux.config @@ -10,6 +10,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_WIRELESS is not set +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y diff --git a/buildroot/board/qemu/x86/readme.txt b/buildroot/board/qemu/x86/readme.txt index 3bbafecf9..a1f232e2e 100644 --- a/buildroot/board/qemu/x86/readme.txt +++ b/buildroot/board/qemu/x86/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_defconfig Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/x86_64/linux.config b/buildroot/board/qemu/x86_64/linux.config index 5fa33d442..e1d2ce01b 100644 --- a/buildroot/board/qemu/x86_64/linux.config +++ b/buildroot/board/qemu/x86_64/linux.config @@ -10,6 +10,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_WIRELESS is not set +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y diff --git a/buildroot/board/qemu/x86_64/readme.txt b/buildroot/board/qemu/x86_64/readme.txt index 93ac22a94..2b2ae3be2 100644 --- a/buildroot/board/qemu/x86_64/readme.txt +++ b/buildroot/board/qemu/x86_64/readme.txt @@ -1,9 +1,7 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_64_defconfig Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qemu/xtensa-lx60/readme.txt b/buildroot/board/qemu/xtensa-lx60/readme.txt index 4287e1f09..6f0e2710c 100644 --- a/buildroot/board/qemu/xtensa-lx60/readme.txt +++ b/buildroot/board/qemu/xtensa-lx60/readme.txt @@ -1,7 +1,7 @@ Run the emulation with: - qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf + qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf # qemu_xtensa_lx60_defconfig + + qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf # qemu_xtensa_lx60_nommu_defconfig The login prompt will appear in the terminal that started Qemu. - -Tested with QEMU 2.12.0 diff --git a/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch b/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch new file mode 100644 index 000000000..86d8e387d --- /dev/null +++ b/buildroot/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch @@ -0,0 +1,418 @@ +From 22d955122ac0f7ac74ab74aadebf6b8edaf0bbbd Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 15 Dec 2019 18:45:40 +0100 +Subject: [PATCH] DTS for QMTech Zynq starter kit + +Signed-off-by: Martin Chabot +Signed-off-by: Julien Olivain +--- + arch/arm/boot/dts/zynq-qmtech.dts | 397 ++++++++++++++++++++++++++++++ + 1 file changed, 397 insertions(+) + create mode 100644 arch/arm/boot/dts/zynq-qmtech.dts + +diff --git a/arch/arm/boot/dts/zynq-qmtech.dts b/arch/arm/boot/dts/zynq-qmtech.dts +new file mode 100644 +index 000000000000..c6081dc0080e +--- /dev/null ++++ b/arch/arm/boot/dts/zynq-qmtech.dts +@@ -0,0 +1,397 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2011 - 2015 Xilinx ++ * Copyright (C) 2012 National Instruments Corp. ++ * Copyright (C) 2019 Martin Chabot ++ */ ++ ++/* Derived from: ++ * https://github.com/Xilinx/linux-xlnx/blob/xilinx-v2019.2.01/arch/arm/boot/dts/zynq-zc702.dts ++ */ ++ ++/dts-v1/; ++#include "zynq-7000.dtsi" ++ ++/ { ++ model = "QMTECH XC7Z010 Starter Kit"; ++ compatible = "xlnx,zynq-qmtech", "xlnx,zynq-zc702", "xlnx,zynq-7000"; ++ ++ aliases { ++ ethernet0 = &gem0; ++ i2c0 = &i2c0; ++ serial0 = &uart1; ++ spi0 = &qspi; ++ mmc0 = &sdhci0; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x20000000>; ++ }; ++ ++ chosen { ++ bootargs = ""; ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ ds23 { ++ label = "ds23"; ++ gpios = <&gpio0 10 0>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++}; ++ ++&amba { ++ ocm: sram@fffc0000 { ++ compatible = "mmio-sram"; ++ reg = <0xfffc0000 0x10000>; ++ }; ++}; ++ ++&clkc { ++ ps-clk-frequency = <33333333>; ++}; ++ ++&gem0 { ++ status = "okay"; ++ phy-mode = "rgmii-id"; ++ phy-handle = <ðernet_phy>; ++ ++ ethernet_phy: ethernet-phy@0 { ++ reg = <0>; ++ device_type = "ethernet-phy"; ++ }; ++}; ++ ++&gpio0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_gpio0_default>; ++}; ++ ++&i2c0 { ++ status = "disabled"; ++ clock-frequency = <400000>; ++ pinctrl-names = "default", "gpio"; ++ pinctrl-0 = <&pinctrl_i2c0_default>; ++ pinctrl-1 = <&pinctrl_i2c0_gpio>; ++ scl-gpios = <&gpio0 50 0>; ++ sda-gpios = <&gpio0 51 0>; ++ ++ i2c-mux@74 { ++ compatible = "nxp,pca9548"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0x74>; ++ ++ i2c@0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0>; ++ si570: clock-generator@5d { ++ #clock-cells = <0>; ++ compatible = "silabs,si570"; ++ temperature-stability = <50>; ++ reg = <0x5d>; ++ factory-fout = <156250000>; ++ clock-frequency = <148500000>; ++ }; ++ }; ++ ++ i2c@1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <1>; ++ adv7511: hdmi-tx@39 { ++ compatible = "adi,adv7511"; ++ reg = <0x39>; ++ adi,input-depth = <8>; ++ adi,input-colorspace = "yuv422"; ++ adi,input-clock = "1x"; ++ adi,input-style = <3>; ++ adi,input-justification = "right"; ++ }; ++ }; ++ ++ i2c@2 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <2>; ++ eeprom@54 { ++ compatible = "atmel,24c08"; ++ reg = <0x54>; ++ }; ++ }; ++ ++ i2c@3 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <3>; ++ gpio@21 { ++ compatible = "ti,tca6416"; ++ reg = <0x21>; ++ gpio-controller; ++ #gpio-cells = <2>; ++ }; ++ }; ++ ++ i2c@4 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <4>; ++ rtc@51 { ++ compatible = "nxp,pcf8563"; ++ reg = <0x51>; ++ }; ++ }; ++ ++ i2c@7 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <7>; ++ hwmon@52 { ++ compatible = "ti,ucd9248"; ++ reg = <52>; ++ }; ++ hwmon@53 { ++ compatible = "ti,ucd9248"; ++ reg = <53>; ++ }; ++ hwmon@54 { ++ compatible = "ti,ucd9248"; ++ reg = <54>; ++ }; ++ }; ++ }; ++}; ++ ++&pinctrl0 { ++ pinctrl_can0_default: can0-default { ++ mux { ++ function = "can0"; ++ groups = "can0_9_grp"; ++ }; ++ ++ conf { ++ groups = "can0_9_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ ++ conf-rx { ++ pins = "MIO46"; ++ bias-high-impedance; ++ }; ++ ++ conf-tx { ++ pins = "MIO47"; ++ bias-disable; ++ }; ++ }; ++ ++ pinctrl_gem0_default: gem0-default { ++ mux { ++ function = "ethernet0"; ++ groups = "ethernet0_0_grp"; ++ }; ++ ++ conf { ++ groups = "ethernet0_0_grp"; ++ slew-rate = <0>; ++ io-standard = <4>; ++ }; ++ ++ conf-rx { ++ pins = "MIO22", "MIO23", "MIO24", "MIO25", "MIO26", "MIO27"; ++ bias-high-impedance; ++ low-power-disable; ++ }; ++ ++ conf-tx { ++ pins = "MIO16", "MIO17", "MIO18", "MIO19", "MIO20", "MIO21"; ++ bias-disable; ++ low-power-enable; ++ }; ++ ++ mux-mdio { ++ function = "mdio0"; ++ groups = "mdio0_0_grp"; ++ }; ++ ++ conf-mdio { ++ groups = "mdio0_0_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ bias-disable; ++ }; ++ }; ++ ++ pinctrl_gpio0_default: gpio0-default { ++ mux { ++ function = "gpio0"; ++ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", ++ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", ++ "gpio0_13_grp", "gpio0_14_grp"; ++ }; ++ ++ conf { ++ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", ++ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", ++ "gpio0_13_grp", "gpio0_14_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ ++ conf-pull-up { ++ pins = "MIO9", "MIO10", "MIO11", "MIO12", "MIO13", "MIO14"; ++ bias-pull-up; ++ }; ++ ++ conf-pull-none { ++ pins = "MIO7", "MIO8"; ++ bias-disable; ++ }; ++ }; ++ ++ pinctrl_i2c0_default: i2c0-default { ++ mux { ++ groups = "i2c0_10_grp"; ++ function = "i2c0"; ++ }; ++ ++ conf { ++ groups = "i2c0_10_grp"; ++ bias-pull-up; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ }; ++ ++ pinctrl_i2c0_gpio: i2c0-gpio { ++ mux { ++ groups = "gpio0_50_grp", "gpio0_51_grp"; ++ function = "gpio0"; ++ }; ++ ++ conf { ++ groups = "gpio0_50_grp", "gpio0_51_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ }; ++ ++ pinctrl_sdhci0_default: sdhci0-default { ++ mux { ++ groups = "sdio0_2_grp"; ++ function = "sdio0"; ++ }; ++ ++ conf { ++ groups = "sdio0_2_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ bias-disable; ++ }; ++ ++ mux-cd { ++ groups = "gpio0_0_grp"; ++ function = "sdio0_cd"; ++ }; ++ ++ conf-cd { ++ groups = "gpio0_0_grp"; ++ bias-high-impedance; ++ bias-pull-up; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ ++ mux-wp { ++ groups = "gpio0_15_grp"; ++ function = "sdio0_wp"; ++ }; ++ ++ conf-wp { ++ groups = "gpio0_15_grp"; ++ bias-high-impedance; ++ bias-pull-up; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ }; ++ ++ pinctrl_uart1_default: uart1-default { ++ mux { ++ groups = "uart1_10_grp"; ++ function = "uart1"; ++ }; ++ ++ conf { ++ groups = "uart1_10_grp"; ++ slew-rate = <0>; ++ io-standard = <1>; ++ }; ++ ++ conf-rx { ++ pins = "MIO25"; ++ bias-high-impedance; ++ }; ++ ++ conf-tx { ++ pins = "MIO24"; ++ bias-disable; ++ }; ++ }; ++}; ++ ++&qspi { ++ u-boot,dm-pre-reloc; ++ status = "disabled"; ++ is-dual = <0>; ++ num-cs = <1>; ++ flash@0 { ++ compatible = "n25q128a11"; ++ reg = <0x0>; ++ spi-tx-bus-width = <1>; ++ spi-rx-bus-width = <4>; ++ spi-max-frequency = <50000000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ partition@qspi-fsbl-uboot { ++ label = "qspi-fsbl-uboot"; ++ reg = <0x0 0x100000>; ++ }; ++ partition@qspi-linux { ++ label = "qspi-linux"; ++ reg = <0x100000 0x500000>; ++ }; ++ partition@qspi-device-tree { ++ label = "qspi-device-tree"; ++ reg = <0x600000 0x20000>; ++ }; ++ partition@qspi-rootfs { ++ label = "qspi-rootfs"; ++ reg = <0x620000 0x5E0000>; ++ }; ++ partition@qspi-bitstream { ++ label = "qspi-bitstream"; ++ reg = <0xC00000 0x400000>; ++ }; ++ }; ++}; ++ ++&sdhci0 { ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&uart1 { ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart1_default>; ++}; +-- +2.23.0 + diff --git a/buildroot/board/qmtech/zynq/readme.txt b/buildroot/board/qmtech/zynq/readme.txt new file mode 100644 index 000000000..5fb95bb90 --- /dev/null +++ b/buildroot/board/qmtech/zynq/readme.txt @@ -0,0 +1,76 @@ +******************************* +QMTECH Zynq XC7Z010 Starter Kit +******************************* + +This file documents the Buildroot support for the QMTECH [1] Zynq +XC7Z010 Starter Kit [2]. It is a low cost (~55$) Zynq based +development board. The board user manual is available at +[3]. Additional files are available on Github [4]. + + +Build +===== + +First, configure Buildroot for the QMTECH Zynq board: + + make zynq_qmtech_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - boot.bin + - boot.vfat + - devicetree.dtb + - rootfs.cpio + - rootfs.cpio.gz + - rootfs.cpio.uboot + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot.img + - uImage + - zynq-qmtech.dtb + + +Create a bootable micro SD card +=============================== + +To determine the device associated to the micro SD card have a look in +the /proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a micro SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + + +Boot the QMTECH Zynq board +========================== + +To boot your newly created system: +- put a mini USB cable into the J4 Debug USB Port and connect using a + terminal emulator at 115200 bps, 8n1, +- put the prepared micro SD card in the J2 micro SD card slot, +- plug the 5V power supply on the JP4 barrel jack. + +Enjoy! + + +[1]. QMTECH: + http://www.chinaqmtech.com/ + +[2]. QMTECH Zynq XC7Z010 Starter Kit Product Page: + http://www.chinaqmtech.com/xilinx_zynq_soc + +[3]. QMTECH Zynq XC7Z010 Starter Kit Hardware User Manual: + http://www.chinaqmtech.com/filedownload/32552 + +[4]. QMTECH Github: + https://github.com/ChinaQMTECH/ZYNQ_STARTER_KIT diff --git a/buildroot/board/radxa/rockpi-4/extlinux.conf b/buildroot/board/radxa/rockpi-4/extlinux.conf new file mode 100644 index 000000000..83374f174 --- /dev/null +++ b/buildroot/board/radxa/rockpi-4/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_ROCK_PI_4 linux + kernel /Image + devicetree /rk3399-rock-pi-4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/buildroot/board/radxa/rockpi-4/genimage.cfg b/buildroot/board/radxa/rockpi-4/genimage.cfg new file mode 100644 index 000000000..88986df34 --- /dev/null +++ b/buildroot/board/radxa/rockpi-4/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-rock-pi-4.dtb", + "extlinux" + } + } + size = 112M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/radxa/rockpi-4/post-build.sh b/buildroot/board/radxa/rockpi-4/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/radxa/rockpi-4/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rockpi-4/readme.txt b/buildroot/board/radxa/rockpi-4/readme.txt new file mode 100644 index 000000000..1db7569ed --- /dev/null +++ b/buildroot/board/radxa/rockpi-4/readme.txt @@ -0,0 +1,61 @@ +RADXA ROCK_PI_4 +================ +https://rockpi.org/rockpi4 + +ROCK Pi 4 is a Single Board Computer (SBC) from radxa. This guide is valid +for the below models: +- ROCK PI 4 Model A +- ROCK PI 4 Model B +- ROCK PI 4 Model C + +Build: +====== + $ make rock_pi_4_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-rock-pi-4.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +RockPi4 has a 40-pin GPIO header. The pin layout is as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +Wiki link: +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rock-pi-4.html diff --git a/buildroot/board/radxa/rockpi-n10/extlinux.conf b/buildroot/board/radxa/rockpi-n10/extlinux.conf new file mode 100644 index 000000000..b6a4c97cd --- /dev/null +++ b/buildroot/board/radxa/rockpi-n10/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_ROCK_PI_N10 linux + kernel /Image + devicetree /rk3399pro-rock-pi-n10.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/buildroot/board/radxa/rockpi-n10/genimage.cfg b/buildroot/board/radxa/rockpi-n10/genimage.cfg new file mode 100644 index 000000000..8fbf562f2 --- /dev/null +++ b/buildroot/board/radxa/rockpi-n10/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399pro-rock-pi-n10.dtb", + "extlinux" + } + } + size = 112M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/radxa/rockpi-n10/post-build.sh b/buildroot/board/radxa/rockpi-n10/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/radxa/rockpi-n10/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rockpi-n10/readme.txt b/buildroot/board/radxa/rockpi-n10/readme.txt new file mode 100644 index 000000000..49decbb3d --- /dev/null +++ b/buildroot/board/radxa/rockpi-n10/readme.txt @@ -0,0 +1,61 @@ +RADXA ROCKPI-N10 +================ +https://wiki.radxa.com/RockpiN10 + +Build: +====== + $ make rock_pi_n10_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399pro-rock-pi-n10.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +RockPi-N10 has a 40-pin GPIO header. The pin layout is as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 1500000. + +The boot order on rockpi-n10 is emmc, sd. If emmc contains a valid Image, the board +always boots from emmc. To boot from SD, erase emmc as per the guide: + +https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399pro/rock-pi-n10.html diff --git a/buildroot/board/radxa/rockpi-n8/extlinux.conf b/buildroot/board/radxa/rockpi-n8/extlinux.conf new file mode 100644 index 000000000..c323fe10e --- /dev/null +++ b/buildroot/board/radxa/rockpi-n8/extlinux.conf @@ -0,0 +1,4 @@ +label RK3288_ROCKPI_N8 linux + kernel /zImage + devicetree /rk3288-rock-pi-n8.dtb + append console=ttyS2,115200n8 root=/dev/mmcblk0p4 rw rootwait diff --git a/buildroot/board/radxa/rockpi-n8/genimage.cfg b/buildroot/board/radxa/rockpi-n8/genimage.cfg new file mode 100644 index 000000000..88b55de37 --- /dev/null +++ b/buildroot/board/radxa/rockpi-n8/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "rk3288-rock-pi-n8.dtb", + "extlinux" + } + } + size = 16M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot-dtb.img" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/radxa/rockpi-n8/post-build.sh b/buildroot/board/radxa/rockpi-n8/post-build.sh new file mode 100755 index 000000000..ba29375c0 --- /dev/null +++ b/buildroot/board/radxa/rockpi-n8/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/radxa/rockpi-n8/readme.txt b/buildroot/board/radxa/rockpi-n8/readme.txt new file mode 100644 index 000000000..ac83d5c8c --- /dev/null +++ b/buildroot/board/radxa/rockpi-n8/readme.txt @@ -0,0 +1,61 @@ +RADXA ROCKPI-N8 +================ +https://wiki.radxa.com/RockpiN8 + +Build: +====== + $ make rock_pi_n8_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +├── boot.vfat +├── extlinux +├── idbloader.img +├── rk3288-rock-pi-n8.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +├── u-boot-dtb.bin +├── u-boot-dtb.img +└── zImage + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +RockPi-N8 has a 40-pin GPIO header. The pin layout is as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 115200. + +The boot order on rockpi-n8 is emmc, sd. If emmc contains a valid Image, the board +always boots from emmc. To boot from SD, erase emmc as per the guide: + +https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://wiki.amarulasolutions.com/bsp/rockchip/rk3288/rock-pi-n8.html diff --git a/buildroot/board/roseapplepi/genimage.cfg b/buildroot/board/roseapplepi/genimage.cfg index 4d40e65bb..f4a353e82 100644 --- a/buildroot/board/roseapplepi/genimage.cfg +++ b/buildroot/board/roseapplepi/genimage.cfg @@ -7,10 +7,10 @@ image boot.vfat { "uImage" } file kernel.dtb { - image = "actduino_bubble_gum_sdboot_linux.dtb" + image = "owl-s500-roseapplepi.dtb" } } - size = 10M + size = 128M } image sdcard.img { @@ -34,10 +34,4 @@ image sdcard.img { bootable = "true" image = "boot.vfat" } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } } diff --git a/buildroot/board/roseapplepi/linux.config b/buildroot/board/roseapplepi/linux.config new file mode 100644 index 000000000..aea48b773 --- /dev/null +++ b/buildroot/board/roseapplepi/linux.config @@ -0,0 +1,45 @@ +# CONFIG_SWAP is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_CPU_ISOLATION is not set +# CONFIG_KALLSYMS is not set +# CONFIG_RSEQ is not set +CONFIG_EMBEDDED=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_ARCH_ACTIONS=y +CONFIG_SMP=y +CONFIG_ARM_PSCI=y +CONFIG_HIGHMEM=y +CONFIG_VFP=y +CONFIG_NEON=y +# CONFIG_SUSPEND is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +# CONFIG_COREDUMP is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +# CONFIG_ETHTOOL_NETLINK is not set +# CONFIG_VT is not set +CONFIG_SERIAL_OWL=y +# CONFIG_HW_RANDOM is not set +# CONFIG_HID is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VHOST_MENU is not set +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXT4_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_FTRACE is not set +# CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch b/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch new file mode 100644 index 000000000..615be675a --- /dev/null +++ b/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch @@ -0,0 +1,52 @@ +From: Cristian Ciocaltea +Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers +To: Rob Herring , + Andreas Färber , + Manivannan Sadhasivam +Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, + linux-kernel@vger.kernel.org +Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago) +X-Mailer: git-send-email 2.27.0 + +The PPI interrupts for cortex-a9 were incorrectly specified, fix them. + +Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar") +Signed-off-by: Cristian Ciocaltea +Signed-off-by: Peter Korsgaard +--- + arch/arm/boot/dts/owl-s500.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi +index 5ceb6cc4451d..1dbe4e8b38ac 100644 +--- a/arch/arm/boot/dts/owl-s500.dtsi ++++ b/arch/arm/boot/dts/owl-s500.dtsi +@@ -84,21 +84,21 @@ scu: scu@b0020000 { + global_timer: timer@b0020200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0xb0020200 0x100>; +- interrupts = ; ++ interrupts = ; + status = "disabled"; + }; + + twd_timer: timer@b0020600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0xb0020600 0x20>; +- interrupts = ; ++ interrupts = ; + status = "disabled"; + }; + + twd_wdt: wdt@b0020620 { + compatible = "arm,cortex-a9-twd-wdt"; + reg = <0xb0020620 0xe0>; +- interrupts = ; ++ interrupts = ; + status = "disabled"; + }; + +-- +2.27.0 + + diff --git a/buildroot/board/roseapplepi/patches/linux/0001-unbreak-xhci-trace.patch b/buildroot/board/roseapplepi/patches/linux/0001-unbreak-xhci-trace.patch deleted file mode 100644 index 79e8c800d..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0001-unbreak-xhci-trace.patch +++ /dev/null @@ -1,31 +0,0 @@ -[PATCH] unbreak xhci-trace compilation - -When commit 84a99f6fc5d4 (xhci: add traces for debug messages in -xhci_address_device) was backported to the owl tree as part of commit -5b2ea66f15396 (usb: add owl usb driver), the specific CFLAGS needed for -xhci-trace.c were missed, causing build breakage: - - CC drivers/usb/host/xhci-trace.o -In file included from drivers/usb/host/xhci-trace.h:151:0, - from drivers/usb/host/xhci-trace.c:15: -include/trace/define_trace.h:79:43: fatal error: ./xhci-trace.h: No such file or directory - -Signed-off-by: Peter Korsgaard ---- - drivers/usb/host/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -Index: linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b/drivers/usb/host/Makefile -=================================================================== ---- linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.orig/drivers/usb/host/Makefile -+++ linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b/drivers/usb/host/Makefile -@@ -4,6 +4,9 @@ - - ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG - -+# tell define_trace.h where to find the xhci trace header -+CFLAGS_xhci-trace.o := -I$(src) -+ - isp1760-y := isp1760-hcd.o isp1760-if.o - - fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o diff --git a/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch b/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch new file mode 100644 index 000000000..87a6ee245 --- /dev/null +++ b/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch @@ -0,0 +1,89 @@ +From: Cristian Ciocaltea +Subject: [PATCH 4/4] arm: dts: owl-s500: Add RoseapplePi +To: Rob Herring , + Andreas Färber , + Manivannan Sadhasivam +Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org +Date: Mon, 15 Jun 2020 03:19:11 +0300 (10 weeks, 3 days, 20 hours ago) +X-Mailer: git-send-email 2.27.0 + +Add a Device Tree for the RoseapplePi SBC. + +Signed-off-by: Cristian Ciocaltea +Signed-off-by: Peter Korsgaard +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 47 ++++++++++++++++++++++ + 2 files changed, 48 insertions(+) + create mode 100644 arch/arm/boot/dts/owl-s500-roseapplepi.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index e8dd99201397..d0712e7275da 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -856,6 +856,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ + dtb-$(CONFIG_ARCH_ACTIONS) += \ + owl-s500-cubieboard6.dtb \ + owl-s500-guitar-bb-rev-b.dtb \ ++ owl-s500-roseapplepi.dtb \ + owl-s500-sparky.dtb + dtb-$(CONFIG_ARCH_PRIMA2) += \ + prima2-evb.dtb +diff --git a/arch/arm/boot/dts/owl-s500-roseapplepi.dts b/arch/arm/boot/dts/owl-s500-roseapplepi.dts +new file mode 100644 +index 000000000000..c61fbaa3821e +--- /dev/null ++++ b/arch/arm/boot/dts/owl-s500-roseapplepi.dts +@@ -0,0 +1,47 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Roseapple Pi ++ * ++ * Copyright (c) 2020 Cristian Ciocaltea ++ */ ++ ++/dts-v1/; ++ ++#include "owl-s500.dtsi" ++ ++/ { ++ compatible = "roseapplepi,roseapplepi", "actions,s500"; ++ model = "Roseapple Pi"; ++ ++ aliases { ++ serial2 = &uart2; ++ }; ++ ++ chosen { ++ stdout-path = "serial2:115200n8"; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x80000000>; /* 2GB */ ++ }; ++ ++ uart2_clk: uart2-clk { ++ compatible = "fixed-clock"; ++ clock-frequency = <921600>; ++ #clock-cells = <0>; ++ }; ++}; ++ ++&twd_timer { ++ status = "okay"; ++}; ++ ++&timer { ++ clocks = <&hosc>; ++}; ++ ++&uart2 { ++ status = "okay"; ++ clocks = <&uart2_clk>; ++}; +-- +2.27.0 + + diff --git a/buildroot/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch b/buildroot/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch deleted file mode 100644 index 8d3c703e3..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 96b4fb75d15be65edc5494579e4a944534042f99 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 13 Oct 2014 15:51:05 -0700 -Subject: [PATCH] kernel: add support for gcc 5 - -We're missing include/linux/compiler-gcc5.h which is required now -because gcc branched off to v5 in trunk. - -Just copy the relevant bits out of include/linux/compiler-gcc4.h, -no new code is added as of now. - -This fixes a build error when using gcc 5. - -Signed-off-by: Sasha Levin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -(cherry picked from commit 71458cfc782eafe4b27656e078d379a34e472adf) -Signed-off-by: Peter Korsgaard ---- - include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -new file mode 100644 -index 0000000..cdd1cc2 ---- /dev/null -+++ b/include/linux/compiler-gcc5.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.10.2 - diff --git a/buildroot/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/buildroot/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch deleted file mode 100644 index da38f2667..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8ac9a3f6dbf00d861134bea3f2c930defed6311a Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Wed, 24 Sep 2014 01:06:46 +0100 -Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). In this case using static inline -and removing the NULL version of return_address in return_address.c does -the right thing. - -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois -Acked-by: Steven Rostedt -Signed-off-by: Russell King -(cherry picked from commit aeea3592a13bf12861943e44fc48f1f270941f8d) -Signed-off-by: Peter Korsgaard ---- - arch/arm/include/asm/ftrace.h | 2 +- - arch/arm/kernel/return_address.c | 5 ----- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h -index f89515a..2bb8cac 100644 ---- a/arch/arm/include/asm/ftrace.h -+++ b/arch/arm/include/asm/ftrace.h -@@ -45,7 +45,7 @@ void *return_address(unsigned int); - - #else - --extern inline void *return_address(unsigned int level) -+static inline void *return_address(unsigned int level) - { - return NULL; - } -diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c -index 2f8f523..a3b587f 100755 ---- a/arch/arm/kernel/return_address.c -+++ b/arch/arm/kernel/return_address.c -@@ -63,11 +63,6 @@ void *return_address(unsigned int level) - //#warning "TODO: return_address should use unwind tables" - //#endif - --void *return_address(unsigned int level) --{ -- return NULL; --} -- - #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ - - EXPORT_SYMBOL_GPL(return_address); --- -2.10.2 - diff --git a/buildroot/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch b/buildroot/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch deleted file mode 100644 index d76e2851b..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch +++ /dev/null @@ -1,121 +0,0 @@ -From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001 -From: Marco Franceschetti -Date: Sun, 13 Mar 2016 09:44:54 +0100 -Subject: [PATCH] Fix compile errors with gcc5 - -(cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e) -Signed-off-by: Peter Korsgaard ---- - drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++--- - drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++--- - drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++--- - drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++--- - 4 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h -index fc293c4..0898cd4 100755 ---- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h -+++ b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h -@@ -1314,18 +1314,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static __inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static __inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+static __inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -diff --git a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h -index 09475ef..56e0f5a 100755 ---- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h -+++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h -@@ -1318,18 +1318,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static __inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static __inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+static __inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -diff --git a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h -index 5dfc421..95144b6 100755 ---- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h -+++ b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h -@@ -1314,18 +1314,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static __inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static __inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+static __inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -diff --git a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h -index 09475ef..56e0f5a 100755 ---- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h -+++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h -@@ -1318,18 +1318,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static __inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static __inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+static __inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); --- -2.10.2 - diff --git a/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch b/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch deleted file mode 100644 index 791dd930c..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch +++ /dev/null @@ -1,363 +0,0 @@ -From 21be6b635320321216dde9201fa57a3aed60ee12 Mon Sep 17 00:00:00 2001 -From: Joe Perches -Date: Thu, 25 Jun 2015 15:01:02 -0700 -Subject: [PATCH] compiler-gcc: integrate the various compiler-gcc[345].h files - -As gcc major version numbers are going to advance rather rapidly in the -future, there's no real value in separate files for each compiler -version. - -Deduplicate some of the macros #defined in each file too. - -Neaten comments using normal kernel commenting style. - -Signed-off-by: Joe Perches -Cc: Andi Kleen -Cc: Michal Marek -Cc: Segher Boessenkool -Cc: Sasha Levin -Cc: Anton Blanchard -Cc: Alan Modra -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -(cherry picked from commit cb984d101b30eb7478d32df56a0023e4603cba7f) -Signed-off-by: Peter Korsgaard ---- - include/linux/compiler-gcc.h | 120 ++++++++++++++++++++++++++++++++++++++++-- - include/linux/compiler-gcc3.h | 23 -------- - include/linux/compiler-gcc4.h | 88 ------------------------------- - include/linux/compiler-gcc5.h | 66 ----------------------- - 4 files changed, 116 insertions(+), 181 deletions(-) - delete mode 100644 include/linux/compiler-gcc3.h - delete mode 100644 include/linux/compiler-gcc4.h - delete mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index 24545cd90a25..0c5d746850c2 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -97,10 +97,122 @@ - #define __maybe_unused __attribute__((unused)) - #define __always_unused __attribute__((unused)) - --#define __gcc_header(x) #x --#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) --#define gcc_header(x) _gcc_header(x) --#include gcc_header(__GNUC__) -+/* gcc version specific checks */ -+ -+#if GCC_VERSION < 30200 -+# error Sorry, your compiler is too old - please upgrade it. -+#endif -+ -+#if GCC_VERSION < 30300 -+# define __used __attribute__((__unused__)) -+#else -+# define __used __attribute__((__used__)) -+#endif -+ -+#ifdef CONFIG_GCOV_KERNEL -+# if GCC_VERSION < 30400 -+# error "GCOV profiling support for gcc versions below 3.4 not included" -+# endif /* __GNUC_MINOR__ */ -+#endif /* CONFIG_GCOV_KERNEL */ -+ -+#if GCC_VERSION >= 30400 -+#define __must_check __attribute__((warn_unused_result)) -+#endif -+ -+#if GCC_VERSION >= 40000 -+ -+/* GCC 4.1.[01] miscompiles __weak */ -+#ifdef __KERNEL__ -+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 -+# error Your version of gcc miscompiles the __weak directive -+# endif -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __compiler_offsetof(a, b) \ -+ __builtin_offsetof(a, b) -+ -+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 -+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -+#endif -+ -+#if GCC_VERSION >= 40300 -+/* Mark functions as cold. gcc will assume any path leading to a call -+ * to them will be unlikely. This means a lot of manual unlikely()s -+ * are unnecessary now for any paths leading to the usual suspects -+ * like BUG(), printk(), panic() etc. [but let's keep them for now for -+ * older compilers] -+ * -+ * Early snapshots of gcc 4.3 don't support this and we can't detect this -+ * in the preprocessor, but we can live with this because they're unreleased. -+ * Maketime probing would be overkill here. -+ * -+ * gcc also has a __attribute__((__hot__)) to move hot functions into -+ * a special section, but I don't see any sense in this right now in -+ * the kernel context -+ */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+#endif /* GCC_VERSION >= 40300 */ -+ -+#if GCC_VERSION >= 40500 -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+#endif /* GCC_VERSION >= 40500 */ -+ -+#if GCC_VERSION >= 40600 -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+#endif -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#if GCC_VERSION >= 40400 -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#endif -+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -+ -+#if GCC_VERSION >= 50000 -+#define KASAN_ABI_VERSION 4 -+#elif GCC_VERSION >= 40902 -+#define KASAN_ABI_VERSION 3 -+#endif -+ -+#endif /* gcc version >= 40000 specific checks */ - - #if !defined(__noclone) - #define __noclone /* not needed */ -diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h -deleted file mode 100644 -index 7d89febe4d79..000000000000 ---- a/include/linux/compiler-gcc3.h -+++ /dev/null -@@ -1,23 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --#if GCC_VERSION < 30200 --# error Sorry, your compiler is too old - please upgrade it. --#endif -- --#if GCC_VERSION >= 30300 --# define __used __attribute__((__used__)) --#else --# define __used __attribute__((__unused__)) --#endif -- --#if GCC_VERSION >= 30400 --#define __must_check __attribute__((warn_unused_result)) --#endif -- --#ifdef CONFIG_GCOV_KERNEL --# if GCC_VERSION < 30400 --# error "GCOV profiling support for gcc versions below 3.4 not included" --# endif /* __GNUC_MINOR__ */ --#endif /* CONFIG_GCOV_KERNEL */ -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -deleted file mode 100644 -index 2507fd2a1eb4..000000000000 ---- a/include/linux/compiler-gcc4.h -+++ /dev/null -@@ -1,88 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --/* GCC 4.1.[01] miscompiles __weak */ --#ifdef __KERNEL__ --# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 --# error Your version of gcc miscompiles the __weak directive --# endif --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -- --#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 --# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) --#endif -- --#if GCC_VERSION >= 40300 --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ --#endif /* GCC_VERSION >= 40300 */ -- --#if GCC_VERSION >= 40500 --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --#endif /* GCC_VERSION >= 40500 */ -- --#if GCC_VERSION >= 40600 --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) --#endif -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * Fixed in GCC 4.8.2 and later versions. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#if GCC_VERSION >= 40400 --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#endif --#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) --#define __HAVE_BUILTIN_BSWAP16__ --#endif --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -deleted file mode 100644 -index cdd1cc202d51..000000000000 ---- a/include/linux/compiler-gcc5.h -+++ /dev/null -@@ -1,66 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -- --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ -- --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * Fixed in GCC 4.8.2 and later versions. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#define __HAVE_BUILTIN_BSWAP16__ --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.11.0 - diff --git a/buildroot/board/roseapplepi/uEnv.txt b/buildroot/board/roseapplepi/uEnv.txt old mode 100755 new mode 100644 index f9646e498..2b9de727b --- a/buildroot/board/roseapplepi/uEnv.txt +++ b/buildroot/board/roseapplepi/uEnv.txt @@ -1,3 +1,3 @@ # no ramdisk ramdisk_addr_r=- -bootargs=clk_ignore_unused root=/dev/mmcblk0p2 +bootargs=console=ttyOWL2,115200 diff --git a/buildroot/board/solidrun/macchiatobin/readme.txt b/buildroot/board/solidrun/macchiatobin/readme.txt index dc5d6c794..7412951aa 100644 --- a/buildroot/board/solidrun/macchiatobin/readme.txt +++ b/buildroot/board/solidrun/macchiatobin/readme.txt @@ -12,32 +12,14 @@ through the serial console. How to build ============ -There are two build options: mainline support and vendor support. +Default configuration provides the following BSP versions: + - Linux v5.6.3 (mainline) + - U-Boot v2020.01 (mainline) + - ATF v1.5-18.12.2 (Marvell) -For the mainline BSP, we use: - - Linux v4.19.2 - - U-Boot v2018.11 +To build images run the following commands: -For the vendor BSP, we use the sources available from Marvell Github -page at https://github.com/MarvellEmbeddedProcessors, which uses: - - Linux v4.4.120 - - U-Boot v2018.03 - -At the moment mainline support for the board is a work in -progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5), -copper 10Gb interfaces, and automatic configuration of select SFP -modules on the SFP cages. The vendor BSP enables more hardware features -out of the box, but lacks support for SFP detection and automatic -configuration. - -To use the mainline BSP run the following commands: - - $ make solidrun_macchiatobin_mainline_defconfig - $ make - -To use the vendor BSP run the following commands: - - $ make solidrun_macchiatobin_marvell_defconfig + $ make solidrun_macchiatobin_defconfig $ make How to write the SD card @@ -74,13 +56,15 @@ Insert the micro SDcard in the MacchiatoBin board and power it up. The serial console is accessible at the micro-USB Type-B connector marked CON9. The serial line settings are 115200 8N1. -Note: the following text only applies to the vendor BSP from -solidrun_macchiatobin_marvell_defconfig. +U-Boot environment +================== -By default Marvell provided U-Boot will load its environment from the -SPI flash. On the first boot SPI flash may be empty or it may contain a -legacy environment that prevents proper boot. Then the following -commands can be used to boot the board: +By default current configuration provides U-Boot that keeps environment +in SD/eMMC. However, if needed, u-boot-fragment.config can be tweaked +so that U-Boot will keep environment in SPI flash. On the first boot +SPI flash may be empty or it may contain a stale environment that +prevents proper boot. Then the following commands can be used +to boot the board: => ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt => env import -t 0x01700000 $filesize diff --git a/buildroot/board/solidrun/mx6cubox/boot.scr.txt b/buildroot/board/solidrun/mx6cubox/boot.scr.txt index 7a8aa4bd5..e4cf81478 100644 --- a/buildroot/board/solidrun/mx6cubox/boot.scr.txt +++ b/buildroot/board/solidrun/mx6cubox/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/buildroot/board/stmicroelectronics/stm32-post-build.sh b/buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh similarity index 100% rename from buildroot/board/stmicroelectronics/stm32-post-build.sh rename to buildroot/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg b/buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template similarity index 60% rename from buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg rename to buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template index 2b9e832dc..f341c19f2 100644 --- a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg +++ b/buildroot/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template @@ -4,21 +4,19 @@ image sdcard.img { } partition fsbl1 { - image = "u-boot-spl.stm32" + image = "%ATFBIN%" } partition fsbl2 { - image = "u-boot-spl.stm32" + image = "%ATFBIN%" } partition ssbl { - image = "u-boot.img" + image = "u-boot.stm32" } partition rootfs { image = "rootfs.ext4" - partition-type = 0x83 bootable = "yes" - size = 256M } } diff --git a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh new file mode 100755 index 000000000..eec3cb739 --- /dev/null +++ b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +# +# atf_image extracts the ATF binary image from DTB_FILE_NAME that appears in +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES in ${BR_CONFIG}, +# then prints the corresponding file name for the genimage +# configuration file +# +atf_image() +{ + local ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})" + + if grep -Eq "DTB_FILE_NAME=stm32mp157c-dk2.dtb" <<< ${ATF_VARIABLES}; then + echo "tf-a-stm32mp157c-dk2.stm32" + elif grep -Eq "DTB_FILE_NAME=stm32mp157a-dk1.dtb" <<< ${ATF_VARIABLES}; then + echo "tf-a-stm32mp157a-dk1.stm32" + fi +} + +main() +{ + local ATFBIN="$(atf_image)" + local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + + sed -e "s/%ATFBIN%/${ATFBIN}/" \ + board/stmicroelectronics/common/stm32mp157/genimage.cfg.template > ${GENIMAGE_CFG} + + support/scripts/genimage.sh -c ${GENIMAGE_CFG} + + rm -f ${GENIMAGE_CFG} + + exit $? +} + +main $@ diff --git a/buildroot/board/stmicroelectronics/stm32mp157a-dk1/linux.config b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/linux.config new file mode 100644 index 000000000..95c834e43 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/linux.config @@ -0,0 +1,182 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_ARCH_STM32=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SECCOMP=y +# CONFIG_ATAGS is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_CRYPTO=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CAN=y +CONFIG_CAN_M_CAN=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_KS8851=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_STPMIC1_ONKEY=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_STM32F7=y +CONFIG_SPI=y +CONFIG_SPI_STM32=y +CONFIG_SPI_STM32_QSPI=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_STMFX=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_WATCHDOG=y +CONFIG_STPMIC1_WATCHDOG=y +CONFIG_MFD_STM32_LPTIMER=y +CONFIG_MFD_STPMIC1=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_STM32_VREFBUF=y +CONFIG_REGULATOR_STM32_PWR=y +CONFIG_REGULATOR_STPMIC1=y +CONFIG_DRM=y +CONFIG_DRM_STM=y +CONFIG_DRM_STM_DSI=y +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +# CONFIG_DRM_SII902X is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_LCD_CLASS_DEVICE is not set +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +# CONFIG_BACKLIGHT_GENERIC is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_GPIO_VBUS=y +CONFIG_USB_ISP1301=y +CONFIG_USB_ULPI=y +CONFIG_TYPEC=y +CONFIG_TYPEC_STUSB=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_DW=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STM32=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_STM32_IPCC=y +CONFIG_REMOTEPROC=y +CONFIG_STM32_RPROC=y +CONFIG_RPMSG_VIRTIO=y +CONFIG_RPMSG_TTY=y +CONFIG_IIO=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_SD_ADC_MODULATOR=y +CONFIG_STM32_ADC_CORE=y +CONFIG_STM32_ADC=y +CONFIG_STM32_ADC_TEMP=y +CONFIG_STM32_DFSDM_ADC=y +CONFIG_STM32_LPTIMER_CNT=y +CONFIG_STM32_DAC=y +CONFIG_IIO_HRTIMER_TRIGGER=y +CONFIG_IIO_STM32_LPTIMER_TRIGGER=y +CONFIG_PWM=y +CONFIG_PWM_STM32=y +CONFIG_PWM_STM32_LP=y +CONFIG_PHY_STM32_USBPHYC=y +CONFIG_NVMEM_STM32_ROMEM=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_PRINTK_TIME=y diff --git a/buildroot/board/stmicroelectronics/stm32mp157a-dk1/overlay/boot/extlinux/extlinux.conf b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000..437e80fde --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp157a-dk1-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157a-dk1.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/buildroot/board/stmicroelectronics/stm32mp157a-dk1/readme.txt b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/readme.txt new file mode 100644 index 000000000..060f71d5d --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/readme.txt @@ -0,0 +1,38 @@ +STM32MP157A Discovery Kit v1 + +Intro +===== + +This configuration supports the STM32MP157 Discovery Kit 1 (DK1) +platform: + + https://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html + +How to build +============ + + $ make stm32mp157a_dk1_defconfig + $ make + +How to write the microSD card +============================= + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector CN15 + + (2) Plug a micro-USB cable in connector CN11 and run your serial + communication program on /dev/ttyACM0. + + (3) Plug a USB-C cable in CN6 to power-up the board. + + (4) The system will start, with the console on UART, but also visible + on the screen. diff --git a/buildroot/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config new file mode 100644 index 000000000..a278ce9e2 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config @@ -0,0 +1 @@ +# CONFIG_STM32MP_WATCHDOG is not set diff --git a/buildroot/board/synopsys/hsdk/linux.fragment b/buildroot/board/synopsys/hsdk/linux.fragment index 45d6c69af..aaca08e01 100644 --- a/buildroot/board/synopsys/hsdk/linux.fragment +++ b/buildroot/board/synopsys/hsdk/linux.fragment @@ -1,2 +1,3 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_ARC_UBOOT_SUPPORT=y +CONFIG_USB=y diff --git a/buildroot/board/udoo/neo/boot.scr.txt b/buildroot/board/udoo/common/boot.scr.txt similarity index 66% rename from buildroot/board/udoo/neo/boot.scr.txt rename to buildroot/board/udoo/common/boot.scr.txt index 7a8aa4bd5..7acceed0f 100644 --- a/buildroot/board/udoo/neo/boot.scr.txt +++ b/buildroot/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ setenv finduuid "part uuid mmc 0:1 uuid" run finduuid run findfdt -setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" +setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" load mmc 0:1 ${fdt_addr} boot/${fdtfile} load mmc 0:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/buildroot/board/udoo/common/post-build.sh b/buildroot/board/udoo/common/post-build.sh new file mode 100755 index 000000000..d3f612f81 --- /dev/null +++ b/buildroot/board/udoo/common/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/udoo/mx6qdl/linux.fragment b/buildroot/board/udoo/mx6qdl/linux.fragment deleted file mode 100644 index 1d2509982..000000000 --- a/buildroot/board/udoo/mx6qdl/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_USB is not set diff --git a/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch b/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch new file mode 100644 index 000000000..d151a40d6 --- /dev/null +++ b/buildroot/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch @@ -0,0 +1,26 @@ +[PATCH] ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang + +Currently the kernel hangs when USB Host1 is enabled due to the lack of +support for controlling the USB hub clock and GPIO reset line. + +Peter Chen has made several attempts to fix this problem, but his series +has not been applied yet, so better disable USB host1 for now to avoid +the kernel hang. + +Signed-off-by: Fabio Estevam +--- + +diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +index 828dd20cd27d..c9e122865312 100644 +--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +@@ -292,7 +292,8 @@ &usbh1 { + pinctrl-0 = <&pinctrl_usbh>; + vbus-supply = <®_usb_h1_vbus>; + clocks = <&clks IMX6QDL_CLK_CKO>; +- status = "okay"; ++ /* currently USB support causes a kernel hang. Disable it for now */ ++ status = "disabled"; + }; + + &usbotg { diff --git a/buildroot/board/udoo/mx6qdl/readme.txt b/buildroot/board/udoo/mx6qdl/readme.txt index cf1a61042..a7ca98cc8 100644 --- a/buildroot/board/udoo/mx6qdl/readme.txt +++ b/buildroot/board/udoo/mx6qdl/readme.txt @@ -14,4 +14,4 @@ directory, ready to be dumped on a micro SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/mx6qdl/genimage.cfg. +board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. diff --git a/buildroot/board/udoo/neo/genimage.cfg b/buildroot/board/udoo/neo/genimage.cfg deleted file mode 100644 index 46209120f..000000000 --- a/buildroot/board/udoo/neo/genimage.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# Minimal SD card image for the MX6SX Udoo Neo board -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "SPL" - offset = 1K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.img" - offset = 69K - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - offset = 1M - size = 512M - } -} diff --git a/buildroot/board/udoo/neo/post-build.sh b/buildroot/board/udoo/neo/post-build.sh deleted file mode 100755 index 6ccd87faf..000000000 --- a/buildroot/board/udoo/neo/post-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -d -m 755 $TARGET_DIR/boot -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ - -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/udoo/neo/post-image.sh b/buildroot/board/udoo/neo/post-image.sh deleted file mode 100755 index 18e76aa40..000000000 --- a/buildroot/board/udoo/neo/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - diff --git a/buildroot/board/udoo/neo/readme.txt b/buildroot/board/udoo/neo/readme.txt index f037ad484..94ebcc12f 100644 --- a/buildroot/board/udoo/neo/readme.txt +++ b/buildroot/board/udoo/neo/readme.txt @@ -13,4 +13,4 @@ directory, ready to be dumped on an SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/neo/genimage.cfg. +board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. diff --git a/buildroot/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch b/buildroot/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..5ef47b59f --- /dev/null +++ b/buildroot/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch @@ -0,0 +1,46 @@ +From 5448f328ff63a6ca4a64519c2f1dfc63a33df4b7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 10 Sep 2020 11:37:33 +0200 +Subject: [PATCH] Pass -fno-builtin to fix build with gcc 10 + +gcc 10, if it recognizes some hand-written code that looks like +memcpy, will generate a call to memcpy(). + +For example: + + while (dst < &_end_data) { + *dst++ = *src++; + } + +gets recognized as such. However, in the context of bare-metal code, +having a call to memcpy() in the C library doesn't work. So we fix +that by disabling builtins. + +Fixes: + +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: stm32f429i-disco.o: in function `reset': +stm32f429i-disco.c:(.text.reset+0x1a): undefined reference to `memcpy' +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: stm32f429i-disco.c:(.text.reset+0x34): undefined reference to `memset' +make[1]: *** [Makefile:26: stm32f429i-disco] Error 1 + +Upstream: https://github.com/mcoquelin-stm32/afboot-stm32/pull/9 +Signed-off-by: Thomas Petazzoni +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index f699176..1e8557d 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,6 +13,7 @@ DTB_ADDR?=0x08004000 + CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall ++CFLAGS += -fno-builtin + LINKERFLAGS := -nostartfiles --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.26.2 + diff --git a/buildroot/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in index 737dc587e..e505dee9d 100644 --- a/buildroot/boot/arm-trusted-firmware/Config.in +++ b/buildroot/boot/arm-trusted-firmware/Config.in @@ -15,7 +15,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v1.4" + bool "v2.2" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v1.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.2" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT @@ -167,4 +167,12 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC Select this option if your ATF board configuration requires the Device Tree compiler to be available. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN + bool "Needs arm-none-eabi toolchain" + depends on BR2_aarch64 + depends on BR2_HOSTARCH = "x86_64" + help + Select this option if your ATF board configuration requires + an ARM32 bare metal toolchain to be available. + endif diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 394071865..3cd83d78f 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6dae02acd85278394bfad6e2683e186e5332a711e4491ac4632ad6480f6e5494 arm-trusted-firmware-v1.4.tar.gz -sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst +sha256 07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911 arm-trusted-firmware-v2.2.tar.gz +sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 37efe8263..a3553e36c 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -35,6 +35,10 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-dtc endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain +endif + ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) diff --git a/buildroot/boot/at91bootstrap3/Config.in b/buildroot/boot/at91bootstrap3/Config.in index bd3873860..25ab30489 100644 --- a/buildroot/boot/at91bootstrap3/Config.in +++ b/buildroot/boot/at91bootstrap3/Config.in @@ -19,7 +19,7 @@ choice prompt "AT91 Bootstrap 3 version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - bool "3.9.0" + bool "3.9.3" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -51,7 +51,7 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/buildroot/boot/at91bootstrap3/at91bootstrap3.hash b/buildroot/boot/at91bootstrap3/at91bootstrap3.hash index 9f6c95ab0..6671a4ac7 100644 --- a/buildroot/boot/at91bootstrap3/at91bootstrap3.hash +++ b/buildroot/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71 at91bootstrap3-v3.9.0.tar.gz +sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index 687bac182..3b354e64d 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2020.01.0" + bool "2020.09.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2020.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2020.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index 5ade20e18..77c75b6b5 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.01.0.tar.bz2.md5 -md5 05038e0b61b68ce40e038295b809c548 barebox-2020.01.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2020.09.0.tar.bz2.md5 +md5 907dc813298fcded06fa9c788d3fb6c8 barebox-2020.09.0.tar.bz2 # Locally calculated -sha256 8968e6b0d72d79eba636917b067b925e3bbb54d38c6c2acfc4e1e49909b42f33 barebox-2020.01.0.tar.bz2 +sha256 aad3b0736aa8d368d185736260d81fb3785251f376897be3cec745182fd51869 barebox-2020.09.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/buildroot/boot/opensbi/opensbi.hash b/buildroot/boot/opensbi/opensbi.hash index 47d5930ac..f7280b890 100644 --- a/buildroot/boot/opensbi/opensbi.hash +++ b/buildroot/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd opensbi-0.5.tar.gz -sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD +sha256 17e048ac765e92e15f7436b604452614cf88dc2bcbbaab18cdc024f3fdd4c575 opensbi-0.8.tar.gz +sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD diff --git a/buildroot/boot/opensbi/opensbi.mk b/buildroot/boot/opensbi/opensbi.mk index 2df746ab0..60b87c268 100644 --- a/buildroot/boot/opensbi/opensbi.mk +++ b/buildroot/boot/opensbi/opensbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSBI_VERSION = 0.5 +OPENSBI_VERSION = 0.8 OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION)) OPENSBI_LICENSE = BSD-2-Clause OPENSBI_LICENSE_FILES = COPYING.BSD diff --git a/buildroot/boot/optee-os/Config.in b/buildroot/boot/optee-os/Config.in index 669bbda92..3076be6b4 100644 --- a/buildroot/boot/optee-os/Config.in +++ b/buildroot/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.7.0" + bool "3.11.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.11.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/buildroot/boot/optee-os/optee-os.hash b/buildroot/boot/optee-os/optee-os.hash index dc0fbecce..0d60cebea 100644 --- a/buildroot/boot/optee-os/optee-os.hash +++ b/buildroot/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz -sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.11.0.tar.gz +sha256 3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb optee-os-3.11.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/buildroot/boot/optee-os/optee-os.mk b/buildroot/boot/optee-os/optee-os.mk index acdb25b47..03ce08ffb 100644 --- a/buildroot/boot/optee-os/optee-os.mk +++ b/buildroot/boot/optee-os/optee-os.mk @@ -21,7 +21,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit @@ -32,7 +32,8 @@ OPTEE_OS_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE_core="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ - CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" + CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" \ + PYTHON3="$(HOST_DIR)/bin/python3" ifeq ($(BR2_aarch64),y) OPTEE_OS_MAKE_OPTS += \ diff --git a/buildroot/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in index ffc441d67..e4a0f48de 100644 --- a/buildroot/boot/uboot/Config.in +++ b/buildroot/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2020.01" + bool "2020.10" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -74,13 +74,9 @@ if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG || BR2_TARGET_UBOOT config BR2_TARGET_UBOOT_CUSTOM_REPO_URL string "URL of custom repository" - default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION string "Custom repository version" - default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy help Revision to use in the typical format used by Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. @@ -89,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2020.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2020.10" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -147,14 +143,45 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. +config BR2_TARGET_UBOOT_NEEDS_PYTHON + bool + +choice + bool "U-Boot needs host Python" + +config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE + bool "no" + depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON + help + Select this option if U-Boot does not need any + host python to build. + +config BR2_TARGET_UBOOT_NEEDS_PYTHON2 + bool "python 2.x" + help + Select this option if U-Boot needs a host Python 2.x + interpreter. This is the case for some U-Boot + configurations, prior to U-Boot 2020.01. + +config BR2_TARGET_UBOOT_NEEDS_PYTHON3 + bool "python 3.x" + help + Select this option if U-Boot needs a host Python 3.x + interpreter. This is the case for some U-Boot + configurations, after U-Boot 2020.01. + +endchoice + config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT bool "U-Boot needs pylibfdt" + select BR2_TARGET_UBOOT_NEEDS_PYTHON help Select this option if your U-Boot board configuration requires the Python libfdt library to be available. config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS bool "U-Boot needs pyelftools" + select BR2_TARGET_UBOOT_NEEDS_PYTHON help Select this option if your U-Boot board configuration requires the Python pyelftools library to be available. @@ -218,47 +245,31 @@ config BR2_TARGET_UBOOT_FORMAT_BIN config BR2_TARGET_UBOOT_FORMAT_DTB_BIN bool "u-boot-dtb.bin" -config BR2_TARGET_UBOOT_FORMAT_DTB_IMG - bool "u-boot-dtb.img" - -config BR2_TARGET_UBOOT_FORMAT_DTB_IMX - bool "u-boot-dtb.imx" - -config BR2_TARGET_UBOOT_FORMAT_IMG - bool "u-boot.img" - -config BR2_TARGET_UBOOT_FORMAT_ITB - bool "u-boot.itb" - -config BR2_TARGET_UBOOT_FORMAT_IMX - bool "u-boot.imx" - config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" -config BR2_TARGET_UBOOT_FORMAT_KWB - bool "u-boot.kwb (Marvell)" - depends on BR2_arm - config BR2_TARGET_UBOOT_FORMAT_ELF bool "u-boot.elf" -config BR2_TARGET_UBOOT_FORMAT_SB - bool "u-boot.sb (Freescale i.MX28)" +config BR2_TARGET_UBOOT_FORMAT_IMG + bool "u-boot.img" + +config BR2_TARGET_UBOOT_FORMAT_DTB_IMG + bool "u-boot-dtb.img" + +config BR2_TARGET_UBOOT_FORMAT_IMX + bool "u-boot.imx" + +config BR2_TARGET_UBOOT_FORMAT_DTB_IMX + bool "u-boot-dtb.imx" + +config BR2_TARGET_UBOOT_FORMAT_ITB + bool "u-boot.itb" + +config BR2_TARGET_UBOOT_FORMAT_KWB + bool "u-boot.kwb (Marvell)" depends on BR2_arm -config BR2_TARGET_UBOOT_FORMAT_SD - bool "u-boot.sd (Freescale i.MX28)" - depends on BR2_arm - help - This is Freescale i.MX28 SB format, with a header for booting - from an SD card. - - U-Boot includes an mxsboot tool to generate this format, - starting from 2011.12. - - See doc/README.mxs (or doc/README.mx28_common before 2013.07) - config BR2_TARGET_UBOOT_FORMAT_NAND bool "u-boot.nand (Freescale i.MX28)" depends on BR2_arm @@ -316,6 +327,26 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE endif +config BR2_TARGET_UBOOT_FORMAT_SB + bool "u-boot.sb (Freescale i.MX28)" + depends on BR2_arm + +config BR2_TARGET_UBOOT_FORMAT_SD + bool "u-boot.sd (Freescale i.MX28)" + depends on BR2_arm + help + This is Freescale i.MX28 SB format, with a header for booting + from an SD card. + + U-Boot includes an mxsboot tool to generate this format, + starting from 2011.12. + + See doc/README.mxs (or doc/README.mx28_common before 2013.07) + +config BR2_TARGET_UBOOT_FORMAT_STM32 + bool "u-boot.stm32" + depends on BR2_arm + config BR2_TARGET_UBOOT_FORMAT_CUSTOM bool "Custom (specify below)" help @@ -431,6 +462,28 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW This feature requires U-Boot >= 2018.07. +config BR2_TARGET_UBOOT_ZYNQMP_PM_CFG + string "PMU configuration location" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + help + Location of a PMU configuration file. + + If not empty, Buildroot will convert the PMU configuration + file into a loadable blob and pass it to U-Boot. The blob gets + embedded into the U-Boot SPL and is used to configure the PMU + during board initialization. + + Unlike the PMU firmware, the PMU configuration file is unique + to each board configuration. A PMU configuration file can be + generated by building your Xilinx SDK BSP. It can be found in + the BSP source, for example at + ./psu_cortexa53_0/libsrc/xilpm_v2_4/src/pm_cfg_obj.c + + Leave this option empty if your PMU firmware has a hard-coded + configuration object or you are loading it by any other means. + + This feature requires U-Boot >= v2019.10. + config BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE string "Custom psu_init_gpl file" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG @@ -484,65 +537,6 @@ config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC In either case the resulting file will be given a .crc extension. -menuconfig BR2_TARGET_UBOOT_ENVIMAGE - bool "Environment image" - help - Generate a valid binary environment image from a text file - describing the key=value pairs of the environment. - - The environment image will be called uboot-env.bin. - -if BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE - string "Source files for environment" - help - Text files describing the environment. Files should have - lines of the form var=value, one per line. Blank lines and - lines starting with a # are ignored. - - Multiple source files are concatenated in the order listed. - - Leave empty to generate image from compiled-in env. - -config BR2_TARGET_UBOOT_ENVIMAGE_SIZE - string "Size of environment" - help - Size of envronment, can be prefixed with 0x for hexadecimal - values. - -config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT - bool "Environment has two copies" - help - Some platforms define in their U-Boot configuration that the - U-Boot environment should be duplicated in two locations (for - extra safety). Check your U-Boot configuration for the - CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to - see if this is the case for your platform. - - If it is the case, then you should enable this option to - ensure that the U-Boot environment image generated by - Buildroot is compatible with the "redundant environment" - mechanism of U-Boot. - -endif # BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_BOOT_SCRIPT - bool "Generate a U-Boot boot script" - help - Generate a U-Boot boot script, given a file listing U-Boot - commands to be executed at boot time. The generated boot - script will be called 'boot.scr'. - -if BR2_TARGET_UBOOT_BOOT_SCRIPT - -config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE - string "U-Boot boot script source" - help - Source file to generate the U-Boot boot script. - -endif - if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH diff --git a/buildroot/boot/uboot/uboot.hash b/buildroot/boot/uboot/uboot.hash index 6c17ef02b..ba6ea0bfc 100644 --- a/buildroot/boot/uboot/uboot.hash +++ b/buildroot/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 u-boot-2020.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk index 9cbd81b05..72d5df412 100644 --- a/buildroot/boot/uboot/uboot.mk +++ b/buildroot/boot/uboot/uboot.mk @@ -34,7 +34,7 @@ UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn else # Handle stable official U-Boot versions -UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot +UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif @@ -121,6 +121,11 @@ UBOOT_MAKE_TARGET += u-boot.sb UBOOT_DEPENDENCIES += host-elftosb host-openssl endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_STM32),y) +UBOOT_BINS += u-boot.stm32 +UBOOT_MAKE_TARGET += u-boot.stm32 +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) endif @@ -160,12 +165,22 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) +UBOOT_DEPENDENCIES += host-python +else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +UBOOT_DEPENDENCIES += host-python3 +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-python host-swig +UBOOT_DEPENDENCIES += host-swig endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) UBOOT_DEPENDENCIES += host-python-pyelftools +else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) +UBOOT_DEPENDENCIES += host-python3-pyelftools +endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) @@ -302,21 +317,6 @@ define UBOOT_BUILD_OMAP_IFT -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)) endef -ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) -UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) -define UBOOT_GENERATE_ENV_IMAGE - $(if $(UBOOT_GENERATE_ENV_FILE), \ - cat $(UBOOT_GENERATE_ENV_FILE), \ - CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ - >$(@D)/buildroot-env.txt - $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ - $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ - $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ - -o $(BINARIES_DIR)/uboot-env.bin \ - $(@D)/buildroot-env.txt -endef -endif - define UBOOT_INSTALL_IMAGES_CMDS $(foreach f,$(UBOOT_BINS), \ cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ @@ -328,11 +328,6 @@ define UBOOT_INSTALL_IMAGES_CMDS cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ ) ) - $(UBOOT_GENERATE_ENV_IMAGE) - $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT), - $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ - -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \ - $(BINARIES_DIR)/boot.scr) endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) @@ -348,17 +343,31 @@ UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) endif define UBOOT_ZYNQMP_KCONFIG_PMUFW - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)", \ - $(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)") endef +UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) +ifneq ($(UBOOT_ZYNQMP_PM_CFG),) +UBOOT_ZYNQMP_PM_CFG_BIN = $(UBOOT_DIR)/pm_cfg_obj.bin +define UBOOT_ZYNQMP_KCONFIG_PM_CFG + $(call KCONFIG_SET_OPT,CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE,"$(UBOOT_ZYNQMP_PM_CFG_BIN)", \ + $(@D)/.config) +endef + +define UBOOT_ZYNQMP_PM_CFG_CONVERT + $(UBOOT_DIR)/tools/zynqmp_pm_cfg_obj_convert.py \ + "$(UBOOT_ZYNQMP_PM_CFG)" \ + "$(UBOOT_ZYNQMP_PM_CFG_BIN)" +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_ZYNQMP_PM_CFG_CONVERT +endif + UBOOT_ZYNQMP_PSU_INIT = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE)) UBOOT_ZYNQMP_PSU_INIT_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PSU_INIT)) ifneq ($(UBOOT_ZYNQMP_PSU_INIT),) define UBOOT_ZYNQMP_KCONFIG_PSU_INIT - $(call KCONFIG_SET_OPT,CONFIG_XILINX_PS_INIT_FILE,"$(UBOOT_ZYNQMP_PSU_INIT_PATH)", \ - $(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_XILINX_PS_INIT_FILE,"$(UBOOT_ZYNQMP_PSU_INIT_PATH)") endef endif @@ -415,27 +424,10 @@ endif define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PMUFW) + $(UBOOT_ZYNQMP_KCONFIG_PM_CFG) $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) endef -ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) -$(error Please provide U-Boot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - -ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),) -$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy) # diff --git a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig index 4f8f4d540..cf62b5b72 100644 --- a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig index 4569a7b7a..496ccd685 100644 --- a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig index 0174f356d..17ef7e757 100644 --- a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig index 14e4dd00b..aa0236bbb 100644 --- a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" # AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/arcturus_ucls1012a_defconfig b/buildroot/configs/arcturus_ucls1012a_defconfig index fceaed0db..fd33ebf1f 100644 --- a/buildroot/configs/arcturus_ucls1012a_defconfig +++ b/buildroot/configs/arcturus_ucls1012a_defconfig @@ -1,20 +1,21 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v0.2.1935)/linux-v0.2.1935.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -27,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v0.2.1935)/uboot-v0.2.1935.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools diff --git a/buildroot/configs/arm_foundationv8_defconfig b/buildroot/configs/arm_foundationv8_defconfig index d31f69d3a..ea19f3550 100644 --- a/buildroot/configs/arm_foundationv8_defconfig +++ b/buildroot/configs/arm_foundationv8_defconfig @@ -5,8 +5,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(LINUX_DIR)/arch/arm64/configs/defconfig" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8" BR2_TARGET_ROOTFS_EXT2=y diff --git a/buildroot/configs/at91sam9x5ek_mmc_defconfig b/buildroot/configs/at91sam9x5ek_mmc_defconfig index 633ca8e1c..63a537bd9 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_defconfig @@ -35,9 +35,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image diff --git a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig index e8246c8d5..698cb9230 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig @@ -95,9 +95,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image diff --git a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 6b5def3c6..b608bac0c 100644 --- a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.04)/linux-at91-linux4sam-2020.04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek" @@ -71,12 +71,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.2)/at91bootstrap3-v3.9.2.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.04)/u-boot-at91-linux4sam-2020.04.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/bananapi_m1_defconfig b/buildroot/configs/bananapi_m1_defconfig index 558ef3d4a..23da36334 100644 --- a/buildroot/configs/bananapi_m1_defconfig +++ b/buildroot/configs/bananapi_m1_defconfig @@ -21,8 +21,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m2_plus_defconfig b/buildroot/configs/bananapi_m2_plus_defconfig index 0e2d91d21..77a403ce8 100644 --- a/buildroot/configs/bananapi_m2_plus_defconfig +++ b/buildroot/configs/bananapi_m2_plus_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m2_ultra_defconfig b/buildroot/configs/bananapi_m2_ultra_defconfig index bc1d31a60..22f7974bc 100644 --- a/buildroot/configs/bananapi_m2_ultra_defconfig +++ b/buildroot/configs/bananapi_m2_ultra_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-ultra/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-ultra/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m2_zero_defconfig b/buildroot/configs/bananapi_m2_zero_defconfig new file mode 100644 index 000000000..e82814e33 --- /dev/null +++ b/buildroot/configs/bananapi_m2_zero_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.7" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-zero/boot.cmd" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/bananapi_m64_defconfig b/buildroot/configs/bananapi_m64_defconfig index 5e56eaed8..b93332ed2 100644 --- a/buildroot/configs/bananapi_m64_defconfig +++ b/buildroot/configs/bananapi_m64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/beaglebone_defconfig b/buildroot/configs/beaglebone_defconfig index 5d6b680d2..9a4be13ec 100644 --- a/buildroot/configs/beaglebone_defconfig +++ b/buildroot/configs/beaglebone_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/buildroot/configs/beaglebone_qt5_defconfig b/buildroot/configs/beaglebone_qt5_defconfig index 6e07bc9ac..5f7b911e5 100644 --- a/buildroot/configs/beaglebone_qt5_defconfig +++ b/buildroot/configs/beaglebone_qt5_defconfig @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/buildroot/configs/beelink_gs1_defconfig b/buildroot/configs/beelink_gs1_defconfig index 80b111aee..b461574a9 100644 --- a/buildroot/configs/beelink_gs1_defconfig +++ b/buildroot/configs/beelink_gs1_defconfig @@ -8,13 +8,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -BR2_GLOBAL_PATCH_DIR="board/beelink/gs1/patches/" -# Kernel Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Kernel Linux headers same as kernel, a 5.5 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -25,16 +24,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/chromebook_elm_defconfig b/buildroot/configs/chromebook_elm_defconfig new file mode 100644 index 000000000..05e82ffc3 --- /dev/null +++ b/buildroot/configs/chromebook_elm_defconfig @@ -0,0 +1,37 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Patches +BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches/" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9" + +# Build Kernel with a Custom config. +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/chromebook/elm/linux.config" + +# DTS support +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="mediatek/mt8173-elm" + +# Package Firmware for WiFi chip. +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y + +# Scripts to generate final images. +BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/elm/sign.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" + +# Supporting host tools to build / sign FIT Image. +BR2_PACKAGE_HOST_PARTED=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_VBOOT_UTILS=y diff --git a/buildroot/configs/chromebook_snow_defconfig b/buildroot/configs/chromebook_snow_defconfig index 5558c101d..bcb94b716 100644 --- a/buildroot/configs/chromebook_snow_defconfig +++ b/buildroot/configs/chromebook_snow_defconfig @@ -4,7 +4,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/snow/mksd.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" diff --git a/buildroot/configs/ci20_defconfig b/buildroot/configs/ci20_defconfig index 8f2604b07..09eddc4e6 100644 --- a/buildroot/configs/ci20_defconfig +++ b/buildroot/configs/ci20_defconfig @@ -2,9 +2,8 @@ BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set - -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +BR2_KERNEL_HEADERS_AS_KERNEL=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" @@ -15,25 +14,24 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MIPS,CI20_linux,7dff33297116643485ca37141d804eddd793e834)/linux-7dff33297116643485ca37141d804eddd793e834.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y # u-boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y -BR2_TARGET_UBOOT_BOARDNAME="ci20_mmc" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa" -BR2_TARGET_UBOOT_PATCH="board/ci20/patches/uboot" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="32768" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" # host BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/cubieboard2_defconfig b/buildroot/configs/cubieboard2_defconfig index fd50742d0..8924c88c5 100644 --- a/buildroot/configs/cubieboard2_defconfig +++ b/buildroot/configs/cubieboard2_defconfig @@ -24,8 +24,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig index fdbca331a..b893c6aea 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -63,6 +63,7 @@ BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y # qt5 demo packages BR2_PACKAGE_GLMARK2=y diff --git a/buildroot/configs/freescale_imx28evk_defconfig b/buildroot/configs/freescale_imx28evk_defconfig index 520c63f67..bd5b007ed 100644 --- a/buildroot/configs/freescale_imx28evk_defconfig +++ b/buildroot/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem diff --git a/buildroot/configs/freescale_imx6dlsabreauto_defconfig b/buildroot/configs/freescale_imx6dlsabreauto_defconfig index 55db461f4..f8659e876 100644 --- a/buildroot/configs/freescale_imx6dlsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6dlsabreauto_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -18,10 +18,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" @@ -39,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6dlsabresd_defconfig b/buildroot/configs/freescale_imx6dlsabresd_defconfig index dc9b498aa..069bfcbbb 100644 --- a/buildroot/configs/freescale_imx6dlsabresd_defconfig +++ b/buildroot/configs/freescale_imx6dlsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,10 +18,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" @@ -38,5 +39,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6qsabreauto_defconfig b/buildroot/configs/freescale_imx6qsabreauto_defconfig index bc333e1a3..8ce6e378c 100644 --- a/buildroot/configs/freescale_imx6qsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6qsabreauto_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -18,10 +18,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" @@ -39,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6qsabresd_defconfig b/buildroot/configs/freescale_imx6qsabresd_defconfig index e0ef20c57..b6cd1c40c 100644 --- a/buildroot/configs/freescale_imx6qsabresd_defconfig +++ b/buildroot/configs/freescale_imx6qsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,10 +18,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" @@ -39,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6sxsabresd_defconfig b/buildroot/configs/freescale_imx6sxsabresd_defconfig index eb11fb8ae..dd5283730 100644 --- a/buildroot/configs/freescale_imx6sxsabresd_defconfig +++ b/buildroot/configs/freescale_imx6sxsabresd_defconfig @@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -18,10 +18,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" @@ -37,6 +38,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6ullevk_defconfig b/buildroot/configs/freescale_imx6ullevk_defconfig new file mode 100644 index 000000000..6306c9720 --- /dev/null +++ b/buildroot/configs/freescale_imx6ullevk_defconfig @@ -0,0 +1,25 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/freescale_imx7dsabresd_defconfig b/buildroot/configs/freescale_imx7dsabresd_defconfig index 9d00a53eb..d7119ef5a 100644 --- a/buildroot/configs/freescale_imx7dsabresd_defconfig +++ b/buildroot/configs/freescale_imx7dsabresd_defconfig @@ -2,11 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# patches -BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" - -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,10 +12,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -29,7 +27,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx8mmevk_defconfig b/buildroot/configs/freescale_imx8mmevk_defconfig index 5472ed36b..38cd47063 100644 --- a/buildroot/configs/freescale_imx8mmevk_defconfig +++ b/buildroot/configs/freescale_imx8mmevk_defconfig @@ -1,16 +1,17 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mm-evk.dtb" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mm-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y @@ -20,17 +21,16 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8mnevk_defconfig b/buildroot/configs/freescale_imx8mnevk_defconfig new file mode 100644 index 000000000..8c795fe21 --- /dev/null +++ b/buildroot/configs/freescale_imx8mnevk_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR4=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/freescale_imx8mqevk_defconfig b/buildroot/configs/freescale_imx8mqevk_defconfig index 7989b6057..f0df74846 100644 --- a/buildroot/configs/freescale_imx8mqevk_defconfig +++ b/buildroot/configs/freescale_imx8mqevk_defconfig @@ -1,16 +1,17 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mq-evk.dtb" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mq-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y @@ -20,17 +21,16 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/freescale_imx8qmmek_defconfig b/buildroot/configs/freescale_imx8qmmek_defconfig new file mode 100644 index 000000000..45b4dbd1b --- /dev/null +++ b/buildroot/configs/freescale_imx8qmmek_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_PACKAGE_IMX_SECO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/freescale_imx8qxpmek_defconfig b/buildroot/configs/freescale_imx8qxpmek_defconfig index 82f433f6c..7c4a456c2 100644 --- a/buildroot/configs/freescale_imx8qxpmek_defconfig +++ b/buildroot/configs/freescale_imx8qxpmek_defconfig @@ -1,35 +1,37 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y BR2_PACKAGE_FIRMWARE_IMX=y BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_PACKAGE_IMX_SECO=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/friendlyarm_nanopi_a64_defconfig b/buildroot/configs/friendlyarm_nanopi_a64_defconfig index 7d9535e6a..4df22b2a2 100644 --- a/buildroot/configs/friendlyarm_nanopi_a64_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_a64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig b/buildroot/configs/friendlyarm_nanopi_neo2_defconfig index e932ae3bb..9262737b8 100644 --- a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_neo2_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/globalscale_espressobin_defconfig b/buildroot/configs/globalscale_espressobin_defconfig new file mode 100644 index 000000000..50cfc6b53 --- /dev/null +++ b/buildroot/configs/globalscale_espressobin_defconfig @@ -0,0 +1,27 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.11" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/globalscale/espressobin/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" diff --git a/buildroot/configs/grinn_chiliboard_defconfig b/buildroot/configs/grinn_chiliboard_defconfig index ab89bbf8f..5b05ed44d 100644 --- a/buildroot/configs/grinn_chiliboard_defconfig +++ b/buildroot/configs/grinn_chiliboard_defconfig @@ -1,11 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.26" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" @@ -15,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/buildroot/configs/grinn_liteboard_defconfig b/buildroot/configs/grinn_liteboard_defconfig index f2c1da33e..8bec2e1d5 100644 --- a/buildroot/configs/grinn_liteboard_defconfig +++ b/buildroot/configs/grinn_liteboard_defconfig @@ -1,11 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" @@ -15,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/imx6-sabresd_defconfig b/buildroot/configs/imx6-sabresd_defconfig index d244c5961..574816f7d 100644 --- a/buildroot/configs/imx6-sabresd_defconfig +++ b/buildroot/configs/imx6-sabresd_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 8fcc4f713..b521f20ee 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" @@ -50,6 +50,7 @@ BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y # Fonts BR2_PACKAGE_BITSTREAM_VERA=y @@ -64,6 +65,7 @@ BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_LIBV4L=y +BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_MESA3D_DEMOS=y # Qt5 diff --git a/buildroot/configs/imx6ullevk_defconfig b/buildroot/configs/imx6ullevk_defconfig new file mode 100644 index 000000000..81db66268 --- /dev/null +++ b/buildroot/configs/imx6ullevk_defconfig @@ -0,0 +1,37 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y + +# system +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.8" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_NEEDS_DTC=y + +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# filesystem / image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/imx7dpico_defconfig b/buildroot/configs/imx7dpico_defconfig index 190e77fbf..a3c2af164 100644 --- a/buildroot/configs/imx7dpico_defconfig +++ b/buildroot/configs/imx7dpico_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y # wifi firmware for brcm43439 diff --git a/buildroot/configs/imx8mqevk_defconfig b/buildroot/configs/imx8mqevk_defconfig new file mode 100644 index 000000000..73f3f3dcc --- /dev/null +++ b/buildroot/configs/imx8mqevk_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/kontron_smarc_sal28_defconfig b/buildroot/configs/kontron_smarc_sal28_defconfig new file mode 100644 index 000000000..d4b2387e3 --- /dev/null +++ b/buildroot/configs/kontron_smarc_sal28_defconfig @@ -0,0 +1,23 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/smarc-sal28/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/lafrite_defconfig b/buildroot/configs/lafrite_defconfig index 63370928e..5496bbc30 100644 --- a/buildroot/configs/lafrite_defconfig +++ b/buildroot/configs/lafrite_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" @@ -16,5 +16,6 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/licheepi_zero_defconfig b/buildroot/configs/licheepi_zero_defconfig index fd875d5f4..2e1a41398 100644 --- a/buildroot/configs/licheepi_zero_defconfig +++ b/buildroot/configs/licheepi_zero_defconfig @@ -42,8 +42,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" # Required host utilities for building an SDCard image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig new file mode 100644 index 000000000..3bba4f6e3 --- /dev/null +++ b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig @@ -0,0 +1,30 @@ +BR2_arm=y +BR2_cortex_a5=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="sama5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_wlsom1_ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_wlsom1_ek_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig new file mode 100644 index 000000000..031a533bc --- /dev/null +++ b/buildroot/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -0,0 +1,85 @@ +BR2_arm=y +BR2_cortex_a5=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PTHREAD_DEBUG=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="sama5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_wlsom1_ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_ALSA_UTILS=y +BR2_PACKAGE_ALSA_UTILS_ALSACONF=y +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_FFMPEG=y +BR2_PACKAGE_FFMPEG_GPL=y +BR2_PACKAGE_FFMPEG_SWSCALE=y +BR2_PACKAGE_MPG123=y +BR2_PACKAGE_BZIP2=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_UNZIP=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_ZIP=y +BR2_PACKAGE_GDB=y +BR2_PACKAGE_LMBENCH=y +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y +BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y +BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y +BR2_PACKAGE_MMC_UTILS=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_I2C_TOOLS=y +BR2_PACKAGE_SETSERIAL=y +BR2_PACKAGE_SPI_TOOLS=y +BR2_PACKAGE_USBUTILS=y +BR2_PACKAGE_LIBSYSFS=y +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y +BR2_PACKAGE_ARGP_STANDALONE=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BRIDGE_UTILS=y +BR2_PACKAGE_CAN_UTILS=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_IPERF=y +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_LRZSZ=y +BR2_PACKAGE_MII_DIAG=y +BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_WGET=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_BASH=y +BR2_PACKAGE_HTOP=y +BR2_PACKAGE_VIM=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_wlsom1_ek_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/mx53loco_defconfig b/buildroot/configs/mx53loco_defconfig index 8b78f6586..69a94e071 100644 --- a/buildroot/configs/mx53loco_defconfig +++ b/buildroot/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.2 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" diff --git a/buildroot/configs/mx6cubox_defconfig b/buildroot/configs/mx6cubox_defconfig index 7e9b16bd2..5ed28e53c 100644 --- a/buildroot/configs/mx6cubox_defconfig +++ b/buildroot/configs/mx6cubox_defconfig @@ -1,30 +1,45 @@ +# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y + +# Toolchain # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloaders BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/mx6sx_udoo_neo_defconfig b/buildroot/configs/mx6sx_udoo_neo_defconfig index e2e36b907..4a2f8b0bc 100644 --- a/buildroot/configs/mx6sx_udoo_neo_defconfig +++ b/buildroot/configs/mx6sx_udoo_neo_defconfig @@ -3,22 +3,22 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" @@ -28,3 +28,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/udoo/common/boot.scr.txt" diff --git a/buildroot/configs/mx6udoo_defconfig b/buildroot/configs/mx6udoo_defconfig index 86ad13bbf..058dc4534 100644 --- a/buildroot/configs/mx6udoo_defconfig +++ b/buildroot/configs/mx6udoo_defconfig @@ -3,27 +3,32 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/udoo/common/boot.scr.txt" diff --git a/buildroot/configs/nanopc_t4_defconfig b/buildroot/configs/nanopc_t4_defconfig new file mode 100644 index 000000000..2f7c53904 --- /dev/null +++ b/buildroot/configs/nanopc_t4_defconfig @@ -0,0 +1,53 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopc-t4-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopc-t4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="nanopc-t4" +BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPC-T4" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopc-t4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopc-t4/post-build.sh" diff --git a/buildroot/configs/nanopi_m1_defconfig b/buildroot/configs/nanopi_m1_defconfig index cf9521a3a..18cfcb261 100644 --- a/buildroot/configs/nanopi_m1_defconfig +++ b/buildroot/configs/nanopi_m1_defconfig @@ -20,6 +20,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -32,8 +35,6 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/nanopi_m1_plus_defconfig b/buildroot/configs/nanopi_m1_plus_defconfig index 2f9d14f10..06adc54b1 100644 --- a/buildroot/configs/nanopi_m1_plus_defconfig +++ b/buildroot/configs/nanopi_m1_plus_defconfig @@ -20,6 +20,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -32,8 +35,6 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/nanopi_m4_defconfig b/buildroot/configs/nanopi_m4_defconfig new file mode 100644 index 000000000..9c3f58f20 --- /dev/null +++ b/buildroot/configs/nanopi_m4_defconfig @@ -0,0 +1,53 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" +BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh" diff --git a/buildroot/configs/nanopi_neo4_defconfig b/buildroot/configs/nanopi_neo4_defconfig new file mode 100644 index 000000000..a11872ef2 --- /dev/null +++ b/buildroot/configs/nanopi_neo4_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4" +BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="70M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh" diff --git a/buildroot/configs/nanopi_neo_defconfig b/buildroot/configs/nanopi_neo_defconfig index be98918c6..1519d828d 100644 --- a/buildroot/configs/nanopi_neo_defconfig +++ b/buildroot/configs/nanopi_neo_defconfig @@ -26,12 +26,13 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd" # Build an sdcard image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/nanopi_r1_defconfig b/buildroot/configs/nanopi_r1_defconfig new file mode 100644 index 000000000..8b03f6dd0 --- /dev/null +++ b/buildroot/configs/nanopi_r1_defconfig @@ -0,0 +1,49 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="nanopi-r1" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi R1" + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-r1/boot.cmd" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-r1/kernel/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-r1" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r1/genimage.cfg" +# BR2_TARGET_ROOTFS_TAR is not set + +# Additional tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/nitrogen6sx_defconfig b/buildroot/configs/nitrogen6sx_defconfig index 29fa4dff6..d51ebcd10 100644 --- a/buildroot/configs/nitrogen6sx_defconfig +++ b/buildroot/configs/nitrogen6sx_defconfig @@ -17,26 +17,28 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2017.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz" +# Last version of branch boundary-v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen6x_defconfig b/buildroot/configs/nitrogen6x_defconfig index 5a53caed9..5353b38fd 100644 --- a/buildroot/configs/nitrogen6x_defconfig +++ b/buildroot/configs/nitrogen6x_defconfig @@ -17,26 +17,28 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2017.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz" +# Last version of branch boundary-v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen7_defconfig b/buildroot/configs/nitrogen7_defconfig index a7cd8a10e..ddefe7cd0 100644 --- a/buildroot/configs/nitrogen7_defconfig +++ b/buildroot/configs/nitrogen7_defconfig @@ -16,26 +16,28 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2017.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz" +# Last version of branch boundary-v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen8m_defconfig b/buildroot/configs/nitrogen8m_defconfig index 21402162f..6e104ce84 100644 --- a/buildroot/configs/nitrogen8m_defconfig +++ b/buildroot/configs/nitrogen8m_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.9.51_imx8m_ga -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/67c68675.tar.gz" +# Latest revision of branch boundary-imx_4.14.98_2.3.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,8 +38,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2017.03_4.9.51_imx8m_ga -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/b661d854.tar.gz" +# Latest revision of branch boundary-imx_v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -48,9 +48,10 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen8mm_defconfig b/buildroot/configs/nitrogen8mm_defconfig new file mode 100644 index 000000000..2560b36c7 --- /dev/null +++ b/buildroot/configs/nitrogen8mm_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y + +# System +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-nitrogen8mm.dtb" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# DDR training binaries +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# ARM Trusted Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_4.14.98_2.3.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/nitrogen8mn_defconfig b/buildroot/configs/nitrogen8mn_defconfig new file mode 100644 index 000000000..cb5cc2480 --- /dev/null +++ b/buildroot/configs/nitrogen8mn_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y + +# System +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-nitrogen8_nano.dtb" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# DDR training binaries +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# ARM Trusted Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_4.14.98_2.3.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_v2018.07 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_5.4.x_2.1.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-nitrogen8_nano freescale/imx8mn-nitrogen8mn freescale/imx8mn-nitrogen8mn_som" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/odroidc2_defconfig b/buildroot/configs/odroidc2_defconfig new file mode 100644 index 000000000..5f97fc3dd --- /dev/null +++ b/buildroot/configs/odroidc2_defconfig @@ -0,0 +1,42 @@ +# Architecture +BR2_aarch64=y + +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="odroidc2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyAML0" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_OVERLAY="board/hardkernel/odroidc2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-odroidc2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y + +# U-Boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y +BR2_TARGET_UBOOT_BOARDNAME="odroid-c2" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd" + +# Firmware +BR2_PACKAGE_ODROIDC2_FIRMWARE=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MESON_TOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/olimex_a10_olinuxino_lime_defconfig b/buildroot/configs/olimex_a10_olinuxino_lime_defconfig index 8248daf92..0896a66dd 100644 --- a/buildroot/configs/olimex_a10_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a10_olinuxino_lime_defconfig @@ -40,8 +40,9 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig index 4419d9bc2..ca8a319e6 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -43,15 +43,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig index fd34054af..9de6de77f 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -43,15 +43,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a20_olinuxino_micro_defconfig b/buildroot/configs/olimex_a20_olinuxino_micro_defconfig index a2aff0ca3..4a2a8a4ba 100644 --- a/buildroot/configs/olimex_a20_olinuxino_micro_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_micro_defconfig @@ -38,8 +38,9 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a33_olinuxino_defconfig b/buildroot/configs/olimex_a33_olinuxino_defconfig index 71b1669b2..7c691ab20 100644 --- a/buildroot/configs/olimex_a33_olinuxino_defconfig +++ b/buildroot/configs/olimex_a33_olinuxino_defconfig @@ -22,8 +22,9 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/olimex_a64_olinuxino_defconfig b/buildroot/configs/olimex_a64_olinuxino_defconfig index d5b2d3530..e35c6014b 100644 --- a/buildroot/configs/olimex_a64_olinuxino_defconfig +++ b/buildroot/configs/olimex_a64_olinuxino_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/olpc_xo175_defconfig b/buildroot/configs/olpc_xo175_defconfig new file mode 100644 index 000000000..bb7aa047f --- /dev/null +++ b/buildroot/configs/olpc_xo175_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_pj4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_LABEL="XO175" +BR2_TARGET_ROOTFS_EXT2_SIZE="32M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O dir_index,^huge_file,^64bit,^extent" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olpc_xo1_defconfig b/buildroot/configs/olpc_xo1_defconfig new file mode 100644 index 000000000..41226d892 --- /dev/null +++ b/buildroot/configs/olpc_xo1_defconfig @@ -0,0 +1,27 @@ +BR2_x86_geode=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.1" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1/linux.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_V9=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_OLPC=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB_THINFIRM=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_LABEL="XO1" +BR2_TARGET_ROOTFS_EXT2_SIZE="32M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O dir_index,^huge_file,^64bit,^extent" +BR2_TARGET_ROOTFS_JFFS2=y +BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y +BR2_TARGET_ROOTFS_JFFS2_PAD=y +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/orangepi_lite_defconfig b/buildroot/configs/orangepi_lite_defconfig index 249224ed3..e75943c98 100644 --- a/buildroot/configs/orangepi_lite_defconfig +++ b/buildroot/configs/orangepi_lite_defconfig @@ -28,8 +28,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_one_defconfig b/buildroot/configs/orangepi_one_defconfig index 4863eebff..20b78fe7c 100644 --- a/buildroot/configs/orangepi_one_defconfig +++ b/buildroot/configs/orangepi_one_defconfig @@ -23,8 +23,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_pc2_defconfig b/buildroot/configs/orangepi_pc2_defconfig index 864f8bb8a..c7e17c8eb 100644 --- a/buildroot/configs/orangepi_pc2_defconfig +++ b/buildroot/configs/orangepi_pc2_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/orangepi_pc_defconfig b/buildroot/configs/orangepi_pc_defconfig index fcb6bdc9e..90ad50b78 100644 --- a/buildroot/configs/orangepi_pc_defconfig +++ b/buildroot/configs/orangepi_pc_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -20,14 +20,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_pc_plus_defconfig b/buildroot/configs/orangepi_pc_plus_defconfig index 4d22e7840..a42b380f6 100644 --- a/buildroot/configs/orangepi_pc_plus_defconfig +++ b/buildroot/configs/orangepi_pc_plus_defconfig @@ -26,8 +26,8 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_plus_defconfig b/buildroot/configs/orangepi_plus_defconfig index be3eba51f..11d748648 100644 --- a/buildroot/configs/orangepi_plus_defconfig +++ b/buildroot/configs/orangepi_plus_defconfig @@ -20,6 +20,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -32,8 +35,6 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" diff --git a/buildroot/configs/orangepi_prime_defconfig b/buildroot/configs/orangepi_prime_defconfig index f78711ce4..f8f958c67 100644 --- a/buildroot/configs/orangepi_prime_defconfig +++ b/buildroot/configs/orangepi_prime_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/orangepi_r1_defconfig b/buildroot/configs/orangepi_r1_defconfig index b1d35f299..7c3ec637e 100644 --- a/buildroot/configs/orangepi_r1_defconfig +++ b/buildroot/configs/orangepi_r1_defconfig @@ -25,8 +25,9 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_rk3399_defconfig b/buildroot/configs/orangepi_rk3399_defconfig new file mode 100644 index 000000000..bcce35feb --- /dev/null +++ b/buildroot/configs/orangepi_rk3399_defconfig @@ -0,0 +1,53 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-orangepi" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="orangepi-rk3399" +BR2_TARGET_GENERIC_ISSUE="Welcome to ORANGEPI-RK3399" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-rk3399/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-rk3399/post-build.sh" diff --git a/buildroot/configs/orangepi_win_defconfig b/buildroot/configs/orangepi_win_defconfig index 8aae60245..715ff3b71 100644 --- a/buildroot/configs/orangepi_win_defconfig +++ b/buildroot/configs/orangepi_win_defconfig @@ -25,8 +25,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/orangepi_zero_defconfig b/buildroot/configs/orangepi_zero_defconfig index 354e3bfdb..37d3d8dc7 100644 --- a/buildroot/configs/orangepi_zero_defconfig +++ b/buildroot/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -21,14 +21,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/orangepi_zero_plus2_defconfig b/buildroot/configs/orangepi_zero_plus2_defconfig index a0183714a..222736423 100644 --- a/buildroot/configs/orangepi_zero_plus2_defconfig +++ b/buildroot/configs/orangepi_zero_plus2_defconfig @@ -27,8 +27,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/orangepi_zero_plus_defconfig b/buildroot/configs/orangepi_zero_plus_defconfig new file mode 100644 index 000000000..cff2788f0 --- /dev/null +++ b/buildroot/configs/orangepi_zero_plus_defconfig @@ -0,0 +1,51 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus/boot.cmd" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus/genimage.cfg" diff --git a/buildroot/configs/pcengines_apu2_defconfig b/buildroot/configs/pcengines_apu2_defconfig new file mode 100644 index 000000000..68cebb8f6 --- /dev/null +++ b/buildroot/configs/pcengines_apu2_defconfig @@ -0,0 +1,16 @@ +BR2_x86_64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_ISO9660=y +BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" +BR2_TARGET_ROOTFS_ISO9660_HYBRID=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_SYSLINUX=y diff --git a/buildroot/configs/pine64_defconfig b/buildroot/configs/pine64_defconfig index d2e3a360f..2bdb6f6ae 100644 --- a/buildroot/configs/pine64_defconfig +++ b/buildroot/configs/pine64_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/pine64_sopine_defconfig b/buildroot/configs/pine64_sopine_defconfig index 3007d5a64..6fa511477 100644 --- a/buildroot/configs/pine64_sopine_defconfig +++ b/buildroot/configs/pine64_sopine_defconfig @@ -26,8 +26,9 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/qemu_aarch64_virt_defconfig b/buildroot/configs/qemu_aarch64_virt_defconfig index 6a9bc25be..67dccc604 100644 --- a/buildroot/configs/qemu_aarch64_virt_defconfig +++ b/buildroot/configs/qemu_aarch64_virt_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_arm_versatile_defconfig b/buildroot/configs/qemu_arm_versatile_defconfig index 42d29e3bf..280c31340 100644 --- a/buildroot/configs/qemu_arm_versatile_defconfig +++ b/buildroot/configs/qemu_arm_versatile_defconfig @@ -10,13 +10,19 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +# Qemu >= 5.1 requires SD card size to be a power of 2, e.g. 64 MiB. +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/buildroot/configs/qemu_arm_versatile_nommu_defconfig index 6e4de0a0d..4108e706c 100644 --- a/buildroot/configs/qemu_arm_versatile_nommu_defconfig +++ b/buildroot/configs/qemu_arm_versatile_nommu_defconfig @@ -21,13 +21,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_vexpress_defconfig b/buildroot/configs/qemu_arm_vexpress_defconfig index 188fd7201..f99b87c17 100644 --- a/buildroot/configs/qemu_arm_vexpress_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_defconfig @@ -13,13 +13,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/buildroot/configs/qemu_arm_vexpress_tz_defconfig b/buildroot/configs/qemu_arm_vexpress_tz_defconfig index eff3f52d1..5aeb6b429 100644 --- a/buildroot/configs/qemu_arm_vexpress_tz_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_tz_defconfig @@ -7,16 +7,21 @@ BR2_ARM_FPU_VFPV3D16=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" +# optee-test needs toolchain C++ +BR2_TOOLCHAIN_BUILDROOT_CXX=y + # Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -25,7 +30,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca15_a7" # TF-A for booting OP-TEE secure and uboot/linux non secure BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,13 +43,6 @@ BR2_PACKAGE_OPTEE_BENCHMARK=y BR2_PACKAGE_OPTEE_EXAMPLES=y BR2_PACKAGE_OPTEE_TEST=y -# OP-TEE components needs host-python3 interpreter and its modules -BR2_PACKAGE_HOST_PYTHON3=y -# Select python3 on the target to make sure Buildroot builds host-python using -# python3 and builds all host-python modules for python3. -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PACKAGE_PYTHON3=y - # U-boot for booting the dear Linux kernel BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/buildroot/configs/qemu_csky610_virt_defconfig b/buildroot/configs/qemu_csky610_virt_defconfig index f337bd7eb..e7d75f5f4 100644 --- a/buildroot/configs/qemu_csky610_virt_defconfig +++ b/buildroot/configs/qemu_csky610_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck610=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/buildroot/configs/qemu_csky807_virt_defconfig b/buildroot/configs/qemu_csky807_virt_defconfig index c4a10b8ad..df12450a5 100644 --- a/buildroot/configs/qemu_csky807_virt_defconfig +++ b/buildroot/configs/qemu_csky807_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck807=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/buildroot/configs/qemu_csky810_virt_defconfig b/buildroot/configs/qemu_csky810_virt_defconfig index 56efe8a6a..dd1fd329f 100644 --- a/buildroot/configs/qemu_csky810_virt_defconfig +++ b/buildroot/configs/qemu_csky810_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck810=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/buildroot/configs/qemu_csky860_virt_defconfig b/buildroot/configs/qemu_csky860_virt_defconfig index 9ec8f633a..6edfba4e8 100644 --- a/buildroot/configs/qemu_csky860_virt_defconfig +++ b/buildroot/configs/qemu_csky860_virt_defconfig @@ -5,6 +5,10 @@ BR2_ck860=y # System BR2_TARGET_ROOTFS_INITRAMFS=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # linux kernel header, the same version with linux kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y diff --git a/buildroot/configs/qemu_m68k_mcf5208_defconfig b/buildroot/configs/qemu_m68k_mcf5208_defconfig index a2cadffa9..0806dc0ac 100644 --- a/buildroot/configs/qemu_m68k_mcf5208_defconfig +++ b/buildroot/configs/qemu_m68k_mcf5208_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_m68k_q800_defconfig b/buildroot/configs/qemu_m68k_q800_defconfig index 2ef73d1dd..b54d502be 100644 --- a/buildroot/configs/qemu_m68k_q800_defconfig +++ b/buildroot/configs/qemu_m68k_q800_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_microblazebe_mmu_defconfig b/buildroot/configs/qemu_microblazebe_mmu_defconfig index 2bcf13e08..a989e555b 100644 --- a/buildroot/configs/qemu_microblazebe_mmu_defconfig +++ b/buildroot/configs/qemu_microblazebe_mmu_defconfig @@ -10,17 +10,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" +BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/buildroot/configs/qemu_microblazeel_mmu_defconfig b/buildroot/configs/qemu_microblazeel_mmu_defconfig index 4352ad687..ccd679fd9 100644 --- a/buildroot/configs/qemu_microblazeel_mmu_defconfig +++ b/buildroot/configs/qemu_microblazeel_mmu_defconfig @@ -10,17 +10,21 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" +BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/buildroot/configs/qemu_mips32r2_malta_defconfig b/buildroot/configs/qemu_mips32r2_malta_defconfig index baacc3cc8..f56e95b14 100644 --- a/buildroot/configs/qemu_mips32r2_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r2el_malta_defconfig b/buildroot/configs/qemu_mips32r2el_malta_defconfig index 35ad64368..9548a8218 100644 --- a/buildroot/configs/qemu_mips32r2el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2el_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r6_malta_defconfig b/buildroot/configs/qemu_mips32r6_malta_defconfig index a0553ed96..935fc4c2a 100644 --- a/buildroot/configs/qemu_mips32r6_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6_malta_defconfig @@ -9,16 +9,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/buildroot/configs/qemu_mips32r6el_malta_defconfig b/buildroot/configs/qemu_mips32r6el_malta_defconfig index aaace9540..dfaf11afb 100644 --- a/buildroot/configs/qemu_mips32r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6el_malta_defconfig @@ -9,16 +9,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/buildroot/configs/qemu_mips64_malta_defconfig b/buildroot/configs/qemu_mips64_malta_defconfig index 2a8b50a18..4a0531947 100644 --- a/buildroot/configs/qemu_mips64_malta_defconfig +++ b/buildroot/configs/qemu_mips64_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64el_malta_defconfig b/buildroot/configs/qemu_mips64el_malta_defconfig index 1d9d0807d..06e80b339 100644 --- a/buildroot/configs/qemu_mips64el_malta_defconfig +++ b/buildroot/configs/qemu_mips64el_malta_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64r6_malta_defconfig b/buildroot/configs/qemu_mips64r6_malta_defconfig index ed4204229..035c664fe 100644 --- a/buildroot/configs/qemu_mips64r6_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6_malta_defconfig @@ -10,16 +10,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/buildroot/configs/qemu_mips64r6el_malta_defconfig b/buildroot/configs/qemu_mips64r6el_malta_defconfig index 7f4f28a70..26e945853 100644 --- a/buildroot/configs/qemu_mips64r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6el_malta_defconfig @@ -10,16 +10,21 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y +BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/buildroot/configs/qemu_nios2_10m50_defconfig b/buildroot/configs/qemu_nios2_10m50_defconfig index 48d151384..cfb83ff66 100644 --- a/buildroot/configs/qemu_nios2_10m50_defconfig +++ b/buildroot/configs/qemu_nios2_10m50_defconfig @@ -1,13 +1,17 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_or1k_defconfig b/buildroot/configs/qemu_or1k_defconfig index 60147acd4..4ccb58ef1 100644 --- a/buildroot/configs/qemu_or1k_defconfig +++ b/buildroot/configs/qemu_or1k_defconfig @@ -5,13 +5,17 @@ BR2_or1k=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4,19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/buildroot/configs/qemu_ppc64_e5500_defconfig b/buildroot/configs/qemu_ppc64_e5500_defconfig index 3c71c17e0..1e030f5c7 100644 --- a/buildroot/configs/qemu_ppc64_e5500_defconfig +++ b/buildroot/configs/qemu_ppc64_e5500_defconfig @@ -5,13 +5,17 @@ BR2_powerpc_e5500=y # Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_ppc64_pseries_defconfig b/buildroot/configs/qemu_ppc64_pseries_defconfig index 42856a52b..91d0c528f 100644 --- a/buildroot/configs/qemu_ppc64_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64_pseries_defconfig @@ -10,13 +10,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc64le_pseries_defconfig b/buildroot/configs/qemu_ppc64le_pseries_defconfig index 653d11195..effc3cf8f 100644 --- a/buildroot/configs/qemu_ppc64le_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64le_pseries_defconfig @@ -10,13 +10,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_g3beige_defconfig b/buildroot/configs/qemu_ppc_g3beige_defconfig index acb9d86fb..c04260cf9 100644 --- a/buildroot/configs/qemu_ppc_g3beige_defconfig +++ b/buildroot/configs/qemu_ppc_g3beige_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_mac99_defconfig b/buildroot/configs/qemu_ppc_mac99_defconfig index 496b0fb2a..33e819426 100644 --- a/buildroot/configs/qemu_ppc_mac99_defconfig +++ b/buildroot/configs/qemu_ppc_mac99_defconfig @@ -5,13 +5,13 @@ BR2_powerpc_7400=y # System BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.2 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y @@ -25,6 +25,10 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig index 66bc1d208..98a10b353 100644 --- a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig +++ b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig index 8b105cf7e..6425e1a8b 100644 --- a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig +++ b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig @@ -6,8 +6,12 @@ BR2_powerpc_440=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Use soft float BR2_POWERPC_SOFT_FLOAT=y @@ -15,7 +19,7 @@ BR2_POWERPC_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig index 242cc69e5..5447342dd 100644 --- a/buildroot/configs/qemu_riscv32_virt_defconfig +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -5,25 +5,27 @@ BR2_RISCV_32=y # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_GLOBAL_PATCH_DIR="board/qemu/riscv32-virt/patches/" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.61" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_PLAT="qemu/virt" +BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index 10d789948..01633d5ad 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -5,24 +5,27 @@ BR2_RISCV_64=y # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_PLAT="qemu/virt" +BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/buildroot/configs/qemu_s390x_defconfig b/buildroot/configs/qemu_s390x_defconfig new file mode 100644 index 000000000..b3c2641d1 --- /dev/null +++ b/buildroot/configs/qemu_s390x_defconfig @@ -0,0 +1,26 @@ +# Architecture +BR2_s390x=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sh4_r2d_defconfig b/buildroot/configs/qemu_sh4_r2d_defconfig index c7c5126bf..a465547c8 100644 --- a/buildroot/configs/qemu_sh4_r2d_defconfig +++ b/buildroot/configs/qemu_sh4_r2d_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sh4eb_r2d_defconfig b/buildroot/configs/qemu_sh4eb_r2d_defconfig index 4d9559a38..24a9f2169 100644 --- a/buildroot/configs/qemu_sh4eb_r2d_defconfig +++ b/buildroot/configs/qemu_sh4eb_r2d_defconfig @@ -10,13 +10,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sparc64_sun4u_defconfig b/buildroot/configs/qemu_sparc64_sun4u_defconfig index d7be664cb..254f2d924 100644 --- a/buildroot/configs/qemu_sparc64_sun4u_defconfig +++ b/buildroot/configs/qemu_sparc64_sun4u_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/buildroot/configs/qemu_sparc_ss10_defconfig b/buildroot/configs/qemu_sparc_ss10_defconfig index dada40d46..1fdebfced 100644 --- a/buildroot/configs/qemu_sparc_ss10_defconfig +++ b/buildroot/configs/qemu_sparc_ss10_defconfig @@ -9,13 +9,17 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/buildroot/configs/qemu_x86_64_defconfig b/buildroot/configs/qemu_x86_64_defconfig index b561e42e5..60b446861 100644 --- a/buildroot/configs/qemu_x86_64_defconfig +++ b/buildroot/configs/qemu_x86_64_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" diff --git a/buildroot/configs/qemu_x86_defconfig b/buildroot/configs/qemu_x86_defconfig index 52f174434..ef38d98dd 100644 --- a/buildroot/configs/qemu_x86_defconfig +++ b/buildroot/configs/qemu_x86_defconfig @@ -12,13 +12,17 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/buildroot/configs/qemu_xtensa_lx60_defconfig b/buildroot/configs/qemu_xtensa_lx60_defconfig index 7cf8c41fd..79ae11d8f 100644 --- a/buildroot/configs/qemu_xtensa_lx60_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_defconfig @@ -11,13 +11,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig index 8cb93f2d3..09a388868 100644 --- a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig @@ -15,13 +15,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/buildroot/configs/raspberrypi0_defconfig b/buildroot/configs/raspberrypi0_defconfig index 38576dd65..930d7d9e5 100644 --- a/buildroot/configs/raspberrypi0_defconfig +++ b/buildroot/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/buildroot/configs/raspberrypi0w_defconfig b/buildroot/configs/raspberrypi0w_defconfig index f096f2bba..08d6ec2e2 100644 --- a/buildroot/configs/raspberrypi0w_defconfig +++ b/buildroot/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/buildroot/configs/raspberrypi2_defconfig b/buildroot/configs/raspberrypi2_defconfig index a91683292..406e7c946 100644 --- a/buildroot/configs/raspberrypi2_defconfig +++ b/buildroot/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_64_defconfig b/buildroot/configs/raspberrypi3_64_defconfig index 1f27957c6..51bd88eed 100644 --- a/buildroot/configs/raspberrypi3_64_defconfig +++ b/buildroot/configs/raspberrypi3_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_defconfig b/buildroot/configs/raspberrypi3_defconfig index 6441fe57a..cbe3daaf6 100644 --- a/buildroot/configs/raspberrypi3_defconfig +++ b/buildroot/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_qt5we_defconfig b/buildroot/configs/raspberrypi3_qt5we_defconfig index 1e954011d..222d29952 100644 --- a/buildroot/configs/raspberrypi3_qt5we_defconfig +++ b/buildroot/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi4_64_defconfig b/buildroot/configs/raspberrypi4_64_defconfig index b14c66d22..b80cf4117 100644 --- a/buildroot/configs/raspberrypi4_64_defconfig +++ b/buildroot/configs/raspberrypi4_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi4_defconfig b/buildroot/configs/raspberrypi4_defconfig index 70d6c4573..b652c7b10 100644 --- a/buildroot/configs/raspberrypi4_defconfig +++ b/buildroot/configs/raspberrypi4_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi_defconfig b/buildroot/configs/raspberrypi_defconfig index 2d662875d..edff12dd4 100644 --- a/buildroot/configs/raspberrypi_defconfig +++ b/buildroot/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/buildroot/configs/roc_pc_rk3399_defconfig b/buildroot/configs/roc_pc_rk3399_defconfig new file mode 100644 index 000000000..dfbc5e4f4 --- /dev/null +++ b/buildroot/configs/roc_pc_rk3399_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh" diff --git a/buildroot/configs/rock_pi_4_defconfig b/buildroot/configs/rock_pi_4_defconfig new file mode 100644 index 000000000..401a59bac --- /dev/null +++ b/buildroot/configs/rock_pi_4_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-4-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.46" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-pi-4" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rockpi4" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCK_PI_4" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="96M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-4/post-build.sh" diff --git a/buildroot/configs/rock_pi_n10_defconfig b/buildroot/configs/rock_pi_n10_defconfig new file mode 100644 index 000000000..c622839c8 --- /dev/null +++ b/buildroot/configs/rock_pi_n10_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n10-rk3399pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399pro-rock-pi-n10" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rockpi-n10" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N10" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="160M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n10/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n10/post-build.sh" diff --git a/buildroot/configs/rock_pi_n8_defconfig b/buildroot/configs/rock_pi_n8_defconfig new file mode 100644 index 000000000..9c671d416 --- /dev/null +++ b/buildroot/configs/rock_pi_n8_defconfig @@ -0,0 +1,45 @@ +# Architecture +BR2_arm=y +BR2_cortex_a17=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="ba120841bf40ebaed049d64bb4f980083a1cf6b7" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n8-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/amarula/linux-amarula.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dcb0132685b07beb82065c5d7521e6c555c55b6" +BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-rock-pi-n8" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rockpi-n8" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N8" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n8/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n8/post-build.sh" diff --git a/buildroot/configs/rockpro64_defconfig b/buildroot/configs/rockpro64_defconfig new file mode 100644 index 000000000..5086320cb --- /dev/null +++ b/buildroot/configs/rockpro64_defconfig @@ -0,0 +1,53 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rockpro64" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPRO64" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rockpro64/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh" diff --git a/buildroot/configs/roseapplepi_defconfig b/buildroot/configs/roseapplepi_defconfig index d315a02e1..45c42ec0f 100644 --- a/buildroot/configs/roseapplepi_defconfig +++ b/buildroot/configs/roseapplepi_defconfig @@ -2,27 +2,25 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y - BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 3.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -# kernel does not build with gcc 8.x -BR2_GCC_VERSION_7_X=y +# Linux headers same as kernel, a 5.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,xapp-le,kernel,59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b)/linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="actduino_bubble_gum_linux" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="actduino_bubble_gum_sdboot_linux" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders diff --git a/buildroot/configs/snps_arc700_axs101_defconfig b/buildroot/configs/snps_arc700_axs101_defconfig index 5d9b5a513..080250e92 100644 --- a/buildroot/configs/snps_arc700_axs101_defconfig +++ b/buildroot/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/snps_archs38_axs103_defconfig b/buildroot/configs/snps_archs38_axs103_defconfig index c6e2b10f0..c5847809b 100644 --- a/buildroot/configs/snps_archs38_axs103_defconfig +++ b/buildroot/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/snps_archs38_haps_defconfig b/buildroot/configs/snps_archs38_haps_defconfig index cb5edea2c..a95d760df 100644 --- a/buildroot/configs/snps_archs38_haps_defconfig +++ b/buildroot/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/snps_archs38_hsdk_defconfig b/buildroot/configs/snps_archs38_hsdk_defconfig index 646cd99d9..9a9d57b32 100644 --- a/buildroot/configs/snps_archs38_hsdk_defconfig +++ b/buildroot/configs/snps_archs38_hsdk_defconfig @@ -2,8 +2,8 @@ BR2_arcle=y BR2_archs38_full=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # System BR2_TARGET_GENERIC_HOSTNAME="hsdk" @@ -13,7 +13,7 @@ BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" diff --git a/buildroot/configs/snps_archs38_vdk_defconfig b/buildroot/configs/snps_archs38_vdk_defconfig index 7c7834f9b..8d8e9f755 100644 --- a/buildroot/configs/snps_archs38_vdk_defconfig +++ b/buildroot/configs/snps_archs38_vdk_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/socrates_cyclone5_defconfig b/buildroot/configs/socrates_cyclone5_defconfig index 4c659263d..6ecbf05d8 100644 --- a/buildroot/configs/socrates_cyclone5_defconfig +++ b/buildroot/configs/socrates_cyclone5_defconfig @@ -23,9 +23,10 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="8192" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt" +BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="8192" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig b/buildroot/configs/solidrun_macchiatobin_defconfig similarity index 90% rename from buildroot/configs/solidrun_macchiatobin_mainline_defconfig rename to buildroot/configs/solidrun_macchiatobin_defconfig index e601092d6..f1ca7764b 100644 --- a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig +++ b/buildroot/configs/solidrun_macchiatobin_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" @@ -19,7 +19,7 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040" @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragme # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" @@ -40,6 +40,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_TAR=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg" diff --git a/buildroot/configs/solidrun_macchiatobin_marvell_defconfig b/buildroot/configs/solidrun_macchiatobin_marvell_defconfig deleted file mode 100644 index 4d269b9f7..000000000 --- a/buildroot/configs/solidrun_macchiatobin_marvell_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y -BR2_TARGET_GENERIC_HOSTNAME="mcbin" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" -# This commit corresponds to release armada-18.09.4 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" -BR2_TARGET_BINARIES_MARVELL=y -BR2_TARGET_MV_DDR_MARVELL=y - -# U-Boot -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/u-boot-marvell" -# This commit corresponds to armada-18.09.1, based on u-boot 2018.03 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="8fe403172c58440bcfbb3724242301c0108eff5b" -BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" -BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MarvellEmbeddedProcessors,linux-marvell,linux-4.4.52-armada-17.10)/linux-linux-4.4.120-armada-18.09.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v8_lsp" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# rootfs -BR2_TARGET_ROOTFS_TAR=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build.sh" diff --git a/buildroot/configs/stm32f429_disco_defconfig b/buildroot/configs/stm32f429_disco_defconfig index 5237e9adb..2c0641a6c 100644 --- a/buildroot/configs/stm32f429_disco_defconfig +++ b/buildroot/configs/stm32f429_disco_defconfig @@ -2,7 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" diff --git a/buildroot/configs/stm32f469_disco_defconfig b/buildroot/configs/stm32f469_disco_defconfig index 8b77d8c1a..9760d5187 100644 --- a/buildroot/configs/stm32f469_disco_defconfig +++ b/buildroot/configs/stm32f469_disco_defconfig @@ -2,7 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" diff --git a/buildroot/configs/stm32mp157a_dk1_defconfig b/buildroot/configs/stm32mp157a_dk1_defconfig new file mode 100644 index 000000000..6883aaba7 --- /dev/null +++ b/buildroot/configs/stm32mp157a_dk1_defconfig @@ -0,0 +1,34 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dk1" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_STM32=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/stm32mp157c_dk2_defconfig b/buildroot/configs/stm32mp157c_dk2_defconfig index 273eda46a..50d875749 100644 --- a/buildroot/configs/stm32mp157c_dk2_defconfig +++ b/buildroot/configs/stm32mp157c_dk2_defconfig @@ -1,12 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -15,17 +14,21 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^metadata_csum" # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/wandboard_defconfig b/buildroot/configs/wandboard_defconfig index 1f42707ef..4882042a1 100644 --- a/buildroot/configs/wandboard_defconfig +++ b/buildroot/configs/wandboard_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" diff --git a/buildroot/configs/warp7_defconfig b/buildroot/configs/warp7_defconfig index 8ee56b8f2..5f9d97366 100644 --- a/buildroot/configs/warp7_defconfig +++ b/buildroot/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # wifi firmware for brcm43430 diff --git a/buildroot/configs/zynq_qmtech_defconfig b/buildroot/configs/zynq_qmtech_defconfig new file mode 100644 index 000000000..4db3f68b1 --- /dev/null +++ b/buildroot/configs/zynq_qmtech_defconfig @@ -0,0 +1,32 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2019.2.01)/linux-xilinx-v2019.2.01.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-qmtech" +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,u-boot-xlnx,xilinx-v2019.2.qmtech.1)/uboot-xilinx-v2019.2.qmtech.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_qmtech" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/docs/manual/adding-packages-cargo.txt b/buildroot/docs/manual/adding-packages-cargo.txt index edf698e70..8fcc80bcc 100644 --- a/buildroot/docs/manual/adding-packages-cargo.txt +++ b/buildroot/docs/manual/adding-packages-cargo.txt @@ -18,7 +18,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS -04: select BR2_PACKAGE_HOST_CARGO +04: select BR2_PACKAGE_HOST_RUSTC 05: help 06: This is a comment that explains what foo is. 07: @@ -44,7 +44,7 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-cargo +13: FOO_DEPENDENCIES = host-rustc 14: 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo 16: diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index f2969e9a1..b8bfcb4af 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -577,6 +577,14 @@ different steps of the build process. This is seldom used, as packages rarely have custom rules. *Do not use this variable*, unless you really know that you need to print help. +* +LIBFOO_LINUX_CONFIG_FIXUPS+ lists the Linux kernel configuration + options that are needed to build and use this package, and without + which the package is fundamentally broken. This shall be a set of + calls to one of the kconfig tweaking option: `KCONFIG_ENABLE_OPT`, + `KCONFIG_DISABLE_OPT`, or `KCONFIG_SET_OPT`. + This is seldom used, as package usually have no strict requirements on + the kernel options. + The preferred way to define these variables is: ---------------------- diff --git a/buildroot/docs/manual/adding-packages-golang.txt b/buildroot/docs/manual/adding-packages-golang.txt index 8c467689b..3b3457920 100644 --- a/buildroot/docs/manual/adding-packages-golang.txt +++ b/buildroot/docs/manual/adding-packages-golang.txt @@ -76,15 +76,13 @@ optionally be defined, depending on the package's needs. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them, or none. -* If your package need a custom +GOPATH+ to be compiled in, you can - use the +FOO_WORKSPACE+ variable. The +GOPATH+ being used will be - +/+. If +FOO_WORKSPACE+ is not - specified, it defaults to +_gopath+. - -* +FOO_SRC_SUBDIR+ is the sub-directory where your source will be - compiled relatively to the +GOPATH+. An example value is - +github.com/bar/foo+. If +FOO_SRC_SUBDIR+ is not specified, it - defaults to a value infered from the +FOO_SITE+ variable. +* The package must specify its Go module name in the +FOO_GOMOD+ + variable. If not specified, it defaults to + +URL-domain/1st-part-of-URL/2nd-part-of-URL+, e.g +FOO_GOMOD+ will + take the value +github.com/bar/foo+ for a package that specifies + +FOO_SITE = $(call github,bar,foo,$(FOO_VERSION))+. The Go package + infrastructure will automatically generate a minimal +go.mod+ file + in the package source tree if it doesn't exist. * +FOO_LDFLAGS+ and +FOO_TAGS+ can be used to pass respectively the +LDFLAGS+ or the +TAGS+ to the +go+ build command. diff --git a/buildroot/docs/manual/adding-packages-luarocks.txt b/buildroot/docs/manual/adding-packages-luarocks.txt index df97cdd50..70f48fc02 100644 --- a/buildroot/docs/manual/adding-packages-luarocks.txt +++ b/buildroot/docs/manual/adding-packages-luarocks.txt @@ -73,9 +73,7 @@ infrastructures in Buildroot, respectively. The main macro of the LuaRocks package infrastructure is +luarocks-package+: like +generic-package+ it works by defining a number of variables providing -metadata information about the package, and then calling +luarocks-package+. It -is worth mentioning that building LuaRocks packages for the host is not -supported, so the macro +host-luarocks-package+ is not implemented. +metadata information about the package, and then calling +luarocks-package+. Just like the generic infrastructure, the LuaRocks infrastructure works by defining a number of variables before calling the +luarocks-package+ diff --git a/buildroot/docs/manual/adding-packages-meson.txt b/buildroot/docs/manual/adding-packages-meson.txt index e84bf7f60..029c8c248 100644 --- a/buildroot/docs/manual/adding-packages-meson.txt +++ b/buildroot/docs/manual/adding-packages-meson.txt @@ -116,6 +116,15 @@ will therefore only use a few of them. single quotes. By default, empty. Note that Buildroot already sets the correct values for +c+, +cpp+, +ar+, +strip+, and +pkgconfig+. +* +FOO_MESON_EXTRA_PROPERTIES+, to specify a space-separated list of + properties to add to the `[properties]` section of the meson + `cross-compilation.conf` configuration file. The format is + `property-name=` with no space around the +=+ sign, and with + single quotes around string values. By default, empty. Note that + Buildroot already sets values for +needs_exe_wrapper+, +c_args+, + +c_link_args+, +cpp_args+, +cpp_link_args+, +sys_root+, and + +pkg_config_libdir+. + * +FOO_NINJA_ENV+, to specify additional environment variables to pass to +ninja+, meson companion tool in charge of the build operations. By default, empty. diff --git a/buildroot/docs/manual/adding-packages-qmake.txt b/buildroot/docs/manual/adding-packages-qmake.txt new file mode 100644 index 000000000..e1621e914 --- /dev/null +++ b/buildroot/docs/manual/adding-packages-qmake.txt @@ -0,0 +1,81 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +=== Infrastructure for QMake-based packages + +[[qmake-package-tutorial]] + +==== +qmake-package+ tutorial + +First, let's see how to write a +.mk+ file for a QMake-based package, with +an example : + +------------------------ +01: ################################################################################ +02: # +03: # libfoo +04: # +05: ################################################################################ +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_CONF_OPTS = QT_CONFIG+=bar QT_CONFIG-=baz +11: LIBFOO_DEPENDENCIES = bar +12: +13: $(eval $(qmake-package)) +------------------------ + +On line 7, we declare the version of the package. + +On line 8 and 9, we declare the name of the tarball (xz-ed tarball +recommended) and the location of the tarball on the Web. Buildroot +will automatically download the tarball from this location. + +On line 10, we tell Buildroot what options to enable for libfoo. + +On line 11, we tell Buildroot the dependencies of libfoo. + +Finally, on line line 13, we invoke the +qmake-package+ +macro that generates all the Makefile rules that actually allows the +package to be built. + +[[qmake-package-reference]] + +==== +qmake-package+ reference + +The main macro of the QMake package infrastructure is +qmake-package+. +It is similar to the +generic-package+ macro. + +Just like the generic infrastructure, the QMake infrastructure works +by defining a number of variables before calling the +qmake-package+ +macro. + +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the QMake infrastructure: ++LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, ++LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, ++LIBFOO_INSTALL_TARGET+. + +An additional variable, specific to the QMake infrastructure, can +also be defined. + +* +LIBFOO_CONF_ENV+, to specify additional environment variables to + pass to the +qmake+ script for the configuration step. By default, empty. + +* +LIBFOO_CONF_OPTS+, to specify additional options to pass to the + +qmake+ script for the configuration step. By default, empty. + +* +LIBFOO_MAKE_ENV+, to specify additional environment variables to the + +make+ command during the build and install steps. By default, empty. + +* +LIBFOO_MAKE_OPTS+, to specify additional targets to pass to the + +make+ command during the build step. By default, empty. + +* +LIBFOO_INSTALL_STAGING_OPTS+, to specify additional targets to pass + to the +make+ command during the staging installation step. By default, + +install+. + +* +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional targets to pass + to the +make+ command during the target installation step. By default, + +install+. diff --git a/buildroot/docs/manual/adding-packages.txt b/buildroot/docs/manual/adding-packages.txt index 4a4a17e87..814355cd7 100644 --- a/buildroot/docs/manual/adding-packages.txt +++ b/buildroot/docs/manual/adding-packages.txt @@ -41,6 +41,8 @@ include::adding-packages-cargo.txt[] include::adding-packages-golang.txt[] +include::adding-packages-qmake.txt[] + include::adding-packages-kernel-module.txt[] include::adding-packages-asciidoc.txt[] diff --git a/buildroot/docs/manual/contribute.txt b/buildroot/docs/manual/contribute.txt index 70d178d00..14ecdbd66 100644 --- a/buildroot/docs/manual/contribute.txt +++ b/buildroot/docs/manual/contribute.txt @@ -602,11 +602,8 @@ The basic test case definition involves * Implementing a +def test_run(self):+ function to optionally startup the emulator and provide test case conditions. -Beyond creating the test script, there are a couple of additional steps that -should be taken once you have your initial test case script. The first is -to add yourself to the +DEVELOPERS+ file to be the maintainer of that test -case. The second is to update the Gitlab CI yml by executing -+make .gitlab-ci.yml+. +After creating the test script, add yourself to the +DEVELOPERS+ file to +be the maintainer of that test case. ==== Debugging a test case diff --git a/buildroot/docs/manual/customize-outside-br.txt b/buildroot/docs/manual/customize-outside-br.txt index 5f7d623ae..348f2b089 100644 --- a/buildroot/docs/manual/customize-outside-br.txt +++ b/buildroot/docs/manual/customize-outside-br.txt @@ -191,9 +191,9 @@ tree. For some packages, Buildroot provides a choice between two (or more) implementations of API-compatible such packages. For example, there is -a choice to choose either libjpeg ot jpeg-turbo, and another choice -between openssl or libressl. Finally, there is a choice to select one -of the known, pre-configured toolchains. +a choice to choose either libjpeg ot jpeg-turbo; there is one between +openssl or libressl; there is one to select one of the known, +pre-configured toolchains... It is possible for a br2-external to extend those choices, by providing a set of files that define those alternatives: @@ -201,7 +201,10 @@ a set of files that define those alternatives: * +provides/toolchains.in+ defines the pre-configured toolchains, which will then be listed in the toolchain selection; * +provides/jpeg.in+ defines the alternative libjpeg implementations; -* +provides/openssl.in+ defines the alternative openssl implementations. +* +provides/openssl.in+ defines the alternative openssl implementations; +* +provides/skeleton.in+ defines the alternative skeleton implementations; +* +provides/init.in+ defines the alternative init system implementations, this + can be used to select a default skeleton for your init. ===== Free-form content @@ -301,6 +304,34 @@ illustration, of course): | |$(eval $(autotools-package)) | `---- | + |- provides/init.in + | |config BR2_INIT_MINE + | | bool "my custom init" + | | select BR2_PACKAGE_MY_INIT + | | select BR2_PACKAGE_SKELETON_INIT_MINE if BR2_ROOTFS_SKELETON_DEFAULT + | `---- + | + |- provides/skeleton.in + | |config BR2_ROOTFS_SKELETON_MINE + | | bool "my custom skeleton" + | | select BR2_PACKAGE_SKELETON_MINE + | `---- + |- package/skeleton-mine/Config.in + | |config BR2_PACKAGE_SKELETON_MINE + | | bool + | | select BR2_PACKAGE_HAS_SKELETON + | | + | |config BR2_PACKAGE_PROVIDES_SKELETON + | | default "skeleton-mine" if BR2_PACKAGE_SKELETON_MINE + | `---- + |- package/skeleton-mine/skeleton-mine.mk + | |SKELETON_MINE_ADD_TOOLCHAIN_DEPENDENCY = NO + | |SKELETON_MINE_ADD_SKELETON_DEPENDENCY = NO + | |SKELETON_MINE_PROVIDES = skeleton + | |SKELETON_MINE_INSTALL_STAGING = YES + | |$(eval $(generic-package)) + | `---- + | |- provides/toolchains.in | |config BR2_TOOLCHAIN_EXTERNAL_MINE | | bool "my custom toolchain" diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 87aaa4f27..ee397d701 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Top-level parallel build
8.12. Integration with Eclipse
8.13. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
21.7. Using the run-tests framework
22. DEVELOPERS file and get-developers
23. Release Engineering
23.1. Releases
23.2. Development
IV. Appendix
24. Makedev syntax documentation
25. Makeusers syntax documentation
26. Migrating from older Buildroot versions
26.1. Migrating to 2016.11
26.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2020.02.7 manual generated on 2020-10-12 -21:37:29 UTC from git revision d8082db677

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Top-level parallel build
8.12. Integration with Eclipse
8.13. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2020.11-rc1 manual generated on 2020-11-04 +22:31:15 UTC from git revision 5b79a9cc47

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -85,7 +85,7 @@ Source fetching tools: wget from ftp, http or https locations. A few packages are only available through a version control system. Moreover, Buildroot is capable of downloading sources via other tools, like rsync or scp -(refer to Chapter 19, Download infrastructure for more details). If you enable +(refer to Chapter 20, Download infrastructure for more details). If you enable packages using any of these methods, you will need to install the corresponding tool on the host system:

8.13.2. Using gdb in Buildroot

Buildroot allows to do cross-debugging, where the debugger runs on the +generating a tarball.

For your convenience, by selecting the option +BR2_PACKAGE_HOST_ENVIRONMENT_SETUP, you can get a +setup-environment script installed in output/host/ and therefore +in your SDK. This script can be sourced with +. your/sdk/path/environment-setup to export a number of environment +variables that will help cross-compile your projects using the +Buildroot SDK: the PATH will contain the SDK binaries, standard +autotools variables will be defined with the appropriate values, and +CONFIGURE_FLAGS will contain basic ./configure options to +cross-compile autotools projects. It also provides some useful +commands. Note however that once this script is sourced, the +environment is setup only for cross-compilation, and no longer for +native compilation.

8.13.2. Using gdb in Buildroot

Buildroot allows to do cross-debugging, where the debugger runs on the build machine and communicates with gdbserver on the target to control the execution of the program.

To achieve this:

  • If you are using an internal toolchain (built by Buildroot), you @@ -1331,7 +1343,7 @@ If it is passed as a relative path, it is important to note that it is interpreted relative to the main Buildroot source directory, not to the Buildroot output directory.

    Note: If using an br2-external tree from before Buildroot 2016.11, you need to convert it before you can use it with Buildroot 2016.11 onward. See -Section 26.1, “Migrating to 2016.11” for help on doing so.

    Some examples:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig

    From now on, definitions from the /path/to/foo br2-external tree +Section 27.1, “Migrating to 2016.11” for help on doing so.

    Some examples:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig

    From now on, definitions from the /path/to/foo br2-external tree will be used:

    buildroot/ $ make
 buildroot/ $ make legal-info

    We can switch to another br2-external tree at any time:

    buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig

    We can also use multiple br2-external trees:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig

    Or disable the usage of any br2-external tree:

    buildroot/ $ make BR2_EXTERNAL= xconfig

    9.2.1. Layout of a br2-external tree

    A br2-external tree must contain at least those three files, described in the following chapters:

    • @@ -1389,7 +1401,7 @@ makefile logic.

      The main usage of this is to store package recipes. The re to do this is to write a Config.in file that looks like:

      source "$BR2_EXTERNAL_BAR_42_PATH/package/package1/Config.in"
 source "$BR2_EXTERNAL_BAR_42_PATH/package/package2/Config.in"

      Then, have an external.mk file that looks like:

      include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk))

      And then in $(BR2_EXTERNAL_BAR_42_PATH)/package/package1 and $(BR2_EXTERNAL_BAR_42_PATH)/package/package2 create normal -Buildroot package recipes, as explained in Chapter 17, Adding new packages to Buildroot. +Buildroot package recipes, as explained in Chapter 18, Adding new packages to Buildroot. If you prefer, you can also group the packages in subdirectories called <boardname> and adapt the above paths accordingly.

      You can also define custom configuration options in Config.in and custom make logic in external.mk.

    The configs/ directory

    One can store Buildroot defconfigs in the configs subdirectory of @@ -1402,16 +1414,21 @@ the one from the last br2-external tree is used. It is thus possible to override a defconfig bundled in Buildroot or another br2-external tree.

    The provides/ directory

    For some packages, Buildroot provides a choice between two (or more) implementations of API-compatible such packages. For example, there is -a choice to choose either libjpeg ot jpeg-turbo, and another choice -between openssl or libressl. Finally, there is a choice to select one -of the known, pre-configured toolchains.

    It is possible for a br2-external to extend those choices, by providing +a choice to choose either libjpeg ot jpeg-turbo; there is one between +openssl or libressl; there is one to select one of the known, +pre-configured toolchains…

    It is possible for a br2-external to extend those choices, by providing a set of files that define those alternatives:

    • provides/toolchains.in defines the pre-configured toolchains, which will then be listed in the toolchain selection;
    • provides/jpeg.in defines the alternative libjpeg implementations;
    • -provides/openssl.in defines the alternative openssl implementations. +provides/openssl.in defines the alternative openssl implementations; +
    • +provides/skeleton.in defines the alternative skeleton implementations; +
    • +provides/init.in defines the alternative init system implementations, this + can be used to select a default skeleton for your init.

    Free-form content

    One can store all the board-specific configuration files there, such as the kernel configuration, the root filesystem overlay, or any other configuration file for which Buildroot allows to set the location (by @@ -1420,7 +1437,7 @@ could set the paths to a global patch directory, to a rootfs overlay and to the kernel configuration file as follows (e.g. by running make menuconfig and filling in these options):

    BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/
 BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/overlay/
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/kernel.config

    Additional Linux kernel extensions

    Additional Linux kernel extensions (see Section 17.20.2, “linux-kernel-extensions”) can +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/kernel.config

    Additional Linux kernel extensions

    Additional Linux kernel extensions (see Section 18.21.2, “linux-kernel-extensions”) can be added by storing them in the linux/ directory at the root of a br2-external tree.

    Example layout

    Here is an example layout using all features of br2-external (the sample content is shown for the file above it, when it is relevant to explain @@ -1493,6 +1510,34 @@ illustration, of course):

    /path/to/br2-ext-tree/
   |     |$(eval $(autotools-package))
   |     `----
   |
+  |- provides/init.in
+  |     |config BR2_INIT_MINE
+  |     |    bool "my custom init"
+  |     |    select BR2_PACKAGE_MY_INIT
+  |     |    select BR2_PACKAGE_SKELETON_INIT_MINE if BR2_ROOTFS_SKELETON_DEFAULT
+  |     `----
+  |
+  |- provides/skeleton.in
+  |     |config BR2_ROOTFS_SKELETON_MINE
+  |     |    bool "my custom skeleton"
+  |     |    select BR2_PACKAGE_SKELETON_MINE
+  |     `----
+  |- package/skeleton-mine/Config.in
+  |     |config BR2_PACKAGE_SKELETON_MINE
+  |     |    bool
+  |     |    select BR2_PACKAGE_HAS_SKELETON
+  |     |
+  |     |config BR2_PACKAGE_PROVIDES_SKELETON
+  |     |    default "skeleton-mine" if BR2_PACKAGE_SKELETON_MINE
+  |     `----
+  |- package/skeleton-mine/skeleton-mine.mk
+  |     |SKELETON_MINE_ADD_TOOLCHAIN_DEPENDENCY = NO
+  |     |SKELETON_MINE_ADD_SKELETON_DEPENDENCY = NO
+  |     |SKELETON_MINE_PROVIDES = skeleton
+  |     |SKELETON_MINE_INSTALL_STAGING = YES
+  |     |$(eval $(generic-package))
+  |     `----
+  |
   |- provides/toolchains.in
   |     |config BR2_TOOLCHAIN_EXTERNAL_MINE
   |     |    bool "my custom toolchain"
@@ -1658,7 +1703,7 @@ Post-build scripts (BR2_ROOTFS_POST_BUILD_SCRIPT)
 BR2_CONFIG: the path to the Buildroot .config file
  • HOST_DIR, STAGING_DIR, TARGET_DIR: see - Section 17.5.2, “generic-package reference” + Section 18.5.2, “generic-package reference”
  • BUILD_DIR: the directory where packages are extracted and built
  • @@ -1725,7 +1770,7 @@ such changes from there unless you use an explicit fakeroot from the post-build script.

    Instead, Buildroot provides support for so-called permission tables. To use this feature, set config option BR2_ROOTFS_DEVICE_TABLE to a space-separated list of permission tables, regular text files following -the makedev syntax.

    If you are using a static device table (i.e. not using devtmpfs, +the makedev syntax.

    If you are using a static device table (i.e. not using devtmpfs, mdev, or (e)udev) then you can add device nodes using the same syntax, in so-called device tables. To use this feature, set config option BR2_ROOTFS_STATIC_DEVICE_TABLE to a space-separated list of @@ -1733,14 +1778,14 @@ device tables.

    As shown in board/<company>/<boardname>/.

    It should be noted that if the specific permissions or device nodes are related to a specific application, you should set variables FOO_PERMISSIONS and FOO_DEVICES in the package’s .mk file instead -(see Section 17.5.2, “generic-package reference”).

9.6. Adding custom user accounts

Sometimes it is needed to add specific users in the target system. +(see Section 18.5.2, “generic-package reference”).

9.6. Adding custom user accounts

Sometimes it is needed to add specific users in the target system. To cover this requirement, Buildroot provides support for so-called users tables. To use this feature, set config option BR2_ROOTFS_USERS_TABLES to a space-separated list of users tables, -regular text files following the makeusers syntax.

As shown in Section 9.1, “Recommended directory structure”, the recommended location for +regular text files following the makeusers syntax.

As shown in Section 9.1, “Recommended directory structure”, the recommended location for such files is board/<company>/<boardname>/.

It should be noted that if the custom users are related to a specific application, you should set variable FOO_USERS in the package’s .mk -file instead (see Section 17.5.2, “generic-package reference”).

9.7. Customization after the images have been created

While post-build scripts (Section 9.5, “Customizing the generated target filesystem”) are run before +file instead (see Section 18.5.2, “generic-package reference”).

9.7. Customization after the images have been created

While post-build scripts (Section 9.5, “Customizing the generated target filesystem”) are run before building the filesystem image, kernel and bootloader, post-image scripts can be used to perform some specific actions after all images have been created.

Post-image scripts can for example be used to automatically extract your @@ -1791,7 +1836,7 @@ Otherwise, patch files matching *.patch are applied <number>-<description>.patch, where <number> refers to the apply order.

For information about how patches are applied for a package, see -Section 18.2, “How patches are applied”

The BR2_GLOBAL_PATCH_DIR option is the preferred method for +Section 19.2, “How patches are applied”

The BR2_GLOBAL_PATCH_DIR option is the preferred method for specifying a custom patch directory for packages. It can be used to specify a patch directory for any package in buildroot. It should also be used in place of the custom patch directory options that are @@ -1805,7 +1850,7 @@ patches that are applied after patches available in BR2_GL as it is done from a post-patch hook of the Linux package.

9.9. Adding project-specific packages

In general, any new package should be added directly in the package directory and submitted to the Buildroot upstream project. How to add packages to Buildroot in general is explained in full detail in -Chapter 17, Adding new packages to Buildroot and will not be repeated here. However, your +Chapter 18, Adding new packages to Buildroot and will not be repeated here. However, your project may need some proprietary packages that cannot be upstreamed. This section will explain how you can keep such project-specific packages in a project-specific directory.

As shown in Section 9.1, “Recommended directory structure”, the recommended location for @@ -1814,7 +1859,7 @@ br2-external tree feature (see package/ in your br2-external tree.

However, Buildroot will not be aware of the packages in this location, unless we perform some additional steps. As explained in -Chapter 17, Adding new packages to Buildroot, a package in Buildroot basically consists of two +Chapter 18, Adding new packages to Buildroot, a package in Buildroot basically consists of two files: a .mk file (describing how to build the package) and a Config.in file (describing the configuration options for this package).

Buildroot will automatically include the .mk files in first-level @@ -1916,7 +1961,60 @@ If you need to add project-specific packages, create make savedefconfig to save the buildroot configuration.

  • cp defconfig configs/<boardname>_defconfig -

    • Chapter 10. Frequently Asked Questions & Troubleshooting

    10.1. The boot hangs after Starting network…

    If the boot process seems to hang after the following messages +

    Chapter 10. Using SELinux in Buildroot

    SELinux is a Linux kernel security module +enforcing access control policies. In addition to the traditional file +permissions and access control lists, SELinux allows to write rules +for users or processes to access specific functions of resources +(files, sockets…).

    SELinux has three modes of operation:

    • +Disabled: the policy is not applied +
    • +Permissive: the policy is applied, and non-authorized actions are + simply logged. This mode is often used for troubleshooting SELinux + issues. +
    • +Enforcing: the policy is applied, and non-authorized actions are + denied +

    In Buildroot the mode of operation is controlled by the +BR2_PACKAGE_REFPOLICY_POLICY_STATE_* configuration options. The +Linux kernel also has various configuration options that affect how +SELinux is enabled (see security/selinux/Kconfig in the Linux +kernel sources).

    By default in Buildroot the SELinux policy is provided by the +upstream refpolicy +project, enabled with BR2_PACKAGE_REFPOLICY.

    10.1. Enabling SELinux support

    To have proper support for SELinux in a Buildroot generated system, +the following configuration options must be enabled:

    • +BR2_PACKAGE_LIBSELINUX +
    • +BR2_PACKAGE_REFPOLICY +

    In addition, your filesystem image format must support extended +attributes.

    10.2. SELinux policy tweaking

    The SELinux refpolicy contains modules that can be enabled or +disabled when being built. Each module provide a number of SELinux +rules. In Buildroot the non-base modules are disabled by default and +several ways to enable such modules are provided:

    • +Packages can enable a list of SELinux modules within the refpolicy using + the <packagename>_SELINUX_MODULES variable. +
    • +Packages can provide additional SELinux modules by putting them (.fc, .if + and .te files) in package/<packagename>/selinux/. +
    • +Extra SELinux modules can be added in directories pointed by the + BR2_REFPOLICY_EXTRA_MODULES_DIRS configuration option. +
    • +Additional modules in the refpolicy can be enabled if listed in the + BR2_REFPOLICY_EXTRA_MODULES_DEPENDENCIES configuration option. +

    Buildroot also allows to completely override the refpolicy. This +allows to provide a full custom policy designed specifically for a +given system. When going this way, all of the above mechanisms are +disabled: no extra SElinux module is added to the policy, and all +the available modules within the custom policy are enabled and built +into the final binary policy. The custom policy must be a fork of the +official refpolicy.

    In order to fully override the refpolicy the following configuration +variables have to be set:

    • +BR2_PACKAGE_REFPOLICY_CUSTOM_GIT +
    • +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL +
    • +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION +

    Chapter 11. Frequently Asked Questions & Troubleshooting

    11.1. The boot hangs after Starting network…

    If the boot process seems to hang after the following messages (messages not necessarily exactly similar, depending on the list of packages selected):

    Freeing init memory: 3972K
 Initializing random number generator... done.
@@ -1927,7 +2025,7 @@ serial console, you have to go into the Buildroot configuration, in
 System configuration, modify Run a getty (login prompt) after boot
 and set the appropriate port and baud rate in the getty options
 submenu. This will automatically tune the /etc/inittab file of the
-generated system so that a shell starts on the correct serial port.

    10.2. Why is there no compiler on the target?

    It has been decided that support for the native compiler on the +generated system so that a shell starts on the correct serial port.

    11.2. Why is there no compiler on the target?

    It has been decided that support for the native compiler on the target would be stopped from the Buildroot-2012.11 release because:

    • this feature was neither maintained nor tested, and often broken;
    • @@ -1955,21 +2053,21 @@ distribution and you should opt for something like:

      Arch Linux ARM
    • … -

    10.3. Why are there no development files on the target?

    Since there is no compiler available on the target (see -Section 10.2, “Why is there no compiler on the target?”), it does not make sense to waste +

    11.3. Why are there no development files on the target?

    Since there is no compiler available on the target (see +Section 11.2, “Why is there no compiler on the target?”), it does not make sense to waste space with headers or static libraries.

    Therefore, those files are always removed from the target since the -Buildroot-2012.11 release.

    10.4. Why is there no documentation on the target?

    Because Buildroot mostly targets small or very small target +Buildroot-2012.11 release.

    11.4. Why is there no documentation on the target?

    Because Buildroot mostly targets small or very small target hardware with limited resource onboard (CPU, ram, mass-storage), it does not make sense to waste space with the documentation data.

    If you need documentation data on your target anyway, then Buildroot is not suitable for your purpose, and you should look for a real -distribution (see: Section 10.2, “Why is there no compiler on the target?”).

    10.5. Why are some packages not visible in the Buildroot config menu?

    If a package exists in the Buildroot tree and does not appear in the +distribution (see: Section 11.2, “Why is there no compiler on the target?”).

    11.5. Why are some packages not visible in the Buildroot config menu?

    If a package exists in the Buildroot tree and does not appear in the config menu, this most likely means that some of the package’s dependencies are not met.

    To know more about the dependencies of a package, search for the package symbol in the config menu (see Section 8.1, “make tips”).

    Then, you may have to recursively enable several options (which correspond to the unmet dependencies) to finally be able to select the package.

    If the package is not visible due to some unmet toolchain options, then you should certainly run a full rebuild (see Section 8.1, “make tips” for -more explanations).

    10.6. Why not use the target directory as a chroot directory?

    There are plenty of reasons to not use the target directory a chroot +more explanations).

    11.6. Why not use the target directory as a chroot directory?

    There are plenty of reasons to not use the target directory a chroot one, among these:

    • file ownerships, modes and permissions are not correctly set in the target directory; @@ -1978,7 +2076,7 @@ device nodes are not created in the target directory.

    For these reasons, commands run through chroot, using the target directory as the new root, will most likely fail.

    If you want to run the target filesystem inside a chroot, or as an NFS root, then use the tarball image generated in images/ and extract it -as root.

    10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?

    One feature that is often discussed on the Buildroot list is the +as root.

    11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?

    One feature that is often discussed on the Buildroot list is the general topic of "package management". To summarize, the idea would be to add some tracking of which Buildroot package installs what files, with the goals of:

    • @@ -2066,7 +2164,7 @@ We believe that for most embedded Linux systems, binary packages are upgrades by upgrading the entire root filesystem image at once, the image deployed to the embedded system is guaranteed to really be the one that has been tested and validated. -

    10.8. How to speed-up the build process?

    Since Buildroot often involves doing full rebuilds of the entire +

    11.8. How to speed-up the build process?

    Since Buildroot often involves doing full rebuilds of the entire system that can be quite long, we provide below a number of tips to help reduce the build time:

    • Use a pre-built external toolchain instead of the default Buildroot @@ -2098,7 +2196,7 @@ Buy new hardware. SSDs and lots of RAM are key to speeding up the
    • Experiment with top-level parallel build, see Section 8.11, “Top-level parallel build”. -

    Chapter 11. Known issues

    • +

    Chapter 12. Known issues

    • It is not possible to pass extra linker options via BR2_TARGET_LDFLAGS if such options contain a $ sign. For example, the following is known to break: BR2_TARGET_LDFLAGS="-Wl,-rpath='$ORIGIN/../lib'" @@ -2108,7 +2206,7 @@ The libffi package is not supported on the SuperH 2
    • The prboom package triggers a compiler failure with the SuperH 4 compiler from Sourcery CodeBench, version 2012.09. -

    Chapter 12. Legal notice and licensing

    12.1. Complying with open source licenses

    All of the end products of Buildroot (toolchain, root filesystem, kernel, +

    Chapter 13. Legal notice and licensing

    13.1. Complying with open source licenses

    All of the end products of Buildroot (toolchain, root filesystem, kernel, bootloaders) contain open source software, released under various licenses.

    Using open source software gives you the freedom to build rich embedded systems, choosing from a wide range of packages, but also imposes some obligations that you must know and honour. @@ -2169,7 +2267,7 @@ well possible that those declarative statements are not all fully accurate nor exhaustive. You (or your legal department) have to check the output of make legal-info before using it as your own compliance delivery. See the NO WARRANTY clauses (clauses 11 and 12) in the COPYING file at the -root of the Buildroot distribution.

    12.2. Complying with the Buildroot license

    Buildroot itself is an open source software, released under the +root of the Buildroot distribution.

    13.2. Complying with the Buildroot license

    Buildroot itself is an open source software, released under the GNU General Public License, version 2 or (at your option) any later version, with the exception of the package patches detailed below. @@ -2188,19 +2286,19 @@ of the executable". Buildroot is part of the scripts used to control compilation and installation of the executable, and as such it is considered part of the material that must be redistributed.

    Keep in mind that this is only the Buildroot developers' opinion, and you -should consult your legal department or lawyer in case of any doubt.

    12.2.1. Patches to packages

    Buildroot also bundles patch files, which are applied to the sources +should consult your legal department or lawyer in case of any doubt.

    13.2.1. Patches to packages

    Buildroot also bundles patch files, which are applied to the sources of the various packages. Those patches are not covered by the license of Buildroot. Instead, they are covered by the license of the software to which the patches are applied. When said software is available under multiple licenses, the Buildroot patches are only provided under -the publicly accessible licenses.

    See Chapter 18, Patching a package for the technical details.

    Chapter 13. Beyond Buildroot

    13.1. Boot the generated images

    13.1.1. NFS boot

    To achieve NFS-boot, enable tar root filesystem in the Filesystem +the publicly accessible licenses.

    See Chapter 19, Patching a package for the technical details.

    Chapter 14. Beyond Buildroot

    14.1. Boot the generated images

    14.1.1. NFS boot

    To achieve NFS-boot, enable tar root filesystem in the Filesystem images menu.

    After a complete build, just run the following commands to setup the -NFS-root directory:

    sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir

    Remember to add this path to /etc/exports.

    Then, you can execute a NFS-boot from your target.

    13.1.2. Live CD

    To build a live CD image, enable the iso image option in the +NFS-root directory:

    sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir

    Remember to add this path to /etc/exports.

    Then, you can execute a NFS-boot from your target.

    14.1.2. Live CD

    To build a live CD image, enable the iso image option in the Filesystem images menu. Note that this option is only available on the x86 and x86-64 architectures, and if you are building your kernel with Buildroot.

    You can build a live CD image with either IsoLinux, Grub or Grub 2 as a bootloader, but only Isolinux supports making this image usable both -as a live CD and live USB (through the Build hybrid image option).

    You can test your live CD image using QEMU:

    qemu-system-i386 -cdrom output/images/rootfs.iso9660

    Or use it as a hard-drive image if it is a hybrid ISO:

    qemu-system-i386 -hda output/images/rootfs.iso9660

    It can be easily flashed to a USB drive with dd:

    dd if=output/images/rootfs.iso9660 of=/dev/sdb

    13.2. Chroot

    If you want to chroot in a generated image, then there are few thing +as a live CD and live USB (through the Build hybrid image option).

    You can test your live CD image using QEMU:

    qemu-system-i386 -cdrom output/images/rootfs.iso9660

    Or use it as a hard-drive image if it is a hybrid ISO:

    qemu-system-i386 -hda output/images/rootfs.iso9660

    It can be easily flashed to a USB drive with dd:

    dd if=output/images/rootfs.iso9660 of=/dev/sdb

    14.2. Chroot

    If you want to chroot in a generated image, then there are few thing you should be aware of:

    • you should setup the new root from the tar root filesystem image;
    • @@ -2211,7 +2309,7 @@ either the selected target architecture is compatible with your host
    • Buildroot does not currently provide host-qemu and binfmt correctly built and set for that kind of use. -

    Part III. Developer guide

    Chapter 14. How Buildroot works

    As mentioned above, Buildroot is basically a set of Makefiles that +

    Part III. Developer guide

    Chapter 15. How Buildroot works

    As mentioned above, Buildroot is basically a set of Makefiles that download, configure, and compile software with the correct options. It also includes patches for various software packages - mainly the ones involved in the cross-compilation toolchain (gcc, binutils and @@ -2267,14 +2365,14 @@ Generate all the targets listed in the TARGETS vari the userspace packages (libraries, programs), the kernel, the bootloader and the generation of the root filesystem images, depending on the configuration. -

    Chapter 15. Coding style

    Overall, these coding style rules are here to help you to add new files in +

    Chapter 16. Coding style

    Overall, these coding style rules are here to help you to add new files in Buildroot or refactor existing ones.

    If you slightly modify some existing file, the important thing is to keep the consistency of the whole file, so you can:

    • either follow the potentially deprecated coding style used in this file,
    • or entirely rework it in order to make it comply with these rules. -

    15.1. Config.in file

    Config.in files contain entries for almost anything configurable in +

    16.1. Config.in file

    Config.in files contain entries for almost anything configurable in Buildroot.

    An entry has the following pattern:

    config BR2_PACKAGE_LIBFOO
         bool "libfoo"
         depends on BR2_PACKAGE_LIBBAZ
@@ -2295,7 +2393,7 @@ The help text should be wrapped to fit 72 columns, where tab counts

    The Config.in files are the input for the configuration tool used in Buildroot, which is the regular Kconfig. For further details about the Kconfig language, refer to -http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt.

    15.2. The .mk file

    16.2. The .mk file

    • Header: The file starts with a header. It contains the module name, preferably in lowercase, enclosed between separators made of 80 hashes. A blank line is mandatory after the header: @@ -2338,11 +2436,11 @@ endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA -endif

    15.3. The documentation

    The documentation uses the +endif

    16.3. The documentation

    The documentation uses the asciidoc format.

    For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html.

    15.4. Support scripts

    Some scripts in the support/ and utils/ directories are written in +http://www.methods.co.nz/asciidoc/userguide.html.

    16.4. Support scripts

    Some scripts in the support/ and utils/ directories are written in Python and should follow the -PEP8 Style Guide for Python Code.

    Chapter 16. Adding support for a particular board

    Buildroot contains basic configurations for several publicly available +PEP8 Style Guide for Python Code.

    Chapter 17. Adding support for a particular board

    Buildroot contains basic configurations for several publicly available hardware boards, so that users of such a board can easily build a system that is known to work. You are welcome to add support for other boards to Buildroot too.

    To do so, you need to create a normal Buildroot configuration that @@ -2373,18 +2471,18 @@ configuration or patches specific to your target platform. To do so, create a directory board/<manufacturer> and a subdirectory board/<manufacturer>/<boardname>. You can then store your patches and configurations in these directories, and reference them from the main -Buildroot configuration. Refer to Chapter 9, Project-specific customization for more details.

    Chapter 17. Adding new packages to Buildroot

    This section covers how new packages (userspace libraries or +Buildroot configuration. Refer to Chapter 9, Project-specific customization for more details.

    Chapter 18. Adding new packages to Buildroot

    This section covers how new packages (userspace libraries or applications) can be integrated into Buildroot. It also shows how existing packages are integrated, which is needed for fixing issues or tuning their configuration.

    When you add a new package, be sure to test it in various conditions -(see Section 17.23.3, “How to test your package”) and also check it for coding style (see -Section 17.23.2, “How to check the coding style”).

    17.1. Package directory

    First of all, create a directory under the package directory for +(see Section 18.24.3, “How to test your package”) and also check it for coding style (see +Section 18.24.2, “How to check the coding style”).

    18.1. Package directory

    First of all, create a directory under the package directory for your software, for example libfoo.

    Some packages have been grouped by topic in a sub-directory: x11r7, qt5 and gstreamer. If your package fits in one of these categories, then create your package directory in these. -New subdirectories are discouraged, however.

    17.2. Config files

    For the package to be displayed in the configuration tool, you need to +New subdirectories are discouraged, however.

    18.2. Config files

    For the package to be displayed in the configuration tool, you need to create a Config file in your package directory. There are two types: -Config.in and Config.in.host.

    17.2.1. Config.in file

    For packages used on the target, create a file named Config.in. This +Config.in and Config.in.host.

    18.2.1. Config.in file

    For packages used on the target, create a file named Config.in. This file will contain the option descriptions related to our libfoo software that will be used and displayed in the configuration tool. It should basically contain:

    config BR2_PACKAGE_LIBFOO
@@ -2421,7 +2519,7 @@ available at package/Config.in (or in a category subdirectory if you decided to
 put your package in one of the existing categories). The files
 included there are sorted alphabetically per category and are NOT
-supposed to contain anything but the bare name of the package.
    source "package/libfoo/Config.in"

    17.2.2. Config.in.host file

    Some packages also need to be built for the host system. There are two +supposed to contain anything but the bare name of the package.

    source "package/libfoo/Config.in"

    18.2.2. Config.in.host file

    Some packages also need to be built for the host system. There are two options here:

    • The host package is only required to satisfy build-time dependencies of one or more target packages. In this case, add @@ -2438,7 +2536,7 @@ The host package should be explicitly selectable by the user from http://foosoftware.org/foo/

      The same coding style and options as for the Config.in file are valid.

      Finally you have to add your new libfoo/Config.in.host to package/Config.in.host. The files included there are sorted alphabetically -and are NOT supposed to contain anything but the bare name of the package.

      source "package/foo/Config.in.host"

      The host package will then be available from the Host utilities menu.

    17.2.3. Choosing depends on or select

    The Config.in file of your package must also ensure that +and are NOT supposed to contain anything but the bare name of the package.

    source "package/foo/Config.in.host"

    The host package will then be available from the Host utilities menu.

    18.2.3. Choosing depends on or select

    The Config.in file of your package must also ensure that dependencies are enabled. Typically, Buildroot uses the following rules:

    • Use a select type of dependency for dependencies on @@ -2453,7 +2551,7 @@ Use a select type of dependency for dependencies on Use a depends on type of dependency when the user really needs to be aware of the dependency. Typically, Buildroot uses this type of dependency for dependencies on target architecture, MMU support and - toolchain options (see Section 17.2.4, “Dependencies on target and toolchain options”), + toolchain options (see Section 18.2.4, “Dependencies on target and toolchain options”), or for dependencies on "big" things, such as the X.org system. The depends on keyword expresses the dependency with a forward semantic. @@ -2516,8 +2614,8 @@ config BR2_PACKAGE_E preferred.

      Note that such dependencies will ensure that the dependency option is also enabled, but not necessarily built before your package. To do so, the dependency also needs to be expressed in the .mk file of the -package.

      Further formatting details: see the -coding style.

    17.2.4. Dependencies on target and toolchain options

    Many packages depend on certain options of the toolchain: the choice of +package.

    Further formatting details: see the +coding style.

    18.2.4. Dependencies on target and toolchain options

    Many packages depend on certain options of the toolchain: the choice of C library, C++ support, thread support, RPC support, wchar support, or dynamic library support. Some packages can only be built on certain target architectures, or if an MMU is available in the processor.

    These dependencies have to be expressed with the appropriate depends @@ -2654,14 +2752,14 @@ dynamic library Dependency symbol: !BR2_STATIC_LIBS

  • Comment string: dynamic library -

    • 17.2.5. Dependencies on a Linux kernel built by buildroot

    Some packages need a Linux kernel to be built by buildroot. These are +

    18.2.5. Dependencies on a Linux kernel built by buildroot

    Some packages need a Linux kernel to be built by buildroot. These are typically kernel modules or firmware. A comment should be added in the Config.in file to express this dependency, similar to dependencies on toolchain options. The general format is:

    foo needs a Linux kernel to be built

    If there is a dependency on both toolchain options and the Linux -kernel, use this format:

    foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built

    17.2.6. Dependencies on udev /dev management

    If a package needs udev /dev management, it should depend on symbol +kernel, use this format:

    foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built

    18.2.6. Dependencies on udev /dev management

    If a package needs udev /dev management, it should depend on symbol BR2_PACKAGE_HAS_UDEV, and the following comment should be added:

    foo needs udev /dev management

    If there is a dependency on both toolchain options and udev /dev -management, use this format:

    foo needs udev /dev management and a toolchain w/ featA, featB, featC

    17.2.7. Dependencies on features provided by virtual packages

    Some features can be provided by more than one package, such as the -openGL libraries.

    See Section 17.11, “Infrastructure for virtual packages” for more on the virtual packages.

    17.3. The .mk file

    Finally, here’s the hardest part. Create a file named libfoo.mk. It +management, use this format:

    foo needs udev /dev management and a toolchain w/ featA, featB, featC

    18.2.7. Dependencies on features provided by virtual packages

    Some features can be provided by more than one package, such as the +openGL libraries.

    See Section 18.11, “Infrastructure for virtual packages” for more on the virtual packages.

    18.3. The .mk file

    Finally, here’s the hardest part. Create a file named libfoo.mk. It describes how the package should be downloaded, configured, built, installed, etc.

    Depending on the package type, the .mk file must be written in a different way, using different infrastructures:

    • @@ -2673,35 +2771,35 @@ different way, using different infrastructures:

        tutorial and a - reference. + them through in a tutorial and a + reference.
      • Makefiles for autotools-based software (autoconf, automake, etc.): We provide a dedicated infrastructure for such packages, since autotools is a very common build system. This infrastructure must be used for new packages that rely on the autotools as their build - system. We cover them through a tutorial - and reference. + system. We cover them through a tutorial + and reference.
      • Makefiles for cmake-based software: We provide a dedicated infrastructure for such packages, as CMake is a more and more commonly used build system and has a standardized behaviour. This infrastructure must be used for new packages that rely on - CMake. We cover them through a tutorial - and reference. + CMake. We cover them through a tutorial + and reference.
      • Makefiles for Python modules: We have a dedicated infrastructure for Python modules that use either the distutils or the setuptools mechanism. We cover them through a - tutorial and a - reference. + tutorial and a + reference.
      • Makefiles for Lua modules: We have a dedicated infrastructure for Lua modules available through the LuaRocks web site. We cover them - through a tutorial and a - reference. -

      Further formatting details: see the writing -rules.

    17.4. The .hash file

    When possible, you must add a third file, named libfoo.hash, that + through a tutorial and a + reference. +

    Further formatting details: see the writing +rules.

    18.4. The .hash file

    When possible, you must add a third file, named libfoo.hash, that contains the hashes of the downloaded files for the libfoo package. The only reason for not adding a .hash file is when hash checking is not possible due to how the package is downloaded.

    When a package has a version selection choice, then the hash file may be @@ -2750,7 +2848,7 @@ this in a comment line above the hashes.

    Note. The hashe package version is bumped. The hashes are checked during the make legal-info target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory <packageversion> of that package -(see also Section 18.2, “How patches are applied”).

    The none hash type is reserved to those archives downloaded from a +(see also Section 19.2, “How patches are applied”).

    The none hash type is reserved to those archives downloaded from a repository, like a git clone, a subversion checkout…

    The example below defines a sha1 and a sha256 published by upstream for the main libfoo-1.2.3.tar.bz2 tarball, an md5 from upstream and a locally-computed sha256 hashes for a binary blob, a sha256 for a @@ -2787,10 +2885,10 @@ systems.

    Hashes should only be added in .hash guaranteed to be stable. For example, patches auto-generated by Github are not guaranteed to be stable, and therefore their hashes can change over time. Such patches should not be downloaded, and instead be added -locally to the package folder.

    If the .hash file is missing, then no check is done at all.

    17.5. Infrastructure for packages with specific build systems

    By packages with specific build systems we mean all the packages +locally to the package folder.

    If the .hash file is missing, then no check is done at all.

    18.5. Infrastructure for packages with specific build systems

    By packages with specific build systems we mean all the packages whose build system is not one of the standard ones, such as autotools or CMake. This typically includes packages whose build -system is based on hand-written Makefiles or shell scripts.

    17.5.1. generic-package tutorial

    01: ################################################################################
+system is based on hand-written Makefiles or shell scripts.
    18.5.1. generic-package tutorial
    01: ################################################################################
 02: #
 03: # libfoo
 04: #
@@ -2857,7 +2955,7 @@ flags.
 The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s)
 of the shell script(s) needing fixing. All these names are relative to
 $(STAGING_DIR)/usr/bin and if needed multiple names can be given.
    In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed
-from $(TARGET_DIR)/usr/bin, since they are not needed on the target.
    Example 17.1. Config script: divine package
    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.
    So its fixup would be:
    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 17.2. Config script: imagemagick package:
    Package imagemagick installs the following scripts:
+from $(TARGET_DIR)/usr/bin, since they are not needed on the target.
    Example 18.1. Config script: divine package
    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.
    So its fixup would be:
    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 18.2. Config script: imagemagick package:
    Package imagemagick installs the following scripts:
 $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config
    So it’s fixup would be:
    IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

    On line 14, we specify the list of dependencies this package relies
@@ -2879,7 +2977,7 @@ to run a daemon as non-root) (LIBFOO_USERS).
    
 (LIBFOO_DEVICES).
    On line 39..41, we define the permissions to set to specific files
 installed by this package (LIBFOO_PERMISSIONS).
    Finally, on line 43, we call the generic-package function, which
 generates, according to the variables defined previously, all the
-Makefile code necessary to make your package working.
    17.5.2. generic-package reference
    There are two variants of the generic target. The generic-package macro is
+Makefile code necessary to make your package working.
    18.5.2. generic-package reference
    There are two variants of the generic target. The generic-package macro is
 used for packages to be cross-compiled for the target. The
 host-generic-package macro is used for host packages, natively compiled
 for the host. It is possible to call both of them in a single .mk
@@ -2944,7 +3042,7 @@ because two builds can never be perfectly simultaneous, and because
   itself use a different mechanism: all files of the form
   *.patch present in the package directory inside
   Buildroot will be applied to the package after extraction (see
-  patching a package). Finally, patches listed in
+  patching a package). Finally, patches listed in
   the LIBFOO_PATCH variable are applied before the patches stored
   in the Buildroot package directory.
 
  • 
@@ -2956,7 +3054,7 @@ because two builds can never be perfectly simultaneous, and because
   and Bazaar are supported URL types for retrieving packages directly
   from source code management systems. There is a helper function to make
   it easier to download source tarballs from GitHub (refer to
-  Section 17.23.4, “How to add a package from GitHub” for details). A filesystem path may be used
+  Section 18.24.4, “How to add a package from GitHub” for details). A filesystem path may be used
   to specify either a tarball or a directory containing the package
   source code. See LIBFOO_SITE_METHOD below for more details on how
   retrieval works.
@@ -3050,7 +3148,7 @@ because two builds can never be perfectly simultaneous, and because
      source directory into the package’s build directory. Note that
      for local packages, no patches are applied. If you need to
      still patch the source code, use LIBFOO_POST_RSYNC_HOOKS, see
-     Section 17.21.1, “Using the POST_RSYNC hook”.
+     Section 18.22.1, “Using the POST_RSYNC hook”.
 
  • 
 LIBFOO_GIT_SUBMODULES can be set to YES to create an archive
   with the git submodules in the repository.  This is only available
@@ -3098,7 +3196,7 @@ because two builds can never be perfectly simultaneous, and because
   really want to use.
 
  • 
 LIBFOO_PROVIDES lists all the virtual packages libfoo is an
-  implementation of. See Section 17.11, “Infrastructure for virtual packages”.
+  implementation of. See Section 18.11, “Infrastructure for virtual packages”.
 
  • 
 LIBFOO_INSTALL_STAGING can be set to YES or NO (default). If
   set to YES, then the commands in the LIBFOO_INSTALL_STAGING_CMDS
@@ -3125,17 +3223,17 @@ because two builds can never be perfectly simultaneous, and because
 LIBFOO_DEVICES lists the device files to be created by Buildroot
   when using the static device table. The syntax to use is the
   makedevs one. You can find some documentation for this syntax in the
-  Chapter 24, Makedev syntax documentation. This variable is optional.
+  Chapter 25, Makedev syntax documentation. This variable is optional.
 
  • 
 LIBFOO_PERMISSIONS lists the changes of permissions to be done at
   the end of the build process. The syntax is once again the makedevs one.
-  You can find some documentation for this syntax in the Chapter 24, Makedev syntax documentation.
+  You can find some documentation for this syntax in the Chapter 25, Makedev syntax documentation.
   This variable is optional.
 
  • 
 LIBFOO_USERS lists the users to create for this package, if it installs
   a program you want to run as a specific user (e.g. as a daemon, or as a
   cron-job). The syntax is similar in spirit to the makedevs one, and is
-  described in the Chapter 25, Makeusers syntax documentation. This variable is optional.
+  described in the Chapter 26, Makeusers syntax documentation. This variable is optional.
 
  • 
 LIBFOO_LICENSE defines the license (or licenses) under which the package
   is released.
@@ -3166,7 +3264,7 @@ If the package is dual licensed, then separate licenses with the
 LIBFOO_LICENSE_FILES is a space-separated list of files in the package
   tarball that contain the license(s) under which the package is released.
   make legal-info copies all of these files in the legal-info directory.
-  See Chapter 12, Legal notice and licensing for more information.
+  See Chapter 13, Legal notice and licensing for more information.
   This variable is optional. If it is not defined, a warning will be produced
   to let you know, and not saved will appear in the license files field
   of the manifest file for this package.
@@ -3284,6 +3382,14 @@ different steps of the build process.
      Do not use
   this variable, unless you really know that you need to print help.
+
    • 
+LIBFOO_LINUX_CONFIG_FIXUPS lists the Linux kernel configuration
+  options that are needed to build and use this package, and without
+  which the package is fundamentally broken. This shall be a set of
+  calls to one of the kconfig tweaking option: KCONFIG_ENABLE_OPT,
+  KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT.
+  This is seldom used, as package usually have no strict requirements on
+  the kernel options.
 
    The preferred way to define these variables is:
    define LIBFOO_CONFIGURE_CMDS
         action 1
         action 2
@@ -3314,7 +3420,7 @@ Of course the $(HOST_DIR), $(
   view: it should simply use HOST_DIR, STAGING_DIR and
   TARGET_DIR. See Section 8.11, “Top-level parallel build” for more details
   about per-package directory support.
-
    • Finally, you can also use hooks. See Section 17.21, “Hooks available in the various build steps” for more information.

    17.6. Infrastructure for autotools-based packages

    17.6.1. autotools-package tutorial

    First, let’s see how to write a .mk file for an autotools-based +

    Finally, you can also use hooks. See Section 18.22, “Hooks available in the various build steps” for more information.

    18.6. Infrastructure for autotools-based packages

    18.6.1. autotools-package tutorial

    First, let’s see how to write a .mk file for an autotools-based package, with an example :

    01: ################################################################################
 02: #
 03: # libfoo
@@ -3350,7 +3456,7 @@ will be passed to the ./configure script before con
 and building the package.
    On line 13, we declare our dependencies, so that they are built
 before the build process of our package starts.
    Finally, on line line 15, we invoke the autotools-package
 macro that generates all the Makefile rules that actually allows the
-package to be built.

    17.6.2. autotools-package reference

    The main macro of the autotools package infrastructure is +package to be built.

    18.6.2. autotools-package reference

    The main macro of the autotools package infrastructure is autotools-package. It is similar to the generic-package macro. The ability to have target and host packages is also available, with the host-autotools-package macro.

    Just like the generic infrastructure, the autotools infrastructure @@ -3439,7 +3545,7 @@ and install the packages are already defined, and they generally work well for most autotools-based packages. However, when required, it is still possible to customize what is done in any particular step:

    17.7. Infrastructure for CMake-based packages

    17.7.1. cmake-package tutorial

    First, let’s see how to write a .mk file for a CMake-based package, +

    18.7. Infrastructure for CMake-based packages

    18.7.1. cmake-package tutorial

    First, let’s see how to write a .mk file for a CMake-based package, with an example :

    01: ################################################################################
 02: #
 03: # libfoo
@@ -3482,7 +3588,7 @@ installed in this location using the make install c
 configuring the package.
    On line 13, we declare our dependencies, so that they are built
 before the build process of our package starts.
    Finally, on line line 15, we invoke the cmake-package
 macro that generates all the Makefile rules that actually allows the
-package to be built.

    17.7.2. cmake-package reference

    The main macro of the CMake package infrastructure is +package to be built.

    18.7.2. cmake-package reference

    The main macro of the CMake package infrastructure is cmake-package. It is similar to the generic-package macro. The ability to have target and host packages is also available, with the host-cmake-package macro.

    Just like the generic infrastructure, the CMake infrastructure works @@ -3555,16 +3661,16 @@ install the packages are already defined, and they generally work well for most CMake-based packages. However, when required, it is still possible to customize what is done in any particular step:

    17.8. Infrastructure for Python packages

    This infrastructure applies to Python packages that use the standard +

    18.8. Infrastructure for Python packages

    This infrastructure applies to Python packages that use the standard Python setuptools mechanism as their build system, generally -recognizable by the usage of a setup.py script.

    17.8.1. python-package tutorial

    First, let’s see how to write a .mk file for a Python package, +recognizable by the usage of a setup.py script.

    18.8.1. python-package tutorial

    First, let’s see how to write a .mk file for a Python package, with an example :

    01: ################################################################################
 02: #
 03: # python-foo
@@ -3590,7 +3696,7 @@ before the build process of our package starts.
    On line 14, we declare the
 this case the distutils Python build system is used. The two
 supported ones are distutils and setuptools.
    Finally, on line 16, we invoke the python-package macro that
 generates all the Makefile rules that actually allow the package to be
-built.

    17.8.2. python-package reference

    As a policy, packages that merely provide Python modules should all be +built.

    18.8.2. python-package reference

    As a policy, packages that merely provide Python modules should all be named python-<something> in Buildroot. Other packages that use the Python build system, but are not Python modules, can freely choose their name (existing examples in Buildroot are scons and @@ -3606,7 +3712,7 @@ also possible to create Python host packages with the host-python-package macro.

    Just like the generic infrastructure, the Python infrastructure works by defining a number of variables before calling the python-package or host-python-package macros.

    All the package metadata information variables that exist in the -generic package infrastructure also +generic package infrastructure also exist in the Python infrastructure: PYTHON_FOO_VERSION, PYTHON_FOO_SOURCE, PYTHON_FOO_PATCH, PYTHON_FOO_SITE, PYTHON_FOO_SUBDIR, PYTHON_FOO_DEPENDENCIES, PYTHON_FOO_LICENSE, @@ -3674,14 +3780,14 @@ install the packages are already defined, and they generally work well for most Python-based packages. However, when required, it is still possible to customize what is done in any particular step:

    17.8.3. Generating a python-package from a PyPI repository

    If the Python package for which you would like to create a Buildroot +

    18.8.3. Generating a python-package from a PyPI repository

    If the Python package for which you would like to create a Buildroot package is available on PyPI, you may want to use the scanpypi tool located in utils/ to automate the process.

    You can find the list of existing PyPI packages here.

    scanpypi requires Python’s setuptools package to be installed on @@ -3694,7 +3800,7 @@ such as BR2_PACKAGE_PYTHON_ZLIB). Also, please take note that the license and license files are guessed and must be checked. You also need to manually add the package to the package/Config.in file.

    If your Buildroot package is not in the official Buildroot tree but in a br2-external tree, use the -o flag as follows:

    utils/scanpypi foo bar -o other_package_dir

    This will generate packages python-foo and python-bar in the -other_package_directory instead of package.

    Option -h will list the available options:

    utils/scanpypi -h

    17.8.4. python-package CFFI backend

    C Foreign Function Interface for Python (CFFI) provides a convenient +other_package_directory instead of package.

    Option -h will list the available options:

    utils/scanpypi -h

    18.8.4. python-package CFFI backend

    C Foreign Function Interface for Python (CFFI) provides a convenient and reliable way to call compiled C code from Python using interface declarations written in C. Python packages relying on this backend can be identified by the appearance of a cffi dependency in the @@ -3718,7 +3824,7 @@ cross-compile the C wrapper. This is achieved by adding PYTHON_FOO_DEPENDENCIES = host-python-cffi -$(eval $(python-package))

    17.9. Infrastructure for LuaRocks-based packages

    17.9.1. luarocks-package tutorial

    First, let’s see how to write a .mk file for a LuaRocks-based package, +$(eval $(python-package))

    18.9. Infrastructure for LuaRocks-based packages

    18.9.1. luarocks-package tutorial

    First, let’s see how to write a .mk file for a LuaRocks-based package, with an example :

    01: ################################################################################
 02: #
 03: # lua-foo
@@ -3751,16 +3857,14 @@ that will automatically generate a Buildroot package. The result must
 still be manually inspected and possibly modified.
    • 
 The package/Config.in file has to be updated manually to include the
   generated Config.in files.
-

    17.9.2. luarocks-package reference

    LuaRocks is a deployment and management system for Lua modules, and supports +

    18.9.2. luarocks-package reference

    LuaRocks is a deployment and management system for Lua modules, and supports various build.type: builtin, make and cmake. In the context of Buildroot, the luarocks-package infrastructure only supports the builtin mode. LuaRocks packages that use the make or cmake build mechanisms should instead be packaged using the generic-package and cmake-package infrastructures in Buildroot, respectively.

    The main macro of the LuaRocks package infrastructure is luarocks-package: like generic-package it works by defining a number of variables providing -metadata information about the package, and then calling luarocks-package. It -is worth mentioning that building LuaRocks packages for the host is not -supported, so the macro host-luarocks-package is not implemented.

    Just like the generic infrastructure, the LuaRocks infrastructure works +metadata information about the package, and then calling luarocks-package.

    Just like the generic infrastructure, the LuaRocks infrastructure works by defining a number of variables before calling the luarocks-package macro.

    First, all the package metadata information variables that exist in the generic infrastructure also exist in the LuaRocks infrastructure: @@ -3785,7 +3889,7 @@ also defined. They can be overridden in specific cases.

    LUA_FOO_BUILD_OPTS contains additional build options for the luarocks build call. -

    17.10. Infrastructure for Perl/CPAN packages

    17.10.1. perl-package tutorial

    First, let’s see how to write a .mk file for a Perl/CPAN package, +

    18.10. Infrastructure for Perl/CPAN packages

    18.10.1. perl-package tutorial

    First, let’s see how to write a .mk file for a Perl/CPAN package, with an example :

    01: ################################################################################
 02: #
 03: # perl-foo-bar
@@ -3823,7 +3927,7 @@ If the perl module links with a shared library that is provided by
 The package/Config.in file has to be updated manually to include the
   generated Config.in files. As a hint, the scancpan script prints out
   the required source "…" statements, sorted alphabetically.
-

    17.10.2. perl-package reference

    As a policy, packages that provide Perl/CPAN modules should all be +

    18.10.2. perl-package reference

    As a policy, packages that provide Perl/CPAN modules should all be named perl-<something> in Buildroot.

    This infrastructure handles various Perl build systems : ExtUtils-MakeMaker (EUMM), Module-Build (MB) and Module-Build-Tiny. Build.PL is preferred by default when a package provides a Makefile.PL @@ -3869,28 +3973,28 @@ cases, typical packages will therefore only use a few of them.

    HOST_PERL_FOO_INSTALL_OPTS, to specify additional options to pass to make pure_install or perl Build install in the install step. By default, empty. -

    17.11. Infrastructure for virtual packages

    In Buildroot, a virtual package is a package whose functionalities are +

    18.11. Infrastructure for virtual packages

    In Buildroot, a virtual package is a package whose functionalities are provided by one or more packages, referred to as providers. The virtual package management is an extensible mechanism allowing the user to choose the provider used in the rootfs.

    For example, OpenGL ES is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the Allwinner Tech Sunxi and the Texas Instruments OMAP35xx platforms. So libgles will be a virtual -package and sunxi-mali and ti-gfx will be the providers.

    17.11.1. virtual-package tutorial

    In the following example, we will explain how to add a new virtual package -(something-virtual) and a provider for it (some-provider).

    First, let’s create the virtual package.

    17.11.2. Virtual package’s Config.in file

    The Config.in file of virtual package something-virtual should contain:

    01: config BR2_PACKAGE_HAS_SOMETHING_VIRTUAL
+package and sunxi-mali and ti-gfx will be the providers.
    18.11.1. virtual-package tutorial
    In the following example, we will explain how to add a new virtual package
+(something-virtual) and a provider for it (some-provider).
    First, let’s create the virtual package.
    18.11.2. Virtual package’s Config.in file
    The Config.in file of virtual package something-virtual should contain:
    01: config BR2_PACKAGE_HAS_SOMETHING_VIRTUAL
 02:     bool
 03:
 04: config BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL
 05:     depends on BR2_PACKAGE_HAS_SOMETHING_VIRTUAL
 06:     string
    In this file, we declare two options, BR2_PACKAGE_HAS_SOMETHING_VIRTUAL and
 BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL, whose values will be used by the
-providers.
    17.11.3. Virtual package’s .mk file
    The .mk for the virtual package should just evaluate the virtual-package macro:
    01: ################################################################################
+providers.
    18.11.3. Virtual package’s .mk file
    The .mk for the virtual package should just evaluate the virtual-package macro:
    01: ################################################################################
 02: #
 03: # something-virtual
 04: #
 05: ################################################################################
 06:
 07: $(eval $(virtual-package))
    The ability to have target and host packages is also available, with the
-host-virtual-package macro.
    17.11.4. Provider’s Config.in file
    When adding a package as a provider, only the Config.in file requires some
+host-virtual-package macro.
    18.11.4. Provider’s Config.in file
    When adding a package as a provider, only the Config.in file requires some
 modifications.
    The Config.in file of the package some-provider, which provides the
 functionalities of something-virtual, should contain:
    01: config BR2_PACKAGE_SOME_PROVIDER
 02:     bool "some-provider"
@@ -3905,16 +4009,16 @@ functionalities of something-virtual, sho
 11:     default "some-provider"
 12: endif
    On line 3, we select BR2_PACKAGE_HAS_SOMETHING_VIRTUAL, and on line 11, we
 set the value of BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL to the name of the
-provider, but only if it is selected.
    17.11.5. Provider’s .mk file
    The .mk file should also declare an additional variable
+provider, but only if it is selected.
    18.11.5. Provider’s .mk file
    The .mk file should also declare an additional variable
 SOME_PROVIDER_PROVIDES to contain the names of all the virtual
 packages it is an implementation of:
    01: SOME_PROVIDER_PROVIDES = something-virtual
    Of course, do not forget to add the proper build and runtime dependencies for
-this package!
    17.11.6. Notes on depending on a virtual package
    When adding a package that requires a certain FEATURE provided by a virtual
+this package!
    18.11.6. Notes on depending on a virtual package
    When adding a package that requires a certain FEATURE provided by a virtual
 package, you have to use depends on BR2_PACKAGE_HAS_FEATURE, like so:
    config BR2_PACKAGE_HAS_FEATURE
     bool
 
 config BR2_PACKAGE_FOO
     bool "foo"
-    depends on BR2_PACKAGE_HAS_FEATURE
    17.11.7. Notes on depending on a specific provider
    If your package really requires a specific provider, then you’ll have to
+    depends on BR2_PACKAGE_HAS_FEATURE

    18.11.7. Notes on depending on a specific provider

    If your package really requires a specific provider, then you’ll have to make your package depends on this provider; you can not select a provider.

    Let’s take an example with two providers for a FEATURE:

    config BR2_PACKAGE_HAS_FEATURE
     bool
@@ -3931,7 +4035,7 @@ be able to select BR2_PACKAGE_BAR in the menuconfig
 a configuration inconsistency, whereby two providers of the same FEATURE
 would be enabled at once, one explicitly set by the user, the other
 implicitly by your select.
    Instead, you have to use depends on BR2_PACKAGE_FOO, which avoids any
-implicit configuration inconsistency.

    17.12. Infrastructure for packages using kconfig for configuration files

    A popular way for a software package to handle user-specified +implicit configuration inconsistency.

    18.12. Infrastructure for packages using kconfig for configuration files

    A popular way for a software package to handle user-specified configuration is kconfig. Among others, it is used by the Linux kernel, Busybox, and Buildroot itself. The presence of a .config file and a menuconfig target are two well-known symptoms of kconfig being @@ -3942,7 +4046,7 @@ Buildroot, and to handle the copying back and forth of the configuration file in a correct way.

    The kconfig-package infrastructure is based on the generic-package infrastructure. All variables supported by generic-package are available in kconfig-package as well. See -Section 17.5.2, “generic-package reference” for more details.

    In order to use the kconfig-package infrastructure for a Buildroot +Section 18.5.2, “generic-package reference” for more details.

    In order to use the kconfig-package infrastructure for a Buildroot package, the minimally required lines in the .mk file, in addition to the variables required by the generic-package infrastructure, are:

    FOO_KCONFIG_FILE = reference-to-source-configuration-file
 
@@ -4000,7 +4104,7 @@ be set to suit the needs of the package under consideration:
    FOO_KCONFIG_DEPENDENCIES: the list of packages (most probably, host
   packages) that need to be built before this package’s kconfig is
   interpreted. Seldom used. By default, empty.
-

    17.13. Infrastructure for rebar-based packages

    17.13.1. rebar-package tutorial

    First, let’s see how to write a .mk file for a rebar-based package, +

    18.13. Infrastructure for rebar-based packages

    18.13.1. rebar-package tutorial

    First, let’s see how to write a .mk file for a rebar-based package, with an example :

    01: ################################################################################
 02: #
 03: # erlang-foobar
@@ -4017,7 +4121,7 @@ recommended) and the location of the tarball on the Web. Buildroot
 will automatically download the tarball from this location.
    On line 10, we declare our dependencies, so that they are built
 before the build process of our package starts.
    Finally, on line 12, we invoke the rebar-package macro that
 generates all the Makefile rules that actually allows the package to
-be built.

    17.13.2. rebar-package reference

    The main macro of the rebar package infrastructure is +be built.

    18.13.2. rebar-package reference

    The main macro of the rebar package infrastructure is rebar-package. It is similar to the generic-package macro. The ability to have host packages is also available, with the host-rebar-package macro.

    Just like the generic infrastructure, the rebar infrastructure works @@ -4058,7 +4162,7 @@ and install the packages are already defined, and they generally work well for most rebar-based packages. However, when required, it is still possible to customize what is done in any particular step:

    17.14. Infrastructure for Waf-based packages

    17.14.1. waf-package tutorial

    First, let’s see how to write a .mk file for a Waf-based package, with +

    18.14. Infrastructure for Waf-based packages

    18.14.1. waf-package tutorial

    First, let’s see how to write a .mk file for a Waf-based package, with an example :

    01: ################################################################################
 02: #
 03: # libfoo
@@ -4083,7 +4187,7 @@ an example :
    01: ########################################
 recommended) and the location of the tarball on the Web. Buildroot
 will automatically download the tarball from this location.
    On line 10, we tell Buildroot what options to enable for libfoo.
    On line 11, we tell Buildroot the dependencies of libfoo.
    Finally, on line line 13, we invoke the waf-package
 macro that generates all the Makefile rules that actually allows the
-package to be built.

    17.14.2. waf-package reference

    The main macro of the Waf package infrastructure is waf-package. +package to be built.

    18.14.2. waf-package reference

    The main macro of the Waf package infrastructure is waf-package. It is similar to the generic-package macro.

    Just like the generic infrastructure, the Waf infrastructure works by defining a number of variables before calling the waf-package macro.

    First, all the package metadata information variables that exist in @@ -4121,7 +4225,7 @@ also be defined.

      LIBFOO_INSTALL_TARGET_OPTS, to specify additional options to pass to the waf script during the target installation step. By default, empty. -

    17.15. Infrastructure for Meson-based packages

    17.15.1. meson-package tutorial

    Meson is an open source build system meant to be both +

    18.15. Infrastructure for Meson-based packages

    18.15.1. meson-package tutorial

    Meson is an open source build system meant to be both extremely fast, and, even more importantly, as user friendly as possible. It uses Ninja as a companion tool to perform the actual build operations.

    Let’s see how to write a .mk file for a Meson-based package, with an example:

    01: ################################################################################
@@ -4159,7 +4263,7 @@ added to FOO_DEPENDENCIES. Note that the support fo
 disabled at line 20, if the package is not selected.
    To sum it up, to add a new meson-based package, the Makefile example can be
 copied verbatim then edited to replace all occurences of FOO with the
 uppercase name of the new package and update the values of the standard
-variables.

    17.15.2. meson-package reference

    The main macro of the Meson package infrastructure is meson-package. It is +variables.

    18.15.2. meson-package reference

    The main macro of the Meson package infrastructure is meson-package. It is similar to the generic-package macro. The ability to have target and host packages is also available, with the host-meson-package macro.

    Just like the generic infrastructure, the Meson infrastructure works by defining a number of variables before calling the meson-package macro.

    First, all the package metadata information variables that exist in the generic @@ -4199,23 +4303,32 @@ will therefore only use a few of them.

      c, cpp, ar, strip, and pkgconfig.
    • +FOO_MESON_EXTRA_PROPERTIES, to specify a space-separated list of + properties to add to the [properties] section of the meson + cross-compilation.conf configuration file. The format is + property-name=<value> with no space around the = sign, and with + single quotes around string values. By default, empty. Note that + Buildroot already sets values for needs_exe_wrapper, c_args, + c_link_args, cpp_args, cpp_link_args, sys_root, and + pkg_config_libdir. +
    • FOO_NINJA_ENV, to specify additional environment variables to pass to ninja, meson companion tool in charge of the build operations. By default, empty.
    • FOO_NINJA_OPTS, to specify a space-separated list of targets to build. By default, empty, to build the default target(s). -

    17.16. Integration of Cargo-based packages

    Cargo is the package manager for the Rust programming language. It allows the +

    18.16. Integration of Cargo-based packages

    Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and manages their dependencies, to ensure repeatable builds. Cargo packages are -called "crates".

    17.16.1. Cargo-based package’s Config.in file

    The Config.in file of Cargo-based package foo should contain:

    01: config BR2_PACKAGE_FOO
+called "crates".
    18.16.1. Cargo-based package’s Config.in file
    The Config.in file of Cargo-based package foo should contain:
    01: config BR2_PACKAGE_FOO
 02:     bool "foo"
 03:     depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
-04:     select BR2_PACKAGE_HOST_CARGO
+04:     select BR2_PACKAGE_HOST_RUSTC
 05:     help
 06:       This is a comment that explains what foo is.
 07:
-08:       http://foosoftware.org/foo/
    17.16.2. Cargo-based package’s .mk file
    Buildroot does not (yet) provide a dedicated package infrastructure for
+08:       http://foosoftware.org/foo/

    18.16.2. Cargo-based package’s .mk file

    Buildroot does not (yet) provide a dedicated package infrastructure for Cargo-based packages. So, we will explain how to write a .mk file for such a package. Let’s start with an example:

    01: ################################################################################
 02: #
@@ -4229,7 +4342,7 @@ package. Let’s start with an example:
    01: #############
 10: FOO_LICENSE = GPL-3.0+
 11: FOO_LICENSE_FILES = COPYING
 12:
-13: FOO_DEPENDENCIES = host-cargo
+13: FOO_DEPENDENCIES = host-rustc
 14:
 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
 16:
@@ -4252,7 +4365,7 @@ package. Let’s start with an example:
    01: #############
 33:
 34: $(eval $(generic-package))
    The Makefile starts with the definition of the standard variables for package
 declaration (lines 7 to 11).
    As seen in line 34, it is based on the
-generic-package infrastructure. So, it defines
+generic-package infrastructure. So, it defines
 the variables required by this particular infrastructure, where Cargo is
 invoked:
    • 
 FOO_BUILD_CMDS: Cargo is invoked to perform the build. The options required
@@ -4265,7 +4378,7 @@ invoked:
        host-cargo.
        To sum it up, to add a new Cargo-based package, the Makefile example can be
 copied verbatim then edited to replace all occurences of FOO with the
 uppercase name of the new package and update the values of the standard
-variables.
      17.16.3. About Dependencies Management
      A crate can depend on other libraries from crates.io or git repositories, listed
+variables.
      18.16.3. About Dependencies Management
      A crate can depend on other libraries from crates.io or git repositories, listed
 in its Cargo.toml file. Before starting a build, Cargo usually downloads
 automatically them. This step can also be performed independently, via the
 cargo fetch command.
      Cargo maintains a local cache of the registry index and of git checkouts of the
@@ -4274,8 +4387,8 @@ Makefile example at line 15, this environment variable is set to
 $(HOST_DIR)/share/cargo.
      This dependency download mechanism is not convenient when performing an offline
 build, as Cargo will fail to fetch the dependencies. In that case, it is advised
 to generate a tarball of the dependencies using the cargo vendor and add it to
-FOO_EXTRA_DOWNLOADS.
    17.17. Infrastructure for Go packages
    This infrastructure applies to Go packages that use the standard
-build system and use bundled dependencies.
    17.17.1. golang-package tutorial
    First, let’s see how to write a .mk file for a go package,
+FOO_EXTRA_DOWNLOADS.
    18.17. Infrastructure for Go packages
    This infrastructure applies to Go packages that use the standard
+build system and use bundled dependencies.
    18.17.1. golang-package tutorial
    First, let’s see how to write a .mk file for a go package,
 with an example :
    01: ################################################################################
 02: #
 03: # foo
@@ -4291,7 +4404,7 @@ with an example :
    01: ###################################
 fetched from Github, since a large number of Go packages are hosted on
 Github.
    On line 9 and 10, we give licensing details about the package.
    Finally, on line 12, we invoke the golang-package macro that
 generates all the Makefile rules that actually allow the package to be
-built.
    17.17.2. golang-package reference
    In their Config.in file, packages using the golang-package
+built.
    18.17.2. golang-package reference
    In their Config.in file, packages using the golang-package
 infrastructure should depend on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 because Buildroot will automatically add a dependency on host-go
 to such packages.
@@ -4303,7 +4416,7 @@ ability to build host packages is also available, with the
 Host packages built by host-golang-package macro should depend on
 BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS.
    Just like the generic infrastructure, the Go infrastructure works
 by defining a number of variables before calling the golang-package.
    All the package metadata information variables that exist in the
-generic package infrastructure also
+generic package infrastructure also
 exist in the Go infrastructure: FOO_VERSION, FOO_SOURCE,
 FOO_PATCH, FOO_SITE, FOO_SUBDIR, FOO_DEPENDENCIES,
 FOO_LICENSE, FOO_LICENSE_FILES, FOO_INSTALL_STAGING, etc.
    Note that it is not necessary to add host-go in the
@@ -4312,15 +4425,13 @@ is automatically added as needed by the Go package infrastructure.
    A few a
 optionally be defined, depending on the package’s needs. Many of them
 are only useful in very specific cases, typical packages will
 therefore only use a few of them, or none.
    • 
-If your package need a custom GOPATH to be compiled in, you can
-  use the FOO_WORKSPACE variable. The GOPATH being used will be
-  <package-srcdir>/<FOO_WORKSPACE>. If FOO_WORKSPACE is not
-  specified, it defaults to _gopath.
-
    • 
-FOO_SRC_SUBDIR is the sub-directory where your source will be
-  compiled relatively to the GOPATH. An example value is
-  github.com/bar/foo. If FOO_SRC_SUBDIR is not specified, it
-  defaults to a value infered from the FOO_SITE variable.
+The package must specify its Go module name in the FOO_GOMOD
+  variable. If not specified, it defaults to
+  URL-domain/1st-part-of-URL/2nd-part-of-URL, e.g FOO_GOMOD will
+  take the value github.com/bar/foo for a package that specifies
+  FOO_SITE = $(call github,bar,foo,$(FOO_VERSION)). The Go package
+  infrastructure will automatically generate a minimal go.mod file
+  in the package source tree if it doesn’t exist.
 
    • 
 FOO_LDFLAGS and FOO_TAGS can be used to pass respectively the
   LDFLAGS or the TAGS to the go build command.
@@ -4349,17 +4460,62 @@ install the packages are already defined, and they generally work well
 for most Go-based packages. However, when required, it is still
 possible to customize what is done in any particular step:
    17.18. Infrastructure for packages building kernel modules
    Buildroot offers a helper infrastructure to make it easy to write packages that
+

    18.18. Infrastructure for QMake-based packages

    18.18.1. qmake-package tutorial

    First, let’s see how to write a .mk file for a QMake-based package, with +an example :

    01: ################################################################################
+02: #
+03: # libfoo
+04: #
+05: ################################################################################
+06:
+07: LIBFOO_VERSION = 1.0
+08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+09: LIBFOO_SITE = http://www.foosoftware.org/download
+10: LIBFOO_CONF_OPTS = QT_CONFIG+=bar QT_CONFIG-=baz
+11: LIBFOO_DEPENDENCIES = bar
+12:
+13: $(eval $(qmake-package))

    On line 7, we declare the version of the package.

    On line 8 and 9, we declare the name of the tarball (xz-ed tarball +recommended) and the location of the tarball on the Web. Buildroot +will automatically download the tarball from this location.

    On line 10, we tell Buildroot what options to enable for libfoo.

    On line 11, we tell Buildroot the dependencies of libfoo.

    Finally, on line line 13, we invoke the qmake-package +macro that generates all the Makefile rules that actually allows the +package to be built.

    18.18.2. qmake-package reference

    The main macro of the QMake package infrastructure is qmake-package. +It is similar to the generic-package macro.

    Just like the generic infrastructure, the QMake infrastructure works +by defining a number of variables before calling the qmake-package +macro.

    First, all the package metadata information variables that exist in +the generic infrastructure also exist in the QMake infrastructure: +LIBFOO_VERSION, LIBFOO_SOURCE, LIBFOO_PATCH, LIBFOO_SITE, +LIBFOO_SUBDIR, LIBFOO_DEPENDENCIES, LIBFOO_INSTALL_STAGING, +LIBFOO_INSTALL_TARGET.

    An additional variable, specific to the QMake infrastructure, can +also be defined.

    • +LIBFOO_CONF_ENV, to specify additional environment variables to + pass to the qmake script for the configuration step. By default, empty. +
    • +LIBFOO_CONF_OPTS, to specify additional options to pass to the + qmake script for the configuration step. By default, empty. +
    • +LIBFOO_MAKE_ENV, to specify additional environment variables to the + make command during the build and install steps. By default, empty. +
    • +LIBFOO_MAKE_OPTS, to specify additional targets to pass to the + make command during the build step. By default, empty. +
    • +LIBFOO_INSTALL_STAGING_OPTS, to specify additional targets to pass + to the make command during the staging installation step. By default, + install. +
    • +LIBFOO_INSTALL_TARGET_OPTS, to specify additional targets to pass + to the make command during the target installation step. By default, + install. +

    18.19. Infrastructure for packages building kernel modules

    Buildroot offers a helper infrastructure to make it easy to write packages that build and install Linux kernel modules. Some packages only contain a kernel module, other packages contain programs and libraries in addition to kernel -modules. Buildroot’s helper infrastructure supports either case.

    17.18.1. kernel-module tutorial

    Let’s start with an example on how to prepare a simple package that only +modules. Buildroot’s helper infrastructure supports either case.

    18.19.1. kernel-module tutorial

    Let’s start with an example on how to prepare a simple package that only builds a kernel module, and no other component:

    01: ################################################################################
 02: #
 03: # foo
@@ -4377,7 +4533,7 @@ builds a kernel module, and no other component:
    01: #####
 remote URI where to find the package source, licensing information.
    On line 13, we invoke the kernel-module helper infrastructure, that
 generates all the appropriate Makefile rules and variables to build
 that kernel module.
    Finally, on line 14, we invoke the
-generic-package infrastructure.
    The dependency on linux is automatically added, so it is not needed to
+generic-package infrastructure.
    The dependency on linux is automatically added, so it is not needed to
 specify it in FOO_DEPENDENCIES.
    What you may have noticed is that, unlike other package infrastructures,
 we explicitly invoke a second infrastructure. This allows a package to
 build a kernel module, but also, if needed, use any one of other package
@@ -4411,7 +4567,7 @@ not sufficient; another package infrastructure must
 the kernel module located in sub-directory driver/base and, if libbar
 is enabled, the kernel module located in sub-directory driver/bar, and
 defines the variable KVERSION to be passed to the Linux buildsystem
-when building the module(s).

    17.18.2. kernel-module reference

    The main macro for the kernel module infrastructure is kernel-module. +when building the module(s).

    18.19.2. kernel-module reference

    The main macro for the kernel module infrastructure is kernel-module. Unlike other package infrastructures, it is not stand-alone, and requires any of the other *-package macros be called after it.

    The kernel-module macro defines post-build and post-target-install hooks to build the kernel modules. If the package’s .mk needs access @@ -4447,7 +4603,7 @@ configure the build of the kernel module:

    • KERNEL_ARCH contains the name of the current architecture, like arm, mips… -

    17.19. Infrastructure for asciidoc documents

    The Buildroot manual, which you are currently reading, is entirely written +

    18.20. Infrastructure for asciidoc documents

    The Buildroot manual, which you are currently reading, is entirely written using the AsciiDoc mark-up syntax. The manual is then rendered to many formats:

    • html @@ -4464,7 +4620,7 @@ is, as for packages, an infrastructure for rendering documents using the AsciiDoc syntax.

      Also as for packages, the AsciiDoc infrastructure is available from a br2-external tree. This allows documentation for a br2-external tree to match the Buildroot documentation, as it will be -rendered to the same formats and use the same layout and theme.

      17.19.1. asciidoc-document tutorial

      Whereas package infrastructures are suffixed with -package, the document +rendered to the same formats and use the same layout and theme.

      18.20.1. asciidoc-document tutorial

      Whereas package infrastructures are suffixed with -package, the document infrastructures are suffixed with -document. So, the AsciiDoc infrastructure is named asciidoc-document.

      Here is an example to render a simple AsciiDoc document.

      01: ################################################################################
 02: #
@@ -4478,7 +4634,7 @@ Currently, it is expected that the document’s sources are only local;
 Buildroot will not attempt to download anything to render a document.
 Thus, you must indicate where the sources are. Usually, the string
 above is sufficient for a document with no sub-directory structure.
      On line 8, we call the asciidoc-document function, which generates all
-the Makefile code necessary to render the document.

      17.19.2. asciidoc-document reference

      The list of variables that can be set in a .mk file to give metadata +the Makefile code necessary to render the document.

      18.20.2. asciidoc-document reference

      The list of variables that can be set in a .mk file to give metadata information is (assuming the document name is foo) :

      • FOO_SOURCES, mandatory, defines the source files for the document.
      • @@ -4488,7 +4644,7 @@ information is (assuming the document name is foo)
      • FOO_DEPENDENCIES, optional, the list of packages (most probably, host-packages) that must be built before building this document. -

      There are also additional hooks (see Section 17.21, “Hooks available in the various build steps” for general information +

    There are also additional hooks (see Section 18.22, “Hooks available in the various build steps” for general information on hooks), that a document may set to define extra actions to be done at various steps:

    • FOO_POST_RSYNC_HOOKS to run additional commands after the sources @@ -4535,8 +4691,8 @@ various steps:

        17.20. Infrastructure specific to the Linux kernel package

        The Linux kernel package can use some specific infrastructures based on package -hooks for building Linux kernel tools or/and building Linux kernel extensions.

        17.20.1. linux-kernel-tools

        Buildroot offers a helper infrastructure to build some userspace tools +31: $(eval $(call asciidoc-document))

      18.21. Infrastructure specific to the Linux kernel package

      The Linux kernel package can use some specific infrastructures based on package +hooks for building Linux kernel tools or/and building Linux kernel extensions.

      18.21.1. linux-kernel-tools

      Buildroot offers a helper infrastructure to build some userspace tools for the target available within the Linux kernel sources. Since their source code is part of the kernel source code, a special package, linux-tools, exists and re-uses the sources of the Linux kernel that @@ -4583,11 +4739,11 @@ Linux tools.

      On line 9, we specify the list of dependencies this tool reli dependencies are added to the Linux package dependencies list only when the foo tool is selected.

      The rest of the Makefile, lines 11-25 defines what should be done at the different steps of the Linux tool build process like for a -generic package. They will actually be +generic package. They will actually be used only when the foo tool is selected. The only supported commands are _BUILD_CMDS, _INSTALL_STAGING_CMDS and _INSTALL_TARGET_CMDS.

      Note. One must not call $(eval $(generic-package)) or any other package infrastructure! Linux tools are not packages by themselves, -they are part of the linux-tools package.

      17.20.2. linux-kernel-extensions

      Some packages provide new features that require the Linux kernel tree +they are part of the linux-tools package.

      18.21.2. linux-kernel-extensions

      Some packages provide new features that require the Linux kernel tree to be modified. This can be in the form of patches to be applied on the kernel tree, or in the form of new files to be added to the tree. The Buildroot’s Linux kernel extensions infrastructure provides @@ -4624,7 +4780,7 @@ the Linux kernel tree; this is specific to the linux extension and can use the variables defined by the foo package, like: $(FOO_DIR) or $(FOO_VERSION)… as well as all the Linux variables, like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)… -See the definition of those kernel variables.

      17.21. Hooks available in the various build steps

      The generic infrastructure (and as a result also the derived autotools +See the definition of those kernel variables.

    18.22. Hooks available in the various build steps

    The generic infrastructure (and as a result also the derived autotools and cmake infrastructures) allow packages to specify hooks. These define further actions to perform after existing steps. Most hooks aren’t really useful for generic packages, since the .mk @@ -4680,7 +4836,7 @@ registered at a given hook point. Here is an example:

    def
         action2
 endef
 
-LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP

    17.21.1. Using the POST_RSYNC hook

    The POST_RSYNC hook is run only for packages that use a local source, +LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP

    18.22.1. Using the POST_RSYNC hook

    The POST_RSYNC hook is run only for packages that use a local source, either through the local site method or the OVERRIDE_SRCDIR mechanism. In this case, package sources are copied using rsync from the local location into the buildroot build directory. The rsync @@ -4695,10 +4851,10 @@ others, use the following variables:

      $(SRCDIR): the path to the overridden source directory
    • $(@D): the path to the build directory -

    17.21.2. Target-finalize hook

    Packages may also register hooks in LIBFOO_TARGET_FINALIZE_HOOKS. +

    18.22.2. Target-finalize hook

    Packages may also register hooks in LIBFOO_TARGET_FINALIZE_HOOKS. These hooks are run after all packages are built, but before the filesystem images are generated. They are seldom used, and your -package probably do not need them.

    17.22. Gettext integration and interaction with packages

    Many packages that support internationalization use the gettext +package probably do not need them.

    18.23. Gettext integration and interaction with packages

    Many packages that support internationalization use the gettext library. Dependencies for this library are fairly complicated and therefore, deserve some explanation.

    The glibc C library integrates a full-blown implementation of gettext, supporting translation. Native Language Support is @@ -4744,7 +4900,7 @@ use select BR2_PACKAGE_GETTEXT in their

  • not add any gettext dependency in the DEPENDENCIES variable of their .mk file. -

    • 17.23. Tips and tricks

    17.23.1. Package name, config entry name and makefile variable relationship

    In Buildroot, there is some relationship between:

    • +

    18.24. Tips and tricks

    18.24.1. Package name, config entry name and makefile variable relationship

    In Buildroot, there is some relationship between:

    • the package name, which is the package directory name (and the name of the *.mk file);
    • @@ -4766,14 +4922,14 @@ the config entry is the upper case package name< the *.mk file variable prefix is the upper case package name with . and - characters substituted with _ (e.g.: FOO_BAR_BOO_VERSION). -

    17.23.2. How to check the coding style

    Buildroot provides a script in utils/check-package that checks new or +

    18.24.2. How to check the coding style

    Buildroot provides a script in utils/check-package that checks new or changed files for coding style. It is not a complete language validator, but it catches many common mistakes. It is meant to run in the actual files you created or modified, before creating the patch for submission.

    This script can be used for packages, filesystem makefiles, Config.in files, etc. It does not check the files defining the package infrastructures and some other files containing similar common code.

    To use it, run the check-package script, by telling which files you created or changed:

    $ ./utils/check-package package/new-package/*

    If you have the utils directory in your path you can also run:

    $ cd package/new-package/
-$ check-package *

    The tool can also be used for packages in a br2-external:

    $ check-package -b /path/to/br2-ext-tree/package/my-package/*

    17.23.3. How to test your package

    Once you have added your new package, it is important that you test it +$ check-package *

    The tool can also be used for packages in a br2-external:

    $ check-package -b /path/to/br2-ext-tree/package/my-package/*

    18.24.3. How to test your package

    Once you have added your new package, it is important that you test it under various conditions: does it build for all architectures? Does it build with the different C libraries? Does it need threads, NPTL? And so on…

    Buildroot runs autobuilders which @@ -4833,7 +4989,7 @@ one of the preliminary steps (downloading the config file, applying options (after you fixed your package); the script will attempt to re-build the package specified with -p for all toolchains, without the need to re-build all the dependencies of that package.

    The test-pkg script accepts a few options, for which you can get some -help by running:

    $ ./utils/test-pkg -h

    17.23.4. How to add a package from GitHub

    Packages on GitHub often don’t have a download area with release tarballs. +help by running:

    $ ./utils/test-pkg -h

    18.24.4. How to add a package from GitHub

    Packages on GitHub often don’t have a download area with release tarballs. However, it is possible to download tarballs directly from the repository on GitHub. As GitHub is known to have changed download mechanisms in the past, the github helper function should be used as shown below.

    # Use a tag or a full commit ID
@@ -4860,22 +5016,22 @@ If it looks like the image above then it was uploaded by the
 On the other hand, if there’s is only the "Source code" link, then
   it’s an automatically generated tarball and you should use the
   github helper function.
-

    17.24. Conclusion

    As you can see, adding a software package to Buildroot is simply a +

    18.25. Conclusion

    As you can see, adding a software package to Buildroot is simply a matter of writing a Makefile using an existing example and modifying it according to the compilation process required by the package.

    If you package software that might be useful for other people, don’t forget to send a patch to the Buildroot mailing list (see -Section 21.5, “Submitting patches”)!

    Chapter 18. Patching a package

    While integrating a new package or updating an existing one, it may be +Section 22.5, “Submitting patches”)!

    Chapter 19. Patching a package

    While integrating a new package or updating an existing one, it may be necessary to patch the source of the software to get it cross-built within Buildroot.

    Buildroot offers an infrastructure to automatically handle this during the builds. It supports three ways of applying patch sets: downloaded patches, patches supplied within buildroot and patches located in a user-defined -global patch directory.

    18.1. Providing patches

    18.1.1. Downloaded

    If it is necessary to apply a patch that is available for download, then add it +global patch directory.

    19.1. Providing patches

    19.1.1. Downloaded

    If it is necessary to apply a patch that is available for download, then add it to the <packagename>_PATCH variable. If an entry contains ://, then Buildroot will assume it is a full URL and download the patch from this location. Otherwise, Buildroot will assume that the patch should be downloaded from <packagename>_SITE. It can be a single patch, or a tarball containing a patch series.

    Like for all downloads, a hash should be added to the <packagename>.hash -file.

    This method is typically used for packages from Debian.

    18.1.2. Within Buildroot

    Most patches are provided within Buildroot, in the package +file.

    This method is typically used for packages from Debian.

    19.1.2. Within Buildroot

    Most patches are provided within Buildroot, in the package directory; these typically aim to fix cross-compilation, libc support, or other such issues.

    These patch files should be named <number>-<description>.patch.

    Notes

    • The patch files coming with Buildroot should not contain any package version @@ -4894,10 +5050,10 @@ Previously, a series file, as used by series file defines the patch application order. This is deprecated, and will be removed in the future. Do not use a series file. -

    18.1.3. Global patch directory

    The BR2_GLOBAL_PATCH_DIR configuration file option can be +

    19.1.3. Global patch directory

    The BR2_GLOBAL_PATCH_DIR configuration file option can be used to specify a space separated list of one or more directories containing global package patches. See Section 9.8, “Adding project-specific patches” for -details.

    18.2. How patches are applied

    1. +details.

    19.2. How patches are applied

    1. Run the <packagename>_PRE_PATCH_HOOKS commands if defined;
    2. Cleanup the build directory, removing any existing *.rej files; @@ -4924,8 +5080,8 @@ If BR2_GLOBAL_PATCH_DIR is defined, the directories as described in the previous step.
    3. Run the <packagename>_POST_PATCH_HOOKS commands if defined. -

    If something goes wrong in the steps 3 or 4, then the build fails.

    18.3. Format and licensing of the package patches

    Patches are released under the same license as the software they apply -to (see Section 12.2, “Complying with the Buildroot license”).

    A message explaining what the patch does, and why it is needed, should +

    If something goes wrong in the steps 3 or 4, then the build fails.

    19.3. Format and licensing of the package patches

    Patches are released under the same license as the software they apply +to (see Section 13.2, “Complying with the Buildroot license”).

    A message explaining what the patch does, and why it is needed, should be added in the header commentary of the patch.

    You should add a Signed-off-by statement in the header of the each patch to help with keeping track of the changes and to certify that the patch is released under the same license as the software that is modified.

    If the software is under version control, it is recommended to use the @@ -4950,11 +5106,11 @@ AC_PROG_MAKE_SET + [rw_cv_prog_cxx_works=no]) + AC_LANG_POP([C++])]) + -+AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])

    18.4. Integrating patches found on the Web

    When integrating a patch of which you are not the author, you have to ++AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])

    19.4. Integrating patches found on the Web

    When integrating a patch of which you are not the author, you have to add a few things in the header of the patch itself.

    Depending on whether the patch has been obtained from the project repository itself, or from somewhere on the web, add one of the following tags:

    Backported from: <some commit id>

    or

    Fetch from: <some url>

    It is also sensible to add a few words about any changes to the patch -that may have been necessary.

    Chapter 19. Download infrastructure

    TODO

    Chapter 20. Debugging Buildroot

    It is possible to instrument the steps Buildroot does when building +that may have been necessary.

    Chapter 20. Download infrastructure

    TODO

    Chapter 21. Debugging Buildroot

    It is possible to instrument the steps Buildroot does when building packages. Define the variable BR2_INSTRUMENTATION_SCRIPTS to contain the path of one or more scripts (or other executables), in a space-separated list, you want called before and after each step. The @@ -4984,7 +5140,7 @@ the name of the package. BR2_CONFIG: the path to the Buildroot .config file

  • HOST_DIR, STAGING_DIR, TARGET_DIR: see - Section 17.5.2, “generic-package reference” + Section 18.5.2, “generic-package reference”
  • BUILD_DIR: the directory where packages are extracted and built
  • @@ -4992,7 +5148,7 @@ the name of the package. stored
  • BASE_DIR: the base output directory -

    • Chapter 21. Contributing to Buildroot

    There are many ways in which you can contribute to Buildroot: analyzing +

    Chapter 22. Contributing to Buildroot

    There are many ways in which you can contribute to Buildroot: analyzing and fixing bugs, analyzing and fixing package build failures detected by the autobuilders, testing and reviewing patches sent by other developers, working on the items in our TODO list and sending your own @@ -5005,12 +5161,12 @@ contributions to. If you aren’t subscribed yet, then refer to git repository of Buildroot, rather than starting from an extracted source code tarball. Git is the easiest way to develop from and directly send your patches to the mailing list. Refer to Chapter 3, Getting Buildroot -for more information on obtaining a Buildroot git tree.

    21.1. Reproducing, analyzing and fixing bugs

    A first way of contributing is to have a look at the open bug reports in +for more information on obtaining a Buildroot git tree.

    22.1. Reproducing, analyzing and fixing bugs

    A first way of contributing is to have a look at the open bug reports in the Buildroot bug tracker. As we strive to keep the bug count as small as possible, all help in reproducing, analyzing and fixing reported bugs is more than welcome. Don’t hesitate to add a comment to bug reports reporting your -findings, even if you don’t yet see the full picture.

    21.2. Analyzing and fixing autobuild failures

    The Buildroot autobuilders are a set of build machines that continuously +findings, even if you don’t yet see the full picture.

    22.2. Analyzing and fixing autobuild failures

    The Buildroot autobuilders are a set of build machines that continuously run Buildroot builds based on random configurations. This is done for all architectures supported by Buildroot, with various toolchains, and with a random selection of packages. With the large commit activity on @@ -5042,13 +5198,13 @@ Verify that the problem is really fixed by starting from a clean Buildroot tree and only applying your fix.

  • Send the fix to the Buildroot mailing list (see - Section 21.5, “Submitting patches”). In case you created a patch against the + Section 22.5, “Submitting patches”). In case you created a patch against the package sources, you should also send the patch upstream so that the problem will be fixed in a later release, and the patch in Buildroot can be removed. In the commit message of a patch fixing an autobuild failure, add a reference to the build result directory, as follows: -
    • Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069

    21.3. Reviewing and testing patches

    With the amount of patches sent to the mailing list each day, the +

    Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069

    22.3. Reviewing and testing patches

    With the amount of patches sent to the mailing list each day, the maintainer has a very hard job to judge which patches are ready to apply and which ones aren’t. Contributors can greatly help here by reviewing and testing these patches.

    In the review process, do not hesitate to respond to patch submissions @@ -5059,7 +5215,7 @@ submissions.

    To indicate approval of a patch, there are three formal tags track of this approval. To add your tag to a patch, reply to it with the approval tag below the original author’s Signed-off-by line. These tags will be picked up automatically by patchwork (see -Section 21.3.1, “Applying Patches from Patchwork”) and will be part of the commit log when +Section 22.3.1, “Applying Patches from Patchwork”) and will be part of the commit log when the patch is accepted.

    Tested-by
    @@ -5103,8 +5259,8 @@ provided by a regular contributor will naturally be trusted more than tags provided by a newcomer. As you provide tags more regularly, your trustworthiness (in the eyes of the maintainer) will go up, but any tag provided is valuable.

    Buildroot’s Patchwork website can be used to pull in patches for testing -purposes. Please see Section 21.3.1, “Applying Patches from Patchwork” for more -information on using Buildroot’s Patchwork website to apply patches.

    21.3.1. Applying Patches from Patchwork

    The main use of Buildroot’s Patchwork website for a developer is for +purposes. Please see Section 22.3.1, “Applying Patches from Patchwork” for more +information on using Buildroot’s Patchwork website to apply patches.

    22.3.1. Applying Patches from Patchwork

    The main use of Buildroot’s Patchwork website for a developer is for pulling in patches into their local git repository for testing purposes.

    When browsing patches in the patchwork management interface, an mbox link is provided at the top of the page. Copy this link address and @@ -5113,14 +5269,14 @@ $ wget -O - <mbox-url> | git am

    Another option for applying patche a set of patches that you can group together using the patchwork interface. Once the bundle is created and the bundle is made public, you can copy the mbox link for the bundle and apply the bundle -using the above commands.

    21.4. Work on items from the TODO list

    If you want to contribute to Buildroot but don’t know where to start, +using the above commands.

    22.4. Work on items from the TODO list

    If you want to contribute to Buildroot but don’t know where to start, and you don’t like any of the above topics, you can always work on items from the Buildroot TODO list. Don’t hesitate to discuss an item first on the mailing list or on IRC. Do edit the wiki to indicate when you start working on an item, so we -avoid duplicate efforts.

    21.5. Submitting patches

    Note

    Please, do not attach patches to bugs, send them to the mailing list +avoid duplicate efforts.

    22.5. Submitting patches

    Note

    Please, do not attach patches to bugs, send them to the mailing list instead.

    If you made some changes to Buildroot and you would like to contribute -them to the Buildroot project, proceed as follows.

    21.5.1. The formatting of a patch

    We expect patches to be formatted in a specific way. This is necessary +them to the Buildroot project, proceed as follows.

    22.5.1. The formatting of a patch

    We expect patches to be formatted in a specific way. This is necessary to make it easy to review patches, to be able to apply them easily to the git repository, to make it easy to find back in the history how and why things have changed, and to make it possible to use git @@ -5192,16 +5348,16 @@ required changes should be explained explicitly, like configure options that no longer exist or are no longer needed.

    If you are interested in getting notified of build failures and of further changes in the packages you added or modified, please add yourself to the DEVELOPERS file. This should be done in the same patch -creating or modifying the package. See the DEVELOPERS file +creating or modifying the package. See the DEVELOPERS file for more information.

    Buildroot provides a handy tool to check for common coding style mistakes on files you created or modified, called check-package (see -Section 17.23.2, “How to check the coding style” for more information).

    21.5.2. Preparing a patch series

    Starting from the changes committed in your local git view, rebase +Section 18.24.2, “How to check the coding style” for more information).

    22.5.2. Preparing a patch series

    Starting from the changes committed in your local git view, rebase your development branch on top of the upstream tree before generating a patch set. To do so, run:

    $ git fetch --all --tags
 $ git rebase origin/master

    Now, you are ready to generate then submit your patch set.

    To generate it, run:

    $ git format-patch -M -n -s -o outgoing origin/master

    This will generate patch files in the outgoing subdirectory, automatically adding the Signed-off-by line.

    Once patch files are generated, you can review/edit the commit message before submitting them, using your favorite text editor.

    Buildroot provides a handy tool to know to whom your patches should be -sent, called get-developers (see Chapter 22, DEVELOPERS file and get-developers for more +sent, called get-developers (see Chapter 23, DEVELOPERS file and get-developers for more information). This tool reads your patches and outputs the appropriate git send-email command to use:

    $ ./utils/get-developers outgoing/*

    Use the output of get-developers to send your patches:

    $ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/*

    Alternatively, get-developers -e can be used directly with the --cc-cmd argument to git send-email to automatically CC the @@ -5210,7 +5366,7 @@ affected developers:

    $ git send-email --to buildroot@buil
 $ git config sendemail.ccCmd "$(pwd)/utils/get-developers -e"

    And then just do:

    $ git send-email origin/master

    Note that git should be configured to use your mail account. To configure git, see man git-send-email or google it.

    If you do not use git send-email, make sure posted patches are not line-wrapped, otherwise they cannot easily be applied. In such a case, -fix your e-mail client, or better yet, learn to use git send-email.

    21.5.3. Cover letter

    If you want to present the whole patch set in a separate mail, add +fix your e-mail client, or better yet, learn to use git send-email.

    22.5.3. Cover letter

    If you want to present the whole patch set in a separate mail, add --cover-letter to the git format-patch command (see man git-format-patch for further information). This will generate a template for an introduction e-mail to your patch series.

    A cover letter may be useful to introduce the changes you propose @@ -5219,11 +5375,11 @@ large number of commits in the series;

  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. -

    • 21.5.4. Patches for maintenance branches

    When fixing bugs on a maintenance branch, bugs should be fixed on the +

    22.5.4. Patches for maintenance branches

    When fixing bugs on a maintenance branch, bugs should be fixed on the master branch first. The commit log for such a patch may then contain a post-commit note specifying what branches are affected:

    package/foo: fix stuff
 
@@ -5236,7 +5392,7 @@ because it is using an older version of a package. In that case, patches
 should be based off the maintenance branch, and the patch subject prefix
 must include the maintenance branch name (for example "[PATCH 2020.02.x]").
 This can be done with the git format-patch flag --subject-prefix:
    $ git format-patch --subject-prefix "PATCH 2020.02.x" \
-    -M -s -o outgoing origin/2020.02.x
    Then send the patches with git send-email, as described above.

    21.5.5. Patch revision changelog

    When improvements are requested, the new revision of each commit + -M -s -o outgoing origin/2020.02.x

    Then send the patches with git send-email, as described above.

    22.5.5. Patch revision changelog

    When improvements are requested, the new revision of each commit should include a changelog of the modifications between each submission. Note that when your patch series is introduced by a cover letter, an overall changelog may be added to the cover letter in @@ -5286,7 +5442,7 @@ submitting a patch to the mailing list. The id of the mail to reply to can be found under the "Message Id" tag on patchwork. The advantage of in-reply-to is that patchwork will automatically mark the previous -version of the patch as superseded.

    21.6. Reporting issues/bugs or getting help

    Before reporting any issue, please check in +version of the patch as superseded.

    22.6. Reporting issues/bugs or getting help

    Before reporting any issue, please check in the mailing list archive whether someone has already reported and/or fixed a similar problem.

    However you choose to report bugs or get help, either by opening a bug in the bug tracker or by @@ -5311,7 +5467,7 @@ pastebin service. Note that not all available pastebin services will preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https://gist.github.com/ -- http://code.bulix.org/

    21.7. Using the run-tests framework

    Buildroot includes a run-time testing framework called run-tests built +- http://code.bulix.org/

    22.7. Using the run-tests framework

    Buildroot includes a run-time testing framework called run-tests built upon Python scripting and QEMU runtime execution. There are two types of test cases within the framework, one for build time tests and another for run-time tests that have a QEMU dependency. The goals of the framework are @@ -5360,7 +5516,7 @@ test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok Ran 157 tests in 0.021s OK

    Those runtime tests are regularly executed by Buildroot Gitlab CI -infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/buildroot/-/jobs.

    21.7.1. Creating a test case

    The best way to get familiar with how to create a test case is to look at a +infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/buildroot/-/jobs.

    22.7.1. Creating a test case

    The best way to get familiar with how to create a test case is to look at a few of the basic file system support/testing/tests/fs/ and init support/testing/tests/init/ test scripts. Those tests give good examples of a basic build and build with run type of tests. There are other more @@ -5379,11 +5535,8 @@ Determining if the default defconfig plus test options can be used

  • Implementing a def test_run(self): function to optionally startup the emulator and provide test case conditions. -

    • Beyond creating the test script, there are a couple of additional steps that -should be taken once you have your initial test case script. The first is -to add yourself to the DEVELOPERS file to be the maintainer of that test -case. The second is to update the Gitlab CI yml by executing -make .gitlab-ci.yml.

    21.7.2. Debugging a test case

    Within the Buildroot repository, the testing framework is organized at the +

    After creating the test script, add yourself to the DEVELOPERS file to +be the maintainer of that test case.

    22.7.2. Debugging a test case

    Within the Buildroot repository, the testing framework is organized at the top level in support/testing/ by folders of conf, infra and tests. All the test cases live under the test folder and are organized in various folders representing the catagory of test.

    Lets walk through an example.

    • @@ -5436,12 +5589,12 @@ to trigger all run-test test case jobs: 
     $ git push gitlab HEAD:<name>-runtime-tests
    • to trigger one test case job, a specific branch naming string is used that includes the full test case name. -
     $ git push gitlab HEAD:<name>-<test case name>

    [4] RFC: (Request for comments) change proposal

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +

     $ git push gitlab HEAD:<name>-<test case name>

    [4] RFC: (Request for comments) change proposal

    Chapter 23. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developers tool allows to:

    • Calculate the list of developers to whom patches should be sent, by parsing the patches and matching the modified files with the - relevant developers. See Section 21.5, “Submitting patches” for details. + relevant developers. See Section 22.5, “Submitting patches” for details.
    • Find which developers are taking care of a given architecture or package, so that they can be notified when a build failure occurs on @@ -5472,7 +5625,7 @@ When using the -c command line option,
    • When using without any arguments, it validates the integrity of the DEVELOPERS file and will note WARNINGS for items that don’t match. -

    Chapter 23. Release Engineering

    23.1. Releases

    The Buildroot project makes quarterly releases with monthly bugfix +

    Chapter 24. Release Engineering

    24.1. Releases

    The Buildroot project makes quarterly releases with monthly bugfix releases. The first release of each year is a long term support release, LTS.

    • Quarterly releases: 2020.02, 2020.05, 2020.08, and 2020.11 @@ -5482,13 +5635,13 @@ Bugfix releases: 2020.02.1, 2020.02.2, … LTS releases: 2020.02, 2021.02, …

    Releases are supported until the first bugfix release of the next release, e.g., 2020.05.x is EOL when 2020.08.1 is released.

    LTS releases are supported until the first bugfix release of the next -LTS, e.g., 2020.02.x is supported until 2021.02.1 is released.

    23.2. Development

    Each release cycle consist of two months of development on the master +LTS, e.g., 2020.02.x is supported until 2021.02.1 is released.

    24.2. Development

    Each release cycle consist of two months of development on the master branch and one month stabilization before the release is made. During this phase no new features are added to master, only bugfixes.

    The stabilization phase starts with tagging -rc1, and every week until the release, another release candidate is tagged.

    To handle new features and version bumps during the stabilization phase, a next branch may be created for these features. Once the current release has been made, the next branch is merged into master and -the development cycle for the next release continues there.

    Part IV. Appendix

    Chapter 24. Makedev syntax documentation

    The makedev syntax is used in several places in Buildroot to +the development cycle for the next release continues there.

    Part IV. Appendix

    Chapter 25. Makedev syntax documentation

    The makedev syntax is used in several places in Buildroot to define changes to be made for permissions, or which device files to create and how to create them, in order to avoid calls to mknod.

    This syntax is derived from the makedev utility, and more complete documentation can be found in the package/makedevs/README file.

    It takes the form of a space separated list of fields, one file per @@ -5544,7 +5697,7 @@ you will write :

    /usr/bin/foo f 755 root root - - - - -
 If you want to add the capability cap_sys_admin and cap_net_admin to the
 binary foo, you will write :
    /usr/bin/foo f 755 root root - - - - -
 |xattr cap_sys_admin+eip
-|xattr cap_net_admin+eip

    Chapter 25. Makeusers syntax documentation

    The syntax to create users is inspired by the makedev syntax, above, but +|xattr cap_net_admin+eip

    Chapter 26. Makeusers syntax documentation

    The syntax to create users is inspired by the makedev syntax, above, but is specific to Buildroot.

    The syntax for adding a user is a space-separated list of fields, one user per line; the fields are:

    username

    uid

    group

    gid

    password

    home

    shell

    groups

    comment

    Where:

    • username is the desired user name (aka login name) for the user. @@ -5627,9 +5780,9 @@ main group gid is computed by Buildroot, and will u
    • comment is: Test user -

    Chapter 26. Migrating from older Buildroot versions

    Some versions have introduced backward incompatibilities. This section +

    Chapter 27. Migrating from older Buildroot versions

    Some versions have introduced backward incompatibilities. This section explains those incompatibilities, and for each explains what to do to -complete the migration.

    26.1. Migrating to 2016.11

    Before Buildroot 2016.11, it was possible to use only one br2-external +complete the migration.

    27.1. Migrating to 2016.11

    Before Buildroot 2016.11, it was possible to use only one br2-external tree at once. With Buildroot 2016.11 came the possibility to use more than one simultaneously (for details, see Section 9.2, “Keeping customizations outside of Buildroot”).

    This however means that older br2-external trees are not usable as-is. A minor change has to be made: adding a name to your br2-external tree.

    This can be done very easily in just a few steps:

    • @@ -5641,7 +5794,7 @@ with only ASCII characters from the set [A-Za-z0-9_]BR2_EXTERNAL in your br2-external tree with the new variable: 

      $ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g'

    Now, your br2-external tree can be used with Buildroot 2016.11 onward.

    Note: This change makes your br2-external tree incompatible with Buildroot -before 2016.11.

    26.2. Migrating to 2017.08

    Before Buildroot 2017.08, host packages were installed in $(HOST_DIR)/usr +before 2016.11.

    27.2. Migrating to 2017.08

    Before Buildroot 2017.08, host packages were installed in $(HOST_DIR)/usr (with e.g. the autotools' --prefix=$(HOST_DIR)/usr). With Buildroot 2017.08, they are now installed directly in $(HOST_DIR).

    Whenever a package installs an executable that is linked with a library in $(HOST_DIR)/lib, it must have an RPATH pointing to that directory.

    An RPATH pointing to $(HOST_DIR)/usr/lib is no longer accepted.

    \ No newline at end of file diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index a085d4b98..91ae33809 100644 Binary files a/buildroot/docs/manual/manual.pdf and b/buildroot/docs/manual/manual.pdf differ diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index 1f0e94811..9aa5d8fca 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -60,120 +60,126 @@ II. User guide 9.10. Quick guide to storing your project-specific customizations - 10. Frequently Asked Questions & Troubleshooting + 10. Using SELinux in Buildroot - 10.1. The boot hangs after Starting network… - 10.2. Why is there no compiler on the target? - 10.3. Why are there no development files on the target? - 10.4. Why is there no documentation on the target? - 10.5. Why are some packages not visible in the Buildroot + 10.1. Enabling SELinux support + 10.2. SELinux policy tweaking + + 11. Frequently Asked Questions & Troubleshooting + + 11.1. The boot hangs after Starting network… + 11.2. Why is there no compiler on the target? + 11.3. Why are there no development files on the target? + 11.4. Why is there no documentation on the target? + 11.5. Why are some packages not visible in the Buildroot config menu? - 10.6. Why not use the target directory as a chroot directory? - 10.7. Why doesn’t Buildroot generate binary packages (.deb, + 11.6. Why not use the target directory as a chroot directory? + 11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)? - 10.8. How to speed-up the build process? + 11.8. How to speed-up the build process? - 11. Known issues - 12. Legal notice and licensing + 12. Known issues + 13. Legal notice and licensing - 12.1. Complying with open source licenses - 12.2. Complying with the Buildroot license + 13.1. Complying with open source licenses + 13.2. Complying with the Buildroot license - 13. Beyond Buildroot + 14. Beyond Buildroot - 13.1. Boot the generated images - 13.2. Chroot + 14.1. Boot the generated images + 14.2. Chroot III. Developer guide - 14. How Buildroot works - 15. Coding style + 15. How Buildroot works + 16. Coding style - 15.1. Config.in file - 15.2. The .mk file - 15.3. The documentation - 15.4. Support scripts + 16.1. Config.in file + 16.2. The .mk file + 16.3. The documentation + 16.4. Support scripts - 16. Adding support for a particular board - 17. Adding new packages to Buildroot + 17. Adding support for a particular board + 18. Adding new packages to Buildroot - 17.1. Package directory - 17.2. Config files - 17.3. The .mk file - 17.4. The .hash file - 17.5. Infrastructure for packages with specific build systems - 17.6. Infrastructure for autotools-based packages - 17.7. Infrastructure for CMake-based packages - 17.8. Infrastructure for Python packages - 17.9. Infrastructure for LuaRocks-based packages - 17.10. Infrastructure for Perl/CPAN packages - 17.11. Infrastructure for virtual packages - 17.12. Infrastructure for packages using kconfig for + 18.1. Package directory + 18.2. Config files + 18.3. The .mk file + 18.4. The .hash file + 18.5. Infrastructure for packages with specific build systems + 18.6. Infrastructure for autotools-based packages + 18.7. Infrastructure for CMake-based packages + 18.8. Infrastructure for Python packages + 18.9. Infrastructure for LuaRocks-based packages + 18.10. Infrastructure for Perl/CPAN packages + 18.11. Infrastructure for virtual packages + 18.12. Infrastructure for packages using kconfig for configuration files - 17.13. Infrastructure for rebar-based packages - 17.14. Infrastructure for Waf-based packages - 17.15. Infrastructure for Meson-based packages - 17.16. Integration of Cargo-based packages - 17.17. Infrastructure for Go packages - 17.18. Infrastructure for packages building kernel modules - 17.19. Infrastructure for asciidoc documents - 17.20. Infrastructure specific to the Linux kernel package - 17.21. Hooks available in the various build steps - 17.22. Gettext integration and interaction with packages - 17.23. Tips and tricks - 17.24. Conclusion + 18.13. Infrastructure for rebar-based packages + 18.14. Infrastructure for Waf-based packages + 18.15. Infrastructure for Meson-based packages + 18.16. Integration of Cargo-based packages + 18.17. Infrastructure for Go packages + 18.18. Infrastructure for QMake-based packages + 18.19. Infrastructure for packages building kernel modules + 18.20. Infrastructure for asciidoc documents + 18.21. Infrastructure specific to the Linux kernel package + 18.22. Hooks available in the various build steps + 18.23. Gettext integration and interaction with packages + 18.24. Tips and tricks + 18.25. Conclusion - 18. Patching a package + 19. Patching a package - 18.1. Providing patches - 18.2. How patches are applied - 18.3. Format and licensing of the package patches - 18.4. Integrating patches found on the Web + 19.1. Providing patches + 19.2. How patches are applied + 19.3. Format and licensing of the package patches + 19.4. Integrating patches found on the Web - 19. Download infrastructure - 20. Debugging Buildroot - 21. Contributing to Buildroot + 20. Download infrastructure + 21. Debugging Buildroot + 22. Contributing to Buildroot - 21.1. Reproducing, analyzing and fixing bugs - 21.2. Analyzing and fixing autobuild failures - 21.3. Reviewing and testing patches - 21.4. Work on items from the TODO list - 21.5. Submitting patches - 21.6. Reporting issues/bugs or getting help - 21.7. Using the run-tests framework + 22.1. Reproducing, analyzing and fixing bugs + 22.2. Analyzing and fixing autobuild failures + 22.3. Reviewing and testing patches + 22.4. Work on items from the TODO list + 22.5. Submitting patches + 22.6. Reporting issues/bugs or getting help + 22.7. Using the run-tests framework - 22. DEVELOPERS file and get-developers - 23. Release Engineering + 23. DEVELOPERS file and get-developers + 24. Release Engineering - 23.1. Releases - 23.2. Development + 24.1. Releases + 24.2. Development IV. Appendix - 24. Makedev syntax documentation - 25. Makeusers syntax documentation - 26. Migrating from older Buildroot versions + 25. Makedev syntax documentation + 26. Makeusers syntax documentation + 27. Migrating from older Buildroot versions - 26.1. Migrating to 2016.11 - 26.2. Migrating to 2017.08 + 27.1. Migrating to 2016.11 + 27.2. Migrating to 2017.08 List of Examples -17.1. Config script: divine package -17.2. Config script: imagemagick package: +18.1. Config script: divine package +18.2. Config script: imagemagick package: --------------------------------------------------------------------- --------------------------------------------------------------------- -Buildroot 2020.02.7 manual generated on 2020-10-12 21:37:33 UTC from -git revision d8082db677 +Buildroot 2020.11-rc1 manual generated on 2020-11-04 22:31:20 UTC +from git revision 5b79a9cc47 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -d8082db677046e004a6537828b3e4f4b9a818a4f] file in the Buildroot +5b79a9cc47ff22e18c901d02d94f1e3c3cfdfae1] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -284,7 +290,7 @@ vary between distributions). using wget from ftp, http or https locations. A few packages are only available through a version control system. Moreover, Buildroot is capable of downloading sources via other tools, like - rsync or scp (refer to Chapter 19, Download infrastructure for + rsync or scp (refer to Chapter 20, Download infrastructure for more details). If you enable packages using any of these methods, you will need to install the corresponding tool on the host system: @@ -497,7 +503,7 @@ Bug tracker Bugs in Buildroot can be reported via the mailing list or alternatively via the Buildroot bugtracker [https:// bugs.buildroot.org/buglist.cgi?product=buildroot]. Please refer - to Section 21.6, “Reporting issues/bugs or getting help” before + to Section 22.6, “Reporting issues/bugs or getting help” before creating a bug report. Wiki The Buildroot wiki page [http://elinux.org/Buildroot] is hosted @@ -515,7 +521,7 @@ Patchwork Buildroot’s Patchwork website is mainly for use by Buildroot’s maintainer to ensure patches aren’t missed. It is also used by - Buildroot patch reviewers (see also Section 21.3.1, “Applying + Buildroot patch reviewers (see also Section 22.3.1, “Applying Patches from Patchwork”). However, since the website exposes patches and their corresponding review comments in a clean and concise web interface, it can be useful for all Buildroot @@ -564,29 +570,34 @@ Table of Contents 9.9. Adding project-specific packages 9.10. Quick guide to storing your project-specific customizations -10. Frequently Asked Questions & Troubleshooting +10. Using SELinux in Buildroot - 10.1. The boot hangs after Starting network… - 10.2. Why is there no compiler on the target? - 10.3. Why are there no development files on the target? - 10.4. Why is there no documentation on the target? - 10.5. Why are some packages not visible in the Buildroot config + 10.1. Enabling SELinux support + 10.2. SELinux policy tweaking + +11. Frequently Asked Questions & Troubleshooting + + 11.1. The boot hangs after Starting network… + 11.2. Why is there no compiler on the target? + 11.3. Why are there no development files on the target? + 11.4. Why is there no documentation on the target? + 11.5. Why are some packages not visible in the Buildroot config menu? - 10.6. Why not use the target directory as a chroot directory? - 10.7. Why doesn’t Buildroot generate binary packages (.deb, + 11.6. Why not use the target directory as a chroot directory? + 11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)? - 10.8. How to speed-up the build process? + 11.8. How to speed-up the build process? -11. Known issues -12. Legal notice and licensing +12. Known issues +13. Legal notice and licensing - 12.1. Complying with open source licenses - 12.2. Complying with the Buildroot license + 13.1. Complying with open source licenses + 13.2. Complying with the Buildroot license -13. Beyond Buildroot +14. Beyond Buildroot - 13.1. Boot the generated images - 13.2. Chroot + 14.1. Boot the generated images + 14.2. Chroot Chapter 6. Buildroot configuration @@ -882,7 +893,7 @@ different solutions to handle the /dev directory : BR2_ROOTFS_STATIC_DEVICE_TABLE to system/device_table_dev.txt board///device_table_dev.txt. For more details about the format of the device table file, see - Chapter 24, Makedev syntax documentation. + Chapter 25, Makedev syntax documentation. * The second solution is Dynamic using devtmpfs only. devtmpfs is a virtual filesystem inside the Linux kernel that has been introduced in kernel 2.6.32 (if you use an older kernel, it is @@ -1679,6 +1690,19 @@ or will be generating the tarball on your own), Buildroot also allows you to just prepare the SDK with make prepare-sdk without actually generating a tarball. +For your convenience, by selecting the option +BR2_PACKAGE_HOST_ENVIRONMENT_SETUP, you can get a setup-environment +script installed in output/host/ and therefore in your SDK. This +script can be sourced with . your/sdk/path/environment-setup to +export a number of environment variables that will help cross-compile +your projects using the Buildroot SDK: the PATH will contain the SDK +binaries, standard autotools variables will be defined with the +appropriate values, and CONFIGURE_FLAGS will contain basic ./ +configure options to cross-compile autotools projects. It also +provides some useful commands. Note however that once this script is +sourced, the environment is setup only for cross-compilation, and no +longer for native compilation. + 8.13.2. Using gdb in Buildroot Buildroot allows to do cross-debugging, where the debugger runs on @@ -2177,7 +2201,7 @@ directory, not to the Buildroot output directory. Note: If using an br2-external tree from before Buildroot 2016.11, you need to convert it before you can use it with Buildroot 2016.11 -onward. See Section 26.1, “Migrating to 2016.11” for help on doing +onward. See Section 27.1, “Migrating to 2016.11” for help on doing so. Some examples: @@ -2296,7 +2320,7 @@ include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) And then in $(BR2_EXTERNAL_BAR_42_PATH)/package/package1 and $ (BR2_EXTERNAL_BAR_42_PATH)/package/package2 create normal Buildroot -package recipes, as explained in Chapter 17, Adding new packages to +package recipes, as explained in Chapter 18, Adding new packages to Buildroot. If you prefer, you can also group the packages in subdirectories called and adapt the above paths accordingly. @@ -2322,9 +2346,9 @@ br2-external tree. For some packages, Buildroot provides a choice between two (or more) implementations of API-compatible such packages. For example, there -is a choice to choose either libjpeg ot jpeg-turbo, and another -choice between openssl or libressl. Finally, there is a choice to -select one of the known, pre-configured toolchains. +is a choice to choose either libjpeg ot jpeg-turbo; there is one +between openssl or libressl; there is one to select one of the known, +pre-configured toolchains… It is possible for a br2-external to extend those choices, by providing a set of files that define those alternatives: @@ -2333,7 +2357,12 @@ providing a set of files that define those alternatives: which will then be listed in the toolchain selection; * provides/jpeg.in defines the alternative libjpeg implementations; * provides/openssl.in defines the alternative openssl - implementations. + implementations; + * provides/skeleton.in defines the alternative skeleton + implementations; + * provides/init.in defines the alternative init system + implementations, this can be used to select a default skeleton + for your init. 9.2.1.5. Free-form content @@ -2351,7 +2380,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board///. It should be noted that if the specific permissions or device nodes are related to a specific application, you should set variables FOO_PERMISSIONS and FOO_DEVICES in the package’s .mk file instead -(see Section 17.5.2, “generic-package reference”). +(see Section 18.5.2, “generic-package reference”). 9.6. Adding custom user accounts @@ -2794,7 +2851,7 @@ recommended location for such files is board///. It should be noted that if the custom users are related to a specific application, you should set variable FOO_USERS in the package’s .mk -file instead (see Section 17.5.2, “generic-package reference”). +file instead (see Section 18.5.2, “generic-package reference”). 9.7. Customization after the images have been created @@ -2867,7 +2924,7 @@ follows: refers to the apply order. For information about how patches are applied for a package, see -Section 18.2, “How patches are applied” +Section 19.2, “How patches are applied” The BR2_GLOBAL_PATCH_DIR option is the preferred method for specifying a custom patch directory for packages. It can be used to @@ -2890,7 +2947,7 @@ Linux package. In general, any new package should be added directly in the package directory and submitted to the Buildroot upstream project. How to add packages to Buildroot in general is explained in full detail in -Chapter 17, Adding new packages to Buildroot and will not be repeated +Chapter 18, Adding new packages to Buildroot and will not be repeated here. However, your project may need some proprietary packages that cannot be upstreamed. This section will explain how you can keep such project-specific packages in a project-specific directory. @@ -2904,7 +2961,7 @@ in your br2-external tree. However, Buildroot will not be aware of the packages in this location, unless we perform some additional steps. As explained in -Chapter 17, Adding new packages to Buildroot, a package in Buildroot +Chapter 18, Adding new packages to Buildroot, a package in Buildroot basically consists of two files: a .mk file (describing how to build the package) and a Config.in file (describing the configuration options for this package). @@ -3000,9 +3057,79 @@ are not relevant to your project can be skipped. 13. make savedefconfig to save the buildroot configuration. 14. cp defconfig configs/_defconfig -Chapter 10. Frequently Asked Questions & Troubleshooting +Chapter 10. Using SELinux in Buildroot -10.1. The boot hangs after Starting network… +SELinux [https://selinuxproject.org] is a Linux kernel security +module enforcing access control policies. In addition to the +traditional file permissions and access control lists, SELinux allows +to write rules for users or processes to access specific functions of +resources (files, sockets…). + +SELinux has three modes of operation: + + * Disabled: the policy is not applied + * Permissive: the policy is applied, and non-authorized actions are + simply logged. This mode is often used for troubleshooting + SELinux issues. + * Enforcing: the policy is applied, and non-authorized actions are + denied + +In Buildroot the mode of operation is controlled by the +BR2_PACKAGE_REFPOLICY_POLICY_STATE_* configuration options. The Linux +kernel also has various configuration options that affect how SELinux +is enabled (see security/selinux/Kconfig in the Linux kernel +sources). + +By default in Buildroot the SELinux policy is provided by the +upstream refpolicy [https://github.com/SELinuxProject/refpolicy] +project, enabled with BR2_PACKAGE_REFPOLICY. + +10.1. Enabling SELinux support + +To have proper support for SELinux in a Buildroot generated system, +the following configuration options must be enabled: + + * BR2_PACKAGE_LIBSELINUX + * BR2_PACKAGE_REFPOLICY + +In addition, your filesystem image format must support extended +attributes. + +10.2. SELinux policy tweaking + +The SELinux refpolicy contains modules that can be enabled or +disabled when being built. Each module provide a number of SELinux +rules. In Buildroot the non-base modules are disabled by default and +several ways to enable such modules are provided: + + * Packages can enable a list of SELinux modules within the + refpolicy using the _SELINUX_MODULES variable. + * Packages can provide additional SELinux modules by putting them + (.fc, .if and .te files) in package//selinux/. + * Extra SELinux modules can be added in directories pointed by the + BR2_REFPOLICY_EXTRA_MODULES_DIRS configuration option. + * Additional modules in the refpolicy can be enabled if listed in + the BR2_REFPOLICY_EXTRA_MODULES_DEPENDENCIES configuration + option. + +Buildroot also allows to completely override the refpolicy. This +allows to provide a full custom policy designed specifically for a +given system. When going this way, all of the above mechanisms are +disabled: no extra SElinux module is added to the policy, and all the +available modules within the custom policy are enabled and built into +the final binary policy. The custom policy must be a fork of the +official refpolicy [https://github.com/SELinuxProject/refpolicy]. + +In order to fully override the refpolicy the following configuration +variables have to be set: + + * BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + * BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL + * BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION + +Chapter 11. Frequently Asked Questions & Troubleshooting + +11.1. The boot hangs after Starting network… If the boot process seems to hang after the following messages (messages not necessarily exactly similar, depending on the list of @@ -3021,7 +3148,7 @@ and set the appropriate port and baud rate in the getty options submenu. This will automatically tune the /etc/inittab file of the generated system so that a shell starts on the correct serial port. -10.2. Why is there no compiler on the target? +11.2. Why is there no compiler on the target? It has been decided that support for the native compiler on the target would be stopped from the Buildroot-2012.11 release because: @@ -3046,16 +3173,16 @@ and you should opt for something like: * Arch Linux ARM [http://archlinuxarm.org] * … -10.3. Why are there no development files on the target? +11.3. Why are there no development files on the target? -Since there is no compiler available on the target (see Section 10.2, +Since there is no compiler available on the target (see Section 11.2, “Why is there no compiler on the target?”), it does not make sense to waste space with headers or static libraries. Therefore, those files are always removed from the target since the Buildroot-2012.11 release. -10.4. Why is there no documentation on the target? +11.4. Why is there no documentation on the target? Because Buildroot mostly targets small or very small target hardware with limited resource onboard (CPU, ram, mass-storage), it does not @@ -3063,10 +3190,10 @@ make sense to waste space with the documentation data. If you need documentation data on your target anyway, then Buildroot is not suitable for your purpose, and you should look for a real -distribution (see: Section 10.2, “Why is there no compiler on the +distribution (see: Section 11.2, “Why is there no compiler on the target?”). -10.5. Why are some packages not visible in the Buildroot config menu? +11.5. Why are some packages not visible in the Buildroot config menu? If a package exists in the Buildroot tree and does not appear in the config menu, this most likely means that some of the package’s @@ -3083,7 +3210,7 @@ If the package is not visible due to some unmet toolchain options, then you should certainly run a full rebuild (see Section 8.1, “make tips” for more explanations). -10.6. Why not use the target directory as a chroot directory? +11.6. Why not use the target directory as a chroot directory? There are plenty of reasons to not use the target directory a chroot one, among these: @@ -3099,7 +3226,7 @@ If you want to run the target filesystem inside a chroot, or as an NFS root, then use the tarball image generated in images/ and extract it as root. -10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)? +11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)? One feature that is often discussed on the Buildroot list is the general topic of "package management". To summarize, the idea would @@ -3196,7 +3323,7 @@ statement: once, the image deployed to the embedded system is guaranteed to really be the one that has been tested and validated. -10.8. How to speed-up the build process? +11.8. How to speed-up the build process? Since Buildroot often involves doing full rebuilds of the entire system that can be quite long, we provide below a number of tips to @@ -3230,7 +3357,7 @@ help reduce the build time: * Experiment with top-level parallel build, see Section 8.11, “Top-level parallel build”. -Chapter 11. Known issues +Chapter 12. Known issues * It is not possible to pass extra linker options via BR2_TARGET_LDFLAGS if such options contain a $ sign. For example, @@ -3241,9 +3368,9 @@ Chapter 11. Known issues * The prboom package triggers a compiler failure with the SuperH 4 compiler from Sourcery CodeBench, version 2012.09. -Chapter 12. Legal notice and licensing +Chapter 13. Legal notice and licensing -12.1. Complying with open source licenses +13.1. Complying with open source licenses All of the end products of Buildroot (toolchain, root filesystem, kernel, bootloaders) contain open source software, released under @@ -3320,7 +3447,7 @@ check the output of make legal-info before using it as your own compliance delivery. See the NO WARRANTY clauses (clauses 11 and 12) in the COPYING file at the root of the Buildroot distribution. -12.2. Complying with the Buildroot license +13.2. Complying with the Buildroot license Buildroot itself is an open source software, released under the GNU General Public License, version 2 [http://www.gnu.org/licenses/ @@ -3347,7 +3474,7 @@ Keep in mind that this is only the Buildroot developers' opinion, and you should consult your legal department or lawyer in case of any doubt. -12.2.1. Patches to packages +13.2.1. Patches to packages Buildroot also bundles patch files, which are applied to the sources of the various packages. Those patches are not covered by the license @@ -3356,13 +3483,13 @@ software to which the patches are applied. When said software is available under multiple licenses, the Buildroot patches are only provided under the publicly accessible licenses. -See Chapter 18, Patching a package for the technical details. +See Chapter 19, Patching a package for the technical details. -Chapter 13. Beyond Buildroot +Chapter 14. Beyond Buildroot -13.1. Boot the generated images +14.1. Boot the generated images -13.1.1. NFS boot +14.1.1. NFS boot To achieve NFS-boot, enable tar root filesystem in the Filesystem images menu. @@ -3376,7 +3503,7 @@ Remember to add this path to /etc/exports. Then, you can execute a NFS-boot from your target. -13.1.2. Live CD +14.1.2. Live CD To build a live CD image, enable the iso image option in the Filesystem images menu. Note that this option is only available on @@ -3400,7 +3527,7 @@ It can be easily flashed to a USB drive with dd: dd if=output/images/rootfs.iso9660 of=/dev/sdb -13.2. Chroot +14.2. Chroot If you want to chroot in a generated image, then there are few thing you should be aware of: @@ -3417,69 +3544,70 @@ Part III. Developer guide Table of Contents -14. How Buildroot works -15. Coding style +15. How Buildroot works +16. Coding style - 15.1. Config.in file - 15.2. The .mk file - 15.3. The documentation - 15.4. Support scripts + 16.1. Config.in file + 16.2. The .mk file + 16.3. The documentation + 16.4. Support scripts -16. Adding support for a particular board -17. Adding new packages to Buildroot +17. Adding support for a particular board +18. Adding new packages to Buildroot - 17.1. Package directory - 17.2. Config files - 17.3. The .mk file - 17.4. The .hash file - 17.5. Infrastructure for packages with specific build systems - 17.6. Infrastructure for autotools-based packages - 17.7. Infrastructure for CMake-based packages - 17.8. Infrastructure for Python packages - 17.9. Infrastructure for LuaRocks-based packages - 17.10. Infrastructure for Perl/CPAN packages - 17.11. Infrastructure for virtual packages - 17.12. Infrastructure for packages using kconfig for + 18.1. Package directory + 18.2. Config files + 18.3. The .mk file + 18.4. The .hash file + 18.5. Infrastructure for packages with specific build systems + 18.6. Infrastructure for autotools-based packages + 18.7. Infrastructure for CMake-based packages + 18.8. Infrastructure for Python packages + 18.9. Infrastructure for LuaRocks-based packages + 18.10. Infrastructure for Perl/CPAN packages + 18.11. Infrastructure for virtual packages + 18.12. Infrastructure for packages using kconfig for configuration files - 17.13. Infrastructure for rebar-based packages - 17.14. Infrastructure for Waf-based packages - 17.15. Infrastructure for Meson-based packages - 17.16. Integration of Cargo-based packages - 17.17. Infrastructure for Go packages - 17.18. Infrastructure for packages building kernel modules - 17.19. Infrastructure for asciidoc documents - 17.20. Infrastructure specific to the Linux kernel package - 17.21. Hooks available in the various build steps - 17.22. Gettext integration and interaction with packages - 17.23. Tips and tricks - 17.24. Conclusion + 18.13. Infrastructure for rebar-based packages + 18.14. Infrastructure for Waf-based packages + 18.15. Infrastructure for Meson-based packages + 18.16. Integration of Cargo-based packages + 18.17. Infrastructure for Go packages + 18.18. Infrastructure for QMake-based packages + 18.19. Infrastructure for packages building kernel modules + 18.20. Infrastructure for asciidoc documents + 18.21. Infrastructure specific to the Linux kernel package + 18.22. Hooks available in the various build steps + 18.23. Gettext integration and interaction with packages + 18.24. Tips and tricks + 18.25. Conclusion -18. Patching a package +19. Patching a package - 18.1. Providing patches - 18.2. How patches are applied - 18.3. Format and licensing of the package patches - 18.4. Integrating patches found on the Web + 19.1. Providing patches + 19.2. How patches are applied + 19.3. Format and licensing of the package patches + 19.4. Integrating patches found on the Web -19. Download infrastructure -20. Debugging Buildroot -21. Contributing to Buildroot +20. Download infrastructure +21. Debugging Buildroot +22. Contributing to Buildroot - 21.1. Reproducing, analyzing and fixing bugs - 21.2. Analyzing and fixing autobuild failures - 21.3. Reviewing and testing patches - 21.4. Work on items from the TODO list - 21.5. Submitting patches - 21.6. Reporting issues/bugs or getting help - 21.7. Using the run-tests framework + 22.1. Reproducing, analyzing and fixing bugs + 22.2. Analyzing and fixing autobuild failures + 22.3. Reviewing and testing patches + 22.4. Work on items from the TODO list + 22.5. Submitting patches + 22.6. Reporting issues/bugs or getting help + 22.7. Using the run-tests framework -22. DEVELOPERS file and get-developers -23. Release Engineering +23. DEVELOPERS file and get-developers +24. Release Engineering - 23.1. Releases - 23.2. Development + 24.1. Releases + 24.2. Development -Chapter 14. How Buildroot works +Chapter 15. How Buildroot works As mentioned above, Buildroot is basically a set of Makefiles that download, configure, and compile software with the correct options. @@ -3536,7 +3664,7 @@ configuration is done): bootloader and the generation of the root filesystem images, depending on the configuration. -Chapter 15. Coding style +Chapter 16. Coding style Overall, these coding style rules are here to help you to add new files in Buildroot or refactor existing ones. @@ -3549,7 +3677,7 @@ keep the consistency of the whole file, so you can: * or entirely rework it in order to make it comply with these rules. -15.1. Config.in file +16.1. Config.in file Config.in files contain entries for almost anything configurable in Buildroot. @@ -3578,7 +3706,7 @@ Buildroot, which is the regular Kconfig. For further details about the Kconfig language, refer to http://kernel.org/doc/Documentation/ kbuild/kconfig-language.txt. -15.2. The .mk file +16.2. The .mk file * Header: The file starts with a header. It contains the module name, preferably in lowercase, enclosed between separators made @@ -3648,7 +3776,7 @@ kbuild/kconfig-language.txt. LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif -15.3. The documentation +16.3. The documentation The documentation uses the asciidoc [http://www.methods.co.nz/ asciidoc/] format. @@ -3656,13 +3784,13 @@ asciidoc/] format. For further details about the asciidoc syntax, refer to http:// www.methods.co.nz/asciidoc/userguide.html. -15.4. Support scripts +16.4. Support scripts Some scripts in the support/ and utils/ directories are written in Python and should follow the PEP8 Style Guide for Python Code [https: //www.python.org/dev/peps/pep-0008/]. -Chapter 16. Adding support for a particular board +Chapter 17. Adding support for a particular board Buildroot contains basic configurations for several publicly available hardware boards, so that users of such a board can easily @@ -3708,7 +3836,7 @@ configurations in these directories, and reference them from the main Buildroot configuration. Refer to Chapter 9, Project-specific customization for more details. -Chapter 17. Adding new packages to Buildroot +Chapter 18. Adding new packages to Buildroot This section covers how new packages (userspace libraries or applications) can be integrated into Buildroot. It also shows how @@ -3716,11 +3844,11 @@ existing packages are integrated, which is needed for fixing issues or tuning their configuration. When you add a new package, be sure to test it in various conditions -(see Section 17.23.3, “How to test your package”) and also check it -for coding style (see Section 17.23.2, “How to check the coding +(see Section 18.24.3, “How to test your package”) and also check it +for coding style (see Section 18.24.2, “How to check the coding style”). -17.1. Package directory +18.1. Package directory First of all, create a directory under the package directory for your software, for example libfoo. @@ -3730,13 +3858,13 @@ qt5 and gstreamer. If your package fits in one of these categories, then create your package directory in these. New subdirectories are discouraged, however. -17.2. Config files +18.2. Config files For the package to be displayed in the configuration tool, you need to create a Config file in your package directory. There are two types: Config.in and Config.in.host. -17.2.1. Config.in file +18.2.1. Config.in file For packages used on the target, create a file named Config.in. This file will contain the option descriptions related to our libfoo @@ -3784,7 +3912,7 @@ contain anything but the bare name of the package. source "package/libfoo/Config.in" -17.2.2. Config.in.host file +18.2.2. Config.in.host file Some packages also need to be built for the host system. There are two options here: @@ -3817,7 +3945,7 @@ two options here: The host package will then be available from the Host utilities menu. -17.2.3. Choosing depends on or select +18.2.3. Choosing depends on or select The Config.in file of your package must also ensure that dependencies are enabled. Typically, Buildroot uses the following rules: @@ -3832,7 +3960,7 @@ are enabled. Typically, Buildroot uses the following rules: * Use a depends on type of dependency when the user really needs to be aware of the dependency. Typically, Buildroot uses this type of dependency for dependencies on target architecture, MMU - support and toolchain options (see Section 17.2.4, “Dependencies + support and toolchain options (see Section 18.2.4, “Dependencies on target and toolchain options”), or for dependencies on "big" things, such as the X.org system. The depends on keyword expresses the dependency with a forward semantic. @@ -3914,7 +4042,7 @@ package. Further formatting details: see the coding style. -17.2.4. Dependencies on target and toolchain options +18.2.4. Dependencies on target and toolchain options Many packages depend on certain options of the toolchain: the choice of C library, C++ support, thread support, RPC support, wchar @@ -4049,7 +4177,7 @@ the text to use in the comment. + Dependency symbol: !BR2_STATIC_LIBS + Comment string: dynamic library -17.2.5. Dependencies on a Linux kernel built by buildroot +18.2.5. Dependencies on a Linux kernel built by buildroot Some packages need a Linux kernel to be built by buildroot. These are typically kernel modules or firmware. A comment should be added in @@ -4063,7 +4191,7 @@ kernel, use this format: foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built -17.2.6. Dependencies on udev /dev management +18.2.6. Dependencies on udev /dev management If a package needs udev /dev management, it should depend on symbol BR2_PACKAGE_HAS_UDEV, and the following comment should be added: @@ -4075,15 +4203,15 @@ management, use this format: foo needs udev /dev management and a toolchain w/ featA, featB, featC -17.2.7. Dependencies on features provided by virtual packages +18.2.7. Dependencies on features provided by virtual packages Some features can be provided by more than one package, such as the openGL libraries. -See Section 17.11, “Infrastructure for virtual packages” for more on +See Section 18.11, “Infrastructure for virtual packages” for more on the virtual packages. -17.3. The .mk file +18.3. The .mk file Finally, here’s the hardest part. Create a file named libfoo.mk. It describes how the package should be downloaded, configured, built, @@ -4122,7 +4250,7 @@ different way, using different infrastructures: Further formatting details: see the writing rules. -17.4. The .hash file +18.4. The .hash file When possible, you must add a third file, named libfoo.hash, that contains the hashes of the downloaded files for the libfoo package. @@ -4182,7 +4310,7 @@ Note. The hashes for license files are used to detect a license change when a package version is bumped. The hashes are checked during the make legal-info target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory - of that package (see also Section 18.2, “How patches + of that package (see also Section 19.2, “How patches are applied”). The none hash type is reserved to those archives downloaded from a @@ -4238,14 +4366,14 @@ instead be added locally to the package folder. If the .hash file is missing, then no check is done at all. -17.5. Infrastructure for packages with specific build systems +18.5. Infrastructure for packages with specific build systems By packages with specific build systems we mean all the packages whose build system is not one of the standard ones, such as autotools or CMake. This typically includes packages whose build system is based on hand-written Makefiles or shell scripts. -17.5.1. generic-package tutorial +18.5.1. generic-package tutorial 01: ################################################################################ 02: # @@ -4329,7 +4457,7 @@ be given. In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed from $(TARGET_DIR)/usr/bin, since they are not needed on the target. -Example 17.1. Config script: divine package +Example 18.1. Config script: divine package Package divine installs shell script $(STAGING_DIR)/usr/bin/ divine-config. @@ -4339,7 +4467,7 @@ So its fixup would be: DIVINE_CONFIG_SCRIPTS = divine-config -Example 17.2. Config script: imagemagick package: +Example 18.2. Config script: imagemagick package: Package imagemagick installs the following scripts: $(STAGING_DIR)/ usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config @@ -4382,7 +4510,7 @@ Finally, on line 43, we call the generic-package function, which generates, according to the variables defined previously, all the Makefile code necessary to make your package working. -17.5.2. generic-package reference +18.5.2. generic-package reference There are two variants of the generic target. The generic-package macro is used for packages to be cross-compiled for the target. The @@ -4471,7 +4599,7 @@ information is (assuming the package name is libfoo) : Mercurial, and Bazaar are supported URL types for retrieving packages directly from source code management systems. There is a helper function to make it easier to download source tarballs - from GitHub (refer to Section 17.23.4, “How to add a package from + from GitHub (refer to Section 18.24.4, “How to add a package from GitHub” for details). A filesystem path may be used to specify either a tarball or a directory containing the package source code. See LIBFOO_SITE_METHOD below for more details on how @@ -4548,7 +4676,7 @@ information is (assuming the package name is libfoo) : source directory into the package’s build directory. Note that for local packages, no patches are applied. If you need to still patch the source code, use LIBFOO_POST_RSYNC_HOOKS, - see Section 17.21.1, “Using the POST_RSYNC hook”. + see Section 18.22.1, “Using the POST_RSYNC hook”. * LIBFOO_GIT_SUBMODULES can be set to YES to create an archive with the git submodules in the repository. This is only available for packages downloaded with git (i.e. when LIBFOO_SITE_METHOD=git). @@ -4590,7 +4718,7 @@ information is (assuming the package name is libfoo) : used; usually, LIBFOO_DEPENDENCIES is what you really want to use. * LIBFOO_PROVIDES lists all the virtual packages libfoo is an - implementation of. See Section 17.11, “Infrastructure for virtual + implementation of. See Section 18.11, “Infrastructure for virtual packages”. * LIBFOO_INSTALL_STAGING can be set to YES or NO (default). If set to YES, then the commands in the LIBFOO_INSTALL_STAGING_CMDS @@ -4613,17 +4741,17 @@ information is (assuming the package name is libfoo) : * LIBFOO_DEVICES lists the device files to be created by Buildroot when using the static device table. The syntax to use is the makedevs one. You can find some documentation for this syntax in - the Chapter 24, Makedev syntax documentation. This variable is + the Chapter 25, Makedev syntax documentation. This variable is optional. * LIBFOO_PERMISSIONS lists the changes of permissions to be done at the end of the build process. The syntax is once again the makedevs one. You can find some documentation for this syntax in - the Chapter 24, Makedev syntax documentation. This variable is + the Chapter 25, Makedev syntax documentation. This variable is optional. * LIBFOO_USERS lists the users to create for this package, if it installs a program you want to run as a specific user (e.g. as a daemon, or as a cron-job). The syntax is similar in spirit to the - makedevs one, and is described in the Chapter 25, Makeusers + makedevs one, and is described in the Chapter 26, Makeusers syntax documentation. This variable is optional. * LIBFOO_LICENSE defines the license (or licenses) under which the package is released. This name will appear in the manifest file @@ -4653,7 +4781,7 @@ information is (assuming the package name is libfoo) : * LIBFOO_LICENSE_FILES is a space-separated list of files in the package tarball that contain the license(s) under which the package is released. make legal-info copies all of these files in - the legal-info directory. See Chapter 12, Legal notice and + the legal-info directory. See Chapter 13, Legal notice and licensing for more information. This variable is optional. If it is not defined, a warning will be produced to let you know, and not saved will appear in the license files field of the manifest @@ -4771,6 +4899,13 @@ different steps of the build process. can print anything in any format. This is seldom used, as packages rarely have custom rules. Do not use this variable, unless you really know that you need to print help. + * LIBFOO_LINUX_CONFIG_FIXUPS lists the Linux kernel configuration + options that are needed to build and use this package, and + without which the package is fundamentally broken. This shall be + a set of calls to one of the kconfig tweaking option: + KCONFIG_ENABLE_OPT, KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT. This + is seldom used, as package usually have no strict requirements on + the kernel options. The preferred way to define these variables is: @@ -4803,12 +4938,12 @@ In the action definitions, you can use the following variables: TARGET_DIR. See Section 8.11, “Top-level parallel build” for more details about per-package directory support. -Finally, you can also use hooks. See Section 17.21, “Hooks available +Finally, you can also use hooks. See Section 18.22, “Hooks available in the various build steps” for more information. -17.6. Infrastructure for autotools-based packages +18.6. Infrastructure for autotools-based packages -17.6.1. autotools-package tutorial +18.6.1. autotools-package tutorial First, let’s see how to write a .mk file for an autotools-based package, with an example : @@ -4865,7 +5000,7 @@ Finally, on line line 15, we invoke the autotools-package macro that generates all the Makefile rules that actually allows the package to be built. -17.6.2. autotools-package reference +18.6.2. autotools-package reference The main macro of the autotools package infrastructure is autotools-package. It is similar to the generic-package macro. The @@ -4948,7 +5083,7 @@ well for most autotools-based packages. However, when required, it is still possible to customize what is done in any particular step: * By adding a post-operation hook (after extract, patch, configure, - build or install). See Section 17.21, “Hooks available in the + build or install). See Section 18.22, “Hooks available in the various build steps” for details. * By overriding one of the steps. For example, even if the autotools infrastructure is used, if the package .mk file defines @@ -4957,9 +5092,9 @@ still possible to customize what is done in any particular step: be restricted to very specific cases. Do not use it in the general case. -17.7. Infrastructure for CMake-based packages +18.7. Infrastructure for CMake-based packages -17.7.1. cmake-package tutorial +18.7.1. cmake-package tutorial First, let’s see how to write a .mk file for a CMake-based package, with an example : @@ -5015,7 +5150,7 @@ Finally, on line line 15, we invoke the cmake-package macro that generates all the Makefile rules that actually allows the package to be built. -17.7.2. cmake-package reference +18.7.2. cmake-package reference The main macro of the CMake package infrastructure is cmake-package. It is similar to the generic-package macro. The ability to have @@ -5087,7 +5222,7 @@ well for most CMake-based packages. However, when required, it is still possible to customize what is done in any particular step: * By adding a post-operation hook (after extract, patch, configure, - build or install). See Section 17.21, “Hooks available in the + build or install). See Section 18.22, “Hooks available in the various build steps” for details. * By overriding one of the steps. For example, even if the CMake infrastructure is used, if the package .mk file defines its own @@ -5096,13 +5231,13 @@ still possible to customize what is done in any particular step: restricted to very specific cases. Do not use it in the general case. -17.8. Infrastructure for Python packages +18.8. Infrastructure for Python packages This infrastructure applies to Python packages that use the standard Python setuptools mechanism as their build system, generally recognizable by the usage of a setup.py script. -17.8.1. python-package tutorial +18.8.1. python-package tutorial First, let’s see how to write a .mk file for a Python package, with an example : @@ -5148,7 +5283,7 @@ Finally, on line 16, we invoke the python-package macro that generates all the Makefile rules that actually allow the package to be built. -17.8.2. python-package reference +18.8.2. python-package reference As a policy, packages that merely provide Python modules should all be named python- in Buildroot. Other packages that use the @@ -5247,7 +5382,7 @@ well for most Python-based packages. However, when required, it is still possible to customize what is done in any particular step: * By adding a post-operation hook (after extract, patch, configure, - build or install). See Section 17.21, “Hooks available in the + build or install). See Section 18.22, “Hooks available in the various build steps” for details. * By overriding one of the steps. For example, even if the Python infrastructure is used, if the package .mk file defines its own @@ -5256,7 +5391,7 @@ still possible to customize what is done in any particular step: restricted to very specific cases. Do not use it in the general case. -17.8.3. Generating a python-package from a PyPI repository +18.8.3. Generating a python-package from a PyPI repository If the Python package for which you would like to create a Buildroot package is available on PyPI, you may want to use the scanpypi tool @@ -5298,7 +5433,7 @@ Option -h will list the available options: utils/scanpypi -h -17.8.4. python-package CFFI backend +18.8.4. python-package CFFI backend C Foreign Function Interface for Python (CFFI) provides a convenient and reliable way to call compiled C code from Python using interface @@ -5332,9 +5467,9 @@ PYTHON_FOO_DEPENDENCIES = host-python-cffi $(eval $(python-package)) -17.9. Infrastructure for LuaRocks-based packages +18.9. Infrastructure for LuaRocks-based packages -17.9.1. luarocks-package tutorial +18.9.1. luarocks-package tutorial First, let’s see how to write a .mk file for a LuaRocks-based package, with an example : @@ -5387,7 +5522,7 @@ manually inspected and possibly modified. * The package/Config.in file has to be updated manually to include the generated Config.in files. -17.9.2. luarocks-package reference +18.9.2. luarocks-package reference LuaRocks is a deployment and management system for Lua modules, and supports various build.type: builtin, make and cmake. In the context @@ -5399,9 +5534,7 @@ cmake-package infrastructures in Buildroot, respectively. The main macro of the LuaRocks package infrastructure is luarocks-package: like generic-package it works by defining a number of variables providing metadata information about the package, and -then calling luarocks-package. It is worth mentioning that building -LuaRocks packages for the host is not supported, so the macro -host-luarocks-package is not implemented. +then calling luarocks-package. Just like the generic infrastructure, the LuaRocks infrastructure works by defining a number of variables before calling the @@ -5432,9 +5565,9 @@ are also defined. They can be overridden in specific cases. * LUA_FOO_BUILD_OPTS contains additional build options for the luarocks build call. -17.10. Infrastructure for Perl/CPAN packages +18.10. Infrastructure for Perl/CPAN packages -17.10.1. perl-package tutorial +18.10.1. perl-package tutorial First, let’s see how to write a .mk file for a Perl/CPAN package, with an example : @@ -5491,7 +5624,7 @@ the result. In particular, the following things should be checked. prints out the required source "…" statements, sorted alphabetically. -17.10.2. perl-package reference +18.10.2. perl-package reference As a policy, packages that provide Perl/CPAN modules should all be named perl- in Buildroot. @@ -5547,7 +5680,7 @@ cases, typical packages will therefore only use a few of them. to make pure_install or perl Build install in the install step. By default, empty. -17.11. Infrastructure for virtual packages +18.11. Infrastructure for virtual packages In Buildroot, a virtual package is a package whose functionalities are provided by one or more packages, referred to as providers. The @@ -5560,14 +5693,14 @@ Allwinner Tech Sunxi and the Texas Instruments OMAP35xx platforms. So libgles will be a virtual package and sunxi-mali and ti-gfx will be the providers. -17.11.1. virtual-package tutorial +18.11.1. virtual-package tutorial In the following example, we will explain how to add a new virtual package (something-virtual) and a provider for it (some-provider). First, let’s create the virtual package. -17.11.2. Virtual package’s Config.in file +18.11.2. Virtual package’s Config.in file The Config.in file of virtual package something-virtual should contain: @@ -5584,7 +5717,7 @@ BR2_PACKAGE_HAS_SOMETHING_VIRTUAL and BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL, whose values will be used by the providers. -17.11.3. Virtual package’s .mk file +18.11.3. Virtual package’s .mk file The .mk for the virtual package should just evaluate the virtual-package macro: @@ -5600,7 +5733,7 @@ virtual-package macro: The ability to have target and host packages is also available, with the host-virtual-package macro. -17.11.4. Provider’s Config.in file +18.11.4. Provider’s Config.in file When adding a package as a provider, only the Config.in file requires some modifications. @@ -5625,7 +5758,7 @@ On line 3, we select BR2_PACKAGE_HAS_SOMETHING_VIRTUAL, and on line 11, we set the value of BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL to the name of the provider, but only if it is selected. -17.11.5. Provider’s .mk file +18.11.5. Provider’s .mk file The .mk file should also declare an additional variable SOME_PROVIDER_PROVIDES to contain the names of all the virtual @@ -5636,7 +5769,7 @@ packages it is an implementation of: Of course, do not forget to add the proper build and runtime dependencies for this package! -17.11.6. Notes on depending on a virtual package +18.11.6. Notes on depending on a virtual package When adding a package that requires a certain FEATURE provided by a virtual package, you have to use depends on BR2_PACKAGE_HAS_FEATURE, @@ -5649,7 +5782,7 @@ config BR2_PACKAGE_FOO bool "foo" depends on BR2_PACKAGE_HAS_FEATURE -17.11.7. Notes on depending on a specific provider +18.11.7. Notes on depending on a specific provider If your package really requires a specific provider, then you’ll have to make your package depends on this provider; you can not select a @@ -5680,7 +5813,7 @@ user, the other implicitly by your select. Instead, you have to use depends on BR2_PACKAGE_FOO, which avoids any implicit configuration inconsistency. -17.12. Infrastructure for packages using kconfig for configuration +18.12. Infrastructure for packages using kconfig for configuration files A popular way for a software package to handle user-specified @@ -5697,7 +5830,7 @@ configuration file in a correct way. The kconfig-package infrastructure is based on the generic-package infrastructure. All variables supported by generic-package are -available in kconfig-package as well. See Section 17.5.2, +available in kconfig-package as well. See Section 18.5.2, “generic-package reference” for more details. In order to use the kconfig-package infrastructure for a Buildroot @@ -5764,9 +5897,9 @@ consideration: host packages) that need to be built before this package’s kconfig is interpreted. Seldom used. By default, empty. -17.13. Infrastructure for rebar-based packages +18.13. Infrastructure for rebar-based packages -17.13.1. rebar-package tutorial +18.13.1. rebar-package tutorial First, let’s see how to write a .mk file for a rebar-based package, with an example : @@ -5796,7 +5929,7 @@ before the build process of our package starts. Finally, on line 12, we invoke the rebar-package macro that generates all the Makefile rules that actually allows the package to be built. -17.13.2. rebar-package reference +18.13.2. rebar-package reference The main macro of the rebar package infrastructure is rebar-package. It is similar to the generic-package macro. The ability to have host @@ -5849,7 +5982,7 @@ well for most rebar-based packages. However, when required, it is still possible to customize what is done in any particular step: * By adding a post-operation hook (after extract, patch, configure, - build or install). See Section 17.21, “Hooks available in the + build or install). See Section 18.22, “Hooks available in the various build steps” for details. * By overriding one of the steps. For example, even if the rebar infrastructure is used, if the package .mk file defines its own @@ -5858,9 +5991,9 @@ still possible to customize what is done in any particular step: restricted to very specific cases. Do not use it in the general case. -17.14. Infrastructure for Waf-based packages +18.14. Infrastructure for Waf-based packages -17.14.1. waf-package tutorial +18.14.1. waf-package tutorial First, let’s see how to write a .mk file for a Waf-based package, with an example : @@ -5893,7 +6026,7 @@ Finally, on line line 13, we invoke the waf-package macro that generates all the Makefile rules that actually allows the package to be built. -17.14.2. waf-package reference +18.14.2. waf-package reference The main macro of the Waf package infrastructure is waf-package. It is similar to the generic-package macro. @@ -5935,9 +6068,9 @@ be defined. to the waf script during the target installation step. By default, empty. -17.15. Infrastructure for Meson-based packages +18.15. Infrastructure for Meson-based packages -17.15.1. meson-package tutorial +18.15.1. meson-package tutorial Meson [http://mesonbuild.com] is an open source build system meant to be both extremely fast, and, even more importantly, as user friendly @@ -5998,7 +6131,7 @@ can be copied verbatim then edited to replace all occurences of FOO with the uppercase name of the new package and update the values of the standard variables. -17.15.2. meson-package reference +18.15.2. meson-package reference The main macro of the Meson package infrastructure is meson-package. It is similar to the generic-package macro. The ability to have @@ -6043,33 +6176,41 @@ typical packages will therefore only use a few of them. and with the path of the program between single quotes. By default, empty. Note that Buildroot already sets the correct values for c, cpp, ar, strip, and pkgconfig. + * FOO_MESON_EXTRA_PROPERTIES, to specify a space-separated list of + properties to add to the [properties] section of the meson + cross-compilation.conf configuration file. The format is + property-name= with no space around the = sign, and with + single quotes around string values. By default, empty. Note that + Buildroot already sets values for needs_exe_wrapper, c_args, + c_link_args, cpp_args, cpp_link_args, sys_root, and + pkg_config_libdir. * FOO_NINJA_ENV, to specify additional environment variables to pass to ninja, meson companion tool in charge of the build operations. By default, empty. * FOO_NINJA_OPTS, to specify a space-separated list of targets to build. By default, empty, to build the default target(s). -17.16. Integration of Cargo-based packages +18.16. Integration of Cargo-based packages Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and manages their dependencies, to ensure repeatable builds. Cargo packages are called "crates". -17.16.1. Cargo-based package’s Config.in file +18.16.1. Cargo-based package’s Config.in file The Config.in file of Cargo-based package foo should contain: 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS -04: select BR2_PACKAGE_HOST_CARGO +04: select BR2_PACKAGE_HOST_RUSTC 05: help 06: This is a comment that explains what foo is. 07: 08: http://foosoftware.org/foo/ -17.16.2. Cargo-based package’s .mk file +18.16.2. Cargo-based package’s .mk file Buildroot does not (yet) provide a dedicated package infrastructure for Cargo-based packages. So, we will explain how to write a .mk file @@ -6087,7 +6228,7 @@ for such a package. Let’s start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-cargo +13: FOO_DEPENDENCIES = host-rustc 14: 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo 16: @@ -6131,7 +6272,7 @@ can be copied verbatim then edited to replace all occurences of FOO with the uppercase name of the new package and update the values of the standard variables. -17.16.3. About Dependencies Management +18.16.3. About Dependencies Management A crate can depend on other libraries from crates.io or git repositories, listed in its Cargo.toml file. Before starting a build, @@ -6148,12 +6289,12 @@ an offline build, as Cargo will fail to fetch the dependencies. In that case, it is advised to generate a tarball of the dependencies using the cargo vendor and add it to FOO_EXTRA_DOWNLOADS. -17.17. Infrastructure for Go packages +18.17. Infrastructure for Go packages This infrastructure applies to Go packages that use the standard build system and use bundled dependencies. -17.17.1. golang-package tutorial +18.17.1. golang-package tutorial First, let’s see how to write a .mk file for a go package, with an example : @@ -6183,7 +6324,7 @@ Finally, on line 12, we invoke the golang-package macro that generates all the Makefile rules that actually allow the package to be built. -17.17.2. golang-package reference +18.17.2. golang-package reference In their Config.in file, packages using the golang-package infrastructure should depend on @@ -6216,14 +6357,13 @@ optionally be defined, depending on the package’s needs. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them, or none. - * If your package need a custom GOPATH to be compiled in, you can - use the FOO_WORKSPACE variable. The GOPATH being used will be - /. If FOO_WORKSPACE is not - specified, it defaults to _gopath. - * FOO_SRC_SUBDIR is the sub-directory where your source will be - compiled relatively to the GOPATH. An example value is github.com - /bar/foo. If FOO_SRC_SUBDIR is not specified, it defaults to a - value infered from the FOO_SITE variable. + * The package must specify its Go module name in the FOO_GOMOD + variable. If not specified, it defaults to URL-domain/ + 1st-part-of-URL/2nd-part-of-URL, e.g FOO_GOMOD will take the + value github.com/bar/foo for a package that specifies FOO_SITE = + $(call github,bar,foo,$(FOO_VERSION)). The Go package + infrastructure will automatically generate a minimal go.mod file + in the package source tree if it doesn’t exist. * FOO_LDFLAGS and FOO_TAGS can be used to pass respectively the LDFLAGS or the TAGS to the go build command. * FOO_BUILD_TARGETS can be used to pass the list of targets that @@ -6250,7 +6390,7 @@ well for most Go-based packages. However, when required, it is still possible to customize what is done in any particular step: * By adding a post-operation hook (after extract, patch, configure, - build or install). See Section 17.21, “Hooks available in the + build or install). See Section 18.22, “Hooks available in the various build steps” for details. * By overriding one of the steps. For example, even if the Go infrastructure is used, if the package .mk file defines its own @@ -6258,7 +6398,77 @@ possible to customize what is done in any particular step: Go one. However, using this method should be restricted to very specific cases. Do not use it in the general case. -17.18. Infrastructure for packages building kernel modules +18.18. Infrastructure for QMake-based packages + +18.18.1. qmake-package tutorial + +First, let’s see how to write a .mk file for a QMake-based package, +with an example : + +01: ################################################################################ +02: # +03: # libfoo +04: # +05: ################################################################################ +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_CONF_OPTS = QT_CONFIG+=bar QT_CONFIG-=baz +11: LIBFOO_DEPENDENCIES = bar +12: +13: $(eval $(qmake-package)) + +On line 7, we declare the version of the package. + +On line 8 and 9, we declare the name of the tarball (xz-ed tarball +recommended) and the location of the tarball on the Web. Buildroot +will automatically download the tarball from this location. + +On line 10, we tell Buildroot what options to enable for libfoo. + +On line 11, we tell Buildroot the dependencies of libfoo. + +Finally, on line line 13, we invoke the qmake-package macro that +generates all the Makefile rules that actually allows the package to +be built. + +18.18.2. qmake-package reference + +The main macro of the QMake package infrastructure is qmake-package. +It is similar to the generic-package macro. + +Just like the generic infrastructure, the QMake infrastructure works +by defining a number of variables before calling the qmake-package +macro. + +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the QMake infrastructure: +LIBFOO_VERSION, LIBFOO_SOURCE, LIBFOO_PATCH, LIBFOO_SITE, +LIBFOO_SUBDIR, LIBFOO_DEPENDENCIES, LIBFOO_INSTALL_STAGING, +LIBFOO_INSTALL_TARGET. + +An additional variable, specific to the QMake infrastructure, can +also be defined. + + * LIBFOO_CONF_ENV, to specify additional environment variables to + pass to the qmake script for the configuration step. By default, + empty. + * LIBFOO_CONF_OPTS, to specify additional options to pass to the + qmake script for the configuration step. By default, empty. + * LIBFOO_MAKE_ENV, to specify additional environment variables to + the make command during the build and install steps. By default, + empty. + * LIBFOO_MAKE_OPTS, to specify additional targets to pass to the + make command during the build step. By default, empty. + * LIBFOO_INSTALL_STAGING_OPTS, to specify additional targets to + pass to the make command during the staging installation step. By + default, install. + * LIBFOO_INSTALL_TARGET_OPTS, to specify additional targets to pass + to the make command during the target installation step. By + default, install. + +18.19. Infrastructure for packages building kernel modules Buildroot offers a helper infrastructure to make it easy to write packages that build and install Linux kernel modules. Some packages @@ -6266,7 +6476,7 @@ only contain a kernel module, other packages contain programs and libraries in addition to kernel modules. Buildroot’s helper infrastructure supports either case. -17.18.1. kernel-module tutorial +18.19.1. kernel-module tutorial Let’s start with an example on how to prepare a simple package that only builds a kernel module, and no other component: @@ -6341,7 +6551,7 @@ libbar is enabled, the kernel module located in sub-directory driver/ bar, and defines the variable KVERSION to be passed to the Linux buildsystem when building the module(s). -17.18.2. kernel-module reference +18.19.2. kernel-module reference The main macro for the kernel module infrastructure is kernel-module. Unlike other package infrastructures, it is not stand-alone, and @@ -6389,7 +6599,7 @@ You may also reference (but you may not set!) those variables: * KERNEL_ARCH contains the name of the current architecture, like arm, mips… -17.19. Infrastructure for asciidoc documents +18.20. Infrastructure for asciidoc documents The Buildroot manual, which you are currently reading, is entirely written using the AsciiDoc [http://asciidoc.org/] mark-up syntax. The @@ -6410,7 +6620,7 @@ br2-external tree. This allows documentation for a br2-external tree to match the Buildroot documentation, as it will be rendered to the same formats and use the same layout and theme. -17.19.1. asciidoc-document tutorial +18.20.1. asciidoc-document tutorial Whereas package infrastructures are suffixed with -package, the document infrastructures are suffixed with -document. So, the @@ -6437,7 +6647,7 @@ structure. On line 8, we call the asciidoc-document function, which generates all the Makefile code necessary to render the document. -17.19.2. asciidoc-document reference +18.20.2. asciidoc-document reference The list of variables that can be set in a .mk file to give metadata information is (assuming the document name is foo) : @@ -6450,7 +6660,7 @@ information is (assuming the document name is foo) : * FOO_DEPENDENCIES, optional, the list of packages (most probably, host-packages) that must be built before building this document. -There are also additional hooks (see Section 17.21, “Hooks available +There are also additional hooks (see Section 18.22, “Hooks available in the various build steps” for general information on hooks), that a document may set to define extra actions to be done at various steps: @@ -6503,13 +6713,13 @@ Here is a complete example that uses all variables and all hooks: 30: 31: $(eval $(call asciidoc-document)) -17.20. Infrastructure specific to the Linux kernel package +18.21. Infrastructure specific to the Linux kernel package The Linux kernel package can use some specific infrastructures based on package hooks for building Linux kernel tools or/and building Linux kernel extensions. -17.20.1. linux-kernel-tools +18.21.1. linux-kernel-tools Buildroot offers a helper infrastructure to build some userspace tools for the target available within the Linux kernel sources. Since @@ -6585,7 +6795,7 @@ Note. One must not call $(eval $(generic-package)) or any other package infrastructure! Linux tools are not packages by themselves, they are part of the linux-tools package. -17.20.2. linux-kernel-extensions +18.21.2. linux-kernel-extensions Some packages provide new features that require the Linux kernel tree to be modified. This can be in the form of patches to be applied on @@ -6642,7 +6852,7 @@ and can use the variables defined by the foo package, like: $ like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)… See the definition of those kernel variables. -17.21. Hooks available in the various build steps +18.22. Hooks available in the various build steps The generic infrastructure (and as a result also the derived autotools and cmake infrastructures) allow packages to specify hooks. @@ -6687,7 +6897,7 @@ endef LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP -17.21.1. Using the POST_RSYNC hook +18.22.1. Using the POST_RSYNC hook The POST_RSYNC hook is run only for packages that use a local source, either through the local site method or the OVERRIDE_SRCDIR @@ -6707,14 +6917,14 @@ among others, use the following variables: * $(SRCDIR): the path to the overridden source directory * $(@D): the path to the build directory -17.21.2. Target-finalize hook +18.22.2. Target-finalize hook Packages may also register hooks in LIBFOO_TARGET_FINALIZE_HOOKS. These hooks are run after all packages are built, but before the filesystem images are generated. They are seldom used, and your package probably do not need them. -17.22. Gettext integration and interaction with packages +18.23. Gettext integration and interaction with packages Many packages that support internationalization use the gettext library. Dependencies for this library are fairly complicated and @@ -6771,9 +6981,9 @@ package should: * not add any gettext dependency in the DEPENDENCIES variable of their .mk file. -17.23. Tips and tricks +18.24. Tips and tricks -17.23.1. Package name, config entry name and makefile variable +18.24.1. Package name, config entry name and makefile variable relationship In Buildroot, there is some relationship between: @@ -6797,7 +7007,7 @@ the following rules: . and - characters substituted with _ (e.g.: FOO_BAR_BOO_VERSION). -17.23.2. How to check the coding style +18.24.2. How to check the coding style Buildroot provides a script in utils/check-package that checks new or changed files for coding style. It is not a complete language @@ -6823,7 +7033,7 @@ The tool can also be used for packages in a br2-external: $ check-package -b /path/to/br2-ext-tree/package/my-package/* -17.23.3. How to test your package +18.24.3. How to test your package Once you have added your new package, it is important that you test it under various conditions: does it build for all architectures? @@ -6914,7 +7124,7 @@ help by running: $ ./utils/test-pkg -h -17.23.4. How to add a package from GitHub +18.24.4. How to add a package from GitHub Packages on GitHub often don’t have a download area with release tarballs. However, it is possible to download tarballs directly from @@ -6954,7 +7164,7 @@ tag: then it’s an automatically generated tarball and you should use the github helper function. -17.24. Conclusion +18.25. Conclusion As you can see, adding a software package to Buildroot is simply a matter of writing a Makefile using an existing example and modifying @@ -6962,9 +7172,9 @@ it according to the compilation process required by the package. If you package software that might be useful for other people, don’t forget to send a patch to the Buildroot mailing list (see -Section 21.5, “Submitting patches”)! +Section 22.5, “Submitting patches”)! -Chapter 18. Patching a package +Chapter 19. Patching a package While integrating a new package or updating an existing one, it may be necessary to patch the source of the software to get it @@ -6975,9 +7185,9 @@ during the builds. It supports three ways of applying patch sets: downloaded patches, patches supplied within buildroot and patches located in a user-defined global patch directory. -18.1. Providing patches +19.1. Providing patches -18.1.1. Downloaded +19.1.1. Downloaded If it is necessary to apply a patch that is available for download, then add it to the _PATCH variable. If an entry contains @@ -6991,7 +7201,7 @@ Like for all downloads, a hash should be added to the This method is typically used for packages from Debian. -18.1.2. Within Buildroot +19.1.2. Within Buildroot Most patches are provided within Buildroot, in the package directory; these typically aim to fix cross-compilation, libc support, or other @@ -7016,14 +7226,14 @@ Notes the patch application order. This is deprecated, and will be removed in the future. Do not use a series file. -18.1.3. Global patch directory +19.1.3. Global patch directory The BR2_GLOBAL_PATCH_DIR configuration file option can be used to specify a space separated list of one or more directories containing global package patches. See Section 9.8, “Adding project-specific patches” for details. -18.2. How patches are applied +19.2. How patches are applied 1. Run the _PRE_PATCH_HOOKS commands if defined; 2. Cleanup the build directory, removing any existing *.rej files; @@ -7047,10 +7257,10 @@ patches” for details. If something goes wrong in the steps 3 or 4, then the build fails. -18.3. Format and licensing of the package patches +19.3. Format and licensing of the package patches Patches are released under the same license as the software they -apply to (see Section 12.2, “Complying with the Buildroot license”). +apply to (see Section 13.2, “Complying with the Buildroot license”). A message explaining what the patch does, and why it is needed, should be added in the header commentary of the patch. @@ -7093,7 +7303,7 @@ AC_PROG_MAKE_SET + +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) -18.4. Integrating patches found on the Web +19.4. Integrating patches found on the Web When integrating a patch of which you are not the author, you have to add a few things in the header of the patch itself. @@ -7111,11 +7321,11 @@ Fetch from: It is also sensible to add a few words about any changes to the patch that may have been necessary. -Chapter 19. Download infrastructure +Chapter 20. Download infrastructure TODO -Chapter 20. Debugging Buildroot +Chapter 21. Debugging Buildroot It is possible to instrument the steps Buildroot does when building packages. Define the variable BR2_INSTRUMENTATION_SCRIPTS to contain @@ -7148,14 +7358,14 @@ The list of steps is: The script has access to the following variables: * BR2_CONFIG: the path to the Buildroot .config file - * HOST_DIR, STAGING_DIR, TARGET_DIR: see Section 17.5.2, + * HOST_DIR, STAGING_DIR, TARGET_DIR: see Section 18.5.2, “generic-package reference” * BUILD_DIR: the directory where packages are extracted and built * BINARIES_DIR: the place where all binary files (aka images) are stored * BASE_DIR: the base output directory -Chapter 21. Contributing to Buildroot +Chapter 22. Contributing to Buildroot There are many ways in which you can contribute to Buildroot: analyzing and fixing bugs, analyzing and fixing package build @@ -7177,7 +7387,7 @@ directly send your patches to the mailing list. Refer to Chapter 3, Getting Buildroot for more information on obtaining a Buildroot git tree. -21.1. Reproducing, analyzing and fixing bugs +22.1. Reproducing, analyzing and fixing bugs A first way of contributing is to have a look at the open bug reports in the Buildroot bug tracker [https://bugs.buildroot.org/buglist.cgi? @@ -7186,7 +7396,7 @@ possible, all help in reproducing, analyzing and fixing reported bugs is more than welcome. Don’t hesitate to add a comment to bug reports reporting your findings, even if you don’t yet see the full picture. -21.2. Analyzing and fixing autobuild failures +22.2. Analyzing and fixing autobuild failures The Buildroot autobuilders are a set of build machines that continuously run Buildroot builds based on random configurations. @@ -7222,7 +7432,7 @@ basically two things that can be done: 2. Analyze the problem and create a fix. 3. Verify that the problem is really fixed by starting from a clean Buildroot tree and only applying your fix. - 4. Send the fix to the Buildroot mailing list (see Section 21.5, + 4. Send the fix to the Buildroot mailing list (see Section 22.5, “Submitting patches”). In case you created a patch against the package sources, you should also send the patch upstream so that the problem will be fixed in a later release, and the @@ -7232,7 +7442,7 @@ basically two things that can be done: Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 -21.3. Reviewing and testing patches +22.3. Reviewing and testing patches With the amount of patches sent to the mailing list each day, the maintainer has a very hard job to judge which patches are ready to @@ -7249,7 +7459,7 @@ To indicate approval of a patch, there are three formal tags that keep track of this approval. To add your tag to a patch, reply to it with the approval tag below the original author’s Signed-off-by line. These tags will be picked up automatically by patchwork (see -Section 21.3.1, “Applying Patches from Patchwork”) and will be part +Section 22.3.1, “Applying Patches from Patchwork”) and will be part of the commit log when the patch is accepted. Tested-by @@ -7297,11 +7507,11 @@ more regularly, your trustworthiness (in the eyes of the maintainer) will go up, but any tag provided is valuable. Buildroot’s Patchwork website can be used to pull in patches for -testing purposes. Please see Section 21.3.1, “Applying Patches from +testing purposes. Please see Section 22.3.1, “Applying Patches from Patchwork” for more information on using Buildroot’s Patchwork website to apply patches. -21.3.1. Applying Patches from Patchwork +22.3.1. Applying Patches from Patchwork The main use of Buildroot’s Patchwork website for a developer is for pulling in patches into their local git repository for testing @@ -7320,7 +7530,7 @@ interface. Once the bundle is created and the bundle is made public, you can copy the mbox link for the bundle and apply the bundle using the above commands. -21.4. Work on items from the TODO list +22.4. Work on items from the TODO list If you want to contribute to Buildroot but don’t know where to start, and you don’t like any of the above topics, you can always work on @@ -7329,7 +7539,7 @@ Todo_list]. Don’t hesitate to discuss an item first on the mailing list or on IRC. Do edit the wiki to indicate when you start working on an item, so we avoid duplicate efforts. -21.5. Submitting patches +22.5. Submitting patches Note @@ -7339,7 +7549,7 @@ instead. If you made some changes to Buildroot and you would like to contribute them to the Buildroot project, proceed as follows. -21.5.1. The formatting of a patch +22.5.1. The formatting of a patch We expect patches to be formatted in a specific way. This is necessary to make it easy to review patches, to be able to apply them @@ -7433,10 +7643,10 @@ more information. Buildroot provides a handy tool to check for common coding style mistakes on files you created or modified, called check-package (see -Section 17.23.2, “How to check the coding style” for more +Section 18.24.2, “How to check the coding style” for more information). -21.5.2. Preparing a patch series +22.5.2. Preparing a patch series Starting from the changes committed in your local git view, rebase your development branch on top of the upstream tree before generating @@ -7458,7 +7668,7 @@ Once patch files are generated, you can review/edit the commit message before submitting them, using your favorite text editor. Buildroot provides a handy tool to know to whom your patches should -be sent, called get-developers (see Chapter 22, DEVELOPERS file and +be sent, called get-developers (see Chapter 23, DEVELOPERS file and get-developers for more information). This tool reads your patches and outputs the appropriate git send-email command to use: @@ -7492,7 +7702,7 @@ line-wrapped, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better yet, learn to use git send-email. -21.5.3. Cover letter +22.5.3. Cover letter If you want to present the whole patch set in a separate mail, add --cover-letter to the git format-patch command (see man @@ -7508,7 +7718,7 @@ the following cases: * whenever you feel it will help presenting your work, your choices, the review process, etc. -21.5.4. Patches for maintenance branches +22.5.4. Patches for maintenance branches When fixing bugs on a maintenance branch, bugs should be fixed on the master branch first. The commit log for such a patch may then contain @@ -7536,7 +7746,7 @@ $ git format-patch --subject-prefix "PATCH 2020.02.x" \ Then send the patches with git send-email, as described above. -21.5.5. Patch revision changelog +22.5.5. Patch revision changelog When improvements are requested, the new revision of each commit should include a changelog of the modifications between each @@ -7612,7 +7822,7 @@ patchwork.buildroot.org]. The advantage of in-reply-to is that patchwork will automatically mark the previous version of the patch as superseded. -21.6. Reporting issues/bugs or getting help +22.6. Reporting issues/bugs or getting help Before reporting any issue, please check in the mailing list archive whether someone has already reported and/or fixed a similar problem. @@ -7643,7 +7853,7 @@ preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https:// gist.github.com/ - http://code.bulix.org/ -21.7. Using the run-tests framework +22.7. Using the run-tests framework Buildroot includes a run-time testing framework called run-tests built upon Python scripting and QEMU runtime execution. There are two @@ -7704,7 +7914,7 @@ Those runtime tests are regularly executed by Buildroot Gitlab CI infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/ buildroot/-/jobs. -21.7.1. Creating a test case +22.7.1. Creating a test case The best way to get familiar with how to create a test case is to look at a few of the basic file system support/testing/tests/fs/ and @@ -7729,13 +7939,10 @@ The basic test case definition involves * Implementing a def test_run(self): function to optionally startup the emulator and provide test case conditions. -Beyond creating the test script, there are a couple of additional -steps that should be taken once you have your initial test case -script. The first is to add yourself to the DEVELOPERS file to be the -maintainer of that test case. The second is to update the Gitlab CI -yml by executing make .gitlab-ci.yml. +After creating the test script, add yourself to the DEVELOPERS file +to be the maintainer of that test case. -21.7.2. Debugging a test case +22.7.2. Debugging a test case Within the Buildroot repository, the testing framework is organized at the top level in support/testing/ by folders of conf, infra and @@ -7814,7 +8021,7 @@ unique string you choose to identify this specific job being created. ^[4] RFC: (Request for comments) change proposal -Chapter 22. DEVELOPERS file and get-developers +Chapter 23. DEVELOPERS file and get-developers The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks @@ -7822,7 +8029,7 @@ to this file, the get-developers tool allows to: * Calculate the list of developers to whom patches should be sent, by parsing the patches and matching the modified files with the - relevant developers. See Section 21.5, “Submitting patches” for + relevant developers. See Section 22.5, “Submitting patches” for details. * Find which developers are taking care of a given architecture or package, so that they can be notified when a build failure occurs @@ -7859,9 +8066,9 @@ DEVELOPERS file for various tasks: the DEVELOPERS file and will note WARNINGS for items that don’t match. -Chapter 23. Release Engineering +Chapter 24. Release Engineering -23.1. Releases +24.1. Releases The Buildroot project makes quarterly releases with monthly bugfix releases. The first release of each year is a long term support @@ -7877,7 +8084,7 @@ release, e.g., 2020.05.x is EOL when 2020.08.1 is released. LTS releases are supported until the first bugfix release of the next LTS, e.g., 2020.02.x is supported until 2021.02.1 is released. -23.2. Development +24.2. Development Each release cycle consist of two months of development on the master branch and one month stabilization before the release is made. During @@ -7895,14 +8102,14 @@ Part IV. Appendix Table of Contents -24. Makedev syntax documentation -25. Makeusers syntax documentation -26. Migrating from older Buildroot versions +25. Makedev syntax documentation +26. Makeusers syntax documentation +27. Migrating from older Buildroot versions - 26.1. Migrating to 2016.11 - 26.2. Migrating to 2017.08 + 27.1. Migrating to 2016.11 + 27.2. Migrating to 2017.08 -Chapter 24. Makedev syntax documentation +Chapter 25. Makedev syntax documentation The makedev syntax is used in several places in Buildroot to define changes to be made for permissions, or which device files to create @@ -7991,7 +8198,7 @@ cap_net_admin to the binary foo, you will write : |xattr cap_sys_admin+eip |xattr cap_net_admin+eip -Chapter 25. Makeusers syntax documentation +Chapter 26. Makeusers syntax documentation The syntax to create users is inspired by the makedev syntax, above, but is specific to Buildroot. @@ -8076,13 +8283,13 @@ This will create this user: * test is not a member of any additional groups * comment is: Test user -Chapter 26. Migrating from older Buildroot versions +Chapter 27. Migrating from older Buildroot versions Some versions have introduced backward incompatibilities. This section explains those incompatibilities, and for each explains what to do to complete the migration. -26.1. Migrating to 2016.11 +27.1. Migrating to 2016.11 Before Buildroot 2016.11, it was possible to use only one br2-external tree at once. With Buildroot 2016.11 came the @@ -8115,7 +8322,7 @@ onward. Note: This change makes your br2-external tree incompatible with Buildroot before 2016.11. -26.2. Migrating to 2017.08 +27.2. Migrating to 2017.08 Before Buildroot 2017.08, host packages were installed in $(HOST_DIR) /usr (with e.g. the autotools' --prefix=$(HOST_DIR)/usr). With diff --git a/buildroot/docs/manual/manual.txt b/buildroot/docs/manual/manual.txt index 48de65ee1..b5cc04480 100644 --- a/buildroot/docs/manual/manual.txt +++ b/buildroot/docs/manual/manual.txt @@ -38,6 +38,8 @@ include::common-usage.txt[] include::customize.txt[] +include::selinux-support.txt[] + include::faq-troubleshooting.txt[] include::known-issues.txt[] diff --git a/buildroot/docs/manual/selinux-support.txt b/buildroot/docs/manual/selinux-support.txt new file mode 100644 index 000000000..21137ae6c --- /dev/null +++ b/buildroot/docs/manual/selinux-support.txt @@ -0,0 +1,74 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[selinux]] +== Using SELinux in Buildroot + +https://selinuxproject.org[SELinux] is a Linux kernel security module +enforcing access control policies. In addition to the traditional file +permissions and access control lists, +SELinux+ allows to write rules +for users or processes to access specific functions of resources +(files, sockets...). + +_SELinux_ has three modes of operation: + +* _Disabled_: the policy is not applied +* _Permissive_: the policy is applied, and non-authorized actions are + simply logged. This mode is often used for troubleshooting SELinux + issues. +* _Enforcing_: the policy is applied, and non-authorized actions are + denied + +In Buildroot the mode of operation is controlled by the ++BR2_PACKAGE_REFPOLICY_POLICY_STATE_*+ configuration options. The +Linux kernel also has various configuration options that affect how ++SELinux+ is enabled (see +security/selinux/Kconfig+ in the Linux +kernel sources). + +By default in Buildroot the +SELinux+ policy is provided by the +upstream https://github.com/SELinuxProject/refpolicy[refpolicy] +project, enabled with +BR2_PACKAGE_REFPOLICY+. + +[[enabling-selinux]] +=== Enabling SELinux support + +To have proper support for +SELinux+ in a Buildroot generated system, +the following configuration options must be enabled: + +* +BR2_PACKAGE_LIBSELINUX+ +* +BR2_PACKAGE_REFPOLICY+ + +In addition, your filesystem image format must support extended +attributes. + +[[selinux-policy-tweaking]] +=== SELinux policy tweaking + +The +SELinux refpolicy+ contains modules that can be enabled or +disabled when being built. Each module provide a number of +SELinux+ +rules. In Buildroot the non-base modules are disabled by default and +several ways to enable such modules are provided: + +- Packages can enable a list of +SELinux+ modules within the +refpolicy+ using + the +_SELINUX_MODULES+ variable. +- Packages can provide additional +SELinux+ modules by putting them (.fc, .if + and .te files) in +package//selinux/+. +- Extra +SELinux+ modules can be added in directories pointed by the + +BR2_REFPOLICY_EXTRA_MODULES_DIRS+ configuration option. +- Additional modules in the +refpolicy+ can be enabled if listed in the + +BR2_REFPOLICY_EXTRA_MODULES_DEPENDENCIES+ configuration option. + +Buildroot also allows to completely override the +refpolicy+. This +allows to provide a full custom policy designed specifically for a +given system. When going this way, all of the above mechanisms are +disabled: no extra +SElinux+ module is added to the policy, and all +the available modules within the custom policy are enabled and built +into the final binary policy. The custom policy must be a fork of the +official https://github.com/SELinuxProject/refpolicy[refpolicy]. + +In order to fully override the +refpolicy+ the following configuration +variables have to be set: + +- +BR2_PACKAGE_REFPOLICY_CUSTOM_GIT+ +- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL+ +- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION+ diff --git a/buildroot/docs/manual/using-buildroot-toolchain.txt b/buildroot/docs/manual/using-buildroot-toolchain.txt index 0c0c35fce..110be5939 100644 --- a/buildroot/docs/manual/using-buildroot-toolchain.txt +++ b/buildroot/docs/manual/using-buildroot-toolchain.txt @@ -32,3 +32,17 @@ the tarball (e.g. because you will just be moving the +host+ directory, or will be generating the tarball on your own), Buildroot also allows you to just prepare the SDK with +make prepare-sdk+ without actually generating a tarball. + +For your convenience, by selecting the option ++BR2_PACKAGE_HOST_ENVIRONMENT_SETUP+, you can get a ++setup-environment+ script installed in +output/host/+ and therefore +in your SDK. This script can be sourced with ++. your/sdk/path/environment-setup+ to export a number of environment +variables that will help cross-compile your projects using the +Buildroot SDK: the +PATH+ will contain the SDK binaries, standard +_autotools_ variables will be defined with the appropriate values, and ++CONFIGURE_FLAGS+ will contain basic +./configure+ options to +cross-compile _autotools_ projects. It also provides some useful +commands. Note however that once this script is sourced, the +environment is setup only for cross-compilation, and no longer for +native compilation. diff --git a/buildroot/docs/website/download.html b/buildroot/docs/website/download.html index bc759ae3d..7d2a3c1c9 100644 --- a/buildroot/docs/website/download.html +++ b/buildroot/docs/website/download.html @@ -8,108 +8,108 @@
    Download
    -

    Latest stable / long term support release: 2020.02

    +

    Latest long term support release: 2020.02.7

    - +
    - +
    -

    buildroot-2020.02.tar.gz

    -

    PGP signature

    +

    buildroot-2020.02.7.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2020.02.tar.bz2

    -

    PGP signature

    +

    buildroot-2020.02.7.tar.bz2

    +

    PGP signature

    - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
    diff --git a/buildroot/docs/website/images/tap2open-logo.png b/buildroot/docs/website/images/tap2open-logo.png new file mode 100644 index 000000000..136019b62 Binary files /dev/null and b/buildroot/docs/website/images/tap2open-logo.png differ diff --git a/buildroot/docs/website/news.html b/buildroot/docs/website/news.html index 29dcdb3ac..5c4cea2d4 100644 --- a/buildroot/docs/website/news.html +++ b/buildroot/docs/website/news.html @@ -9,6 +9,485 @@

    News

      +
    • +
      +
      +
      +

      2020.11-rc1 released

      +

      4 November 2020

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2020.11-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.7 released

      +

      12 October 2020

      +
      +
      +

      The 2020.02.7 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.6 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.7 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05.3 released

      +

      12 October 2020

      +
      +
      +

      The 2020.05.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.05.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.05.3 release.

      + +

      Notice that the 2020.05.x series is now end of life. Please migrate to + the 2020.08 series instead which will be supported until December 2020.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08.1 released

      +

      12 October 2020

      +
      +
      +

      The 2020.08.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.08 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.08.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.6 released

      +

      5 September 2020

      +
      +
      +

      The 2020.02.6 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.5 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.6 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08 released

      +

      1 September 2020

      +
      +
      +

      The stable 2020.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.08 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.5 released

      +

      29 august 2020

      +
      +
      +

      The 2020.02.5 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.4 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.5 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05.2 released

      +

      29 August 2020

      +
      +
      +

      The 2020.05.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.05.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.05.2 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08-rc3 released

      +

      28 August 2020

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2020.08-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08-rc2 released

      +

      24 August 2020

      +
      +
      +

      2020.08-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2020.08-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08-rc1 released

      +

      6 August 2020

      +
      +
      +

      The 2020.08-rc1 release candidate is out. It is the first + release candidate for 2020.08, which we aim at releasing end + of August 2020. It contains a number of new packages, new + defconfigs, toolchain improvements, package updates and + more. See + the CHANGES. Go + to the downloads page to pick up the + 2020.08-rc1 + release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.4 released

      +

      26 July 2020

      +
      +
      +

      The 2020.02.4 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.3 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.4 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05.1 released

      +

      25 July 2020

      +
      +
      +

      The 2020.05.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.05 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.05.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.3 released

      +

      3 June 2020

      +
      +
      +

      The 2020.02.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.3 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05 released

      +

      1 June 2020

      +
      +
      +

      The stable 2020.05 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.05 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05-rc3 released

      +

      29 May 2020

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2020.05-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05-rc2 released

      +

      22 May 2020

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2020.05-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.2 released

      +

      12 May 2020

      +
      +
      +

      The 2020.02.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.2 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.05-rc1 released

      +

      10 April 2020

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2020.05-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.1 released

      +

      10 April 2020

      +
      +
      +

      The 2020.02.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2020.02 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2020.02.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2019.11.3 released, 2019.11.x series EOL

      +

      10 April 2020

      +
      +
      +

      The 2019.11.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2019.11.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2019.11.3 release.

      + +

      Notice that the 2019.11.x series is now end of life. Please migrate to + the 2020.02 series instead which will be supported until April 2021.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2019.02.11 released, 2019.02.x series EOL

      +

      9 April 2020

      +
      +
      +

      The 2019.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2019.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2019.02.11 release.

      + +

      Notice that the 2019.02.x series is now end of life. Please migrate to + the 2020.02 series instead which will be supported until April 2021.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2019.02.10 released

      +

      16 march 2020

      +
      +
      +

      The 2019.02.10 bugfix release is out, fixing a number of important / + security related issues discovered since the 2019.02.9 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2019.02.10 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2019.11.2 released

      +

      16 March 2020

      +
      +
      +

      The 2019.11.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2019.11.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2019.11.2 release.

      +
      +
      +
      • +
    • @@ -20,7 +499,8 @@

      The stable 2020.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2020.02 release.

      diff --git a/buildroot/docs/website/sponsors.html b/buildroot/docs/website/sponsors.html index 4cbfc5a34..2f3f6309a 100644 --- a/buildroot/docs/website/sponsors.html +++ b/buildroot/docs/website/sponsors.html @@ -4,6 +4,46 @@
      +
      +
      Current sponsors
      +
      + +
      +
      +
      +
      +
      + + + +
      +
      + Tap2Open + financially sponsored the Buildroot Association + in 2020.
      +
      +
      +
      + +
      +
      +
      +
      + + + +
      +
      + Logilin + financially sponsored the Buildroot Association + in 2020.
      +
      +
      +
      +
      +
      +
      +
      Sponsor of the Buildroot.org domain
      diff --git a/buildroot/fs/Config.in b/buildroot/fs/Config.in index 527051ef5..37a2aa21f 100644 --- a/buildroot/fs/Config.in +++ b/buildroot/fs/Config.in @@ -5,6 +5,7 @@ source "fs/btrfs/Config.in" source "fs/cloop/Config.in" source "fs/cpio/Config.in" source "fs/cramfs/Config.in" +source "fs/erofs/Config.in" source "fs/ext2/Config.in" source "fs/f2fs/Config.in" source "fs/initramfs/Config.in" diff --git a/buildroot/fs/common.mk b/buildroot/fs/common.mk index 842ea924a..84e13d1b7 100644 --- a/buildroot/fs/common.mk +++ b/buildroot/fs/common.mk @@ -36,12 +36,6 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) ROOTFS_FULL_DEVICES_TABLE = $(FS_DIR)/full_devices_table.txt ROOTFS_FULL_USERS_TABLE = $(FS_DIR)/full_users_table.txt -ifeq ($(BR2_REPRODUCIBLE),y) -define ROOTFS_REPRODUCIBLE - find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) -endef -endif - ROOTFS_COMMON_NAME = rootfs-common ROOTFS_COMMON_TYPE = rootfs ROOTFS_COMMON_DEPENDENCIES = \ @@ -49,6 +43,22 @@ ROOTFS_COMMON_DEPENDENCIES = \ $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) +ifeq ($(BR2_REPRODUCIBLE),y) +define ROOTFS_REPRODUCIBLE + find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) +endef +endif + +ifeq ($(BR2_PACKAGE_REFPOLICY),y) +define ROOTFS_SELINUX + $(HOST_DIR)/sbin/setfiles -m -r $(TARGET_DIR) \ + -c $(TARGET_DIR)/etc/selinux/targeted/policy/policy.$(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION) \ + $(TARGET_DIR)/etc/selinux/targeted/contexts/files/file_contexts \ + $(TARGET_DIR) +endef +ROOTFS_COMMON_DEPENDENCIES += host-policycoreutils +endif + ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ $(if $(filter undefined,$(origin ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)), \ $(eval ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X := \ @@ -163,15 +173,16 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(ROOTFS_FULL_USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT) echo "$$(HOST_DIR)/bin/makedevs -d $$(ROOTFS_FULL_DEVICES_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) + $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ + $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) - $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) FAKEROOTDONTTRYCHOWN=1 $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) diff --git a/buildroot/fs/erofs/Config.in b/buildroot/fs/erofs/Config.in new file mode 100644 index 000000000..d7360edea --- /dev/null +++ b/buildroot/fs/erofs/Config.in @@ -0,0 +1,14 @@ +config BR2_TARGET_ROOTFS_EROFS + bool "erofs root filesystem" + select BR2_PACKAGE_HOST_EROFS_UTILS + help + Build a EROFS root filesystem. + +if BR2_TARGET_ROOTFS_EROFS + +config BR2_TARGET_ROOTFS_EROFS_LZ4HC + bool "lz4hc compression" + help + Use lz4 high-compression to compress data in the filesystem. + +endif # BR2_TARGET_ROOTFS_EROFS diff --git a/buildroot/fs/erofs/erofs.mk b/buildroot/fs/erofs/erofs.mk new file mode 100644 index 000000000..58559d483 --- /dev/null +++ b/buildroot/fs/erofs/erofs.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# Build the EROFS root filesystem image +# +################################################################################ + +ROOTFS_EROFS_DEPENDENCIES = host-erofs-utils + +ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) +ROOTFS_EROFS_ARGS += -zlz4hc +endif + +define ROOTFS_EROFS_CMD + $(HOST_DIR)/bin/mkfs.erofs $(ROOTFS_EROFS_ARGS) $@ $(TARGET_DIR) +endef + +$(eval $(rootfs)) diff --git a/buildroot/fs/ext2/Config.in b/buildroot/fs/ext2/Config.in index 74bacc114..333ead95f 100644 --- a/buildroot/fs/ext2/Config.in +++ b/buildroot/fs/ext2/Config.in @@ -43,6 +43,7 @@ config BR2_TARGET_ROOTFS_EXT2_REV config BR2_TARGET_ROOTFS_EXT2_LABEL string "filesystem label" + default "rootfs" config BR2_TARGET_ROOTFS_EXT2_SIZE string "exact size" diff --git a/buildroot/fs/jffs2/jffs2.mk b/buildroot/fs/jffs2/jffs2.mk index 2adbc2320..0096af2ea 100644 --- a/buildroot/fs/jffs2/jffs2.mk +++ b/buildroot/fs/jffs2/jffs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JFFS2_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) +JFFS2_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) --with-xattr SUMTOOL_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) diff --git a/buildroot/fs/squashfs/Config.in b/buildroot/fs/squashfs/Config.in index dde2097cb..70d4a20cf 100644 --- a/buildroot/fs/squashfs/Config.in +++ b/buildroot/fs/squashfs/Config.in @@ -5,6 +5,13 @@ config BR2_TARGET_ROOTFS_SQUASHFS if BR2_TARGET_ROOTFS_SQUASHFS +config BR2_TARGET_ROOTFS_SQUASHFS_PAD + bool "pad to a 4K boundary" + default y # legacy was always ON + help + Say 'y' here (the default) to pad the the filesystem image + to a 4K boundary. Say 'n' to disable padding. + choice prompt "Compression algorithm" default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP @@ -31,4 +38,5 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD bool "zstd" endchoice + endif diff --git a/buildroot/fs/squashfs/squashfs.mk b/buildroot/fs/squashfs/squashfs.mk index 34ab04860..7a5e3e313 100644 --- a/buildroot/fs/squashfs/squashfs.mk +++ b/buildroot/fs/squashfs/squashfs.mk @@ -8,6 +8,10 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS) +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_PAD),) +ROOTFS_SQUASHFS_ARGS += -nopad +endif + ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index f83474e1e..6d9d0af06 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -2,6 +2,7 @@ menu "Kernel" config BR2_LINUX_KERNEL bool "Linux Kernel" + select BR2_PACKAGE_HOST_KMOD # Unconditional, even if modules not enabled select BR2_PACKAGE_HOST_IMAGEMAGICK if BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH != "" help Enable this option if you want to build a Linux kernel for @@ -27,7 +28,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.4)" + bool "Latest version (5.9)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (4.19.132-cip30)" @@ -113,13 +114,9 @@ if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG || BR2_LINUX_KERNEL config BR2_LINUX_KERNEL_CUSTOM_REPO_URL string "URL of custom repository" - default BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL \ - if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != "" # legacy config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION string "Custom repository version" - default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \ - if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != "" # legacy help Revision to use in the typical format used by Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. @@ -128,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.4.70" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ @@ -230,7 +227,7 @@ config BR2_LINUX_KERNEL_APPENDED_UIMAGE config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" - depends on BR2_i386 || BR2_x86_64 + depends on BR2_i386 || BR2_x86_64 || BR2_s390x config BR2_LINUX_KERNEL_ZIMAGE bool "zImage" @@ -325,6 +322,9 @@ config BR2_LINUX_KERNEL_LZO config BR2_LINUX_KERNEL_XZ bool "xz compression" +config BR2_LINUX_KERNEL_ZSTD + bool "zstd compression" + endchoice config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME @@ -407,6 +407,13 @@ config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH You can provide a list of dts paths to copy and build, separated by spaces. +config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME + bool "Keep the directory name of the Device Tree" + help + If enabled, the device tree blobs keep their + directory prefixes when they get copied to the + output image directory or the target directory. + config BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT bool "Build Device Tree with overlay support" help diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index b2eccb38e..4b76398c5 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,4 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06 linux-5.9.tar.xz +sha256 ee767991808d234ad9acd17f0ba94ba7979d30c528876bee6fba337ea540f0af linux-5.8.14.tar.xz sha256 c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22c45007 linux-5.4.70.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 067814035c17e77dee84076dcc06a95eb675344cd926b7b79a16b80fee593364 linux-4.4.238.tar.xz @@ -10,6 +12,6 @@ sha256 c20f9014b89ea3e27f55f1d407aa5a4724ed38ac520c197291e9d644f164c43a linux- sha256 81dd791d9ad6c3fddaeaffc6d7d8df0e13831283a5fe494c437ac7820d79ca39 linux-cip-4.19.132-cip30-rt12.tar.gz # Licenses hashes -sha256 ee5808b032a67f587d3541099d46de34f5bec8cd5976114ba07f1299ee6001ff COPYING +sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk index fd44f0f0e..e07e014d1 100644 --- a/buildroot/linux/linux.mk +++ b/buildroot/linux/linux.mk @@ -98,12 +98,15 @@ else ifeq ($(BR2_LINUX_KERNEL_LZO),y) LINUX_DEPENDENCIES += host-lzop else ifeq ($(BR2_LINUX_KERNEL_XZ),y) LINUX_DEPENDENCIES += host-xz +else ifeq ($(BR2_LINUX_KERNEL_ZSTD),y) +LINUX_DEPENDENCIES += host-zstd endif LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_GZIP) += CONFIG_KERNEL_GZIP LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZ4) += CONFIG_KERNEL_LZ4 LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ +LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_ZSTD) += CONFIG_KERNEL_ZSTD ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y) LINUX_DEPENDENCIES += host-openssl @@ -305,40 +308,40 @@ LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES) # option will be thrown away and ignored if it doesn't exist. ifeq ($(BR2_ENDIAN),"BIG") define LINUX_FIXUP_CONFIG_ENDIANNESS - $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_BIG_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_BIG_ENDIAN) endef else define LINUX_FIXUP_CONFIG_ENDIANNESS - $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_LITTLE_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPU_LITTLE_ENDIAN) endef endif define LINUX_KCONFIG_FIXUP_CMDS $(if $(LINUX_NEEDS_MODULES), - $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES,$(@D)/.config)) - $(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y)),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES)) + $(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y))) $(foreach opt, $(LINUX_COMPRESSION_OPT_), - $(call KCONFIG_DISABLE_OPT,$(opt),$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,$(opt)) ) $(LINUX_FIXUP_CONFIG_ENDIANNESS) $(if $(BR2_arm)$(BR2_armeb), - $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI)) $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), - $(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR)) $(if $(BR2_ARC_PAGE_SIZE_4K), - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_ARC_PAGE_SIZE_8K), - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_ARC_PAGE_SIZE_16K), - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) $(if $(BR2_TARGET_ROOTFS_CPIO), - $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD)) # As the kernel gets compiled before root filesystems are # built, we create a fake cpio file. It'll be # replaced later by the real cpio archive, and the kernel will be @@ -346,70 +349,24 @@ define LINUX_KCONFIG_FIXUP_CMDS $(if $(BR2_TARGET_ROOTFS_INITRAMFS), mkdir -p $(BINARIES_DIR) touch $(BINARIES_DIR)/rootfs.cpio - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio",$(@D)/.config) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config) - $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio") + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0)) $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),, - $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV), - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV), - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)) - $(if $(BR2_PACKAGE_AUDIT), - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config)) - $(if $(BR2_PACKAGE_INTEL_MICROCODE), - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL,$(@D)/.config)) - $(if $(BR2_PACKAGE_KTAP), - $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config)) - $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF), - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config)) - $(if $(BR2_PACKAGE_PCM_TOOLS), - $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR,$(@D)/.config)) - $(if $(BR2_PACKAGE_SYSTEMD), - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR,$(@D)/.config)) - $(if $(BR2_PACKAGE_SMACK), - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK,$(@D)/.config)) - $(if $(BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER), - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA,$(@D)/.config)) - $(if $(BR2_PACKAGE_IPTABLES), - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES,$(@D)/.config)) - $(if $(BR2_PACKAGE_XTABLES_ADDONS), - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT,$(@D)/.config)) - $(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT), - $(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET)) $(if $(BR2_LINUX_KERNEL_APPENDED_DTB), - $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config)) - $(if $(BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV), - $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB)) $(if $(LINUX_KERNEL_CUSTOM_LOGO_PATH), - $(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224,$(@D)/.config)) - $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_FB) + $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) + $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) + $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) + $(PACKAGES_LINUX_CONFIG_FIXUPS) endef ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) @@ -425,10 +382,11 @@ endef ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),) define LINUX_INSTALL_DTB # dtbs moved from arch//boot to arch//boot/dts since 3.8-rc1 - cp $(addprefix \ - $(LINUX_ARCH_PATH)/boot/$(if $(wildcard \ - $(addprefix $(LINUX_ARCH_PATH)/boot/dts/,$(LINUX_DTBS))),dts/),$(LINUX_DTBS)) \ - $(1) + $(foreach dtb,$(LINUX_DTBS), \ + install -D \ + $(or $(wildcard $(LINUX_ARCH_PATH)/boot/dts/$(dtb)),$(LINUX_ARCH_PATH)/boot/$(dtb)) \ + $(1)/$(if $(BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME),$(dtb),$(notdir $(dtb))) + ) endef endif # BR2_LINUX_KERNEL_APPENDED_DTB endif # BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT @@ -472,7 +430,7 @@ endif # The call to disable gcc-plugins is a stop-gap measure: # http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html define LINUX_BUILD_CMDS - $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ ) diff --git a/buildroot/package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch b/buildroot/package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..36480dfcc --- /dev/null +++ b/buildroot/package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch @@ -0,0 +1,38 @@ +From 12d3b3c01b0ec28d45427754541a8156939346d9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 13 Aug 2020 23:24:05 +0200 +Subject: [PATCH] plt.h: fix build with gcc 10 + +Drop EFUSE_PARAMETER_TYPE_ENM to fix the following build failure with +gcc 10: + +/home/buildroot/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -L/home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/lib nvs.o misc_cmds.o calibrator.o plt.o wl18xx_plt.o ini.o -lm -lnl-3 -lnl-genl-3 -o calibrator +/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: misc_cmds.o:(.bss+0x0): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here +/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: calibrator.o: in function `.LANCHOR0': +calibrator.c:(.bss+0xc): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/df2d04de4b2e5003f3fc56c9e84db5054bd4d499 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to sudharshan ] +--- + plt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plt.h b/plt.h +index 8b534a9..43d5dbc 100644 +--- a/plt.h ++++ b/plt.h +@@ -399,7 +399,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT { + TX_BIP_PD_BUFFER_VBIAS_ERROR_E, + EFUSE_NUMBER_OF_PARAMETERS_E, + EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1) +-} EFUSE_PARAMETER_TYPE_ENM; ++}; + + int get_mac_addr(int ifc_num, unsigned char *mac_addr); + +-- +2.27.0 + diff --git a/buildroot/package/18xx-ti-utils/18xx-ti-utils.hash b/buildroot/package/18xx-ti-utils/18xx-ti-utils.hash index faa23d0b3..7ecca54b9 100644 --- a/buildroot/package/18xx-ti-utils/18xx-ti-utils.hash +++ b/buildroot/package/18xx-ti-utils/18xx-ti-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9ce2c7228dd0ac8d3cc530a32bb92b532bdbc5dfb6a405c245abee678d878697 18xx-ti-utils-R8.7_SP3.tar.gz -sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING +sha256 ce0185ba8a9bf456cc94a798bf66903775065e337e53ff812f18a6d88f5bac13 18xx-ti-utils-R8.8.tar.xz +sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING diff --git a/buildroot/package/18xx-ti-utils/18xx-ti-utils.mk b/buildroot/package/18xx-ti-utils/18xx-ti-utils.mk index d1f0388c3..5d45191cd 100644 --- a/buildroot/package/18xx-ti-utils/18xx-ti-utils.mk +++ b/buildroot/package/18xx-ti-utils/18xx-ti-utils.mk @@ -4,8 +4,9 @@ # ################################################################################ -18XX_TI_UTILS_VERSION = R8.7_SP3 -18XX_TI_UTILS_SITE = git://git.ti.com/wilink8-wlan/18xx-ti-utils +18XX_TI_UTILS_VERSION = 8.8 +18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils/snapshot +18XX_TI_UTILS_SOURCE = 18xx-ti-utils-R$(18XX_TI_UTILS_VERSION).tar.xz 18XX_TI_UTILS_DEPENDENCIES = libnl 18XX_TI_UTILS_LICENSE = BSD-3-Clause 18XX_TI_UTILS_LICENSE_FILES = COPYING @@ -21,10 +22,14 @@ define 18XX_TI_UTILS_BUILD_CMDS NFSROOT="$(STAGING_DIR)" NLVER=3 $(MAKE) -C $(@D) \ CFLAGS="$(TARGET_CFLAGS) $(18XX_TI_UTILS_CFLAGS)" \ $(18XX_TI_UTILS_BUILD_TARGET) + + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/wlconf \ + $(HOST_CONFIGURE_OPTS) endef define 18XX_TI_UTILS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/calibrator $(TARGET_DIR)/usr/bin/calibrator + $(INSTALL) -m 0755 $(@D)/wlconf/wlconf $(HOST_DIR)/bin/wlconf endef $(eval $(generic-package)) diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in index c328d9f15..016a99ed1 100644 --- a/buildroot/package/Config.in +++ b/buildroot/package/Config.in @@ -13,7 +13,6 @@ menu "Audio and video applications" source "package/alsa-utils/Config.in" source "package/atest/Config.in" source "package/aumix/Config.in" - source "package/bellagio/Config.in" source "package/bluez-alsa/Config.in" source "package/dvblast/Config.in" source "package/dvdauthor/Config.in" @@ -70,7 +69,6 @@ menu "Compressors and decompressors" source "package/bzip2/Config.in" source "package/gzip/Config.in" source "package/lrzip/Config.in" - source "package/lz4/Config.in" source "package/lzip/Config.in" source "package/lzop/Config.in" source "package/p7zip/Config.in" @@ -84,6 +82,7 @@ menu "Compressors and decompressors" endmenu menu "Debugging, profiling and benchmark" + source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" @@ -129,6 +128,7 @@ menu "Debugging, profiling and benchmark" source "package/ramsmp/Config.in" source "package/ramspeed/Config.in" source "package/rt-tests/Config.in" + source "package/sentry-native/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" @@ -148,11 +148,13 @@ endmenu menu "Development tools" source "package/bats-core/Config.in" source "package/binutils/Config.in" + source "package/bitwise/Config.in" source "package/bsdiff/Config.in" source "package/bustle/Config.in" source "package/check/Config.in" source "package/cmake/Config.in" source "package/cppunit/Config.in" + source "package/cukinia/Config.in" source "package/cunit/Config.in" source "package/cvs/Config.in" source "package/cxxtest/Config.in" @@ -196,11 +198,14 @@ menu "Filesystem and flash utilities" source "package/e2fsprogs/Config.in" source "package/e2tools/Config.in" source "package/ecryptfs-utils/Config.in" + source "package/erofs-utils/Config.in" source "package/exfat/Config.in" source "package/exfat-utils/Config.in" + source "package/exfatprogs/Config.in" source "package/f2fs-tools/Config.in" source "package/flashbench/Config.in" source "package/fscryptctl/Config.in" + source "package/fuse-overlayfs/Config.in" source "package/fwup/Config.in" source "package/genext2fs/Config.in" source "package/genpart/Config.in" @@ -276,6 +281,7 @@ endmenu menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" + source "package/cage/Config.in" source "package/cog/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" @@ -294,7 +300,7 @@ comment "Graphic applications" source "package/tesseract-ocr/Config.in" comment "Graphic libraries" - source "package/cegui06/Config.in" + source "package/cegui/Config.in" source "package/directfb/Config.in" source "package/directfb-examples/Config.in" source "package/efl/Config.in" @@ -305,6 +311,7 @@ comment "Graphic libraries" source "package/fbterm/Config.in" source "package/fbv/Config.in" source "package/freerdp/Config.in" + source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" @@ -342,7 +349,6 @@ comment "QT libraries and helper libraries" endif source "package/tekui/Config.in" source "package/weston/Config.in" - source "package/weston-imx/Config.in" source "package/x11r7/Config.in" comment "X applications" @@ -354,7 +360,6 @@ comment "X applications" source "package/docker/Config.in" source "package/feh/Config.in" source "package/gmpc/Config.in" - source "package/gqview/Config.in" source "package/gtkperf/Config.in" source "package/leafpad/Config.in" source "package/midori/Config.in" @@ -396,6 +401,7 @@ menu "Firmware" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" + source "package/odroidc2-firmware/Config.in" source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/rpi-wifi-firmware/Config.in" @@ -412,8 +418,9 @@ endmenu source "package/acpid/Config.in" source "package/acpitool/Config.in" source "package/aer-inject/Config.in" + source "package/altera-stapl/Config.in" source "package/am335x-pru-package/Config.in" - source "package/amd-catalyst/Config.in" + source "package/apcupsd/Config.in" source "package/avrdude/Config.in" source "package/bcache-tools/Config.in" source "package/biosdevname/Config.in" @@ -484,6 +491,7 @@ endmenu source "package/luksmeta/Config.in" source "package/lvm2/Config.in" source "package/mali-t76x/Config.in" + source "package/mbpfan/Config.in" source "package/mdadm/Config.in" source "package/mdevd/Config.in" source "package/memtest86/Config.in" @@ -494,11 +502,11 @@ endmenu source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" - source "package/nvidia-tegra23/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" + source "package/openfpgaloader/Config.in" source "package/openipmi/Config.in" source "package/openocd/Config.in" source "package/openpowerlink/Config.in" @@ -555,6 +563,7 @@ endmenu source "package/ubus/Config.in" source "package/uccp420wlan/Config.in" source "package/udev/Config.in" + source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" source "package/uhubctl/Config.in" source "package/umtprd/Config.in" @@ -651,6 +660,7 @@ menu "Lua libraries/modules" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" source "package/lua-lunitx/Config.in" + source "package/lua-lyaml/Config.in" source "package/lua-markdown/Config.in" source "package/lua-messagepack/Config.in" source "package/lua-msgpack-native/Config.in" @@ -758,6 +768,7 @@ menu "Perl libraries/modules" source "package/perl-http-message/Config.in" source "package/perl-http-multipartparser/Config.in" source "package/perl-http-negotiate/Config.in" + source "package/perl-i18n/Config.in" source "package/perl-io-html/Config.in" source "package/perl-io-interface/Config.in" source "package/perl-io-socket-multicast/Config.in" @@ -765,7 +776,9 @@ menu "Perl libraries/modules" source "package/perl-json-maybexs/Config.in" source "package/perl-json-tiny/Config.in" source "package/perl-libwww-perl/Config.in" + source "package/perl-locale-maketext-lexicon/Config.in" source "package/perl-lwp-mediatypes/Config.in" + source "package/perl-lwp-protocol-https/Config.in" source "package/perl-mail-dkim/Config.in" source "package/perl-mailtools/Config.in" source "package/perl-math-prime-util/Config.in" @@ -775,7 +788,12 @@ menu "Perl libraries/modules" source "package/perl-module-runtime/Config.in" source "package/perl-mojolicious/Config.in" source "package/perl-mojolicious-plugin-authentication/Config.in" + source "package/perl-mojolicious-plugin-authorization/Config.in" + source "package/perl-mojolicious-plugin-cspheader/Config.in" + source "package/perl-mojolicious-plugin-i18n/Config.in" + source "package/perl-mojolicious-plugin-securityheader/Config.in" source "package/perl-moo/Config.in" + source "package/perl-mozilla-ca/Config.in" source "package/perl-net-dns/Config.in" source "package/perl-net-http/Config.in" source "package/perl-net-snmp/Config.in" @@ -821,6 +839,7 @@ menu "External php extensions" source "package/php-imagick/Config.in" source "package/php-memcached/Config.in" source "package/php-ssh2/Config.in" + source "package/php-xdebug/Config.in" source "package/php-yaml/Config.in" source "package/php-zmq/Config.in" endmenu @@ -838,6 +857,7 @@ menu "External python modules" source "package/python-aiocoap/Config.in" source "package/python-aioconsole/Config.in" source "package/python-aiodns/Config.in" + source "package/python-aiofiles/Config.in" source "package/python-aiohttp/Config.in" source "package/python-aiohttp-cors/Config.in" source "package/python-aiohttp-debugtoolbar/Config.in" @@ -855,7 +875,9 @@ menu "External python modules" source "package/python-aiosignal/Config.in" source "package/python-aiozipkin/Config.in" source "package/python-alsaaudio/Config.in" + source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" + source "package/python-argon2-cffi/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" @@ -875,12 +897,17 @@ menu "External python modules" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" source "package/python-bluezero/Config.in" + source "package/python-boto3/Config.in" + source "package/python-botocore/Config.in" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" + source "package/python-bsdiff4/Config.in" source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" + source "package/python-canopen/Config.in" source "package/python-cbor/Config.in" + source "package/python-cbor2/Config.in" source "package/python-cchardet/Config.in" source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" @@ -895,10 +922,12 @@ menu "External python modules" source "package/python-coherence/Config.in" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" + source "package/python-colorzero/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" + source "package/python-crayons/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crontab/Config.in" @@ -933,6 +962,7 @@ menu "External python modules" source "package/python-enum34/Config.in" source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" + source "package/python-filelock/Config.in" source "package/python-fire/Config.in" source "package/python-flask/Config.in" source "package/python-flask-babel/Config.in" @@ -940,6 +970,7 @@ menu "External python modules" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" source "package/python-flask-sqlalchemy/Config.in" + source "package/python-flatbuffers/Config.in" source "package/python-flup/Config.in" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" @@ -947,6 +978,8 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-gitdb2/Config.in" source "package/python-gobject/Config.in" + source "package/python-gpiozero/Config.in" + source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" @@ -964,10 +997,13 @@ menu "External python modules" source "package/python-incremental/Config.in" source "package/python-inflection/Config.in" source "package/python-influxdb/Config.in" + source "package/python-iniconfig/Config.in" source "package/python-iniparse/Config.in" + source "package/python-intelhex/Config.in" source "package/python-iowait/Config.in" source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" + source "package/python-ipdb/Config.in" source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" @@ -979,6 +1015,7 @@ menu "External python modules" source "package/python-jaraco-functools/Config.in" source "package/python-jedi/Config.in" source "package/python-jinja2/Config.in" + source "package/python-jmespath/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-jsonmodels/Config.in" source "package/python-jsonschema/Config.in" @@ -991,6 +1028,7 @@ menu "External python modules" source "package/python-logbook/Config.in" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" + source "package/python-m2crypto/Config.in" source "package/python-m2r/Config.in" source "package/python-mad/Config.in" source "package/python-mako/Config.in" @@ -1002,6 +1040,7 @@ menu "External python modules" source "package/python-meld3/Config.in" source "package/python-mimeparse/Config.in" source "package/python-mistune/Config.in" + source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" @@ -1018,6 +1057,8 @@ menu "External python modules" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" + source "package/python-opcua-asyncio/Config.in" + source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" @@ -1030,9 +1071,11 @@ menu "External python modules" source "package/python-periphery/Config.in" source "package/python-pexpect/Config.in" source "package/python-pickleshare/Config.in" + source "package/python-piexif/Config.in" source "package/python-pigpio/Config.in" source "package/python-pillow/Config.in" source "package/python-pip/Config.in" + source "package/python-pluggy/Config.in" source "package/python-ply/Config.in" source "package/python-portend/Config.in" source "package/python-posix-ipc/Config.in" @@ -1045,10 +1088,10 @@ menu "External python modules" source "package/python-pudb/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" - source "package/python-pyasn/Config.in" - source "package/python-pyasn-modules/Config.in" + source "package/python-pyalsa/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" + source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycli/Config.in" @@ -1079,6 +1122,7 @@ menu "External python modules" source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" + source "package/python-pysftp/Config.in" source "package/python-pysmb/Config.in" source "package/python-pysmi/Config.in" source "package/python-pysnmp/Config.in" @@ -1086,6 +1130,7 @@ menu "External python modules" source "package/python-pysocks/Config.in" source "package/python-pytablereader/Config.in" source "package/python-pytablewriter/Config.in" + source "package/python-pytest/Config.in" source "package/python-pytrie/Config.in" source "package/python-pytz/Config.in" source "package/python-pyudev/Config.in" @@ -1096,6 +1141,7 @@ menu "External python modules" source "package/python-raven/Config.in" source "package/python-redis/Config.in" source "package/python-reentry/Config.in" + source "package/python-regex/Config.in" source "package/python-remi/Config.in" source "package/python-request-id/Config.in" source "package/python-requests/Config.in" @@ -1104,6 +1150,7 @@ menu "External python modules" source "package/python-rpi-gpio/Config.in" source "package/python-rpi-ws281x/Config.in" source "package/python-rtslib-fb/Config.in" + source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" @@ -1130,6 +1177,7 @@ menu "External python modules" source "package/python-slob/Config.in" source "package/python-smbus-cffi/Config.in" source "package/python-smmap2/Config.in" + source "package/python-snappy/Config.in" source "package/python-socketio/Config.in" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" @@ -1188,7 +1236,9 @@ menu "External python modules" source "package/python-xlutils/Config.in" source "package/python-xlwt/Config.in" source "package/python-xmltodict/Config.in" + source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" + source "package/python-yatl/Config.in" source "package/python-yieldfrom/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" @@ -1265,6 +1315,7 @@ menu "Compression and decompression" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" + source "package/lz4/Config.in" source "package/lzo/Config.in" source "package/minizip/Config.in" source "package/snappy/Config.in" @@ -1274,6 +1325,7 @@ menu "Compression and decompression" endmenu menu "Crypto" + source "package/bearssl/Config.in" source "package/beecrypt/Config.in" source "package/botan/Config.in" source "package/ca-certificates/Config.in" @@ -1303,6 +1355,7 @@ menu "Crypto" source "package/mbedtls/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" + source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" source "package/tpm2-tss/Config.in" @@ -1319,6 +1372,10 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libgit2/Config.in" + source "package/libodb/Config.in" + source "package/libodb-boost/Config.in" + source "package/libodb-mysql/Config.in" + source "package/libodb-pgsql/Config.in" source "package/libpqxx/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" @@ -1327,6 +1384,7 @@ menu "Database" source "package/rocksdb/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" + source "package/timescaledb/Config.in" source "package/unixodbc/Config.in" endmenu @@ -1335,6 +1393,7 @@ menu "Filesystem" source "package/libconfig/Config.in" source "package/libconfuse/Config.in" source "package/libfuse/Config.in" + source "package/libfuse3/Config.in" source "package/liblockfile/Config.in" source "package/libnfs/Config.in" source "package/libsysfs/Config.in" @@ -1374,6 +1433,7 @@ menu "Graphics" source "package/intel-mediasdk/Config.in" source "package/irrlicht/Config.in" source "package/jasper/Config.in" + source "package/jbig2dec/Config.in" source "package/jpeg/Config.in" source "package/kmsxx/Config.in" source "package/lcms2/Config.in" @@ -1415,7 +1475,6 @@ menu "Graphics" source "package/libvips/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" - source "package/opencv/Config.in" source "package/opencv3/Config.in" source "package/opengl/Config.in" source "package/openjpeg/Config.in" @@ -1426,12 +1485,15 @@ menu "Graphics" source "package/poppler/Config.in" source "package/powervr/Config.in" source "package/tiff/Config.in" + source "package/unclutter-xfixes/Config.in" source "package/waffle/Config.in" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" + source "package/wayland-utils/Config.in" source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" + source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" source "package/wpewebkit/Config.in" @@ -1453,6 +1515,7 @@ menu "Hardware handling" source "package/let-me-create/Config.in" source "package/libaio/Config.in" source "package/libatasmart/Config.in" + source "package/libblockdev/Config.in" source "package/libcec/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" @@ -1492,8 +1555,8 @@ menu "Hardware handling" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/tslib/Config.in" + source "package/uhd/Config.in" source "package/urg/Config.in" - source "package/wiringpi/Config.in" endmenu menu "Javascript" @@ -1504,6 +1567,7 @@ menu "External AngularJS plugins" endmenu endif source "package/bootstrap/Config.in" + source "package/chartjs/Config.in" source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" @@ -1524,13 +1588,13 @@ endif source "package/json-javascript/Config.in" source "package/openlayers/Config.in" source "package/spidermonkey/Config.in" + source "package/vuejs/Config.in" endmenu menu "JSON/XML" source "package/benejson/Config.in" source "package/cjson/Config.in" source "package/expat/Config.in" - source "package/ezxml/Config.in" source "package/jansson/Config.in" source "package/jose/Config.in" source "package/jsmn/Config.in" @@ -1599,6 +1663,7 @@ menu "Multimedia" source "package/libopenh264/Config.in" source "package/libopusenc/Config.in" source "package/libtheora/Config.in" + source "package/libudfread/Config.in" source "package/libvpx/Config.in" source "package/libyuv/Config.in" source "package/live555/Config.in" @@ -1612,6 +1677,7 @@ menu "Networking" source "package/azmq/Config.in" source "package/azure-iot-sdk-c/Config.in" source "package/batman-adv/Config.in" + source "package/belle-sip/Config.in" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" source "package/canfestival/Config.in" @@ -1674,13 +1740,16 @@ menu "Networking" source "package/libnfnetlink/Config.in" source "package/libnftnl/Config.in" source "package/libnice/Config.in" + source "package/libnids/Config.in" source "package/libnl/Config.in" + source "package/libnpupnp/Config.in" source "package/liboauth/Config.in" source "package/liboping/Config.in" source "package/libosip2/Config.in" source "package/libpagekite/Config.in" source "package/libpcap/Config.in" source "package/libpjsip/Config.in" + source "package/librelp/Config.in" source "package/librsync/Config.in" source "package/libshairplay/Config.in" source "package/libshout/Config.in" @@ -1692,18 +1761,23 @@ menu "Networking" source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libtorrent-rasterbar/Config.in" + source "package/libuev/Config.in" + source "package/libuhttpd/Config.in" source "package/libupnp/Config.in" source "package/libupnp18/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" + source "package/libuwsc/Config.in" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" source "package/libwebsockets/Config.in" source "package/libyang/Config.in" source "package/lksctp-tools/Config.in" + source "package/mbuffer/Config.in" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in" @@ -1717,9 +1791,11 @@ menu "Networking" source "package/ortp/Config.in" source "package/paho-mqtt-c/Config.in" source "package/paho-mqtt-cpp/Config.in" + source "package/pistache/Config.in" source "package/qdecoder/Config.in" source "package/qpid-proton/Config.in" source "package/rabbitmq-c/Config.in" + source "package/resiprocate/Config.in" source "package/restclient-cpp/Config.in" source "package/rtmpdump/Config.in" source "package/slirp/Config.in" @@ -1744,6 +1820,7 @@ menu "Other" source "package/avro-c/Config.in" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" + source "package/belr/Config.in" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" @@ -1769,22 +1846,25 @@ menu "Other" source "package/glibmm/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" + source "package/gobject-introspection/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" + source "package/libabseil-cpp/Config.in" source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" source "package/libavl/Config.in" source "package/libb64/Config.in" + source "package/libbacktrace/Config.in" source "package/libbsd/Config.in" + source "package/libbytesize/Config.in" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in" source "package/libclc/Config.in" source "package/libcofi/Config.in" source "package/libcorrect/Config.in" - source "package/libcroco/Config.in" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" @@ -1832,12 +1912,12 @@ endif source "package/liquid-dsp/Config.in" source "package/llvm/Config.in" source "package/lttng-libust/Config.in" + source "package/matio/Config.in" source "package/mpc/Config.in" source "package/mpdecimal/Config.in" source "package/mpfr/Config.in" source "package/mpir/Config.in" source "package/msgpack/Config.in" - source "package/mtdev2tuio/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" source "package/openblas/Config.in" @@ -1861,6 +1941,7 @@ endif endmenu menu "Security" + source "package/libapparmor/Config.in" source "package/libselinux/Config.in" source "package/libsemanage/Config.in" source "package/libsepol/Config.in" @@ -1887,6 +1968,7 @@ menu "Text and terminal handling" source "package/pcre/Config.in" source "package/pcre2/Config.in" source "package/popt/Config.in" + source "package/re2/Config.in" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" @@ -1924,6 +2006,7 @@ menu "Miscellaneous" source "package/linux-syscall-support/Config.in" source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" + source "package/netdata/Config.in" source "package/proj/Config.in" source "package/qemu/Config.in" source "package/qpdf/Config.in" @@ -1983,6 +2066,7 @@ menu "Networking applications" source "package/dnsmasq/Config.in" source "package/drbd-utils/Config.in" source "package/dropbear/Config.in" + source "package/easyframes/Config.in" source "package/ebtables/Config.in" source "package/ejabberd/Config.in" source "package/ethtool/Config.in" @@ -1995,8 +2079,10 @@ menu "Networking applications" source "package/fping/Config.in" source "package/freeswitch/Config.in" source "package/freeswitch-mod-bcg729/Config.in" + source "package/frr/Config.in" source "package/gerbera/Config.in" source "package/gesftpserver/Config.in" + source "package/gloox/Config.in" source "package/glorytun/Config.in" source "package/gupnp-tools/Config.in" source "package/gutenprint/Config.in" @@ -2005,6 +2091,7 @@ menu "Networking applications" source "package/hiawatha/Config.in" source "package/hostapd/Config.in" source "package/hplip/Config.in" + source "package/htpdate/Config.in" source "package/httping/Config.in" source "package/i2pd/Config.in" source "package/ibrdtn-tools/Config.in" @@ -2020,6 +2107,7 @@ menu "Networking applications" source "package/igmpproxy/Config.in" source "package/inadyn/Config.in" source "package/iodine/Config.in" + source "package/ipcalc/Config.in" source "package/iperf/Config.in" source "package/iperf3/Config.in" source "package/iproute2/Config.in" @@ -2060,12 +2148,14 @@ menu "Networking applications" source "package/mosh/Config.in" source "package/mosquitto/Config.in" source "package/mrouted/Config.in" + source "package/mrp/Config.in" source "package/mtr/Config.in" source "package/nbd/Config.in" source "package/ncftp/Config.in" source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" source "package/netplug/Config.in" @@ -2103,6 +2193,7 @@ endif source "package/openswan/Config.in" source "package/openvpn/Config.in" source "package/p910nd/Config.in" + source "package/parprouted/Config.in" source "package/phidgetwebservice/Config.in" source "package/phytool/Config.in" source "package/pimd/Config.in" @@ -2122,6 +2213,7 @@ endif source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" + source "package/redir/Config.in" source "package/rp-pppoe/Config.in" source "package/rpcbind/Config.in" source "package/rsh-redone/Config.in" @@ -2160,7 +2252,7 @@ endif source "package/tftpd/Config.in" source "package/thttpd/Config.in" source "package/tinc/Config.in" - source "package/tinyhttpd/Config.in" + source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" source "package/tor/Config.in" source "package/traceroute/Config.in" @@ -2172,6 +2264,8 @@ endif source "package/uftp/Config.in" source "package/uhttpd/Config.in" source "package/ulogd/Config.in" + source "package/unbound/Config.in" + source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" source "package/vde2/Config.in" @@ -2220,6 +2314,7 @@ menu "Real-Time" endmenu menu "Security" + source "package/apparmor/Config.in" source "package/checkpolicy/Config.in" source "package/ima-evm-utils/Config.in" source "package/optee-benchmark/Config.in" @@ -2233,6 +2328,7 @@ menu "Security" source "package/selinux-python/Config.in" source "package/semodule-utils/Config.in" source "package/setools/Config.in" + source "package/urandom-scripts/Config.in" endmenu menu "Shell and utilities" @@ -2258,13 +2354,16 @@ comment "Utilities" source "package/logsurfer/Config.in" source "package/pdmenu/Config.in" source "package/pinentry/Config.in" + source "package/qprint/Config.in" source "package/ranger/Config.in" + source "package/rtty/Config.in" source "package/screen/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" source "package/tini/Config.in" source "package/tmux/Config.in" + source "package/ttyd/Config.in" source "package/which/Config.in" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" @@ -2292,12 +2391,14 @@ menu "System tools" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" source "package/docker-proxy/Config.in" + source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/htop/Config.in" + source "package/ibm-sw-tpm2/Config.in" source "package/initscripts/Config.in" source "package/iotop/Config.in" source "package/iprutils/Config.in" @@ -2308,10 +2409,12 @@ menu "System tools" source "package/kvmtool/Config.in" source "package/libostree/Config.in" source "package/lxc/Config.in" + source "package/makedumpfile/Config.in" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" source "package/monit/Config.in" + source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" @@ -2330,6 +2433,7 @@ menu "System tools" source "package/rauc/Config.in" source "package/rsyslog/Config.in" source "package/runc/Config.in" + source "package/s390-tools/Config.in" source "package/s6/Config.in" source "package/s6-linux-init/Config.in" source "package/s6-linux-utils/Config.in" @@ -2355,6 +2459,7 @@ menu "System tools" source "package/tpm2-totp/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" + source "package/watchdog/Config.in" source "package/xdg-dbus-proxy/Config.in" source "package/xen/Config.in" source "package/xvisor/Config.in" @@ -2365,6 +2470,7 @@ menu "Text editors and viewers" source "package/joe/Config.in" source "package/less/Config.in" source "package/mc/Config.in" + source "package/mg/Config.in" source "package/most/Config.in" source "package/nano/Config.in" source "package/uemacs/Config.in" diff --git a/buildroot/package/Config.in.host b/buildroot/package/Config.in.host index dfea47886..c69c756f3 100644 --- a/buildroot/package/Config.in.host +++ b/buildroot/package/Config.in.host @@ -2,8 +2,9 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" + source "package/asn1c/Config.in.host" + source "package/babeltrace2/Config.in.host" source "package/btrfs-progs/Config.in.host" - source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" @@ -18,7 +19,10 @@ menu "Host utilities" source "package/dtc/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/e2tools/Config.in.host" + source "package/environment-setup/Config.in.host" + source "package/erofs-utils/Config.in.host" source "package/eudev/Config.in.host" + source "package/exfatprogs/Config.in.host" source "package/f2fs-tools/Config.in.host" source "package/faketime/Config.in.host" source "package/fatcat/Config.in.host" @@ -36,21 +40,25 @@ menu "Host utilities" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" + source "package/kmod/Config.in.host" source "package/libp11/Config.in.host" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/mender-artifact/Config.in.host" + source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" + source "package/odb/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/opkg-utils/Config.in.host" source "package/parted/Config.in.host" source "package/patchelf/Config.in.host" + source "package/pigz/Config.in.host" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" @@ -68,6 +76,7 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" + source "package/sentry-cli/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" diff --git a/buildroot/package/Makefile.in b/buildroot/package/Makefile.in index 285e2837e..51f5cbce4 100644 --- a/buildroot/package/Makefile.in +++ b/buildroot/package/Makefile.in @@ -426,3 +426,4 @@ include package/pkg-kernel-module.mk include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk +include package/pkg-qmake.mk diff --git a/buildroot/package/acpica/acpica.hash b/buildroot/package/acpica/acpica.hash index ac2201d57..a2fdfe602 100644 --- a/buildroot/package/acpica/acpica.hash +++ b/buildroot/package/acpica/acpica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 edb9a886455d22955c93753e2de61b780bed94fb434079e844dc5e4376cadd4c acpica-unix2-20191018.tar.gz -sha256 65464cea6ee2f7a5d38e2b5f1050a4b39a15358a09b8e36119416d4e2c5031b8 source/include/acpi.h +sha256 8a49904744a8159b7f325ed941b56968ba37a0371c634036628064f97538de4b acpica-unix2-20200717.tar.gz +sha256 cb17c679d3291eba1a70a1336062fb07eec2e839b0821b443b24f41de18c5218 source/include/acpi.h diff --git a/buildroot/package/acpica/acpica.mk b/buildroot/package/acpica/acpica.mk index 68b948c86..21ecc155b 100644 --- a/buildroot/package/acpica/acpica.mk +++ b/buildroot/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20191018 +ACPICA_VERSION = 20200717 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 diff --git a/buildroot/package/acsccid/acsccid.hash b/buildroot/package/acsccid/acsccid.hash index 2d61ad664..f43a7930a 100644 --- a/buildroot/package/acsccid/acsccid.hash +++ b/buildroot/package/acsccid/acsccid.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.7/ -sha1 f4db3c2393f392191291df128008832e245d821b acsccid-1.1.7.tar.bz2 -md5 0b34146571d9492ecfff066582dd9356 acsccid-1.1.7.tar.bz2 +sha1 c0062401e5fedf3ec12c8c2d375d6e1561a8a8ed acsccid-1.1.8.tar.bz2 +md5 3eba7b2527aa0b14c73b1a620a1d72d2 acsccid-1.1.8.tar.bz2 # Locally computed -sha256 3778548ff9b639dd46d1570922e425698e16c5a0a0840ed1fad235052e291ee3 acsccid-1.1.7.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 f86fd846bc88594a569ea27040cb441d933b7eca8d51d2a90bacf161e7740051 acsccid-1.1.8.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/acsccid/acsccid.mk b/buildroot/package/acsccid/acsccid.mk index 28a31b95a..db74e9cb7 100644 --- a/buildroot/package/acsccid/acsccid.mk +++ b/buildroot/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.7 +ACSCCID_VERSION = 1.1.8 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash index 0daef24db..ce6acb8d9 100644 --- a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash +++ b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash @@ -1,5 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum -sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz +sha256 a594e7440971f860cc61b1b8291be15ffc1b8dd06a9f11485a5a7faf189bcf6b adwaita-icon-theme-3.37.2.tar.xz # locally computed sha256 51f83b2b4e9ed2beebc9b8eed2ecad29314a58ed8c5184b22ad8f9df703d3ce5 COPYING sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING_LGPL diff --git a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk index 8c9dec14f..3950cfa63 100644 --- a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk +++ b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk @@ -4,8 +4,8 @@ # ################################################################################ -ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22 -ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0 +ADWAITA_ICON_THEME_VERSION_MAJOR = 3.37 +ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).2 ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz ADWAITA_ICON_THEME_INSTALL_STAGING = YES diff --git a/buildroot/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/buildroot/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch new file mode 100644 index 000000000..f16c2b4b7 --- /dev/null +++ b/buildroot/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch @@ -0,0 +1,102 @@ +From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Tue, 14 Jul 2020 10:30:10 +0200 +Subject: [PATCH] Fix build when SNMPv3 is disabled + +agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it +is missing one and it has a few ones in excess. Fix them. + +Upstream is aware, says "will fix in later version", but thinks to make v3 +mandatory. See discussion at +https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 + +Upstream status: none, upstream is not welcoming contributions. + +Signed-off-by: Luca Ceresoli +--- + include/agent_pp/notification_log_mib.h | 4 ++-- + include/agent_pp/notification_originator.h | 2 ++ + include/agent_pp/snmp_community_mib.h | 4 ++-- + src/notification_originator.cpp | 2 ++ + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h +index ddac05e515d9..8fd8cfec32ca 100644 +--- a/include/agent_pp/notification_log_mib.h ++++ b/include/agent_pp/notification_log_mib.h +@@ -22,7 +22,7 @@ + + //--AgentGen BEGIN=_BEGIN + #include +-#ifdef _SNMPv3 ++// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific + #include + //--AgentGen END + +@@ -688,6 +688,6 @@ protected: + */ + + +-#endif ++// #endif // _SNMPv3 + + +diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h +index 95e8b4e1836d..6f50cd52625b 100644 +--- a/include/agent_pp/notification_originator.h ++++ b/include/agent_pp/notification_originator.h +@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { + */ + virtual nlmLogEntry* get_nlm_log_entry(); + ++#ifdef _SNMPv3 + virtual v3MP* get_v3mp(); ++#endif + + protected: + +diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h +index 7d5c4558f36d..d9eb2b4a87ec 100644 +--- a/include/agent_pp/snmp_community_mib.h ++++ b/include/agent_pp/snmp_community_mib.h +@@ -49,7 +49,7 @@ namespace Agentpp { + #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" + #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" + +-#ifdef _SNMPv3 ++// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific + + /** + * snmpCommunityName +@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup + static void add_public(); + static void add_public(Mib* mib); + }; +-#endif ++// #endif // _SNMPv3 + + #ifdef AGENTPP_NAMESPACE + } +diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp +index d7d566869998..39ddbe08cdeb 100644 +--- a/src/notification_originator.cpp ++++ b/src/notification_originator.cpp +@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { + return nlmLogEntry::instance; + } + ++#ifdef _SNMPv3 + v3MP* NotificationOriginator::get_v3mp() { + if (mib) { + return mib->get_request_list()->get_v3mp(); +@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { + return v3MP::I; + } + } ++#endif + + + bool NotificationOriginator::check_access(ListCursor& cur, +-- +2.27.0 + diff --git a/buildroot/package/agentpp/agentpp.hash b/buildroot/package/agentpp/agentpp.hash index f45819072..11b23c8ee 100644 --- a/buildroot/package/agentpp/agentpp.hash +++ b/buildroot/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ffbd06e6582978b6ea7344ae0ccfe58e634b84d31496bb6eb77f0a9e8f1e1df1 agent++-4.1.2.tar.gz -sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt +sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/buildroot/package/agentpp/agentpp.mk b/buildroot/package/agentpp/agentpp.mk index 0b6ef0a2a..8982d9e56 100644 --- a/buildroot/package/agentpp/agentpp.mk +++ b/buildroot/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.1.2 +AGENTPP_VERSION = 4.3.1 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 diff --git a/buildroot/package/aircrack-ng/0001-Expand-packed-definition.patch b/buildroot/package/aircrack-ng/0001-Expand-packed-definition.patch new file mode 100644 index 000000000..f0c033a1a --- /dev/null +++ b/buildroot/package/aircrack-ng/0001-Expand-packed-definition.patch @@ -0,0 +1,26 @@ +From d4496006ac1e0c99908108b998ae39afb0658733 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Tue, 7 Jul 2020 11:42:40 -0700 +Subject: [PATCH] Expand __packed definition. + +Signed-off-by: Joseph Benden +[Retrieved from: +https://github.com/aircrack-ng/aircrack-ng/commit/d4496006ac1e0c99908108b998ae39afb0658733] +Signed-off-by: Fabrice Fontaine +--- + lib/radiotap/radiotap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/radiotap/radiotap.h b/lib/radiotap/radiotap.h +index 57f784b8d..bb5a41dfc 100644 +--- a/lib/radiotap/radiotap.h ++++ b/lib/radiotap/radiotap.h +@@ -56,7 +56,7 @@ struct ieee80211_radiotap_header { + * @it_present: (first) present word + */ + uint32_t it_present; +-} __packed; ++} __attribute__((__packed__)); + + /* version is always 0 */ + #define PKTHDR_RADIOTAP_VERSION 0 diff --git a/buildroot/package/aircrack-ng/0002-Fix-duplicated-symbols.patch b/buildroot/package/aircrack-ng/0002-Fix-duplicated-symbols.patch new file mode 100644 index 000000000..f18158080 --- /dev/null +++ b/buildroot/package/aircrack-ng/0002-Fix-duplicated-symbols.patch @@ -0,0 +1,74 @@ +From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Tue, 7 Jul 2020 11:44:40 -0700 +Subject: [PATCH] Fix duplicated symbols. + +Signed-off-by: Joseph Benden +[Retrieved from: +https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4] +Signed-off-by: Fabrice Fontaine +--- + src/airodump-ng/airodump-ng.c | 2 -- + src/airventriloquist-ng/airventriloquist-ng.c | 6 +++--- + src/tkiptun-ng/tkiptun-ng.c | 4 ++-- + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c +index 3ae6994dd..e72bc88e2 100644 +--- a/src/airodump-ng/airodump-ng.c ++++ b/src/airodump-ng/airodump-ng.c +@@ -92,8 +92,6 @@ + #include "radiotap/radiotap_iter.h" + + struct devices dev; +-uint8_t h80211[4096] __attribute__((aligned(16))); +-uint8_t tmpbuf[4096] __attribute__((aligned(16))); + + static const unsigned char llcnull[] = {0, 0, 0, 0}; + +diff --git a/src/airventriloquist-ng/airventriloquist-ng.c b/src/airventriloquist-ng/airventriloquist-ng.c +index ac6b7647e..267d95540 100644 +--- a/src/airventriloquist-ng/airventriloquist-ng.c ++++ b/src/airventriloquist-ng/airventriloquist-ng.c +@@ -173,7 +173,7 @@ static struct local_options + } lopt; + + struct devices dev; +-struct wif *_wi_in, *_wi_out; ++extern struct wif *_wi_in, *_wi_out; + + struct ARP_req + { +@@ -195,8 +195,8 @@ struct APt + }; + + unsigned long nb_pkt_sent; +-u_int8_t h80211[4096]; +-static u_int8_t tmpbuf[4096]; ++extern u_int8_t h80211[4096]; ++extern u_int8_t tmpbuf[4096]; + + static int tcp_test(const char * ip_str, const short port) + { +diff --git a/src/tkiptun-ng/tkiptun-ng.c b/src/tkiptun-ng/tkiptun-ng.c +index dc67f5d58..43db0bc23 100644 +--- a/src/tkiptun-ng/tkiptun-ng.c ++++ b/src/tkiptun-ng/tkiptun-ng.c +@@ -267,7 +267,7 @@ static struct local_options + + // unused, but needed for link + struct devices dev; +-struct wif *_wi_in, *_wi_out; ++extern struct wif *_wi_in, *_wi_out; + + struct ARP_req + { +@@ -289,7 +289,7 @@ struct APt + }; + + unsigned long nb_pkt_sent; +-unsigned char h80211[4096]; ++extern unsigned char h80211[4096]; + static unsigned char srcbuf[4096]; + static char strbuf[512]; + static int alarmed; diff --git a/buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch index 5bf9dd205..17b57d1f3 100644 --- a/buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch +++ b/buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -10,6 +10,8 @@ Signed-off-by: Thomas Petazzoni [Jörg: update patch for 1.1.6] Signed-off-by: Jörg Krause Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html +[Bernd: update patch for 1.2.4] +Signed-off-by: Bernd Kuhls --- configure.ac | 2 ++ src/pcm/pcm_direct.c | 10 +++++++++- @@ -32,7 +34,7 @@ diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 2b07eff9..4dc3ea26 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c -@@ -431,13 +431,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) +@@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) close(dmix->server_fd); return ret; } diff --git a/buildroot/package/alsa-lib/0002-dlmisc-the-snd_plugin_dir_set.patch b/buildroot/package/alsa-lib/0002-dlmisc-the-snd_plugin_dir_set.patch new file mode 100644 index 000000000..61d945455 --- /dev/null +++ b/buildroot/package/alsa-lib/0002-dlmisc-the-snd_plugin_dir_set.patch @@ -0,0 +1,34 @@ +From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 22 Oct 2020 20:57:32 +0200 +Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be + declared even for \!DL_ORIGIN_AVAILABLE + +Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") +BugLink: https://github.com/alsa-project/alsa-lib/issues/91 +Signed-off-by: Jaroslav Kysela + +Downloaded from upstream commit +https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e + +Signed-off-by: Bernd Kuhls +--- + src/dlmisc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index c9517c55..f20eb593 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -42,11 +42,9 @@ + #ifndef PIC + struct snd_dlsym_link *snd_dlsym_start = NULL; + #endif +-#ifdef DL_ORIGIN_AVAILABLE + static int snd_plugin_dir_set = 0; + static char *snd_plugin_dir = NULL; + #endif +-#endif + + #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) + static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch b/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch deleted file mode 100644 index 4d3ad1117..000000000 --- a/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 65eb51668f87668d994f260f36a6325f248cdff3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 3 Dec 2019 18:56:40 +0100 -Subject: [PATCH] src/ucm/main.c: fix build without mixer - -Commit 4ce38a5ff466d18039b2606938f866ea3a6c9f3c breaks the build without -mixer on: - - CCLD libasound.la -/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: ucm/.libs/libucm.a(main.o): in function `snd_use_case_set': -main.c:(.text+0x185c): undefined reference to `snd_mixer_selem_id_parse' - -Fixes: - - http://autobuild.buildroot.org/results/4d91c9f82a2a61c50c457a851073b85cc09ea345 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/alsa-project/alsa-lib/pull/15] ---- - src/ucm/main.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/ucm/main.c b/src/ucm/main.c -index d2078a23..61922f10 100644 ---- a/src/ucm/main.c -+++ b/src/ucm/main.c -@@ -2115,8 +2115,10 @@ int snd_use_case_parse_selem_id(snd_mixer_selem_id_t *dst, - const char *ucm_id, - const char *value) - { -+#ifdef BUILD_MIXER - if (strcmp(ucm_id, "PlaybackMixerId") == 0 || - strcmp(ucm_id, "CaptureMixerId") == 0) - return snd_mixer_selem_id_parse(dst, value); -+#endif - return -EINVAL; - } --- -2.24.0 - diff --git a/buildroot/package/alsa-lib/alsa-lib.hash b/buildroot/package/alsa-lib/alsa-lib.hash index 2f34a12fb..6e65fb716 100644 --- a/buildroot/package/alsa-lib/alsa-lib.hash +++ b/buildroot/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 958e260e3673f1f6ff6b2d2c0df3fc2e469bea5b2957163ce96ce17f23e87943 alsa-lib-1.2.1.2.tar.bz2 -sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING -sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING +sha256 f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 alsa-lib-1.2.4.tar.bz2 +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING +sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/buildroot/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk index 38bd0fb70..728aec31a 100644 --- a/buildroot/package/alsa-lib/alsa-lib.mk +++ b/buildroot/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.1.2 +ALSA_LIB_VERSION = 1.2.4 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) diff --git a/buildroot/package/alsa-utils/alsa-utils.hash b/buildroot/package/alsa-utils/alsa-utils.hash index 2c55ce621..dda009c1a 100644 --- a/buildroot/package/alsa-utils/alsa-utils.hash +++ b/buildroot/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d alsa-utils-1.2.1.tar.bz2 -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/alsa-utils/alsa-utils.mk b/buildroot/package/alsa-utils/alsa-utils.mk index 7af46e239..d9f0fea7b 100644 --- a/buildroot/package/alsa-utils/alsa-utils.mk +++ b/buildroot/package/alsa-utils/alsa-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.1 +ALSA_UTILS_VERSION = 1.2.4 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 -ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils +ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 ALSA_UTILS_LICENSE_FILES = COPYING ALSA_UTILS_INSTALL_STAGING = YES @@ -14,10 +14,6 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) \ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ $(TARGET_NLS_DEPENDENCIES) -# Regenerate aclocal.m4 to pick the patched -# version of alsa.m4 from alsa-lib -ALSA_UTILS_AUTORECONF = YES -ALSA_UTILS_GETTEXTIZE = YES ALSA_UTILS_CONF_ENV = \ ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \ diff --git a/buildroot/package/altera-stapl/Config.in b/buildroot/package/altera-stapl/Config.in new file mode 100644 index 000000000..ff7d23f84 --- /dev/null +++ b/buildroot/package/altera-stapl/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ALTERA_STAPL + bool "altera-stapl" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + Altera Jam STAPL Bytecode Player. + + https://github.com/kontron/altera-stapl diff --git a/buildroot/package/altera-stapl/altera-stapl.hash b/buildroot/package/altera-stapl/altera-stapl.hash new file mode 100644 index 000000000..c3af649c4 --- /dev/null +++ b/buildroot/package/altera-stapl/altera-stapl.hash @@ -0,0 +1,2 @@ +sha256 a4d85a79790eab851399132fce4524979fe764d5297413b2445673e6a190bb42 altera-stapl-0.3.3.tar.gz +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/buildroot/package/altera-stapl/altera-stapl.mk b/buildroot/package/altera-stapl/altera-stapl.mk new file mode 100644 index 000000000..afafbe2d0 --- /dev/null +++ b/buildroot/package/altera-stapl/altera-stapl.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# altera-stapl +# +################################################################################ + +ALTERA_STAPL_VERSION = 0.3.3 +ALTERA_STAPL_SITE = $(call github,kontron,altera-stapl,$(ALTERA_STAPL_VERSION)) +ALTERA_STAPL_LICENSE = GPLv2+ +ALTERA_STAPL_LICENSE_FILES = COPYING +ALTERA_STAPL_DEPENDENCIES = libgpiod + +define ALTERA_STAPL_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define ALTERA_STAPL_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/am33x-cm3/0004-Makefile-add-fno-builtin.patch b/buildroot/package/am33x-cm3/0004-Makefile-add-fno-builtin.patch new file mode 100644 index 000000000..7478bd45f --- /dev/null +++ b/buildroot/package/am33x-cm3/0004-Makefile-add-fno-builtin.patch @@ -0,0 +1,41 @@ +From 25fc567ba8a0cd199e48bfa82863247d953784ea Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 30 Aug 2020 20:59:29 +0200 +Subject: [PATCH] Makefile: add -fno-builtin + +Build with gcc 10 fails on: + +/srv/storage/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: src/foundation/startup.o: in function `reset_handler': +/srv/storage/autobuild/run/instance-2/output-1/build/am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365/src/foundation/startup.c:177: undefined reference to `memcpy' + +This is due to the fact that gcc 10 replaces the following statement by +a memcpy call: + +*puldest++ = *pulsrc++; + +To fix this build failure, add -fno-builtin + +Fixes: + - http://autobuild.buildroot.org/results/a991e6efa012df518ff1bb35017ad2c96c8feedc + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index fe3d844..fa24d4b 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \ + -Werror-implicit-function-declaration -Wstrict-prototypes \ + -Wdeclaration-after-statement -fno-delete-null-pointer-checks \ + -Wempty-body -fno-strict-overflow -fno-stack-protector \ +- -fno-pie -g -I$(INCLUDES) -O2 ++ -fno-pie -fno-builtin -g -I$(INCLUDES) -O2 + LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld + + EXECUTABLE=am335x-pm-firmware.elf +-- +2.28.0 + diff --git a/buildroot/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch b/buildroot/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch deleted file mode 100644 index a0db9621a..000000000 --- a/buildroot/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:41:46 +0200 -Subject: [PATCH] Add support for Linux 4.0 - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++ - common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 677565d..6017e89 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table); - - MODULE_INFO(supported, "external"); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -+#define read_cr4() __read_cr4() -+#define write_cr4(cr4) __write_cr4(cr4) -+#endif -+ - /* globals constants */ - const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE; - const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE; -diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c -index 2d89eb0..bacdb69 100755 ---- a/common/lib/modules/fglrx/build_mod/kcl_str.c -+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c -@@ -42,6 +42,10 @@ - #include "kcl_type.h" - #include "kcl_str.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -+#define strnicmp strncasecmp -+#endif -+ - /** \brief Fill memory with a constant byte - * \param s Pointer to memory - * \param c Initializing value --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch b/buildroot/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch deleted file mode 100644 index cc95916e1..000000000 --- a/buildroot/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:44:59 +0200 -Subject: [PATCH] Add support for Linux 4.1 - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 6017e89..94778f1 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler( - KCL_PUB_InterruptHandlerWrap, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)), --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) - //when MSI enabled. keep irq disabled when calling the action handler, - //exclude this IRQ from irq balancing (only on one CPU) - ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), -+#else -+ ((useMSI) ? (0x0) : (IRQF_SHARED)), - #endif - dev_name, - context); --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch b/buildroot/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch deleted file mode 100644 index 745816296..000000000 --- a/buildroot/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch +++ /dev/null @@ -1,121 +0,0 @@ -From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Tue, 14 Jul 2015 12:56:37 +0200 -Subject: [PATCH] Add support for Linux 4.2 - -Deal with the FPU code renaming - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 94778f1..749ea51 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -191,9 +191,17 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - #include "asm/i387.h" -+#else -+#include -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - #include -+#else -+#include -+#endif - #endif - - #include "firegl_public.h" -@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state) - - #if defined(__i386__) - #ifndef __HAVE_ARCH_CMPXCHG -+#ifndef __xg -+#define __xg(x) ((volatile long *)(x)) -+#endif - static inline - unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, - unsigned long new, int size) -@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old, - unsigned long new, int size) - { - #ifndef __HAVE_ARCH_CMPXCHG -+#if defined(__i386__) - return __fgl_cmpxchg(ptr,old,new,size); -+#elif defined(__x86_64__) -+ return cmpxchg((unsigned long*)ptr,old,new); -+#endif - #else - /* On kernel version 2.6.34 passing a variable or unsupported size - * argument to the __cmpxchg macro causes the default-clause of a -@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - struct fpu *fpu = &tsk->thread.fpu; - - if(static_cpu_has(X86_FEATURE_XSAVE)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - fpu_xsave(fpu); - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) -+#else -+ copy_xregs_to_kernel(&fpu->state.xsave); -+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) -+#endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - fpu_fxsave(fpu); -+#else -+ copy_fxregs_to_kernel(fpu); -+#endif - } else { - asm volatile("fnsave %[fx]; fwait" -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - : [fx] "=m" (fpu->state->fsave)); -+#else -+ : [fx] "=m" (fpu->state.fsave)); -+#endif - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) { - asm volatile("fnclex"); - return 0; - } -+#endif - return 1; - } - #endif -@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - void ATI_API_CALL KCL_fpu_begin(void) - { - #ifdef CONFIG_X86_64 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - kernel_fpu_begin(); - #else -+ __kernel_fpu_begin(); -+#endif -+#else - #ifdef TS_USEDFPU - struct thread_info *cur_thread = current_thread_info(); - struct task_struct *cur_task = get_current(); -@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void) - */ - void ATI_API_CALL KCL_fpu_end(void) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - kernel_fpu_end(); -+#else -+ __kernel_fpu_end(); -+#endif - } - - /** Create new directory entry under "/proc/...." --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch b/buildroot/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch deleted file mode 100644 index 4d375b8ad..000000000 --- a/buildroot/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:48:30 +0200 -Subject: [PATCH] Use fpregs_active instead of has_fpu - -This is for Linux 4.2 - -Thanks to Tim Gardner for the patch. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 749ea51..4c1f9a5 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void) - /* The thread structure is changed with the commit below for kernel 3.3: - * https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8 - */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) -+ if (cur_task->thread.fpu.fpregs_active) -+#else - if (cur_task->thread.fpu.has_fpu) -+#endif - #else - if (cur_task->thread.has_fpu) - #endif --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch b/buildroot/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch deleted file mode 100644 index c9513ef18..000000000 --- a/buildroot/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch +++ /dev/null @@ -1,79 +0,0 @@ -From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:49:46 +0200 -Subject: [PATCH] Use a local copy of copy_xregs_to_kernel - -This is needed for Linux 4.2. - -Thanks to Tim Gardner for the patch. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++- - 1 file changed, 43 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 4c1f9a5..bb67bba 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...) - return i; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) -+/* -+ * Save processor xstate to xsave area. -+ */ -+static void _copy_xregs_to_kernel(struct xregs_state *xstate) -+{ -+ u64 mask = -1; -+ u32 lmask = mask; -+ u32 hmask = mask >> 32; -+ int err = 0; -+ -+ /*WARN_ON(!alternatives_patched);*/ -+ -+ /* -+ * If xsaves is enabled, xsaves replaces xsaveopt because -+ * it supports compact format and supervisor states in addition to -+ * modified optimization in xsaveopt. -+ * -+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave -+ * because xsaveopt supports modified optimization which is not -+ * supported by xsave. -+ * -+ * If none of xsaves and xsaveopt is enabled, use xsave. -+ */ -+ alternative_input_2( -+ "1:"XSAVE, -+ XSAVEOPT, -+ X86_FEATURE_XSAVEOPT, -+ XSAVES, -+ X86_FEATURE_XSAVES, -+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) : -+ "memory"); -+ asm volatile("2:\n\t" -+ xstate_fault(err) -+ : "0" (err) -+ : "memory"); -+ -+ /* We should never fault when copying to a kernel buffer: */ -+ WARN_ON_FPU(err); -+} -+#endif -+ - /** \brief Generate UUID - * \param buf pointer to the generated UUID - * \return None -@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - fpu_xsave(fpu); - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else -- copy_xregs_to_kernel(&fpu->state.xsave); -+ _copy_xregs_to_kernel(&fpu->state.xsave); - if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) - #endif - return 1; --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch b/buildroot/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch deleted file mode 100644 index 104e2c599..000000000 --- a/buildroot/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001 -From: Romain Perier -Date: Thu, 7 Jul 2016 14:40:53 +0200 -Subject: [PATCH] Add support for Linux 4.4 - -It fixes various things like the use of seq_printf because its API -changed. It also replaces the call to mtrr_add and mtrr_del by -arch_phys_wc_add and arch_phys_wc_del because these symbols are -no longer exported for Linux >= 4.3.x. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index bb67bba..b4b2d30 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data) - - len = snprintf(buf, request, "%d\n", major); - #else -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ seq_printf(m, "%d\n", major); -+ len = 0; -+#else - len = seq_printf(m, "%d\n", major); - #endif - -+#endif -+ - KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len); - - return len; -@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void) - int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ return arch_phys_wc_add(base, size); -+#else - return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ -@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size - int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ arch_phys_wc_del(reg); -+ return 0; -+#else - return mtrr_del(reg, base, size); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ -@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else - _copy_xregs_to_kernel(&fpu->state.xsave); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) -+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) -+#else - if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) - #endif -+ -+#endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) --- -2.8.1 - diff --git a/buildroot/package/amd-catalyst/0007-remove-gpl-symbols.patch b/buildroot/package/amd-catalyst/0007-remove-gpl-symbols.patch deleted file mode 100644 index d0094b093..000000000 --- a/buildroot/package/amd-catalyst/0007-remove-gpl-symbols.patch +++ /dev/null @@ -1,54 +0,0 @@ -Author: Manuel Rüger -Date: Sat, 2 Jan 2016 17:24:30 +0100 -URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50 - -Signed-off-by: Romain Perier ---- ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400 -@@ -136,7 +136,6 @@ - #include - #include - #include --#include // for flush_tlb_page - #include - #ifdef CONFIG_MTRR - #include -@@ -251,6 +250,26 @@ - #define WRITE_CR4(x) write_cr4(x) - #endif - -+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory") -+#define __flush_tlb() native_write_cr3(native_read_cr3()) -+ -+static inline void __flush_tlb_all(void) -+{ -+ if (cpu_has_pge) -+ { -+ unsigned long flags, cr4; -+ raw_local_irq_save(flags); -+ cr4 = native_read_cr4(); -+ native_write_cr4(cr4 & ~X86_CR4_PGE); -+ native_write_cr4(cr4); -+ raw_local_irq_restore(flags); -+ } -+ else -+ { -+ __flush_tlb(); -+ } -+} -+ - // ============================================================ - /* globals */ - ---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400 -@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - if(pdev) - { --#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) -+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) - pci_ignore_hotplug(pdev); - #else - pdev->ignore_hotplug = 1; diff --git a/buildroot/package/amd-catalyst/20-fglrx.conf b/buildroot/package/amd-catalyst/20-fglrx.conf deleted file mode 100644 index d83ff582f..000000000 --- a/buildroot/package/amd-catalyst/20-fglrx.conf +++ /dev/null @@ -1,4 +0,0 @@ -Section "Device" - Identifier "AMD Radeon GPU" - Driver "fglrx" -EndSection diff --git a/buildroot/package/amd-catalyst/Config.in b/buildroot/package/amd-catalyst/Config.in deleted file mode 100644 index 1a5bf0295..000000000 --- a/buildroot/package/amd-catalyst/Config.in +++ /dev/null @@ -1,65 +0,0 @@ -comment "amd-catalyst needs a glibc toolchain" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_AMD_CATALYST - bool "amd-catalyst" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_USES_GLIBC - help - The binary-only driver blob for AMD cards. - This driver supports AMD Radeon HD 5xxx and newer graphics - cards. - - http://www.amd.com/ - -if BR2_PACKAGE_AMD_CATALYST - -comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17" - depends on !BR2_PACKAGE_XORG7 \ - || !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \ - || !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - -config BR2_PACKAGE_AMD_CATALYST_XORG - bool "X.org drivers" - default y - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX - select BR2_PACKAGE_ACPID # runtime - select BR2_PACKAGE_XLIB_LIBX11 # runtime - select BR2_PACKAGE_XLIB_LIBXEXT # runtime - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime - # This package does not have standard GL headers - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_HAS_LIBGL - -if BR2_PACKAGE_AMD_CATALYST_XORG - -config BR2_PACKAGE_PROVIDES_LIBGL - default "amd-catalyst" - -config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS - bool "command-line configuration tools" - help - Build and install the AMD command line tools. - -endif - -comment "amd-catalyst kernel module needs a kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_AMD_CATALYST_MODULE - bool "fglrx kernel module" - depends on BR2_LINUX_KERNEL - help - Builds and install the fglrx kernel module - -config BR2_PACKAGE_AMD_CATALYST_OPENCL - bool "OpenCL support" - help - Installs the OpenCL binary blobs and the ICD profile - for GPGPU computing. - -endif # BR2_PACKAGE_AMD_CATALYST diff --git a/buildroot/package/amd-catalyst/amd-catalyst.hash b/buildroot/package/amd-catalyst/amd-catalyst.hash deleted file mode 100644 index 9f9b0a314..000000000 --- a/buildroot/package/amd-catalyst/amd-catalyst.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip diff --git a/buildroot/package/amd-catalyst/amd-catalyst.mk b/buildroot/package/amd-catalyst/amd-catalyst.mk deleted file mode 100644 index fe8aa850f..000000000 --- a/buildroot/package/amd-catalyst/amd-catalyst.mk +++ /dev/null @@ -1,162 +0,0 @@ -################################################################################ -# -# amd-catalyst -# -################################################################################ - -AMD_CATALYST_VERSION = 15.9 -AMD_CATALYST_VERBOSE_VER = 15.201.1151 -AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux -AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com' -AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip -AMD_CATALYST_LICENSE = AMD Software License -AMD_CATALYST_LICENSE_FILES = LICENSE.TXT -AMD_CATALYST_INSTALL_STAGING = YES -AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64) -AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX) -AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64) - -define AMD_CATALYST_EXTRACT_CMDS - unzip -q $(AMD_CATALYST_DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D) - $(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D) -endef - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y) -AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x -AMD_CATALYST_MODULE_MAKE_OPTS = \ - CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - -define AMD_CATALYST_PREPARE_MODULE - # The Makefile expects to have source in the folder 2.6.x - cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \ - $(@D)/common/lib/modules/fglrx/build_mod/2.6.x - # This static lib is required during the link - cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \ - $(@D)/common/lib/modules/fglrx/build_mod/2.6.x -endef - -AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE - -$(eval $(kernel-module)) -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y) - -AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32) -AMD_CATALYST_OPENCL_FILES = \ - libOpenCL.so.1 \ - libaticalcl.so \ - libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \ - libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so - -define AMD_CATALYST_INSTALL_OPENCL - $(foreach f,$(AMD_CATALYST_OPENCL_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f) - ) - ln -sf libOpenCL.so.1 \ - $(TARGET_DIR)/usr/lib/libOpenCL.so - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \ - $(TARGET_DIR)/usr/bin/clinfo - $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \ - $(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd -endef - -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y) - -# GL headers are needed by any package that wants to use libgl, so they need to -# be installed before any user of it. The only way to do so is to have this -# package depends on mesa3d-headers. -AMD_CATALYST_DEPENDENCIES += mesa3d-headers -AMD_CATALYST_PROVIDES = libgl -AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX) - -define AMD_CATALYST_INSTALL_GL_LIBS - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \ - $(1)/usr/lib - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2 - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1 - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so -endef - -define AMD_CATALYST_INSTALL_STAGING_XORG - $(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR)) - $(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc -endef - -AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \ - modules/drivers/fglrx_drv.so \ - modules/linux/libfglrxdrm.so - -define AMD_CATALYST_INSTALL_XORG - # Xorg drivers - $(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \ - $(TARGET_DIR)/usr/lib/xorg/$(f) - ) - - # Xorg is not able to detect the driver automatically - $(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \ - $(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf - - # Common files: containing binary profiles about GPUs, - # required by the fglrx_drv xorg driver - $(INSTALL) -d $(TARGET_DIR)/etc/ati - $(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/ - - # DRI and GLX xorg modules: by default DRI is activated, - # these modules are required by the fglrx_drv.so xorg driver - $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \ - $(TARGET_DIR)/usr/lib/dri/fglrx_dri.so - $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \ - $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so - $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \ - $(TARGET_DIR)/usr/lib/xorg/modules/glesx.so - - # Userspace GL libraries, also runtime dependency of most of the cmdline - # tools - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \ - $(TARGET_DIR)/usr/lib/ - $(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR)) - - # Runtime dependency required by libfglrxdrm.so - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \ - $(TARGET_DIR)/usr/lib/ - ln -sf libatiuki.so.1.0 \ - $(TARGET_DIR)/usr/lib/libatiuki.so.1 -endef - -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y) -AMD_CATALYST_CMDLINE_TOOLS_FILES = \ - atiode \ - atiodcli \ - fgl_glxgears \ - aticonfig \ - amd-console-helper \ - fglrxinfo - -define AMD_CATALYST_INSTALL_CMDLINE_TOOLS - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \ - $(TARGET_DIR)/usr/sbin - $(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \ - $(TARGET_DIR)/usr/bin/$(f) - ) -endef -endif - -define AMD_CATALYST_INSTALL_STAGING_CMDS - $(call AMD_CATALYST_INSTALL_STAGING_XORG) -endef - -define AMD_CATALYST_INSTALL_TARGET_CMDS - $(call AMD_CATALYST_INSTALL_XORG) - $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) - $(call AMD_CATALYST_INSTALL_OPENCL) -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/amd-catalyst/gl.pc b/buildroot/package/amd-catalyst/gl.pc deleted file mode 100644 index 8729271fa..000000000 --- a/buildroot/package/amd-catalyst/gl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: gl -Description: AMD Catalyst OpenGL library -Version: 15.9 -Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl -Cflags: -I${includedir} -glx_tls: no - diff --git a/buildroot/package/angularjs/angularjs.hash b/buildroot/package/angularjs/angularjs.hash index 4f0f36b2a..5468174e4 100644 --- a/buildroot/package/angularjs/angularjs.hash +++ b/buildroot/package/angularjs/angularjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7182e7f39b921469157971d9e0783745758df4b625322d606ec7d9abf2b28af2 angular-1.7.9.zip -sha256 2420c59374dcdc1ca9721c334a32afee92f0610280cae0d1b3952b1279bc2b24 angular.js +sha256 471b57064031da8c5fd3b1ba3f52dd1e0d2740a97ed34da2e8ab2a4cc2718280 angular-1.8.2.zip +sha256 237656fae6e39d02cd71cbcfbf91b7964eba5796aafca1bfcfff3b054ce3fed6 angular.js diff --git a/buildroot/package/angularjs/angularjs.mk b/buildroot/package/angularjs/angularjs.mk index 295be5400..a9bee0216 100644 --- a/buildroot/package/angularjs/angularjs.mk +++ b/buildroot/package/angularjs/angularjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ANGULARJS_VERSION = 1.7.9 +ANGULARJS_VERSION = 1.8.2 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) ANGULARJS_LICENSE = MIT diff --git a/buildroot/package/apcupsd/Config.in b/buildroot/package/apcupsd/Config.in new file mode 100644 index 000000000..4bc523eed --- /dev/null +++ b/buildroot/package/apcupsd/Config.in @@ -0,0 +1,70 @@ +config BR2_PACKAGE_APCUPSD + bool "apcupsd" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + help + A daemon for controlling APC UPSes. + + http://www.apcupsd.org/ + +if BR2_PACKAGE_APCUPSD + +config BR2_PACKAGE_APCUPSD_APCSMART + bool "apcsmart" + help + Compile APC SmartUPS serial driver + +config BR2_PACKAGE_APCUPSD_DUMB + bool "dumb" + help + Compile dumb UPS driver + +config BR2_PACKAGE_APCUPSD_MODBUS + bool "modbus" + help + Compile MODBUS driver code + +config BR2_PACKAGE_APCUPSD_MODBUS_USB + bool "modbus usb" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + select BR2_PACKAGE_APCUPSD_MODBUS + help + Compile MODBUS/USB driver code + +comment "modbus usb support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_APCUPSD_NET + bool "net" + help + Compile networking driver for slaves + +config BR2_PACKAGE_APCUPSD_PCNET + bool "pcnet" + help + Compile PCNET driver code + +config BR2_PACKAGE_APCUPSD_SNMP + bool "snmp" + help + Compile SNMP driver + +config BR2_PACKAGE_APCUPSD_USB + bool "usb" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + help + Compile USB UPS code + +comment "usb support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +endif + +comment "apcupsd needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/apcupsd/apcupsd.hash b/buildroot/package/apcupsd/apcupsd.hash new file mode 100644 index 000000000..6795560f6 --- /dev/null +++ b/buildroot/package/apcupsd/apcupsd.hash @@ -0,0 +1,6 @@ +# From https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/3.14.14/ +md5 cc8f5ced77f38906a274787acb9bc980 apcupsd-3.14.14.tar.gz +sha1 f027fa141c929371fe860443b6d911ef3a3606fb apcupsd-3.14.14.tar.gz +# Locally computed: +sha256 db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867 apcupsd-3.14.14.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/apcupsd/apcupsd.mk b/buildroot/package/apcupsd/apcupsd.mk new file mode 100644 index 000000000..410bce9ae --- /dev/null +++ b/buildroot/package/apcupsd/apcupsd.mk @@ -0,0 +1,81 @@ +################################################################################ +# +# apcupsd +# +################################################################################ + +APCUPSD_VERSION = 3.14.14 +APCUPSD_SITE = http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/$(APCUPSD_VERSION) +APCUPSD_LICENSE = GPL-2.0 +APCUPSD_LICENSE_FILES = COPYING +APCUPSD_CONF_OPTS = --disable-test + +ifneq ($(BR2_PACKAGE_APCUPSD_MODBUS_USB)$(BR2_PACKAGE_APCUPSD_USB),) +APCUPSD_CONF_ENV += ac_cv_path_usbcfg=$(STAGING_DIR)/usr/bin/libusb-config +ifeq ($(BR2_STATIC_LIBS),y) +APCUPSD_DEPENDENCIES += host-pkgconf +APCUPSD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libusb`" +endif +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_APCSMART),y) +APCUPSD_CONF_OPTS += --enable-apcsmart +else +APCUPSD_CONF_OPTS += --disable-apcsmart +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_DUMB),y) +APCUPSD_CONF_OPTS += --enable-dumb +else +APCUPSD_CONF_OPTS += --disable-dumb +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_MODBUS_USB),y) +APCUPSD_CONF_OPTS += --enable-modbus-usb +APCUPSD_DEPENDENCIES = libusb libusb-compat +else +APCUPSD_CONF_OPTS += --disable-modbus-usb +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_MODBUS),y) +APCUPSD_CONF_OPTS += --enable-modbus +else +APCUPSD_CONF_OPTS += --disable-modbus +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_NET),y) +APCUPSD_CONF_OPTS += --enable-net +else +APCUPSD_CONF_OPTS += --disable-net +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_PCNET),y) +APCUPSD_CONF_OPTS += --enable-pcnet +else +APCUPSD_CONF_OPTS += --disable-pcnet +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_SNMP),y) +APCUPSD_CONF_OPTS += --enable-snmp +else +APCUPSD_CONF_OPTS += --disable-snmp +endif + +ifeq ($(BR2_PACKAGE_APCUPSD_USB),y) +APCUPSD_CONF_OPTS += --enable-usb +APCUPSD_DEPENDENCIES = libusb libusb-compat +else +APCUPSD_CONF_OPTS += --disable-usb +endif + +define APCUPSD_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/platforms +endef + +define APCUPSD_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/platforms DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/apitrace/apitrace.mk b/buildroot/package/apitrace/apitrace.mk index e4e6c41fe..b962ac01d 100644 --- a/buildroot/package/apitrace/apitrace.mk +++ b/buildroot/package/apitrace/apitrace.mk @@ -27,6 +27,10 @@ APITRACE_CXXFLAGS = $(TARGET_CXXFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) # This works around embedded Brotli build failure APITRACE_CFLAGS += -O0 +# CMakeLists.txt sets CMAKE_CXX_FLAGS_ depending on +# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS. +# Override CMAKE_BUILD_TYPE so no overrides are applied. +APITRACE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot endif ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) diff --git a/buildroot/package/apparmor/3.0.0 b/buildroot/package/apparmor/3.0.0 new file mode 120000 index 000000000..eb1e43a57 --- /dev/null +++ b/buildroot/package/apparmor/3.0.0 @@ -0,0 +1 @@ +../libapparmor/3.0.0/ \ No newline at end of file diff --git a/buildroot/package/apparmor/Config.in b/buildroot/package/apparmor/Config.in new file mode 100644 index 000000000..1cc9daa7b --- /dev/null +++ b/buildroot/package/apparmor/Config.in @@ -0,0 +1,77 @@ +config BR2_PACKAGE_APPARMOR + bool "apparmor" + depends on BR2_USE_MMU # fork() + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libapparmor + depends on BR2_TOOLCHAIN_HAS_THREADS # libapparmor + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # libapparmor + select BR2_PACKAGE_LIBAPPARMOR + help + AppArmor is an effective and easy-to-use Linux application + security system. AppArmor proactively protects the operating + system and applications from external or internal threats, + even zero-day attacks, by enforcing good behavior and + preventing even unknown application flaws from being + exploited. + + This package builds the parser (which can load profiles). + + http://wiki.apparmor.net + +if BR2_PACKAGE_APPARMOR + +config BR2_PACKAGE_APPARMOR_BINUTILS + bool "binutils" + help + A set of utilities (written in C): + aa-enabled aa-exec + +comment "utils need python3" + depends on !BR2_PACKAGE_PYTHON3 + +config BR2_PACKAGE_APPARMOR_UTILS + bool "utils" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # net-tools + select BR2_PACKAGE_NET_TOOLS # runtime (aa-unconfined) + select BR2_PACKAGE_PYTHON3_READLINE + help + A set of utilities (written in python): + aa-audit aa-disable aa-logprof + aa-autodep aa-easyprof aa-mergeprof + aa-cleanprof aa-enforce aa-status + aa-complain aa-genprof aa-unconfined + +if BR2_PACKAGE_APPARMOR_UTILS + +comment "utils (extras) need bash and perl, and busybox or gawk" + depends on !BR2_PACKAGE_BASH || !BR2_PACKAGE_PERL \ + || !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_GAWK) + +config BR2_PACKAGE_APPARMOR_UTILS_EXTRA + bool "utils (extras)" + depends on BR2_PACKAGE_BASH + depends on BR2_PACKAGE_PERL + depends on BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_GAWK + help + An extra set of utilities (written in a mixture of sh, + bash, perl, and awk): + aa-decode (bash + perl) + aa-notify (perl) + aa-remove-unknown (sh + awk) + +endif # BR2_PACKAGE_APPARMOR_UTILS + +config BR2_PACKAGE_APPARMOR_PROFILES + bool "profiles" + help + Installs server-class profiles for a wide range of + usual programs and daemons. + +endif # BR2_PACKAGE_APPARMOR + +comment "apparmor needs a toolchain w/ headers >= 3.16, threads, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 diff --git a/buildroot/package/apparmor/apparmor.hash b/buildroot/package/apparmor/apparmor.hash new file mode 100644 index 000000000..394bfb81a --- /dev/null +++ b/buildroot/package/apparmor/apparmor.hash @@ -0,0 +1,6 @@ +# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace +sha256 66fd751fe51eb427d2aa864ee035b12d01d212fd595579275219b0148c43755e apparmor-3.0.0.tar.gz + +# locally computed +sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE +sha256 dd54950fa69a3096fe907a466a454d217ccca9bca77398d5232704766d5a0040 parser/COPYING.GPL diff --git a/buildroot/package/apparmor/apparmor.mk b/buildroot/package/apparmor/apparmor.mk new file mode 100644 index 000000000..4d08b0433 --- /dev/null +++ b/buildroot/package/apparmor/apparmor.mk @@ -0,0 +1,95 @@ +################################################################################ +# +# apparmor +# +################################################################################ + +# When updating the version here, please also update the libapparmor package +APPARMOR_VERSION_MAJOR = 3.0 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).0 +APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION_MAJOR)/+download +APPARMOR_DL_SUBDIR = libapparmor +APPARMOR_LICENSE = GPL-2.0 +APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL + +APPARMOR_DEPENDENCIES = libapparmor + +APPARMOR_TOOLS = parser +APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown POD2MAN=true POD2HTML=true + +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) +APPARMOR_DEPENDENCIES += gettext +APPARMOR_MAKE_OPTS += WITH_LIBINTL=1 +endif + +ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y) +APPARMOR_TOOLS += binutils +endif + +ifeq ($(BR2_PACKAGE_APPARMOR_UTILS),y) +APPARMOR_DEPENDENCIES += host-python3 python3 +APPARMOR_TOOLS += utils +APPARMOR_MAKE_OPTS += PYTHON=$(HOST_DIR)/bin/python3 + +ifeq ($(BR2_PACKAGE_APPARMOR_UTILS_EXTRA),) +define APPARMOR_UTILS_NO_EXTRA + $(Q)rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,aa-decode aa-notify aa-remove-unknown) +endef +APPARMOR_POST_INSTALL_TARGET_HOOKS += APPARMOR_UTILS_NO_EXTRA +endif # BR2_PACKAGE_APPARMOR_UTILS_EXTRA + +endif # BR2_PACKAGE_APPARMOR_UTILS + +ifeq ($(BR2_PACKAGE_APPARMOR_PROFILES),y) +APPARMOR_TOOLS += profiles +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +APPARMOR_DEPENDENCIES += linux-pam +APPARMOR_TOOLS += changehat/pam_apparmor +endif + +ifeq ($(BR2_PACKAGE_APACHE),y) +APPARMOR_DEPENDENCIES += apache +APPARMOR_TOOLS += changehat/mod_apparmor +APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define APPARMOR_FIXUP_APXS + $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ + $(STAGING_DIR)/usr/bin/apxs \ + $(STAGING_DIR)/usr/build/config_vars.mk +endef +APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS +endif +endif + +define APPARMOR_BUILD_CMDS + $(foreach tool,$(APPARMOR_TOOLS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D)/$(tool) $(APPARMOR_MAKE_OPTS) + ) +endef + +define APPARMOR_INSTALL_TARGET_CMDS + $(foreach tool,$(APPARMOR_TOOLS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D)/$(tool) $(APPARMOR_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install + ) +endef + +# Despite its name, apparmor.systemd is a sysv-init compatible startup script +define APPARMOR_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \ + $(TARGET_DIR)/etc/init.d/S00apparmor +endef + +define APPARMOR_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \ + $(TARGET_DIR)/lib/apparmor/apparmor.systemd + $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.service \ + $(TARGET_DIR)/usr/lib/systemd/system/apparmor.service +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/argparse/argparse.hash b/buildroot/package/argparse/argparse.hash index 1b01e4b6f..fd7c48eab 100644 --- a/buildroot/package/argparse/argparse.hash +++ b/buildroot/package/argparse/argparse.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 47b3ca9e734971ba24ef26b0beff692ce6008f53aaf78c303f3d883648c96acb argparse-0.7.0-1.src.rock -sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.0/LICENSE +sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE diff --git a/buildroot/package/argparse/argparse.mk b/buildroot/package/argparse/argparse.mk index a9b7a2f71..d719e67d8 100644 --- a/buildroot/package/argparse/argparse.mk +++ b/buildroot/package/argparse/argparse.mk @@ -4,7 +4,7 @@ # ################################################################################ -ARGPARSE_VERSION = 0.7.0-1 +ARGPARSE_VERSION = 0.7.1-1 ARGPARSE_LICENSE = MIT ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE diff --git a/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash b/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash new file mode 100644 index 000000000..b18e56c15 --- /dev/null +++ b/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 ac952d89ae0fc3543e81099e7d34917efc621f5def112eee843fd1ce755eca8c gcc-arm-9.2-2019.12-x86_64-arm-none-eabi.tar.xz diff --git a/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk b/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk new file mode 100644 index 000000000..d7088892c --- /dev/null +++ b/buildroot/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# arm-gnu-a-toolchain +# +################################################################################ + +ARM_GNU_A_TOOLCHAIN_VERSION = 9.2-2019.12 +ARM_GNU_A_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/$(ARM_GNU_A_TOOLCHAIN_VERSION)/binrel +ARM_GNU_A_TOOLCHAIN_SOURCE = gcc-arm-$(ARM_GNU_A_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz +ARM_GNU_A_TOOLCHAIN_LICENSE = GPL-3.0+ + +HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi + +define HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_CMDS + rm -rf $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR) + mkdir -p $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR) + cp -rf $(@D)/* $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)/ + + mkdir -p $(HOST_DIR)/bin + cd $(HOST_DIR)/bin && \ + for i in ../opt/gcc-arm-none-eabi/bin/*; do \ + ln -sf $$i; \ + done +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/armadillo/armadillo.hash b/buildroot/package/armadillo/armadillo.hash index 6b3c4a855..cc91fb456 100644 --- a/buildroot/package/armadillo/armadillo.hash +++ b/buildroot/package/armadillo/armadillo.hash @@ -1,7 +1,4 @@ -# From http://sourceforge.net/projects/arma/files/?source=navbar -md5 5ef71763bd429a3d481499878351f3be armadillo-7.900.1.tar.xz -sha1 8118faf1c6a7a39c55a1103a1f90e85e613cc377 armadillo-7.900.1.tar.xz # Locally computed: -sha256 33eec7013990b5477ccc5ad3abc68bc2326c7a7a2790014d625cfcf37c0e07d3 armadillo-7.900.1.tar.xz +sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz # License files, locally calculated -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt diff --git a/buildroot/package/armadillo/armadillo.mk b/buildroot/package/armadillo/armadillo.mk index 5d9e3eda5..624b842ef 100644 --- a/buildroot/package/armadillo/armadillo.mk +++ b/buildroot/package/armadillo/armadillo.mk @@ -4,7 +4,7 @@ # ################################################################################ -ARMADILLO_VERSION = 7.900.1 +ARMADILLO_VERSION = 9.900.2 ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma ARMADILLO_DEPENDENCIES = clapack @@ -12,4 +12,6 @@ ARMADILLO_INSTALL_STAGING = YES ARMADILLO_LICENSE = Apache-2.0 ARMADILLO_LICENSE_FILES = LICENSE.txt +ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false + $(eval $(cmake-package)) diff --git a/buildroot/package/armbian-firmware/Config.in b/buildroot/package/armbian-firmware/Config.in index 761c31661..7c5f6ba19 100644 --- a/buildroot/package/armbian-firmware/Config.in +++ b/buildroot/package/armbian-firmware/Config.in @@ -8,14 +8,19 @@ config BR2_PACKAGE_ARMBIAN_FIRMWARE if BR2_PACKAGE_ARMBIAN_FIRMWARE -config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819 - bool "XR819 WiFi" - help - Firmware files for XR819 WiFi SDIO chip. - config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212 bool "AP6212 WiFi/BT" help Firmware files for AP6212 WiFi/BT combo chip. +config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6256 + bool "AP6256 WiFi/BT" + help + Firmware files for AP6256 WiFi/BT combo chip. + +config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819 + bool "XR819 WiFi" + help + Firmware files for XR819 WiFi SDIO chip. + endif diff --git a/buildroot/package/armbian-firmware/armbian-firmware.hash b/buildroot/package/armbian-firmware/armbian-firmware.hash index 0f3858ded..edbc9c828 100644 --- a/buildroot/package/armbian-firmware/armbian-firmware.hash +++ b/buildroot/package/armbian-firmware/armbian-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 876958ce6ba8a4a01a424f2b4455208b7a989eaba96015649c774340553f0c35 armbian-firmware-455d6b6701178dafe7fd0168eb4a4ef78a8d24a3.tar.gz +sha256 975bc377728496006f058317cccc88e2d3c4ab172ee3df08cfd085cf13221752 armbian-firmware-70a08503ac9e765f5d1ccf4fa3e825db0751e53e.tar.gz diff --git a/buildroot/package/armbian-firmware/armbian-firmware.mk b/buildroot/package/armbian-firmware/armbian-firmware.mk index 77e518542..0ed069025 100644 --- a/buildroot/package/armbian-firmware/armbian-firmware.mk +++ b/buildroot/package/armbian-firmware/armbian-firmware.mk @@ -4,10 +4,23 @@ # ################################################################################ -ARMBIAN_FIRMWARE_VERSION = 455d6b6701178dafe7fd0168eb4a4ef78a8d24a3 +ARMBIAN_FIRMWARE_VERSION = 70a08503ac9e765f5d1ccf4fa3e825db0751e53e ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware ARMBIAN_FIRMWARE_SITE_METHOD = git +# AP6212 WiFi/BT combo firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y) +ARMBIAN_FIRMWARE_DIRS += ap6212 +endif + +# AP6256 WiFi/BT combo firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6256),y) +ARMBIAN_FIRMWARE_FILES += \ + brcm/BCM4345C5.hcd \ + brcm/brcmfmac43456-sdio.bin \ + brcm/brcmfmac43456-sdio.txt +endif + # XR819 WiFi firmware ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y) ARMBIAN_FIRMWARE_FILES += \ @@ -16,11 +29,6 @@ ARMBIAN_FIRMWARE_FILES += \ xr819/sdd_xr819.bin endif -# AP6212 WiFi/BT combo firmware -ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y) -ARMBIAN_FIRMWARE_DIRS += ap6212 -endif - ifneq ($(ARMBIAN_FIRMWARE_FILES),) define ARMBIAN_FIRMWARE_INSTALL_FILES cd $(@D) && \ diff --git a/buildroot/package/asn1c/Config.in.host b/buildroot/package/asn1c/Config.in.host new file mode 100644 index 000000000..951f5f669 --- /dev/null +++ b/buildroot/package/asn1c/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_ASN1C + bool "host asn1c" + help + ASN.1 stands for Abstract Syntax Notation One and allows + to describe complex data structures independently of any + particular programming language. + + The asn1c is a free, open source compiler of ASN.1 + specifications into C source code. + + http://lionet.info/asn1c diff --git a/buildroot/package/asn1c/asn1c.hash b/buildroot/package/asn1c/asn1c.hash new file mode 100644 index 000000000..abc4d77e1 --- /dev/null +++ b/buildroot/package/asn1c/asn1c.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 8007440b647ef2dd9fb73d931c33ac11764e6afb2437dbe638bb4e5fc82386b9 asn1c-0.9.28.tar.gz + +# Hash for license files: +sha256 bcc636802a52ace2255212be15fb707084af87061b5cfd37eb84dcf6a02cc48b LICENSE diff --git a/buildroot/package/asn1c/asn1c.mk b/buildroot/package/asn1c/asn1c.mk new file mode 100644 index 000000000..314462a92 --- /dev/null +++ b/buildroot/package/asn1c/asn1c.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# asn1c +# +################################################################################ + +ASN1C_VERSION = 0.9.28 +ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) +ASN1C_LICENSE = BSD-2-Clause +ASN1C_LICENSE_FILES = LICENSE + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch b/buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch index bfcbeb55e..1b23d6636 100644 --- a/buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch +++ b/buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch @@ -12,15 +12,17 @@ Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes: code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type +Signed-off-by: Peter Seiderer +[Rebased on 5.0.1] Signed-off-by: Peter Seiderer --- - code/FBXConverter.cpp | 2 +- + code/FBX/FBXConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp +diff --git a/code/FBX/FBXConverter.cpp b/code/FBXConverter.cpp index e0c6b9c..b1e9a71 100644 ---- a/code/FBXConverter.cpp -+++ b/code/FBXConverter.cpp +--- a/code/FBX/FBXConverter.cpp ++++ b/code/FBX/FBXConverter.cpp @@ -67,7 +67,7 @@ namespace FBX { #define MAGIC_NODE_TAG "_$AssimpFbx$" diff --git a/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch b/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch new file mode 100644 index 000000000..a9a30c483 --- /dev/null +++ b/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch @@ -0,0 +1,50 @@ +From 3fef857a570d1ef2c96401358fe8e239625b48c9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 10 Apr 2020 18:11:50 +0200 +Subject: [PATCH] contrib/zip: fix ssize_t typedef mismatch for musl compile + +Musl uses defines __DEFINED_ssize_t to indicate ssize_t +availability. So backport this part of upstream commit [1] +to fixl musl compile. + +https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1 + +Signed-off-by: Peter Seiderer +--- + contrib/zip/src/zip.h | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h +index 5f39df50..4672eb3e 100644 +--- a/contrib/zip/src/zip.h ++++ b/contrib/zip/src/zip.h +@@ -20,8 +20,9 @@ extern "C" { + #endif + + #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ +- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) +-#define _SSIZE_T ++ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ ++ !defined(_SSIZE_T) && !defined(_SSIZE_T_) ++ + // 64-bit Windows is the only mainstream platform + // where sizeof(long) != sizeof(void*) + #ifdef _WIN64 +@@ -29,6 +30,14 @@ typedef long long ssize_t; /* byte count or error */ + #else + typedef long ssize_t; /* byte count or error */ + #endif ++ ++#define _SSIZE_T_DEFINED ++#define _SSIZE_T_DEFINED_ ++#define __DEFINED_ssize_t ++#define __ssize_t_defined ++#define _SSIZE_T ++#define _SSIZE_T_ ++ + #endif + + #ifndef MAX_PATH +-- +2.26.0 + diff --git a/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch b/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch new file mode 100644 index 000000000..8661311be --- /dev/null +++ b/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch @@ -0,0 +1,31 @@ +From 2b8684aded0c383be64bac0fa59e39870252963f Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 12 Apr 2020 18:19:13 +0200 +Subject: [PATCH] contrib/zlib: disable dynamic library building + +Fixes compile failure for static only toolchains (and assimp +links against the static one). + +Signed-off-by: Peter Seiderer +--- + contrib/zlib/CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt +index 9d1fcc94..78346233 100644 +--- a/contrib/zlib/CMakeLists.txt ++++ b/contrib/zlib/CMakeLists.txt +@@ -195,10 +195,7 @@ if(MINGW) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) +-set_target_properties(zlib PROPERTIES SOVERSION 1) + + INSTALL( TARGETS zlibstatic + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +-- +2.26.0 + diff --git a/buildroot/package/assimp/Config.in b/buildroot/package/assimp/Config.in index 42bfee945..9bdc05490 100644 --- a/buildroot/package/assimp/Config.in +++ b/buildroot/package/assimp/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - select BR2_PACKAGE_ZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a diff --git a/buildroot/package/assimp/assimp.hash b/buildroot/package/assimp/assimp.hash index 72d367ac4..df5daa79c 100644 --- a/buildroot/package/assimp/assimp.hash +++ b/buildroot/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 assimp-4.1.0.tar.gz -sha256 a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8 LICENSE +sha256 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc assimp-5.0.1.tar.gz +sha256 a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8 LICENSE diff --git a/buildroot/package/assimp/assimp.mk b/buildroot/package/assimp/assimp.mk index ce02ef300..e1b9a2349 100644 --- a/buildroot/package/assimp/assimp.mk +++ b/buildroot/package/assimp/assimp.mk @@ -4,15 +4,23 @@ # ################################################################################ -ASSIMP_VERSION = 4.1.0 +ASSIMP_VERSION = 5.0.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -ASSIMP_DEPENDENCIES = zlib ASSIMP_INSTALL_STAGING = YES -# relocation truncated to fit: R_68K_GOT16O +# relocation truncated to fit: R_68K_GOT16O. We also need to disable +# optimizations to not run into "Error: value -43420 out of range" +# assembler issues. ifeq ($(BR2_m68k),y) +ASSIMP_CXXFLAGS += -mxgot -O0 +endif + +# just like m68k coldfire, mips64 also has some limitations on the GOT +# size for large libraries, which can be overcome by passing +# -mxgot. Solves "relocation truncated to fit: R_MIPS_CALL16" issues. +ifeq ($(BR2_mips64)$(BR2_mips64el),y) ASSIMP_CXXFLAGS += -mxgot endif @@ -28,7 +36,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) ASSIMP_CXXFLAGS += -O0 endif -ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ +ASSIMP_CONF_OPTS += -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" $(eval $(cmake-package)) diff --git a/buildroot/package/asterisk/asterisk.hash b/buildroot/package/asterisk/asterisk.hash index 50457ba8f..1bb5da7d0 100644 --- a/buildroot/package/asterisk/asterisk.hash +++ b/buildroot/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 f0ba5e3c4ef46f6657dd3a7167190f9b6cd6bbf4af09ecc291a9d5868b477609 asterisk-16.10.0.tar.gz +sha256 5ebefa6387f89695361b8c105e2ad7ee6381f87a99012aeb85b886ddf6d518ac asterisk-16.13.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed @@ -12,4 +12,4 @@ sha256 449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538 asteri sha256 82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f COPYING sha256 ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312 main/sha1.c sha256 6215e3ed73c3982a5c6701127d681ec0b9f1121ac78a28805bd93f93c3eb84c0 codecs/speex/speex_resampler.h -sha256 1ca2c7a7a1ae7ccd75212a8c1e85dd9ec92bdbc9170aafd97ea60459387755fd utils/db1-ast/include/db.h +sha256 ea69cc96ab8a779c180a362377caeada71926897d1b55b980f04d74ba5aaa388 utils/db1-ast/include/db.h diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk index 97e97c14c..b9e2b80dd 100644 --- a/buildroot/package/asterisk/asterisk.mk +++ b/buildroot/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.10.0 +ASTERISK_VERSION = 16.13.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -107,6 +107,9 @@ ASTERISK_CONF_OPTS = \ # the time of this writing). ASTERISK_CONF_OPTS += --without-avcodec +# asterisk is not compatible with freeswitch spandsp +ASTERISK_CONF_OPTS += --without-spandsp + ASTERISK_CONF_ENV = \ ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \ ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config @@ -232,13 +235,6 @@ else ASTERISK_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_SPANDSP),y) -ASTERISK_DEPENDENCIES += spandsp -ASTERISK_CONF_OPTS += --with-spandsp -else -ASTERISK_CONF_OPTS += --without-spandsp -endif - ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) ASTERISK_DEPENDENCIES += speex ASTERISK_CONF_OPTS += --with-speex --with-speexdsp diff --git a/buildroot/package/at-spi2-atk/0001-meson-add-tests-option.patch b/buildroot/package/at-spi2-atk/0001-meson-add-tests-option.patch new file mode 100644 index 000000000..3a2aefa09 --- /dev/null +++ b/buildroot/package/at-spi2-atk/0001-meson-add-tests-option.patch @@ -0,0 +1,43 @@ +From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 3 May 2020 10:29:36 +0200 +Subject: [PATCH] meson: add tests option + +Add tests option to allow the user to build at-spi2-atk without tests, +it is especially useful as one of the test requires libxml-2.0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] +--- + meson.build | 4 +++- + meson_options.txt | 4 ++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9fce5d6..61bc93d 100644 +--- a/meson.build ++++ b/meson.build +@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', + + subdir('droute') + subdir('atk-adaptor') +-subdir('tests') ++if get_option('tests') ++ subdir('tests') ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 24c9228..a4abdc2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('disable_p2p', + description: 'Disable peer-to-peer DBus connections', + type: 'boolean', + value: false) ++option('tests', ++ description: 'Whether to build tests', ++ type: 'boolean', ++ value: true) +-- +2.26.2 + diff --git a/buildroot/package/at-spi2-atk/at-spi2-atk.hash b/buildroot/package/at-spi2-atk/at-spi2-atk.hash index 77c8f68e4..9c564c32a 100644 --- a/buildroot/package/at-spi2-atk/at-spi2-atk.hash +++ b/buildroot/package/at-spi2-atk/at-spi2-atk.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum +sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz + # locally calculated -sha256 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e at-spi2-atk-2.26.2.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/at-spi2-atk/at-spi2-atk.mk b/buildroot/package/at-spi2-atk/at-spi2-atk.mk index 4ef681b3b..69d11f66b 100644 --- a/buildroot/package/at-spi2-atk/at-spi2-atk.mk +++ b/buildroot/package/at-spi2-atk/at-spi2-atk.mk @@ -4,13 +4,15 @@ # ################################################################################ -AT_SPI2_ATK_VERSION_MAJOR = 2.26 +AT_SPI2_ATK_VERSION_MAJOR = 2.34 AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.0+ +AT_SPI2_ATK_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) +AT_SPI2_ATK_LICENSE = LGPL-2.1+ AT_SPI2_ATK_LICENSE_FILES = COPYING AT_SPI2_ATK_INSTALL_STAGING = YES AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf +AT_SPI2_ATK_CONF_OPTS = -Dtests=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch b/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch deleted file mode 100644 index 154d7010d..000000000 --- a/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann -Date: Tue, 12 Mar 2019 11:46:24 +0100 -Subject: [PATCH] Fix meson.build for meson 0.50.0. - -Since meson 0.50.0 it is not possible anymore to specify an -absolute directory for subdir. To keep current functionality, -use install_dir instead. - -atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. - -Signed-off-by: Tobias Stoeckmann - -Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch -Signed-off-by: Peter Seiderer ---- - atspi/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atspi/meson.build b/atspi/meson.build -index 17bfc45..2e44ffd 100644 ---- a/atspi/meson.build -+++ b/atspi/meson.build -@@ -57,7 +57,7 @@ atspi_headers = [ - - atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') - --install_headers(atspi_headers, subdir: atspi_includedir) -+install_headers(atspi_headers, install_dir: atspi_includedir) - - atspi_enums = gnome.mkenums('atspi-enum-types', - sources: [ 'atspi-constants.h', 'atspi-types.h' ], --- -2.21.0 - diff --git a/buildroot/package/at-spi2-core/at-spi2-core.hash b/buildroot/package/at-spi2-core/at-spi2-core.hash index 9c96da312..e2cc403e7 100644 --- a/buildroot/package/at-spi2-core/at-spi2-core.hash +++ b/buildroot/package/at-spi2-core/at-spi2-core.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz + # locally calculated -sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/at-spi2-core/at-spi2-core.mk b/buildroot/package/at-spi2-core/at-spi2-core.mk index 3a5197eb0..cf7fdd297 100644 --- a/buildroot/package/at-spi2-core/at-spi2-core.mk +++ b/buildroot/package/at-spi2-core/at-spi2-core.mk @@ -4,11 +4,11 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.28 +AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) -AT_SPI2_CORE_LICENSE = LGPL-2.0+ +AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ diff --git a/buildroot/package/atest/0001-seq.h-fix-build-with-gcc-10.patch b/buildroot/package/atest/0001-seq.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..c0ae042b0 --- /dev/null +++ b/buildroot/package/atest/0001-seq.h-fix-build-with-gcc-10.patch @@ -0,0 +1,40 @@ +From fb374e0775fd9772a2cd7b99a5c21f96f7fe2a9a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Aug 2020 12:12:07 +0200 +Subject: [PATCH] seq.h: fix build with gcc 10 + +Rename state structure to avoid the following build failure with gcc +10.0: + +/bin/bash ./libtool --tag=CC --mode=link /home/test/autobuild/run/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -include config.h -Wall -Wno-sign-compare -Wno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o atest atest.o seq.o alsa.o capture.o playback.o loopback_delay.o -L/home/test/autobuild/run/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lasound -lev +libtool: link: /home/test/autobuild/run/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -include config.h -Wall -Wno-sign-compare -Wno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o atest atest.o seq.o alsa.o capture.o playback.o loopback_delay.o -L/home/test/autobuild/run/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib /home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libasound.so -ldl -lpthread -lrt /home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libev.so -lm -Wl,-rpath -Wl,/home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -Wl,-rpath -Wl,/home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib +/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: seq.o:(.bss+0x8): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here +/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: capture.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here +/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: playback.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here +/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: loopback_delay.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/887c466b3703449239eedaf86f3f4dd2a2dc8afe + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/amouiche/atest/pull/3] +--- + seq.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/seq.h b/seq.h +index 0fa1a95..b7ba8d1 100644 +--- a/seq.h ++++ b/seq.h +@@ -30,7 +30,7 @@ enum seq_stat_e { + NULL_FRAME = 0, + INVALID_FRAME, + VALID_FRAME, +-} state; ++}; + + + struct seq_info { +-- +2.27.0 + diff --git a/buildroot/package/atk/atk.hash b/buildroot/package/atk/atk.hash index 8c1bad5b1..2e7c3b5fe 100644 --- a/buildroot/package/atk/atk.hash +++ b/buildroot/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.33/atk-2.33.3.sha256sum -sha256 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe atk-2.33.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum +sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz # Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/atk/atk.mk b/buildroot/package/atk/atk.mk index 703966605..dfeb4de8b 100644 --- a/buildroot/package/atk/atk.mk +++ b/buildroot/package/atk/atk.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.33 -ATK_VERSION = $(ATK_VERSION_MAJOR).3 +ATK_VERSION_MAJOR = 2.36 +ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+ @@ -13,7 +13,13 @@ ATK_LICENSE_FILES = COPYING ATK_INSTALL_STAGING = YES ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -ATK_CONF_OPTS = -Dintrospection=false +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +ATK_CONF_OPTS += -Dintrospection=true +ATK_DEPENDENCIES += gobject-introspection +else +ATK_CONF_OPTS += -Dintrospection=false +endif + ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) diff --git a/buildroot/package/audit/audit.mk b/buildroot/package/audit/audit.mk index 03967ee65..652e0fcd5 100644 --- a/buildroot/package/audit/audit.mk +++ b/buildroot/package/audit/audit.mk @@ -54,6 +54,11 @@ define AUDIT_INSTALL_CLEANUP endef AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP +define AUDIT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT) +endef + HOST_AUDIT_CONF_OPTS = \ --without-python \ --without-python3 \ diff --git a/buildroot/package/aumix/aumix.hash b/buildroot/package/aumix/aumix.hash index 2fbab4bda..43c09dc54 100644 --- a/buildroot/package/aumix/aumix.hash +++ b/buildroot/package/aumix/aumix.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 aumix-2.9.1.tar.bz2 sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING +sha256 3bfa74db4aeb68bfef7ee213bb1dbf236d784dea3d35a52f6e23a48c847375dd 19_no-common.patch diff --git a/buildroot/package/aumix/aumix.mk b/buildroot/package/aumix/aumix.mk index 9bcc19a37..a4001f5bb 100644 --- a/buildroot/package/aumix/aumix.mk +++ b/buildroot/package/aumix/aumix.mk @@ -12,6 +12,9 @@ AUMIX_GETTEXTIZE = YES AUMIX_LICENSE = GPL-2.0+ AUMIX_LICENSE_FILES = COPYING +AUMIX_PATCH = \ + https://sources.debian.org/data/main/a/aumix/2.9.1-7/debian/patches/19_no-common.patch + AUMIX_CONF_OPTS = \ --without-gtk \ --without-gtk1 \ diff --git a/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch deleted file mode 100644 index 0e8408c83..000000000 --- a/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 -From: Trent Lloyd -Date: Sat, 22 Dec 2018 09:06:07 +0800 -Subject: [PATCH] Drop legacy unicast queries from address not on local link - -When handling legacy unicast queries, ensure that the source IP is -inside a subnet on the local link, otherwise drop the packet. - -Fixes #145 -Fixes #203 -CVE-2017-6519 -CVE-2018-100084 - -Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f -Signed-off-by: Artem Panfilov ---- - avahi-core/server.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/avahi-core/server.c b/avahi-core/server.c -index a2cb19a8..a2580e38 100644 ---- a/avahi-core/server.c -+++ b/avahi-core/server.c -@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - - if (avahi_dns_packet_is_query(p)) { - int legacy_unicast = 0; -+ char t[AVAHI_ADDRESS_STR_MAX]; - - /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the - * AR section completely here, so far. Until the day we add -@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - legacy_unicast = 1; - } - -+ if (!is_mdns_mcast_address(dst_address) && -+ !avahi_interface_address_on_link(i, src_address)) { -+ -+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); -+ return; -+ } -+ - if (legacy_unicast) - reflect_legacy_unicast_query_packet(s, p, i, src_address, port); - --- -2.19.1 - diff --git a/buildroot/package/avahi/avahi.hash b/buildroot/package/avahi/avahi.hash index b4d36ffe5..cfc7ba020 100644 --- a/buildroot/package/avahi/avahi.hash +++ b/buildroot/package/avahi/avahi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz +sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/buildroot/package/avahi/avahi.mk b/buildroot/package/avahi/avahi.mk index 8d451c179..eef05f0d2 100644 --- a/buildroot/package/avahi/avahi.mk +++ b/buildroot/package/avahi/avahi.mk @@ -4,60 +4,13 @@ # ################################################################################ -AVAHI_VERSION = 0.7 +AVAHI_VERSION = 0.8 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPL-2.1+ AVAHI_LICENSE_FILES = LICENSE AVAHI_INSTALL_STAGING = YES AVAHI_CONF_ENV = \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ avahi_cv_sys_cxx_works=yes \ DATADIRNAME=share @@ -74,6 +27,7 @@ AVAHI_CONF_ENV = \ AVAHI_CONF_OPTS = \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ @@ -90,9 +44,7 @@ AVAHI_CONF_OPTS = \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi -AVAHI_DEPENDENCIES = \ - host-intltool host-pkgconf \ - $(TARGET_NLS_DEPENDENCIES) +AVAHI_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) AVAHI_CFLAGS = $(TARGET_CFLAGS) @@ -131,6 +83,12 @@ else AVAHI_CONF_OPTS += --disable-dbus endif +ifeq ($(BR2_PACKAGE_LIBEVENT),y) +AVAHI_DEPENDENCIES += libevent +else +AVAHI_CONF_OPTS += --disable-libevent +endif + ifeq ($(BR2_PACKAGE_LIBGLIB2),y) AVAHI_DEPENDENCIES += libglib2 else diff --git a/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch b/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch deleted file mode 100644 index bfa7e8a60..000000000 --- a/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Sun, 8 Dec 2019 01:55:59 +0100 -Subject: [PATCH] Allow avro C to be built on musl based systems. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The type `ssize_t` is defined in sys/types.h, and nowhere else -in the musl standard C library, so it should be included for the -compilation to succeed. - -This fixes several errors like: - - In file included from src/generic.c:29:0: - src/generic.c: In function ‘avro_generic_value_new’: - src/avro_generic_internal.h:63:39: - error: ‘ssize_t’ undeclared (first use in this function); - did you mean ‘size_t’? - -Signed-off-by: Titouan Christophe -[yann.morin.1998@free.fr: - - backported from upstream 9b39a98, adapted to the release tarball -] -Signed-off-by: Yann E. MORIN ---- - src/avro_generic_internal.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/avro_generic_internal.h b/src/avro_generic_internal.h -index 709403c0..9843ed65 100644 ---- a/src/avro_generic_internal.h -+++ b/src/avro_generic_internal.h -@@ -24,6 +24,8 @@ extern "C" { - #define CLOSE_EXTERN - #endif - -+#include -+ - #include "avro/generic.h" - #include "avro/schema.h" - #include "avro/value.h" --- -2.20.1 - diff --git a/buildroot/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/buildroot/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch new file mode 100644 index 000000000..8f7e59cf6 --- /dev/null +++ b/buildroot/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch @@ -0,0 +1,34 @@ +From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Jul 2020 09:35:09 +0200 +Subject: [PATCH] cmake: Build failure without a C++ compiler (again) + +avro-c fails to build (again) without a C++ compiler because commit +664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by +commit 414a51fdc1856083bb16851f09a4c61a48796132 + +Fixes: + - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c8d7aaf..aa923e18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ + # under the License. + # + cmake_minimum_required(VERSION 3.1) +-project(AvroC) ++project(AvroC C) + enable_testing() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) +-- +2.27.0 + diff --git a/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch deleted file mode 100644 index 89a500c58..000000000 --- a/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch +++ /dev/null @@ -1,92 +0,0 @@ -From cdab7db8ad81884cfb21cc1cf94c981c59d17ef4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 30 Dec 2019 12:32:20 +0100 -Subject: [PATCH] CMakeLists.txt: fix build without C++ - -Specify that AvroC is a C project and remove tests_cpp.cpp to avoid the -following build failure if a C++ compiler is not found: - -CMake Error at CMakeLists.txt:20 (project): - The CMAKE_CXX_COMPILER: - - /home/naourr/work/instance-2/output-1/host/bin/microblazeel-buildroot-linux-uclibc-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Fixes: - - http://autobuild.buildroot.org/results/135e246aa70f28c6b9aea5fd6b0eb9c7b45ebfe7 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/apache/avro/pull/754] ---- - CMakeLists.txt | 2 +- - tests/CMakeLists.txt | 1 - - tests/test_cpp.cpp | 27 --------------------------- - 3 files changed, 1 insertion(+), 29 deletions(-) - delete mode 100644 lang/c/tests/test_cpp.cpp - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11cbf018..b75418c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 2.4) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index b9e8fe1d..2e84a06a 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -81,7 +81,6 @@ add_avro_test_checkmem(test_avro_1405) - add_avro_test_checkmem(test_avro_1572) - add_avro_test(test_avro_data) # Skip memory check for datum. Deprecated and has a lot of memory issues - add_avro_test_checkmem(test_refcount) --add_avro_test_checkmem(test_cpp test_cpp.cpp) - add_avro_test_checkmem(test_avro_1379) - add_avro_test_checkmem(test_avro_1691) - add_avro_test_checkmem(test_avro_1906) -diff --git a/lang/c/tests/test_cpp.cpp b/lang/c/tests/test_cpp.cpp -deleted file mode 100644 -index 13f98a9b..00000000 ---- a/tests/test_cpp.cpp -+++ /dev/null -@@ -1,27 +0,0 @@ --/* -- * Licensed to the Apache Software Foundation (ASF) under one or more -- * contributor license agreements. See the NOTICE file distributed with -- * this work for additional information regarding copyright ownership. -- * The ASF licenses this file to you 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 -- * -- * https://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. -- */ -- --#include "avro.h" -- --int main(int argc, char **argv) --{ -- (void)argc; -- (void)argv; -- -- return 0; --} -- --- -2.24.0 - diff --git a/buildroot/package/avro-c/avro-c.hash b/buildroot/package/avro-c/avro-c.hash index da74f3c05..c4fd7d3f5 100644 --- a/buildroot/package/avro-c/avro-c.hash +++ b/buildroot/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://www-eu.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz.sha512 -sha512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904 avro-c-1.9.1.tar.gz +# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 +sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz # License files -sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE +sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/buildroot/package/avro-c/avro-c.mk b/buildroot/package/avro-c/avro-c.mk index a1b1931bf..ee6e86416 100644 --- a/buildroot/package/avro-c/avro-c.mk +++ b/buildroot/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.9.1 +AVRO_C_VERSION = 1.10.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/buildroot/package/axel/axel.hash b/buildroot/package/axel/axel.hash index 9d1aecc4d..66d56b658 100644 --- a/buildroot/package/axel/axel.hash +++ b/buildroot/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 b700b299fc8a369352a4672560ba833335142a6bfd280d5ccdc66dc2fa6bff86 axel-2.17.7.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 f1364d9b55d435efc6d32218097a50a63be7b1300138e698133cf19ad3aa3a54 axel-2.17.9.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/axel/axel.mk b/buildroot/package/axel/axel.mk index b7ec2efb6..0d5fc2a3c 100644 --- a/buildroot/package/axel/axel.mk +++ b/buildroot/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.7 +AXEL_VERSION = 2.17.9 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ diff --git a/buildroot/package/azure-iot-sdk-c/0001-Fix-redirection-of-errno-header.patch b/buildroot/package/azure-iot-sdk-c/0001-Fix-redirection-of-errno-header.patch new file mode 100644 index 000000000..efc3d3326 --- /dev/null +++ b/buildroot/package/azure-iot-sdk-c/0001-Fix-redirection-of-errno-header.patch @@ -0,0 +1,32 @@ +From 9ff62052a9490c96366d97096a039dca30702b2d Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Fri, 3 Jul 2020 21:09:20 -0300 +Subject: [PATCH] Fix redirection of errno header + +The POSIX correct header to include is . + +The glibc silently redirects incorrect includes, but musl libc prints +a warning: + #warning redirecting incorrect #include to + +Signed-off-by: Sergio Prado +--- + c-utility/pal/linux/socket_async_os.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c-utility/pal/linux/socket_async_os.h b/c-utility/pal/linux/socket_async_os.h +index bd59e487c099..1797089851e3 100644 +--- a/c-utility/pal/linux/socket_async_os.h ++++ b/c-utility/pal/linux/socket_async_os.h +@@ -10,7 +10,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +2.17.1 + diff --git a/buildroot/package/azure-iot-sdk-c/Config.in b/buildroot/package/azure-iot-sdk-c/Config.in index c554d2fb9..860746524 100644 --- a/buildroot/package/azure-iot-sdk-c/Config.in +++ b/buildroot/package/azure-iot-sdk-c/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_AZURE_IOT_SDK_C bool "azure-iot-sdk-c" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_OPENSSL @@ -13,5 +14,6 @@ config BR2_PACKAGE_AZURE_IOT_SDK_C https://github.com/Azure/azure-iot-sdk-c -comment "azure-iot-sdk-c needs a toolchain w/ C++ and NPTL" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +comment "azure-iot-sdk-c needs a toolchain w/ C++, NPTL and wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash new file mode 100644 index 000000000..8e547963e --- /dev/null +++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 6f5ce8a81ed941e525a0265844082e4c641e9ac5cdac8b00bc92492700512a43 azure-iot-sdk-c-LTS_07_2020_Ref01.tar.gz + +# Hash for license files: +sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index f63297844..19f0812f8 100644 --- a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = 2018-12-13 +AZURE_IOT_SDK_C_VERSION = LTS_07_2020_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES @@ -29,6 +29,8 @@ AZURE_IOT_SDK_C_LIBS += \ iothub_service_client/libiothub_service_client.a \ serializer/libserializer.a \ umqtt/libumqtt.a \ + deps/uhttp/libuhttp.a \ + deps/umock-c/libumock_c.a \ libparson.a else AZURE_IOT_SDK_C_LIBS += \ @@ -42,12 +44,14 @@ AZURE_IOT_SDK_C_LIBS += \ iothub_client/libiothub_client_mqtt_transport.so \ iothub_service_client/libiothub_service_client.so \ serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.11 \ + umqtt/libumqtt.so.1.1.12 \ + deps/uhttp/libuhttp.so \ + deps/umock-c/libumock_c.so \ libparson.so define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so + ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 + ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so endef endif diff --git a/buildroot/package/babeld/babeld.hash b/buildroot/package/babeld/babeld.hash index 510fe2bc9..2e0513efa 100644 --- a/buildroot/package/babeld/babeld.hash +++ b/buildroot/package/babeld/babeld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98070dc418c190f047b8d69eb47987df30ded8f0fca353c49427d3137ad08b87 babeld-1.8.4.tar.gz -sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE +sha256 154f00e0a8bf35d6ea9028886c3dc5c3c342dd1a367df55ef29a547b75867f07 babeld-1.9.2.tar.gz +sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE diff --git a/buildroot/package/babeld/babeld.mk b/buildroot/package/babeld/babeld.mk index f864b5db2..785fa2bce 100644 --- a/buildroot/package/babeld/babeld.mk +++ b/buildroot/package/babeld/babeld.mk @@ -4,7 +4,7 @@ # ################################################################################ -BABELD_VERSION = 1.8.4 +BABELD_VERSION = 1.9.2 BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files BABELD_LICENSE = MIT BABELD_LICENSE_FILES = LICENCE diff --git a/buildroot/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch b/buildroot/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch new file mode 100644 index 000000000..ec7ea83ff --- /dev/null +++ b/buildroot/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch @@ -0,0 +1,669 @@ +From 28ba44ad9ca14153e96c94a9100423ea224c1af3 Mon Sep 17 00:00:00 2001 +From: Simon Marchi +Date: Tue, 18 Feb 2020 13:14:22 -0500 +Subject: [PATCH] configure: simplify warning flags detection + +We currently use the AX_COMPILER_FLAGS macro to detect the warning flags +that the current compiler supports. It works, but is quite invasive. +It unconditionally enables a bunch of warnings we don't want, which +forces us to disable them with many -Wno-foo switches. + +Instead of using AX_COMPILER_FLAGS, we can use the slightly lower lever +macro AX_APPEND_COMPILE_FLAGS to achieve our goal of detecting which +warning flags are supported. This is what we ended up using in +lttng-tools (a completely unrelated project, but that has a suspiciously +high ratio of contributors in common with Babeltrace). + +I looked in our git history to see which warning flags were mentioned in +commit messages. I have added the flags that did find actual problems +and are not enabled by default to the AX_APPEND_COMPILE_FLAGS invocation. +I have also added the flags that AX_COMPILER_FLAGS did provide, which we +didn't need to disable. + +The --{enable,disable}-Werror flag is added using an explicit +AC_ARG_ENABLE. In lttng-tools, it was decided to _not_ have -Werror by +default, so I suggest we do the same in Babeltrace, for consistency +(although it saddens me very much). Developers who want to build with +-Werror will need to pass --enable-Werror. + +Note that with this patch, we lose the following configure switch, that +is provided by AX_COMPILER_FLAGS: + + --enable-compile-warnings=[no/yes/error] + +Change-Id: If968f7385a7f5c48d27f402c76bc26241a8f505a +Signed-off-by: Simon Marchi +Reviewed-on: https://review.lttng.org/c/babeltrace/+/3209 +Tested-by: jenkins +Reviewed-by: Michael Jeanson + +[Retrieved from: +https://github.com/efficios/babeltrace/commit/28ba44ad9ca14153e96c94a9100423ea224c1af3] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 74 +++++++++------ + m4/ax_compiler_flags.m4 | 158 ------------------------------- + m4/ax_compiler_flags_cflags.m4 | 161 -------------------------------- + m4/ax_compiler_flags_gir.m4 | 60 ------------ + m4/ax_compiler_flags_ldflags.m4 | 111 ---------------------- + 5 files changed, 46 insertions(+), 518 deletions(-) + delete mode 100644 m4/ax_compiler_flags.m4 + delete mode 100644 m4/ax_compiler_flags_cflags.m4 + delete mode 100644 m4/ax_compiler_flags_gir.m4 + delete mode 100644 m4/ax_compiler_flags_ldflags.m4 + +diff --git a/configure.ac b/configure.ac +index 055fba101..7ebcf2ad4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -660,25 +660,35 @@ target. + CFLAGS=${save_CFLAGS} + + # Detect C and LD warning flags supported by the compiler. +-AX_COMPILER_FLAGS( +- [WARN_CFLAGS], dnl CFLAGS variable name +- [WARN_LDFLAGS], dnl LDFLAGS variable name (unused for now) +- [], dnl is-release +- [], dnl Extra base CFLAGS +- [ dnl Extra "yes" CFLAGS +- dnl Disable these flags, either because we don't want them +- dnl or because we want them but are not ready to enable them +- dnl yet. +- -Wno-sign-compare dnl +- -Wno-inline dnl +- -Wno-declaration-after-statement dnl +- -Wno-switch-enum dnl +- -Wno-switch-default dnl +- -Wno-packed dnl +- -Wno-pointer-arith dnl ++ ++# Detect warning flags supported by the compiler, append them to WARN_CFLAGS. ++# ++# Pass -Werror as an extra flag during the test: this is needed to make the ++# -Wunknown-warning-option diagnostic fatal with clang. ++AX_APPEND_COMPILE_FLAGS([ dnl ++ -Wall dnl ++ -Wextra dnl ++ -Wstrict-prototypes dnl ++ -Wmissing-prototypes dnl ++ -Wmissing-declarations dnl ++ -Wnull-dereference dnl ++ -Wundef dnl ++ -Wredundant-decls dnl ++ -Wshadow dnl ++ -Wjump-misses-init dnl ++ -Wtautological-constant-out-of-range-compare dnl ++ -Wnested-externs dnl ++ -Wwrite-strings dnl ++ -Wformat=2 dnl + -Wno-format-nonliteral dnl +- -Wno-double-promotion dnl +- -Wno-cast-align dnl ++ -Wstrict-aliasing dnl ++ -Wmissing-noreturn dnl ++ -Winit-self dnl ++ -Wduplicated-cond dnl ++ -Wduplicated-branches dnl ++ -Wlogical-op dnl ++ -Wno-unused-parameter dnl ++ -Wno-sign-compare dnl + dnl + dnl Some versions of SWIG (like 3.0.12) generate code that produces + dnl -Wcast-function-type warnings. This warning is present in gcc >= 8. This +@@ -692,24 +702,32 @@ AX_COMPILER_FLAGS( + dnl + dnl Ref: https://github.com/swig/swig/issues/1259 + -Wno-cast-function-type dnl +- ]) +- +-# CFLAGS from AX_COMPILER_FLAGS. +-AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}" ++ -Wno-missing-field-initializers dnl ++ ], ++ [WARN_CFLAGS], ++ [-Werror]) ++ ++# When given, add -Werror to WARN_CFLAGS. ++AC_ARG_ENABLE([Werror], ++ [AS_HELP_STRING([--enable-Werror], [Treat compiler warnings as errors.])] ++) ++AS_IF([test "x$enable_Werror" = "xyes"], ++ [WARN_CFLAGS="${WARN_CFLAGS} -Werror"] ++) + +-# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is ++# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is + # written in such a way that it triggers a -Wold-style-definition warning. So +-# if the user has -Werror in their CFLAGS, that warning flag will end up +-# disabled, because the test program will not build. ++# this warning always ends up disabled if we put it there, because the test ++# program does not build. + # + # Enable it here unconditionally. It is supported by GCC >= 4.8 and by Clang + # (it is accepted for compatibility although it has no effect), and there is + # not reason to not want it. + +-AM_CFLAGS="${AM_CFLAGS} -Wold-style-definition" ++WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition" + +-# We want this one to always be an error. +-AM_CFLAGS="${AM_CFLAGS} -Werror=implicit-function-declaration" ++# CFLAGS from AX_APPEND_COMPILE_FLAGS. ++AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}" + + # Done for AM_CFLAGS. + AC_SUBST(AM_CFLAGS) +diff --git a/m4/ax_compiler_flags.m4 b/m4/ax_compiler_flags.m4 +deleted file mode 100644 +index ddb0456c4..000000000 +--- a/m4/ax_compiler_flags.m4 ++++ /dev/null +@@ -1,158 +0,0 @@ +-# =========================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html +-# =========================================================================== +-# +-# SYNOPSIS +-# +-# AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED]) +-# +-# DESCRIPTION +-# +-# Check for the presence of an --enable-compile-warnings option to +-# configure, defaulting to "error" in normal operation, or "yes" if +-# IS-RELEASE is equal to "yes". Return the value in the variable +-# $ax_enable_compile_warnings. +-# +-# Depending on the value of --enable-compile-warnings, different compiler +-# warnings are checked to see if they work with the current compiler and, +-# if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE. This +-# allows a consistent set of baseline compiler warnings to be used across +-# a code base, irrespective of any warnings enabled locally by individual +-# developers. By standardising the warnings used by all developers of a +-# project, the project can commit to a zero-warnings policy, using -Werror +-# to prevent compilation if new warnings are introduced. This makes +-# catching bugs which are flagged by warnings a lot easier. +-# +-# By providing a consistent --enable-compile-warnings argument across all +-# projects using this macro, continuous integration systems can easily be +-# configured the same for all projects. Automated systems or build +-# systems aimed at beginners may want to pass the --disable-Werror +-# argument to unconditionally prevent warnings being fatal. +-# +-# --enable-compile-warnings can take the values: +-# +-# * no: Base compiler warnings only; not even -Wall. +-# * yes: The above, plus a broad range of useful warnings. +-# * error: The above, plus -Werror so that all warnings are fatal. +-# Use --disable-Werror to override this and disable fatal +-# warnings. +-# +-# The set of base and enabled flags can be augmented using the +-# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and +-# appended to the output variable if --enable-compile-warnings is not +-# "no". Flags should not be disabled using these arguments, as the entire +-# point of AX_COMPILER_FLAGS is to enforce a consistent set of useful +-# compiler warnings on code, using warnings which have been chosen for low +-# false positive rates. If a compiler emits false positives for a +-# warning, a #pragma should be used in the code to disable the warning +-# locally. See: +-# +-# https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas +-# +-# The EXTRA-* variables should only be used to supply extra warning flags, +-# and not general purpose compiler flags, as they are controlled by +-# configure options such as --disable-Werror. +-# +-# IS-RELEASE can be used to disable -Werror when making a release, which +-# is useful for those hairy moments when you just want to get the release +-# done as quickly as possible. Set it to "yes" to disable -Werror. By +-# default, it uses the value of $ax_is_release, so if you are using the +-# AX_IS_RELEASE macro, there is no need to pass this parameter. For +-# example: +-# +-# AX_IS_RELEASE([git-directory]) +-# AX_COMPILER_FLAGS() +-# +-# CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults +-# to WARN_LDFLAGS. Both variables are AC_SUBST-ed by this macro, but must +-# be manually added to the CFLAGS and LDFLAGS variables for each target in +-# the code base. +-# +-# If C++ language support is enabled with AC_PROG_CXX, which must occur +-# before this macro in configure.ac, warning flags for the C++ compiler +-# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the +-# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can +-# be used to augment the base and enabled flags. +-# +-# Warning flags for g-ir-scanner (from GObject Introspection) are +-# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added +-# to the SCANNERFLAGS variable for each GIR target in the code base. If +-# extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR +-# macro must be invoked manually. +-# +-# AX_COMPILER_FLAGS may add support for other tools in future, in addition +-# to the compiler and linker. No extra EXTRA-* variables will be added +-# for those tools, and all extra support will still use the single +-# --enable-compile-warnings configure option. For finer grained control +-# over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS, +-# AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools. +-# +-# The UNUSED variables date from a previous version of this macro, and are +-# automatically appended to the preceding non-UNUSED variable. They should +-# be left empty in new uses of the macro. +-# +-# LICENSE +-# +-# Copyright (c) 2014, 2015 Philip Withnall +-# Copyright (c) 2015 David King +-# +-# Copying and distribution of this file, with or without modification, are +-# permitted in any medium without royalty provided the copyright notice +-# and this notice are preserved. This file is offered as-is, without any +-# warranty. +- +-#serial 14 +- +-# _AX_COMPILER_FLAGS_LANG([LANGNAME]) +-m4_defun([_AX_COMPILER_FLAGS_LANG], +-[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [], +- [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl +- AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl +-]) +- +-AC_DEFUN([AX_COMPILER_FLAGS],[ +- # C support is enabled by default. +- _AX_COMPILER_FLAGS_LANG([C]) +- # Only enable C++ support if AC_PROG_CXX is called. The redefinition of +- # AC_PROG_CXX is so that a fatal error is emitted if this macro is called +- # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be +- # checked. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AX_COMPILER_FLAGS_LANG([CXX])], +- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])]) +- AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS]) +- +- # Default value for IS-RELEASE is $ax_is_release +- ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],, +- [$ax_is_release], +- [$3]))) +- +- AC_ARG_ENABLE([compile-warnings], +- AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], +- [Enable compiler warnings and errors]),, +- [AS_IF([test "$ax_compiler_flags_is_release" = "yes"], +- [enable_compile_warnings="yes"], +- [enable_compile_warnings="error"])]) +- AC_ARG_ENABLE([Werror], +- AS_HELP_STRING([--disable-Werror], +- [Unconditionally make all compiler warnings non-fatal]),, +- [enable_Werror=maybe]) +- +- # Return the user's chosen warning level +- AS_IF([test "$enable_Werror" = "no" -a \ +- "$enable_compile_warnings" = "error"],[ +- enable_compile_warnings="yes" +- ]) +- +- ax_enable_compile_warnings=$enable_compile_warnings +- +- AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release], +- [$4],[$5 $6 $7 $8]) +- m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled], +- [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS], +- [$ax_compiler_flags_is_release], +- [$4],[$5 $6 $7 $8])]) +- AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release], +- [$9],[$10 $11 $12 $13]) +- AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release]) +-])dnl AX_COMPILER_FLAGS +diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4 +deleted file mode 100644 +index 916f91837..000000000 +--- a/m4/ax_compiler_flags_cflags.m4 ++++ /dev/null +@@ -1,161 +0,0 @@ +-# ============================================================================= +-# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html +-# ============================================================================= +-# +-# SYNOPSIS +-# +-# AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +-# +-# DESCRIPTION +-# +-# Add warning flags for the C compiler to VARIABLE, which defaults to +-# WARN_CFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +-# manually added to the CFLAGS variable for each target in the code base. +-# +-# This macro depends on the environment set up by AX_COMPILER_FLAGS. +-# Specifically, it uses the value of $ax_enable_compile_warnings to decide +-# which flags to enable. +-# +-# LICENSE +-# +-# Copyright (c) 2014, 2015 Philip Withnall +-# Copyright (c) 2017, 2018 Reini Urban +-# +-# Copying and distribution of this file, with or without modification, are +-# permitted in any medium without royalty provided the copyright notice +-# and this notice are preserved. This file is offered as-is, without any +-# warranty. +- +-#serial 17 +- +-AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ +- AC_REQUIRE([AC_PROG_SED]) +- AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) +- AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +- +- # Variable names +- m4_define([ax_warn_cflags_variable], +- [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))]) +- +- AC_LANG_PUSH([C]) +- +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +- [#ifndef __cplusplus +- #error "no C++" +- #endif]])], +- [ax_compiler_cxx=yes;], +- [ax_compiler_cxx=no;]) +- +- # Always pass -Werror=unknown-warning-option to get Clang to fail on bad +- # flags, otherwise they are always appended to the warn_cflags variable, and +- # Clang warns on them for every compilation unit. +- # If this is passed to GCC, it will explode, so the flag must be enabled +- # conditionally. +- AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ +- ax_compiler_flags_test="-Werror=unknown-warning-option" +- ],[ +- ax_compiler_flags_test="" +- ]) +- +- # Check that -Wno-suggest-attribute=format is supported +- AX_CHECK_COMPILE_FLAG([-Wno-suggest-attribute=format],[ +- ax_compiler_no_suggest_attribute_flags="-Wno-suggest-attribute=format" +- ],[ +- ax_compiler_no_suggest_attribute_flags="" +- ]) +- +- # Base flags +- AX_APPEND_COMPILE_FLAGS([ dnl +- -fno-strict-aliasing dnl +- $3 dnl +- ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) +- +- AS_IF([test "$ax_enable_compile_warnings" != "no"],[ +- if test "$ax_compiler_cxx" = "no" ; then +- # C-only flags. Warn in C++ +- AX_APPEND_COMPILE_FLAGS([ dnl +- -Wnested-externs dnl +- -Wmissing-prototypes dnl +- -Wstrict-prototypes dnl +- -Wdeclaration-after-statement dnl +- -Wimplicit-function-declaration dnl +- -Wold-style-definition dnl +- -Wjump-misses-init dnl +- ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) +- fi +- +- # "yes" flags +- AX_APPEND_COMPILE_FLAGS([ dnl +- -Wall dnl +- -Wextra dnl +- -Wundef dnl +- -Wwrite-strings dnl +- -Wpointer-arith dnl +- -Wmissing-declarations dnl +- -Wredundant-decls dnl +- -Wno-unused-parameter dnl +- -Wno-missing-field-initializers dnl +- -Wformat=2 dnl +- -Wcast-align dnl +- -Wformat-nonliteral dnl +- -Wformat-security dnl +- -Wsign-compare dnl +- -Wstrict-aliasing dnl +- -Wshadow dnl +- -Winline dnl +- -Wpacked dnl +- -Wmissing-format-attribute dnl +- -Wmissing-noreturn dnl +- -Winit-self dnl +- -Wredundant-decls dnl +- -Wmissing-include-dirs dnl +- -Wunused-but-set-variable dnl +- -Warray-bounds dnl +- -Wreturn-type dnl +- -Wswitch-enum dnl +- -Wswitch-default dnl +- -Wduplicated-cond dnl +- -Wduplicated-branches dnl +- -Wlogical-op dnl +- -Wrestrict dnl +- -Wnull-dereference dnl +- -Wdouble-promotion dnl +- $4 dnl +- $5 dnl +- $6 dnl +- $7 dnl +- ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) +- ]) +- AS_IF([test "$ax_enable_compile_warnings" = "error"],[ +- # "error" flags; -Werror has to be appended unconditionally because +- # it's not possible to test for +- # +- # suggest-attribute=format is disabled because it gives too many false +- # positives +- AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) +- +- AX_APPEND_COMPILE_FLAGS([ dnl +- [$ax_compiler_no_suggest_attribute_flags] dnl +- ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) +- ]) +- +- # In the flags below, when disabling specific flags, always add *both* +- # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) +- # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, +- # which effectively turns that flag back on again as an error. +- for flag in $ax_warn_cflags_variable; do +- AS_CASE([$flag], +- [-Wno-*=*],[], +- [-Wno-*],[ +- AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], +- ax_warn_cflags_variable, +- [$ax_compiler_flags_test]) +- ]) +- done +- +- AC_LANG_POP([C]) +- +- # Substitute the variables +- AC_SUBST(ax_warn_cflags_variable) +-])dnl AX_COMPILER_FLAGS +diff --git a/m4/ax_compiler_flags_gir.m4 b/m4/ax_compiler_flags_gir.m4 +deleted file mode 100644 +index 5b4924a20..000000000 +--- a/m4/ax_compiler_flags_gir.m4 ++++ /dev/null +@@ -1,60 +0,0 @@ +-# =========================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +-# =========================================================================== +-# +-# SYNOPSIS +-# +-# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +-# +-# DESCRIPTION +-# +-# Add warning flags for the g-ir-scanner (from GObject Introspection) to +-# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed +-# by this macro, but must be manually added to the SCANNERFLAGS variable +-# for each GIR target in the code base. +-# +-# This macro depends on the environment set up by AX_COMPILER_FLAGS. +-# Specifically, it uses the value of $ax_enable_compile_warnings to decide +-# which flags to enable. +-# +-# LICENSE +-# +-# Copyright (c) 2015 Philip Withnall +-# +-# Copying and distribution of this file, with or without modification, are +-# permitted in any medium without royalty provided the copyright notice +-# and this notice are preserved. This file is offered as-is, without any +-# warranty. +- +-#serial 6 +- +-AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ +- AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +- +- # Variable names +- m4_define([ax_warn_scannerflags_variable], +- [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) +- +- # Base flags +- AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) +- +- AS_IF([test "$ax_enable_compile_warnings" != "no"],[ +- # "yes" flags +- AX_APPEND_FLAG([ dnl +- --warn-all dnl +- $4 dnl +- $5 dnl +- $6 dnl +- $7 dnl +- ],ax_warn_scannerflags_variable) +- ]) +- AS_IF([test "$ax_enable_compile_warnings" = "error"],[ +- # "error" flags +- AX_APPEND_FLAG([ dnl +- --warn-error dnl +- ],ax_warn_scannerflags_variable) +- ]) +- +- # Substitute the variables +- AC_SUBST(ax_warn_scannerflags_variable) +-])dnl AX_COMPILER_FLAGS +diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4 +deleted file mode 100644 +index 976d1198d..000000000 +--- a/m4/ax_compiler_flags_ldflags.m4 ++++ /dev/null +@@ -1,111 +0,0 @@ +-# ============================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html +-# ============================================================================== +-# +-# SYNOPSIS +-# +-# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +-# +-# DESCRIPTION +-# +-# Add warning flags for the linker to VARIABLE, which defaults to +-# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +-# manually added to the LDFLAGS variable for each target in the code base. +-# +-# This macro depends on the environment set up by AX_COMPILER_FLAGS. +-# Specifically, it uses the value of $ax_enable_compile_warnings to decide +-# which flags to enable. +-# +-# LICENSE +-# +-# Copyright (c) 2014, 2015 Philip Withnall +-# Copyright (c) 2017, 2018 Reini Urban +-# +-# Copying and distribution of this file, with or without modification, are +-# permitted in any medium without royalty provided the copyright notice +-# and this notice are preserved. This file is offered as-is, without any +-# warranty. +- +-#serial 9 +- +-AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ +- AX_REQUIRE_DEFINED([AX_APPEND_LINK_FLAGS]) +- AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +- AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +- +- # Variable names +- m4_define([ax_warn_ldflags_variable], +- [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) +- +- # Always pass -Werror=unknown-warning-option to get Clang to fail on bad +- # flags, otherwise they are always appended to the warn_ldflags variable, +- # and Clang warns on them for every compilation unit. +- # If this is passed to GCC, it will explode, so the flag must be enabled +- # conditionally. +- AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ +- ax_compiler_flags_test="-Werror=unknown-warning-option" +- ],[ +- ax_compiler_flags_test="" +- ]) +- +- AX_CHECK_LINK_FLAG([-Wl,--as-needed], [ +- AX_APPEND_LINK_FLAGS([-Wl,--as-needed], +- [AM_LDFLAGS],[$ax_compiler_flags_test]) +- ]) +- AX_CHECK_LINK_FLAG([-Wl,-z,relro], [ +- AX_APPEND_LINK_FLAGS([-Wl,-z,relro], +- [AM_LDFLAGS],[$ax_compiler_flags_test]) +- ]) +- AX_CHECK_LINK_FLAG([-Wl,-z,now], [ +- AX_APPEND_LINK_FLAGS([-Wl,-z,now], +- [AM_LDFLAGS],[$ax_compiler_flags_test]) +- ]) +- AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [ +- AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack], +- [AM_LDFLAGS],[$ax_compiler_flags_test]) +- ]) +- # textonly, retpolineplt not yet +- +- # macOS and cygwin linker do not have --as-needed +- AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [ +- ax_compiler_flags_as_needed_option="-Wl,--no-as-needed" +- ], [ +- ax_compiler_flags_as_needed_option="" +- ]) +- +- # macOS linker speaks with a different accent +- ax_compiler_flags_fatal_warnings_option="" +- AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [ +- ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings" +- ]) +- AX_CHECK_LINK_FLAG([-Wl,-fatal_warnings], [ +- ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings" +- ]) +- +- # Base flags +- AX_APPEND_LINK_FLAGS([ dnl +- $ax_compiler_flags_as_needed_option dnl +- $3 dnl +- ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) +- +- AS_IF([test "$ax_enable_compile_warnings" != "no"],[ +- # "yes" flags +- AX_APPEND_LINK_FLAGS([$4 $5 $6 $7], +- ax_warn_ldflags_variable, +- [$ax_compiler_flags_test]) +- ]) +- AS_IF([test "$ax_enable_compile_warnings" = "error"],[ +- # "error" flags; -Werror has to be appended unconditionally because +- # it's not possible to test for +- # +- # suggest-attribute=format is disabled because it gives too many false +- # positives +- AX_APPEND_LINK_FLAGS([ dnl +- $ax_compiler_flags_fatal_warnings_option dnl +- ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) +- ]) +- +- # Substitute the variables +- AC_SUBST(ax_warn_ldflags_variable) +-])dnl AX_COMPILER_FLAGS diff --git a/buildroot/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/buildroot/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch new file mode 100644 index 000000000..ac9eee82d --- /dev/null +++ b/buildroot/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch @@ -0,0 +1,57 @@ +From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 26 Sep 2020 22:03:10 +0200 +Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure + +Rename user structure to bt_user to avoid the following build failure +with uclibc: + +test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' + struct user { + ^ +In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, + from ../../src/common/assert.h:28, + from ../../src/lib/object.h:28, + from test_trace_ir_ref.c:25: +/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here + struct user + ^~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/efficios/babeltrace/pull/115] +--- + tests/lib/test_trace_ir_ref.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c +index d5dfa9cf..70caf29c 100644 +--- a/tests/lib/test_trace_ir_ref.c ++++ b/tests/lib/test_trace_ir_ref.c +@@ -25,7 +25,7 @@ + + #define NR_TESTS 37 + +-struct user { ++struct bt_user { + bt_trace_class *tc; + bt_stream_class *sc; + bt_event_class *ec; +@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) + bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; + bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, + *weak_ec3 = NULL; +- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; ++ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; + + /* The only reference which exists at this point is on TC1. */ + tc1 = create_tc1(self_comp); +-- +2.28.0 + diff --git a/buildroot/package/babeltrace2/Config.in b/buildroot/package/babeltrace2/Config.in new file mode 100644 index 000000000..a020d4a7c --- /dev/null +++ b/buildroot/package/babeltrace2/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_BABELTRACE2 + bool "babeltrace2" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + help + Babeltrace 2 is an open-source trace manipulation toolkit. + + The Babeltrace 2 project offers a library with a C API, + Python 3 bindings, and a command-line tool which makes it + very easy for mere mortals to view, convert, transform, and + analyze traces. + + Babeltrace 2 is also the reference parser implementation of + the Common Trace Format (CTF), a very versatile trace format + followed by various tracers and tools such as LTTng and + barectf. The Babeltrace 2 library and its Python bindings + can read and write CTF traces. + + To get support for the debugging information filter + component class, enable the elfutils package + (BR2_PACKAGE_ELFUTILS). + + https://babeltrace.org/ + +comment "babeltrace2 needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/babeltrace2/Config.in.host b/buildroot/package/babeltrace2/Config.in.host new file mode 100644 index 000000000..852ad870d --- /dev/null +++ b/buildroot/package/babeltrace2/Config.in.host @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HOST_BABELTRACE2 + bool "host babeltrace2" + help + Babeltrace 2 is an open-source trace manipulation toolkit. + + The Babeltrace 2 project offers a library with a C API, + Python 3 bindings, and a command-line tool which makes it + very easy for mere mortals to view, convert, transform, and + analyze traces. + + Babeltrace 2 is also the reference parser implementation of + the Common Trace Format (CTF), a very versatile trace format + followed by various tracers and tools such as LTTng and + barectf. The Babeltrace 2 library and its Python bindings + can read and write CTF traces. + + https://babeltrace.org/ diff --git a/buildroot/package/babeltrace2/babeltrace2.hash b/buildroot/package/babeltrace2/babeltrace2.hash new file mode 100644 index 000000000..27c47ba26 --- /dev/null +++ b/buildroot/package/babeltrace2/babeltrace2.hash @@ -0,0 +1,8 @@ +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 +sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 + +# Hash for license files +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt diff --git a/buildroot/package/babeltrace2/babeltrace2.mk b/buildroot/package/babeltrace2/babeltrace2.mk new file mode 100644 index 000000000..eb29a5928 --- /dev/null +++ b/buildroot/package/babeltrace2/babeltrace2.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# babeltrace2 +# +################################################################################ + +BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace +BABELTRACE2_VERSION = 2.0.3 +BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 +BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) +BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE +# We're patching configure.ac +BABELTRACE2_AUTORECONF = YES +BABELTRACE2_CONF_OPTS = --disable-man-pages +BABELTRACE2_DEPENDENCIES = libglib2 host-pkgconf +# The host-elfutils dependency is optional, but since we don't have +# options for host packages, just build support for it +# unconditionally. +HOST_BABELTRACE2_DEPENDENCIES = host-libglib2 host-pkgconf host-elfutils +HOST_BABELTRACE2_CONF_OPTS += --enable-debug-info + +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +BABELTRACE2_DEPENDENCIES += elfutils +BABELTRACE2_CONF_OPTS += --enable-debug-info +BABELTRACE2_CONF_ENV += bt_cv_lib_elfutils=yes +else +BABELTRACE2_CONF_OPTS += --disable-debug-info +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch b/buildroot/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..e7d0dec8d --- /dev/null +++ b/buildroot/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch @@ -0,0 +1,60 @@ +From dde68ed77114d7b19bfed3068edefc9dc0644445 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 16 Aug 2020 10:21:46 +0200 +Subject: [PATCH] src/bandwidthd.h: fix build with gcc 10 + +Remove SubnetTable[SUBNET_NUM] and IpTable[IP_NUM] from bandwidthd.h as +they are already in bandwidthd.c otherwise the build with gcc 10 will +fail on: + +/home/buildroot/autobuild/instance-2/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o bandwidthd bandwidthd.o graph.o extensions.o sqlight.o parser.o lexer.o pgsql.o -lpcap -lgd -lm -lresolv -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lpng16 -lz -L/home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/bin/../../../../arm-buildroot-linux-gnueabihf/sysroot/usr/lib/.libs -lnl-genl-3 -lnl-3 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: graph.o:(.bss+0x4b0): multiple definition of `IpTable'; bandwidthd.o:(.bss+0x3e0): first defined here +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: graph.o:(.bss+0x18c): multiple definition of `SubnetTable'; bandwidthd.o:(.bss+0x88): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/6308c8ee38b6017215038d47c009b238113bd36f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nroach44/bandwidthd/pull/1] +--- + src/bandwidthd.h | 4 ++-- + src/graph.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/bandwidthd.h b/src/bandwidthd.h +index 870fdf7..eb4c830 100644 +--- a/src/bandwidthd.h ++++ b/src/bandwidthd.h +@@ -134,7 +134,7 @@ struct SubnetData + { + uint32_t ip; + uint32_t mask; +-} SubnetTable[SUBNET_NUM]; ++}; + + struct Statistics + { +@@ -157,7 +157,7 @@ struct IPData + uint32_t ip; // Host byte order + struct Statistics Send; + struct Statistics Receive; +-} IpTable[IP_NUM]; ++}; + + struct SummaryData + { +diff --git a/src/graph.c b/src/graph.c +index b4b68f0..058e8c7 100644 +--- a/src/graph.c ++++ b/src/graph.c +@@ -18,6 +18,7 @@ + #include + #endif + ++extern struct SubnetData SubnetTable[SUBNET_NUM]; + extern unsigned int SubnetCount; + extern struct config config; + +-- +2.27.0 + diff --git a/buildroot/package/batctl/batctl.hash b/buildroot/package/batctl/batctl.hash index 94f3de023..e8127aa26 100644 --- a/buildroot/package/batctl/batctl.hash +++ b/buildroot/package/batctl/batctl.hash @@ -1,6 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2019.3/batctl-2019.3.tar.gz.sha1 -sha1 3a1357d51e9338e79e9953b7d8b33ace9f904b30 batctl-2019.3.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2020.2/batctl-2020.2.tar.gz.sha1 +sha1 e347fb126e2a8f6d21516296325afc043062e3bd batctl-2020.2.tar.gz # Locally calculated -sha256 2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c batctl-2019.3.tar.gz -sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 -sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 d29cdb53ee68abd5027eae07d9fd645b3f154e0d577efa2666c1334bb6d60efd batctl-2020.2.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/buildroot/package/batctl/batctl.mk b/buildroot/package/batctl/batctl.mk index 17ed15e36..229c042aa 100644 --- a/buildroot/package/batctl/batctl.mk +++ b/buildroot/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2019.3 +BATCTL_VERSION = 2020.2 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT diff --git a/buildroot/package/bats-core/bats-core.hash b/buildroot/package/bats-core/bats-core.hash index 4d10d785d..becc1aeca 100644 --- a/buildroot/package/bats-core/bats-core.hash +++ b/buildroot/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 855d8b8bed466bc505e61123d12885500ef6fcdb317ace1b668087364717ea82 bats-core-1.1.0.tar.gz +sha256 c74ea5517d9381c044e8e87427de0113be6ad591213d489aeaa28146daf1c723 bats-core-1.2.0.tar.gz # License files -sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md +sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/buildroot/package/bats-core/bats-core.mk b/buildroot/package/bats-core/bats-core.mk index eee38056f..2bcfca70d 100644 --- a/buildroot/package/bats-core/bats-core.mk +++ b/buildroot/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.1.0 +BATS_CORE_VERSION = 1.2.0 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/bcm2835/bcm2835.hash b/buildroot/package/bcm2835/bcm2835.hash index 025ef8be4..8317e1025 100644 --- a/buildroot/package/bcm2835/bcm2835.hash +++ b/buildroot/package/bcm2835/bcm2835.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7beacda787d6073d0982bfe576c318bb2730700f7d0f7950c6e763dfcb06e0e5 bcm2835-1.62.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 62955cc8506cc6506d729da3138442beb9763f1ffd536e925aeb0dc223492874 bcm2835-1.65.tar.gz +sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b COPYING diff --git a/buildroot/package/bcm2835/bcm2835.mk b/buildroot/package/bcm2835/bcm2835.mk index 2435a42c9..2ef6d94b3 100644 --- a/buildroot/package/bcm2835/bcm2835.mk +++ b/buildroot/package/bcm2835/bcm2835.mk @@ -4,10 +4,13 @@ # ################################################################################ -BCM2835_VERSION = 1.62 +BCM2835_VERSION = 1.65 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835 -BCM2835_LICENSE = GPL-2.0 +BCM2835_LICENSE = GPL-3.0 BCM2835_LICENSE_FILES = COPYING BCM2835_INSTALL_STAGING = YES +# disable doxygen doc generation +BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true + $(eval $(autotools-package)) diff --git a/buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch index a70c7c633..342042d59 100644 --- a/buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch +++ b/buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch @@ -1,49 +1,37 @@ -From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 14 Feb 2017 22:02:26 +0100 -Subject: [PATCH] Fix Libs.private flags for mbedtls +From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 10 Feb 2019 17:51:05 +0100 +Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Static linking with bctoolbox fails when using pkg-config as the -generated bctoolbox.pc file only consists of an '-L' string without any -search path or libraries flags. - -That's because of an typo in `mbedtls_library_path`. However, -`mbedtls_library_path` contains a string of the mbedtls libraries -concatenated by an ';' which cannot be parsed by pkg-config. - -Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get -the library path. - -Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and -*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the -`Libs.private` field of bctoolbox.pc. - -Upstream status: Pending +bctoolbox.pc should not contain the full libraries path, path should be +given by -L and library names by -l +So sent back the fix already suggested by Jörg Krause in https://github.com/BelledonneCommunications/bctoolbox/pull/4 Signed-off-by: Jörg Krause +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/BelledonneCommunications/bctoolbox/pull/7] --- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed7aa00..4127f0e 100644 +index 29f3eb6..b2f26c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -103,8 +103,8 @@ else() +@@ -101,9 +101,8 @@ else() endif() if(MBEDTLS_FOUND) - get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) -- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}") +- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}") +- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}") + get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) + set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509") endif() if(POLARSSL_FOUND) get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) --- -2.11.1 - diff --git a/buildroot/package/bctoolbox/Config.in b/buildroot/package/bctoolbox/Config.in index 048d01282..1cf2b7e23 100644 --- a/buildroot/package/bctoolbox/Config.in +++ b/buildroot/package/bctoolbox/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_BCTOOLBOX bool "bctoolbox" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone. @@ -12,3 +14,6 @@ config BR2_PACKAGE_BCTOOLBOX comment "bctoolbox needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + +comment "bctoolbox needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/bctoolbox/bctoolbox.hash b/buildroot/package/bctoolbox/bctoolbox.hash index 6242355ee..7d64c3201 100644 --- a/buildroot/package/bctoolbox/bctoolbox.hash +++ b/buildroot/package/bctoolbox/bctoolbox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz +sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING diff --git a/buildroot/package/bctoolbox/bctoolbox.mk b/buildroot/package/bctoolbox/bctoolbox.mk index 281a0bf2a..f9d740820 100644 --- a/buildroot/package/bctoolbox/bctoolbox.mk +++ b/buildroot/package/bctoolbox/bctoolbox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCTOOLBOX_VERSION = 0.4.0 +BCTOOLBOX_VERSION = 4.3.1 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) BCTOOLBOX_LICENSE = GPL-2.0+ BCTOOLBOX_LICENSE_FILES = COPYING @@ -20,6 +20,11 @@ BCTOOLBOX_CONF_OPTS = \ -DGIT_EXECUTABLE=OFF \ -DCMAKE_SKIP_RPATH=ON +ifeq ($(BR2_PACKAGE_LIBICONV),y) +BCTOOLBOX_DEPENDENCIES += libiconv +BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv" +endif + ifeq ($(BR2_PACKAGE_MBEDTLS),y) BCTOOLBOX_DEPENDENCIES += mbedtls BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON diff --git a/buildroot/package/bearssl/Config.in b/buildroot/package/bearssl/Config.in new file mode 100644 index 000000000..b10ce6025 --- /dev/null +++ b/buildroot/package/bearssl/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_BEARSSL + bool "bearssl" + help + BearSSL is an implementation of the SSL/TLS protocol + (RFC 5246) written in C. + + https://bearssl.org diff --git a/buildroot/package/bearssl/bearssl.hash b/buildroot/package/bearssl/bearssl.hash new file mode 100644 index 000000000..e00076266 --- /dev/null +++ b/buildroot/package/bearssl/bearssl.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 bearssl-0.6.tar.gz +sha256 771bf18c8633ea69ec9b07d2e604c4b99b7bef41b0f5ce6385d24df4448f61ca LICENSE.txt diff --git a/buildroot/package/bearssl/bearssl.mk b/buildroot/package/bearssl/bearssl.mk new file mode 100644 index 000000000..ff5f4e87b --- /dev/null +++ b/buildroot/package/bearssl/bearssl.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# bearssl +# +################################################################################ + +BEARSSL_VERSION = 0.6 +BEARSSL_SITE = https://bearssl.org +BEARSSL_LICENSE = MIT +BEARSSL_LICENSE_FILES = LICENSE.txt +BEARSSL_INSTALL_STAGING = YES + +BEARSSL_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + LDDLL=$(TARGET_CC) + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +BEARSSL_TARGETS += dll +BEARSSL_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -fPIC" +endif + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +BEARSSL_TARGETS += lib +endif + +define BEARSSL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(BEARSSL_MAKE_OPTS) -C $(@D) \ + $(BEARSSL_TARGETS) +endef + +define BEARSSL_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include + cp -dpfr $(@D)/inc/*.h $(STAGING_DIR)/usr/include + mkdir -p $(STAGING_DIR)/usr/lib + cp -dpfr $(@D)/build/lib* $(STAGING_DIR)/usr/lib +endef + +define BEARSSL_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -dpfr $(@D)/build/lib* $(TARGET_DIR)/usr/lib +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/bellagio/0001-drop-werror.patch b/buildroot/package/bellagio/0001-drop-werror.patch deleted file mode 100644 index 39baf421b..000000000 --- a/buildroot/package/bellagio/0001-drop-werror.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] don't force -Werror in CFLAGS - -Released software shouldn't get built with -Werror. - -Signed-of-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libomxil-bellagio-0.9.3/configure.ac -=================================================================== ---- libomxil-bellagio-0.9.3.orig/configure.ac -+++ libomxil-bellagio-0.9.3/configure.ac -@@ -5,7 +5,7 @@ - AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) --CFLAGS="${CFLAGS} -Wall -Werror" -+CFLAGS="${CFLAGS} -Wall" - - ################################################################################ - # Set the shared versioning info, according to section 6.3 of the libtool info # diff --git a/buildroot/package/bellagio/0002-dynamicloader-linking.patch b/buildroot/package/bellagio/0002-dynamicloader-linking.patch deleted file mode 100644 index 5e4243d5e..000000000 --- a/buildroot/package/bellagio/0002-dynamicloader-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. -Link explicitly against omxil-bellagio so that ld.so can find the reference. - -Signed-off-by: Qais Yousef - ---- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 -+++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 -@@ -3,7 +3,7 @@ - omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la - libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h - --libomxdynamicloader_la_LDFLAGS = -+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(abs_top_srcdir)/src/.libs - libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base \ diff --git a/buildroot/package/bellagio/0003-parallel-build.patch b/buildroot/package/bellagio/0003-parallel-build.patch deleted file mode 100644 index 767bbeb2a..000000000 --- a/buildroot/package/bellagio/0003-parallel-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix dependency issue to allow parallel build - -Signed-off-by: Qais Yousef - -Index: bellagio-0.9.3/src/Makefile.am -=================================================================== ---- bellagio-0.9.3.orig/src/Makefile.am -+++ bellagio-0.9.3/src/Makefile.am -@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist - omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ - -I$(top_srcdir)/include - omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -+omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la - - lib_LTLIBRARIES = libomxil-bellagio.la - libomxil_bellagio_la_SOURCES = component_loader.h \ diff --git a/buildroot/package/bellagio/0004-segfault-on-removeFromWaitResource.patch b/buildroot/package/bellagio/0004-segfault-on-removeFromWaitResource.patch deleted file mode 100644 index f52a2c33f..000000000 --- a/buildroot/package/bellagio/0004-segfault-on-removeFromWaitResource.patch +++ /dev/null @@ -1,37 +0,0 @@ -We always access globalComponentList[] at indexComponent=-1 which causes a -segfault. Use i as the index instead. - -Signed-off-by: Qais Yousef - ---- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 -+++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 -@@ -485,7 +485,6 @@ - OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { - omx_base_component_PrivateType* omx_base_component_Private; - int i = 0; -- int indexComponent = -1; - - DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); - omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; -@@ -493,16 +492,13 @@ - while(listOfcomponentRegistered[i].component_name != NULL ) { - if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { - // found component in the list of the resource manager -- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); -- break; -+ removeElemFromList(&globalComponentList[i], openmaxStandComp); -+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ return OMX_ErrorNone; - } - i++; - } -- if (indexComponent <0) { -- // No resource to be handled -- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); -- return OMX_ErrorNone; -- } -- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ // No resource to be handled -+ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); - return OMX_ErrorNone; - } diff --git a/buildroot/package/bellagio/0005-fix-doc-installation-path.patch b/buildroot/package/bellagio/0005-fix-doc-installation-path.patch deleted file mode 100644 index 06b0743e2..000000000 --- a/buildroot/package/bellagio/0005-fix-doc-installation-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile.am: fix bogus docdir definition - -The definition of the docdir variable uses $(DESTDIR). However, -automake already prefixes all *dir variables automatically with -DESTDIR, which causes the documentation to be installed in -$(DESTDIR)/$(DESTDIR)/usr/share/doc/... - -Fix this by removing the $(DESTDIR) part of the docdir definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,7 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libomxil-bellagio.pc - --docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ -+docdir = $(prefix)/share/doc/@PACKAGE@ - doc_DATA = README \ - ChangeLog \ - TODO diff --git a/buildroot/package/bellagio/Config.in b/buildroot/package/bellagio/Config.in deleted file mode 100644 index 8ad186739..000000000 --- a/buildroot/package/bellagio/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_BELLAGIO - bool "bellagio" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HAS_LIBOPENMAX - help - Bellagio is an opensource implementation of the - OpenMAX IL API. - - OpenMAX Integration Layer (IL) is a standard API - to access Multimedia Components on mobile platforms. - It has been defined by the Khronos group. - By means of the OpenMAX IL API, multimedia frameworks - can access hardware accelerators on platforms that - provide it. - - http://omxil.sourceforge.net/ - -if BR2_PACKAGE_BELLAGIO - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - default "bellagio" - -endif - -comment "bellagio needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/bellagio/bellagio.hash b/buildroot/package/bellagio/bellagio.hash deleted file mode 100644 index bd95df0f1..000000000 --- a/buildroot/package/bellagio/bellagio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c libomxil-bellagio-0.9.3.tar.gz -sha256 a3d4e451d72288a4f8819b734ef610926213c2ba97e512add8de2f30843505a6 COPYING diff --git a/buildroot/package/bellagio/bellagio.mk b/buildroot/package/bellagio/bellagio.mk deleted file mode 100644 index 4e5c6912e..000000000 --- a/buildroot/package/bellagio/bellagio.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# bellagio -# -################################################################################ - -BELLAGIO_VERSION = 0.9.3 -BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz -BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION) -BELLAGIO_AUTORECONF = YES -BELLAGIO_INSTALL_STAGING = YES -BELLAGIO_LICENSE = LGPL-2.1+ -BELLAGIO_LICENSE_FILES = COPYING -BELLAGIO_PROVIDES = libopenmax - -$(eval $(autotools-package)) diff --git a/buildroot/package/belle-sip/Config.in b/buildroot/package/belle-sip/Config.in new file mode 100644 index 000000000..8e4de366e --- /dev/null +++ b/buildroot/package/belle-sip/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_BELLE_SIP + bool "belle-sip" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox + depends on BR2_USE_WCHAR + select BR2_PACKAGE_BCTOOLBOX + # needs crypto support in bctoolbox + select BR2_PACKAGE_MBEDTLS + help + Belle-sip is a modern library implementing SIP (RFC 3261) + transport, transaction and dialog layers. + + http://www.linphone.org/technical-corner/belle-sip + +comment "belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "belle-sip needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/belle-sip/belle-sip.hash b/buildroot/package/belle-sip/belle-sip.hash new file mode 100644 index 000000000..889ad2be7 --- /dev/null +++ b/buildroot/package/belle-sip/belle-sip.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3ac7051ea6ac758cccbf1483a5dd6cda4293b5cde1370a3f0d298e3a6f0ee032 belle-sip-4.3.1.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/belle-sip/belle-sip.mk b/buildroot/package/belle-sip/belle-sip.mk new file mode 100644 index 000000000..1daef1d2d --- /dev/null +++ b/buildroot/package/belle-sip/belle-sip.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# belle-sip +# +################################################################################ + +BELLE_SIP_VERSION = 4.3.1 +BELLE_SIP_SITE = \ + https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION) +BELLE_SIP_LICENSE = GPL-3.0+ +BELLE_SIP_LICENSE_FILES = LICENSE.txt +BELLE_SIP_INSTALL_STAGING = YES +BELLE_SIP_DEPENDENCIES = \ + bctoolbox \ + $(if $(BR2_PACKAGE_ZLIB),zlib) +BELLE_SIP_CONF_OPTS = \ + -DENABLE_STRICT=OFF \ + -DENABLE_TESTS=OFF + +ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) +BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=ON +BELLE_SIP_DEPENDENCIES += avahi +else +BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=OFF +endif + +ifeq ($(BR2_STATIC_LIBS),y) +BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/belr/Config.in b/buildroot/package/belr/Config.in new file mode 100644 index 000000000..f3f742ad2 --- /dev/null +++ b/buildroot/package/belr/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_BELR + bool "belr" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # bctoolbox + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox + select BR2_PACKAGE_BCTOOLBOX + help + Belr is Belledonne Communications' language recognition + library, written in C++11. It parses text inputs formatted + according to a language defined by an ABNF grammar, such as + the protocols standardized at IETF. + + https://gitlab.linphone.org/BC/public/belr + +comment "belr needs a toolchain w/ threads, C++" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + +comment "belr needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/belr/belr.hash b/buildroot/package/belr/belr.hash new file mode 100644 index 000000000..42cf50697 --- /dev/null +++ b/buildroot/package/belr/belr.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d6575c36c32828edcaf39df2775070b187019b21fe5fe274e7a85caf54284f05 belr-4.3.1.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/belr/belr.mk b/buildroot/package/belr/belr.mk new file mode 100644 index 000000000..8855f94fd --- /dev/null +++ b/buildroot/package/belr/belr.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# belr +# +################################################################################ + +BELR_VERSION = 4.3.1 +BELR_SITE = https://gitlab.linphone.org/BC/public/belr/-/archive/$(BELR_VERSION) +BELR_LICENSE = GPL-3.0+ +BELR_LICENSE_FILES = LICENSE.txt +BELR_INSTALL_STAGING = YES +BELR_DEPENDENCIES = bctoolbox +BELR_CONF_OPTS = \ + -DENABLE_STRICT=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_TOOLS=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +BELR_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +BELR_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +BELR_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch b/buildroot/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch deleted file mode 100644 index 306c65fdf..000000000 --- a/buildroot/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch +++ /dev/null @@ -1,198 +0,0 @@ -From d930affa2d475d1cc6792f1e6d56bef3d6c617db Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:16:21 +0100 -Subject: [PATCH] Refactored location where GOT information is collected. - -Change location where GOT information is collected for ARC target, avoiding -posible use conflicts of the previous .got field in the symbols hash_entry. - -bfd/ -2018-03-01 Cupertino Miranda - - * arc-got.h (get_got_entry_list_for_symbol): Changed. - * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed. - (elf_arc_link_hash_newfunc): Changed. - (arc_elf_link_hash_table_create): Removed old initializations. - (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed. - -Signed-off-by: Alexey Brodkin -[Romain: rebase on top of 2.31] -Signed-off-by: Romain Naour ---- - bfd/arc-got.h | 6 +++-- - bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++++++-------------------------- - 2 files changed, 46 insertions(+), 37 deletions(-) - -diff --git a/bfd/arc-got.h b/bfd/arc-got.h -index a86061bcb38..81ce88fe21a 100644 ---- a/bfd/arc-got.h -+++ b/bfd/arc-got.h -@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd, - unsigned long r_symndx, - struct elf_link_hash_entry *h) - { -- if (h != NULL) -+ struct elf_arc_link_hash_entry *h1 = -+ ((struct elf_arc_link_hash_entry *) h); -+ if (h1 != NULL) - { -- return &h->got.glist; -+ return &h1->got_ents; - } - else - { -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index a48ef0ca15f..ab84de43815 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -160,6 +160,18 @@ struct arc_relocation_data - const char * symbol_name; - }; - -+/* ARC ELF linker hash entry. */ -+struct elf_arc_link_hash_entry -+{ -+ struct elf_link_hash_entry root; -+ -+ /* Track dynamic relocs copied for this symbol. */ -+ struct elf_dyn_relocs *dyn_relocs; -+ -+ struct got_entry *got_ents; -+}; -+ -+ - /* Should be included at this location due to static declarations - defined before this point. */ - #include "arc-got.h" -@@ -281,15 +293,6 @@ struct arc_reloc_map - unsigned char elf_reloc_val; - }; - --/* ARC ELF linker hash entry. */ --struct elf_arc_link_hash_entry --{ -- struct elf_link_hash_entry root; -- -- /* Track dynamic relocs copied for this symbol. */ -- struct elf_dyn_relocs *dyn_relocs; --}; -- - /* ARC ELF linker hash table. */ - struct elf_arc_link_hash_table - { -@@ -301,28 +304,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, - const char *string) - { -+ struct elf_arc_link_hash_entry * ret = -+ (struct elf_arc_link_hash_entry *) entry; -+ - /* Allocate the structure if it has not already been allocated by a - subclass. */ -- if (entry == NULL) -- { -- entry = (struct bfd_hash_entry *) -- bfd_hash_allocate (table, -- sizeof (struct elf_arc_link_hash_entry)); -- if (entry == NULL) -- return entry; -- } -+ if (ret == NULL) -+ ret = (struct elf_arc_link_hash_entry *) -+ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry)); -+ if (ret == NULL) -+ return (struct bfd_hash_entry *) ret; - - /* Call the allocation method of the superclass. */ -- entry = _bfd_elf_link_hash_newfunc (entry, table, string); -- if (entry != NULL) -+ ret = ((struct elf_arc_link_hash_entry *) -+ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, -+ table, string)); -+ if (ret != NULL) - { -- struct elf_arc_link_hash_entry *eh; -- -- eh = (struct elf_arc_link_hash_entry *) entry; -- eh->dyn_relocs = NULL; -+ ret->dyn_relocs = NULL; -+ ret->got_ents = NULL; - } - -- return entry; -+ return (struct bfd_hash_entry *) ret; - } - - /* Destroy an ARC ELF linker hash table. */ -@@ -352,11 +355,6 @@ arc_elf_link_hash_table_create (bfd *abfd) - return NULL; - } - -- ret->elf.init_got_refcount.refcount = 0; -- ret->elf.init_got_refcount.glist = NULL; -- ret->elf.init_got_offset.offset = 0; -- ret->elf.init_got_offset.glist = NULL; -- - ret->elf.root.hash_table_free = elf_arc_link_hash_table_free; - - return &ret->elf.root; -@@ -1615,10 +1613,14 @@ elf_arc_relocate_section (bfd * output_bfd, - while (h->root.type == bfd_link_hash_indirect - || h->root.type == bfd_link_hash_warning) - { -- struct elf_link_hash_entry *h_old = h; -+ struct elf_arc_link_hash_entry *ah_old = -+ (struct elf_arc_link_hash_entry *) h; - h = (struct elf_link_hash_entry *) h->root.u.i.link; -- if (h->got.glist == 0 && h_old->got.glist != h->got.glist) -- h->got.glist = h_old->got.glist; -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; -+ -+ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents) -+ ah->got_ents = ah_old->got_ents; - } - - /* TODO: Need to validate what was the intention. */ -@@ -1636,6 +1638,8 @@ elf_arc_relocate_section (bfd * output_bfd, - - if (is_reloc_for_GOT (howto) && !bfd_link_pic (info)) - { -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; - /* TODO: Change it to use arc_do_relocation with - ARC_32 reloc. Try to use ADD_RELA macro. */ - bfd_vma relocation = -@@ -1645,8 +1649,8 @@ elf_arc_relocate_section (bfd * output_bfd, - + reloc_data.sym_section->output_section->vma) - : 0); - -- BFD_ASSERT (h->got.glist); -- bfd_vma got_offset = h->got.glist->offset; -+ BFD_ASSERT (ah->got_ents); -+ bfd_vma got_offset = ah->got_ents->offset; - bfd_put_32 (output_bfd, relocation, - htab->sgot->contents + got_offset); - } -@@ -1958,6 +1962,7 @@ elf_arc_check_relocs (bfd * abfd, - else /* Global one. */ - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; - -+ - switch (r_type) - { - case R_ARC_32: -@@ -2404,7 +2409,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, - create respective dynamic relocs. */ - /* TODO: Make function to get list and not access the list directly. */ - /* TODO: Move function to relocate_section create this relocs eagerly. */ -- create_got_dynrelocs_for_got_info (&h->got.glist, -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; -+ create_got_dynrelocs_for_got_info (&ah->got_ents, - output_bfd, - info, - h); --- -2.14.4 - diff --git a/buildroot/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/buildroot/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch deleted file mode 100644 index b6e6d202e..000000000 --- a/buildroot/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 955176bd999fe80c5b937ab8786665079e35c387 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:33:48 +0100 -Subject: [PATCH] Improved robustness. Return FALSE in case of NULL pointer. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case - arc_htab is NULL. - -Signed-off-by: Alexey Brodkin -[Romain: rebase on top of 2.31] -Signed-off-by: Romain Naour ---- - bfd/elf32-arc.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index ab84de43815..33fc72cff6e 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -2420,6 +2420,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, - { - struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info); - -+ if(arc_htab == NULL) -+ return FALSE; -+ - if (h->dynindx == -1 - || (h->root.type != bfd_link_hash_defined - && h->root.type != bfd_link_hash_defweak) --- -2.14.4 - diff --git a/buildroot/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/buildroot/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch deleted file mode 100644 index c3558fe08..000000000 --- a/buildroot/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9d09ce14b4eef2b56f24660fd69a44acd45128b2 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:38:14 +0100 -Subject: [PATCH] Make sure global symbol is not an indirect or warning. - -Problem identified in the context of glibc with latest upstream binutils. -Dynamic symbol space was being reserved but, no actual information for the -symbol was being set. Data for the symbol was kept initialized with -1. -No easy test case was possible to be created. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_check_relocs): Changed. - -Signed-off-by: Alexey Brodkin -[Romain: rebase on top of 2.31] -Signed-off-by: Romain Naour ---- - bfd/elf32-arc.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 33fc72cff6e..9b72c5b4f4f 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -1960,7 +1960,12 @@ elf_arc_check_relocs (bfd * abfd, - if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ - h = NULL; - else /* Global one. */ -- h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ { -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ } - - - switch (r_type) --- -2.14.4 - diff --git a/buildroot/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch b/buildroot/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch deleted file mode 100644 index 60bb522e1..000000000 --- a/buildroot/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e4861c68067cb2166b4c2bb9c052abeb6ad9aaa1 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:44:29 +0100 -Subject: [PATCH] PLT information was still being generated when symbol was - forced_local. - -A change upstream reveiled this issue, triggering an assert when linking glibc. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_check_relocs): Changed. - -Signed-off-by: Alexey Brodkin -[Romain: rebase on top of 2.31] -Signed-off-by: Romain Naour ---- - bfd/elf32-arc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 9b72c5b4f4f..b40b463d34d 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -2041,7 +2041,8 @@ elf_arc_check_relocs (bfd * abfd, - if (h == NULL) - continue; - else -- h->needs_plt = 1; -+ if(h->forced_local == 0) -+ h->needs_plt = 1; - } - - /* Add info to the symbol got_entry_list. */ --- -2.14.4 - diff --git a/buildroot/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch b/buildroot/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch deleted file mode 100644 index 660d30c38..000000000 --- a/buildroot/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5d3a462f05cba5b0c0c96de899b84fb84155c760 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 22 Jul 2018 13:52:28 -0700 -Subject: [PATCH] xtensa: fix relaxation of undefined weak references in - shared objects - -The change c451bb34ae8b ("xtensa: don't emit dynamic relocation for weak -undefined symbol") didn't properly handle shrinking of relocation -sections due to coalescing of references to a dynamic undefined weak -symbol in a shared object, which resulted in the following assertion -failure in ld when linking uClibc-ng libthread_db for xtensa: - - BFD (GNU Binutils) 2.31 internal error, aborting at elf32-xtensa.c:3269 - in elf_xtensa_finish_dynamic_sections - -Shrink dynamic relocations section for dynamic undefined weak symbols -when linking a shared object. - -bfd/ -2018-07-23 Max Filippov - - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic - relocations section for dynamic undefined weak symbols when - linking a shared object. - -Signed-off-by: Max Filippov -Backported from: 5d3a462f05cba5b0c0c96de899b84fb84155c760 ---- - bfd/elf32-xtensa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index f7f569d0c086..a4b046e445f1 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10022,7 +10022,8 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) - && (input_section->flags & SEC_ALLOC) != 0 - && (dynamic_symbol || bfd_link_pic (info)) -- && (!h || h->root.type != bfd_link_hash_undefweak)) -+ && (!h || h->root.type != bfd_link_hash_undefweak -+ || (dynamic_symbol && bfd_link_dll (info)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.11.0 - diff --git a/buildroot/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch b/buildroot/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch deleted file mode 100644 index 2c12ce3db..000000000 --- a/buildroot/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch +++ /dev/null @@ -1,90 +0,0 @@ -From f82863d797e461b936dff2b659a3aa65088ee87e Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 22 Jul 2018 18:59:11 -0700 -Subject: [PATCH] xtensa: move dynamic relocations sections consistency - check - -The function elf_xtensa_finish_dynamic_sections checks that sizes of -sections .rela.dyn and .rela.plt match number of corresponding relocation -records, but the check is only done when .rela.plt is non-empty, so, e.g. -it is never run for the static PIE. -Rearrange the test so that .rela.dyn and .rela.plt are checked always. - -bfd/ -2018-07-23 Max Filippov - - * elf32-xtensa.c (elf_xtensa_finish_dynamic_sections): Move - relocation sections consistency check to always check both - .rela.dyn and .rela.plt when they exist. Rearrange variable - definition and assignment places. - -Signed-off-by: Max Filippov -Backported from: f82863d797e461b936dff2b659a3aa65088ee87e ---- - bfd/elf32-xtensa.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index a4b046e445f1..cf085b7b0751 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -3156,7 +3156,7 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, - { - struct elf_xtensa_link_hash_table *htab; - bfd *dynobj; -- asection *sdyn, *srelplt, *sgot, *sxtlit, *sgotloc; -+ asection *sdyn, *srelplt, *srelgot, *sgot, *sxtlit, *sgotloc; - Elf32_External_Dyn *dyncon, *dynconend; - int num_xtlit_entries = 0; - -@@ -3186,15 +3186,15 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, - } - - srelplt = htab->elf.srelplt; -+ srelgot = htab->elf.srelgot; - if (srelplt && srelplt->size != 0) - { -- asection *sgotplt, *srelgot, *spltlittbl; -+ asection *sgotplt, *spltlittbl; - int chunk, plt_chunks, plt_entries; - Elf_Internal_Rela irela; - bfd_byte *loc; - unsigned rtld_reloc; - -- srelgot = htab->elf.srelgot; - spltlittbl = htab->spltlittbl; - BFD_ASSERT (srelgot != NULL && spltlittbl != NULL); - -@@ -3260,14 +3260,6 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, - spltlittbl->contents + (chunk * 8) + 4); - } - -- /* All the dynamic relocations have been emitted at this point. -- Make sure the relocation sections are the correct size. */ -- if (srelgot->size != (sizeof (Elf32_External_Rela) -- * srelgot->reloc_count) -- || srelplt->size != (sizeof (Elf32_External_Rela) -- * srelplt->reloc_count)) -- abort (); -- - /* The .xt.lit.plt section has just been modified. This must - happen before the code below which combines adjacent literal - table entries, and the .xt.lit.plt contents have to be forced to -@@ -3282,6 +3274,14 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, - spltlittbl->flags &= ~SEC_HAS_CONTENTS; - } - -+ /* All the dynamic relocations have been emitted at this point. -+ Make sure the relocation sections are the correct size. */ -+ if ((srelgot && srelgot->size != (sizeof (Elf32_External_Rela) -+ * srelgot->reloc_count)) -+ || (srelplt && srelplt->size != (sizeof (Elf32_External_Rela) -+ * srelplt->reloc_count))) -+ abort (); -+ - /* Combine adjacent literal table entries. */ - BFD_ASSERT (! bfd_link_relocatable (info)); - sxtlit = bfd_get_section_by_name (output_bfd, ".xt.lit"); --- -2.11.0 - diff --git a/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch deleted file mode 100644 index 8a05af4bb..000000000 --- a/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ /dev/null @@ -1,568 +0,0 @@ -From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Fri, 20 Jul 2018 09:18:47 -0700 -Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed - -When -z separate-code, which is enabled by default for Linux/x86, is -used to create executable, ld won't place any data in the code-only -PT_LOAD segment. If there are no data sections placed before the -code-only PT_LOAD segment, the program headers won't be mapped into -any PT_LOAD segment. When the executable tries to access it (based -on the program header address passed in AT_PHDR), it will lead to -segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if -there may be no data sections before the text section so that the -first PT_LOAD segment won't be code-only and will contain the program -header. - -Testcases are adjusted to either pass "-z noseparate-code" to ld or -discard the .note.gnu.property section. A Linux/x86 run-time test is -added. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the - separate code program header is needed, make sure that the first - read-only PT_LOAD segment has no code by adding a - GNU_PROPERTY_X86_ISA_1_USED note. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/linux-x86.S: New file. - * testsuite/ld-elf/linux-x86.exp: Likewise. - * testsuite/ld-elf/pr23428.c: Likewise. - * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld - for Linux/x86 targets. - * testsuite/ld-i386/abs-iamcu.d: Likewise. - * testsuite/ld-i386/abs.d: Likewise. - * testsuite/ld-i386/pr12718.d: Likewise. - * testsuite/ld-i386/pr12921.d: Likewise. - * testsuite/ld-x86-64/abs-k1om.d: Likewise. - * testsuite/ld-x86-64/abs-l1om.d: Likewise. - * testsuite/ld-x86-64/abs.d: Likewise. - * testsuite/ld-x86-64/pr12718.d: Likewise. - * testsuite/ld-x86-64/pr12921.d: Likewise. - * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property - section. - * testsuite/ld-scripts/print-memory-usage.t: Likewise. - * testsuite/ld-scripts/size-2.t: Likewise. - * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld - to create executable if language is "asm". - -(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) -Signed-off-by: Norbert Lange ---- - bfd/ChangeLog | 8 ++++ - bfd/elfxx-x86.c | 60 +++++++++++++++++++------- - ld/ChangeLog | 24 +++++++++++ - ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++++++++ - ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++++++++ - ld/testsuite/ld-elf/sec64k.exp | 2 + - ld/testsuite/ld-i386/abs-iamcu.d | 2 +- - ld/testsuite/ld-i386/abs.d | 2 +- - ld/testsuite/ld-i386/pr12718.d | 2 +- - ld/testsuite/ld-i386/pr12921.d | 2 +- - ld/testsuite/ld-linkonce/zeroeh.ld | 1 + - ld/testsuite/ld-scripts/print-memory-usage.t | 2 + - ld/testsuite/ld-scripts/size-2.t | 1 + - ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- - ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- - ld/testsuite/ld-x86-64/abs.d | 2 +- - ld/testsuite/ld-x86-64/pr12718.d | 2 +- - ld/testsuite/ld-x86-64/pr12921.d | 2 +- - ld/testsuite/lib/ld-lib.exp | 5 ++- - 20 files changed, 248 insertions(+), 25 deletions(-) - create mode 100644 ld/testsuite/ld-elf/linux-x86.S - create mode 100644 ld/testsuite/ld-elf/linux-x86.exp - create mode 100644 ld/testsuite/ld-elf/pr23428.c - -diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index 1c1174a..d3831b7 100644 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,11 @@ -+2018-07-23 H.J. Lu -+ -+ PR ld/23428 -+ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the -+ separate code program header is needed, make sure that the first -+ read-only PT_LOAD segment has no code by adding a -+ GNU_PROPERTY_X86_ISA_1_USED note. -+ - 2018-07-18 Nick Clifton - - * development.sh: Set to true. -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index a2497aa..2e4ff88 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties - const struct elf_backend_data *bed; - unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; - unsigned int got_align; -+ bfd_boolean has_text = FALSE; - - features = 0; - if (info->ibt) -@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties - if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour - && bfd_count_sections (pbfd) != 0) - { -+ if (!has_text) -+ { -+ /* Check if there is no non-empty text section. */ -+ sec = bfd_get_section_by_name (pbfd, ".text"); -+ if (sec != NULL && sec->size != 0) -+ has_text = TRUE; -+ } -+ - ebfd = pbfd; - - if (elf_properties (pbfd) != NULL) - break; - } - -- if (ebfd != NULL && features) -+ bed = get_elf_backend_data (info->output_bfd); -+ -+ htab = elf_x86_hash_table (info, bed->target_id); -+ if (htab == NULL) -+ return pbfd; -+ -+ if (ebfd != NULL) - { -- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_FEATURE_1_AND, -- 4); -- prop->u.number |= features; -- prop->pr_kind = property_number; -+ prop = NULL; -+ if (features) -+ { -+ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -+ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_FEATURE_1_AND, -+ 4); -+ prop->u.number |= features; -+ prop->pr_kind = property_number; -+ } -+ else if (has_text -+ && elf_properties (ebfd) == NULL -+ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL -+ && !htab->elf.dynamic_sections_created -+ && !info->traditional_format -+ && (info->output_bfd->flags & D_PAGED) != 0 -+ && info->separate_code) -+ { -+ /* If the separate code program header is needed, make sure -+ that the first read-only PT_LOAD segment has no code by -+ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_USED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - - /* Create the GNU property note section if needed. */ -- if (pbfd == NULL) -+ if (prop != NULL && pbfd == NULL) - { - sec = bfd_make_section_with_flags (ebfd, - NOTE_GNU_PROPERTY_SECTION_NAME, -@@ -2581,12 +2617,6 @@ error_alignment: - - pbfd = _bfd_elf_link_setup_gnu_properties (info); - -- bed = get_elf_backend_data (info->output_bfd); -- -- htab = elf_x86_hash_table (info, bed->target_id); -- if (htab == NULL) -- return pbfd; -- - htab->r_info = init_table->r_info; - htab->r_sym = init_table->r_sym; - -diff --git a/ld/ChangeLog b/ld/ChangeLog -index c07e442..cfadbd4 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,27 @@ -+2018-07-23 H.J. Lu -+ -+ PR ld/23428 -+ * testsuite/ld-elf/linux-x86.S: New file. -+ * testsuite/ld-elf/linux-x86.exp: Likewise. -+ * testsuite/ld-elf/pr23428.c: Likewise. -+ * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld -+ for Linux/x86 targets. -+ * testsuite/ld-i386/abs-iamcu.d: Likewise. -+ * testsuite/ld-i386/abs.d: Likewise. -+ * testsuite/ld-i386/pr12718.d: Likewise. -+ * testsuite/ld-i386/pr12921.d: Likewise. -+ * testsuite/ld-x86-64/abs-k1om.d: Likewise. -+ * testsuite/ld-x86-64/abs-l1om.d: Likewise. -+ * testsuite/ld-x86-64/abs.d: Likewise. -+ * testsuite/ld-x86-64/pr12718.d: Likewise. -+ * testsuite/ld-x86-64/pr12921.d: Likewise. -+ * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property -+ section. -+ * testsuite/ld-scripts/print-memory-usage.t: Likewise. -+ * testsuite/ld-scripts/size-2.t: Likewise. -+ * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to -+ create executable if language is "asm". -+ - 2018-07-18 Nick Clifton - - 2.31.1 Release point. -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -new file mode 100644 -index 0000000..bdf40c6 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -0,0 +1,63 @@ -+ .text -+ .globl _start -+ .type _start,@function -+ .p2align 4 -+_start: -+ xorl %ebp, %ebp -+#ifdef __LP64__ -+ popq %rdi -+ movq %rsp, %rsi -+ andq $~15, %rsp -+#elif defined __x86_64__ -+ mov (%rsp),%edi -+ addl $4,%esp -+ movl %esp, %esi -+ andl $~15, %esp -+#else -+ popl %esi -+ movl %esp, %ecx -+ andl $~15, %esp -+ -+ subl $8,%esp -+ pushl %ecx -+ pushl %esi -+#endif -+ -+ call main -+ -+ hlt -+ -+ .type syscall, @function -+ .globl syscall -+ .p2align 4 -+syscall: -+#ifdef __x86_64__ -+ movq %rdi, %rax /* Syscall number -> rax. */ -+ movq %rsi, %rdi /* shift arg1 - arg5. */ -+ movq %rdx, %rsi -+ movq %rcx, %rdx -+ movq %r8, %r10 -+ movq %r9, %r8 -+ movq 8(%rsp),%r9 /* arg6 is on the stack. */ -+ syscall /* Do the system call. */ -+#else -+ push %ebp -+ push %edi -+ push %esi -+ push %ebx -+ mov 0x2c(%esp),%ebp -+ mov 0x28(%esp),%edi -+ mov 0x24(%esp),%esi -+ mov 0x20(%esp),%edx -+ mov 0x1c(%esp),%ecx -+ mov 0x18(%esp),%ebx -+ mov 0x14(%esp),%eax -+ int $0x80 -+ pop %ebx -+ pop %esi -+ pop %edi -+ pop %ebp -+#endif -+ ret /* Return to caller. */ -+ .size syscall, .-syscall -+ .section .note.GNU-stack,"",@progbits -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -new file mode 100644 -index 0000000..36217c6 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -0,0 +1,46 @@ -+# Expect script for simple native Linux/x86 tests. -+# Copyright (C) 2018 Free Software Foundation, Inc. -+# -+# This file is part of the GNU Binutils. -+# -+# 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, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -+# MA 02110-1301, USA. -+# -+ -+# Test very simple native Linux/x86 programs with linux-x86.S. -+if { ![isnative] || [which $CC] == 0 \ -+ || (![istarget "i?86-*-linux*"] \ -+ && ![istarget "x86_64-*-linux*"] \ -+ && ![istarget "amd64-*-linux*"]) } { -+ return -+} -+ -+# Add $PLT_CFLAGS if PLT is expected. -+global PLT_CFLAGS -+# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -+global NOPIE_CFLAGS NOPIE_LDFLAGS -+ -+run_ld_link_exec_tests [list \ -+ [list \ -+ "Run PR ld/23428 test" \ -+ "--no-dynamic-linker -z separate-code" \ -+ "" \ -+ { linux-x86.S pr23428.c } \ -+ "pr23428" \ -+ "pass.out" \ -+ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ -+ "asm" \ -+ ] \ -+] -diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c -new file mode 100644 -index 0000000..3631ed7 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr23428.c -@@ -0,0 +1,43 @@ -+#include -+#include -+#include -+ -+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) -+ -+int -+main (int argc, char **argv) -+{ -+ char **ev = &argv[argc + 1]; -+ char **evp = ev; -+ ElfW(auxv_t) *av; -+ const ElfW(Phdr) *phdr = NULL; -+ size_t phnum = 0; -+ size_t loadnum = 0; -+ int fd = STDOUT_FILENO; -+ size_t i; -+ -+ while (*evp++ != NULL) -+ ; -+ -+ av = (ElfW(auxv_t) *) evp; -+ -+ for (; av->a_type != AT_NULL; ++av) -+ switch (av->a_type) -+ { -+ case AT_PHDR: -+ phdr = (const void *) av->a_un.a_val; -+ break; -+ case AT_PHNUM: -+ phnum = av->a_un.a_val; -+ break; -+ } -+ -+ for (i = 0; i < phnum; i++, phdr++) -+ if (phdr->p_type == PT_LOAD) -+ loadnum++; -+ -+ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); -+ -+ syscall (SYS_exit, !loadnum); -+ return 0; -+} -diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp -index b58139e..3909c0e 100644 ---- a/ld/testsuite/ld-elf/sec64k.exp -+++ b/ld/testsuite/ld-elf/sec64k.exp -@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] - foreach sfile $sfiles { puts $ofd "#source: $sfile" } - if { [istarget spu*-*-*] } { - puts $ofd "#ld: --local-store 0:0" -+ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { -+ puts $ofd "#ld: -z noseparate-code" - } else { - puts $ofd "#ld:" - } -diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d -index ac9beff..aba7d6b 100644 ---- a/ld/testsuite/ld-i386/abs-iamcu.d -+++ b/ld/testsuite/ld-i386/abs-iamcu.d -@@ -2,7 +2,7 @@ - #source: abs.s - #source: zero.s - #as: --32 -march=iamcu --#ld: -m elf_iamcu -+#ld: -m elf_iamcu -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d -index e660aca..191ee44 100644 ---- a/ld/testsuite/ld-i386/abs.d -+++ b/ld/testsuite/ld-i386/abs.d -@@ -2,7 +2,7 @@ - #as: --32 - #source: abs.s - #source: zero.s --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d -index ec51540..7eba52d 100644 ---- a/ld/testsuite/ld-i386/pr12718.d -+++ b/ld/testsuite/ld-i386/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d -index e49079b..ea2da3e 100644 ---- a/ld/testsuite/ld-i386/pr12921.d -+++ b/ld/testsuite/ld-i386/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld -index b22eaa1..f89855a 100644 ---- a/ld/testsuite/ld-linkonce/zeroeh.ld -+++ b/ld/testsuite/ld-linkonce/zeroeh.ld -@@ -2,4 +2,5 @@ SECTIONS { - .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } - .gcc_except_table 0x2000 : { *(.gcc_except_table) } - .eh_frame 0x4000 : { *(.eh_frame) } -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t -index 5ff057a..6eda1d2 100644 ---- a/ld/testsuite/ld-scripts/print-memory-usage.t -+++ b/ld/testsuite/ld-scripts/print-memory-usage.t -@@ -11,4 +11,6 @@ SECTIONS - *(.data) - *(.rw) - } -+ -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t -index 7238639..c3c4edd 100644 ---- a/ld/testsuite/ld-scripts/size-2.t -+++ b/ld/testsuite/ld-scripts/size-2.t -@@ -18,4 +18,5 @@ SECTIONS - LONG (SIZEOF (.tdata)) - LONG (SIZEOF (.tbss)) - } :image -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d -index 2c26639..6b0fde0 100644 ---- a/ld/testsuite/ld-x86-64/abs-k1om.d -+++ b/ld/testsuite/ld-x86-64/abs-k1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=k1om --#ld: -m elf_k1om -+#ld: -m elf_k1om -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d -index 1fb96d4..f87869f 100644 ---- a/ld/testsuite/ld-x86-64/abs-l1om.d -+++ b/ld/testsuite/ld-x86-64/abs-l1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=l1om --#ld: -m elf_l1om -+#ld: -m elf_l1om -z noseparate-code - #objdump: -rs -j .text - #target: x86_64-*-linux* - -diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d -index b24b018..d99ab46 100644 ---- a/ld/testsuite/ld-x86-64/abs.d -+++ b/ld/testsuite/ld-x86-64/abs.d -@@ -1,7 +1,7 @@ - #name: Absolute non-overflowing relocs - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s --#ld: -+#ld: -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d -index 07d1732..2c503ff 100644 ---- a/ld/testsuite/ld-x86-64/pr12718.d -+++ b/ld/testsuite/ld-x86-64/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d -index 6fe6abe..1162d55 100644 ---- a/ld/testsuite/ld-x86-64/pr12921.d -+++ b/ld/testsuite/ld-x86-64/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index cfbefe9..1095091 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { - continue - } - -- if { [ string match "c++" $lang ] } { -+ if { [ string match "asm" $lang ] } { -+ set link_proc ld_link -+ set link_cmd $ld -+ } elseif { [ string match "c++" $lang ] } { - set link_proc ld_link - set link_cmd $CXX - } else { --- -2.9.3 - diff --git a/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch deleted file mode 100644 index a4c48985d..000000000 --- a/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ /dev/null @@ -1,588 +0,0 @@ -From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 8 Aug 2018 06:09:15 -0700 -Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. -If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the -corresponding x86 instruction set isn’t used. When merging properties -from 2 input files and one input file doesn't have the -GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have -it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED -property if an input file doesn't have it. - -This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the -GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA -requirement. - -bfd/ - - PR ld/23486 - * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove - GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. - (_bfd_x86_elf_link_setup_gnu_properties): Adding the - GNU_PROPERTY_X86_ISA_1_NEEDED, instead of - GNU_PROPERTY_X86_ISA_1_USED, property. - -ld/ - - PR ld/23486 - * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. - * testsuite/ld-x86-64/x86-64.exp: Likewise. - * testsuite/ld-i386/pr23486a.d: New file. - * testsuite/ld-i386/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486a.d: Likewise. - * testsuite/ld-x86-64/pr23486a.s: Likewise. - * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486b.s: Likewise. - * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". - * testsuite/ld-i386/property-4.r: Likewise. - * testsuite/ld-i386/property-5.r: Likewise. - * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. - * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. - * testsuite/ld-x86-64/property-3.r: Likewise. - * testsuite/ld-x86-64/property-4.r: Likewise. - * testsuite/ld-x86-64/property-5.r: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. - -(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) -Signed-off-by: Norbert Lange ---- - bfd/ChangeLog | 9 +++++++ - bfd/elfxx-x86.c | 25 ++++++++++++++---- - ld/ChangeLog | 32 +++++++++++++++++++++++ - ld/testsuite/ld-i386/i386.exp | 2 ++ - ld/testsuite/ld-i386/pr23486a.d | 10 +++++++ - ld/testsuite/ld-i386/pr23486b.d | 10 +++++++ - ld/testsuite/ld-i386/property-3.r | 1 - - ld/testsuite/ld-i386/property-4.r | 1 - - ld/testsuite/ld-i386/property-5.r | 1 - - ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++-- - ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++-- - ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++-- - ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++-- - ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 +++++++ - ld/testsuite/ld-x86-64/pr23486a.d | 10 +++++++ - ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++++++ - ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 +++++++ - ld/testsuite/ld-x86-64/pr23486b.d | 10 +++++++ - ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++++++ - ld/testsuite/ld-x86-64/property-3.r | 1 - - ld/testsuite/ld-x86-64/property-4.r | 1 - - ld/testsuite/ld-x86-64/property-5.r | 1 - - ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d | 5 ++-- - ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++-- - ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ - 31 files changed, 211 insertions(+), 47 deletions(-) - create mode 100644 ld/testsuite/ld-i386/pr23486a.d - create mode 100644 ld/testsuite/ld-i386/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s - create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 2e4ff88..7ccfd25 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - switch (pr_type) - { - case GNU_PROPERTY_X86_ISA_1_USED: -+ if (aprop == NULL || bprop == NULL) -+ { -+ /* Only one of APROP and BPROP can be NULL. */ -+ if (aprop != NULL) -+ { -+ /* Remove this property since the other input file doesn't -+ have it. */ -+ aprop->pr_kind = property_remove; -+ updated = TRUE; -+ } -+ break; -+ } -+ goto or_property; -+ - case GNU_PROPERTY_X86_ISA_1_NEEDED: - if (aprop != NULL && bprop != NULL) - { -+or_property: - number = aprop->u.number; - aprop->u.number = number | bprop->u.number; -- /* Remove the property if ISA bits are empty. */ -+ /* Remove the property if all bits are empty. */ - if (aprop->u.number == 0) - { - aprop->pr_kind = property_remove; -@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - { - if (aprop->u.number == 0) - { -- /* Remove APROP if ISA bits are empty. */ -+ /* Remove APROP if all bits are empty. */ - aprop->pr_kind = property_remove; - updated = TRUE; - } - } - else - { -- /* Return TRUE if APROP is NULL and ISA bits of BPROP -+ /* Return TRUE if APROP is NULL and all bits of BPROP - aren't empty to indicate that BPROP should be added - to ABFD. */ - updated = bprop->u.number != 0; -@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties - { - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by -- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ - prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_USED, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, - 4); - prop->u.number = GNU_PROPERTY_X86_ISA_1_486; - prop->pr_kind = property_number; -diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp -index 6d794fe..78dad02 100644 ---- a/ld/testsuite/ld-i386/i386.exp -+++ b/ld/testsuite/ld-i386/i386.exp -@@ -462,6 +462,8 @@ run_dump_test "pr23189" - run_dump_test "pr23194" - run_dump_test "pr23372a" - run_dump_test "pr23372b" -+run_dump_test "pr23486a" -+run_dump_test "pr23486b" - - if { !([istarget "i?86-*-linux*"] - || [istarget "i?86-*-gnu*"] -diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d -new file mode 100644 -index 0000000..41a6dcf ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486a.s -+#source: ../ld-x86-64/pr23486b.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d -new file mode 100644 -index 0000000..08019b7 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486b.s -+#source: ../ld-x86-64/pr23486a.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r -index 0ed91f5..d03203c 100644 ---- a/ld/testsuite/ld-i386/property-3.r -+++ b/ld/testsuite/ld-i386/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r -index cb2bc15..da295eb 100644 ---- a/ld/testsuite/ld-i386/property-4.r -+++ b/ld/testsuite/ld-i386/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r -index 5529650..e414159 100644 ---- a/ld/testsuite/ld-i386/property-5.r -+++ b/ld/testsuite/ld-i386/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d -index 4bb35b0..0aedea1 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d -index 418d58a..bd69ac6 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d -index e261038..76d2a39 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d -index 25f3d23..e770ecf 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d -new file mode 100644 -index 0000000..6d9fa68 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d -new file mode 100644 -index 0000000..dc2b7bf ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s -new file mode 100644 -index 0000000..a07d0c7 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_USED */ -+ .long 0xc0000000 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0xa -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d -new file mode 100644 -index 0000000..0445e69 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486b.s -+#source: pr23486a.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d -new file mode 100644 -index 0000000..dc2b7bf ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s -new file mode 100644 -index 0000000..c5167ee ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ -+ .long 0xc0000001 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0x3 -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r -index 0ed91f5..d03203c 100644 ---- a/ld/testsuite/ld-x86-64/property-3.r -+++ b/ld/testsuite/ld-x86-64/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r -index cb2bc15..da295eb 100644 ---- a/ld/testsuite/ld-x86-64/property-4.r -+++ b/ld/testsuite/ld-x86-64/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r -index 5529650..e414159 100644 ---- a/ld/testsuite/ld-x86-64/property-5.r -+++ b/ld/testsuite/ld-x86-64/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -index 011426f..4cec728 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -index 1b4229a..a8df49a 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -index 290ed6a..c112626 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -index 1142e03..f10dffd 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -index 819542d..0147a3c 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -index 4c5d0e0..1f8c2dc 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -index ba181e0..7ca2539 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -index 5216f38..f66a40e 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index 6edb9e8..ae21e55 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp -@@ -403,6 +403,10 @@ run_dump_test "pr23372a" - run_dump_test "pr23372a-x32" - run_dump_test "pr23372b" - run_dump_test "pr23372b-x32" -+run_dump_test "pr23486a" -+run_dump_test "pr23486a-x32" -+run_dump_test "pr23486b" -+run_dump_test "pr23486b-x32" - - if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { - return --- -2.9.3 - diff --git a/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch deleted file mode 100644 index 356914c99..000000000 --- a/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Sat, 11 Aug 2018 06:41:33 -0700 -Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property - -Existing properties may be removed during property merging. We avoid -adding X86_ISA_1_NEEDED property only if existing properties won't be -removed. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't - add X86_ISA_1_NEEDED property only if existing properties won't - be removed. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/dummy.s: New file. - * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. - * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. - -(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) -Signed-off-by: Norbert Lange ---- - bfd/ChangeLog | 7 +++++++ - bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ - ld/ChangeLog | 7 +++++++ - ld/testsuite/ld-elf/dummy.s | 1 + - ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 2 +- - 6 files changed, 66 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-elf/dummy.s - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ccfd25..2d8f7b6 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties - prop->pr_kind = property_number; - } - else if (has_text -- && elf_properties (ebfd) == NULL - && elf_tdata (info->output_bfd)->o->build_id.sec == NULL - && !htab->elf.dynamic_sections_created - && !info->traditional_format -@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by - adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_NEEDED, -- 4); -- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -- prop->pr_kind = property_number; -+ elf_property_list *list; -+ bfd_boolean need_property = TRUE; -+ -+ for (list = elf_properties (ebfd); list; list = list->next) -+ switch (list->property.pr_type) -+ { -+ case GNU_PROPERTY_STACK_SIZE: -+ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: -+ case GNU_PROPERTY_X86_ISA_1_NEEDED: -+ /* These properties won't be removed during merging. */ -+ need_property = FALSE; -+ break; -+ } -+ -+ if (need_property) -+ { -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - } - - /* Create the GNU property note section if needed. */ -diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s -new file mode 100644 -index 0000000..403f980 ---- /dev/null -+++ b/ld/testsuite/ld-elf/dummy.s -@@ -0,0 +1 @@ -+# Dummy -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -index bdf40c6..d94abc1 100644 ---- a/ld/testsuite/ld-elf/linux-x86.S -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -61,3 +61,31 @@ syscall: - ret /* Return to caller. */ - .size syscall, .-syscall - .section .note.GNU-stack,"",@progbits -+ -+ .section ".note.gnu.property", "a" -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+ .long 1f - 0f /* name length */ -+ .long 5f - 2f /* data length */ -+ .long 5 /* note type */ -+0: .asciz "GNU" /* vendor name */ -+1: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+2: .long 0xc0000002 /* pr_type. */ -+ .long 4f - 3f /* pr_datasz. */ -+3: -+ .long 0x2 -+4: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+5: -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -index 36217c6..f6f5a80 100644 ---- a/ld/testsuite/ld-elf/linux-x86.exp -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ - "Run PR ld/23428 test" \ - "--no-dynamic-linker -z separate-code" \ - "" \ -- { linux-x86.S pr23428.c } \ -+ { linux-x86.S pr23428.c dummy.s } \ - "pr23428" \ - "pass.out" \ - "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ --- -2.9.3 - diff --git a/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch deleted file mode 100644 index b80e1fa7c..000000000 --- a/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 278989f23735aa501be1052e085540c75c126dbb Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 28 Mar 2019 17:03:57 -0700 -Subject: [PATCH] bfd: xtensa: fix shrink_dynamic_reloc_sections for - export-dynamic - -shrink_dynamic_reloc_sections must remove PLT entry that was created for -an undefined weak symbol in the presence of --export-dynamic option when -relaxation coalesces literals pointing to that symbol. This fixes the -following assertion: - - ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at - elf32-xtensa.c:3292 in elf_xtensa_finish_dynamic_sections - -2019-03-28 Max Filippov -bfd/ - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Add - info->export_dynamic to the conditional. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index c3df3d6db756..37ea200eea74 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10083,7 +10083,8 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - && (input_section->flags & SEC_ALLOC) != 0 - && (dynamic_symbol || bfd_link_pic (info)) - && (!h || h->root.type != bfd_link_hash_undefweak -- || (dynamic_symbol && bfd_link_dll (info)))) -+ || (dynamic_symbol -+ && (bfd_link_dll (info) || info->export_dynamic)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.11.0 - diff --git a/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch deleted file mode 100644 index ed617bcaf..000000000 --- a/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch +++ /dev/null @@ -1,294 +0,0 @@ -From 0dbdfb7918d0b0cfcb8883b24c1291574bf5bb7c Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 2 Apr 2019 14:32:42 -0700 -Subject: [PATCH] gas: use literals/const16 for xtensa loop relaxation - -Loop opcode relaxation that uses addi/addmi doesn't work well with other -relaxations that may cause code movement. Instead of encoding fixed loop -end offset in the relaxed sequence use l32r or a pair of const16 to load -loop end address. This way the address of the loop end gets a relocation -record and it gets updated appropriately. - -gas/ -2019-04-02 Max Filippov - - * config/tc-xtensa.c (convert_frag_immed): Drop - convert_frag_immed_finish_loop invocation. - (convert_frag_immed_finish_loop): Drop declaration and - definition. - * config/xtensa-relax.c (widen_spec_list): Replace loop - widening that uses addi/addmi with widening that uses l32r - and const16. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 120 ---------------------------------------------- - gas/config/xtensa-relax.c | 77 ++++++++++++++++++++--------- - 2 files changed, 55 insertions(+), 142 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 3bdbbc931cfc..0cc06361cf6f 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -10668,7 +10668,6 @@ convert_frag_fill_nop (fragS *fragP) - static fixS *fix_new_exp_in_seg - (segT, subsegT, fragS *, int, int, expressionS *, int, - bfd_reloc_code_real_type); --static void convert_frag_immed_finish_loop (segT, fragS *, TInsn *); - - static void - convert_frag_immed (segT segP, -@@ -10910,9 +10909,6 @@ convert_frag_immed (segT segP, - } - } - -- if (expanded && xtensa_opcode_is_loop (isa, orig_tinsn.opcode) == 1) -- convert_frag_immed_finish_loop (segP, fragP, &orig_tinsn); -- - if (expanded && is_direct_call_opcode (orig_tinsn.opcode)) - { - /* Add an expansion note on the expanded instruction. */ -@@ -10949,122 +10945,6 @@ fix_new_exp_in_seg (segT new_seg, - } - - --/* Relax a loop instruction so that it can span loop >256 bytes. -- -- loop as, .L1 -- .L0: -- rsr as, LEND -- wsr as, LBEG -- addi as, as, lo8 (label-.L1) -- addmi as, as, mid8 (label-.L1) -- wsr as, LEND -- isync -- rsr as, LCOUNT -- addi as, as, 1 -- .L1: -- <> -- label: --*/ -- --static void --convert_frag_immed_finish_loop (segT segP, fragS *fragP, TInsn *tinsn) --{ -- TInsn loop_insn; -- TInsn addi_insn; -- TInsn addmi_insn; -- unsigned long target; -- static xtensa_insnbuf insnbuf = NULL; -- unsigned int loop_length, loop_length_hi, loop_length_lo; -- xtensa_isa isa = xtensa_default_isa; -- addressT loop_offset; -- addressT addi_offset = 9; -- addressT addmi_offset = 12; -- fragS *next_fragP; -- int target_count; -- -- if (!insnbuf) -- insnbuf = xtensa_insnbuf_alloc (isa); -- -- /* Get the loop offset. */ -- loop_offset = get_expanded_loop_offset (tinsn->opcode); -- -- /* Validate that there really is a LOOP at the loop_offset. Because -- loops are not bundleable, we can assume that the instruction will be -- in slot 0. */ -- tinsn_from_chars (&loop_insn, fragP->fr_opcode + loop_offset, 0); -- tinsn_immed_from_frag (&loop_insn, fragP, 0); -- -- gas_assert (xtensa_opcode_is_loop (isa, loop_insn.opcode) == 1); -- addi_offset += loop_offset; -- addmi_offset += loop_offset; -- -- gas_assert (tinsn->ntok == 2); -- if (tinsn->tok[1].X_op == O_constant) -- target = tinsn->tok[1].X_add_number; -- else if (tinsn->tok[1].X_op == O_symbol) -- { -- /* Find the fragment. */ -- symbolS *sym = tinsn->tok[1].X_add_symbol; -- gas_assert (S_GET_SEGMENT (sym) == segP -- || S_GET_SEGMENT (sym) == absolute_section); -- target = (S_GET_VALUE (sym) + tinsn->tok[1].X_add_number); -- } -- else -- { -- as_bad (_("invalid expression evaluation type %d"), tinsn->tok[1].X_op); -- target = 0; -- } -- -- loop_length = target - (fragP->fr_address + fragP->fr_fix); -- loop_length_hi = loop_length & ~0x0ff; -- loop_length_lo = loop_length & 0x0ff; -- if (loop_length_lo >= 128) -- { -- loop_length_lo -= 256; -- loop_length_hi += 256; -- } -- -- /* Because addmi sign-extends the immediate, 'loop_length_hi' can be at most -- 32512. If the loop is larger than that, then we just fail. */ -- if (loop_length_hi > 32512) -- as_bad_where (fragP->fr_file, fragP->fr_line, -- _("loop too long for LOOP instruction")); -- -- tinsn_from_chars (&addi_insn, fragP->fr_opcode + addi_offset, 0); -- gas_assert (addi_insn.opcode == xtensa_addi_opcode); -- -- tinsn_from_chars (&addmi_insn, fragP->fr_opcode + addmi_offset, 0); -- gas_assert (addmi_insn.opcode == xtensa_addmi_opcode); -- -- set_expr_const (&addi_insn.tok[2], loop_length_lo); -- tinsn_to_insnbuf (&addi_insn, insnbuf); -- -- fragP->tc_frag_data.is_insn = TRUE; -- xtensa_insnbuf_to_chars -- (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addi_offset, 0); -- -- set_expr_const (&addmi_insn.tok[2], loop_length_hi); -- tinsn_to_insnbuf (&addmi_insn, insnbuf); -- xtensa_insnbuf_to_chars -- (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addmi_offset, 0); -- -- /* Walk through all of the frags from here to the loop end -- and mark them as no_transform to keep them from being modified -- by the linker. If we ever have a relocation for the -- addi/addmi of the difference of two symbols we can remove this. */ -- -- target_count = 0; -- for (next_fragP = fragP; next_fragP != NULL; -- next_fragP = next_fragP->fr_next) -- { -- next_fragP->tc_frag_data.is_no_transform = TRUE; -- if (next_fragP->tc_frag_data.is_loop_target) -- target_count++; -- if (target_count == 2) -- break; -- } --} -- - - /* A map that keeps information on a per-subsegment basis. This is - maintained during initial assembly, but is invalid once the -diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c -index cb296ed85ed2..daf15d52c259 100644 ---- a/gas/config/xtensa-relax.c -+++ b/gas/config/xtensa-relax.c -@@ -87,13 +87,7 @@ - when the first and second operands are not the same as specified - by the "| %at!=%as" precondition clause. - {"l32i %at,%as,%imm | %at!=%as", -- "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"} -- -- There is special case for loop instructions here, but because we do -- not currently have the ability to represent the difference of two -- symbols, the conversion requires special code in the assembler to -- write the operands of the addi/addmi pair representing the -- difference of the old and new loop end label. */ -+ "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"} */ - - #include "as.h" - #include "xtensa-isa.h" -@@ -306,44 +300,83 @@ static string_pattern_pair widen_spec_list[] = - {"l32i %at,%as,%imm | %at!=%as ? IsaUseConst16", - "const16 %at,HI16U(%imm); const16 %at,LOW16U(%imm); add %at,%at,%as; l32i %at,%at,0"}, - -- /* This is only PART of the loop instruction. In addition, -- hardcoded into its use is a modification of the final operand in -- the instruction in bytes 9 and 12. */ -- {"loop %as,%label | %as!=1 ? IsaUseLoops", -+ /* Widening loops with literals. */ -+ {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "loop %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "beqz %as,%label;" -+ "bltz %as,%label;" -+ "loopgtz %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "beqz %as,%label;" -+ "loopnez %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ -+ /* Widening loops with const16. */ -+ {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "loop %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, -- {"loopgtz %as,%label | %as!=1 ? IsaUseLoops", -+ {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "beqz %as,%label;" - "bltz %as,%label;" - "loopgtz %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, -- {"loopnez %as,%label | %as!=1 ? IsaUseLoops", -+ {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "beqz %as,%label;" - "loopnez %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, - - /* Relaxing to wide branches. Order is important here. With wide --- -2.11.0 - diff --git a/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch b/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch deleted file mode 100644 index b4bbc27b3..000000000 --- a/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 471702ac4a57878a06e8167f063274cf413e548d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 8 Apr 2019 13:47:18 -0700 -Subject: [PATCH] xtensa: gas: put .literal_position at section start - -Provide literal position at the beginning of each section for literal -space reserved by relaxations when text-section-literals or -auto-litpools options are used. Remove code that adds fill frag to the -literal section for every .literal_position directive to avoid creation -of empty literal sections. - -Fix auto-litpools tests that got literal pool address changes. - -gas/ -2019-04-11 Max Filippov - - * config/tc-xtensa.c (xtensa_is_init_fini): Add declaration. - (xtensa_mark_literal_pool_location): Don't add fill frag to literal - section that records literal pool location. - (md_begin): Call xtensa_mark_literal_pool_location when text - section literals or auto litpools are used. - (xtensa_elf_section_change_hook): Call - xtensa_mark_literal_pool_location when text section literals or - auto litpools are used, there's no literal pool location defined - for the current section and it's not .init or .fini. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 22 +++++++++------------- - 1 file changed, 9 insertions(+), 13 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 0cc06361cf6f..6a80e76fed8c 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -497,6 +497,7 @@ static fixS *xg_append_jump (fragS *fragP, symbolS *sym, offsetT offset); - static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean); - static bfd_boolean auto_litpools = FALSE; - static int auto_litpool_limit = 0; -+static bfd_boolean xtensa_is_init_fini (segT seg); - - /* Alignment Functions. */ - -@@ -4797,7 +4798,6 @@ xtensa_mark_literal_pool_location (void) - { - /* Any labels pointing to the current location need - to be adjusted to after the literal pool. */ -- emit_state s; - fragS *pool_location; - - if (use_literal_section) -@@ -4818,19 +4818,7 @@ xtensa_mark_literal_pool_location (void) - RELAX_LITERAL_POOL_END, NULL, 0, NULL); - xtensa_set_frag_assembly_state (frag_now); - -- /* Now put a frag into the literal pool that points to this location. */ - set_literal_pool_location (now_seg, pool_location); -- xtensa_switch_to_non_abs_literal_fragment (&s); -- frag_align (2, 0, 0); -- record_alignment (now_seg, 2); -- -- /* Close whatever frag is there. */ -- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -- xtensa_set_frag_assembly_state (frag_now); -- frag_now->tc_frag_data.literal_frag = pool_location; -- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -- xtensa_restore_emit_state (&s); -- xtensa_set_frag_assembly_state (frag_now); - } - - -@@ -5334,6 +5322,9 @@ md_begin (void) - /* Set up the assembly state. */ - if (!frag_now->tc_frag_data.is_assembly_state_set) - xtensa_set_frag_assembly_state (frag_now); -+ -+ if (!use_literal_section) -+ xtensa_mark_literal_pool_location (); - } - - -@@ -5933,6 +5924,11 @@ xtensa_elf_section_change_hook (void) - /* Set up the assembly state. */ - if (!frag_now->tc_frag_data.is_assembly_state_set) - xtensa_set_frag_assembly_state (frag_now); -+ -+ if (!use_literal_section -+ && seg_info (now_seg)->tc_segment_info_data.literal_pool_loc == NULL -+ && !xtensa_is_init_fini (now_seg)) -+ xtensa_mark_literal_pool_location (); - } - - --- -2.11.0 - diff --git a/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch deleted file mode 100644 index f499426b7..000000000 --- a/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 4 Mar 2020 14:54:27 -0800 -Subject: [PATCH] bfd: xtensa: fix PR ld/25630 - -bfd/ -2020-03-05 Max Filippov - - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic - relocation sections for any removed reference to a dynamic symbol. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 12ff9f772aaf..65e14d87940c 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - - if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) - && (input_section->flags & SEC_ALLOC) != 0 -- && (dynamic_symbol || bfd_link_pic (info)) -- && (!h || h->root.type != bfd_link_hash_undefweak -- || (dynamic_symbol -- && (bfd_link_dll (info) || info->export_dynamic)))) -+ && (dynamic_symbol -+ || (bfd_link_pic (info) -+ && (!h || h->root.type != bfd_link_hash_undefweak)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.20.1 - diff --git a/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch deleted file mode 100644 index 8ca8c965d..000000000 --- a/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch +++ /dev/null @@ -1,376 +0,0 @@ -From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 19 Apr 2020 19:04:41 -0700 -Subject: [PATCH] xtensa: fix PR ld/25861 - -Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences -(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} -for negative differences (subtracted symbol follows diminished symbol). -Don't generate XTENSA_DIFF relocations in the assembler, generate -XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. - -Handle XTENSA_DIFF in BFD for compatibility with old object files. -Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value -as unsigned. - -2020-04-22 Max Filippov -bfd/ - * bfd-in2.h: Regenerated. - * elf32-xtensa.c (elf_howto_table): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) - (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and - R_XTENSA_NDIFF{8,16,32}. - * libbfd.h (bfd_reloc_code_real_names): Add names for - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} - and BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -binutils/ - * readelf.c (is_none_reloc): Recognize - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -gas/ - * config/tc-xtensa.c (md_apply_fix): Replace - BFD_RELOC_XTENSA_DIFF{8,16,32} generation with - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. - * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 - with BFD_RELOC_XTENSA_PDIFF16 in the expected output. - -include/ - * elf/xtensa.h (elf_xtensa_reloc_type): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - -Signed-off-by: Max Filippov ---- -Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 - - bfd/bfd-in2.h | 20 ++++++- - bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- - bfd/libbfd.h | 6 ++ - bfd/reloc.c | 24 ++++++++ - binutils/readelf.c | 8 ++- - gas/config/tc-xtensa.c | 12 +++- - gas/testsuite/gas/xtensa/loc.d | 2 +- - include/elf/xtensa.h | 6 ++ - 11 files changed, 160 insertions(+), 7 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 37114607b515..be6a30f57955 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ - PLT entries. Otherwise, this is just a generic 32-bit relocation. */ - BFD_RELOC_XTENSA_PLT, - --/* Xtensa relocations to mark the difference of two local symbols. -+/* Xtensa relocations for backward compatibility. These have been replaced -+by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. -+Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference - assuming no relaxation. The relocation encodes the position of the -@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ - BFD_RELOC_XTENSA_TLS_ARG, - BFD_RELOC_XTENSA_TLS_CALL, - -+/* Xtensa relocations to mark the difference of two local symbols. -+These are only needed to support linker relaxation and can be ignored -+when not relaxing. The field is set to the value of the difference -+assuming no relaxation. The relocation encodes the position of the -+subtracted symbol so the linker can determine whether to adjust the field -+value. PDIFF relocations are used for positive differences, NDIFF -+relocations are used for negative differences. The difference value -+is treated as unsigned with these relocation types, giving full -+8/16 value ranges. */ -+ BFD_RELOC_XTENSA_PDIFF8, -+ BFD_RELOC_XTENSA_PDIFF16, -+ BFD_RELOC_XTENSA_PDIFF32, -+ BFD_RELOC_XTENSA_NDIFF8, -+ BFD_RELOC_XTENSA_NDIFF16, -+ BFD_RELOC_XTENSA_NDIFF32, -+ - /* 8 bit signed offset in (ix+d) or (iy+d). */ - BFD_RELOC_Z80_DISP8, - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 473a9d76f289..fded42d52a9a 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = - HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, - bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", - FALSE, 0, 0, FALSE), -+ -+ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), -+ -+ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), - }; - - #if DEBUG_GEN_RELOC -@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - TRACE ("BFD_RELOC_XTENSA_DIFF32"); - return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; - -+ case BFD_RELOC_XTENSA_PDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; -+ - case BFD_RELOC_XTENSA_RTLD: - TRACE ("BFD_RELOC_XTENSA_RTLD"); - return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; -@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, - case R_XTENSA_DIFF8: - case R_XTENSA_DIFF16: - case R_XTENSA_DIFF32: -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF8: -+ case R_XTENSA_NDIFF16: -+ case R_XTENSA_NDIFF32: - case R_XTENSA_TLS_FUNC: - case R_XTENSA_TLS_ARG: - case R_XTENSA_TLS_CALL: -@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - if (r_type == R_XTENSA_DIFF8 - || r_type == R_XTENSA_DIFF16 -- || r_type == R_XTENSA_DIFF32) -+ || r_type == R_XTENSA_DIFF32 -+ || r_type == R_XTENSA_PDIFF8 -+ || r_type == R_XTENSA_PDIFF16 -+ || r_type == R_XTENSA_PDIFF32 -+ || r_type == R_XTENSA_NDIFF8 -+ || r_type == R_XTENSA_NDIFF16 -+ || r_type == R_XTENSA_NDIFF32) - { - bfd_signed_vma diff_value = 0; - bfd_vma new_end_offset, diff_mask = 0; -@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_value = -+ bfd_get_8 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_value = -+ bfd_get_16 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_value = -+ bfd_get_32 (abfd, &contents[old_source_offset]); -+ break; - } - -+ if (r_type >= R_XTENSA_NDIFF8 -+ && r_type <= R_XTENSA_NDIFF32) -+ diff_value = -diff_value; -+ - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, - r_rel.target_offset + diff_value); -@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; -+ bfd_put_8 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; -+ bfd_put_16 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; -+ bfd_put_32 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; - } - - /* Check for overflow. Sign bits must be all zeroes or all ones */ -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 3c184fcadadf..989f4bc0b595 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_XTENSA_TLS_FUNC", - "BFD_RELOC_XTENSA_TLS_ARG", - "BFD_RELOC_XTENSA_TLS_CALL", -+ "BFD_RELOC_XTENSA_PDIFF8", -+ "BFD_RELOC_XTENSA_PDIFF16", -+ "BFD_RELOC_XTENSA_PDIFF32", -+ "BFD_RELOC_XTENSA_NDIFF8", -+ "BFD_RELOC_XTENSA_NDIFF16", -+ "BFD_RELOC_XTENSA_NDIFF32", - "BFD_RELOC_Z80_DISP8", - "BFD_RELOC_Z80_BYTE0", - "BFD_RELOC_Z80_BYTE1", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index c4dec86d1d46..f5df8e2ab3eb 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6556,6 +6556,8 @@ ENUMX - ENUMX - BFD_RELOC_XTENSA_DIFF32 - ENUMDOC -+ Xtensa relocations for backward compatibility. These have been replaced -+ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. - Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference -@@ -6668,6 +6670,28 @@ ENUMX - BFD_RELOC_XTENSA_TLS_CALL - ENUMDOC - Xtensa TLS relocations. -+ENUM -+ BFD_RELOC_XTENSA_PDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF32 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF32 -+ENUMDOC -+ Xtensa relocations to mark the difference of two local symbols. -+ These are only needed to support linker relaxation and can be ignored -+ when not relaxing. The field is set to the value of the difference -+ assuming no relaxation. The relocation encodes the position of the -+ subtracted symbol so the linker can determine whether to adjust the field -+ value. PDIFF relocations are used for positive differences, NDIFF -+ relocations are used for negative differences. The difference value -+ is treated as unsigned with these relocation types, giving full -+ 8/16 value ranges. - - ENUM - BFD_RELOC_Z80_DISP8 -diff --git a/binutils/readelf.c b/binutils/readelf.c -index d4756c93b345..800918f901c8 100644 ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 17 /* R_XTENSA_DIFF8. */ - || reloc_type == 18 /* R_XTENSA_DIFF16. */ -- || reloc_type == 19 /* R_XTENSA_DIFF32. */); -+ || reloc_type == 19 /* R_XTENSA_DIFF32. */ -+ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ -+ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ -+ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ -+ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ -+ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ -+ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); - } - return FALSE; - } -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 71d4d94a8d7d..ee75c13548ff 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - case BFD_RELOC_8: - if (fixP->fx_subsy) - { -+ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset -+ < S_GET_VALUE (fixP->fx_subsy); -+ - switch (fixP->fx_r_type) - { - case BFD_RELOC_8: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; - fixP->fx_signed = 0; - break; - case BFD_RELOC_16: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; - fixP->fx_signed = 0; - break; - case BFD_RELOC_32: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; - fixP->fx_signed = 0; - break; - default: -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -index 71983cc90055..8fb3425999d5 100644 ---- a/gas/testsuite/gas/xtensa/loc.d -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -6,5 +6,5 @@ - - RELOCATION RECORDS FOR \[\.debug_line\]: - #... --.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 - #... -diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h -index 2eb5e4e52941..bd5c80d13777 100644 ---- a/include/elf/xtensa.h -+++ b/include/elf/xtensa.h -@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) - RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) - RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) - RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) -+ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) -+ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) -+ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) -+ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) -+ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) -+ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) - END_RELOC_NUMBERS (R_XTENSA_max) - - /* Processor-specific flags for the ELF header e_flags field. */ --- -2.20.1 - diff --git a/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch deleted file mode 100644 index 28f17d7c5..000000000 --- a/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 25 Apr 2020 00:40:25 -0700 -Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 - -Fields marked with XTENSA_NDIFF relocations are not negated, they only -have sign bits removed. Don't negate their values when relaxation is -performed. Don't add sign bits when the value is zero. Report overflow -when the result has negative sign but all significant bits are zero. - -2020-04-29 Max Filippov -bfd/ - * elf32-xtensa.c (relax_section): Don't negate diff_value for - XTENSA_NDIFF relocations. Don't add sign bits whe diff_value - equals 0. Report overflow when the result has negative sign but - all significant bits are zero. - -Signed-off-by: Max Filippov -Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 ---- - - bfd/elf32-xtensa.c | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index fded42d52a9a..4327b027911f 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -+ diff_mask = 0x7f; - diff_value = - bfd_get_signed_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -+ diff_mask = 0x7fff; - diff_value = - bfd_get_signed_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -+ diff_mask = 0x7fffffff; - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; - diff_value = - bfd_get_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; - diff_value = - bfd_get_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; - diff_value = - bfd_get_32 (abfd, &contents[old_source_offset]); - break; - } - - if (r_type >= R_XTENSA_NDIFF8 -- && r_type <= R_XTENSA_NDIFF32) -- diff_value = -diff_value; -+ && r_type <= R_XTENSA_NDIFF32 -+ && diff_value) -+ diff_value |= ~diff_mask; - - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, -@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -- diff_mask = 0x7f; - bfd_put_signed_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -- diff_mask = 0x7fff; - bfd_put_signed_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -- diff_mask = 0x7fffffff; - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -- diff_mask = 0xff; - bfd_put_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -- diff_mask = 0xffff; - bfd_put_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -- diff_mask = 0xffffffff; - bfd_put_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - } - -- /* Check for overflow. Sign bits must be all zeroes or all ones */ -- if ((diff_value & ~diff_mask) != 0 && -- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) -+ /* Check for overflow. Sign bits must be all zeroes or -+ all ones. When sign bits are all ones diff_value -+ may not be zero. */ -+ if (((diff_value & ~diff_mask) != 0 -+ && (diff_value & ~diff_mask) != ~diff_mask) -+ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) - { - (*link_info->callbacks->reloc_dangerous) - (link_info, _("overflow after relaxation"), --- -2.20.1 - diff --git a/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch b/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch deleted file mode 100644 index 046d0d6f3..000000000 --- a/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 7a8213503e25998e2610d5a8c0b19eefb5e41596 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 30 Nov 2019 03:12:37 +0100 -Subject: [PATCH] Revert "PR24311, FAIL: S-records with constructors" - -This reverts commit ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e. - -Revert this patch since it prevent booting a sh4 system under -Qemu as reported on the Binutils mailing list [1]. -This commit is not related to sh4, it's weird that it is the -only affected architecture. - -[1] https://sourceware.org/ml/binutils/2019-10/msg00105.html -[2] https://sourceware.org/ml/binutils/2019-11/msg00407.html - -Signed-off-by: Romain Naour ---- - bfd/merge.c | 52 ++++++++++++++++++++++------------------------------ - 1 file changed, 22 insertions(+), 30 deletions(-) - -diff --git a/bfd/merge.c b/bfd/merge.c -index 632c8523903..fb7c0858beb 100644 ---- a/bfd/merge.c -+++ b/bfd/merge.c -@@ -621,7 +621,7 @@ is_suffix (const struct sec_merge_hash_entry *A, - - /* This is a helper function for _bfd_merge_sections. It attempts to - merge strings matching suffixes of longer strings. */ --static struct sec_merge_sec_info * -+static bfd_boolean - merge_strings (struct sec_merge_info *sinfo) - { - struct sec_merge_hash_entry **array, **a, *e; -@@ -633,7 +633,7 @@ merge_strings (struct sec_merge_info *sinfo) - amt = sinfo->htab->size * sizeof (struct sec_merge_hash_entry *); - array = (struct sec_merge_hash_entry **) bfd_malloc (amt); - if (array == NULL) -- return NULL; -+ return FALSE; - - for (e = sinfo->htab->first, a = array; e; e = e->next) - if (e->alignment) -@@ -703,6 +703,11 @@ merge_strings (struct sec_merge_info *sinfo) - } - } - secinfo->sec->size = size; -+ if (secinfo->sec->alignment_power != 0) -+ { -+ bfd_size_type align = (bfd_size_type) 1 << secinfo->sec->alignment_power; -+ secinfo->sec->size = (secinfo->sec->size + align - 1) & -align; -+ } - - /* And now adjust the rest, removing them from the chain (but not hashtable) - at the same time. */ -@@ -719,7 +724,7 @@ merge_strings (struct sec_merge_info *sinfo) - e->u.index = e->u.suffix->u.index + (e->u.suffix->len - e->len); - } - } -- return secinfo; -+ return TRUE; - } - - /* This function is called once after all SEC_MERGE sections are registered -@@ -735,8 +740,7 @@ _bfd_merge_sections (bfd *abfd, - - for (sinfo = (struct sec_merge_info *) xsinfo; sinfo; sinfo = sinfo->next) - { -- struct sec_merge_sec_info *secinfo; -- bfd_size_type align; -+ struct sec_merge_sec_info * secinfo; - - if (! sinfo->chain) - continue; -@@ -747,7 +751,6 @@ _bfd_merge_sections (bfd *abfd, - secinfo->next = NULL; - - /* Record the sections into the hash table. */ -- align = 1; - for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) - if (secinfo->sec->flags & SEC_EXCLUDE) - { -@@ -755,25 +758,18 @@ _bfd_merge_sections (bfd *abfd, - if (remove_hook) - (*remove_hook) (abfd, secinfo->sec); - } -- else -- { -- if (!record_section (sinfo, secinfo)) -- return FALSE; -- if (align) -- { -- align = (bfd_size_type) 1 << secinfo->sec->alignment_power; -- if ((secinfo->sec->size & (align - 1)) != 0) -- align = 0; -- } -- } -+ else if (! record_section (sinfo, secinfo)) -+ return FALSE; -+ -+ if (secinfo) -+ continue; - - if (sinfo->htab->first == NULL) - continue; - - if (sinfo->htab->strings) - { -- secinfo = merge_strings (sinfo); -- if (!secinfo) -+ if (!merge_strings (sinfo)) - return FALSE; - } - else -@@ -793,7 +789,8 @@ _bfd_merge_sections (bfd *abfd, - e->secinfo->first_str = e; - size = 0; - } -- size = (size + e->alignment - 1) & ~((bfd_vma) e->alignment - 1); -+ size = (size + e->alignment - 1) -+ & ~((bfd_vma) e->alignment - 1); - e->u.index = size; - size += e->len; - secinfo = e->secinfo; -@@ -801,16 +798,11 @@ _bfd_merge_sections (bfd *abfd, - secinfo->sec->size = size; - } - -- /* If the input sections were padded according to their alignments, -- then pad the output too. */ -- if (align) -- secinfo->sec->size = (secinfo->sec->size + align - 1) & -align; -- -- /* Finally remove all input sections which have not made it into -- the hash table at all. */ -- for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) -- if (secinfo->first_str == NULL) -- secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP; -+ /* Finally remove all input sections which have not made it into -+ the hash table at all. */ -+ for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) -+ if (secinfo->first_str == NULL) -+ secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP; - } - - return TRUE; --- -2.23.0 - diff --git a/buildroot/package/binutils/2.31.1/0001-sh-conf.patch b/buildroot/package/binutils/2.34/0001-sh-conf.patch similarity index 82% rename from buildroot/package/binutils/2.31.1/0001-sh-conf.patch rename to buildroot/package/binutils/2.34/0001-sh-conf.patch index 9e77c12b6..6f873691f 100644 --- a/buildroot/package/binutils/2.31.1/0001-sh-conf.patch +++ b/buildroot/package/binutils/2.34/0001-sh-conf.patch @@ -1,4 +1,4 @@ -From ac36af7d97d7920512068316fac6159aead97a01 Mon Sep 17 00:00:00 2001 +From a4292f2852027008714c5ccdbab77af0b36f3928 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:38:13 +0100 Subject: [PATCH] sh-conf @@ -8,7 +8,7 @@ fix that up too.. now we're able to actually build a real toolchain for sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more inept targets than that one, really. Go look, I promise). -[Romain: rebase on top of 2.26] +[Romain: rebase on top of 2.32] Signed-off-by: Romain Naour [Thomas: rebase on top of 2.29, in which sh64 support was removed.] Signed-off-by: Thomas Petazzoni @@ -18,10 +18,10 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 462ad053066..27cb5571d0d 100755 +index 91dc42f6c7..92f70a4ce6 100755 --- a/configure +++ b/configure -@@ -3855,7 +3855,7 @@ case "${target}" in +@@ -3915,7 +3915,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -31,10 +31,10 @@ index 462ad053066..27cb5571d0d 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index a638f694134..2fd7bce1576 100644 +index 4bd869a63a..139e0aa6ab 100644 --- a/configure.ac +++ b/configure.ac -@@ -1152,7 +1152,7 @@ case "${target}" in +@@ -1159,7 +1159,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -44,5 +44,5 @@ index a638f694134..2fd7bce1576 100644 sh*-*-elf) ;; -- -2.14.4 +2.24.1 diff --git a/buildroot/package/binutils/2.31.1/0005-poison-system-directories.patch b/buildroot/package/binutils/2.34/0002-poison-system-directories.patch similarity index 87% rename from buildroot/package/binutils/2.31.1/0005-poison-system-directories.patch rename to buildroot/package/binutils/2.34/0002-poison-system-directories.patch index 90c7ac760..fc0c69841 100644 --- a/buildroot/package/binutils/2.31.1/0005-poison-system-directories.patch +++ b/buildroot/package/binutils/2.34/0002-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001 +From 9952aec22006cfd0e1f5dd0106523e2b93ad20a8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:45:38 +0100 Subject: [PATCH] poison-system-directories @@ -6,7 +6,7 @@ Subject: [PATCH] poison-system-directories Patch adapted to binutils 2.23.2 and extended to use BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. -[Romain: rebase on top of 2.26] +[Romain: rebase on top of 2.33.1] Signed-off-by: Romain Naour [Gustavo: adapt to binutils 2.25] Signed-off-by: Thomas Petazzoni @@ -78,7 +78,7 @@ Signed-off-by: Scott Garman 9 files changed, 89 insertions(+) diff --git a/ld/config.in b/ld/config.in -index d93c9b0..5da2742 100644 +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -92,10 +92,10 @@ index d93c9b0..5da2742 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 300a272..d68890f 100755 +index d55a6a779f..7e5314d24a 100755 --- a/ld/configure +++ b/ld/configure -@@ -822,6 +822,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -103,7 +103,7 @@ index 300a272..d68890f 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1486,6 +1487,8 @@ Optional Features: +@@ -1491,6 +1492,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) @@ -112,7 +112,7 @@ index 300a272..d68890f 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15803,7 +15806,18 @@ else +@@ -15809,7 +15812,18 @@ else fi @@ -132,7 +132,7 @@ index 300a272..d68890f 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index d10c553..9f1b57b 100644 +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -153,10 +153,10 @@ index d10c553..9f1b57b 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 ba914b9..9df17da 100644 +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -172,10 +172,10 @@ index ba914b9..9df17da 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 40d79dd..137d46c 100644 +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change. +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -195,10 +195,10 @@ index 40d79dd..137d46c 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index b3d166c..3dcbf66 100644 +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -223,23 +223,23 @@ index b3d166c..3dcbf66 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 04d6fd5..d7df005 100644 +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -148,6 +148,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, +@@ -150,6 +150,8 @@ enum option_values OPTION_FORCE_GROUP_ALLOCATION, + OPTION_PRINT_MAP_DISCARDED, + OPTION_NO_PRINT_MAP_DISCARDED, + 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 f31eeb2..25f8497 100644 +index c4af10f4e9..95b56b2d2d 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -268,6 +268,8 @@ main (int argc, char **argv) +@@ -273,6 +273,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -249,12 +249,12 @@ index f31eeb2..25f8497 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 86a033a..f07f095 100644 +index 3d15cc491d..54f52dc72f 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = + { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, + '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, @@ -267,7 +267,7 @@ index 86a033a..f07f095 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv) +@@ -562,6 +570,7 @@ parse_args (unsigned argc, char **argv) int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -275,7 +275,7 @@ index 86a033a..f07f095 100644 struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv) +@@ -1562,6 +1571,14 @@ parse_args (unsigned argc, char **argv) } break; @@ -290,7 +290,7 @@ index 86a033a..f07f095 100644 case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv) +@@ -1613,6 +1630,10 @@ parse_args (unsigned argc, char **argv) command_line.soname = NULL; } @@ -300,7 +300,7 @@ index 86a033a..f07f095 100644 + while (ingroup) { - lang_leave_group (); + einfo (_("%P: missing --end-group; added as last command line option\n")); -- -2.7.4 +2.24.1 diff --git a/buildroot/package/binutils/2.35.1/0001-sh-conf.patch b/buildroot/package/binutils/2.35.1/0001-sh-conf.patch new file mode 100644 index 000000000..44d5f4e89 --- /dev/null +++ b/buildroot/package/binutils/2.35.1/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From ae50e875f4292c99b859cded1d036e401b6ddaec Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 54d0339ab9e..c2f51ffcebb 100755 +--- a/configure ++++ b/configure +@@ -3937,7 +3937,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index a910c4fd6ba..a93d93c81c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1178,7 +1178,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.25.4 + diff --git a/buildroot/package/binutils/2.35.1/0002-poison-system-directories.patch b/buildroot/package/binutils/2.35.1/0002-poison-system-directories.patch new file mode 100644 index 000000000..b77a5e1a6 --- /dev/null +++ b/buildroot/package/binutils/2.35.1/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From db405d1bc5607892ddb25433354b46d78e23b343 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 2f4e5ea33e3..8fbb29682b2 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -40,6 +40,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 6be5280621f..d62e7b12382 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -826,6 +826,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1493,6 +1494,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) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15814,7 +15817,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 172398ff847..b77f8510ca6 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 1790dc81a66..73f832eb169 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -166,6 +166,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 2a93e9456ac..3eeb70607fd 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2655,6 +2655,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. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index e39170b5d94..fadc248a140 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5ea083ebeb3..417f9b858ce 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -155,6 +155,8 @@ enum option_values + OPTION_NON_CONTIGUOUS_REGIONS, + OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, + OPTION_DEPENDENCY_FILE, ++ 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 08be9030cb5..92dc16399eb 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* 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 6cab41cf5df..c497f36b148 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = + { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, + '\0', NULL, N_("Do not show discarded sections in map file output"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.25.4 + diff --git a/buildroot/package/binutils/Config.in.host b/buildroot/package/binutils/Config.in.host index 9beabe357..b690b952d 100644 --- a/buildroot/package/binutils/Config.in.host +++ b/buildroot/package/binutils/Config.in.host @@ -7,16 +7,12 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_32_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_34_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc default BR2_BINUTILS_VERSION_CSKY if BR2_csky help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_31_X - bool "binutils 2.31.1" - depends on !BR2_csky - config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky @@ -28,6 +24,20 @@ config BR2_BINUTILS_VERSION_2_33_X # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT +config BR2_BINUTILS_VERSION_2_34_X + bool "binutils 2.34" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + +config BR2_BINUTILS_VERSION_2_35_X + bool "binutils 2.35.1" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.31)" depends on BR2_arc @@ -40,11 +50,12 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2019.09-release" if BR2_BINUTILS_VERSION_ARC + default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY - default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X default "2.32" if BR2_BINUTILS_VERSION_2_32_X default "2.33.1" if BR2_BINUTILS_VERSION_2_33_X + default "2.34" if BR2_BINUTILS_VERSION_2_34_X + default "2.35.1" if BR2_BINUTILS_VERSION_2_35_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch b/buildroot/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch similarity index 98% rename from buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch rename to buildroot/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch index f6a78c7cd..7a76ef296 100644 --- a/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch +++ b/buildroot/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch @@ -229,13 +229,14 @@ diff --git a/ld/ldlex.h b/ld/ldlex.h index 32a7a6409e8..c02b64bf92f 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -150,6 +150,8 @@ enum option_values - OPTION_FORCE_GROUP_ALLOCATION, - OPTION_PRINT_MAP_DISCARDED, +@@ -152,6 +152,8 @@ enum option_values OPTION_NO_PRINT_MAP_DISCARDED, + OPTION_NON_CONTIGUOUS_REGIONS, + OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; + /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c diff --git a/buildroot/package/binutils/binutils.hash b/buildroot/package/binutils/binutils.hash index 797dd5b92..ce5b0cdca 100644 --- a/buildroot/package/binutils/binutils.hash +++ b/buildroot/package/binutils/binutils.hash @@ -1,10 +1,11 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz sha512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac binutils-2.33.1.tar.xz +sha512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz +sha512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb binutils-2.35.1.tar.xz # Locally calculated (fetched from Github) -sha512 33ac5ad662db551870193f5c76c35a18de465adfa1c7f4bf5c1bb4145805a47507bf11ec21eb446b52f91f70cfe392252dd2b02724dc9dad3505258e3f6f4d45 binutils-gdb-arc-2019.09-release.tar.gz +sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz # Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz diff --git a/buildroot/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk index 81308e2e8..d978b424b 100644 --- a/buildroot/package/binutils/binutils.mk +++ b/buildroot/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2019.09-release +BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.32 +BINUTILS_VERSION = 2.34 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2019.09-release) +ifeq ($(BINUTILS_VERSION),arc-2020.09-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y @@ -93,6 +93,7 @@ HOST_BINUTILS_CONF_OPTS = \ --enable-static \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ + --without-debuginfod \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) diff --git a/buildroot/package/bird/0002-Added-missing-extern.patch b/buildroot/package/bird/0002-Added-missing-extern.patch new file mode 100644 index 000000000..00aab3e92 --- /dev/null +++ b/buildroot/package/bird/0002-Added-missing-extern.patch @@ -0,0 +1,34 @@ +From 4bbc10614f3431c37e6352f5a6ea5c693c31021e Mon Sep 17 00:00:00 2001 +From: Maria Matejka +Date: Tue, 4 Feb 2020 10:11:16 +0100 +Subject: [PATCH] Added missing extern +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Robert Scheck who reported it +and Toke Høiland-Jørgensen who suggested this patch. + +[Retrieved from: +https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e] +Signed-off-by: Fabrice Fontaine +--- + nest/route.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nest/route.h b/nest/route.h +index d2a07f09..b927db5f 100644 +--- a/nest/route.h ++++ b/nest/route.h +@@ -458,7 +458,7 @@ typedef struct rta { + protocol-specific metric is availabe */ + + +-const char * rta_dest_names[RTD_MAX]; ++extern const char * rta_dest_names[RTD_MAX]; + + static inline const char *rta_dest_name(uint n) + { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; } +-- +2.26.2 + diff --git a/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch b/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch deleted file mode 100644 index f40c39c55..000000000 --- a/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 50c8a3af1661c3950b9743d673fd46872860aa08 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 18 May 2020 07:53:20 +0200 -Subject: [PATCH] src: make path to m4 relocatable - -Commit a4ede8f85b0c9a254fcb01e5888cee1983095669 ("package: make bison -a relocatable package") made Bison relocatable, but in fact it still -contains one absolute reference: the M4 variable, which points to the -M4 program. Let's fix that by using relocate(). - -We don't use relocate2() to store the temporary buffer and re-use it, -because m4path() is only called once. - -Upstream: submitted to the bison-patches@gnu.org mailing list -https://lists.gnu.org/archive/html/bison-patches/2020-05/msg00078.html -Signed-off-by: Thomas Petazzoni ---- - src/files.c | 7 +++++++ - src/files.h | 3 +++ - src/output.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/files.c b/src/files.c -index 71c10e34..b8b43230 100644 ---- a/src/files.c -+++ b/src/files.c -@@ -421,6 +421,13 @@ pkgdatadir (void) - } - } - -+char const * -+m4path (void) -+{ -+ char const *m4 = getenv("M4"); -+ return m4 ? m4 : relocate(M4); -+} -+ - void - output_file_names_free (void) - { -diff --git a/src/files.h b/src/files.h -index 00814ad0..64b6f8b5 100644 ---- a/src/files.h -+++ b/src/files.h -@@ -64,6 +64,9 @@ extern char *all_but_ext; - /* Where our data files are installed. */ - char const *pkgdatadir (void); - -+/* Where the m4 program is installed. */ -+char const *m4path (void); -+ - void compute_output_file_names (void); - void output_file_names_free (void); - -diff --git a/src/output.c b/src/output.c -index 1871fd75..ebe75095 100644 ---- a/src/output.c -+++ b/src/output.c -@@ -682,7 +682,7 @@ static void - output_skeleton (void) - { - /* Compute the names of the package data dir and skeleton files. */ -- char const *m4 = (m4 = getenv ("M4")) ? m4 : M4; -+ char const *m4 = m4path (); - char const *datadir = pkgdatadir (); - char *skeldir = xpath_join (datadir, "skeletons"); - char *m4sugar = xpath_join (datadir, "m4sugar/m4sugar.m4"); --- -2.26.2 - diff --git a/buildroot/package/bison/bison.hash b/buildroot/package/bison/bison.hash index 01ee17d76..123b6100c 100644 --- a/buildroot/package/bison/bison.hash +++ b/buildroot/package/bison/bison.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 bison-3.4.2.tar.xz +sha256 55c215521a13982a9bee68cd42eed51a65713f96c530a739a57de4438ac1bb69 bison-3.7.1.tar.xz # License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk index 738052096..70111a8d6 100644 --- a/buildroot/package/bison/bison.mk +++ b/buildroot/package/bison/bison.mk @@ -4,7 +4,7 @@ # ################################################################################ -BISON_VERSION = 3.4.2 +BISON_VERSION = 3.7.1 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz BISON_SITE = $(BR2_GNU_MIRROR)/bison BISON_LICENSE = GPL-3.0+ diff --git a/buildroot/package/bitstream/bitstream.hash b/buildroot/package/bitstream/bitstream.hash index 89da7c6fd..0d2e5a1f1 100644 --- a/buildroot/package/bitstream/bitstream.hash +++ b/buildroot/package/bitstream/bitstream.hash @@ -1,6 +1,6 @@ -# From https://get.videolan.org/bitstream/1.4/bitstream-1.4.tar.bz2.md5 -md5 dfb1449194250b2d364d54b5bbac858d bitstream-1.4.tar.bz2 -# From https://get.videolan.org/bitstream/1.4/bitstream-1.4.tar.bz2.sha256 -sha256 b2484940d3b8733bec9dd1ec1731de428261dff31c9f95874264be9dc9ce786b bitstream-1.4.tar.bz2 +# From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.md5 +md5 34630d13332fd1575bcc8531b0a596be bitstream-1.5.tar.bz2 +# From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.sha256 +sha256 45fc5a5a6e4537a69fa8440821e87b76252135180a3070c631b0b36ce0a3b90a bitstream-1.5.tar.bz2 # Locally computed sha256 9644a812f9a8377a59acb7092a36ce8882a39743425d9171a8fb84637e2f6e04 COPYING diff --git a/buildroot/package/bitstream/bitstream.mk b/buildroot/package/bitstream/bitstream.mk index 1746d1386..12124a63d 100644 --- a/buildroot/package/bitstream/bitstream.mk +++ b/buildroot/package/bitstream/bitstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITSTREAM_VERSION = 1.4 +BITSTREAM_VERSION = 1.5 BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2 BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION) BITSTREAM_LICENSE = MIT diff --git a/buildroot/package/bitwise/Config.in b/buildroot/package/bitwise/Config.in new file mode 100644 index 000000000..e955da374 --- /dev/null +++ b/buildroot/package/bitwise/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BITWISE + bool "bitwise" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + help + Bitwise is multi base interactive calculator + supporting dynamic base conversion and bit manipulation. + It's a handy tool for low level hackers, + kernel developers and device drivers developers. + + https://github.com/mellowcandle/bitwise diff --git a/buildroot/package/bitwise/bitwise.hash b/buildroot/package/bitwise/bitwise.hash new file mode 100644 index 000000000..061c5e529 --- /dev/null +++ b/buildroot/package/bitwise/bitwise.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 33ce934fb99dadf7652224152cc135a0abf6a211adde53d96e9be7067567749c bitwise-v0.41.tar.gz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/buildroot/package/bitwise/bitwise.mk b/buildroot/package/bitwise/bitwise.mk new file mode 100644 index 000000000..581eac6fb --- /dev/null +++ b/buildroot/package/bitwise/bitwise.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# bitwise +# +################################################################################ + +BITWISE_VERSION = 0.41 +BITWISE_SITE = https://github.com/mellowcandle/bitwise/releases/download/v$(BITWISE_VERSION) +BITWISE_SOURCE = bitwise-v$(BITWISE_VERSION).tar.gz +BITWISE_DEPENDENCIES = ncurses readline +BITWISE_LICENSE = GPL-3.0 +BITWISE_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch b/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch new file mode 100644 index 000000000..b0b1f7272 --- /dev/null +++ b/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch @@ -0,0 +1,140 @@ +From 72324e9415d2757a5f0f028865f841de70e1d0c4 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Sun, 12 Jul 2020 14:18:09 +0200 +Subject: [PATCH] fix build issue with gcc 10 + +This patch is created on top of tagged version v2.1.0. +An upstream fix commit [1] for this issue is already in upstream master but +does not apply on current used version in buildroot. + +[1] https://github.com/Arkq/bluez-alsa/commit/30a23dd7ce9b00c702fa48545f6b03038f9e17c6 + +Signed-off-by: Heiko Thiery +[Fabrice: also update src/ofono-iface.h] +Signed-off-by: Fabrice Fontaine +--- + src/bluealsa-dbus.c | 4 ++++ + src/bluealsa-iface.c | 2 ++ + src/bluealsa-iface.h | 4 ---- + src/bluealsa.c | 3 +++ + src/bluez-a2dp.h | 3 --- + src/bluez-iface.h | 3 --- + src/bluez.c | 3 +++ + 7 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/bluealsa-dbus.c b/src/bluealsa-dbus.c +index 5e748e3..4c9cd3d 100644 +--- a/src/bluealsa-dbus.c ++++ b/src/bluealsa-dbus.c +@@ -33,6 +33,10 @@ + #include "shared/defs.h" + #include "shared/log.h" + ++extern const GDBusInterfaceInfo bluealsa_iface_manager; ++extern const GDBusInterfaceInfo bluealsa_iface_pcm; ++extern const GDBusInterfaceInfo bluealsa_iface_rfcomm; ++ + static GVariant *ba_variant_new_device_path(const struct ba_device *d) { + return g_variant_new_object_path(d->bluez_dbus_path); + } +diff --git a/src/bluealsa-iface.c b/src/bluealsa-iface.c +index 71810c7..55b79c9 100644 +--- a/src/bluealsa-iface.c ++++ b/src/bluealsa-iface.c +@@ -10,6 +10,8 @@ + + #include "bluealsa-iface.h" + ++#define BLUEALAS_IFACE_C ++ + static const GDBusArgInfo arg_codec = { + -1, "codec", "q", NULL + }; +diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h +index 262fb76..4f3e85b 100644 +--- a/src/bluealsa-iface.h ++++ b/src/bluealsa-iface.h +@@ -32,8 +32,4 @@ + #define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG" + #define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS" + +-const GDBusInterfaceInfo bluealsa_iface_manager; +-const GDBusInterfaceInfo bluealsa_iface_pcm; +-const GDBusInterfaceInfo bluealsa_iface_rfcomm; +- + #endif +diff --git a/src/bluealsa.c b/src/bluealsa.c +index 929f9ed..690c407 100644 +--- a/src/bluealsa.c ++++ b/src/bluealsa.c +@@ -20,6 +20,9 @@ + #include "bluez-a2dp.h" + #include "hfp.h" + ++/* NULL-terminated list of available A2DP codecs */ ++extern const struct bluez_a2dp_codec **bluez_a2dp_codecs; ++ + /* Initialize global configuration variable. */ + struct ba_config config = { + +diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h +index 7c0e33b..127dbd9 100644 +--- a/src/bluez-a2dp.h ++++ b/src/bluez-a2dp.h +@@ -57,7 +57,4 @@ struct bluez_a2dp_codec { + size_t samplings_size; + }; + +-/* NULL-terminated list of available A2DP codecs */ +-const struct bluez_a2dp_codec **bluez_a2dp_codecs; +- + #endif +diff --git a/src/bluez-iface.h b/src/bluez-iface.h +index 34269c5..250267e 100644 +--- a/src/bluez-iface.h ++++ b/src/bluez-iface.h +@@ -27,7 +27,4 @@ + #define BLUEZ_TRANSPORT_STATE_PENDING "pending" + #define BLUEZ_TRANSPORT_STATE_ACTIVE "active" + +-const GDBusInterfaceInfo bluez_iface_endpoint; +-const GDBusInterfaceInfo bluez_iface_profile; +- + #endif +diff --git a/src/bluez.c b/src/bluez.c +index cfdbff8..190101e 100644 +--- a/src/bluez.c ++++ b/src/bluez.c +@@ -45,6 +45,9 @@ + # define G_DBUS_ERROR_UNKNOWN_OBJECT G_DBUS_ERROR_FAILED + #endif + ++extern const GDBusInterfaceInfo bluez_iface_endpoint; ++extern const GDBusInterfaceInfo bluez_iface_profile; ++ + /** + * Structure describing registered D-Bus object. */ + struct dbus_object_data { + diff --git a/src/ofono-iface.h b/src/ofono-iface.h +index d5a6715..d5b9065 100644 +--- a/src/ofono-iface.h ++++ b/src/ofono-iface.h +@@ -1,6 +1,6 @@ + /* + * BlueALSA - ofono-iface.h +- * Copyright (c) 2016-2019 Arkadiusz Bokowy ++ * Copyright (c) 2016-2020 Arkadiusz Bokowy + * 2018 Thierry Bultel + * + * This file is a part of bluez-alsa. +@@ -27,6 +27,6 @@ + #define OFONO_AUDIO_CODEC_CVSD 0x01 + #define OFONO_AUDIO_CODEC_MSBC 0x02 + +-const GDBusInterfaceInfo ofono_iface_hf_audio_agent; ++extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent; + + #endif +-- +2.20.1 + diff --git a/buildroot/package/bluez-tools/0001-fix-gcc-10-compile.patch b/buildroot/package/bluez-tools/0001-fix-gcc-10-compile.patch new file mode 100644 index 000000000..028c2db69 --- /dev/null +++ b/buildroot/package/bluez-tools/0001-fix-gcc-10-compile.patch @@ -0,0 +1,46 @@ +From 687105d611b38961f390f0a328f9cfa3b93aeb18 Mon Sep 17 00:00:00 2001 +From: Leigh Scott +Date: Tue, 28 Jan 2020 22:46:37 +0000 +Subject: [PATCH] fix gcc-10 compile + +[Retrieved from: +https://github.com/khvzak/bluez-tools/pull/34/commits/687105d611b38961f390f0a328f9cfa3b93aeb18] +Signed-off-by: Fabrice Fontaine +--- + src/lib/agent-helper.c | 2 ++ + src/lib/agent-helper.h | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c +index bf50bcc..2b94100 100644 +--- a/src/lib/agent-helper.c ++++ b/src/lib/agent-helper.c +@@ -33,6 +33,8 @@ + + #include "agent-helper.h" + ++gboolean agent_need_unregister; ++ + static const gchar *_bt_agent_introspect_xml = "\n\t\n\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\n\n"; + static guint _bt_agent_registration_id = 0; + static GHashTable *_pin_hash_table = NULL; +diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h +index 8e1cc85..9a952c4 100644 +--- a/src/lib/agent-helper.h ++++ b/src/lib/agent-helper.h +@@ -35,7 +35,7 @@ extern "C" { + #define AGENT_DBUS_INTERFACE "org.bluez.Agent1" + #define AGENT_PATH "/org/blueztools" + +-gboolean agent_need_unregister; ++extern gboolean agent_need_unregister; + + void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error); + void unregister_agent_callbacks(GError **error); +@@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error); + } + #endif + +-#endif /* __AGENT_HELPER_H */ +\ No newline at end of file ++#endif /* __AGENT_HELPER_H */ diff --git a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk index 871986c81..589978c8c 100644 --- a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.54 +BLUEZ5_UTILS_HEADERS_VERSION = 5.55 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/buildroot/package/bluez5_utils/Config.in b/buildroot/package/bluez5_utils/Config.in index 488a2f79c..016a16c4c 100644 --- a/buildroot/package/bluez5_utils/Config.in +++ b/buildroot/package/bluez5_utils/Config.in @@ -60,6 +60,18 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH help Build BlueZ 5.x health plugin +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH + bool "build mesh profile" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell + select BR2_PACKAGE_ELL + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_READLINE + help + Build BlueZ 5.x mesh plugin + +comment "mesh profile needs a toolchain w/ headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI bool "build midi profile" select BR2_PACKAGE_ALSA_LIB @@ -92,6 +104,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST help Build BlueZ 5.x tests +config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI + bool "build hid2hci tool" + depends on BR2_PACKAGE_HAS_UDEV + help + Build BlueZ 5.x hid2hci tool + +comment "hid2hci tool needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + endif comment "bluez5-utils needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library" diff --git a/buildroot/package/bluez5_utils/bluez5_utils.hash b/buildroot/package/bluez5_utils/bluez5_utils.hash index 3eb6912fb..d0f3b8059 100644 --- a/buildroot/package/bluez5_utils/bluez5_utils.hash +++ b/buildroot/package/bluez5_utils/bluez5_utils.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 68cdab9e63e8832b130d5979dc8c96fdb087b31278f342874d992af3e56656dc bluez-5.54.tar.xz +sha256 8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88 bluez-5.55.tar.xz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/buildroot/package/bluez5_utils/bluez5_utils.mk b/buildroot/package/bluez5_utils/bluez5_utils.mk index e328f52ea..f2c8cabcf 100644 --- a/buildroot/package/bluez5_utils/bluez5_utils.mk +++ b/buildroot/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.54 +BLUEZ5_UTILS_VERSION = 5.55 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -51,6 +51,14 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-health endif +# enable mesh profile +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-external-ell --enable-mesh +BLUEZ5_UTILS_DEPENDENCIES += ell json-c readline +else +BLUEZ5_UTILS_CONF_OPTS += --disable-external-ell --disable-mesh +endif + # enable midi profile ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y) BLUEZ5_UTILS_CONF_OPTS += --enable-midi @@ -102,6 +110,13 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-test endif +# enable hid2hci tool +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-hid2hci +else +BLUEZ5_UTILS_CONF_OPTS += --disable-hid2hci +endif + # use udev if available ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BLUEZ5_UTILS_CONF_OPTS += --enable-udev diff --git a/buildroot/package/boa/boa.conf b/buildroot/package/boa/boa.conf index e94029665..f51c23731 100644 --- a/buildroot/package/boa/boa.conf +++ b/buildroot/package/boa/boa.conf @@ -46,7 +46,7 @@ Port 80 # Group: The group name or GID the server should run as. User nobody -Group nogroup +Group nobody # ServerAdmin: The email address where server problems should be sent. # Note: this is not currently used, except as an environment variable diff --git a/buildroot/package/boinc/boinc.hash b/buildroot/package/boinc/boinc.hash index 48d61dc91..b842b6c01 100644 --- a/buildroot/package/boinc/boinc.hash +++ b/buildroot/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 622ce3335a01ef30add4813c0cc7b65cffcaa5500a7f58f77748d0dbc80e6b06 boinc-7.16.3.tar.gz +sha256 caa567da8d3eb50859efe2eeba1c23c7b27d3b0f15b548136e75302713b25303 boinc-7.16.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/buildroot/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk index 5dccf4c43..a47ad9abe 100644 --- a/buildroot/package/boinc/boinc.mk +++ b/buildroot/package/boinc/boinc.mk @@ -5,10 +5,7 @@ ################################################################################ BOINC_VERSION_MAJOR = 7.16 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).3 -# client_release can be used to build the Client and Manager but not the Server -# part. The Server currently has no versioning (see -# https://github.com/BOINC/boinc/pull/1798). +BOINC_VERSION = $(BOINC_VERSION_MAJOR).6 BOINC_SITE = \ $(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION)) BOINC_LICENSE = LGPL-3.0+ diff --git a/buildroot/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch b/buildroot/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch deleted file mode 100644 index e8972fd72..000000000 --- a/buildroot/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -boost: fix ambiguous format call on 64-bit builds - -Fixes problem: - -libs/locale/src/icu/formatter.cpp: In member function -'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format::format(boost::int64_t, size_t&) const': -libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous -/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const -/ec/include/unicode/numfmt.h:330: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const -/ec/include/unicode/numfmt.h:343: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const - -Signed-off-by: Thomas De Schampheleire -Backported-from: https://svn.boost.org/trac/boost/ticket/6851 - - -diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp ---- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100 -+++ boost_1_49_0/libs/locale/src/icu/formatter.cpp 2012-05-01 14:27:54.000000000 +0100 -@@ -58,7 +58,7 @@ - virtual string_type format(int64_t value,size_t &code_points) const - { - icu::UnicodeString tmp; -- icu_fmt_->format(value,tmp); -+ icu_fmt_->format(::int64_t(value),tmp); - code_points=tmp.countChar32(); - return cvt_.std(tmp); - } diff --git a/buildroot/package/boost/0002-fix-uclibc-eventfd.patch b/buildroot/package/boost/0001-fix-uclibc-eventfd.patch similarity index 100% rename from buildroot/package/boost/0002-fix-uclibc-eventfd.patch rename to buildroot/package/boost/0001-fix-uclibc-eventfd.patch diff --git a/buildroot/package/boost/0003-fenv.patch b/buildroot/package/boost/0002-fenv.patch similarity index 98% rename from buildroot/package/boost/0003-fenv.patch rename to buildroot/package/boost/0002-fenv.patch index 95c769aea..9dc7848c9 100644 --- a/buildroot/package/boost/0003-fenv.patch +++ b/buildroot/package/boost/0002-fenv.patch @@ -18,7 +18,7 @@ Index: b/boost/config/platform/linux.hpp =================================================================== --- a/boost/config/platform/linux.hpp +++ b/boost/config/platform/linux.hpp -@@ -47,6 +47,16 @@ +@@ -48,6 +48,16 @@ #endif // diff --git a/buildroot/package/boost/0004-add-riscv-endian-detection.patch b/buildroot/package/boost/0004-add-riscv-endian-detection.patch deleted file mode 100644 index 879838df3..000000000 --- a/buildroot/package/boost/0004-add-riscv-endian-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add RISC-V endian detection - -boost/predef/other/endian.h has two ways of detecting the endianess: - - (1) It includes if BOOST_LIB_C_GNU is defined, and then - use __BYTE_ORDER to decide the endianness. - - (2) Otherwise, if (1) was not possible for some reason, it uses - architecture defines to decide the endianness. - -(1) works perfectly fine with glibc toolchains, because -BOOST_LIB_C_GNU is defined, but it doesn't work with musl. Due to -this, is not included, __BYTE_ORDER is not defined, and -method (1) does not work, causing build failures on musl toolchains -that don't have explicit handling by architecture name (method 2). - -So this commit fixes RISC-V musl build by adding support for the -__riscv architecture define, to determine that the endianness is -little endian. - -Signed-off-by: Thomas Petazzoni - -Index: b/boost/predef/other/endian.h -=================================================================== ---- a/boost/predef/other/endian.h -+++ b/boost/predef/other/endian.h -@@ -127,7 +127,8 @@ - defined(__AARCH64EL__) || \ - defined(_MIPSEL) || \ - defined(__MIPSEL) || \ -- defined(__MIPSEL__) -+ defined(__MIPSEL__) || \ -+ defined(__riscv) - # undef BOOST_ENDIAN_LITTLE_BYTE - # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE - # endif diff --git a/buildroot/package/boost/boost.hash b/buildroot/package/boost/boost.hash index 0348f4046..d11232f5a 100644 --- a/buildroot/package/boost/boost.hash +++ b/buildroot/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From http://www.boost.org/users/history/version_1_72_0.html -sha256 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 boost_1_72_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_74_0.html +sha256 83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 boost_1_74_0.tar.bz2 # Locally computed -sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/buildroot/package/boost/boost.mk b/buildroot/package/boost/boost.mk index 8e47a90c3..82fe42d6b 100644 --- a/buildroot/package/boost/boost.mk +++ b/buildroot/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.72.0 +BOOST_VERSION = 1.74.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES diff --git a/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch b/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch new file mode 100644 index 000000000..fd6a2ffdd --- /dev/null +++ b/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch @@ -0,0 +1,31 @@ +From a93bc8503649028852402c61bdda531af2872d0e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Oct 2020 09:15:06 +0200 +Subject: [PATCH] src/build-data/arch/arm64.txt: add aarch64_be + +Allow the user to set cpu value to aarch64_be. +Endianness will be correctly guessed by choose_endian function because +this alias ends with "be" + +Fixes: + - http://autobuild.buildroot.org/results/69ebf03c59b2af4140a39bc26f17d0396b6ec15d + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/randombit/botan/commit/a93bc8503649028852402c61bdda531af2872d0e] +--- + src/build-data/arch/arm64.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/build-data/arch/arm64.txt b/src/build-data/arch/arm64.txt +index 056c5318ff..5205295125 100644 +--- a/src/build-data/arch/arm64.txt ++++ b/src/build-data/arch/arm64.txt +@@ -5,6 +5,7 @@ family arm + + + aarch64 ++aarch64_be + armv8 + armv8-a + diff --git a/buildroot/package/botan/Config.in b/buildroot/package/botan/Config.in index a242a38ef..95367b900 100644 --- a/buildroot/package/botan/Config.in +++ b/buildroot/package/botan/Config.in @@ -1,9 +1,15 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_powerpc64 || BR2_sparc || BR2_sh || \ - BR2_x86_64 + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + default y if BR2_sh config BR2_PACKAGE_BOTAN bool "botan" diff --git a/buildroot/package/botan/botan.hash b/buildroot/package/botan/botan.hash index a04825a75..003dd13e9 100644 --- a/buildroot/package/botan/botan.hash +++ b/buildroot/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be Botan-2.11.0.tar.xz +sha256 92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628 Botan-2.16.0.tar.xz # Locally computed -sha256 161011a9be56a6e825c06257005055a148056b5c756f75a0b99dae0883fcab7a license.txt +sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index 62027280d..d36324c7f 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.11.0 +BOTAN_VERSION = 2.16.0 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause diff --git a/buildroot/package/bridge-utils/0001-build-system.patch b/buildroot/package/bridge-utils/0001-build-system.patch deleted file mode 100644 index f44737750..000000000 --- a/buildroot/package/bridge-utils/0001-build-system.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 -+++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 -@@ -5,7 +5,7 @@ - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) - - prefix=@prefix@ - exec_prefix=@exec_prefix@ diff --git a/buildroot/package/bridge-utils/Config.in b/buildroot/package/bridge-utils/Config.in index bc614b075..de5883f06 100644 --- a/buildroot/package/bridge-utils/Config.in +++ b/buildroot/package/bridge-utils/Config.in @@ -4,4 +4,8 @@ config BR2_PACKAGE_BRIDGE_UTILS Manage ethernet bridging; a way to connect networks together to form a larger network. + This utility is DEPRECATED. No new features will ever be + added. Instead use the bridge command from the iproute2 + package which supports more features. + https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ diff --git a/buildroot/package/bridge-utils/bridge-utils.hash b/buildroot/package/bridge-utils/bridge-utils.hash index 5658116f8..ccf71704b 100644 --- a/buildroot/package/bridge-utils/bridge-utils.hash +++ b/buildroot/package/bridge-utils/bridge-utils.hash @@ -1,5 +1,3 @@ -# From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc -sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz - # locally computed -sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING +sha256 4b9b12f31d147320dea931f1041b8a69d84741ddb92cf35ea1f896b67da98b7c bridge-utils-1.7.tar.gz +sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING diff --git a/buildroot/package/bridge-utils/bridge-utils.mk b/buildroot/package/bridge-utils/bridge-utils.mk index 251922747..9d63b3ef3 100644 --- a/buildroot/package/bridge-utils/bridge-utils.mk +++ b/buildroot/package/bridge-utils/bridge-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -BRIDGE_UTILS_VERSION = 1.6 -BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils -BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz +BRIDGE_UTILS_VERSION = 1.7 +BRIDGE_UTILS_SITE = \ + https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git/snapshot BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_LICENSE = GPL-2.0+ BRIDGE_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch b/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch new file mode 100644 index 000000000..249d420ca --- /dev/null +++ b/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch @@ -0,0 +1,52 @@ +From 43390f9906a8c663872e0eab56c1173032d1bd6c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Sun, 7 Jun 2020 12:58:38 +0200 +Subject: [PATCH] fix input_event time related compile fail + +./system_linux.c: In function 'writeInputEvent': +./system_linux.c:962:23: error: 'struct input_event' has no member named 'time'; did you mean 'type'? + gettimeofday(&event.time, NULL); + ^~~~ + type + +Signed-off-by: Heiko Thiery +--- + Programs/system_linux.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Programs/system_linux.c b/Programs/system_linux.c +index a97ee7ff6..77052d32f 100644 +--- a/Programs/system_linux.c ++++ b/Programs/system_linux.c +@@ -40,6 +40,14 @@ + #ifdef HAVE_LINUX_INPUT_H + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#endif ++ ++#ifndef input_event_usec ++#define input_event_usec time.tv_usec ++#endif ++ + #include "kbd_keycodes.h" + + LINUX_KEY_MAP(xt00) = { +@@ -957,9 +965,12 @@ int + writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) { + #ifdef HAVE_LINUX_UINPUT_H + struct input_event event; ++ struct timeval tv; + + memset(&event, 0, sizeof(event)); +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + event.type = type; + event.code = code; + event.value = value; +-- +2.20.1 + diff --git a/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch b/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch deleted file mode 100644 index ddcc5ba9e..000000000 --- a/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0414ad2b4e8978a14343d920a5a1f11da892eaf3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 26 Oct 2019 14:28:51 +0200 -Subject: [PATCH] mk4build: change how the _FOR_BUILD variables are passed to - sub-configure - -The logic that eval's for *_FOR_BUILD variables to set them to their -equivalent without _FOR_BUILD before calling the sub-configure for the -host machine doesn't work: the variables are not exported, and -therefore they are not seen by the ./configure script, which runs as a -separate process. - -So instead, keep things simple and pass them explicitly in the -environment of the ./configure script. - -This patch was written in the context of the Buildroot build system, -which does cross-compilation, through which we discovered that the -*_FOR_BUILD variables are not properly passed down to the -sub-configure. - -Upstream: https://github.com/brltty/brltty/pull/183 -Signed-off-by: Thomas Petazzoni ---- - mk4build | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/mk4build b/mk4build -index 3fb9d8917..3c64963b7 100755 ---- a/mk4build -+++ b/mk4build -@@ -67,13 +67,12 @@ then - - needTemporaryDirectory - -- for variable in CC CFLAGS CXX CXXFLAGS LDFLAGS LDLIBS -- do -- unset "${variable}" -- variableForBuild="${variable}_FOR_BUILD" -- eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"' -- done -- -+ CC=${CC_FOR_BUILD} \ -+ CFLAGS=${CFLAGS_FOR_BUILD} \ -+ CXX=${CXX_FOR_BUILD} \ -+ CXXFLAGS=${CXXFLAGS_FOR_BUILD} \ -+ LDFLAGS=${LDFLAGS_FOR_BUILD} \ -+ LDLIBS=${LDLIBS_FOR_BUILD} \ - "${sourceRoot}/configure" \ - --disable-api \ - --disable-gpm \ --- -2.21.0 - diff --git a/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch b/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch deleted file mode 100644 index 5839f78f3..000000000 --- a/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 568e0d6070021a9b805ba1fe1543e4b43a073413 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 20 Feb 2020 00:23:35 +0100 -Subject: [PATCH] mk4build: also pass PKG_CONFIG_FOR_BUILD to the native - configure - -In commit 0414ad2b4e8978a14343d920a5a1f11da892eaf3, mk4build was -modified to pass a number of *_FOR_BUILD variables down to the -configure script called for building the native tools. - -However, this configure script also uses the pkg-config tool, and the -pkg-config to use for the native build and the cross build may be -different, so let's also pass PKG_CONFIG_FOR_BUILD down to the -sub-configure, as PKG_CONFIG, following the same logic as the other -variables. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/brltty/brltty/pull/248 -[Upstream patch is different, due to other upstream changes.] ---- - mk4build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mk4build b/mk4build -index 3c64963b7..ad88ee69c 100755 ---- a/mk4build -+++ b/mk4build -@@ -73,6 +73,7 @@ then - CXXFLAGS=${CXXFLAGS_FOR_BUILD} \ - LDFLAGS=${LDFLAGS_FOR_BUILD} \ - LDLIBS=${LDLIBS_FOR_BUILD} \ -+ PKG_CONFIG=${PKG_CONFIG_FOR_BUILD} \ - "${sourceRoot}/configure" \ - --disable-api \ - --disable-gpm \ --- -2.24.1 - diff --git a/buildroot/package/brltty/brltty.hash b/buildroot/package/brltty/brltty.hash index 4373d7da9..d4f87c42f 100644 --- a/buildroot/package/brltty/brltty.hash +++ b/buildroot/package/brltty/brltty.hash @@ -1,3 +1,4 @@ -sha256 cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7 brltty-6.0.tar.xz +# Locally computed +sha256 4a28e3f1879aee9082f9ce4100fd4053be47add7f8ab0f2af6d6a20590934b62 brltty-6.1.tar.xz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 69d7cbb371bcb165ccde6c496f61481a557d17f0afa0aaa86ece214c4bd698cb README +sha256 9ac2af461c3f5c1640601d607a299c7cb9fe3d2f9974bf671af46601e4f9198f README diff --git a/buildroot/package/brltty/brltty.mk b/buildroot/package/brltty/brltty.mk index acc172fab..4f40e65fc 100644 --- a/buildroot/package/brltty/brltty.mk +++ b/buildroot/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.0 +BRLTTY_VERSION = 6.1 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install @@ -12,7 +12,11 @@ BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install BRLTTY_LICENSE = LGPL-2.1+ BRLTTY_LICENSE_FILES = LICENSE-LGPL README -BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \ +BRLTTY_DEPENDENCIES = \ + $(TARGET_NLS_DEPENDENCIES) \ + host-autoconf \ + host-gawk \ + host-pkgconf \ $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) BRLTTY_CONF_ENV = \ diff --git a/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch deleted file mode 100644 index de2db2f16..000000000 --- a/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ff93866eb119cedb791894814780c0e44db35715 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Fri, 10 Mar 2017 14:56:17 +0000 -Subject: [PATCH] Makefile: install static library and headers in - install-static - -Currently, the install-static target only installs the statically -compiled tools. However, some programs outside of btrfs-progs (for -example docker) link with the btrfs libraries. If such programs want to -link statically against the btrfs-progs library, then this library -should be installed by "install-static". Indeed, "make install" cannot -be used if the support for shared library is not enabled. - -Signed-off-by: Thomas Petazzoni -[Gustavo: Rebase for btrfs-progs 4.7.2] -Signed-off-by: Gustavo Zacarias -[Vincent: Rebase for btrfs-progs 4.10] -Signed-off-by: Vicente Olivert Riera -[baruch: Rebase for btrfs-progs 4.16] -Signed-off-by: Baruch Siach ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 67fbc48..d9e34be 100644 ---- a/Makefile -+++ b/Makefile -@@ -308,7 +308,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli - # NOTE: For static compiles, you need to have all the required libs - # static equivalent available - # --static: $(progs_static) -+static: $(progs_static) $(libs_static) - - version.h: version.sh version.h.in configure.ac - @echo " [SH] $@" -@@ -537,6 +537,10 @@ install-static: $(progs_static) $(INSTALLDIRS) - $(INSTALL) $(progs_static) $(DESTDIR)$(bindir) - # btrfsck is a link to btrfs in the src tree, make it so for installed file as well - $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static -+ $(INSTALL) -m755 -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) -+ $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs -+ $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs - - $(INSTALLDIRS): - @echo "Making install in $(patsubst install-%,%,$@)" --- -2.10.2 - diff --git a/buildroot/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch b/buildroot/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch deleted file mode 100644 index 9c1173b3f..000000000 --- a/buildroot/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1fc5444f5620670bb9d293be4f92df59661e1810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Feb 2017 23:31:24 +0100 -Subject: [PATCH] kerncompat.h: define BTRFS_DISABLE_BACKTRACE when building - with uClibc - -uClibc does not provide backtrace() nor . When building -btrfs-progs, passing --disable-backtrace is enough to make it build with -uClibc. But once btrfs-progs is installed and another program/library -includes kerncompat.h, it fails to build with uClibc, because -BTRFS_DISABLE_BACKTRACE is not defined. - -The most correct fix for this would be to have kerncompat.h generated -from kerncompat.h.in during the btrfs-progs build process, and tuned -depending on autoconf/automake variables. But as a quick fix that -follows the current strategy, we simply tweak the existing __GLIBC__ -conditional. Indeed, uClibc pretends to be glibc and defines __GLIBC__, -but it does not replace it completely, hence the need to define -BTRFS_DISABLE_BACKTRACE when __GLIBC__ is not defined *or* when -__UCLIBC__ is defined. - -Signed-off-by: Thomas Petazzoni ---- - kerncompat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 0f207b7..e47d164 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -32,7 +32,7 @@ - - #include - --#ifndef __GLIBC__ -+#if !defined(__GLIBC__) || defined(__UCLIBC__) - #ifndef BTRFS_DISABLE_BACKTRACE - #define BTRFS_DISABLE_BACKTRACE - #endif --- -2.7.4 - diff --git a/buildroot/package/btrfs-progs/btrfs-progs.hash b/buildroot/package/btrfs-progs/btrfs-progs.hash index b8e6a07fd..900851363 100644 --- a/buildroot/package/btrfs-progs/btrfs-progs.hash +++ b/buildroot/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233 btrfs-progs-v5.2.1.tar.xz +sha256 5c2f048b8c814852614b0b262ab2d468ea02774ef01124ebc0ab708df262de5c btrfs-progs-v5.7.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING diff --git a/buildroot/package/btrfs-progs/btrfs-progs.mk b/buildroot/package/btrfs-progs/btrfs-progs.mk index 11a284499..22e1e330c 100644 --- a/buildroot/package/btrfs-progs/btrfs-progs.mk +++ b/buildroot/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.2.1 +BTRFS_PROGS_VERSION = 5.7 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib diff --git a/buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index 8375ae053..84435442c 100644 --- a/buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -5,7 +5,9 @@ Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: refresh for 1.29.0] +[petr.vorel@gmail.com: refresh for 1.32.0] Signed-off-by: "Yann E. MORIN" +Signed-off-by: Petr Vorel --- Makefile.flags | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) @@ -14,7 +16,7 @@ diff --git a/Makefile.flags b/Makefile.flags index 307afa7..885e323 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -153,7 +153,9 @@ ifeq ($(CONFIG_SELINUX),y) +@@ -176,7 +176,9 @@ ifeq ($(CONFIG_SELINUX),y) SELINUX_PC_MODULES = libselinux libsepol $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) CPPFLAGS += $(SELINUX_CFLAGS) diff --git a/buildroot/package/busybox/S02sysctl b/buildroot/package/busybox/S02sysctl deleted file mode 100644 index 6bb2fa165..000000000 --- a/buildroot/package/busybox/S02sysctl +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -PROGRAM="sysctl" - -SYSCTL_ARGS="" - -# shellcheck source=/dev/null -[ -r "/etc/default/$PROGRAM" ] && . "/etc/default/$PROGRAM" - -# Files are read from directories in the SYSCTL_SOURCES list, in the given -# order. A file may be used more than once, since there can be multiple -# symlinks to it. No attempt is made to prevent this. -SYSCTL_SOURCES="/etc/sysctl.d/ /usr/local/lib/sysctl.d/ /usr/lib/sysctl.d/ /lib/sysctl.d/ /etc/sysctl.conf" - -# Use some scripting to mimic the --system option of the sysctl provided by -# procps-ng but still reporting errors. Users not interested on error report -# can put "-e" in SYSCTL_ARGS. -# -# The file redirections do the following: -# -# - stdout is redirected to syslog with facility.level "kern.info" -# - stderr is redirected to syslog with facility.level "kern.err" -# - file dscriptor 4 is used to pass the result to the "start" function. -# -# Testing the sysctl exit code is fruitless, as at the moment, since it ends -# with status zero even if errors happen. Hopefully this will be fixed in a -# future version of Busybox. -# -run_program() { - # shellcheck disable=SC2086 # we need the word splitting - find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ - xargs -0 -r -n 1 readlink -f | { - prog_status="OK" - while :; do - read -r file - if [ -z "$file" ]; then - echo "$prog_status" >&4 - break - fi - echo "* Applying $file ..." - /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" - done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err - } 3>&1 | /usr/bin/logger -t sysctl -p kern.info -} - -start() { - printf '%s %s: ' "$1" "$PROGRAM" - status=$(run_program 4>&1) - echo "$status" - if [ "$status" = "OK" ]; then - return 0 - fi - return 1 -} - -case "$1" in - start) - start "Running";; - restart|reload) - start "Rerunning";; - stop) - :;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/buildroot/package/busybox/S02sysctl b/buildroot/package/busybox/S02sysctl new file mode 120000 index 000000000..796855c33 --- /dev/null +++ b/buildroot/package/busybox/S02sysctl @@ -0,0 +1 @@ +../procps-ng/S02sysctl \ No newline at end of file diff --git a/buildroot/package/busybox/busybox.hash b/buildroot/package/busybox/busybox.hash index e5b05ae73..222937960 100644 --- a/buildroot/package/busybox/busybox.hash +++ b/buildroot/package/busybox/busybox.hash @@ -1,4 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.31.1.tar.bz2.sha256 -sha256 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.32.0.tar.bz2.sha256 +sha256 c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2 # Locally computed -sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE +sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE +sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/buildroot/package/busybox/busybox.mk b/buildroot/package/busybox/busybox.mk index 55aa9b0bb..8c8303a35 100644 --- a/buildroot/package/busybox/busybox.mk +++ b/buildroot/package/busybox/busybox.mk @@ -4,11 +4,11 @@ # ################################################################################ -BUSYBOX_VERSION = 1.31.1 +BUSYBOX_VERSION = 1.32.0 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 -BUSYBOX_LICENSE = GPL-2.0 -BUSYBOX_LICENSE_FILES = LICENSE +BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 +BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE define BUSYBOX_HELP_CMDS @echo ' busybox-menuconfig - Run BusyBox menuconfig' @@ -42,6 +42,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ + $(if $(BR2_PACKAGE_IPCALC),ipcalc) \ $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ $(if $(BR2_PACKAGE_IPUTILS),iputils) \ $(if $(BR2_PACKAGE_KMOD),kmod) \ @@ -67,6 +68,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ $(if $(BR2_PACKAGE_VIM),vim) \ + $(if $(BR2_PACKAGE_WATCHDOG),watchdog) \ $(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WHOIS),whois) @@ -80,7 +82,6 @@ BUSYBOX_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" BUSYBOX_CFLAGS_busybox += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" endif -BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ @@ -148,53 +149,53 @@ define BUSYBOX_INSTALL_MDEV_CONF $(TARGET_DIR)/etc/mdev.conf endef define BUSYBOX_SET_MDEV - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE) endef endif # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA) endef endif ifeq ($(BR2_USE_MMU),y) define BUSYBOX_SET_MMU - $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU) endef else define BUSYBOX_SET_MMU - $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF) + $(call KCONFIG_DISABLE_OPT,CONFIG_ASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X) endef endif # If we're using static libs do the same for busybox ifeq ($(BR2_STATIC_LIBS),y) define BUSYBOX_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC) endef endif @@ -207,10 +208,17 @@ define BUSYBOX_INSTALL_UDHCPC_SCRIPT fi endef +define BUSYBOX_INSTALL_ZCIP_SCRIPT + if grep -q CONFIG_ZCIP=y $(@D)/.config; then \ + $(INSTALL) -m 0755 -D $(@D)/examples/zcip.script \ + $(TARGET_DIR)/usr/share/zcip/default.script; \ + fi +endef + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_SET_INIT - $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_INIT) endef ifeq ($(BR2_TARGET_GENERIC_GETTY),y) @@ -232,8 +240,8 @@ endif # BR2_INIT_BUSYBOX ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y) BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol define BUSYBOX_SET_SELINUX - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED) endef endif @@ -251,8 +259,8 @@ endif ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y) define BUSYBOX_SET_INDIVIDUAL_BINARIES - $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL) endef define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES @@ -297,7 +305,7 @@ endif ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) define BUSYBOX_SET_WATCHDOG - $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG) endef define BUSYBOX_INSTALL_WATCHDOG_SCRIPT $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ @@ -310,12 +318,12 @@ endif # PAM support requires thread support in the toolchain ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_TOOLCHAIN_HAS_THREADS),yy) define BUSYBOX_LINUX_PAM - $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_PAM) endef BUSYBOX_DEPENDENCIES += linux-pam else define BUSYBOX_LINUX_PAM - $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM) endef endif @@ -365,9 +373,19 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES) $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) + $(BUSYBOX_INSTALL_ZCIP_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) endef +# Install the sysvinit scripts, for the moment, but not those that already +# have a corresponding one in openrc. +define BUSYBOX_INSTALL_INIT_OPENRC + $(BUSYBOX_INSTALL_MDEV_SCRIPT) + $(BUSYBOX_INSTALL_LOGGING_SCRIPT) + $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_TELNET_SCRIPT) +endef + define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) diff --git a/buildroot/package/busybox/udhcpc.script b/buildroot/package/busybox/udhcpc.script index 0196351cd..ec4d9f618 100755 --- a/buildroot/package/busybox/udhcpc.script +++ b/buildroot/package/busybox/udhcpc.script @@ -61,7 +61,23 @@ case "$1" in wait_for_ipv6_default_route fi - if [ -n "$router" ] ; then + # RFC3442: If the DHCP server returns both a Classless + # Static Routes option and a Router option, the DHCP + # client MUST ignore the Router option. + if [ -n "$staticroutes" ]; then + echo "deleting routers" + route -n | while read dest gw mask flags metric ref use iface; do + [ "$iface" != "$interface" -o "$gw" = "0.0.0.0" ] || \ + route del -net "$dest" netmask "$mask" gw "$gw" dev "$interface" + done + + # format: dest1/mask gw1 ... destn/mask gwn + set -- $staticroutes + while [ -n "$1" -a -n "$2" ]; do + route add -net "$1" gw "$2" dev "$interface" + shift 2 + done + elif [ -n "$router" ] ; then echo "deleting routers" while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do : diff --git a/buildroot/package/c-capnproto/Config.in b/buildroot/package/c-capnproto/Config.in index d1f3236af..41a59d7a2 100644 --- a/buildroot/package/c-capnproto/Config.in +++ b/buildroot/package/c-capnproto/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_C_CAPNPROTO depends on BR2_INSTALL_LIBSTDCPP # capnproto depends on BR2_TOOLCHAIN_HAS_THREADS # capnproto depends on BR2_TOOLCHAIN_HAS_ATOMIC # capnproto + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # capnproto + depends on BR2_TOOLCHAIN_HAS_UCONTEXT # capnproto select BR2_PACKAGE_CAPNPROTO help A C plugin for Cap'n Proto. Generates the code generator @@ -14,10 +16,12 @@ config BR2_PACKAGE_C_CAPNPROTO https://github.com/opensourcerouting/c-capnproto -comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" +comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735" depends on BR2_USE_MMU depends on!BR2_HOST_GCC_AT_LEAST_5 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_ATOMIC + !BR2_TOOLCHAIN_HAS_ATOMIC || \ + BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ + !BR2_TOOLCHAIN_HAS_UCONTEXT diff --git a/buildroot/package/c-icap-modules/c-icap-modules.hash b/buildroot/package/c-icap-modules/c-icap-modules.hash index fa0eb0898..cc7949a09 100644 --- a/buildroot/package/c-icap-modules/c-icap-modules.hash +++ b/buildroot/package/c-icap-modules/c-icap-modules.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ -md5 d5f1e553cfe60180f9fa22c9a13005be c_icap_modules-0.5.3.tar.gz -sha1 df76f30b2cc29aeef700f477693e7017eaa847f4 c_icap_modules-0.5.3.tar.gz +md5 2f8c174f7a5414616f5a0a976ac4a221 c_icap_modules-0.5.4.tar.gz +sha1 ec7bb138d7775895cd8b2e12adc41dbf48eba1b7 c_icap_modules-0.5.4.tar.gz # Locally calculated -sha256 6e2f87a60379ffde26947c6e82ff0c7f614bc005588bf1efb40c74f69c82f925 c_icap_modules-0.5.3.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc c_icap_modules-0.5.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/c-icap-modules/c-icap-modules.mk b/buildroot/package/c-icap-modules/c-icap-modules.mk index b5356b1db..2eaa141af 100644 --- a/buildroot/package/c-icap-modules/c-icap-modules.mk +++ b/buildroot/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.5.3 +C_ICAP_MODULES_VERSION = 0.5.4 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ diff --git a/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch b/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch index 452223c67..6f886c9b7 100644 --- a/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch +++ b/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch @@ -3,7 +3,7 @@ From: Christos Tsantilas Date: Fri, 25 Jan 2019 06:42:22 -0800 Subject: [PATCH] Required fixes to compile and run under cygwin -[Retrieved from: +[Retrieved (and backported) from: https://github.com/c-icap/c-icap-server/commit/1631a6c1f50e152b8a45d8279c96086e5636795b, which has the side effect of fixing the build with the musl C library] Signed-off-by: Fabrice Fontaine @@ -189,14 +189,14 @@ index e6e9270..2d43a60 100644 +endif + +sys_logger_la_LIBADD = $(MODS_LIB_ADD) - sys_logger_la_CFLAGS= @MODULES_CFLAGS@ + sys_logger_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -sys_logger_la_LDFLAGS= -module -avoid-version +sys_logger_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ sys_logger_la_SOURCES = sys_logger.c -dnsbl_tables_la_LIBADD = @MODULES_LIBADD@ +dnsbl_tables_la_LIBADD = $(MODS_LIB_ADD) - dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ + dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -dnsbl_tables_la_LDFLAGS= -module -avoid-version +dnsbl_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ dnsbl_tables_la_SOURCES = dnsbl_tables.c @@ -232,7 +232,7 @@ index e6e9270..2d43a60 100644 -shared_cache_la_LIBADD= @MODULES_LIBADD@ +shared_cache_la_LIBADD= $(MODS_LIB_ADD) - shared_cache_la_CFLAGS= + shared_cache_la_CFLAGS= @OPENSSL_ADD_FLAG@ -shared_cache_la_LDFLAGS= -module -avoid-version +shared_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ shared_cache_la_SOURCES= shared_cache.c @@ -329,7 +329,7 @@ index 402c8f9..7d701b1 100644 +endif + +srv_echo_la_LIBADD = $(MODS_LIB_ADD) - srv_echo_la_CFLAGS= @MODULES_CFLAGS@ + srv_echo_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -srv_echo_la_LDFLAGS= -module -avoid-version +srv_echo_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ srv_echo_la_SOURCES = srv_echo.c @@ -351,7 +351,7 @@ index 44bbf21..ff73399 100644 +endif + +srv_ex206_la_LIBADD = $(MODS_LIB_ADD) - srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ + srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@ -srv_ex206_la_LDFLAGS= -module -avoid-version +srv_ex206_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ srv_ex206_la_SOURCES = srv_ex206.c diff --git a/buildroot/package/c-icap/c-icap.hash b/buildroot/package/c-icap/c-icap.hash index 9a761175c..8c70d7558 100644 --- a/buildroot/package/c-icap/c-icap.hash +++ b/buildroot/package/c-icap/c-icap.hash @@ -1,3 +1,6 @@ +# Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ +md5 d59e767ee3733cd81cea02819f13ac72 c_icap-0.5.6.tar.gz +sha1 361e36b63f895bd72bdd18aac5fe4192d4eff530 c_icap-0.5.6.tar.gz # Locally calculated -sha256 5eafc7775ecb3fe49545451eaa31f045716d0242977588c0ba27c2c1b4683d8a c_icap-0.5.5.tar.gz -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING +sha256 9826c50fc34f8fd4a3115844b27c9816dd3fcc3e7e2a3b6bcc7094ec307802b7 c_icap-0.5.6.tar.gz +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/buildroot/package/c-icap/c-icap.mk b/buildroot/package/c-icap/c-icap.mk index 8720cb16c..1a68674a6 100644 --- a/buildroot/package/c-icap/c-icap.mk +++ b/buildroot/package/c-icap/c-icap.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.5 +C_ICAP_VERSION = 0.5.6 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/c-periphery/Config.in b/buildroot/package/c-periphery/Config.in index cf8675801..0bfb4b1f1 100644 --- a/buildroot/package/c-periphery/Config.in +++ b/buildroot/package/c-periphery/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_C_PERIPHERY bool "c-periphery" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 help c-periphery is a set of C wrapper functions for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O interface access in @@ -15,6 +14,3 @@ config BR2_PACKAGE_C_PERIPHERY integration with other projects, and is MIT licensed. https://github.com/vsergeev/c-periphery - -comment "c-periphery needs a toolchain w/ kernel headers >= 4.8" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 diff --git a/buildroot/package/c-periphery/c-periphery.hash b/buildroot/package/c-periphery/c-periphery.hash index 244f8f60f..daebb0435 100644 --- a/buildroot/package/c-periphery/c-periphery.hash +++ b/buildroot/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c455c42b26818d199ac227cd19714f265623e15d363fdfdf47a2416a4165654 c-periphery-2.1.0.tar.gz -sha256 e7b9464cb8511f19ddb40f9cf52fe86b3dfe38b2faed9d7bbc3d5707677ffbe3 LICENSE +sha256 d31fb19c2645b9658ad5ca9313c7f0488c16a52e5adf8b2845e1955ad94546ae c-periphery-2.2.4.tar.gz +sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE diff --git a/buildroot/package/c-periphery/c-periphery.mk b/buildroot/package/c-periphery/c-periphery.mk index bb50434ef..ce0e03f1e 100644 --- a/buildroot/package/c-periphery/c-periphery.mk +++ b/buildroot/package/c-periphery/c-periphery.mk @@ -4,24 +4,10 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.1.0 +C_PERIPHERY_VERSION = 2.2.4 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES -# only a static library -C_PERIPHERY_INSTALL_TARGET = NO C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE -define C_PERIPHERY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# There is no 'install' rule in the Makefile, so we handle things -# manually. -define C_PERIPHERY_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/periphery.a $(STAGING_DIR)/usr/lib/libc-periphery.a - mkdir -p $(STAGING_DIR)/usr/include/c-periphery/ - cp -dpfr $(@D)/src/*.h $(STAGING_DIR)/usr/include/c-periphery/ -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/cage/Config.in b/buildroot/package/cage/Config.in new file mode 100644 index 000000000..c8097751f --- /dev/null +++ b/buildroot/package/cage/Config.in @@ -0,0 +1,24 @@ +comment "cage needs udev, mesa3d w/ EGL and GLES support" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ + !BR2_PACKAGE_MESA3D_OPENGL_ES || \ + !BR2_PACKAGE_HAS_UDEV + +comment "cage needs a toolchain w/ threads, locale, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE || \ + BR2_STATIC_LIBS + +config BR2_PACKAGE_CAGE + bool "cage" + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_ENABLE_LOCALE # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots + depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots + select BR2_PACKAGE_WLROOTS + help + Kiosk compositor for Wayland, which displays a single + maximized application at a time. + + https://www.hjdskes.nl/projects/cage/ diff --git a/buildroot/package/cage/cage.hash b/buildroot/package/cage/cage.hash new file mode 100644 index 000000000..5cae952d7 --- /dev/null +++ b/buildroot/package/cage/cage.hash @@ -0,0 +1,5 @@ +# Generated locally +sha256 38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac cage-0.1.2.1.tar.gz + +# Hashes for license files: +sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/buildroot/package/cage/cage.mk b/buildroot/package/cage/cage.mk new file mode 100644 index 000000000..9fc01d36c --- /dev/null +++ b/buildroot/package/cage/cage.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# cage +# +################################################################################ + +CAGE_VERSION = 0.1.2.1 +CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION) +CAGE_LICENSE = MIT +CAGE_LICENSE_FILES = LICENSE +CAGE_DEPENDENCIES = host-pkgconf wlroots + +ifeq ($(BR2_PACKAGE_XORG7),y) +CAGE_CONF_OPTS = -Dxwayland=true +else +CAGE_CONF_OPTS = -Dxwayland=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/cairo/cairo.mk b/buildroot/package/cairo/cairo.mk index c6a3dad93..3d2fdbd5d 100644 --- a/buildroot/package/cairo/cairo.mk +++ b/buildroot/package/cairo/cairo.mk @@ -41,7 +41,7 @@ HOST_CAIRO_CONF_OPTS = \ --enable-interpreter=no \ --disable-directfb \ --enable-ft \ - --disable-gobject \ + --enable-gobject \ --disable-glesv2 \ --disable-vg \ --disable-xlib \ @@ -51,13 +51,14 @@ HOST_CAIRO_CONF_OPTS = \ --disable-ps \ --disable-pdf \ --enable-png \ - --disable-script \ + --enable-script \ --disable-svg \ --disable-tee \ --disable-xml HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ + host-libglib2 \ host-libpng \ host-pixman \ host-pkgconf diff --git a/buildroot/package/can-utils/can-utils.hash b/buildroot/package/can-utils/can-utils.hash index adbf5b0bc..f76576773 100644 --- a/buildroot/package/can-utils/can-utils.hash +++ b/buildroot/package/can-utils/can-utils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ea0f96a02af37f16713284c7bdccdbae716d9bcb979ccfb51185d696c31f9ecf can-utils-2020.02.0.tar.gz +sha256 a766aad89955b9cfcca27f61ef988fa169565c3657d2789808c0f33a7afa23c8 can-utils-2020.02.04.tar.gz sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/buildroot/package/can-utils/can-utils.mk b/buildroot/package/can-utils/can-utils.mk index cd4dba561..5227bf485 100644 --- a/buildroot/package/can-utils/can-utils.mk +++ b/buildroot/package/can-utils/can-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAN_UTILS_VERSION = 2020.02.0 +CAN_UTILS_VERSION = 2020.02.04 CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt diff --git a/buildroot/package/cannelloni/0001-Add-missing-cstdio-include.patch b/buildroot/package/cannelloni/0001-Add-missing-cstdio-include.patch deleted file mode 100644 index 1e4ad0039..000000000 --- a/buildroot/package/cannelloni/0001-Add-missing-cstdio-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d41f5ec6bb66654558757c3ef9cd2a158ee06ccc Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 15 Feb 2017 09:29:29 +0100 -Subject: [PATCH] Add missing include - -This header defines EOF macro. Some toolchains cannot -find this macro, if is missing. So include it -explicitly. - -Signed-off-by: Yegor Yefremov ---- - sctpthread.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sctpthread.cpp b/sctpthread.cpp -index 6c83fed..d83b472 100644 ---- a/sctpthread.cpp -+++ b/sctpthread.cpp -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - - #include --- -2.1.4 - diff --git a/buildroot/package/cannelloni/cannelloni.hash b/buildroot/package/cannelloni/cannelloni.hash index 41cb72816..107415b0a 100644 --- a/buildroot/package/cannelloni/cannelloni.hash +++ b/buildroot/package/cannelloni/cannelloni.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fe5abb1c9e523049c48dd906603bc762cc55ccd20c16dbec7dc64163b9eefccf cannelloni-20160414.tar.gz +sha256 de44b7e327fbf38883f46e51a5afd07de5144f2e44c5f42b7f2f0741165f0b13 cannelloni-1.0.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/buildroot/package/cannelloni/cannelloni.mk b/buildroot/package/cannelloni/cannelloni.mk index cc99c54aa..f97a09176 100644 --- a/buildroot/package/cannelloni/cannelloni.mk +++ b/buildroot/package/cannelloni/cannelloni.mk @@ -4,10 +4,11 @@ # ################################################################################ -CANNELLONI_VERSION = 20160414 -CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION)) +CANNELLONI_VERSION = 1.0.0 +CANNELLONI_SITE = $(call github,mguentner,cannelloni,v$(CANNELLONI_VERSION)) CANNELLONI_LICENSE = GPL-2.0 CANNELLONI_LICENSE_FILES = gpl-2.0.txt +CANNELLONI_CONF_OPTS = -DCMAKE_CXX_FLAGS="-std=c++11" ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y) CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON diff --git a/buildroot/package/capnproto/Config.in b/buildroot/package/capnproto/Config.in index cd9cb647a..943ba9de2 100644 --- a/buildroot/package/capnproto/Config.in +++ b/buildroot/package/capnproto/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_CAPNPROTO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_TOOLCHAIN_HAS_UCONTEXT help Cap'n Proto is an insanely fast data interchange format and capability-based RPC system. Think JSON, except @@ -15,10 +17,12 @@ config BR2_PACKAGE_CAPNPROTO https://capnproto.org/index.html -comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" +comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735" depends on BR2_USE_MMU depends on !BR2_HOST_GCC_AT_LEAST_5 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_ATOMIC + !BR2_TOOLCHAIN_HAS_ATOMIC || \ + BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ + !BR2_TOOLCHAIN_HAS_UCONTEXT diff --git a/buildroot/package/capnproto/capnproto.hash b/buildroot/package/capnproto/capnproto.hash index 98467f863..d4500e0aa 100644 --- a/buildroot/package/capnproto/capnproto.hash +++ b/buildroot/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28 capnproto-0.7.0.tar.gz +sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/buildroot/package/capnproto/capnproto.mk b/buildroot/package/capnproto/capnproto.mk index 2afeb8ffa..2e7b095cb 100644 --- a/buildroot/package/capnproto/capnproto.mk +++ b/buildroot/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.7.0 +CAPNPROTO_VERSION = 0.8.0 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/cargo-bin/cargo-bin.hash b/buildroot/package/cargo-bin/cargo-bin.hash deleted file mode 100644 index 0e9e9c5c6..000000000 --- a/buildroot/package/cargo-bin/cargo-bin.hash +++ /dev/null @@ -1,13 +0,0 @@ -# From https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32 cargo-0.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761 cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz -# Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY diff --git a/buildroot/package/cargo-bin/cargo-bin.mk b/buildroot/package/cargo-bin/cargo-bin.mk deleted file mode 100644 index 3614f7a53..000000000 --- a/buildroot/package/cargo-bin/cargo-bin.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# cargo-bin -# -################################################################################ - -CARGO_BIN_VERSION = 0.33.0 -CARGO_BIN_SITE = https://static.rust-lang.org/dist -CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz -CARGO_BIN_LICENSE = Apache-2.0 or MIT -CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -$(eval $(host-generic-package)) diff --git a/buildroot/package/cargo/Config.in.host b/buildroot/package/cargo/Config.in.host deleted file mode 100644 index c33c6851f..000000000 --- a/buildroot/package/cargo/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_CARGO - bool "host cargo" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_RUSTC - help - Cargo is the package manager for the Rust programming - language. - - https://crates.io/ diff --git a/buildroot/package/cargo/cargo.hash b/buildroot/package/cargo/cargo.hash deleted file mode 100644 index baa2cfbc3..000000000 --- a/buildroot/package/cargo/cargo.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Locally generated -sha256 1a4bae6910ca895157a1abe8225eb2b7e9b49ee1ee1e4e72fb81cb8e1446bff9 cargo-0.26.0.tar.gz -sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY -# From https://src.fedoraproject.org/repo/pkgs/cargo/cargo-0.26.0-vendor.tar.xz/sha512 -sha512 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 cargo-0.26.0-vendor.tar.xz diff --git a/buildroot/package/cargo/cargo.mk b/buildroot/package/cargo/cargo.mk deleted file mode 100644 index a387281b4..000000000 --- a/buildroot/package/cargo/cargo.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# cargo -# -################################################################################ - -CARGO_VERSION = 0.26.0 -CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION)) -CARGO_LICENSE = Apache-2.0 or MIT -CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -CARGO_DEPS_SHA512 = 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 -CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512) -CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz - -CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf -CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION)) -CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz - -HOST_CARGO_EXTRA_DOWNLOADS = \ - $(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \ - $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) - -HOST_CARGO_DEPENDENCIES = \ - $(BR2_CMAKE_HOST_DEPENDENCY) \ - host-pkgconf \ - host-openssl \ - host-libhttpparser \ - host-libssh2 \ - host-libcurl \ - host-rustc \ - host-cargo-bin - -HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo -HOST_CARGO_HOME = $(HOST_DIR)/share/cargo - -define HOST_CARGO_EXTRACT_DEPS - @mkdir -p $(@D)/vendor - $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS - -define HOST_CARGO_EXTRACT_INSTALLER - @mkdir -p $(@D)/src/rust-installer - $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER - -define HOST_CARGO_SETUP_DEPS - mkdir -p $(@D)/.cargo - ( \ - echo "[source.crates-io]"; \ - echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \ - echo "replace-with = 'vendored-sources'"; \ - echo "[source.vendored-sources]"; \ - echo "directory = '$(@D)/vendor'"; \ - ) > $(@D)/.cargo/config -endef - -HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS - -HOST_CARGO_SNAP_OPTS = \ - --release \ - $(if $(VERBOSE),--verbose) - -HOST_CARGO_ENV = \ - RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \ - CARGO_HOME=$(HOST_CARGO_HOME) - -define HOST_CARGO_BUILD_CMDS - (cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \ - build $(HOST_CARGO_SNAP_OPTS)) -endef - -define HOST_CARGO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo - $(INSTALL) -D package/cargo/config.in \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - $(HOST_DIR)/share/cargo/config -endef - -$(eval $(host-generic-package)) diff --git a/buildroot/package/cc-tool/0001-add-missing-stdarg-include.patch b/buildroot/package/cc-tool/0001-add-missing-stdarg-include.patch deleted file mode 100644 index c4f47fd30..000000000 --- a/buildroot/package/cc-tool/0001-add-missing-stdarg-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing include for va_list - -Fixes the build on uClibc. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/common/log.h -=================================================================== ---- a/src/common/log.h -+++ b/src/common/log.h -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include "common.h" - - class Log diff --git a/buildroot/package/cc-tool/0002-boost-m4.patch b/buildroot/package/cc-tool/0002-boost-m4.patch deleted file mode 100644 index dc07701de..000000000 --- a/buildroot/package/cc-tool/0002-boost-m4.patch +++ /dev/null @@ -1,883 +0,0 @@ -The version of boost.m4 initially included in cc-tool has an issue -with gcc5 (one of its tests fails due to the first change described in [1] -"Preprocessor issues"). - -This was fixed upstream (boost.m4 project) in Nov 2014 [2]. - -We add the latest commit [3] of upstream boost.m4 plus a patch from github PR -[4] to add detection for gcc 5.1. - -[1] -https://gcc.gnu.org/gcc-5/porting_to.html - -[2] -https://github.com/tsuna/boost.m4/commit/32553aaf4d5090da19aa0ec33b936982c685009f - -[3] -https://github.com/tsuna/boost.m4/commit/d9ff75b6af66360d76f46f469a26ab18e24e1030 - -[4] -https://github.com/rubenk/boost.m4/commit/b879eb85f112cf054643d2e7f9544c230299c0b2 - -Signed-off-by: Jörg Krause - -diff -purN cc-tool.original/m4/boost.m4 cc-tool/m4/boost.m4 ---- cc-tool.original/m4/boost.m4 2015-07-28 15:43:25.458840000 +0200 -+++ cc-tool/m4/boost.m4 2015-07-28 16:12:02.532791424 +0200 -@@ -1,5 +1,5 @@ - # boost.m4: Locate Boost headers and libraries for autoconf-based projects. --# Copyright (C) 2007, 2008, 2009, 2010, 2011 Benoit Sigoure -+# Copyright (C) 2007-2011, 2014 Benoit Sigoure - # - # 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 -@@ -22,7 +22,7 @@ - # along with this program. If not, see . - - m4_define([_BOOST_SERIAL], [m4_translit([ --# serial 16 -+# serial 25 - ], [# - ], [])]) - -@@ -59,7 +59,8 @@ m4_pattern_forbid([^_?(BOOST|Boost)_]) - # It could be useful to turn this into a macro which extracts the - # value of any macro. - m4_define([_BOOST_SED_CPP], --[AC_LANG_PREPROC_REQUIRE()dnl -+[AC_LANG_PUSH([C++])dnl -+AC_LANG_PREPROC_REQUIRE()dnl - AC_REQUIRE([AC_PROG_SED])dnl - AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) - AS_IF([dnl eval is necessary to expand ac_cpp. -@@ -71,13 +72,31 @@ dnl strip `\n' with backquotes, not the - dnl boost_cv_lib_version='1_37\r' for instance, which breaks - dnl everything else. - dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK -+dnl -+dnl Beware that GCC 5, when expanding macros, may embed # line directives -+dnl a within single line: -+dnl -+dnl # 1 "conftest.cc" -+dnl # 1 "" -+dnl # 1 "" -+dnl # 1 "conftest.cc" -+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3 -+dnl # 2 "conftest.cc" 2 -+dnl boost-lib-version = -+dnl # 2 "conftest.cc" 3 -+dnl "1_56" -+dnl -+dnl So get rid of the # lines, and glue the remaining ones together. - (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | -+ grep -v '#' | - tr -d '\r' | -+ tr -s '\n' ' ' | - $SED -n -e "$1" >conftest.i 2>&1], - [$3], - [$4]) - rm -rf conftest* --])# AC_EGREP_CPP -+AC_LANG_POP([C++])dnl -+])# _BOOST_SED_CPP - - - -@@ -206,7 +225,7 @@ AC_LANG_POP([C++])dnl - AC_CACHE_CHECK([for Boost's header version], - [boost_cv_lib_version], - [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl -- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}], -+ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]], - [#include - boost-lib-version = BOOST_LIB_VERSION], - [boost_cv_lib_version=`cat conftest.i`])]) -@@ -214,13 +233,14 @@ boost-lib-version = BOOST_LIB_VERSION], - boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` - case $boost_major_version in #( - '' | *[[!0-9]]*) -- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version]) -+ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version']) - ;; - esac - fi - CPPFLAGS=$boost_save_CPPFLAGS - ])# BOOST_REQUIRE - -+ - # BOOST_STATIC() - # -------------- - # Add the "--enable-static-boost" configure argument. If this argument is given -@@ -232,6 +252,7 @@ AC_DEFUN([BOOST_STATIC], - [enable_static_boost=yes], - [enable_static_boost=no])])# BOOST_STATIC - -+ - # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) - # -------------------------------------------------------------------------- - # Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for -@@ -264,14 +285,16 @@ fi - ])# BOOST_FIND_HEADER - - --# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], --# [CXX-PROLOGUE]) --# ------------------------------------------------------------------------- --# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for --# libboost_thread). Check that HEADER-NAME works and check that --# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument --# CXX-PROLOGUE can be used to include some C++ code before the `main' --# function. -+# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Look for the Boost library COMPONENT-NAME (e.g., `thread', for -+# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g., -+# "thread_win32 thread"). Check that HEADER-NAME works and check that -+# libboost_LIB-NAME can link with the code CXX-TEST. The optional -+# argument CXX-PROLOGUE can be used to include some C++ code before -+# the `main' function. - # - # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above). - # -@@ -285,7 +308,7 @@ fi - # builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp - # ... If you want to make sure you have a specific version of Boost - # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro. --AC_DEFUN([BOOST_FIND_LIB], -+AC_DEFUN([BOOST_FIND_LIBS], - [AC_REQUIRE([BOOST_REQUIRE])dnl - AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl - AC_REQUIRE([BOOST_STATIC])dnl -@@ -299,32 +322,69 @@ AS_VAR_PUSHDEF([Boost_lib], [boost_cv_li - AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl - AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl - AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl --BOOST_FIND_HEADER([$3]) -+BOOST_FIND_HEADER([$4]) - boost_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" --# Now let's try to find the library. The algorithm is as follows: first look --# for a given library name according to the user's PREFERRED-RT-OPT. For each --# library name, we prefer to use the ones that carry the tag (toolset name). --# Each library is searched through the various standard paths were Boost is --# usually installed. If we can't find the standard variants, we try to --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist --# but there's -obviously- libboost_threads-mt.dylib). - AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], -- [Boost_lib=no -- case "$2" in #( -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #( -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #( -- *) boost_mt=; boost_rtopt=$2;; -+ [_BOOST_FIND_LIBS($@)]) -+case $Boost_lib in #( -+ (no) _AC_MSG_LOG_CONFTEST -+ AC_MSG_ERROR([cannot find the flags to link with Boost $1]) -+ ;; -+esac -+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl -+AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl -+AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl -+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl -+CPPFLAGS=$boost_save_CPPFLAGS -+AS_VAR_POPDEF([Boost_lib])dnl -+AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl -+AS_VAR_POPDEF([Boost_lib_LDPATH])dnl -+AS_VAR_POPDEF([Boost_lib_LIBS])dnl -+AC_LANG_POP([C++])dnl -+fi -+]) -+ -+ -+# BOOST_FIND_LIB([LIB-NAME], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Backward compatibility wrapper for BOOST_FIND_LIBS. -+AC_DEFUN([BOOST_FIND_LIB], -+[BOOST_FIND_LIBS([$1], $@)]) -+ -+ -+# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Real implementation of BOOST_FIND_LIBS: rely on these local macros: -+# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS -+# -+# The algorithm is as follows: first look for a given library name -+# according to the user's PREFERRED-RT-OPT. For each library name, we -+# prefer to use the ones that carry the tag (toolset name). Each -+# library is searched through the various standard paths were Boost is -+# usually installed. If we can't find the standard variants, we try -+# to enforce -mt (for instance on MacOSX, libboost_thread.dylib -+# doesn't exist but there's -obviously- libboost_thread-mt.dylib). -+AC_DEFUN([_BOOST_FIND_LIBS], -+[Boost_lib=no -+ case "$3" in #( -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #( -+ (*) boost_mt=; boost_rtopt=$3;; - esac - if test $enable_static_boost = yes; then - boost_rtopt="s$boost_rtopt" - fi - # Find the proper debug variant depending on what we've been asked to find. - case $boost_rtopt in #( -- *d*) boost_rt_d=$boost_rtopt;; #( -- *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') -+ (*d*) boost_rt_d=$boost_rtopt;; #( -+ (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( -- *) boost_rt_d='-d';; -+ (*) boost_rt_d='-d';; - esac - # If the PREFERRED-RT-OPT are not empty, prepend a `-'. - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" -@@ -335,8 +395,8 @@ AC_CACHE_CHECK([for the Boost $1 library - AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?]) - boost_save_ac_objext=$ac_objext - # Generate the test file. -- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3> --$5], [$4])]) -+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4> -+$6], [$5])]) - dnl Optimization hacks: compiling C++ is slow, especially with Boost. What - dnl we're trying to do here is guess the right combination of link flags - dnl (LIBS / LDFLAGS) to use a given library. This can take several -@@ -358,21 +418,22 @@ dnl start the for loops). - [AC_MSG_ERROR([cannot compile a test that uses Boost $1])]) - ac_objext=$boost_save_ac_objext - boost_failed_libs= --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones --# matter. -+# Don't bother to ident the following nested for loops, only the 2 -+# innermost ones matter. -+for boost_lib_ in $2; do - for boost_tag_ in -$boost_cv_lib_tag ''; do - for boost_ver_ in -$boost_cv_lib_version ''; do - for boost_mt_ in $boost_mt -mt ''; do - for boost_rtopt_ in $boost_rtopt '' -d; do - for boost_lib in \ -- boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_mt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_ver_ -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_ver_ - do - # Avoid testing twice the same lib - case $boost_failed_libs in #( -- *@$boost_lib@*) continue;; -+ (*@$boost_lib@*) continue;; - esac - # If with_boost is empty, we'll search in /lib first, which is not quite - # right so instead we'll try to a location based on where the headers are. -@@ -382,14 +443,17 @@ for boost_rtopt_ in $boost_rtopt '' -d; - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ - "$with_boost" C:/Boost/lib /lib* - do -- test -e "$boost_ldpath" || continue -+ # Don't waste time with directories that don't exist. -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then -+ continue -+ fi - boost_save_LDFLAGS=$LDFLAGS - # Are we looking for a static library? - case $boost_ldpath:$boost_rtopt_ in #( -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) - Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext" - test -e "$Boost_lib_LIBS" || continue;; #( -- *) # No: use -lboost_foo to find the shared library. -+ (*) # No: use -lboost_foo to find the shared library. - Boost_lib_LIBS="-l$boost_lib";; - esac - boost_save_LIBS=$LIBS -@@ -403,9 +467,35 @@ dnl generated only once above (before we - LDFLAGS=$boost_save_LDFLAGS - LIBS=$boost_save_LIBS - if test x"$Boost_lib" = xyes; then -- Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-rpath,$boost_ldpath" -+ # Check or used cached result of whether or not using -R or -+ # -rpath makes sense. Some implementations of ld, such as for -+ # Mac OSX, require -rpath but -R is the flag known to work on -+ # other systems. https://github.com/tsuna/boost.m4/issues/19 -+ AC_CACHE_VAL([boost_cv_rpath_link_ldflag], -+ [case $boost_ldpath in -+ '') # Nothing to do. -+ boost_cv_rpath_link_ldflag= -+ boost_rpath_link_ldflag_found=yes;; -+ *) -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" -+ LIBS="$boost_save_LIBS $Boost_lib_LIBS" -+ _BOOST_AC_LINK_IFELSE([], -+ [boost_rpath_link_ldflag_found=yes -+ break], -+ [boost_rpath_link_ldflag_found=no]) -+ done -+ ;; -+ esac -+ AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"], -+ [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])]) -+ LDFLAGS=$boost_save_LDFLAGS -+ LIBS=$boost_save_LIBS -+ ]) -+ test x"$boost_ldpath" != x && -+ Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" - Boost_lib_LDPATH="$boost_ldpath" -- break 6 -+ break 7 - else - boost_failed_libs="$boost_failed_libs@$boost_lib@" - fi -@@ -415,25 +505,10 @@ done - done - done - done -+done # boost_lib_ - rm -f conftest.$ac_objext - ]) --case $Boost_lib in #( -- no) _AC_MSG_LOG_CONFTEST -- AC_MSG_ERROR([cannot find the flags to link with Boost $1]) -- ;; --esac --AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl --AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl --AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl --AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl --CPPFLAGS=$boost_save_CPPFLAGS --AS_VAR_POPDEF([Boost_lib])dnl --AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl --AS_VAR_POPDEF([Boost_lib_LDPATH])dnl --AS_VAR_POPDEF([Boost_lib_LIBS])dnl --AC_LANG_POP([C++])dnl --fi --])# BOOST_FIND_LIB -+ - - - # --------------------------------------- # -@@ -475,20 +550,20 @@ BOOST_FIND_HEADER([boost/asio.hpp])]) - - # BOOST_BIND() - # ------------ --# Look for Boost.Bind -+# Look for Boost.Bind. - BOOST_DEFUN([Bind], - [BOOST_FIND_HEADER([boost/bind.hpp])]) - - - # BOOST_CHRONO() --# ------------------ --# Look for Boost.Chrono -+# -------------- -+# Look for Boost.Chrono. - BOOST_DEFUN([Chrono], - [# Do we have to check for Boost.System? This link-time dependency was - # added as of 1.35.0. If we have a version <1.35, we must not attempt to - # find Boost.System as it didn't exist by then. - if test $boost_major_version -ge 135; then --BOOST_SYSTEM([$1]) -+ BOOST_SYSTEM([$1]) - fi # end of the Boost.System check. - boost_filesystem_save_LIBS=$LIBS - boost_filesystem_save_LDFLAGS=$LDFLAGS -@@ -499,14 +574,40 @@ BOOST_FIND_LIB([chrono], [$1], - [boost/chrono.hpp], - [boost::chrono::thread_clock d;]) - if test $enable_static_boost = yes && test $boost_major_version -ge 135; then -- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"]) -+ BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS" - fi - LIBS=$boost_filesystem_save_LIBS - LDFLAGS=$boost_filesystem_save_LDFLAGS -- - ])# BOOST_CHRONO - - -+# BOOST_CONTEXT([PREFERRED-RT-OPT]) -+# ----------------------------------- -+# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -+# 1.51.0 -+BOOST_DEFUN([Context], -+[BOOST_FIND_LIB([context], [$1], -+ [boost/context/all.hpp],[[ -+// creates a stack -+void * stack_pointer = new void*[4096]; -+std::size_t const size = sizeof(void*[4096]); -+ -+// context fc uses f() as context function -+// fcontext_t is placed on top of context stack -+// a pointer to fcontext_t is returned -+fc = ctx::make_fcontext(stack_pointer, size, f); -+return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl -+namespace ctx = boost::context; -+// context -+static ctx::fcontext_t fcm, *fc; -+// context-function -+static void f(intptr_t i) { -+ ctx::jump_fcontext(fc, &fcm, i * 2); -+}]) -+])# BOOST_CONTEXT -+ -+ - # BOOST_CONVERSION() - # ------------------ - # Look for Boost.Conversion (cast / lexical_cast) -@@ -516,6 +617,52 @@ BOOST_FIND_HEADER([boost/lexical_cast.hp - ])# BOOST_CONVERSION - - -+# BOOST_COROUTINE([PREFERRED-RT-OPT]) -+# ----------------------------------- -+# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -+# 1.53.0 -+BOOST_DEFUN([Coroutine], -+[ -+boost_coroutine_save_LIBS=$LIBS -+boost_coroutine_save_LDFLAGS=$LDFLAGS -+# Link-time dependency from coroutine to context -+BOOST_CONTEXT([$1]) -+# Starting from Boost 1.55 a dependency on Boost.System is added -+if test $boost_major_version -ge 155; then -+ BOOST_SYSTEM([$1]) -+fi -+m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)]) -+LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS" -+LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS" -+ -+BOOST_FIND_LIB([coroutine], [$1], -+ [boost/coroutine/coroutine.hpp], -+ [boost::coroutines::coroutine< int(int) > coro; coro.empty();]) -+ -+# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54 -+# coroutine doesn't use context from its headers but from its library. -+if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then -+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS" -+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS" -+fi -+if test $enable_static_boost = yes && test $boost_major_version -ge 155; then -+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS" -+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS" -+fi -+LIBS=$boost_coroutine_save_LIBS -+LDFLAGS=$boost_coroutine_save_LDFLAGS -+])# BOOST_COROUTINE -+ -+ -+# BOOST_CRC() -+# ----------- -+# Look for Boost.CRC -+BOOST_DEFUN([CRC], -+[BOOST_FIND_HEADER([boost/crc.hpp]) -+])# BOOST_CRC -+ -+ - # BOOST_DATE_TIME([PREFERRED-RT-OPT]) - # ----------------------------------- - # Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the -@@ -538,7 +685,7 @@ BOOST_DEFUN([Filesystem], - # added as of 1.35.0. If we have a version <1.35, we must not attempt to - # find Boost.System as it didn't exist by then. - if test $boost_major_version -ge 135; then --BOOST_SYSTEM([$1]) -+ BOOST_SYSTEM([$1]) - fi # end of the Boost.System check. - boost_filesystem_save_LIBS=$LIBS - boost_filesystem_save_LDFLAGS=$LDFLAGS -@@ -548,23 +695,34 @@ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" - BOOST_FIND_LIB([filesystem], [$1], - [boost/filesystem/path.hpp], [boost::filesystem::path p;]) - if test $enable_static_boost = yes && test $boost_major_version -ge 135; then -- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"]) -+ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" - fi - LIBS=$boost_filesystem_save_LIBS - LDFLAGS=$boost_filesystem_save_LDFLAGS - ])# BOOST_FILESYSTEM - - -+# BOOST_FLYWEIGHT() -+# ----------------- -+# Look for Boost.Flyweight. -+BOOST_DEFUN([Flyweight], -+[dnl There's a hidden dependency on pthreads. -+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl -+BOOST_FIND_HEADER([boost/flyweight.hpp]) -+AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag]) -+]) -+ -+ - # BOOST_FOREACH() - # --------------- --# Look for Boost.Foreach -+# Look for Boost.Foreach. - BOOST_DEFUN([Foreach], - [BOOST_FIND_HEADER([boost/foreach.hpp])]) - - - # BOOST_FORMAT() - # -------------- --# Look for Boost.Format -+# Look for Boost.Format. - # Note: we can't check for boost/format/format_fwd.hpp because the header isn't - # standalone. It can't be compiled because it triggers the following error: - # boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std' -@@ -580,6 +738,14 @@ BOOST_DEFUN([Function], - [BOOST_FIND_HEADER([boost/function.hpp])]) - - -+# BOOST_GEOMETRY() -+# ---------------- -+# Look for Boost.Geometry (new since 1.47.0). -+BOOST_DEFUN([Geometry], -+[BOOST_FIND_HEADER([boost/geometry.hpp]) -+])# BOOST_GEOMETRY -+ -+ - # BOOST_GRAPH([PREFERRED-RT-OPT]) - # ------------------------------- - # Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the -@@ -615,9 +781,18 @@ BOOST_DEFUN([Lambda], - [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) - - -+# BOOST_LOCALE() -+# -------------- -+# Look for Boost.Locale -+BOOST_DEFUN([Locale], -+[BOOST_FIND_LIB([locale], [$1], -+ [boost/locale.hpp], -+ [[boost::locale::generator gen; std::locale::global(gen(""));]]) -+])# BOOST_LOCALE -+ - # BOOST_LOG([PREFERRED-RT-OPT]) - # ----------------------------- --# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the -+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Log], - [BOOST_FIND_LIB([log], [$1], -@@ -628,12 +803,12 @@ BOOST_DEFUN([Log], - - # BOOST_LOG_SETUP([PREFERRED-RT-OPT]) - # ----------------------------------- --# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the -+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Log_Setup], - [AC_REQUIRE([BOOST_LOG])dnl - BOOST_FIND_LIB([log_setup], [$1], -- [boost/log/utility/init/from_settings.hpp], -+ [boost/log/utility/setup/from_settings.hpp], - [boost::log::basic_settings bs; bs.empty();]) - ])# BOOST_LOG_SETUP - -@@ -650,6 +825,29 @@ BOOST_DEFUN([Math], - [BOOST_FIND_HEADER([boost/math/special_functions.hpp])]) - - -+# BOOST_MPI([PREFERRED-RT-OPT]) -+# ------------------------------- -+# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is -+# set, otherwise tries CXX -+# -+BOOST_DEFUN([MPI], -+[boost_save_CXX=${CXX} -+boost_save_CXXCPP=${CXXCPP} -+if test x"${MPICXX}" != x; then -+ CXX=${MPICXX} -+ CXXCPP="${MPICXX} -E" -+fi -+BOOST_FIND_LIB([mpi], [$1], -+ [boost/mpi.hpp], -+ [int argc = 0; -+ char **argv = 0; -+ boost::mpi::environment env(argc,argv);]) -+CXX=${boost_save_CXX} -+CXXCPP=${boost_save_CXXCPP} -+])# BOOST_MPI -+ -+ - # BOOST_MULTIARRAY() - # ------------------ - # Look for Boost.MultiArray -@@ -657,6 +855,14 @@ BOOST_DEFUN([MultiArray], - [BOOST_FIND_HEADER([boost/multi_array.hpp])]) - - -+# BOOST_NUMERIC_UBLAS() -+# -------------------------- -+# Look for Boost.NumericUblas (Basic Linear Algebra) -+BOOST_DEFUN([Numeric_Ublas], -+[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp]) -+])# BOOST_NUMERIC_UBLAS -+ -+ - # BOOST_NUMERIC_CONVERSION() - # -------------------------- - # Look for Boost.NumericConversion (policy-based numeric conversion) -@@ -679,6 +885,12 @@ BOOST_DEFUN([Preprocessor], - [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])]) - - -+# BOOST_RANGE() -+# -------------------- -+# Look for Boost.Range -+BOOST_DEFUN([Range], -+[BOOST_FIND_HEADER([boost/range/adaptors.hpp])]) -+ - # BOOST_UNORDERED() - # ----------------- - # Look for Boost.Unordered -@@ -725,9 +937,9 @@ BOOST_DEFUN([Python], - _BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags]) - _BOOST_PYTHON_CONFIG([LIBS], [libs]) - m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl --BOOST_FIND_LIB([python], [$1], -- [boost/python.hpp], -- [], [BOOST_PYTHON_MODULE(empty) {}]) -+BOOST_FIND_LIBS([python], [python python3], [$1], -+ [boost/python.hpp], -+ [], [BOOST_PYTHON_MODULE(empty) {}]) - CPPFLAGS=$boost_python_save_CPPFLAGS - LDFLAGS=$boost_python_save_LDFLAGS - LIBS=$boost_python_save_LIBS -@@ -774,17 +986,13 @@ BOOST_DEFUN([Signals], - [boost::signal s;]) - ])# BOOST_SIGNALS - -+ - # BOOST_SIGNALS2() --# ----------------- --# Look for Boost.Signals2 -+# ---------------- -+# Look for Boost.Signals2 (new since 1.39.0). - BOOST_DEFUN([Signals2], --[BOOST_FIND_HEADER([boost/signals2.hpp])]) -- --# BOOST_CRC() --# ----------------- --# Look for Boost.CRC --BOOST_DEFUN([CRC], --[BOOST_FIND_HEADER([boost/crc.hpp])]) -+[BOOST_FIND_HEADER([boost/signals2.hpp]) -+])# BOOST_SIGNALS2 - - - # BOOST_SMART_PTR() -@@ -837,19 +1045,18 @@ BOOST_FIND_LIB([unit_test_framework], [$ - ])# BOOST_TEST - - --# BOOST_THREADS([PREFERRED-RT-OPT]) -+# BOOST_THREAD([PREFERRED-RT-OPT]) - # --------------------------------- - # Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. --# FIXME: Provide an alias "BOOST_THREAD". --BOOST_DEFUN([Threads], -+BOOST_DEFUN([Thread], - [dnl Having the pthread flag is required at least on GCC3 where - dnl boost/thread.hpp would complain if we try to compile without - dnl -pthread on GNU/Linux. - AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl --boost_threads_save_LIBS=$LIBS --boost_threads_save_LDFLAGS=$LDFLAGS --boost_threads_save_CPPFLAGS=$CPPFLAGS -+boost_thread_save_LIBS=$LIBS -+boost_thread_save_LDFLAGS=$LDFLAGS -+boost_thread_save_CPPFLAGS=$CPPFLAGS - # Link-time dependency from thread to system was added as of 1.49.0. - if test $boost_major_version -ge 149; then - BOOST_SYSTEM([$1]) -@@ -857,36 +1064,26 @@ fi # end of the Boost.System check. - m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl - LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" - LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" --# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, --# boost/thread.hpp will trigger a #error if -pthread isn't used: --# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support --# is not turned on. Please set the correct command line options for --# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" - CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag" - - # When compiling for the Windows platform, the threads library is named - # differently. - case $host_os in -- (*mingw*) -- BOOST_FIND_LIB([thread_win32], [$1], -- [boost/thread.hpp], [boost::thread t; boost::mutex m;]) -- BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS -- BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH -- BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS -- ;; -- (*) -- BOOST_FIND_LIB([thread], [$1], -- [boost/thread.hpp], [boost::thread t; boost::mutex m;]) -- ;; -+ (*mingw*) boost_thread_lib_ext=_win32;; - esac -+BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext], -+ [$1], -+ [boost/thread.hpp], [boost::thread t; boost::mutex m;]) - - BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" - BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS" - BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag" --LIBS=$boost_threads_save_LIBS --LDFLAGS=$boost_threads_save_LDFLAGS --CPPFLAGS=$boost_threads_save_CPPFLAGS --])# BOOST_THREADS -+LIBS=$boost_thread_save_LIBS -+LDFLAGS=$boost_thread_save_LDFLAGS -+CPPFLAGS=$boost_thread_save_CPPFLAGS -+])# BOOST_THREAD -+ -+AU_ALIAS([BOOST_THREADS], [BOOST_THREAD]) - - - # BOOST_TOKENIZER() -@@ -935,10 +1132,23 @@ BOOST_DEFUN([Variant], - BOOST_FIND_HEADER([boost/variant.hpp])]) - - -+# BOOST_POINTER_CONTAINER() -+# ------------------------ -+# Look for Boost.PointerContainer -+BOOST_DEFUN([Pointer_Container], -+[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp]) -+])# BOOST_POINTER_CONTAINER -+ -+ - # BOOST_WAVE([PREFERRED-RT-OPT]) - # ------------------------------ - # NOTE: If you intend to use Wave/Spirit with thread support, make sure you --# call BOOST_THREADS first. -+# call BOOST_THREAD first. - # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Wave], -@@ -973,8 +1183,16 @@ BOOST_DEFUN([Xpressive], - - # _BOOST_PTHREAD_FLAG() - # --------------------- --# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD: --# http://autoconf-archive.cryp.to/acx_pthread.html -+# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag -+# which must be used in CPPFLAGS and LIBS. -+# -+# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, -+# boost/thread.hpp will trigger a #error if -pthread isn't used: -+# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support -+# is not turned on. Please set the correct command line options for -+# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" -+# -+# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html - AC_DEFUN([_BOOST_PTHREAD_FLAG], - [AC_REQUIRE([AC_PROG_CXX])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl -@@ -1042,6 +1260,14 @@ AC_LANG_POP([C++])dnl - m4_define([_BOOST_gcc_test], - ["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl - -+# _BOOST_mingw_test(MAJOR, MINOR) -+# ----------------------------- -+# Internal helper for _BOOST_FIND_COMPILER_TAG. -+m4_define([_BOOST_mingw_test], -+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \ -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl -+ - - # _BOOST_FIND_COMPILER_TAG() - # -------------------------- -@@ -1051,7 +1277,8 @@ m4_define([_BOOST_gcc_test], - AC_DEFUN([_BOOST_FIND_COMPILER_TAG], - [AC_REQUIRE([AC_PROG_CXX])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag], -+AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], -+ [boost_cv_lib_tag], - [boost_cv_lib_tag=unknown - if test x$boost_cv_inc_path != xno; then - AC_LANG_PUSH([C++])dnl -@@ -1069,14 +1296,31 @@ if test x$boost_cv_inc_path != xno; then - # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines - # the same defines as GCC's). - for i in \ -+ _BOOST_mingw_test(5, 1) \ -+ _BOOST_gcc_test(5, 1) \ -+ _BOOST_mingw_test(5, 0) \ -+ _BOOST_gcc_test(5, 0) \ -+ _BOOST_mingw_test(4, 10) \ -+ _BOOST_gcc_test(4, 10) \ -+ _BOOST_mingw_test(4, 9) \ -+ _BOOST_gcc_test(4, 9) \ -+ _BOOST_mingw_test(4, 8) \ - _BOOST_gcc_test(4, 8) \ -+ _BOOST_mingw_test(4, 7) \ - _BOOST_gcc_test(4, 7) \ -+ _BOOST_mingw_test(4, 6) \ - _BOOST_gcc_test(4, 6) \ -+ _BOOST_mingw_test(4, 5) \ - _BOOST_gcc_test(4, 5) \ -+ _BOOST_mingw_test(4, 4) \ - _BOOST_gcc_test(4, 4) \ -+ _BOOST_mingw_test(4, 3) \ - _BOOST_gcc_test(4, 3) \ -+ _BOOST_mingw_test(4, 2) \ - _BOOST_gcc_test(4, 2) \ -+ _BOOST_mingw_test(4, 1) \ - _BOOST_gcc_test(4, 1) \ -+ _BOOST_mingw_test(4, 0) \ - _BOOST_gcc_test(4, 0) \ - "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ - && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ -@@ -1142,6 +1386,7 @@ fi])dnl end of AC_CACHE_CHECK - # Thread) flavors of Boost. Sets boost_guess_use_mt accordingly. - AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT], - [# Check whether we do better use `mt' even though we weren't ask to. -+AC_LANG_PUSH([C++])dnl - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #if defined _REENTRANT || defined _MT || defined __MT__ - /* use -mt */ -@@ -1149,6 +1394,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # error MT not needed - #endif - ]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false]) -+AC_LANG_POP([C++])dnl - ]) - - # _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -@@ -1172,11 +1418,11 @@ boost_use_source=: - test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && - _AS_ECHO_LOG([re-using the existing conftest.$ac_objext]) - AS_IF([_AC_DO_STDERR($ac_link) && { -- test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || -- test ! -s conftest.err -+ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || -+ test ! -s conftest.err - } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_executable_p conftest$ac_exeext -+ test "$cross_compiling" = yes || -+ $as_executable_p conftest$ac_exeext - dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough. - }], - [$2], diff --git a/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch b/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch deleted file mode 100644 index 31a64caec..000000000 --- a/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch +++ /dev/null @@ -1,50 +0,0 @@ -From af3098e05535ddb93bb065770d87738e46089efc Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 20 Aug 2017 15:06:01 +0200 -Subject: [PATCH] Makefile.am: do not overwrite LIBS - -LIBS is meant to be passed on the command line with additional -libraries, it should not be overwritten by Makefile.am. - -Instead: - - - Use LDADD to link with external libraries - - - Use _LDFLAGS for additional, non-libraries, linker flags - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/dashesy/cc-tool/commit/553f9c601646af0c6e3f6150d0fa3bc63ff56416 ---- - Makefile.am | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e79e47b..ed83d91 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -10,14 +10,12 @@ AM_LDFLAGS = \ - - # $(BOOST_THREADS_LDFLAGS) - --LDADD = $(LIBUSB_LIBS) -- --LIBS = -s \ -+LDADD = $(LIBUSB_LIBS) \ - $(BOOST_FILESYSTEM_LIBS) \ - $(BOOST_REGEX_LIBS) \ - $(BOOST_SYSTEM_LIBS) \ - $(BOOST_PROGRAM_OPTIONS_LIBS) -- -+ - # $(BOOST_THREADS_LIBS) - - bin_PROGRAMS=cc-tool -@@ -30,4 +28,4 @@ cc_tool_SOURCES=src/main.cpp src/application/cc_flasher.cpp src/application/cc_b - src/programmer/cc_253x_254x.cpp src/programmer/cc_251x_111x.cpp \ - src/programmer/cc_243x.cpp src/programmer/cc_programmer.cpp \ - src/programmer/cc_unit_driver.cpp src/programmer/cc_unit_info.cpp -- -+cc_tool_LDFLAGS=-s --- -2.9.4 - diff --git a/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch b/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch deleted file mode 100644 index acff10743..000000000 --- a/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5e74a15ce1e093b4d8e83cdade60a43b09d698de Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 20 Aug 2017 15:25:06 +0200 -Subject: [PATCH] m4/boost.m4: fix rpath option check for static linking - -When statically linking, the order in which -l options are passed is -important. The contents of the LIBS option passed to the configure -environment should be passed *after* other -l options used internally -by the package. - -For example, libboost_program_options may used symbols from the -libatomic library, and in this case, one need to pass LIBS="-latomic" -to cc-tool's configure script. When using dynamic linking, this works -fine, because the rpath test does "-latomic --lboost_program_options". However, when statically linking, this -doesn't work because libboost_program_options uses symbols from -libatomic, so -latomic must be passed *after* -lboost_program_options. - -Therefore, this commit inverts the list of variables used to construct -LIBS before doing the _BOOST_AC_LINK_IFELSE() test detecting the rpath -option to be used. Indeed, $boost_save_LIBS contains the previously -saved LIBS variable, and should be passed after $Boost_lib_LIBS. - -Signed-off-by: Thomas Petazzoni ---- - m4/boost.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/boost.m4 b/m4/boost.m4 -index be470a7..f1825ba 100644 ---- a/m4/boost.m4 -+++ b/m4/boost.m4 -@@ -479,7 +479,7 @@ dnl generated only once above (before we start the for loops). - *) - for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do - LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" -- LIBS="$boost_save_LIBS $Boost_lib_LIBS" -+ LIBS="$Boost_lib_LIBS $boost_save_LIBS" - _BOOST_AC_LINK_IFELSE([], - [boost_rpath_link_ldflag_found=yes - break], --- -2.9.4 - diff --git a/buildroot/package/cc-tool/Config.in b/buildroot/package/cc-tool/Config.in index 8145b676c..033128843 100644 --- a/buildroot/package/cc-tool/Config.in +++ b/buildroot/package/cc-tool/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CC_TOOL for Linux OS in order to program 8051-based System-On-Chip devices: CC254x CC253x CC243x CC251x CC111x - http://sourceforge.net/projects/cctool/ + https://github.com/dashesy/cc-tool/ comment "cc-tool needs a toolchain w/ C++, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/cc-tool/cc-tool.hash b/buildroot/package/cc-tool/cc-tool.hash index d778b4439..53c74730f 100644 --- a/buildroot/package/cc-tool/cc-tool.hash +++ b/buildroot/package/cc-tool/cc-tool.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/cctool/files/ -sha1 f313e55f019ea5338438633f5b5e689b699343e1 cc-tool-0.26-src.tgz -md5 26960676f3e6264e612c299fbf8ec5ea cc-tool-0.26-src.tgz +# Locally computed +sha256 1d26be4446c68413a02bf3156e6434d7fe9ce76aa0a169464ca5d7b2a731610d cc-tool-0.27.tar.gz # Hash for license file -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/cc-tool/cc-tool.mk b/buildroot/package/cc-tool/cc-tool.mk index e170e06a2..6864589ab 100644 --- a/buildroot/package/cc-tool/cc-tool.mk +++ b/buildroot/package/cc-tool/cc-tool.mk @@ -4,14 +4,13 @@ # ################################################################################ -CC_TOOL_VERSION = 0.26 -CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool -CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz +CC_TOOL_VERSION = 0.27 +CC_TOOL_SITE = $(call github,dashesy,cc-tool,v$(CC_TOOL_VERSION)) CC_TOOL_LICENSE = GPL-2.0 CC_TOOL_LICENSE_FILES = COPYING CC_TOOL_DEPENDENCIES = boost libusb -# we're patching boost.m4 +# From git CC_TOOL_AUTORECONF = YES # Configure script "discovers" boost in /usr/local if not given explicitly diff --git a/buildroot/package/ccache/ccache.hash b/buildroot/package/ccache/ccache.hash index 83c172fea..16cfad602 100644 --- a/buildroot/package/ccache/ccache.hash +++ b/buildroot/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 b7c1d6d6fe42f18e424de92746af863e0bc85794da3d69e44300840c478c98cd ccache-3.7.7.tar.xz +sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc diff --git a/buildroot/package/ccache/ccache.mk b/buildroot/package/ccache/ccache.mk index a441f7a10..97aa8b1c7 100644 --- a/buildroot/package/ccache/ccache.mk +++ b/buildroot/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 3.7.7 +CCACHE_VERSION = 3.7.12 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others diff --git a/buildroot/package/ccid/ccid.hash b/buildroot/package/ccid/ccid.hash index f29f5b3f9..f129d2ae9 100644 --- a/buildroot/package/ccid/ccid.hash +++ b/buildroot/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7 ccid-1.4.31.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424 ccid-1.4.33.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/ccid/ccid.mk b/buildroot/package/ccid/ccid.mk index a5f9f0047..570c3907e 100644 --- a/buildroot/package/ccid/ccid.mk +++ b/buildroot/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.31 +CCID_VERSION = 1.4.33 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch b/buildroot/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch new file mode 100644 index 000000000..dd5dba9e7 --- /dev/null +++ b/buildroot/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch @@ -0,0 +1,33 @@ +From e18e48624cd45910917e5e4fb0aa16cef490bb6d Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas +Date: Sun, 22 Mar 2020 14:25:53 +0100 +Subject: [PATCH] src/Exceptions.cpp: check if execinfo header is available + +Fixes: + fatal error: execinfo.h: No such file or directory + compilation terminated. + +Signed-off-by: Bartosz Bilas +--- + Upstream status: https://github.com/cegui/cegui/pull/1189 + +cegui/src/Exceptions.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cegui/src/Exceptions.cpp b/cegui/src/Exceptions.cpp +index 8e4890378..6a8420491 100644 +--- a/cegui/src/Exceptions.cpp ++++ b/cegui/src/Exceptions.cpp +@@ -46,7 +46,9 @@ + #elif (defined(__linux__) && !defined(__ANDROID__)) \ + || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) \ + || defined(__HAIKU__) ++#ifdef HAVE_EXECINFO_H + # include ++#endif + # include + # include + # include +-- +2.25.2 + diff --git a/buildroot/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch b/buildroot/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch new file mode 100644 index 000000000..f30438b98 --- /dev/null +++ b/buildroot/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch @@ -0,0 +1,34 @@ +From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas +Date: Thu, 2 Apr 2020 18:04:28 +0200 +Subject: [PATCH] cegui/src/IconvStringTranscoder.cpp: use cast notation + instead of reinterpret_cast + +Fixes: + IconvStringTranscoder.cpp:50:49: error: invalid cast from type 'int' to + type 'iconv_t' {aka 'long int'} + if (d_cd == reinterpret_cast(-1)) + +Signed-off-by: Bartosz Bilas +--- + Upstream status: https://github.com/cegui/cegui/pull/1194 + + cegui/src/IconvStringTranscoder.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cegui/src/IconvStringTranscoder.cpp b/cegui/src/IconvStringTranscoder.cpp +index 1a5df2995..f6b5aa816 100644 +--- a/cegui/src/IconvStringTranscoder.cpp ++++ b/cegui/src/IconvStringTranscoder.cpp +@@ -47,7 +47,7 @@ public: + d_toCode(tocode), + d_cd(iconv_open(d_toCode.c_str(), d_fromCode.c_str())) + { +- if (d_cd == reinterpret_cast(-1)) ++ if (d_cd == (iconv_t)(-1)) + CEGUI_THROW(InvalidRequestException(String( + "Failed to create conversion descriptor from \"") + + d_fromCode.c_str() + "\" to \"" + d_toCode.c_str() + "\".")); +-- +2.26.0 + diff --git a/buildroot/package/cegui06/Config.in b/buildroot/package/cegui/Config.in similarity index 62% rename from buildroot/package/cegui06/Config.in rename to buildroot/package/cegui/Config.in index 0139d3242..1bd0ee1cc 100644 --- a/buildroot/package/cegui06/Config.in +++ b/buildroot/package/cegui/Config.in @@ -1,14 +1,16 @@ -comment "cegui06 needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "cegui needs a toolchain w/ C++, threads, dynamic library, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR -config BR2_PACKAGE_CEGUI06 - bool "cegui06" - depends on BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_CEGUI + bool "cegui" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_PCRE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + select BR2_PACKAGE_GLM + select BR2_PACKAGE_LIBGLFW if BR2_PACKAGE_HAS_LIBGL # SampleBrowser dependency + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Crazy Eddie's GUI System is a free library providing windowing and widgets for graphics APIs / engines where such diff --git a/buildroot/package/cegui/cegui.hash b/buildroot/package/cegui/cegui.hash new file mode 100644 index 000000000..829503903 --- /dev/null +++ b/buildroot/package/cegui/cegui.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 7be289d2d8562e7d20bd155d087d6ccb0ba62f7e99cc25d20684b8edf2ba15cd cegui-0-8-7.tar.gz +sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING diff --git a/buildroot/package/cegui/cegui.mk b/buildroot/package/cegui/cegui.mk new file mode 100644 index 000000000..23919e015 --- /dev/null +++ b/buildroot/package/cegui/cegui.mk @@ -0,0 +1,102 @@ +################################################################################ +# +# cegui +# +################################################################################ + +CEGUI_VERSION = 0-8-7 +CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION)) +CEGUI_LICENSE = MIT +CEGUI_LICENSE_FILES = COPYING +CEGUI_INSTALL_STAGING = YES +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ + -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ + -DCEGUI_BUILD_RENDERER_OGRE=OFF +CEGUI_DEPENDENCIES = glm \ + $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ + $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ + $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) + +# libepoxy support cannot be enabled together with libglew +ifeq ($(BR2_PACKAGE_LIBGLEW)$(BR2_PACKAGE_LIBGLU),yy) +CEGUI_DEPENDENCIES += libglew libglu +CEGUI_CONF_OPTS += -DCEGUI_USE_GLEW=ON -DCEGUI_USE_EPOXY=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=ON \ + -DCEGUI_BUILD_RENDERER_OPENGL3=ON +else ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +CEGUI_DEPENDENCIES += libepoxy +# old OpenGL renderer module is only supported using GLEW +CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON -DCEGUI_USE_GLEW=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL3=ON +else +CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF -DCEGUI_USE_GLEW=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL=OFF \ + -DCEGUI_BUILD_RENDERER_OPENGL3=OFF +endif + +ifeq ($(BR2_PACKAGE_EXPAT),y) +CEGUI_DEPENDENCIES += expat +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF +endif + +ifeq ($(BR2_PACKAGE_IRRLICHT),y) +CEGUI_DEPENDENCIES += irrlicht +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF +endif + +ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy) +CEGUI_DEPENDENCIES += sdl2 sdl2_image +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +CEGUI_DEPENDENCIES += pcre +CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON +else +CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +CEGUI_DEPENDENCIES += freetype +CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON +else +CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +CEGUI_DEPENDENCIES += libxml2 +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF +endif + +ifeq ($(BR2_PACKAGE_RAPIDXML),y) +CEGUI_DEPENDENCIES += rapidxml +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF +endif + +ifeq ($(BR2_PACKAGE_TINYXML),y) +CEGUI_DEPENDENCIES += tinyxml +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y) +CEGUI_DEPENDENCIES += libfreeimage +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON +else +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/cegui06/0001-stddef.h.patch b/buildroot/package/cegui06/0001-stddef.h.patch deleted file mode 100644 index cc16effc2..000000000 --- a/buildroot/package/cegui06/0001-stddef.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -includes: ptrdiff_t is defined in stddef.h - -ptrdiff_t is defined in the stddef.h header, so this -header must be included. - -Do the #include in a common header to avoid doing it -all over the place. - -Signed-off-by: "Yann E. MORIN" - ---- -Patch not sent upstream, it's a no-longer-maintained branch. -To be noted, however, is that the current devel branch is -still missing that include. - -diff -durN cegui06-0.6.2.orig/include/CEGUIBase.h cegui06-0.6.2/include/CEGUIBase.h ---- cegui06-0.6.2.orig//include/CEGUIBase.h 2008-02-11 15:38:27.000000000 +0100 -+++ cegui06-0.6.2/include/CEGUIBase.h 2012-08-19 22:51:50.260385978 +0200 -@@ -34,6 +34,7 @@ - #define _CEGUIBase_h_ - - #include -+#include - - // bring in configuration options - #include "CEGUIConfig.h" diff --git a/buildroot/package/cegui06/cegui06.hash b/buildroot/package/cegui06/cegui06.hash deleted file mode 100644 index f46bcee24..000000000 --- a/buildroot/package/cegui06/cegui06.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f CEGUI-0.6.2b.tar.gz -sha256 da1c10009579e3eb8d3b3abc65d538a2890f70ff7fd1f05b73a4f9e3fff5c56e COPYING diff --git a/buildroot/package/cegui06/cegui06.mk b/buildroot/package/cegui06/cegui06.mk deleted file mode 100644 index d3da3ebc4..000000000 --- a/buildroot/package/cegui06/cegui06.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# cegui06 -# -################################################################################ - -# Do not update the version, we need exactly that one for Spice. -CEGUI06_VERSION_MAJOR = 0.6.2 -CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b -CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz -CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR) -CEGUI06_LICENSE = MIT -CEGUI06_LICENSE_FILES = COPYING -CEGUI06_INSTALL_STAGING = YES - -CEGUI06_DEPENDENCIES = \ - expat \ - freetype \ - pcre - -CEGUI06_CONF_OPTS = \ - --enable-expat \ - --disable-external-tinyxml \ - --disable-xerces-c \ - --disable-libxml \ - --disable-tinyxml \ - --disable-opengl-renderer \ - --disable-external-glew \ - --disable-irrlicht-renderer \ - --disable-directfb-renderer \ - --disable-samples \ - --disable-lua-module \ - --disable-toluacegui \ - --disable-external-toluapp - -$(eval $(autotools-package)) diff --git a/buildroot/package/chartjs/Config.in b/buildroot/package/chartjs/Config.in new file mode 100644 index 000000000..73cc9b775 --- /dev/null +++ b/buildroot/package/chartjs/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_CHARTJS + bool "chartjs" + help + Chart.js, a simple yet flexible JavaScript charting library + for designers & developers + + https://www.chartjs.org/ diff --git a/buildroot/package/chartjs/chartjs.hash b/buildroot/package/chartjs/chartjs.hash new file mode 100644 index 000000000..d2426ea61 --- /dev/null +++ b/buildroot/package/chartjs/chartjs.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 8079d8fd39131fcfaec33f1c7799412bcf8e051e25b10bd6e37fc16159417aa1 chartjs-v2.9.3.tar.gz +sha256 7b43caae91f31b18dc81fae6e0f7aa1acbecaa6d84e3249905cbe15308307d67 LICENSE.md diff --git a/buildroot/package/chartjs/chartjs.mk b/buildroot/package/chartjs/chartjs.mk new file mode 100644 index 000000000..171e0a4a7 --- /dev/null +++ b/buildroot/package/chartjs/chartjs.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# chartjs +# +################################################################################ + +CHARTJS_VERSION = v2.9.3 +CHARTJS_SITE = $(call github,chartjs,Chart.js,$(CHARTJS_VERSION)) +CHARTJS_LICENSE = MIT +CHARTJS_LICENSE_FILES = LICENSE.md + +define CHARTJS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.css \ + $(TARGET_DIR)/var/www/chartjs/css/Chart.css + $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.js \ + $(TARGET_DIR)/var/www/chartjs/js/Chart.js + $(INSTALL) -m 0644 -D $(@D)/dist/Chart.bundle.min.js \ + $(TARGET_DIR)/var/www/chartjs/js/Chart.bundle.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/check/check.hash b/buildroot/package/check/check.hash index 291b5d095..d00956c75 100644 --- a/buildroot/package/check/check.hash +++ b/buildroot/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909 check-0.13.0.tar.gz +sha256 c1cc3d64975c0edd8042ab90d881662f1571278f8ea79d8e3c2cc877dac60001 check-0.15.1.tar.gz # License files, locally calculated -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/buildroot/package/check/check.mk b/buildroot/package/check/check.mk index b02136dcb..f80e6b63b 100644 --- a/buildroot/package/check/check.mk +++ b/buildroot/package/check/check.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECK_VERSION = 0.13.0 +CHECK_VERSION = 0.15.1 CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch deleted file mode 100644 index 0c4ffcbf8..000000000 --- a/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4d330d0d3155211f119b3082f728ae42dcc01e96 Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -Date: Thu, 23 Jan 2020 13:57:15 +0100 -Subject: [PATCH] checkpolicy: remove unused te_assertions - -This variable is declared in a header file, but never defined or used. -The te_assert structure definition is only used in this declaration, so -remove both. - -Upstream: https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96#diff-daf264ea505347df0d59a3a97a07742e - -Signed-off-by: Ondrej Mosnacek -Signed-off-by: Matthew Weber ---- - checkpolicy.h | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/checkpolicy.h b/checkpolicy.h -index 3868f1fa..f127687e 100644 ---- a/checkpolicy.h -+++ b/checkpolicy.h -@@ -1,20 +1,6 @@ - #ifndef _CHECKPOLICY_H_ - #define _CHECKPOLICY_H_ - --#include -- --typedef struct te_assert { -- ebitmap_t stypes; -- ebitmap_t ttypes; -- ebitmap_t tclasses; -- int self; -- sepol_access_vector_t *avp; -- unsigned long line; -- struct te_assert *next; --} te_assert_t; -- --te_assert_t *te_assertions; -- - extern unsigned int policyvers; - - #endif --- -2.17.1 - diff --git a/buildroot/package/checkpolicy/checkpolicy.hash b/buildroot/package/checkpolicy/checkpolicy.hash index 9e77b9b02..55f4f09f7 100644 --- a/buildroot/package/checkpolicy/checkpolicy.hash +++ b/buildroot/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a946c32b284532447857e4c48830f8816867c61220c8c08bdd32e6f691335f8e checkpolicy-2.9.tar.gz +sha256 dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2 checkpolicy-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/checkpolicy/checkpolicy.mk b/buildroot/package/checkpolicy/checkpolicy.mk index 8f1ec7254..86eaffccb 100644 --- a/buildroot/package/checkpolicy/checkpolicy.mk +++ b/buildroot/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 2.9 -CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +CHECKPOLICY_VERSION = 3.1 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING diff --git a/buildroot/package/checksec/checksec.hash b/buildroot/package/checksec/checksec.hash index 4543f62a3..397cfe381 100644 --- a/buildroot/package/checksec/checksec.hash +++ b/buildroot/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e50a92a2bb22d40d1aa297cd011209ab5ad0b620236dfb9a7afe4c29744260a9 checksec-2.1.0.tar.gz -sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt +sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt +sha256 d3c8e80bdd1cee0c2f0e60cb7a8a9482b82f651ea069e3a4453ae9a44072a632 checksec-2.2.2.tar.gz diff --git a/buildroot/package/checksec/checksec.mk b/buildroot/package/checksec/checksec.mk index ffa249663..e46e85843 100644 --- a/buildroot/package/checksec/checksec.mk +++ b/buildroot/package/checksec/checksec.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKSEC_VERSION = 2.1.0 +CHECKSEC_VERSION = 2.2.2 CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch b/buildroot/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch new file mode 100644 index 000000000..bbfbdbb2d --- /dev/null +++ b/buildroot/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch @@ -0,0 +1,29 @@ +From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001 +From: Jordan Christiansen +Date: Sun, 15 Mar 2020 16:55:33 -0500 +Subject: [PATCH] Remove redundant demoextend definition + +GCC 10 enables -fno-common by default, which causes the linker to fail when +there are multple definitions of a global variable. + +See https://gcc.gnu.org/gcc-10/porting_to.html + +[Retrieved from: +https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2] +Signed-off-by: Fabrice Fontaine +--- + src/hexen/mn_menu.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c +index 059f45b3e..a97b7fcd1 100644 +--- a/src/hexen/mn_menu.c ++++ b/src/hexen/mn_menu.c +@@ -131,7 +131,6 @@ boolean MenuActive; + int InfoType; + int messageson = true; + boolean mn_SuicideConsole; +-boolean demoextend; // from h2def.h + + // PRIVATE DATA DEFINITIONS ------------------------------------------------ + diff --git a/buildroot/package/chocolate-doom/chocolate-doom.hash b/buildroot/package/chocolate-doom/chocolate-doom.hash index 7f7fa27ab..79eb1c6a3 100644 --- a/buildroot/package/chocolate-doom/chocolate-doom.hash +++ b/buildroot/package/chocolate-doom/chocolate-doom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8 chocolate-doom-3.0.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7 chocolate-doom-3.0.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/chocolate-doom/chocolate-doom.mk b/buildroot/package/chocolate-doom/chocolate-doom.mk index 4e0a8fee1..8318c123b 100644 --- a/buildroot/package/chocolate-doom/chocolate-doom.mk +++ b/buildroot/package/chocolate-doom/chocolate-doom.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHOCOLATE_DOOM_VERSION = 3.0.0 +CHOCOLATE_DOOM_VERSION = 3.0.1 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ CHOCOLATE_DOOM_LICENSE_FILES = COPYING diff --git a/buildroot/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch b/buildroot/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch deleted file mode 100644 index 6af8d8725..000000000 --- a/buildroot/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7fd0495cf3520508fb1cca301ad3d792b56b5656 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Sep 2018 22:24:24 +0200 -Subject: [PATCH] circus/tests: rename async argument of _create_circus() to - use_async - -In Python 3.7.0, 'async' is now a reserved keyword of the language, so -it cannot be used as an method argument name. When used, it causes the -following byte-compilation failure: - -Traceback (most recent call last): - File "/home/thomas/projets/buildroot/output/host/lib/python3.7/py_compile.py", line 136, in compile - _optimize=optimize) - File "", line 763, in source_to_code - File "", line 219, in _call_with_frames_removed - File "usr/lib/python3.7/site-packages/circus/tests/support.py", line 210 - debug=debug, async=True, **kw) - ^ -SyntaxError: invalid syntax - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/circus-tent/circus/pull/1079 ---- - circus/tests/support.py | 6 +++--- - circus/tests/test_client.py | 2 +- - circus/tests/test_watcher.py | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/circus/tests/support.py b/circus/tests/support.py -index 38964cc..794a9c7 100644 ---- a/circus/tests/support.py -+++ b/circus/tests/support.py -@@ -217,7 +217,7 @@ class TestCircus(AsyncTestCase): - stdout_stream=None, debug=True, **kw): - testfile, arbiter = self._create_circus( - cmd, stdout_stream=stdout_stream, -- debug=debug, async=True, **kw) -+ debug=debug, use_async=True, **kw) - self.test_file = testfile - self.arbiter = arbiter - self.arbiters.append(arbiter) -@@ -265,7 +265,7 @@ class TestCircus(AsyncTestCase): - - @classmethod - def _create_circus(cls, callable_path, plugins=None, stats=False, -- async=False, arbiter_kw=None, **kw): -+ use_async=False, arbiter_kw=None, **kw): - fd, testfile = mkstemp() - os.close(fd) - wdir = os.path.dirname(os.path.dirname(os.path.dirname( -@@ -292,7 +292,7 @@ class TestCircus(AsyncTestCase): - arbiter_kw['stats_endpoint'] = "tcp://127.0.0.1:%d" % _gp() - arbiter_kw['statsd_close_outputs'] = not debug - -- if async: -+ if use_async: - arbiter_kw['background'] = False - arbiter_kw['loop'] = get_ioloop() - else: -diff --git a/circus/tests/test_client.py b/circus/tests/test_client.py -index 9a56a11..a0cfca0 100644 ---- a/circus/tests/test_client.py -+++ b/circus/tests/test_client.py -@@ -90,7 +90,7 @@ class TestWithHook(TestCircus): - self.stream = QueueStream() - self.errstream = QueueStream() - dummy_process = 'circus.tests.support.run_process' -- return self._create_circus(dummy_process, async=True, -+ return self._create_circus(dummy_process, use_async=True, - stdout_stream={'stream': self.stream}, - stderr_stream={'stream': self.errstream}, - hooks=hooks) -diff --git a/circus/tests/test_watcher.py b/circus/tests/test_watcher.py -index 5dd857c..4299ed1 100644 ---- a/circus/tests/test_watcher.py -+++ b/circus/tests/test_watcher.py -@@ -376,7 +376,7 @@ class TestWatcherHooks(TestCircus): - return self._create_circus(dummy_process, - stdout_stream=stdout_stream, - stderr_stream=stderr_stream, -- hooks=hooks, debug=True, async=True) -+ hooks=hooks, debug=True, use_async=True) - - @tornado.gen.coroutine - def _stop(self): -@@ -601,7 +601,7 @@ class RespawnTest(TestCircus): - def test_not_respawning(self): - oneshot_process = 'circus.tests.test_watcher.oneshot_process' - testfile, arbiter = self._create_circus(oneshot_process, -- respawn=False, async=True) -+ respawn=False, use_async=True) - yield arbiter.start() - watcher = arbiter.watchers[-1] - try: --- -2.14.4 - diff --git a/buildroot/package/circus/circus.hash b/buildroot/package/circus/circus.hash index 6391f0b5f..b9e1ef2e6 100644 --- a/buildroot/package/circus/circus.hash +++ b/buildroot/package/circus/circus.hash @@ -1,4 +1,4 @@ # md5, sha256 from https://pypi.org/pypi/circus/json -md5 ed9082b5ac6ac5786721254b06315183 circus-0.15.0.tar.gz -sha256 d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b circus-0.15.0.tar.gz +md5 9887ddafebef7475c08ff2c8e5cc2fad circus-0.16.1.tar.gz +sha256 dd7c011eb67785a1c96a4db94a56a22810c6ed608cebf301152dabc771654c5d circus-0.16.1.tar.gz sha256 3df739c05a4eed7efdf4987142658d2a4f1243e5f08e72a5ecedac5749c92a49 LICENSE diff --git a/buildroot/package/circus/circus.mk b/buildroot/package/circus/circus.mk index d96265192..8f650de1e 100644 --- a/buildroot/package/circus/circus.mk +++ b/buildroot/package/circus/circus.mk @@ -4,8 +4,8 @@ # ################################################################################ -CIRCUS_VERSION = 0.15.0 -CIRCUS_SITE = https://files.pythonhosted.org/packages/12/11/b72ee03c3d1fd09c39466954def2eae176d22a9fa5d9e6e8e6b90ee88f56 +CIRCUS_VERSION = 0.16.1 +CIRCUS_SITE = https://files.pythonhosted.org/packages/09/8a/44a0b6b35ecf5dcf22bf51e4bcf188ec9e7ab9dd4c14330ba1b8bea51102 CIRCUS_SETUP_TYPE = setuptools CIRCUS_LICENSE = Apache-2.0 CIRCUS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch b/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch deleted file mode 100644 index bd1b06aed..000000000 --- a/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 29 Nov 2018 21:43:28 +0100 -Subject: [PATCH] modlua.ini: include dlfcn.h - -dlfcn.h must be included to be able to use dlopen otherwise build will -fail on: -src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function) - lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY); - -Fixes: - - http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/civetweb/civetweb/pull/706] ---- - src/mod_lua.inl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mod_lua.inl b/src/mod_lua.inl -index 97a5de1e..ce7a4b2e 100644 ---- a/src/mod_lua.inl -+++ b/src/mod_lua.inl -@@ -2,6 +2,7 @@ - * See https://github.com/civetweb/civetweb/ - */ - -+#include - #include "civetweb_lua.h" - #include "civetweb_private_lua.h" - --- -2.14.1 - diff --git a/buildroot/package/civetweb/civetweb.hash b/buildroot/package/civetweb/civetweb.hash index e6f60ff1d..cf9d67683 100644 --- a/buildroot/package/civetweb/civetweb.hash +++ b/buildroot/package/civetweb/civetweb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-1.11.tar.gz -sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706 LICENSE.md +sha256 a7ccc76c2f1b5f4e8d855eb328ed542f8fe3b882a6da868781799a98f4acdedc civetweb-1.13.tar.gz +sha256 291622dfbbf4fb35829726fbe97177b7227c0d4d6392b350660af73af4f86df8 LICENSE.md diff --git a/buildroot/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk index f05b29f3c..c0cbdb4a2 100644 --- a/buildroot/package/civetweb/civetweb.mk +++ b/buildroot/package/civetweb/civetweb.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIVETWEB_VERSION = 1.11 +CIVETWEB_VERSION = 1.13 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md @@ -61,7 +61,6 @@ endif ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y) CIVETWEB_BUILD_TARGETS += slib CIVETWEB_INSTALL_TARGETS += install-slib -CIVETWEB_COPT += -fPIC endif endif # BR2_PACKAGE_CIVETWEB_LIB diff --git a/buildroot/package/cjson/cjson.hash b/buildroot/package/cjson/cjson.hash index a02158321..b99fcee8b 100644 --- a/buildroot/package/cjson/cjson.hash +++ b/buildroot/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7 cjson-1.7.12.tar.gz -sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE +sha256 d4e77a38f540f2c37f55758f2666655314f1f51c716fea5f279659940efdcf04 cjson-1.7.13.tar.gz +sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/buildroot/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk index b61d1ceb1..31fef74d9 100644 --- a/buildroot/package/cjson/cjson.mk +++ b/buildroot/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = 1.7.12 +CJSON_VERSION = 1.7.13 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT diff --git a/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch index e99a9742e..d4be5c7b2 100644 --- a/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch +++ b/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch @@ -12,6 +12,8 @@ This is a bit hacky, and would greatly benefit from a test in ./configure instead, but does nicely as a quick fix for now. Signed-off-by: "Yann E. MORIN" +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 0.103.0] --- libclamav/mbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -20,7 +22,7 @@ diff --git a/libclamav/mbox.c b/libclamav/mbox.c index 71f540c0a..4851297a9 100644 --- a/libclamav/mbox.c +++ b/libclamav/mbox.c -@@ -98,7 +98,7 @@ +@@ -91,7 +91,7 @@ #include #endif diff --git a/buildroot/package/clamav/Config.in b/buildroot/package/clamav/Config.in index 08f3e4746..990a818b5 100644 --- a/buildroot/package/clamav/Config.in +++ b/buildroot/package/clamav/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_CLAMAV depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlopen depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMSPACK - select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB @@ -16,7 +16,7 @@ config BR2_PACKAGE_CLAMAV http://www.clamav.net -comment "clamav needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP \ +comment "clamav needs a toolchain w/ C++, dynamic library, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_USE_MMU diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index b15460cec..bc1bf3bf9 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 eebd426a68020ecad0d2084b8c763e6898ccfd5febcae833d719640bb3ff391b clamav-0.102.4.tar.gz +sha256 32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546 clamav-0.103.0.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index 358228b86..45d62943a 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.102.4 +CLAMAV_VERSION = 0.103.0 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ @@ -14,7 +14,6 @@ CLAMAV_DEPENDENCIES = \ host-pkgconf \ libcurl \ libmspack \ - libtool \ openssl \ zlib \ $(TARGET_NLS_DEPENDENCIES) @@ -38,8 +37,6 @@ CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" CLAMAV_CONF_OPTS = \ --with-dbdir=/var/lib/clamav \ - --with-ltdl-include=$(STAGING_DIR)/usr/include \ - --with-ltdl-lib=$(STAGING_DIR)/usr/lib \ --with-libcurl=$(STAGING_DIR)/usr \ --with-openssl=$(STAGING_DIR)/usr \ --with-system-libmspack=$(STAGING_DIR)/usr \ diff --git a/buildroot/package/clang/clang.mk b/buildroot/package/clang/clang.mk index d740af532..ceb7de9af 100644 --- a/buildroot/package/clang/clang.mk +++ b/buildroot/package/clang/clang.mk @@ -33,6 +33,7 @@ CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON # By setting BUILD_SHARED_LIBS to OFF, we generate multiple static # libraries (the same way as host's clang build) and finally # libclang.so to be installed on the target. +HOST_CLANG_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF CLANG_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF # Default is Debug build, which requires considerably more disk space diff --git a/buildroot/package/cmake/Config.in b/buildroot/package/cmake/Config.in index e7bd14e69..3c47fdcb4 100644 --- a/buildroot/package/cmake/Config.in +++ b/buildroot/package/cmake/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_m68k || BR2_mips || BR2_mips64 || \ BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ - BR2_i386 || BR2_x86_64 || BR2_xtensa + BR2_i386 || BR2_x86_64 || BR2_xtensa || \ + BR2_s390x config BR2_PACKAGE_CMAKE bool diff --git a/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch deleted file mode 100644 index 4e8d4ad12..000000000 --- a/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 18 Feb 2020 01:20:50 -0700 -Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling - xkb_state_update_mask (#180) - -[james.hilliard1@gmail.com: backport from upstream commit -9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4] -Signed-off-by: James Hilliard ---- - platform/cog-platform-fdo.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c -index 36177fc..e6f1cb5 100644 ---- a/platform/cog-platform-fdo.c -+++ b/platform/cog-platform-fdo.c -@@ -894,6 +894,9 @@ keyboard_on_modifiers (void *data, - uint32_t mods_locked, - uint32_t group) - { -+ if (xkb_data.state == NULL) -+ return; -+ - xkb_state_update_mask (xkb_data.state, - mods_depressed, - mods_latched, --- -2.20.1 - diff --git a/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch deleted file mode 100644 index 48918001e..000000000 --- a/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 575ef199984ae4e8510ed36f8b1ae1babdff8ea9 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 26 Mar 2020 07:48:19 -0600 -Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling - xkb_state_key_get_one_sym (#192) - -[james.hilliard1@gmail.com: backport from upstream commit -575ef199984ae4e8510ed36f8b1ae1babdff8ea9] -Signed-off-by: James Hilliard ---- - platform/cog-platform-fdo.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c -index 043f91d..93ff255 100644 ---- a/platform/cog-platform-fdo.c -+++ b/platform/cog-platform-fdo.c -@@ -919,6 +919,9 @@ capture_app_key_bindings (uint32_t keysym, - static void - handle_key_event (uint32_t key, uint32_t state, uint32_t time) - { -+ if (xkb_data.state == NULL) -+ return; -+ - uint32_t keysym = xkb_state_key_get_one_sym (xkb_data.state, key); - uint32_t unicode = xkb_state_key_get_utf32 (xkb_data.state, key); - --- -2.20.1 - diff --git a/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch b/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch deleted file mode 100644 index 58842bb15..000000000 --- a/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 817f6c9dafd5ad23722eae0a8f43ba9211f37c95 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 26 Mar 2020 07:49:05 -0600 -Subject: [PATCH] fdo: ensure xkb_data.keymap is not null before calling - xkb_keymap_key_repeats (#193) - -[james.hilliard1@gmail.com: backport from upstream commit -817f6c9dafd5ad23722eae0a8f43ba9211f37c95] -Signed-off-by: James Hilliard ---- - platform/cog-platform-fdo.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c -index 93ff255..ecc05e9 100644 ---- a/platform/cog-platform-fdo.c -+++ b/platform/cog-platform-fdo.c -@@ -990,7 +990,8 @@ keyboard_on_key (void *data, - memset (&wl_data.keyboard.repeat_data, - 0x00, - sizeof (wl_data.keyboard.repeat_data)); -- } else if (state == WL_KEYBOARD_KEY_STATE_PRESSED -+ } else if (xkb_data.keymap != NULL -+ && state == WL_KEYBOARD_KEY_STATE_PRESSED - && xkb_keymap_key_repeats (xkb_data.keymap, key)) { - if (wl_data.keyboard.repeat_data.event_source) - g_source_remove (wl_data.keyboard.repeat_data.event_source); --- -2.20.1 - diff --git a/buildroot/package/cog/Config.in b/buildroot/package/cog/Config.in index b25991d4a..a9ca7473a 100644 --- a/buildroot/package/cog/Config.in +++ b/buildroot/package/cog/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_COG depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS + select BR2_PACKAGE_WAYLAND help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does @@ -26,4 +27,27 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string is used, there is no default and the URI to open must be always specified in the command line. +config BR2_PACKAGE_COG_PLATFORM_FDO + bool "FreeDesktop.org backend" + default y + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + Enable the FreeDesktop.org backend. Cog will interface with + a compositor over the Wayland protocol. + +config BR2_PACKAGE_COG_PLATFORM_DRM + bool "DRM backend" + depends on BR2_PACKAGE_HAS_UDEV # libinput + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT + help + Enable the DRM platform backend. Cog will interface directly + with video drivers that support kernel mode-setting (KMS) + via the DRM user-space API. + +comment "DRM platform needs mesa3d w/ EGL driver and GBM" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + endif diff --git a/buildroot/package/cog/cog.hash b/buildroot/package/cog/cog.hash index 2e37928fc..d76306ca5 100644 --- a/buildroot/package/cog/cog.hash +++ b/buildroot/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.4.0.tar.xz.sums -md5 75a0838ee6c81bb8df1b254f525440a6 cog-0.4.0.tar.xz -sha1 284d2a641e6269b296057918602c8c94eb831527 cog-0.4.0.tar.xz -sha256 e9c13a51232434b7340a419b1e6f59c40c582cd80c8e60bd9ec7de16c904fc03 cog-0.4.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.8.0.tar.xz.sums +md5 f7aa8a425927cab247563411fc67c5a3 cog-0.8.0.tar.xz +sha1 977559204dae0f9220e4c6b8ded7537899fd2daf cog-0.8.0.tar.xz +sha256 181b1f4963cdf264b8068460a64d14c92a627f7138ebecc0f36fce085f4e92dd cog-0.8.0.tar.xz # Hashes for license files: -sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING +sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/buildroot/package/cog/cog.mk b/buildroot/package/cog/cog.mk index d0e5b79c3..47a5573dd 100644 --- a/buildroot/package/cog/cog.mk +++ b/buildroot/package/cog/cog.mk @@ -4,17 +4,31 @@ # ################################################################################ -COG_VERSION = 0.4.0 +COG_VERSION = 0.8.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_FDO=ON \ - -DCOG_PLATFORM_DRM=OFF \ + -DCOG_WESTON_DIRECT_DISPLAY=OFF \ + -DINSTALL_MAN_PAGES=OFF \ -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' +ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) +COG_CONF_OPTS += -DCOG_PLATFORM_FDO=ON +COG_DEPENDENCIES += libxkbcommon wayland-protocols +else +COG_CONF_OPTS += -DCOG_PLATFORM_FDO=OFF +endif + +ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) +COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON +COG_DEPENDENCIES += libdrm libinput +else +COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch b/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch deleted file mode 100644 index 5eb22bef4..000000000 --- a/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a81fb110f7685b3268cd921ba72a00796f43d034 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 29 Oct 2019 10:25:07 +0100 -Subject: [PATCH] configure.ac: fix protobuf/util/time_util.h detection - -Add -std=c++11 when checking gor protobuf/util/time_util.h otherwise -test will fail on: - -configure:104495: checking google/protobuf/util/time_util.h usability -configure:104495: /home/br-user/autobuild/run/instance-2/output/host/bin/mips-linux-gnu-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -pthread conftest.cpp >&5 -In file included from /home/br-user/autobuild/run/instance-2/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/atomic:38:0, - from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/io/coded_stream.h:113, - from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/duration.pb.h:23, - from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/util/time_util.h:52, - from conftest.cpp:188: -/home/br-user/autobuild/run/instance-2/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. - -Fixes: - - http://autobuild.buildroot.net/results/0d486edaf4c51b6438adeec61fe2c55099862acb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/collectd/collectd/pull/3325] ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 34386d06..59a7f355 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2722,6 +2722,7 @@ if test "x$withval" != "xno"; then - else - AC_MSG_RESULT([no]) - with_libgrpcpp="no (requires C++11 support)" -+ with_libprotobuf="no ( requires C++11 support)" - fi - fi - -@@ -4568,7 +4569,7 @@ if test "x$withval" != "xno"; then - AC_CHECK_LIB([protobuf], [main], - [ - SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$with_libprotobuf_cppflags $PROTOBUF_CFLAGS" -+ CPPFLAGS="-std=c++11 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" - if test "x$PROTOBUF_LIBS" = "x" - then - PROTOBUF_LIBS="-lprotobuf" --- -2.23.0 - diff --git a/buildroot/package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch b/buildroot/package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch new file mode 100644 index 000000000..14af0d763 --- /dev/null +++ b/buildroot/package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch @@ -0,0 +1,43 @@ +From 5e600ae2ad370ddbb759e84ce55a7dfaa9a0bdd7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Sep 2020 14:17:23 +0200 +Subject: [PATCH] src/netlink.c: remove REG_NOERROR + +REG_NOERROR is used since version 5.12.0 and +https://github.com/collectd/collectd/commit/f7fd32e5209e188db7985a42054252fc4cbfe7c1 + +However, REG_NOERROR is not defined by musl, even GNU regex do not +mention REG_NOERROR, so just remove it to avoid the following build +failure: + +src/netlink.c: In function 'check_ignorelist': +src/netlink.c:243:51: error: 'REG_NOERROR' undeclared (first use in this function); did you mean 'REG_NOTBOL'? + if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR) + ^~~~~~~~~~~ + REG_NOTBOL + +Fixes: + - http://autobuild.buildroot.org/results/cd4d75888b5259b028132dd224be34f69bcbb702 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/collectd/collectd/pull/3569] +--- + src/netlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/netlink.c b/src/netlink.c +index 7a5da762..fac2fb1e 100644 +--- a/src/netlink.c ++++ b/src/netlink.c +@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type, + for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) { + #if HAVE_REGEX_H + if (i->rdevice != NULL) { +- if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR) ++ if (regexec(i->rdevice, dev, 0, NULL, 0)) + continue; + } else + #endif +-- +2.28.0 + diff --git a/buildroot/package/collectd/Config.in b/buildroot/package/collectd/Config.in index 5b194e943..3e854ba51 100644 --- a/buildroot/package/collectd/Config.in +++ b/buildroot/package/collectd/Config.in @@ -65,11 +65,14 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH config BR2_PACKAGE_COLLECTD_LUA bool "lua" - select BR2_PACKAGE_LUA + depends on BR2_PACKAGE_HAS_LUAINTERPRETER help Embeds a Lua interpreter into collectd and provides an interface to collectd's plugin system. +comment "lua support needs a Lua interpreter" + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER + config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL bool "notify_email" depends on !BR2_STATIC_LIBS # libesmtp @@ -128,6 +131,21 @@ config BR2_PACKAGE_COLLECTD_BIND help Collects BIND DNS statistics. +config BR2_PACKAGE_COLLECTD_BUDDYINFO + bool "buddyinfo" + help + Statistics from buddyinfo file about memory fragmentation. + +config BR2_PACKAGE_COLLECTD_CAPABILITIES + bool "capabilities" + depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode + select BR2_PACKAGE_DMIDECODE # runtime + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBMICROHTTPD + help + Collects selected static platform data using dmidecode and + expose it through micro embedded webserver. + config BR2_PACKAGE_COLLECTD_CEPH bool "ceph" select BR2_PACKAGE_YAJL @@ -210,6 +228,13 @@ config BR2_PACKAGE_COLLECTD_DNS help Collects statistics of DNS traffic using libpcap. +config BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY + bool "dpdk_telemetry" + select BR2_PACKAGE_JANSSON + help + Collects DPDK ethernet device metrics via dpdk_telemetry + library. + config BR2_PACKAGE_COLLECTD_DRBD bool "drbd" help @@ -296,19 +321,6 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. -config BR2_PACKAGE_COLLECTD_LVM - bool "lvm" - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 app library - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY - help - Collects the size of logical volumes (LV) and free space - inside a volume group (VG) from Linux' Logical Volume Manager - (LVM). - -comment "lvm needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_COLLECTD_MD bool "md" help @@ -374,6 +386,17 @@ config BR2_PACKAGE_COLLECTD_NTPD help Queries an NTP server and extracts parameters. +config BR2_PACKAGE_COLLECTD_NUT + bool "nut" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_NUT + help + The NUT plugin collects uninterruptible power supply (UPS) + statistics using the Network UPS Tools (NUT). + +comment "nut needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_COLLECTD_OLSRD bool "olsrd" help @@ -559,6 +582,7 @@ comment "Select at least one for collectd to be useful" config BR2_PACKAGE_COLLECTD_AMQP bool "amqp" + select BR2_PACKAGE_OPENSSL # needs rabbitmq-c with ssl support select BR2_PACKAGE_RABBITMQ_C help Send/receive values via the Advanced Message Queuing Protocol @@ -581,15 +605,19 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" @@ -602,6 +630,14 @@ config BR2_PACKAGE_COLLECTD_NETWORK help Send/receive values from other instances of collectd. +config BR2_PACKAGE_COLLECTD_NETWORK_GCRYPT + bool "crypto support" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt + depends on BR2_PACKAGE_COLLECTD_NETWORK + select BR2_PACKAGE_LIBGCRYPT + help + Enable crypto support + config BR2_PACKAGE_COLLECTD_RRDTOOL bool "rrdtool" depends on BR2_USE_WCHAR # rrdtool @@ -636,6 +672,12 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP Sends values collected to a web-server using HTTP POST and PUTVAL. +config BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP + bool "write_influxdb_udp" + help + Sends data to an instance of InfluxDB using the "Line + Protocol". + config BR2_PACKAGE_COLLECTD_WRITELOG bool "write_log" help diff --git a/buildroot/package/collectd/S90collectd b/buildroot/package/collectd/S90collectd new file mode 100644 index 000000000..cf11c7b38 --- /dev/null +++ b/buildroot/package/collectd/S90collectd @@ -0,0 +1,51 @@ +#!/bin/sh + +DAEMON="collectd" +EXEC="/usr/sbin/$DAEMON" +PIDFILE="/var/run/$DAEMON.pid" +COLLECTD_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "$EXEC" \ + -- $COLLECTD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/collectd/collectd.hash b/buildroot/package/collectd/collectd.hash index 7f716b7a9..394904a19 100644 --- a/buildroot/package/collectd/collectd.hash +++ b/buildroot/package/collectd/collectd.hash @@ -1,5 +1,5 @@ # Locally computed checksums -sha512 1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5 collectd-5.10.0.tar.bz2 -sha256 a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b collectd-5.10.0.tar.bz2 -sha1 9d64ec4e6e834b8e417e282390e2a9c57934d3bc collectd-5.10.0.tar.bz2 +sha512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 collectd-5.12.0.tar.bz2 +sha256 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 collectd-5.12.0.tar.bz2 +sha1 af36fe83e2995270b5632fc21e5a001e6702cdce collectd-5.12.0.tar.bz2 sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING diff --git a/buildroot/package/collectd/collectd.mk b/buildroot/package/collectd/collectd.mk index 65307dce4..00e33f27d 100644 --- a/buildroot/package/collectd/collectd.mk +++ b/buildroot/package/collectd/collectd.mk @@ -4,23 +4,21 @@ # ################################################################################ -COLLECTD_VERSION = 5.10.0 +COLLECTD_VERSION = 5.12.0 COLLECTD_SITE = \ - https://github.com/collectd/collectd/releases/download/$(COLLECTD_VERSION) + https://github.com/collectd/collectd/releases/download/collectd-$(COLLECTD_VERSION) COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING -# We're patching configure.ac -COLLECTD_AUTORECONF = YES # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dbi dpdkstat email \ gmond hddtemp intel_rdt ipmi java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ - nut oracle perl pf pinba powerdns python routeros \ + oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -53,6 +51,8 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_BUDDYINFO),--enable-buddyinfo,--disable-buddyinfo) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),--enable-capabilities,--disable-capabilities) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \ @@ -68,6 +68,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \ $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \ + $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),--enable-dpdk_telemetry,--disable-dpdk_telemetry) \ $(if $(BR2_PACKAGE_COLLECTD_DRBD),--enable-drbd,--disable-drbd) \ $(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \ $(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \ @@ -90,7 +91,6 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ @@ -106,6 +106,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ + $(if $(BR2_PACKAGE_COLLECTD_NUT),--enable-nut,--disable-nut) \ $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ @@ -142,6 +143,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP),--enable-write_influxdb_udp,--disable-write_influxdb_udp) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),--enable-write_redis,--disable-write_redis) \ @@ -154,17 +156,18 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_AMQP),rabbitmq-c) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),jansson libmicrohttpd) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ + $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ - $(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \ + $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ @@ -172,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ + $(if $(BR2_PACKAGE_COLLECTD_NUT),nut) \ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \ $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ @@ -190,9 +194,15 @@ COLLECTD_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_GRPC),y) COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_JANSSON),y) +COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr +endif ifeq ($(BR2_PACKAGE_LIBCURL),y) COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_LUAJIT),y) +COLLECTD_CONF_ENV += LIBLUA_PKG_CONFIG_NAME=luajit +endif ifeq ($(BR2_PACKAGE_MYSQL),y) COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr endif @@ -232,4 +242,9 @@ define COLLECTD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/collectd.service endef +define COLLECTD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/collectd/S90collectd \ + $(TARGET_DIR)/etc/init.d/S90collectd +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/comix-cursors/comix-cursors.hash b/buildroot/package/comix-cursors/comix-cursors.hash index d7f33ca07..e03808c3f 100644 --- a/buildroot/package/comix-cursors/comix-cursors.hash +++ b/buildroot/package/comix-cursors/comix-cursors.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3109e4d19d930a6a2a5c3422ebaaa2002640169118f9b12c042bb64995f3ec31 ComixCursors-0.8.2.tar.bz2 +sha256 9e68ea8ff230dcc793528aa5da9a38b9bf61c478cd6868b4e4f5da659746a019 ComixCursors-0.9.1.tar.bz2 diff --git a/buildroot/package/comix-cursors/comix-cursors.mk b/buildroot/package/comix-cursors/comix-cursors.mk index 6cc73764a..7b034ccee 100644 --- a/buildroot/package/comix-cursors/comix-cursors.mk +++ b/buildroot/package/comix-cursors/comix-cursors.mk @@ -4,8 +4,8 @@ # ################################################################################ -COMIX_CURSORS_VERSION = 0.8.2 -COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors +COMIX_CURSORS_VERSION = 0.9.1 +COMIX_CURSORS_SITE = https://limitland.gitlab.io/comixcursors COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2 COMIX_CURSORS_LICENSE = GPL-3.0 COMIX_CURSORS_STRIP_COMPONENTS = 0 diff --git a/buildroot/package/connman/0001-nat-build-failure.patch b/buildroot/package/connman/0001-nat-build-failure.patch deleted file mode 100644 index 0ab58501d..000000000 --- a/buildroot/package/connman/0001-nat-build-failure.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 19 Apr 2016 08:38:38 -0300 -Subject: [PATCH] nat: fix build failure - -_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in -system header files. - -Signed-off-by: Gustavo Zacarias ---- -Status: submitted upstream - - src/nat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nat.c b/src/nat.c -index 33ae6df..62e21d4 100644 ---- a/src/nat.c -+++ b/src/nat.c -@@ -24,6 +24,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include --- -2.7.3 - diff --git a/buildroot/package/connman/Config.in b/buildroot/package/connman/Config.in index 30eae23c9..72b76bf19 100644 --- a/buildroot/package/connman/Config.in +++ b/buildroot/package/connman/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_CONNMAN depends on !BR2_TOOLCHAIN_USES_MUSL # missing res_ninit() select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_IPTABLES help The Connection Manager (ConnMan) project provides a daemon for managing internet connections within embedded devices @@ -18,6 +17,28 @@ config BR2_PACKAGE_CONNMAN if BR2_PACKAGE_CONNMAN +choice + prompt "Firewall type" + default BR2_PACKAGE_CONNMAN_IPTABLES + help + Select which firewall type is used. + +config BR2_PACKAGE_CONNMAN_IPTABLES + bool "iptables" + select BR2_PACKAGE_IPTABLES + help + Use iptables as firewall. + +config BR2_PACKAGE_CONNMAN_NFTABLES + bool "nftables" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + select BR2_PACKAGE_LIBMNL + select BR2_PACKAGE_NFTABLES + help + Use nftables as firewall. +endchoice + config BR2_PACKAGE_CONNMAN_ETHERNET bool "enable Ethernet support" default y @@ -31,6 +52,10 @@ config BR2_PACKAGE_CONNMAN_WIFI setup). ConnMan detects the start of wpa_supplicant automatically. +config BR2_PACKAGE_CONNMAN_WIREGUARD + bool "enable wireguard support" + select BR2_PACKAGE_LIBMNL + config BR2_PACKAGE_CONNMAN_WISPR bool "enable WISPr support" depends on !BR2_STATIC_LIBS # gnutls @@ -60,8 +85,12 @@ config BR2_PACKAGE_CONNMAN_NEARD config BR2_PACKAGE_CONNMAN_OFONO bool "enable ofono support" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ofono + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ofono select BR2_PACKAGE_OFONO +comment "ofono support needs a toolchain w/ headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_CONNMAN_DEBUG bool "enable compiling with debugging information" diff --git a/buildroot/package/connman/connman.hash b/buildroot/package/connman/connman.hash index ff5b4d48f..303910502 100644 --- a/buildroot/package/connman/connman.hash +++ b/buildroot/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz +sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/connman/connman.mk b/buildroot/package/connman/connman.mk index 2cbf3fe75..23e7cb779 100644 --- a/buildroot/package/connman/connman.mk +++ b/buildroot/package/connman/connman.mk @@ -4,29 +4,85 @@ # ################################################################################ -CONNMAN_VERSION = 1.37 +CONNMAN_VERSION = 1.38 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING -CONNMAN_CONF_OPTS += \ - --with-dbusconfdir=/etc \ - $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \ - $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \ - $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \ - $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \ - $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \ - $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system) -CONNMAN_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls) +CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc + +ifeq ($(BR2_INIT_SYSTEMD),y) +CONNMAN_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_BLUETOOTH),y) +CONNMAN_CONF_OPTS += --enable-bluetooth +else +CONNMAN_CONF_OPTS += --disable-bluetooth +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_DEBUG),y) +CONNMAN_CONF_OPTS += --enable-debug +else +CONNMAN_CONF_OPTS += --disable-debug +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_ETHERNET),y) +CONNMAN_CONF_OPTS += --enable-ethernet +else +CONNMAN_CONF_OPTS += --disable-ethernet +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_IPTABLES),y) +CONNMAN_CONF_OPTS += --with-firewall=iptables +CONNMAN_DEPENDENCIES += iptables +else ifeq ($(BR2_PACKAGE_CONNMAN_NFTABLES),y) +CONNMAN_CONF_OPTS += --with-firewall=nftables +CONNMAN_DEPENDENCIES += libmnl nftables +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_LOOPBACK),y) +CONNMAN_CONF_OPTS += --enable-loopback +else +CONNMAN_CONF_OPTS += --disable-loopback +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_NEARD),y) +CONNMAN_CONF_OPTS += --enable-neard +CONNMAN_DEPENDENCIES += neard +else +CONNMAN_CONF_OPTS += --disable-neard +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_OFONO),y) +CONNMAN_CONF_OPTS += --enable-ofono +CONNMAN_DEPENDENCIES += ofono +else +CONNMAN_CONF_OPTS += --disable-ofono +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_WIFI),y) +CONNMAN_CONF_OPTS += --enable-wifi +else +CONNMAN_CONF_OPTS += --disable-wifi +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_WIREGUARD),y) +CONNMAN_CONF_OPTS += --enable-wireguard +CONNMAN_DEPENDENCIES += libmnl +else +CONNMAN_CONF_OPTS += --disable-wireguard +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y) +CONNMAN_CONF_OPTS += --enable-wispr +CONNMAN_DEPENDENCIES += gnutls +else +CONNMAN_CONF_OPTS += --disable-wispr +endif define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman diff --git a/buildroot/package/conntrack-tools/conntrack-tools.hash b/buildroot/package/conntrack-tools/conntrack-tools.hash index cd95a06dc..ae9af25e8 100644 --- a/buildroot/package/conntrack-tools/conntrack-tools.hash +++ b/buildroot/package/conntrack-tools/conntrack-tools.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/conntrack-tools/downloads.html -sha256 36c6d99c7684851d4d72e75bd07ff3f0ff1baaf4b6f069eb7244990cd1a9a462 conntrack-tools-1.4.5.tar.bz2 +sha256 590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f conntrack-tools-1.4.6.tar.bz2 # Locally calculated sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/conntrack-tools/conntrack-tools.mk b/buildroot/package/conntrack-tools/conntrack-tools.mk index 77fcb5295..145b6d785 100644 --- a/buildroot/package/conntrack-tools/conntrack-tools.mk +++ b/buildroot/package/conntrack-tools/conntrack-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.5 +CONNTRACK_TOOLS_VERSION = 1.4.6 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ diff --git a/buildroot/package/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/buildroot/package/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch new file mode 100644 index 000000000..43a8161b9 --- /dev/null +++ b/buildroot/package/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch @@ -0,0 +1,118 @@ +From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 5 Mar 2020 17:25:29 -0800 +Subject: [PATCH] ls: restore 8.31 behavior on removed directories + +* NEWS: Mention this. +* src/ls.c: Do not include +(print_dir): Don't worry about whether the directory is removed. +* tests/ls/removed-directory.sh: Adjust to match new (i.e., old) +behavior. +Signed-off-by: Joao Marcos Costa +--- + NEWS | 6 ++++++ + src/ls.c | 22 ---------------------- + tests/ls/removed-directory.sh | 10 ++-------- + 3 files changed, 8 insertions(+), 30 deletions(-) + +diff --git a/NEWS b/NEWS +index fdc8bf5db..653e7178b 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Changes in behavior ++ ++ On GNU/Linux systems, ls no longer issues an error message on ++ directory merely because it was removed. This reverts a change ++ that was made in release 8.32. ++ + + * Noteworthy changes in release 8.32 (2020-03-05) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 24b983287..4acf5f44d 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -49,10 +49,6 @@ + # include + #endif + +-#ifdef __linux__ +-# include +-#endif +- + #include + #include + #include +@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + struct dirent *next; + uintmax_t total_blocks = 0; + static bool first = true; +- bool found_any_entries = false; + + errno = 0; + dirp = opendir (name); +@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + next = readdir (dirp); + if (next) + { +- found_any_entries = true; + if (! file_ignored (next->d_name)) + { + enum filetype type = unknown; +@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + if (errno != EOVERFLOW) + break; + } +-#ifdef __linux__ +- else if (! found_any_entries) +- { +- /* If readdir finds no directory entries at all, not even "." or +- "..", then double check that the directory exists. */ +- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 +- && errno != EINVAL) +- { +- /* We exclude EINVAL as that pertains to buffer handling, +- and we've passed NULL as the buffer for simplicity. +- ENOENT is returned if appropriate before buffer handling. */ +- file_failure (command_line_arg, _("reading directory %s"), name); +- } +- break; +- } +-#endif + else + break; + +diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh +index e8c835dab..fe8f929a1 100755 +--- a/tests/ls/removed-directory.sh ++++ b/tests/ls/removed-directory.sh +@@ -26,20 +26,14 @@ case $host_triplet in + *) skip_ 'non linux kernel' ;; + esac + +-LS_FAILURE=2 +- +-cat <<\EOF >exp-err || framework_failure_ +-ls: reading directory '.': No such file or directory +-EOF +- + cwd=$(pwd) + mkdir d || framework_failure_ + cd d || framework_failure_ + rmdir ../d || framework_failure_ + +-returns_ $LS_FAILURE ls >../out 2>../err || fail=1 ++ls >../out 2>../err || fail=1 + cd "$cwd" || framework_failure_ + compare /dev/null out || fail=1 +-compare exp-err err || fail=1 ++compare /dev/null err || fail=1 + + Exit $fail +-- +2.17.1 + diff --git a/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch b/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch deleted file mode 100644 index 7033d3b85..000000000 --- a/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 11 Mar 2019 16:40:29 -0700 -Subject: [PATCH] strtod: fix clash with strtold - -Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). -* lib/strtod.c (compute_minus_zero, minus_zero): -Simplify by remving the macro / external variable, -and having just a function. User changed. This avoids -the need for an external variable that might clash. - -Upstream-Status: Backport [rhel5] - -Signed-off-by: Oleksandr Kravchuk - -Downloaded from -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch - -This patch was committed to gnulib: -http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 -and will be included in the next release of coreutils. - -Signed-off-by: Bernd Kuhls ---- - ChangeLog | 9 +++++++++ - lib/strtod.c | 11 +++++------ - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/lib/strtod.c b/lib/strtod.c -index b9eaa51b4..69b1564e1 100644 ---- a/lib/strtod.c -+++ b/lib/strtod.c -@@ -294,16 +294,15 @@ parse_number (const char *nptr, - ICC 10.0 has a bug when optimizing the expression -zero. - The expression -MIN * MIN does not work when cross-compiling - to PowerPC on Mac OS X 10.5. */ --#if defined __hpux || defined __sgi || defined __ICC - static DOUBLE --compute_minus_zero (void) -+minus_zero (void) - { -+#if defined __hpux || defined __sgi || defined __ICC - return -MIN * MIN; --} --# define minus_zero compute_minus_zero () - #else --DOUBLE minus_zero = -0.0; -+ return -0.0; - #endif -+} - - /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the - character after the last one used in the number is put in *ENDPTR. */ -@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) - /* Special case -0.0, since at least ICC miscompiles negation. We - can't use copysign(), as that drags in -lm on some platforms. */ - if (!num && negative) -- return minus_zero; -+ return minus_zero (); - return negative ? -num : num; - } --- -2.20.1 - diff --git a/buildroot/package/coreutils/coreutils.hash b/buildroot/package/coreutils/coreutils.hash index 31dfbd73a..54cdf4c55 100644 --- a/buildroot/package/coreutils/coreutils.hash +++ b/buildroot/package/coreutils/coreutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd coreutils-8.31.tar.xz +sha256 4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa coreutils-8.32.tar.xz # Locally computed -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/buildroot/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk index c1420b260..3866b7624 100644 --- a/buildroot/package/coreutils/coreutils.mk +++ b/buildroot/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 8.31 +COREUTILS_VERSION = 8.32 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ diff --git a/buildroot/package/cppcms/Config.in b/buildroot/package/cppcms/Config.in index f02b28348..1d7635a83 100644 --- a/buildroot/package/cppcms/Config.in +++ b/buildroot/package/cppcms/Config.in @@ -27,15 +27,17 @@ if BR2_PACKAGE_CPPCMS config BR2_PACKAGE_CPPCMS_ICU bool "enable icu support" depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help Using ICU allows advanced localization features into CppCMS, in another hand ICU is heavier than iconv. -comment "icu support needs a toolchain w/ gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 endif diff --git a/buildroot/package/cppzmq/cppzmq.hash b/buildroot/package/cppzmq/cppzmq.hash index f0e256dc1..7e40d4e32 100644 --- a/buildroot/package/cppzmq/cppzmq.hash +++ b/buildroot/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e9203391a0b913576153a2ad22a2dc1479b1ec325beb6c46a3237c669aef5a52 cppzmq-4.6.0.tar.gz -sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE +sha256 ffbedc8ffb95caea0b82f9be208c8ac5d6040870b63f2a9c780ccff681d5464c cppzmq-4.7.0.tar.gz +sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/buildroot/package/cppzmq/cppzmq.mk b/buildroot/package/cppzmq/cppzmq.mk index c2994ecfc..0f0ace254 100644 --- a/buildroot/package/cppzmq/cppzmq.mk +++ b/buildroot/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 4.6.0 +CPPZMQ_VERSION = 4.7.0 CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq diff --git a/buildroot/package/cramfs/cramfs.hash b/buildroot/package/cramfs/cramfs.hash index af7d2e1db..672266b46 100644 --- a/buildroot/package/cramfs/cramfs.hash +++ b/buildroot/package/cramfs/cramfs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 99d87aa5874f4a34c219275e0297b0f4c710895f9c87295267aeabe6a752add1 cramfs-1a1e65f2a049.tar.gz +sha256 cdb7a4ecad034f063b6456b37cdf653ae31758a224c32161e54712a9d7f01cc3 cramfs-2.1.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/cramfs/cramfs.mk b/buildroot/package/cramfs/cramfs.mk index 18bef80bd..85706d1a8 100644 --- a/buildroot/package/cramfs/cramfs.mk +++ b/buildroot/package/cramfs/cramfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRAMFS_VERSION = 1a1e65f2a049 -CRAMFS_SITE = $(call github,npitre,cramfs-tools,$(CRAMFS_VERSION)) +CRAMFS_VERSION = 2.1 +CRAMFS_SITE = $(call github,npitre,cramfs-tools,v$(CRAMFS_VERSION)) CRAMFS_LICENSE = GPL-2.0+ CRAMFS_LICENSE_FILES = COPYING diff --git a/buildroot/package/cryptodev-linux/cryptodev-linux.hash b/buildroot/package/cryptodev-linux/cryptodev-linux.hash index 4319fd313..1cbc2e859 100644 --- a/buildroot/package/cryptodev-linux/cryptodev-linux.hash +++ b/buildroot/package/cryptodev-linux/cryptodev-linux.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 50cf34ecedc897edb11d1a24076f0d4cfcb704dcd294273bc03e2f6c3632fe2c cryptodev-linux-a1e738aef6249ee3bddf997e91e59b1210553209.tar.gz +sha256 0e2d30cf440a55e1125c815f0df229350192cfddbb38e6571e97de19069c97c6 cryptodev-linux-fabe5989a3dc9fba0cd0a40b612247cdde351c01.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/cryptodev-linux/cryptodev-linux.mk b/buildroot/package/cryptodev-linux/cryptodev-linux.mk index a02add631..5b882b284 100644 --- a/buildroot/package/cryptodev-linux/cryptodev-linux.mk +++ b/buildroot/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = a1e738aef6249ee3bddf997e91e59b1210553209 +CRYPTODEV_LINUX_VERSION = fabe5989a3dc9fba0cd0a40b612247cdde351c01 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ diff --git a/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch b/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch index fa865314a..bbfd1aa07 100644 --- a/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch +++ b/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch @@ -12,6 +12,8 @@ In file included from lib/luks2/luks2_internal.h:32, lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object' Signed-off-by: Baruch Siach +[Upstream status: +https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91] --- lib/luks2/luks2.h | 1 - lib/setup.c | 1 + diff --git a/buildroot/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch b/buildroot/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch deleted file mode 100644 index 6a7313903..000000000 --- a/buildroot/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 13 Apr 2020 11:48:17 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - - * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. - * json_object_get_uint64() and json_object_new_uint64() are part - of the upstream API now. - -Signed-off-by: Peter Korsgaard ---- - lib/luks2/luks2_internal.h | 4 +++- - lib/luks2/luks2_json_metadata.c | 38 +++++++++++++++++---------------- - 2 files changed, 23 insertions(+), 19 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index b9fec6b5..939101d6 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj); --uint32_t json_object_get_uint32(json_object *jobj); - json_object *json_object_new_uint64(uint64_t value); -+#endif -+uint32_t json_object_get_uint32(json_object *jobj); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 781280c2..712c2bbd 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - tmp = strtoull(json_object_get_string(jobj), &endptr, 10); - if (*endptr || errno) { - *value = 0; -- return FALSE; -+ return 0; - } - - *value = tmp; -- return TRUE; -+ return 1; - } - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj) - { - uint64_t r; -@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } -+#endif - - /* - * Validate helpers -@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char - for (i = 0; key[i]; i++) - if (!isdigit(key[i])) { - log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); -- return FALSE; -+ return 0; - } -- return TRUE; -+ return 1; - } - - json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, -@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) - errno = 0; - tmp = json_object_get_int64(jobj); - -- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE; -+ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1; - } - - static json_bool validate_keyslots_array(struct crypt_device *cd, -@@ -313,17 +315,17 @@ static json_bool validate_keyslots_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in keyslots array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_keys, "", "Keyslots section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool validate_segments_array(struct crypt_device *cd, -@@ -336,17 +338,17 @@ static json_bool validate_segments_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in segments array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_segments, "", "Segments section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool segment_has_digest(const char *segment_name, json_object *jobj_digests) -@@ -357,10 +359,10 @@ static json_bool segment_has_digest(const char *segment_name, json_object *jobj_ - UNUSED(key); - json_object_object_get_ex(val, "segments", &jobj_segments); - if (LUKS2_array_jobj(jobj_segments, segment_name)) -- return TRUE; -+ return 1; - } - -- return FALSE; -+ return 0; - } - - static json_bool validate_intervals(struct crypt_device *cd, -@@ -372,18 +374,18 @@ static json_bool validate_intervals(struct crypt_device *cd, - while (i < length) { - if (ix[i].offset < 2 * metadata_size) { - log_dbg(cd, "Illegal area offset: %" PRIu64 ".", ix[i].offset); -- return FALSE; -+ return 0; - } - - if (!ix[i].length) { - log_dbg(cd, "Area length must be greater than zero."); -- return FALSE; -+ return 0; - } - - if ((ix[i].offset + ix[i].length) > keyslots_area_end) { - log_dbg(cd, "Area [%" PRIu64 ", %" PRIu64 "] overflows binary keyslots area (ends at offset: %" PRIu64 ").", - ix[i].offset, ix[i].offset + ix[i].length, keyslots_area_end); -- return FALSE; -+ return 0; - } - - for (j = 0; j < length; j++) { -@@ -393,14 +395,14 @@ static json_bool validate_intervals(struct crypt_device *cd, - log_dbg(cd, "Overlapping areas [%" PRIu64 ",%" PRIu64 "] and [%" PRIu64 ",%" PRIu64 "].", - ix[i].offset, ix[i].offset + ix[i].length, - ix[j].offset, ix[j].offset + ix[j].length); -- return FALSE; -+ return 0; - } - } - - i++; - } - -- return TRUE; -+ return 1; - } - - static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object *hdr_jobj, json_object *hdr_keyslot, const char *key) --- -2.20.1 - diff --git a/buildroot/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch b/buildroot/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch deleted file mode 100644 index 83ce71c6f..000000000 --- a/buildroot/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch +++ /dev/null @@ -1,512 +0,0 @@ -From 55cf272d275c561459f2c9c3dc943ef7a69c9d4c Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Tue, 14 Apr 2020 17:24:54 +0200 -Subject: [PATCH] Avoid name clash with newer json-c library. - -This is partial revert of previous commit and also -fixes wrong decision to name our internal helpers with -json_object prefix. - -(cherry picked from commit e6a356974330e3ae21579a5737976e9a2aad1b51) -Signed-off-by: Peter Korsgaard ---- - lib/luks2/luks2_internal.h | 8 +++----- - lib/luks2/luks2_json_format.c | 6 +++--- - lib/luks2/luks2_json_metadata.c | 18 ++++++++---------- - lib/luks2/luks2_keyslot.c | 8 ++++---- - lib/luks2/luks2_keyslot_luks2.c | 16 ++++++++-------- - lib/luks2/luks2_keyslot_reenc.c | 20 ++++++++++---------- - lib/luks2/luks2_luks1_convert.c | 22 +++++++++++----------- - lib/luks2/luks2_reencrypt.c | 16 ++++++++-------- - lib/luks2/luks2_segment.c | 12 ++++++------ - 9 files changed, 61 insertions(+), 65 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index 6a8b8f2a..d2222e84 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -59,11 +59,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj); --json_object *json_object_new_uint64(uint64_t value); --#endif --uint32_t json_object_get_uint32(json_object *jobj); -+uint64_t crypt_jobj_get_uint64(json_object *jobj); -+uint32_t crypt_jobj_get_uint32(json_object *jobj); -+json_object *crypt_jobj_new_uint64(uint64_t value); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c -index d4f36247..32ea0ea4 100644 ---- a/lib/luks2/luks2_json_format.c -+++ b/lib/luks2/luks2_json_format.c -@@ -325,8 +325,8 @@ int LUKS2_generate_hdr( - - json_object_object_add_by_uint(jobj_segments, 0, jobj_segment); - -- json_object_object_add(jobj_config, "json_size", json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - JSON_DBG(cd, hdr->jobj, "Header JSON:"); - return 0; -@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd, - if (!json_object_object_get_ex(hdr->jobj, "config", &jobj_config)) - return 1; - -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - return 0; - } -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 52421fac..19fb9588 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct luks2_hdr *hdr) - * json_type_int needs to be validated first. - * See validate_json_uint32() - */ --uint32_t json_object_get_uint32(json_object *jobj) -+uint32_t crypt_jobj_get_uint32(json_object *jobj) - { - return json_object_get_int64(jobj); - } -@@ -241,15 +241,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - return 1; - } - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj) -+uint64_t crypt_jobj_get_uint64(json_object *jobj) - { - uint64_t r; - json_str_to_uint64(jobj, &r); - return r; - } - --json_object *json_object_new_uint64(uint64_t value) -+json_object *crypt_jobj_new_uint64(uint64_t value) - { - /* 18446744073709551615 */ - char num[21]; -@@ -263,7 +262,6 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } --#endif - - /* - * Validate helpers -@@ -457,7 +455,7 @@ static int hdr_validate_json_size(struct crypt_device *cd, json_object *hdr_jobj - - json = json_object_to_json_string_ext(hdr_jobj, - JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE); -- json_area_size = json_object_get_uint64(jobj1); -+ json_area_size = crypt_jobj_get_uint64(jobj1); - json_size = (uint64_t)strlen(json); - - if (hdr_json_size != json_area_size) { -@@ -545,7 +543,7 @@ static int hdr_validate_crypt_segment(struct crypt_device *cd, - return 1; - } - -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (!sector_size || MISALIGNED_512(sector_size)) { - log_dbg(cd, "Illegal sector size: %" PRIu32, sector_size); - return 1; -@@ -1569,7 +1567,7 @@ static void hdr_dump_keyslots(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, " %s: %s%s\n", slot, tmps, r == -ENOENT ? " (unbound)" : ""); - - if (json_object_object_get_ex(val, "key_size", &jobj2)) -- log_std(cd, "\tKey: %u bits\n", json_object_get_uint32(jobj2) * 8); -+ log_std(cd, "\tKey: %u bits\n", crypt_jobj_get_uint32(jobj2) * 8); - - log_std(cd, "\tPriority: %s\n", get_priority_desc(val)); - -@@ -1652,7 +1650,7 @@ static void hdr_dump_segments(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, "\tcipher: %s\n", json_object_get_string(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "sector_size", &jobj1)) -- log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", json_object_get_uint32(jobj1)); -+ log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", crypt_jobj_get_uint32(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "integrity", &jobj1) && - json_object_object_get_ex(jobj1, "type", &jobj2)) -@@ -1749,7 +1747,7 @@ int LUKS2_get_data_size(struct luks2_hdr *hdr, uint64_t *size, bool *dynamic) - return 0; - } - -- tmp += json_object_get_uint64(jobj_size); -+ tmp += crypt_jobj_get_uint64(jobj_size); - } - - /* impossible, real device size must not be zero */ -diff --git a/lib/luks2/luks2_keyslot.c b/lib/luks2/luks2_keyslot.c -index 7d06df80..d853fc8e 100644 ---- a/lib/luks2/luks2_keyslot.c -+++ b/lib/luks2/luks2_keyslot.c -@@ -301,11 +301,11 @@ int LUKS2_keyslot_area(struct luks2_hdr *hdr, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj)) - return -EINVAL; -- *offset = json_object_get_uint64(jobj); -+ *offset = crypt_jobj_get_uint64(jobj); - - if (!json_object_object_get_ex(jobj_area, "size", &jobj)) - return -EINVAL; -- *length = json_object_get_uint64(jobj); -+ *length = crypt_jobj_get_uint64(jobj); - - return 0; - } -@@ -840,8 +840,8 @@ int placeholder_keyslot_alloc(struct crypt_device *cd, - - /* Area object */ - jobj_area = json_object_new_object(); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -diff --git a/lib/luks2/luks2_keyslot_luks2.c b/lib/luks2/luks2_keyslot_luks2.c -index 7b438a8b..953ba168 100644 ---- a/lib/luks2/luks2_keyslot_luks2.c -+++ b/lib/luks2/luks2_keyslot_luks2.c -@@ -220,7 +220,7 @@ static int luks2_keyslot_set_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -313,7 +313,7 @@ static int luks2_keyslot_get_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -494,8 +494,8 @@ static int luks2_keyslot_alloc(struct crypt_device *cd, - /* Area object */ - jobj_area = json_object_new_object(); - json_object_object_add(jobj_area, "type", json_object_new_string("raw")); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -@@ -607,7 +607,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tCipher: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "key_size", &jobj1); -- log_std(cd, "\tCipher key: %u bits\n", json_object_get_uint32(jobj1) * 8); -+ log_std(cd, "\tCipher key: %u bits\n", crypt_jobj_get_uint32(jobj1) * 8); - - json_object_object_get_ex(jobj_kdf, "type", &jobj1); - log_std(cd, "\tPBKDF: %s\n", json_object_get_string(jobj1)); -@@ -617,7 +617,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tHash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_kdf, "iterations", &jobj1); -- log_std(cd, "\tIterations: %" PRIu64 "\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tIterations: %" PRIu64 "\n", crypt_jobj_get_uint64(jobj1)); - } else { - json_object_object_get_ex(jobj_kdf, "time", &jobj1); - log_std(cd, "\tTime cost: %" PRIu64 "\n", json_object_get_int64(jobj1)); -@@ -640,10 +640,10 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tAF hash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -diff --git a/lib/luks2/luks2_keyslot_reenc.c b/lib/luks2/luks2_keyslot_reenc.c -index 64b8d274..c6b92db3 100644 ---- a/lib/luks2/luks2_keyslot_reenc.c -+++ b/lib/luks2/luks2_keyslot_reenc.c -@@ -67,13 +67,13 @@ int reenc_keyslot_alloc(struct crypt_device *cd, - - if (params->data_shift) { - json_object_object_add(jobj_area, "type", json_object_new_string("datashift")); -- json_object_object_add(jobj_area, "shift_size", json_object_new_uint64(params->data_shift << SECTOR_SHIFT)); -+ json_object_object_add(jobj_area, "shift_size", crypt_jobj_new_uint64(params->data_shift << SECTOR_SHIFT)); - } else - /* except data shift protection, initial setting is irrelevant. Type can be changed during reencryption */ - json_object_object_add(jobj_area, "type", json_object_new_string("none")); - -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - - json_object_object_add(jobj_keyslot, "type", json_object_new_string("reencrypt")); - json_object_object_add(jobj_keyslot, "key_size", json_object_new_int(1)); /* useless but mandatory */ -@@ -113,8 +113,8 @@ static int reenc_keyslot_store_data(struct crypt_device *cd, - !json_object_object_get_ex(jobj_area, "size", &jobj_length)) - return -EINVAL; - -- area_offset = json_object_get_uint64(jobj_offset); -- area_length = json_object_get_uint64(jobj_length); -+ area_offset = crypt_jobj_get_uint64(jobj_offset); -+ area_length = crypt_jobj_get_uint64(jobj_length); - - if (!area_offset || !area_length || ((uint64_t)buffer_len > area_length)) - return -EINVAL; -@@ -242,14 +242,14 @@ static int reenc_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\t%-12s%d [bytes]\n", "Hash data:", json_object_get_int(jobj1)); - } else if (!strcmp(json_object_get_string(jobj_resilience), "datashift")) { - json_object_object_get_ex(jobj_area, "shift_size", &jobj1); -- log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", json_object_get_uint64(jobj1)); -+ log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", crypt_jobj_get_uint64(jobj1)); - } - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -@@ -304,7 +304,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - return -EINVAL; - if (!validate_json_uint32(jobj_sector_size)) - return -EINVAL; -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (sector_size < SECTOR_SIZE || NOTPOW2(sector_size)) { - log_dbg(cd, "Invalid sector_size (%" PRIu32 ") for checksum resilience mode.", sector_size); - return -EINVAL; -@@ -313,7 +313,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - if (!(jobj_shift_size = json_contains(cd, jobj_area, "type:datashift", "Keyslot area", "shift_size", json_type_string))) - return -EINVAL; - -- shift_size = json_object_get_uint64(jobj_shift_size); -+ shift_size = crypt_jobj_get_uint64(jobj_shift_size); - if (!shift_size) - return -EINVAL; - -diff --git a/lib/luks2/luks2_luks1_convert.c b/lib/luks2/luks2_luks1_convert.c -index 7f5f26b7..cbaa8603 100644 ---- a/lib/luks2/luks2_luks1_convert.c -+++ b/lib/luks2/luks2_luks1_convert.c -@@ -91,8 +91,8 @@ static int json_luks1_keyslot(const struct luks_phdr *hdr_v1, int keyslot, struc - } - area_size = offs_b - offs_a; - json_object_object_add(jobj_area, "key_size", json_object_new_int(hdr_v1->keyBytes)); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_size)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_size)); - json_object_object_add(keyslot_obj, "area", jobj_area); - - *keyslot_object = keyslot_obj; -@@ -145,7 +145,7 @@ static int json_luks1_segment(const struct luks_phdr *hdr_v1, struct json_object - /* offset field */ - number = (uint64_t)hdr_v1->payloadOffset * SECTOR_SIZE; - -- field = json_object_new_uint64(number); -+ field = crypt_jobj_new_uint64(number); - if (!field) { - json_object_put(segment_obj); - return -ENOMEM; -@@ -401,8 +401,8 @@ static int json_luks1_object(struct luks_phdr *hdr_v1, struct json_object **luks - json_object_object_add(luks1_obj, "config", field); - - json_size = LUKS2_HDR_16K_LEN - LUKS2_HDR_BIN_LEN; -- json_object_object_add(field, "json_size", json_object_new_uint64(json_size)); -- json_object_object_add(field, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(field, "json_size", crypt_jobj_new_uint64(json_size)); -+ json_object_object_add(field, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - *luks1_object = luks1_obj; - return 0; -@@ -418,8 +418,8 @@ static void move_keyslot_offset(json_object *jobj, int offset_add) - UNUSED(key); - json_object_object_get_ex(val, "area", &jobj_area); - json_object_object_get_ex(jobj_area, "offset", &jobj2); -- offset = json_object_get_uint64(jobj2) + offset_add; -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -+ offset = crypt_jobj_get_uint64(jobj2) + offset_add; -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); - } - } - -@@ -749,7 +749,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - return -EINVAL; - if (!json_object_object_get_ex(jobj_area, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1); -+ offset = crypt_jobj_get_uint64(jobj1); - } else { - if (LUKS2_find_area_gap(cd, hdr2, key_size, &offset, &area_length)) - return -EINVAL; -@@ -781,7 +781,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_kdf, "iterations", &jobj1)) - continue; -- hdr1->keyblock[i].passwordIterations = json_object_get_uint32(jobj1); -+ hdr1->keyblock[i].passwordIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_kdf, "salt", &jobj1)) - continue; -@@ -822,7 +822,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_digest, "iterations", &jobj1)) - return -EINVAL; -- hdr1->mkDigestIterations = json_object_get_uint32(jobj1); -+ hdr1->mkDigestIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_digest, "digest", &jobj1)) - return -EINVAL; -@@ -847,7 +847,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_segment, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1) / SECTOR_SIZE; -+ offset = crypt_jobj_get_uint64(jobj1) / SECTOR_SIZE; - if (offset > UINT32_MAX) - return -EINVAL; - /* FIXME: LUKS1 requires offset == 0 || offset >= luks1_hdr_size */ -diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c -index 6bac4420..c99577cc 100644 ---- a/lib/luks2/luks2_reencrypt.c -+++ b/lib/luks2/luks2_reencrypt.c -@@ -165,7 +165,7 @@ static uint32_t reencrypt_alignment(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "sector_size", &jobj_sector_size)) - return 0; - -- return json_object_get_uint32(jobj_sector_size); -+ return crypt_jobj_get_uint32(jobj_sector_size); - } - - static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, -@@ -200,13 +200,13 @@ static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, - json_segment_remove_flag(jobj_seg_new, "in-reencryption"); - tmp = rh->length; - } else { -- json_object_object_add(jobj_seg_new, "offset", json_object_new_uint64(rh->offset + data_offset)); -- json_object_object_add(jobj_seg_new, "iv_tweak", json_object_new_uint64(rh->offset >> SECTOR_SHIFT)); -+ json_object_object_add(jobj_seg_new, "offset", crypt_jobj_new_uint64(rh->offset + data_offset)); -+ json_object_object_add(jobj_seg_new, "iv_tweak", crypt_jobj_new_uint64(rh->offset >> SECTOR_SHIFT)); - tmp = json_segment_get_size(jobj_seg_new, 0) + rh->length; - } - - /* alter size of new segment, reenc_seg == 0 we're finished */ -- json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? json_object_new_uint64(tmp) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? crypt_jobj_new_uint64(tmp) : json_object_new_string("dynamic")); - json_object_object_add_by_uint(jobj_segs_post, reenc_seg, jobj_seg_new); - - return jobj_segs_post; -@@ -256,7 +256,7 @@ static json_object *reencrypt_make_hot_segments_encrypt_shift(struct crypt_devic - jobj_seg_shrunk = NULL; - if (json_object_copy(LUKS2_get_segment_jobj(hdr, sg), &jobj_seg_shrunk)) - goto err; -- json_object_object_add(jobj_seg_shrunk, "size", json_object_new_uint64(segment_size - rh->length)); -+ json_object_object_add(jobj_seg_shrunk, "size", crypt_jobj_new_uint64(segment_size - rh->length)); - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_seg_shrunk); - } - -@@ -336,7 +336,7 @@ static json_object *reencrypt_make_post_segments_forward(struct crypt_device *cd - goto err; - jobj_old_seg = jobj_old_seg_copy; - fixed_length = rh->device_size - fixed_length; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(fixed_length)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(fixed_length)); - } else - json_object_get(jobj_old_seg); - json_object_object_add_by_uint(jobj_segs_post, 1, jobj_old_seg); -@@ -491,7 +491,7 @@ static json_object *reencrypt_make_hot_segments_backward(struct crypt_device *cd - if (rh->offset) { - if (json_object_copy(LUKS2_get_segment_jobj(hdr, 0), &jobj_old_seg)) - goto err; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(rh->offset)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(rh->offset)); - - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_old_seg); - } -@@ -575,7 +575,7 @@ static uint64_t reencrypt_data_shift(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "shift_size", &jobj_data_shift)) - return 0; - -- return json_object_get_uint64(jobj_data_shift); -+ return crypt_jobj_get_uint64(jobj_data_shift); - } - - static crypt_reencrypt_mode_info reencrypt_mode(struct luks2_hdr *hdr) -diff --git a/lib/luks2/luks2_segment.c b/lib/luks2/luks2_segment.c -index 6ece2fdd..cd5108e8 100644 ---- a/lib/luks2/luks2_segment.c -+++ b/lib/luks2/luks2_segment.c -@@ -55,7 +55,7 @@ uint64_t json_segment_get_offset(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "offset", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_type(json_object *jobj_segment) -@@ -77,7 +77,7 @@ uint64_t json_segment_get_iv_offset(json_object *jobj_segment) - !json_object_object_get_ex(jobj_segment, "iv_tweak", &jobj)) - return 0; - -- return json_object_get_uint64(jobj); -+ return crypt_jobj_get_uint64(jobj); - } - - uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) -@@ -88,7 +88,7 @@ uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "size", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_get_cipher(json_object *jobj_segment) -@@ -229,8 +229,8 @@ static json_object *_segment_create_generic(const char *type, uint64_t offset, c - return NULL; - - json_object_object_add(jobj, "type", json_object_new_string(type)); -- json_object_object_add(jobj, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj, "size", length ? json_object_new_uint64(*length) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj, "size", length ? crypt_jobj_new_uint64(*length) : json_object_new_string("dynamic")); - - return jobj; - } -@@ -252,7 +252,7 @@ json_object *json_segment_create_crypt(uint64_t offset, - if (!jobj) - return NULL; - -- json_object_object_add(jobj, "iv_tweak", json_object_new_uint64(iv_offset)); -+ json_object_object_add(jobj, "iv_tweak", crypt_jobj_new_uint64(iv_offset)); - json_object_object_add(jobj, "encryption", json_object_new_string(cipher)); - json_object_object_add(jobj, "sector_size", json_object_new_int(sector_size)); - if (reencryption) --- -2.20.1 - diff --git a/buildroot/package/cryptsetup/Config.in b/buildroot/package/cryptsetup/Config.in index c4281f7e2..d9c9d4d4f 100644 --- a/buildroot/package/cryptsetup/Config.in +++ b/buildroot/package/cryptsetup/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBARGON2 + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. diff --git a/buildroot/package/cryptsetup/cryptsetup.hash b/buildroot/package/cryptsetup/cryptsetup.hash index 175ecf33c..3b5834561 100644 --- a/buildroot/package/cryptsetup/cryptsetup.hash +++ b/buildroot/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc -sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46 cryptsetup-2.2.2.tar.xz -sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING -sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc +sha256 9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773 cryptsetup-2.3.4.tar.xz +sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING +sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk index 197f5f25b..a2abf776c 100644 --- a/buildroot/package/cryptsetup/cryptsetup.mk +++ b/buildroot/package/cryptsetup/cryptsetup.mk @@ -4,11 +4,12 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.2 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION_MAJOR = 2.3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL diff --git a/buildroot/package/cukinia/Config.in b/buildroot/package/cukinia/Config.in new file mode 100644 index 000000000..20d0820a7 --- /dev/null +++ b/buildroot/package/cukinia/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_CUKINIA + bool "cukinia" + depends on BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_GAWK + help + Cukinia is designed to help Linux-based embedded firmware + developers run system-level validation tests on their product. + It provides a simple POSIX shell overlay, and primitives to + make sure system integrations and features keep behaving the + way they should. + + By default, cukinia reports colorized test results on stdout, + but can also report them as CSV and JUnit-XML for easy + integration with CI systems such as Jenkins. + + https://github.com/savoirfairelinux/cukinia + +comment "cukinia needs busybox or gawk" + depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_GAWK) diff --git a/buildroot/package/cukinia/cukinia.conf b/buildroot/package/cukinia/cukinia.conf new file mode 100644 index 000000000..e5f304d39 --- /dev/null +++ b/buildroot/package/cukinia/cukinia.conf @@ -0,0 +1,4 @@ +# Note: Cukinia will produce colorized output if the TERM environment +# variable matches vt220, xterm or linux. +cukinia_log $(_colorize blue "############# Cukinia tests ##############") +cukinia_user root diff --git a/buildroot/package/cukinia/cukinia.hash b/buildroot/package/cukinia/cukinia.hash new file mode 100644 index 000000000..e6ae60201 --- /dev/null +++ b/buildroot/package/cukinia/cukinia.hash @@ -0,0 +1,4 @@ +# locally computed +sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/buildroot/package/cukinia/cukinia.mk b/buildroot/package/cukinia/cukinia.mk new file mode 100644 index 000000000..84d4e60ea --- /dev/null +++ b/buildroot/package/cukinia/cukinia.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# cukinia +# +################################################################################ + +CUKINIA_VERSION = 0.5.1 +CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) +CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 +CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 + +define CUKINIA_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/cukinia $(TARGET_DIR)/usr/bin/cukinia + $(INSTALL) -D -m 0644 $(CUKINIA_PKGDIR)/cukinia.conf \ + $(TARGET_DIR)/etc/cukinia/cukinia.conf +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch b/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch new file mode 100644 index 000000000..650b90a89 --- /dev/null +++ b/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch @@ -0,0 +1,41 @@ +From 6ad1ed8b7939bf75079b0a770e234bfee7d33dbb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Jul 2020 23:02:50 +0200 +Subject: [PATCH] configure.ac: fix cross-compilation without dejavu + +Cross-compilation is broken since commit 1d66106. Indeed, when +cross-compiling, dejavu font won't be installed in /usr/share/fonts. The +path (e.g. $(TARGET_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf) could be +provided through --with-test-font-path which will fix the build failure +but will result in broken test programs. + +So when cross-compiling don't try to check if the test-font-path is +valid or not and just use the one provided by the user or the default +one (e.g. /usr/share/fonts/dejavu/DejaVuSans.ttf) + +Fix #262 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/OpenPrinting/cups-filters/commit/6ad1ed8b7939bf75079b0a770e234bfee7d33dbb] +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aa905cf5d..4cc4fd6e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -796,10 +796,10 @@ AC_ARG_WITH([test-font-path], + [with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`] + ) + +-AS_IF([test -f "$with_test_font_path"], +- [AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])], ++AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"], + [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)] + ) ++AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests]) + + # ================ + # Check for cflags diff --git a/buildroot/package/cups-filters/S82cups-browsed b/buildroot/package/cups-filters/S82cups-browsed new file mode 100644 index 000000000..08909c7f9 --- /dev/null +++ b/buildroot/package/cups-filters/S82cups-browsed @@ -0,0 +1,48 @@ +#!/bin/sh + +DAEMON="cups-browsed" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ + -- -c /etc/cups/cups-browsed.conf + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/cups-filters/cups-filters.hash b/buildroot/package/cups-filters/cups-filters.hash index 9e24abe39..61cb42a43 100644 --- a/buildroot/package/cups-filters/cups-filters.hash +++ b/buildroot/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz +sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING diff --git a/buildroot/package/cups-filters/cups-filters.mk b/buildroot/package/cups-filters/cups-filters.mk index 3bb33d963..237d8afe6 100644 --- a/buildroot/package/cups-filters/cups-filters.mk +++ b/buildroot/package/cups-filters/cups-filters.mk @@ -4,21 +4,26 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.26.0 +CUPS_FILTERS_VERSION = 1.27.5 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING +# We're patching configure.ac +CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg -CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ +CUPS_FILTERS_CONF_OPTS = \ --disable-mutool \ --disable-foomatic \ --disable-braille \ + --enable-imagefilters \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-sysroot=$(STAGING_DIR) \ --with-pdftops=pdftops \ - --with-jpeg + --with-jpeg \ + --with-test-font-path=/dev/null \ + --without-rcdir ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -70,4 +75,14 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ + $(TARGET_DIR)/etc/init.d/S82cups-browsed +endef + +define CUPS_FILTERS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/utils/cups-browsed.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cups-browsed.service +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/cutelyst/cutelyst.hash b/buildroot/package/cutelyst/cutelyst.hash index e9c116196..d35fdcc89 100644 --- a/buildroot/package/cutelyst/cutelyst.hash +++ b/buildroot/package/cutelyst/cutelyst.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 5036378d0d8242da68f61bc2f51fc37b881b720311073b6f6cfb113cbae18a40 cutelyst-2.9.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 b0e3d658a60d68906f7255b78bad64af1aa07cb3b785fbf61629b7355f089baa cutelyst-2.11.0.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/cutelyst/cutelyst.mk b/buildroot/package/cutelyst/cutelyst.mk index 709d9443c..952092245 100644 --- a/buildroot/package/cutelyst/cutelyst.mk +++ b/buildroot/package/cutelyst/cutelyst.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUTELYST_VERSION = 2.9.0 +CUTELYST_VERSION = 2.11.0 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) CUTELYST_INSTALL_STAGING = YES CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO @@ -17,7 +17,7 @@ CUTELYST_CONF_OPTS += \ -DPLUGIN_VIEW_GRANTLEE=OFF # Qt 5.8 needs atomics, which on various architectures are in -latomic -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif diff --git a/buildroot/package/daq/0002-parallel-grammar.patch b/buildroot/package/daq/0002-parallel-grammar.patch new file mode 100644 index 000000000..ba0e256f5 --- /dev/null +++ b/buildroot/package/daq/0002-parallel-grammar.patch @@ -0,0 +1,29 @@ +Fix parallel build + +https://bugs.gentoo.org/673390 + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch + +Patch was sent upstream: https://seclists.org/snort/2014/q3/1016 + +Signed-off-by: Bernd Kuhls + +--- a/sfbpf/Makefile.am ++++ b/sfbpf/Makefile.am +@@ -43,13 +43,14 @@ + libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@ + + # use of $@ and $< here is a GNU idiom that borks BSD +-sf_scanner.c: $(srcdir)/scanner.l ++sf_scanner.c: $(srcdir)/scanner.l tokdefs.h + @rm -f $(srcdir)/sf_scanner.c + $(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l + + sf_scanner.o: sf_scanner.c tokdefs.h + + tokdefs.h: sf_grammar.c ++ + sf_grammar.c: $(srcdir)/grammar.y + @rm -f sf_grammar.c tokdefs.h + $(V_YACC) -d $(srcdir)/grammar.y diff --git a/buildroot/package/daq/daq.hash b/buildroot/package/daq/daq.hash index 6a0cb5ed0..0fa1edecc 100644 --- a/buildroot/package/daq/daq.hash +++ b/buildroot/package/daq/daq.hash @@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz # Locally computed: -sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz +sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz # Hash for license files: -sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING +sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/buildroot/package/daq/daq.mk b/buildroot/package/daq/daq.mk index f0f996ba2..8a5394a63 100644 --- a/buildroot/package/daq/daq.mk +++ b/buildroot/package/daq/daq.mk @@ -4,16 +4,15 @@ # ################################################################################ -DAQ_VERSION = 2.0.6 +DAQ_VERSION = 2.0.7 DAQ_SITE = https://www.snort.org/downloads/snort DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES DAQ_DEPENDENCIES = host-bison host-flex - -# package does not build in parallel due to improper make rules -# related to the generation of the tokdefs.h header file -DAQ_MAKE = $(MAKE1) +# 0002-parallel-grammar.patch +# 2.0.7 needs autoreconf due to configure being older than configure.ac +DAQ_AUTORECONF = YES # disable ipq module as libipq is deprecated DAQ_CONF_OPTS += --disable-ipq-module diff --git a/buildroot/package/dash/0001-no-config.h-for-helpers.patch b/buildroot/package/dash/0001-no-config.h-for-helpers.patch deleted file mode 100644 index 9fd449c41..000000000 --- a/buildroot/package/dash/0001-no-config.h-for-helpers.patch +++ /dev/null @@ -1,35 +0,0 @@ -[PATCH] Don't include config.h when building helpers using the native compiler - -config.h contains settings for the cross compiler (most importantly -32/64bit versions of functions), so don't include it when calling the -native compiler to build the helpers. - -Otherwise we get build errors like: - -/usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -O2 -Wall -o mkinit mkinit.c -In file included from /usr/include/sys/stat.h:107, - from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’ -In file included from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/sys/stat.h:504: error: redefinition of ‘stat’ -/usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -Index: dash-0.5.5.1/src/Makefile.in -=================================================================== ---- dash-0.5.5.1.orig/src/Makefile.in -+++ dash-0.5.5.1/src/Makefile.in -@@ -165,7 +165,6 @@ COMMON_CPPFLAGS = \ - AM_CFLAGS = $(COMMON_CFLAGS) - AM_CPPFLAGS = $(COMMON_CPPFLAGS) - AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) --AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS) - COMPILE_FOR_BUILD = \ - $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ - $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) diff --git a/buildroot/package/dash/dash.hash b/buildroot/package/dash/dash.hash index a2e131536..069a7b179 100644 --- a/buildroot/package/dash/dash.hash +++ b/buildroot/package/dash/dash.hash @@ -1,4 +1,4 @@ -# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz.sha256sum -sha256 3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 dash-0.5.10.2.tar.gz +# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz.sha256sum +sha256 00fb7d68b7599cc41ab151051c06c01e9500540183d8aa72116cb9c742bd6d5f dash-0.5.11.2.tar.gz # Locally calculated -sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING +sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING diff --git a/buildroot/package/dash/dash.mk b/buildroot/package/dash/dash.mk index 3014aafe9..88caa6609 100644 --- a/buildroot/package/dash/dash.mk +++ b/buildroot/package/dash/dash.mk @@ -4,7 +4,7 @@ # ################################################################################ -DASH_VERSION = 0.5.10.2 +DASH_VERSION = 0.5.11.2 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING diff --git a/buildroot/package/dav1d/Config.in b/buildroot/package/dav1d/Config.in index 00d2fd17f..fb2902558 100644 --- a/buildroot/package/dav1d/Config.in +++ b/buildroot/package/dav1d/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DAV1D bool "dav1d" + depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HAS_THREADS # pthread help dav1d is a new AV1 cross-platform decoder, open-source, and @@ -7,5 +8,5 @@ config BR2_PACKAGE_DAV1D https://code.videolan.org/videolan/dav1d -comment "dav1d needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "dav1d needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/dav1d/dav1d.hash b/buildroot/package/dav1d/dav1d.hash index a2f2ea4df..3ff4b1b68 100644 --- a/buildroot/package/dav1d/dav1d.hash +++ b/buildroot/package/dav1d/dav1d.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1780199d71e62a82ca1bfca2d71da5c599c7e1edc68c72f6fc3c0c25ce1880b7 dav1d-0.5.2.tar.bz2 -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING +sha256 9eac4f50089f54a9f562827bda4a21187d68c01d8b20055eef1d7efca9f84cf8 dav1d-0.7.1.tar.bz2 +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/buildroot/package/dav1d/dav1d.mk b/buildroot/package/dav1d/dav1d.mk index 150c40f09..1e84c21b4 100644 --- a/buildroot/package/dav1d/dav1d.mk +++ b/buildroot/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.5.2 +DAV1D_VERSION = 0.7.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/buildroot/package/davfs2/0002-fix-iconv.patch b/buildroot/package/davfs2/0002-fix-iconv.patch deleted file mode 100644 index f2bae8f8e..000000000 --- a/buildroot/package/davfs2/0002-fix-iconv.patch +++ /dev/null @@ -1,48 +0,0 @@ -webdav.c: fix iconv calls - -Replace HAVE_ICONV_H by HAVE_ICONV to fix build with iconv indeed -HAVE_ICONV_H is never set as AC_CHECK_HEADERS is not called to check for -iconv.h - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://savannah.nongnu.org/bugs/index.php?56178] - -diff -Naurp davfs2-1.5.4-orig/src/webdav.c davfs2-1.5.4/src/webdav.c ---- davfs2-1.5.4-orig/src/webdav.c 2019-04-20 12:12:38.252599230 +0200 -+++ davfs2-1.5.4/src/webdav.c 2019-04-20 12:13:33.012925300 +0200 -@@ -25,7 +25,7 @@ - #ifdef HAVE_FCNTL_H - #include - #endif --#ifdef HAVE_ICONV_H -+#ifdef HAVE_ICONV - #include - #endif - #ifdef HAVE_LANGINFO_H -@@ -231,7 +231,7 @@ static int initialized; - Needed by ssl_verify() which may be called at any time. */ - static int have_terminal; - --#ifdef HAVE_ICONV_H -+#ifdef HAVE_ICONV - /* Handle to convert character encoding from utf-8 to LC_CTYPE. - If NULL no conversion is done. */ - static iconv_t from_utf_8; -@@ -264,7 +264,7 @@ static char **cookie_list; - /* Private function prototypes and inline functions */ - /*==================================================*/ - --#ifdef HAVE_ICONV_H -+#ifdef HAVE_ICONV - static void - convert(char **s, iconv_t conv); - #endif -@@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args) - if (args->neon_debug & ~NE_DBG_HTTPPLAIN) - syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav"); - --#ifdef HAVE_ICONV_H -+#ifdef HAVE_ICONV - char *lc_charset = nl_langinfo(CODESET); - if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) { - from_utf_8 = iconv_open(lc_charset, "UTF-8"); diff --git a/buildroot/package/davfs2/davfs2.hash b/buildroot/package/davfs2/davfs2.hash index 7e2078bec..88a314d1c 100644 --- a/buildroot/package/davfs2/davfs2.hash +++ b/buildroot/package/davfs2/davfs2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f davfs2-1.5.5.tar.gz +sha256 2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50 davfs2-1.6.0.tar.gz # License file, locally calculated -sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING +sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/buildroot/package/davfs2/davfs2.mk b/buildroot/package/davfs2/davfs2.mk index 90f73f4df..a82e9d2f7 100644 --- a/buildroot/package/davfs2/davfs2.mk +++ b/buildroot/package/davfs2/davfs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVFS2_VERSION = 1.5.5 +DAVFS2_VERSION = 1.6.0 DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING diff --git a/buildroot/package/dbus-python/dbus-python.hash b/buildroot/package/dbus-python/dbus-python.hash index 58b0a7590..e65695d61 100644 --- a/buildroot/package/dbus-python/dbus-python.hash +++ b/buildroot/package/dbus-python/dbus-python.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260 dbus-python-1.2.12.tar.gz +sha256 11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4 dbus-python-1.2.16.tar.gz # Locally calculated -sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING -sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING +sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING +sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING diff --git a/buildroot/package/dbus-python/dbus-python.mk b/buildroot/package/dbus-python/dbus-python.mk index cf4882d8e..f4b8996d7 100644 --- a/buildroot/package/dbus-python/dbus-python.mk +++ b/buildroot/package/dbus-python/dbus-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_PYTHON_VERSION = 1.2.12 +DBUS_PYTHON_VERSION = 1.2.16 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) diff --git a/buildroot/package/dbus/S30dbus b/buildroot/package/dbus/S30dbus index 52646cea2..26772755d 100644 --- a/buildroot/package/dbus/S30dbus +++ b/buildroot/package/dbus/S30dbus @@ -7,11 +7,11 @@ # and other messages. See http://www.freedesktop.org/software/dbus/ # # processname: dbus-daemon -# pidfile: /var/run/messagebus.pid +# pidfile: /run/messagebus.pid # # Create needed directories. -[ -d /var/run/dbus ] || mkdir -p /var/run/dbus +[ -d /run/dbus ] || mkdir -p /run/dbus [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys [ -d /tmp/dbus ] || mkdir -p /tmp/dbus @@ -38,7 +38,7 @@ stop() { echo "done" if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/dbus-daemon - rm -f /var/run/messagebus.pid + rm -f /run/messagebus.pid fi } diff --git a/buildroot/package/dbus/dbus.mk b/buildroot/package/dbus/dbus.mk index 952eff1fc..b58f1ddda 100644 --- a/buildroot/package/dbus/dbus.mk +++ b/buildroot/package/dbus/dbus.mk @@ -15,20 +15,21 @@ define DBUS_PERMISSIONS endef define DBUS_USERS - dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user + dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user endef DBUS_DEPENDENCIES = host-pkgconf expat +DBUS_SELINUX_MODULES = dbus + DBUS_CONF_OPTS = \ --with-dbus-user=dbus \ --disable-tests \ --disable-asserts \ --disable-xml-docs \ --disable-doxygen-docs \ - --with-xml=expat \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-system-pid-file=/var/run/messagebus.pid + --with-system-socket=/run/dbus/system_bus_socket \ + --with-system-pid-file=/run/messagebus.pid ifeq ($(BR2_STATIC_LIBS),y) DBUS_CONF_OPTS += LIBS='-pthread' @@ -108,8 +109,7 @@ HOST_DBUS_CONF_OPTS = \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-systemd \ - --without-x \ - --with-xml=expat + --without-x # dbus for the host DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml diff --git a/buildroot/package/ddrescue/ddrescue.hash b/buildroot/package/ddrescue/ddrescue.hash index ae370acbc..6877b7008 100644 --- a/buildroot/package/ddrescue/ddrescue.hash +++ b/buildroot/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2019-02/msg00012.html -sha256 4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087 ddrescue-1.24.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html +sha256 ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 ddrescue-1.25.tar.lz # Locally computed -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/buildroot/package/ddrescue/ddrescue.mk b/buildroot/package/ddrescue/ddrescue.mk index 4e0317913..f113681fa 100644 --- a/buildroot/package/ddrescue/ddrescue.mk +++ b/buildroot/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.24 +DDRESCUE_VERSION = 1.25 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/debianutils/debianutils.hash b/buildroot/package/debianutils/debianutils.hash index e07f405ee..16a45d4ea 100644 --- a/buildroot/package/debianutils/debianutils.hash +++ b/buildroot/package/debianutils/debianutils.hash @@ -1,4 +1,4 @@ -# From http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils/debianutils_4.8.6.3.dsc -sha256 2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221 debianutils_4.8.6.3.tar.xz +# From http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils/debianutils_4.11.dsc +sha256 bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151 debianutils_4.11.tar.xz # Locally calculated -sha256 a8698f078cd21fc501e66d070e12cf2f23ec1eaf5841bbc87629de76858ef7a7 debian/copyright +sha256 3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567 debian/copyright diff --git a/buildroot/package/debianutils/debianutils.mk b/buildroot/package/debianutils/debianutils.mk index a91383c17..d2c41130f 100644 --- a/buildroot/package/debianutils/debianutils.mk +++ b/buildroot/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.8.6.3 +DEBIANUTILS_VERSION = 4.11 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog) DEBIANUTILS_LICENSE_FILES = debian/copyright diff --git a/buildroot/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch b/buildroot/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch new file mode 100644 index 000000000..ad244267f --- /dev/null +++ b/buildroot/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch @@ -0,0 +1,121 @@ +From 129b7e402bd6e7278854e5a8935fce460552b5f4 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Thu, 30 Jul 2020 10:01:36 -0400 +Subject: [PATCH] [#117] Fixed gcc 10 compilation issues + +client/dhclient.c +relay/dhcrelay.c + extern'ed local_port,remote_port + +common/discover.c + init local_port,remote_port to 0 + +server/mdb.c + extern'ed dhcp_type_host + +server/mdb6.c + create_prefix6() - eliminated memcpy string overflow error + +[Retrieved from: +https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/60/diffs?commit_id=129b7e402bd6e7278854e5a8935fce460552b5f4] +Signed-off-by: Fabrice Fontaine +--- + RELNOTES | 5 +++++ + client/dhclient.c | 5 +++-- + common/discover.c | 4 ++-- + relay/dhcrelay.c | 4 ++-- + server/mdb.c | 2 +- + server/mdb6.c | 2 +- + 6 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/RELNOTES b/RELNOTES +index 9d0a0414..6919dba7 100644 +--- a/RELNOTES ++++ b/RELNOTES +@@ -103,6 +103,11 @@ ISC DHCP is open source software maintained by Internet Systems + Consortium. This product includes cryptographic software written + by Eric Young (eay@cryptsoft.com). + ++ Changes since 4.4.2 (Bug Fixes) ++ ++- Minor corrections to allow compilation under gcc 10. ++ [Gitlab #117] ++ + Changes since 4.4.2b1 (Bug Fixes) + + - Added a clarification on DHCPINFORMs and server authority to +diff --git a/client/dhclient.c b/client/dhclient.c +index 189e5270..7a7837cb 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client"; + static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/"; + #endif /* UNIT_TEST */ + +-u_int16_t local_port = 0; +-u_int16_t remote_port = 0; ++extern u_int16_t local_port; ++extern u_int16_t remote_port; ++ + #if defined(DHCPv6) && defined(DHCP4o6) + int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ + #endif +diff --git a/common/discover.c b/common/discover.c +index ca4f4d55..22f09767 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0; + + int interfaces_invalidated; + int quiet_interface_discovery; +-u_int16_t local_port; +-u_int16_t remote_port; ++u_int16_t local_port = 0; ++u_int16_t remote_port = 0; + u_int16_t relay_port = 0; + int dhcpv4_over_dhcpv6 = 0; + int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *); +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index 883d5058..7211e3bb 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own relay option. */ + forward_untouched, /* Forward without changes. */ + discard } agent_relay_mode = forward_and_replace; + +-u_int16_t local_port; +-u_int16_t remote_port; ++extern u_int16_t local_port; ++extern u_int16_t remote_port; + + /* Relay agent server list. */ + struct server_list { +diff --git a/server/mdb.c b/server/mdb.c +index ff8a707f..8266d764 100644 +--- a/server/mdb.c ++++ b/server/mdb.c +@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL; + + int numclasseswritten; + +-omapi_object_type_t *dhcp_type_host; ++extern omapi_object_type_t *dhcp_type_host; + + isc_result_t enter_class(cd, dynamicp, commit) + struct class *cd; +diff --git a/server/mdb6.c b/server/mdb6.c +index da7baf6e..ebe01e56 100644 +--- a/server/mdb6.c ++++ b/server/mdb6.c +@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref, + } + new_ds.data = new_ds.buffer->data; + memcpy(new_ds.buffer->data, ds.data, ds.len); +- memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp)); ++ memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp)); + data_string_forget(&ds, MDL); + data_string_copy(&ds, &new_ds, MDL); + data_string_forget(&new_ds, MDL); +-- +GitLab + diff --git a/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch b/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch deleted file mode 100644 index b8b187f17..000000000 --- a/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers, - updated util/bind.sh - - Merges in rt48072. -Signed-off-by: Fabrice Fontaine -[Retrieved (and updated to remvove bind.sh update) from: -https://gitlab.isc.org/isc-projects/dhcp/commit/8194daabfd590f17825f0c61e9534bee5c99cc86] ---- - includes/omapip/isclib.h | 3 +++ - includes/omapip/result.h | 1 + - server/dhcpv6.c | 13 +++++++++---- - 3 files changed, 39 insertions(+), 12 deletions(-) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; --- -2.18.1 - diff --git a/buildroot/package/dhcp/dhcp.hash b/buildroot/package/dhcp/dhcp.hash index df07a3255..92ecdfec5 100644 --- a/buildroot/package/dhcp/dhcp.hash +++ b/buildroot/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz.sha256.asc -sha256 2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608 dhcp-4.4.1.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.2/dhcp-4.4.2.tar.gz.sha256.asc +sha256 1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521 dhcp-4.4.2.tar.gz # Locally calculated -sha256 18add1790d1ed47d6ef6f3ed5945aa0cb2f7785fa8bc7fd859f8ae2f9f78567d LICENSE +sha256 89e7b0661134cc118bdcdeb87ff0493d544bc5723c9ca6616fa05f03539738af LICENSE diff --git a/buildroot/package/dhcp/dhcp.mk b/buildroot/package/dhcp/dhcp.mk index 518e8a468..f1ffa81d9 100644 --- a/buildroot/package/dhcp/dhcp.mk +++ b/buildroot/package/dhcp/dhcp.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCP_VERSION = 4.4.1 +DHCP_VERSION = 4.4.2 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 diff --git a/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch b/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch new file mode 100644 index 000000000..07e6d642a --- /dev/null +++ b/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch @@ -0,0 +1,36 @@ +From 13e475d9847bf7d6a6af62397f67eb269e27613e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Jul 2020 10:43:51 +0200 +Subject: [PATCH] src/dhcpcd.c: fix build without fork + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rsmarples/dhcpcd/pull/17] +--- + src/dhcpcd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dhcpcd.c b/src/dhcpcd.c +index ee585aa4..b597a5c0 100644 +--- a/src/dhcpcd.c ++++ b/src/dhcpcd.c +@@ -336,7 +336,7 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) + #ifdef THERE_IS_NO_FORK + eloop_timeout_delete(ctx->eloop, handle_exit_timeout, ctx); + errno = ENOSYS; +- return 0; ++ return; + #else + int i; + unsigned int logopts = loggetopts(); +@@ -2211,7 +2211,7 @@ printpidfile: + ps_init(&ctx); + #endif + +-#ifdef USE_SIGNALS ++#if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK) + if (pipe(sigpipe) == -1) { + logerr("pipe"); + goto exit_failure; +-- +2.27.0 + diff --git a/buildroot/package/dhcpcd/dhcpcd.hash b/buildroot/package/dhcpcd/dhcpcd.hash index c0d68036f..6991e7368 100644 --- a/buildroot/package/dhcpcd/dhcpcd.hash +++ b/buildroot/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-8.0.3.tar.xz.distinfo -sha256 9674971fcd5acd5a3401a0ad8eba7f0b816fec9abb4a2520332b4d8dae068f1d dhcpcd-8.0.3.tar.xz +# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.1.4.tar.xz.distinfo +sha256 5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820 dhcpcd-9.1.4.tar.xz # Locally calculated -sha256 213fc1a704cecdb322276fa7c95891fd1c23137d9ab572af1fc5e91b48762303 LICENSE +sha256 9cce1077bad23544349788ec750ec6e5aee106fc437fd6b5d73c0d8510426578 LICENSE diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk index 63dbbee86..0dcd36f36 100644 --- a/buildroot/package/dhcpcd/dhcpcd.mk +++ b/buildroot/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 8.0.3 +DHCPCD_VERSION = 9.1.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf @@ -16,7 +16,7 @@ DHCPCD_CONFIG_OPTS += --enable-static endif ifeq ($(BR2_USE_MMU),) -DHCPCD_CONFIG_OPTS += --disable-fork +DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep endif define DHCPCD_CONFIGURE_CMDS diff --git a/buildroot/package/dialog/dialog.hash b/buildroot/package/dialog/dialog.hash index e1768588d..2286590b6 100644 --- a/buildroot/package/dialog/dialog.hash +++ b/buildroot/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 10f7c02ee5dea311e61b0d3e29eb6e18bcedd6fb6672411484c1a37729cbd7a6 dialog-1.3-20191210.tgz +sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz # Locally computed -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/dialog/dialog.mk b/buildroot/package/dialog/dialog.mk index f3b66bae0..1c98d354e 100644 --- a/buildroot/package/dialog/dialog.mk +++ b/buildroot/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20191210 +DIALOG_VERSION = 1.3-20200327 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ diff --git a/buildroot/package/dieharder/dieharder.mk b/buildroot/package/dieharder/dieharder.mk index c3eee6455..cbf28922f 100644 --- a/buildroot/package/dieharder/dieharder.mk +++ b/buildroot/package/dieharder/dieharder.mk @@ -36,4 +36,9 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) +# Too many fixes needed to build with -fno-common which is default since gcc 10 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) +DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/dillo/0002-usr-local-include.patch b/buildroot/package/dillo/0001-usr-local-include.patch similarity index 100% rename from buildroot/package/dillo/0002-usr-local-include.patch rename to buildroot/package/dillo/0001-usr-local-include.patch diff --git a/buildroot/package/dillo/0003-Fix-openssl-detection.patch b/buildroot/package/dillo/0002-Fix-openssl-detection.patch similarity index 100% rename from buildroot/package/dillo/0003-Fix-openssl-detection.patch rename to buildroot/package/dillo/0002-Fix-openssl-detection.patch diff --git a/buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch b/buildroot/package/dillo/0003-Support-OpenSSL-1.1.0.patch similarity index 100% rename from buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch rename to buildroot/package/dillo/0003-Support-OpenSSL-1.1.0.patch diff --git a/buildroot/package/dillo/0004-fix-build-with-gcc-10.patch b/buildroot/package/dillo/0004-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..413bccb00 --- /dev/null +++ b/buildroot/package/dillo/0004-fix-build-with-gcc-10.patch @@ -0,0 +1,124 @@ +fix build with gcc 10 + +gcc 10 is now defaulting to -fno-common resulting in the following build +failures: + +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -D_FORTIFY_SOURCE=1 -DENABLE_IPV6 -DD_DNS_THREADED -D_REENTRANT -D_THREAD_SAFE -Wall -W -Wno-unused-parameter -Waggregate-return -o dpid dpi.o dpi_socket_dir.o dpid.o dpid_common.o main.o misc_new.o ../dpip/libDpip.a ../dlib/libDlib.a +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpi_socket_dir.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpid_common.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:64: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:61: multiple definition of `services_list'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:61: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:58: multiple definition of `dpi_attr_list'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:58: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:55: multiple definition of `numsocks'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:55: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:52: multiple definition of `numdpis'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:52: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:31: multiple definition of `srs_fd'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:31: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:28: multiple definition of `srs_name'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:28: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: misc_new.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here + +So add missing extern for srs_fd, numdpis, numsocks, dpi_attr_list, +services_list and sock_set + +Also remove srs_name which is never used and give a name to dpi_errno +enum + +Fixes: + - http://autobuild.buildroot.org/results/9c777af97fe50143c6a68f0170fc86c87d8ead3f + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to jcid@dillo.org] + +diff -r f60d55c02567 dpid/dpid.c +--- a/dpid/dpid.c Fri Oct 05 22:05:08 2018 +0200 ++++ b/dpid/dpid.c Thu Aug 27 18:16:50 2020 +0200 +@@ -38,6 +38,12 @@ + + #define QUEUE 5 + ++int srs_fd; ++int numdpis; ++int numsocks; ++struct dp *dpi_attr_list; ++Dlist *services_list; ++fd_set sock_set; + volatile sig_atomic_t caught_sigchld = 0; + char *SharedKey = NULL; + +diff -r f60d55c02567 dpid/dpid.h +--- a/dpid/dpid.h Fri Oct 05 22:05:08 2018 +0200 ++++ b/dpid/dpid.h Thu Aug 27 18:16:50 2020 +0200 +@@ -25,10 +25,9 @@ + + /*! \TODO: Should read this from dillorc */ + #define SRS_NAME "dpid.srs" +-char *srs_name; + + /*! dpid's service request socket file descriptor */ +-int srs_fd; ++extern int srs_fd; + + /*! plugin state information + */ +@@ -49,19 +48,19 @@ + }; + + /*! Number of available plugins */ +-int numdpis; ++extern int numdpis; + + /*! Number of sockets being watched */ +-int numsocks; ++extern int numsocks; + + /*! State information for each plugin. */ +-struct dp *dpi_attr_list; ++extern struct dp *dpi_attr_list; + + /*! service served for each plugin */ +-Dlist *services_list; ++extern Dlist *services_list; + + /*! Set of sockets watched for connections */ +-fd_set sock_set; ++extern fd_set sock_set; + + /*! Set to 1 by the SIGCHLD handler dpi_sigchld */ + extern volatile sig_atomic_t caught_sigchld; +diff -r f60d55c02567 dpid/dpid_common.h +--- a/dpid/dpid_common.h Fri Oct 05 22:05:08 2018 +0200 ++++ b/dpid/dpid_common.h Thu Aug 27 18:16:50 2020 +0200 +@@ -37,10 +37,10 @@ + + + /*! Error codes for dpid */ +-enum { ++enum dpi_errno { + no_errors, + dpid_srs_addrinuse /* dpid service request socket address already in use */ +-} dpi_errno; ++}; + + /*! Intended for identifying dillo plugins + * and related files +diff -r f60d55c02567 dpid/main.c +--- a/dpid/main.c Fri Oct 05 22:05:08 2018 +0200 ++++ b/dpid/main.c Thu Aug 27 18:16:50 2020 +0200 +@@ -231,7 +231,7 @@ + /* this sleep used to unmask a race condition */ + // sleep(2); + +- dpi_errno = no_errors; ++ enum dpi_errno error_code = no_errors; + + /* Get list of available dpis */ + numdpis = register_all(&dpi_attr_list); +@@ -254,7 +254,7 @@ + + /* Initialise sockets */ + if ((numsocks = init_ids_srs_socket()) == -1) { +- switch (dpi_errno) { ++ switch (error_code) { + case dpid_srs_addrinuse: + MSG_ERR("dpid refuses to start, possibly because:\n"); + MSG_ERR("\t1) An instance of dpid is already running.\n"); diff --git a/buildroot/package/dmidecode/0001-build-system-fixes.patch b/buildroot/package/dmidecode/0001-build-system-fixes.patch deleted file mode 100644 index 00897f82a..000000000 --- a/buildroot/package/dmidecode/0001-build-system-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -Minor build system fixes - -Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden -from the command line, and completed by additional flags from the -Makefile. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -12,9 +12,10 @@ - # (at your option) any later version. - # - --CC = gcc --CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ -- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef -+CC ?= gcc -+override CFLAGS += \ -+ -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ -+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef - - # Let lseek and mmap support 64-bit wide offsets - CFLAGS += -D_FILE_OFFSET_BITS=64 -@@ -27,7 +28,7 @@ CFLAGS += -O2 - #CFLAGS += -g - - # Pass linker flags here --LDFLAGS = -+override LDFLAGS += - - DESTDIR = - prefix = /usr/local diff --git a/buildroot/package/dmidecode/dmidecode.hash b/buildroot/package/dmidecode/dmidecode.hash index c6edf4bca..ba72295ca 100644 --- a/buildroot/package/dmidecode/dmidecode.hash +++ b/buildroot/package/dmidecode/dmidecode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd dmidecode-3.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455 dmidecode-3.3.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/dmidecode/dmidecode.mk b/buildroot/package/dmidecode/dmidecode.mk index 811565d8e..89d9155f9 100644 --- a/buildroot/package/dmidecode/dmidecode.mk +++ b/buildroot/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.2 +DMIDECODE_VERSION = 3.3 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch b/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch deleted file mode 100644 index e42549bea..000000000 --- a/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 08572cffb641004d86072f12aec4d6489454b897 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 21 Jun 2019 09:26:20 +0200 -Subject: [PATCH] Makefile: fix i18n build with ubus - -Commit caf4d571e6d86285a3690cfcc8de9c5f394320a8 forgot adding -ubus_libs to build_libs for all-i18n target - -Fixes: - - http://autobuild.buildroot.org/results/c0b27754b7ede024c095bdf0b3616e6f6be48c6d - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to simon@thekelleys.org.uk] ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3fb7cbe..78e25f0 100644 ---- a/Makefile -+++ b/Makefile -@@ -111,7 +111,7 @@ all-i18n : $(BUILDDIR) - top="$(top)" \ - i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \ - build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags)" \ -- build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs)" \ -+ build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs)" \ - -f $(top)/Makefile dnsmasq - for f in `cd $(PO); echo *.po`; do \ - cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \ --- -2.14.1 - diff --git a/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch b/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch deleted file mode 100644 index a19a14945..000000000 --- a/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001 -From: Vladislav Grishenko -Date: Wed, 26 Jun 2019 20:27:11 +0500 -Subject: [PATCH] Fix build with libnettle 3.5 - -Downloaded from -https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace - -Signed-off-by: Bernd Kuhls ---- - src/crypto.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crypto.c b/src/crypto.c -index 1f1c12b..9cfe371 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - static struct ecc_point *key_256 = NULL, *key_384 = NULL; - static mpz_t x, y; - static struct dsa_signature *sig_struct; -+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 -+#define nettle_get_secp_256r1() (&nettle_secp_256r1) -+#define nettle_get_secp_384r1() (&nettle_secp_384r1) -+#endif - - if (!sig_struct) - { -@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_256, &nettle_secp_256r1); -+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); - } - - key = key_256; -@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_384, &nettle_secp_384r1); -+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); - } - - key = key_384; diff --git a/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch b/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch deleted file mode 100644 index fdde33a66..000000000 --- a/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Wed, 24 Jul 2019 17:34:48 +0100 -Subject: [PATCH] Fix build after y2038 changes in glib. - -SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. - -[Retrieved from: -http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=3052ce208acf602f0163166dcefb7330d537cedb] -Signed-off-by: Fabrice Fontaine ---- - src/dnsmasq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index ff3204a..3ef04ad 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -137,6 +137,7 @@ typedef unsigned long long u64; - #endif - - #if defined(HAVE_LINUX_NETWORK) -+#include - #include - /* There doesn't seem to be a universally-available - userspace header for these. */ --- -1.7.10.4 - diff --git a/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch b/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch deleted file mode 100644 index c00a9cc3e..000000000 --- a/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Wed, 14 Aug 2019 20:44:50 +0100 -Subject: [PATCH] Fix memory leak in helper.c - -Thanks to Xu Mingjie for spotting this. -[Retrieved from: -http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5] -Signed-off-by: Fabrice Fontaine ---- - src/helper.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 ---- a/src/helper.c -+++ b/src/helper.c -@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - pid_t pid; - int i, pipefd[2]; - struct sigaction sigact; -- -+ unsigned char *alloc_buff = NULL; -+ - /* create the pipe through which the main program sends us commands, - then fork our process. */ - if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) -@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - struct script_data data; - char *p, *action_str, *hostname = NULL, *domain = NULL; - unsigned char *buf = (unsigned char *)daemon->namebuff; -- unsigned char *end, *extradata, *alloc_buff = NULL; -+ unsigned char *end, *extradata; - int is6, err = 0; - int pipeout[2]; - -- free(alloc_buff); -+ /* Free rarely-allocated memory from previous iteration. */ -+ if (alloc_buff) -+ { -+ free(alloc_buff); -+ alloc_buff = NULL; -+ } - - /* we read zero bytes when pipe closed: this is our signal to exit */ - if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) --- -1.7.10.4 - diff --git a/buildroot/package/dnsmasq/Config.in b/buildroot/package/dnsmasq/Config.in index d7f3d74bd..ef3a9b834 100644 --- a/buildroot/package/dnsmasq/Config.in +++ b/buildroot/package/dnsmasq/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DNSMASQ bool "dnsmasq" + depends on BR2_USE_MMU # fork() help A lightweight DNS and DHCP server. It is intended to provide coupled DNS and DHCP service to a LAN. diff --git a/buildroot/package/dnsmasq/dnsmasq.hash b/buildroot/package/dnsmasq/dnsmasq.hash index 18a539277..99e417f06 100644 --- a/buildroot/package/dnsmasq/dnsmasq.hash +++ b/buildroot/package/dnsmasq/dnsmasq.hash @@ -1,7 +1,6 @@ # Locally calculated after checking pgp signature -# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz.asc -sha256 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f dnsmasq-2.79.tar.xz -sha256 cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb dnsmasq-2.80.tar.xz +# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.81.tar.xz.asc +sha256 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb dnsmasq-2.81.tar.xz # Locally calculated -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/buildroot/package/dnsmasq/dnsmasq.mk b/buildroot/package/dnsmasq/dnsmasq.mk index 3f25ac088..4a7218a2b 100644 --- a/buildroot/package/dnsmasq/dnsmasq.mk +++ b/buildroot/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.80 +DNSMASQ_VERSION = 2.81 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -15,9 +15,6 @@ DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 -# 0004-Fix-memory-leak-in-helper-c.patch -DNSMASQ_IGNORE_CVES += CVE-2019-14834 - DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index 8f9e69e59..66abfe522 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00801d6b7e9777cf2cf54255ca5afb7b58b3d35c14bb0f60bb9f07d031883223 docker-cli-19.03.12.tar.gz +sha256 21b88a00e8f7a3194c0ae1de5a31e3e1728ef6aa2804158dcb502a8b5fd6ae2b docker-cli-19.03.13.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 49abefcaf..86fffafdb 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -4,9 +4,8 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.12 +DOCKER_CLI_VERSION = 19.03.13 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) -DOCKER_CLI_WORKSPACE = gopath DOCKER_CLI_LICENSE = Apache-2.0 DOCKER_CLI_LICENSE_FILES = LICENSE @@ -15,10 +14,11 @@ DOCKER_CLI_DEPENDENCIES = host-pkgconf DOCKER_CLI_TAGS = autogen DOCKER_CLI_BUILD_TARGETS = cmd/docker +DOCKER_CLI_GOMOD = github.com/docker/cli DOCKER_CLI_LDFLAGS = \ - -X github.com/docker/cli/cli/version.GitCommit=$(DOCKER_CLI_VERSION) \ - -X github.com/docker/cli/cli/version.Version=$(DOCKER_CLI_VERSION) + -X $(DOCKER_CLI_GOMOD)/cli/version.GitCommit=$(DOCKER_CLI_VERSION) \ + -X $(DOCKER_CLI_GOMOD)/cli/version.Version=$(DOCKER_CLI_VERSION) ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y) DOCKER_CLI_LDFLAGS += -extldflags '-static' diff --git a/buildroot/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash index 95288be58..2ec3d042b 100644 --- a/buildroot/package/docker-containerd/docker-containerd.hash +++ b/buildroot/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 docker-containerd-1.2.13.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 d410b8efc94e4124990f01de7107223971be8c9258fc651decf9e0ba648485b5 docker-containerd-1.4.1.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index 57d7d8bf6..e4a410501 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -4,12 +4,12 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.13 +DOCKER_CONTAINERD_VERSION = 1.4.1 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE -DOCKER_CONTAINERD_WORKSPACE = vendor +DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd DOCKER_CONTAINERD_LDFLAGS = \ -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) diff --git a/buildroot/package/docker-engine/Config.in b/buildroot/package/docker-engine/Config.in index 4fe6956ab..85a4bc6a0 100644 --- a/buildroot/package/docker-engine/Config.in +++ b/buildroot/package/docker-engine/Config.in @@ -45,6 +45,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS depends on BR2_USE_WCHAR # gvfs depends on BR2_USE_MMU # gvfs depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs + depends on !BR2_STATIC_LIBS # gvfs select BR2_PACKAGE_GVFS help Build the vfs filesystem driver for Docker. diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index 3283e4eb4..e7d593268 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 858e4e74ee0097bcbdb71d737e268dfcfd1970efa4a1600354253b02fd403e39 docker-engine-19.03.12.tar.gz +sha256 f43331fef1d24e31f43392fc1fed72b48fc17fd432d341d6eb1f68ca11383406 docker-engine-19.03.13.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index c12013221..370cfdbae 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -4,14 +4,14 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.12 -DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) +DOCKER_ENGINE_VERSION = 19.03.13 +DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-pkgconf -DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker +DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_LDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ @@ -79,4 +79,59 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) +define DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS_POSIX_ACL) +endef +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) +define DOCKER_ENGINE_DRIVER_DM_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MD) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_DM) + $(call KCONFIG_ENABLE_OPT,CONFIG_MD_THIN_PROVISIONING) +endef +endif + +# based on contrib/check-config.sh +define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) + $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS) + $(DOCKER_ENGINE_DRIVER_DM_LINUX_CONFIG_FIXUPS) +endef + $(eval $(golang-package)) diff --git a/buildroot/package/docker-proxy/docker-proxy.mk b/buildroot/package/docker-proxy/docker-proxy.mk index 1ab84159d..d0e940db9 100644 --- a/buildroot/package/docker-proxy/docker-proxy.mk +++ b/buildroot/package/docker-proxy/docker-proxy.mk @@ -12,8 +12,6 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE DOCKER_PROXY_DEPENDENCIES = host-pkgconf -DOCKER_PROXY_WORKSPACE = gopath - DOCKER_PROXY_BUILD_TARGETS = cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS diff --git a/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch b/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch deleted file mode 100644 index c2b9cb0d2..000000000 --- a/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bc34ba549d4366092a39a4d7bc4414f8cbd8bc6c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 3 Aug 2019 09:13:54 +0200 -Subject: [PATCH] History.txt: use 10717 instead of xxxxx -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Set current development version to 4.10717 instead of 4.xxxxx to avoid -the following build failure when git is unavailable: - -/home/fabrice/buildroot/output/build/domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533/main/domoticz.cpp: In function ‘void GetAppVersion()’: -/home/fabrice/buildroot/output/build/domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533/main/../appversion.h:1:20: error: ‘xxxxx’ was not declared in this scope - #define APPVERSION xxxxx - -Signed-off-by: Fabrice Fontaine ---- - History.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/History.txt b/History.txt -index 4dc45e6b5..ad67976f3 100644 ---- a/History.txt -+++ b/History.txt -@@ -1,4 +1,4 @@ --Version 4.xxxxx (xxx 2019) -+Version 4.10717 (xxx 2019) - - Implemented: DarkSky CloudCover sensor - - Implemented: EventSystem, option in Settings to enable/disable URL call logging containing full URL path - - Implemented: GUI, OpenZWave added Refresh Node Information button, styling --- -2.20.1 - diff --git a/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch b/buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch similarity index 81% rename from buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch rename to buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch index 8640b8354..5393b0caf 100644 --- a/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch +++ b/buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch @@ -7,6 +7,7 @@ Subject: [PATCH] Revert "Updating CMake configuration file to use This reverts commit 4e4ee999c4b323514c0ba81ab1ff3afb10d2f1cd to avoid bumping host-cmake requirement version from 3.8 to 3.14 in buildroot. +[Fabrice: Updated for 2020.1] Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 8 +++----- @@ -32,11 +33,18 @@ index c5b7832ff..a21f5b87b 100644 if(USE_STATIC_BOOST) message(STATUS "Linking against boost static libraries") -@@ -590,9 +591,6 @@ else(USE_STATIC_BOOST) +@@ -590,16 +591,6 @@ else(USE_STATIC_BOOST) message(STATUS "Linking against boost dynamic libraries") endif(USE_STATIC_BOOST) -find_package(Boost REQUIRED COMPONENTS thread system) +-if(Boost_FOUND) +- MESSAGE(STATUS "BOOST libraries found at: ${Boost_LIBRARY_DIRS}") +- MESSAGE(STATUS "Boost includes found at: ${Boost_INCLUDE_DIR}") +-else(Boost_FOUND) +- MESSAGE(FATAL_ERROR "Boost thread/system library not found on your system, try to get this installed.") +-endif(Boost_FOUND) +- -target_link_libraries(domoticz Boost::thread Boost::system) - # compare found vs required libBoost version diff --git a/buildroot/package/domoticz/0002-Avoid-deprecated-bind-placeholders-in-global-namespace.patch b/buildroot/package/domoticz/0002-Avoid-deprecated-bind-placeholders-in-global-namespace.patch new file mode 100644 index 000000000..5cf53b393 --- /dev/null +++ b/buildroot/package/domoticz/0002-Avoid-deprecated-bind-placeholders-in-global-namespace.patch @@ -0,0 +1,843 @@ +From bbcf7fd0646d74b7f169b3aa4231d9150028ed0d Mon Sep 17 00:00:00 2001 +From: Rob Peters +Date: Sun, 17 May 2020 11:46:37 +0200 +Subject: [PATCH] Avoid deprecated bind placeholders in global namespace + +[Retrieved (and slightly updated to backport it) from: +https://github.com/domoticz/domoticz/commit/bbcf7fd0646d74b7f169b3aa4231d9150028ed0d] +Signed-off-by: Fabrice Fontaine +--- + hardware/ASyncSerial.cpp | 2 +- + hardware/ASyncTCP.cpp | 4 +++- + hardware/Comm5Serial.cpp | 2 ++ + hardware/CurrentCostMeterSerial.cpp | 4 +++- + hardware/DavisLoggerSerial.cpp | 4 +++- + hardware/DenkoviUSBDevices.cpp | 2 ++ + hardware/EnOceanESP2.cpp | 4 +++- + hardware/EnOceanESP3.cpp | 4 +++- + hardware/EvohomeRadio.cpp | 3 +++ + hardware/EvohomeSerial.cpp | 2 ++ + hardware/KMTronic433.cpp | 4 +++- + hardware/KMTronicBase.cpp | 2 +- + hardware/KMTronicSerial.cpp | 4 +++- + hardware/MQTT.cpp | 2 ++ + hardware/Meteostick.cpp | 4 +++- + hardware/MySensorsBase.cpp | 2 +- + hardware/MySensorsSerial.cpp | 4 +++- + hardware/OTGWBase.cpp | 2 +- + hardware/OTGWSerial.cpp | 4 +++- + hardware/OpenWebNetUSB.cpp | 3 ++- + hardware/P1MeterSerial.cpp | 4 +++- + hardware/Pinger.cpp | 2 ++ + hardware/RAVEn.cpp | 2 ++ + hardware/RFLinkSerial.cpp | 2 ++ + hardware/RFXComSerial.cpp | 4 +++- + hardware/RFXComTCP.cpp | 2 -- + hardware/Rego6XXSerial.cpp | 4 +++- + hardware/S0MeterBase.cpp | 2 +- + hardware/S0MeterSerial.cpp | 4 +++- + hardware/TCPProxy/tcpproxy_server.cpp | 2 ++ + hardware/TeleinfoSerial.cpp | 4 +++- + hardware/USBtin.cpp | 4 +++- + hardware/XiaomiGateway.cpp | 2 +- + hardware/Yeelight.h | 1 - + hardware/ZiBlueSerial.cpp | 2 ++ + hardware/plugins/PluginTransports.cpp | 2 ++ + main/WebServer.cpp | 4 +++- + main/mainworker.cpp | 2 ++ + push/FibaroPush.cpp | 2 ++ + push/GooglePubSubPush.cpp | 2 ++ + push/HttpPush.cpp | 2 ++ + push/InfluxPush.cpp | 2 ++ + push/WebsocketPush.cpp | 2 ++ + tcpserver/TCPServer.cpp | 2 +- + webserver/cWebem.cpp | 2 +- + webserver/connection.cpp | 4 +++- + webserver/connection_manager.cpp | 4 +++- + webserver/proxyclient.cpp | 2 ++ + webserver/server.cpp | 4 +++- + 49 files changed, 107 insertions(+), 32 deletions(-) + +diff --git a/hardware/ASyncSerial.cpp b/hardware/ASyncSerial.cpp +index 2c9a5e27e9..36dd402fa7 100644 +--- a/hardware/ASyncSerial.cpp ++++ b/hardware/ASyncSerial.cpp +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include // for shared_array +diff --git a/hardware/ASyncTCP.cpp b/hardware/ASyncTCP.cpp +index 8990c24300..7f7b1e0f24 100644 +--- a/hardware/ASyncTCP.cpp ++++ b/hardware/ASyncTCP.cpp +@@ -1,10 +1,12 @@ + #include "stdafx.h" + #include "ASyncTCP.h" + #include +-#include ++#include + #include // for error_code + #include "../main/Logger.h" + ++//using namespace boost::placeholders; ++ + struct hostent; + + #ifndef WIN32 +diff --git a/hardware/Comm5Serial.cpp b/hardware/Comm5Serial.cpp +index 9b44496fb5..f1c1f706d2 100644 +--- a/hardware/Comm5Serial.cpp ++++ b/hardware/Comm5Serial.cpp +@@ -5,6 +5,8 @@ + #include "../main/Logger.h" + #include "../main/RFXtrx.h" + ++using namespace boost::placeholders; ++ + /* + This driver allows Domoticz to control any I/O module from the MA-4xxx Family + +diff --git a/hardware/CurrentCostMeterSerial.cpp b/hardware/CurrentCostMeterSerial.cpp +index 05bac73d6a..bf9d35cab7 100644 +--- a/hardware/CurrentCostMeterSerial.cpp ++++ b/hardware/CurrentCostMeterSerial.cpp +@@ -10,10 +10,12 @@ + + #include + #include +-#include ++#include + + #include + ++using namespace boost::placeholders; ++ + // + //Class CurrentCostMeterSerial + // +diff --git a/hardware/DavisLoggerSerial.cpp b/hardware/DavisLoggerSerial.cpp +index 9c44539beb..44c9dbde5c 100644 +--- a/hardware/DavisLoggerSerial.cpp ++++ b/hardware/DavisLoggerSerial.cpp +@@ -8,13 +8,15 @@ + #include + #include + #include +-#include ++#include + + #include "../main/localtime_r.h" + #include "../main/mainworker.h" + + #include + ++using namespace boost::placeholders; ++ + #ifdef _DEBUG + //#define DEBUG_DAVIS + #endif +diff --git a/hardware/DenkoviUSBDevices.cpp b/hardware/DenkoviUSBDevices.cpp +index a7977d82c8..53a27e5583 100644 +--- a/hardware/DenkoviUSBDevices.cpp ++++ b/hardware/DenkoviUSBDevices.cpp +@@ -5,6 +5,8 @@ + #include "../main/localtime_r.h" + #include "../main/mainworker.h" + ++using namespace boost::placeholders; ++ + #define MAX_POLL_INTERVAL 3600*1000 + + #define DAE_IO_TYPE_RELAY 2 +diff --git a/hardware/EnOceanESP2.cpp b/hardware/EnOceanESP2.cpp +index f20ff9c0cb..fd08c55f63 100644 +--- a/hardware/EnOceanESP2.cpp ++++ b/hardware/EnOceanESP2.cpp +@@ -8,7 +8,7 @@ + #include + #include + #include +-#include ++#include + #include "hardwaretypes.h" + #include "../main/localtime_r.h" + +@@ -16,6 +16,8 @@ + #include + #include + ++using namespace boost::placeholders; ++ + #define ENOCEAN_RETRY_DELAY 30 + + #define round(a) ( int ) ( a + .5 ) +diff --git a/hardware/EnOceanESP3.cpp b/hardware/EnOceanESP3.cpp +index 6866eeb0d0..2afa0e1e36 100644 +--- a/hardware/EnOceanESP3.cpp ++++ b/hardware/EnOceanESP3.cpp +@@ -8,7 +8,7 @@ + #include + #include + #include +-#include ++#include + #include "hardwaretypes.h" + #include "../main/localtime_r.h" + +@@ -16,6 +16,8 @@ + #include + #include + ++using namespace boost::placeholders; ++ + #if _DEBUG + #define ENOCEAN_BUTTON_DEBUG + #endif +diff --git a/hardware/EvohomeRadio.cpp b/hardware/EvohomeRadio.cpp +index 4da983538b..6ba97158cd 100644 +--- a/hardware/EvohomeRadio.cpp ++++ b/hardware/EvohomeRadio.cpp +@@ -23,6 +23,9 @@ + #include "../main/WebServer.h" + #include "../webserver/cWebem.h" + #include "../json/json.h" ++#include ++ ++using namespace boost::placeholders; + + extern std::string szUserDataFolder; + +diff --git a/hardware/EvohomeSerial.cpp b/hardware/EvohomeSerial.cpp +index 4a54988291..c74cf576cc 100644 +--- a/hardware/EvohomeSerial.cpp ++++ b/hardware/EvohomeSerial.cpp +@@ -7,6 +7,8 @@ + #include "../main/localtime_r.h" + #include + ++using namespace boost::placeholders; ++ + CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) : + CEvohomeRadio(ID, UserContID) + { +diff --git a/hardware/KMTronic433.cpp b/hardware/KMTronic433.cpp +index da81b20f9f..f9832a5a74 100644 +--- a/hardware/KMTronic433.cpp ++++ b/hardware/KMTronic433.cpp +@@ -9,11 +9,13 @@ + #include + #include + #include +-#include ++#include + #include + + #include + ++using namespace boost::placeholders; ++ + //#define DEBUG_KMTronic + + #define RETRY_DELAY 30 +diff --git a/hardware/KMTronicBase.cpp b/hardware/KMTronicBase.cpp +index b343108966..d9c45872b5 100644 +--- a/hardware/KMTronicBase.cpp ++++ b/hardware/KMTronicBase.cpp +@@ -10,7 +10,7 @@ + #include + #include + #include +-#include ++#include + + #include + +diff --git a/hardware/KMTronicSerial.cpp b/hardware/KMTronicSerial.cpp +index 4e07f2c37a..6240f941bd 100644 +--- a/hardware/KMTronicSerial.cpp ++++ b/hardware/KMTronicSerial.cpp +@@ -10,12 +10,14 @@ + #include + #include + #include +-#include ++#include + #include + #include + + //#define DEBUG_KMTronic + ++using namespace boost::placeholders; ++ + #define RETRY_DELAY 30 + + KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname) +diff --git a/hardware/MQTT.cpp b/hardware/MQTT.cpp +index 8de3671853..19750bb75b 100644 +--- a/hardware/MQTT.cpp ++++ b/hardware/MQTT.cpp +@@ -11,6 +11,8 @@ + #define __STDC_FORMAT_MACROS + #include + ++using namespace boost::placeholders; ++ + #define RETRY_DELAY 30 + + #define CLIENTID "Domoticz" +diff --git a/hardware/Meteostick.cpp b/hardware/Meteostick.cpp +index 9793f4b57b..10da69d6e3 100644 +--- a/hardware/Meteostick.cpp ++++ b/hardware/Meteostick.cpp +@@ -9,12 +9,14 @@ + #include + #include + #include +-#include ++#include + #include "../main/localtime_r.h" + #include "../main/mainworker.h" + + #include + ++using namespace boost::placeholders; ++ + #define RETRY_DELAY 30 + + #define round(a) ( int ) ( a + .5 ) +diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp +index af976fba95..42bf58fad5 100644 +--- a/hardware/MySensorsBase.cpp ++++ b/hardware/MySensorsBase.cpp +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include "../webserver/cWebem.h" + #include + +diff --git a/hardware/MySensorsSerial.cpp b/hardware/MySensorsSerial.cpp +index 44f8692d2b..42f3e05409 100644 +--- a/hardware/MySensorsSerial.cpp ++++ b/hardware/MySensorsSerial.cpp +@@ -8,12 +8,14 @@ + #include "hardwaretypes.h" + + #include +-#include ++#include + #include + #include + #include + #include + ++using namespace boost::placeholders; ++ + //#define DEBUG_MYSENSORS + + #define RETRY_DELAY 30 +diff --git a/hardware/OTGWBase.cpp b/hardware/OTGWBase.cpp +index 322574458b..ded3a31c2c 100644 +--- a/hardware/OTGWBase.cpp ++++ b/hardware/OTGWBase.cpp +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "../json/json.h" + + #include +diff --git a/hardware/OTGWSerial.cpp b/hardware/OTGWSerial.cpp +index 4ade70e063..5a3416548f 100644 +--- a/hardware/OTGWSerial.cpp ++++ b/hardware/OTGWSerial.cpp +@@ -8,12 +8,14 @@ + #include "../main/localtime_r.h" + + #include +-#include ++#include + #include + #include + #include + #include + ++using namespace boost::placeholders; ++ + #define RETRY_DELAY 30 + #define OTGW_READ_INTERVAL 10 + +diff --git a/hardware/OpenWebNetUSB.cpp b/hardware/OpenWebNetUSB.cpp +index bf23049844..352a2220e9 100644 +--- a/hardware/OpenWebNetUSB.cpp ++++ b/hardware/OpenWebNetUSB.cpp +@@ -19,11 +19,12 @@ License: Public domain + + #include + #include +-#include ++#include + #include + #include + #include + ++using namespace boost::placeholders; + + COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate) + { +diff --git a/hardware/P1MeterSerial.cpp b/hardware/P1MeterSerial.cpp +index 566b451fa5..7dc3e0782e 100644 +--- a/hardware/P1MeterSerial.cpp ++++ b/hardware/P1MeterSerial.cpp +@@ -14,10 +14,12 @@ + #include + #include + #include +-#include ++#include + + #include + ++using namespace boost::placeholders; ++ + #ifdef _DEBUG + //#define DEBUG_P1_R + #endif +diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp +index d3e2fda942..b6dc78a786 100644 +--- a/hardware/Pinger.cpp ++++ b/hardware/Pinger.cpp +@@ -19,6 +19,8 @@ + + #include + ++using namespace boost::placeholders; ++ + #if BOOST_VERSION >= 107000 + #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) + #else +diff --git a/hardware/RAVEn.cpp b/hardware/RAVEn.cpp +index d9efc7480a..b6a4399d04 100644 +--- a/hardware/RAVEn.cpp ++++ b/hardware/RAVEn.cpp +@@ -8,6 +8,8 @@ + #include "../tinyxpath/tinyxml.h" + #include "hardwaretypes.h" + ++using namespace boost::placeholders; ++ + //Rainforest RAVEn USB ZigBee Smart Meter Adapter + //https://rainforestautomation.com/rfa-z106-raven/ + +diff --git a/hardware/RFLinkSerial.cpp b/hardware/RFLinkSerial.cpp +index c5cae0f739..4ab07ed88e 100644 +--- a/hardware/RFLinkSerial.cpp ++++ b/hardware/RFLinkSerial.cpp +@@ -5,6 +5,8 @@ + #include "../main/localtime_r.h" + #include + ++using namespace boost::placeholders; ++ + CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) : + m_szSerialPort(devname) + { +diff --git a/hardware/RFXComSerial.cpp b/hardware/RFXComSerial.cpp +index dc85f4832d..4c39520510 100644 +--- a/hardware/RFXComSerial.cpp ++++ b/hardware/RFXComSerial.cpp +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + + #include + +@@ -23,6 +23,8 @@ + #include + #endif + ++using namespace boost::placeholders; ++ + #define RETRY_DELAY 30 + + #define RFX_WRITE_DELAY 300 +diff --git a/hardware/RFXComTCP.cpp b/hardware/RFXComTCP.cpp +index 7c6b3954b8..0e4856fbfb 100644 +--- a/hardware/RFXComTCP.cpp ++++ b/hardware/RFXComTCP.cpp +@@ -1,8 +1,6 @@ + #include "stdafx.h" + #include "RFXComTCP.h" + #include "../main/Logger.h" +-//#include +-//#include + #include "../main/Helper.h" + #include "../main/localtime_r.h" + #include "../main/mainworker.h" +diff --git a/hardware/Rego6XXSerial.cpp b/hardware/Rego6XXSerial.cpp +index b94bd291bc..15d22f869a 100644 +--- a/hardware/Rego6XXSerial.cpp ++++ b/hardware/Rego6XXSerial.cpp +@@ -16,11 +16,13 @@ + #include + #include + #include +-#include ++#include + #include "hardwaretypes.h" + + #include + ++using namespace boost::placeholders; ++ + #define Rego6XX_RETRY_DELAY 30 + #define Rego6XX_COMMAND_DELAY 5 + #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1) +diff --git a/hardware/S0MeterBase.cpp b/hardware/S0MeterBase.cpp +index 9cffa67022..75a06e2cc1 100644 +--- a/hardware/S0MeterBase.cpp ++++ b/hardware/S0MeterBase.cpp +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + + #include + +diff --git a/hardware/S0MeterSerial.cpp b/hardware/S0MeterSerial.cpp +index 1dc16b2b3e..f474d1c766 100644 +--- a/hardware/S0MeterSerial.cpp ++++ b/hardware/S0MeterSerial.cpp +@@ -8,11 +8,13 @@ + + #include + #include +-#include ++#include + #include + #include + #include + ++using namespace boost::placeholders; ++ + #ifdef _DEBUG + //#define DEBUG_S0 + #define TOT_DEBUG_LINES 6 +diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp +index 60445d9c28..82ba3559d9 100644 +--- a/hardware/TCPProxy/tcpproxy_server.cpp ++++ b/hardware/TCPProxy/tcpproxy_server.cpp +@@ -15,6 +15,8 @@ + #include "stdafx.h" + #include "tcpproxy_server.h" + ++using namespace boost::placeholders; ++ + #if BOOST_VERSION >= 107000 + #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) + #else +diff --git a/hardware/TeleinfoSerial.cpp b/hardware/TeleinfoSerial.cpp +index 85f9a6240f..fa794802e9 100644 +--- a/hardware/TeleinfoSerial.cpp ++++ b/hardware/TeleinfoSerial.cpp +@@ -28,9 +28,11 @@ History : + #include "../main/localtime_r.h" + #include "../main/Logger.h" + +-#include ++#include + #include + ++using namespace boost::placeholders; ++ + CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit) + { + m_HwdID = ID; +diff --git a/hardware/USBtin.cpp b/hardware/USBtin.cpp +index c3e3656319..ce6f542df3 100644 +--- a/hardware/USBtin.cpp ++++ b/hardware/USBtin.cpp +@@ -27,7 +27,7 @@ History : + #include "../main/SQLHelper.h" + + #include +-#include ++#include + #include + #include + #include +@@ -35,6 +35,8 @@ History : + #include + #include + ++using namespace boost::placeholders; ++ + #define USBTIN_BAUD_RATE 115200 + #define USBTIN_PARITY boost::asio::serial_port_base::parity::none + #define USBTIN_CARACTER_SIZE 8 +diff --git a/hardware/XiaomiGateway.cpp b/hardware/XiaomiGateway.cpp +index f4567ec62f..e4998faa6a 100644 +--- a/hardware/XiaomiGateway.cpp ++++ b/hardware/XiaomiGateway.cpp +@@ -12,7 +12,7 @@ + #include "XiaomiHardware.h" + #include + #include +-#include ++#include + + #ifndef WIN32 + #include +diff --git a/hardware/Yeelight.h b/hardware/Yeelight.h +index b063f79743..64fd6f5479 100644 +--- a/hardware/Yeelight.h ++++ b/hardware/Yeelight.h +@@ -2,7 +2,6 @@ + + #include "DomoticzHardware.h" + #include +-#include + + class Yeelight : public CDomoticzHardwareBase + { +diff --git a/hardware/ZiBlueSerial.cpp b/hardware/ZiBlueSerial.cpp +index 9e9db2aff1..8e896897fc 100644 +--- a/hardware/ZiBlueSerial.cpp ++++ b/hardware/ZiBlueSerial.cpp +@@ -6,6 +6,8 @@ + + #include + ++using namespace boost::placeholders; ++ + #define ZiBlue_RETRY_DELAY 30 + + CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) : +diff --git a/hardware/plugins/PluginTransports.cpp b/hardware/plugins/PluginTransports.cpp +index c7e065529f..7fc1cb953e 100644 +--- a/hardware/plugins/PluginTransports.cpp ++++ b/hardware/plugins/PluginTransports.cpp +@@ -13,6 +13,8 @@ + #include "icmp_header.hpp" + #include "ipv4_header.hpp" + ++using namespace boost::placeholders; ++ + namespace Plugins { + + void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) +diff --git a/main/WebServer.cpp b/main/WebServer.cpp +index 0a19319669..ed92f06e32 100644 +--- a/main/WebServer.cpp ++++ b/main/WebServer.cpp +@@ -1,7 +1,7 @@ + #include "stdafx.h" + #include "WebServer.h" + #include "WebServerHelper.h" +-#include ++#include + #include + #include + #include "mainworker.h" +@@ -65,6 +65,8 @@ + #define __STDC_FORMAT_MACROS + #include + ++using namespace boost::placeholders; ++ + #define round(a) ( int ) ( a + .5 ) + + extern std::string szStartupFolder; +diff --git a/main/mainworker.cpp b/main/mainworker.cpp +index 505f59f49d..5fb2ee9042 100644 +--- a/main/mainworker.cpp ++++ b/main/mainworker.cpp +@@ -174,6 +174,8 @@ + #include + #endif + ++using namespace boost::placeholders; ++ + #define round(a) ( int ) ( a + .5 ) + + extern std::string szStartupFolder; +diff --git a/push/FibaroPush.cpp b/push/FibaroPush.cpp +index 0bc54e6cfd..350a8fa893 100644 +--- a/push/FibaroPush.cpp ++++ b/push/FibaroPush.cpp +@@ -14,6 +14,8 @@ + #define __STDC_FORMAT_MACROS + #include + ++using namespace boost::placeholders; ++ + CFibaroPush::CFibaroPush() + { + m_PushType = PushType::PUSHTYPE_FIBARO; +diff --git a/push/GooglePubSubPush.cpp b/push/GooglePubSubPush.cpp +index 6d0fc82d40..a5b720f219 100644 +--- a/push/GooglePubSubPush.cpp ++++ b/push/GooglePubSubPush.cpp +@@ -21,6 +21,8 @@ extern "C" { + #include + #endif + ++using namespace boost::placeholders; ++ + extern std::string szUserDataFolder; + + // this should be filled in by the preprocessor +diff --git a/push/HttpPush.cpp b/push/HttpPush.cpp +index 8132ca2b43..3d1d51d52e 100644 +--- a/push/HttpPush.cpp ++++ b/push/HttpPush.cpp +@@ -15,6 +15,8 @@ + #define __STDC_FORMAT_MACROS + #include + ++using namespace boost::placeholders; ++ + CHttpPush::CHttpPush() + { + m_PushType = PushType::PUSHTYPE_HTTP; +diff --git a/push/InfluxPush.cpp b/push/InfluxPush.cpp +index 0a8e99414f..745fdf0496 100644 +--- a/push/InfluxPush.cpp ++++ b/push/InfluxPush.cpp +@@ -15,6 +15,8 @@ + #define __STDC_FORMAT_MACROS + #include + ++using namespace boost::placeholders; ++ + CInfluxPush::CInfluxPush() : + m_InfluxPort(8086), + m_bInfluxDebugActive(false) +diff --git a/push/WebsocketPush.cpp b/push/WebsocketPush.cpp +index 0fb71f96ec..3c2ce7ed54 100644 +--- a/push/WebsocketPush.cpp ++++ b/push/WebsocketPush.cpp +@@ -3,6 +3,8 @@ + #include "../webserver/WebsocketHandler.h" + #include "../main/mainworker.h" + ++using namespace boost::placeholders; ++ + extern boost::signals2::signal sOnNotificationReceived; + + +diff --git a/tcpserver/TCPServer.cpp b/tcpserver/TCPServer.cpp +index d3b0a94847..3b8d0b9b76 100644 +--- a/tcpserver/TCPServer.cpp ++++ b/tcpserver/TCPServer.cpp +@@ -11,7 +11,7 @@ + #include "../main/localtime_r.h" + #include + #include +-#include ++#include + + namespace tcp { + namespace server { +diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp +index f015be097f..63c96f789f 100644 +--- a/webserver/cWebem.cpp ++++ b/webserver/cWebem.cpp +@@ -5,7 +5,7 @@ + //Modified, extended etc by Robbert E. Peters/RTSS B.V. + #include "stdafx.h" + #include "cWebem.h" +-#include ++#include + #include "reply.hpp" + #include "request.hpp" + #include "mime_types.hpp" +diff --git a/webserver/connection.cpp b/webserver/connection.cpp +index d3485fe923..afe700e5d7 100644 +--- a/webserver/connection.cpp ++++ b/webserver/connection.cpp +@@ -9,7 +9,7 @@ + // + #include "stdafx.h" + #include "connection.hpp" +-#include ++#include + #include + #include "connection_manager.hpp" + #include "request_handler.hpp" +@@ -17,6 +17,8 @@ + #include "../main/localtime_r.h" + #include "../main/Logger.h" + ++using namespace boost::placeholders; ++ + namespace http { + namespace server { + extern std::string convert_to_http_date(time_t time); +diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp +index b6c20de53f..bf1d9882d0 100644 +--- a/webserver/connection_manager.cpp ++++ b/webserver/connection_manager.cpp +@@ -10,10 +10,12 @@ + #include "stdafx.h" + #include "connection_manager.hpp" + #include +-#include ++#include + #include + #include "../main/Logger.h" + ++using namespace boost::placeholders; ++ + namespace http { + namespace server { + +diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp +index c2bcd3178f..423ee0fb4b 100644 +--- a/webserver/proxyclient.cpp ++++ b/webserver/proxyclient.cpp +@@ -8,6 +8,8 @@ + #include "../tcpserver/TCPServer.h" + #include "sha1.hpp" + ++using namespace boost::placeholders; ++ + // RK: some defines to make mydomoticz also work when openssl not compiled in + #ifdef WWW_ENABLE_SSL + #define PROXY_PORT 443 +diff --git a/webserver/server.cpp b/webserver/server.cpp +index 1eb2137ef2..6025b1cdb5 100644 +--- a/webserver/server.cpp ++++ b/webserver/server.cpp +@@ -3,7 +3,7 @@ + // ~~~~~~~~~~ + // + #include "stdafx.h" +-#include ++#include + #include "server.hpp" + #include + #include "../main/Logger.h" +@@ -11,6 +11,8 @@ + #include "../main/localtime_r.h" + #include "../main/mainworker.h" + ++using namespace boost::placeholders; ++ + extern bool g_bIsWSL; + + namespace http { diff --git a/buildroot/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch b/buildroot/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch deleted file mode 100644 index b14f4c56c..000000000 --- a/buildroot/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 17107b876fb308e3ef3e759ab90f3d8e4755cdc4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 8 Nov 2019 14:17:58 +0100 -Subject: [PATCH] CMakeLists.txt: add -c argument to build precompiled headers - -Add "-c" argument when building precompiler headers as suggested -by Arnout in https://patchwork.ozlabs.org/patch/1187328. - -This will fix the build with RELRO - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/domoticz/domoticz/commit/17107b876fb308e3ef3e759ab90f3d8e4755cdc4] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 32a0dd2a8c..010cdf2db8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -277,10 +277,10 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) - ENDFOREACH(item) - - SEPARATE_ARGUMENTS(_compiler_FLAGS) -- MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}") -+ MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}") - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} -- COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source} -+ COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source} - DEPENDS ${_source} ) - ADD_CUSTOM_TARGET(${_targetName}_gch DEPENDS ${_output}) - ADD_DEPENDENCIES(${_targetName} ${_targetName}_gch) diff --git a/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch b/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch deleted file mode 100644 index 5b9abffab..000000000 --- a/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e9bd383ceb63db7cfe8a284014f0cdf8c2bfe4f0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 1 Nov 2019 10:54:11 +0100 -Subject: [PATCH] DelayedLink.h: fix build with python 3.8 - -Fix build with python 3.8 by copy/pasting the vim workaround from -https://github.com/vim/vim/commit/13a1f3fb0c9d08bba6109fe2131c9524e6ba7e15 - -Fix 3703 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/domoticz/domoticz/commit/e9bd383ceb63db7cfe8a284014f0cdf8c2bfe4f0] ---- - hardware/plugins/DelayedLink.h | 38 ++++++++++++++++++++++++++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h -index 4bf1973281..c90a7d8e69 100644 ---- a/hardware/plugins/DelayedLink.h -+++ b/hardware/plugins/DelayedLink.h -@@ -14,6 +14,44 @@ - #include - #include "../../main/Helper.h" - -+#if PY_VERSION_HEX >= 0x030800f0 -+static inline void -+py3__Py_DECREF(const char *filename, int lineno, PyObject *op) -+{ -+ (void)filename; /* may be unused, shut up -Wunused-parameter */ -+ (void)lineno; /* may be unused, shut up -Wunused-parameter */ -+ _Py_DEC_REFTOTAL; -+ if (--op->ob_refcnt != 0) -+ { -+#ifdef Py_REF_DEBUG -+ if (op->ob_refcnt < 0) -+ { -+ _Py_NegativeRefcount(filename, lineno, op); -+ } -+#endif -+ } -+ else -+ { -+ _Py_Dealloc(op); -+ } -+} -+ -+#undef Py_DECREF -+#define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op)) -+ -+static inline void -+py3__Py_XDECREF(PyObject *op) -+{ -+ if (op != NULL) -+ { -+ Py_DECREF(op); -+ } -+} -+ -+#undef Py_XDECREF -+#define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op)) -+#endif -+ - namespace Plugins { - - #ifdef WIN32 diff --git a/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch b/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch deleted file mode 100644 index 63da572b6..000000000 --- a/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 23f69284cb1ce1a98885b29a6126ebdbee735e7d Mon Sep 17 00:00:00 2001 -From: Daniel Wallner <14888585+danielwallner@users.noreply.github.com> -Date: Thu, 17 Oct 2019 07:31:43 +0200 -Subject: [PATCH] Fix include paths to not confuse local files with system - files (json/json.h) (#3669) - -[Retrieved from: -https://github.com/domoticz/domoticz/commit/23f69284cb1ce1a98885b29a6126ebdbee735e7d] -Signed-off-by: Fabrice Fontaine ---- - hardware/1Wire/1WireForWindows.cpp | 2 +- - hardware/plugins/PluginManager.cpp | 16 ++++++++-------- - hardware/plugins/PluginProtocols.cpp | 8 ++++---- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/hardware/1Wire/1WireForWindows.cpp b/hardware/1Wire/1WireForWindows.cpp -index cf0b42795d..2044882fb9 100644 ---- a/hardware/1Wire/1WireForWindows.cpp -+++ b/hardware/1Wire/1WireForWindows.cpp -@@ -4,7 +4,7 @@ - #include "1WireForWindows.h" - #include "../../main/Logger.h" - #include --#include "../json/json.h" -+#include "../../json/json.h" - #include - - #define _1WIRE_SERVICE_PORT "1664" -diff --git a/hardware/plugins/PluginManager.cpp b/hardware/plugins/PluginManager.cpp -index 793934121e..4276fe2fbc 100644 ---- a/hardware/plugins/PluginManager.cpp -+++ b/hardware/plugins/PluginManager.cpp -@@ -14,14 +14,14 @@ - #include "PluginMessages.h" - #include "PluginTransports.h" - --#include "../main/Helper.h" --#include "../main/Logger.h" --#include "../main/SQLHelper.h" --#include "../main/WebServer.h" --#include "../main/mainworker.h" --#include "../main/EventSystem.h" --#include "../json/json.h" --#include "../main/localtime_r.h" -+#include "../../main/Helper.h" -+#include "../../main/Logger.h" -+#include "../../main/SQLHelper.h" -+#include "../../main/WebServer.h" -+#include "../../main/mainworker.h" -+#include "../../main/EventSystem.h" -+#include "../../json/json.h" -+#include "../../main/localtime_r.h" - #ifdef WIN32 - # include - #else -diff --git a/hardware/plugins/PluginProtocols.cpp b/hardware/plugins/PluginProtocols.cpp -index f19731e1a4..8b1ae4c3e7 100644 ---- a/hardware/plugins/PluginProtocols.cpp -+++ b/hardware/plugins/PluginProtocols.cpp -@@ -7,12 +7,12 @@ - - #include "PluginMessages.h" - #include "PluginProtocols.h" --#include "../main/Helper.h" --#include "../main/Logger.h" --#include "../webserver/Base64.h" -+#include "../../main/Helper.h" -+#include "../../main/Logger.h" -+#include "../../webserver/Base64.h" - #include "icmp_header.hpp" - #include "ipv4_header.hpp" --#include "../json/json.h" -+#include "../../json/json.h" - - namespace Plugins { - diff --git a/buildroot/package/domoticz/Config.in b/buildroot/package/domoticz/Config.in index 0639718c2..642d39482 100644 --- a/buildroot/package/domoticz/Config.in +++ b/buildroot/package/domoticz/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD + select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MOSQUITTO select BR2_PACKAGE_OPENSSL diff --git a/buildroot/package/domoticz/domoticz.hash b/buildroot/package/domoticz/domoticz.hash index 320028ac5..4f095c33a 100644 --- a/buildroot/package/domoticz/domoticz.hash +++ b/buildroot/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1903b830ed53aada66ae261d4f29a73d10c03cb5f117e4c6e7e1275620b11f4e domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt +sha256 d0c17b2082dad8a8caeed888b7d4c191975e74a2808b5d078305f5327b82442d domoticz-2020.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/buildroot/package/domoticz/domoticz.mk b/buildroot/package/domoticz/domoticz.mk index aeac0c65e..0ceaab87b 100644 --- a/buildroot/package/domoticz/domoticz.mk +++ b/buildroot/package/domoticz/domoticz.mk @@ -4,13 +4,14 @@ # ################################################################################ -DOMOTICZ_VERSION = 0f411f781ae4fb4a82f592d38a3f40578c149533 +DOMOTICZ_VERSION = 2020.1 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt DOMOTICZ_DEPENDENCIES = \ boost \ host-pkgconf \ + jsoncpp \ libcurl \ lua \ mosquitto \ @@ -18,6 +19,9 @@ DOMOTICZ_DEPENDENCIES = \ sqlite \ zlib +# Disable precompiled header as it needs cmake >= 3.16 +DOMOTICZ_CONF_OPTS = -DUSE_PRECOMPILED_HEADER=OFF + # Due to the dependency on mosquitto, domoticz depends on # !BR2_STATIC_LIBS so set USE_STATIC_BOOST and USE_OPENSSL_STATIC to OFF DOMOTICZ_CONF_OPTS += \ @@ -25,8 +29,9 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# lua, sqlite and mqtt +# jsoncpp, lua, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ + -DUSE_BUILTIN_JSONCPP=OFF \ -DUSE_BUILTIN_LUA=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF diff --git a/buildroot/package/doxygen/doxygen.hash b/buildroot/package/doxygen/doxygen.hash index 90d4e978b..ff2fac7b9 100644 --- a/buildroot/package/doxygen/doxygen.hash +++ b/buildroot/package/doxygen/doxygen.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599 doxygen-1.8.17.src.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656 doxygen-1.8.18.src.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/doxygen/doxygen.mk b/buildroot/package/doxygen/doxygen.mk index 52e96f380..ee8ae4fde 100644 --- a/buildroot/package/doxygen/doxygen.mk +++ b/buildroot/package/doxygen/doxygen.mk @@ -4,11 +4,13 @@ # ################################################################################ -DOXYGEN_VERSION = 1.8.17 +DOXYGEN_VERSION = 1.8.18 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz DOXYGEN_SITE = http://doxygen.nl/files DOXYGEN_LICENSE = GPL-2.0 DOXYGEN_LICENSE_FILES = LICENSE HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison +HOST_DOXYGEN_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + $(eval $(host-cmake-package)) diff --git a/buildroot/package/drbd-utils/drbd-utils.hash b/buildroot/package/drbd-utils/drbd-utils.hash index 884d6790e..47f6f6ecf 100644 --- a/buildroot/package/drbd-utils/drbd-utils.hash +++ b/buildroot/package/drbd-utils/drbd-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e07d156ce6e3d93ac1b69fa9bf8695038e6e5edfb2c80c91a1098d1477478ecb drbd-utils-9.11.0.tar.gz -sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING +sha256 e89be59e60fc33534481a5dcae90de242e35867512d85cef2878ca757bfb074a drbd-utils-9.15.0.tar.gz +sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING diff --git a/buildroot/package/drbd-utils/drbd-utils.mk b/buildroot/package/drbd-utils/drbd-utils.mk index 55ac9d9dc..8ea581eb2 100644 --- a/buildroot/package/drbd-utils/drbd-utils.mk +++ b/buildroot/package/drbd-utils/drbd-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DRBD_UTILS_VERSION = 9.11.0 +DRBD_UTILS_VERSION = 9.15.0 DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils DRBD_UTILS_LICENSE = GPL-2.0+ DRBD_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch b/buildroot/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch deleted file mode 100644 index 4372d615d..000000000 --- a/buildroot/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Haelwenn Monnier -# Date 1590411269 -7200 -# Mon May 25 14:54:29 2020 +0200 -# Node ID 087c2804147074c95b6a3f35137b4f4b726b1452 -# Parent 009d52ae26d35f3381c801e02318fa9be34be93c -scp.c: Port OpenSSH CVE-2018-20685 fix (#80) - -[backport from 2020.79 to 2019.78 for Buildroot 2020.02.x] -Signed-off-by: Thomas De Schampheleire - -diff --git a/scp.c b/scp.c ---- a/scp.c -+++ b/scp.c -@@ -935,7 +935,8 @@ sink(int argc, char **argv) - size = size * 10 + (*cp++ - '0'); - if (*cp++ != ' ') - SCREWUP("size not delimited"); -- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { -+ if (*cp == '\0' || strchr(cp, '/') != NULL || -+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { - run_err("error: unexpected filename: %s", cp); - exit(1); - } diff --git a/buildroot/package/dropbear/dropbear.hash b/buildroot/package/dropbear/dropbear.hash index aa0e80a20..82ff454f0 100644 --- a/buildroot/package/dropbear/dropbear.hash +++ b/buildroot/package/dropbear/dropbear.hash @@ -1,5 +1,7 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 dropbear-2019.78.tar.bz2 +sha256 48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b dropbear-2020.81.tar.bz2 # License file, locally computed -sha256 cfa32d49e9022265375e533a4a5ef9e37d4aaa604119d612c46816aa1e59fe52 LICENSE +sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE +sha256 8f196cb13afd271f5e267fd29543fc454596382ad580e7592709492843996ac8 libtomcrypt/LICENSE +sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a libtommath/LICENSE diff --git a/buildroot/package/dropbear/dropbear.mk b/buildroot/package/dropbear/dropbear.mk index 1070a410b..00992f066 100644 --- a/buildroot/package/dropbear/dropbear.mk +++ b/buildroot/package/dropbear/dropbear.mk @@ -4,10 +4,10 @@ # ################################################################################ -DROPBEAR_VERSION = 2019.78 +DROPBEAR_VERSION = 2020.81 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 -DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause +DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) @@ -56,11 +56,15 @@ endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH endif -ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) +ifeq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) +define DROPBEAR_ENABLE_LEGACY_CRYPTO + echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h +endef +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO +else define DROPBEAR_DISABLE_LEGACY_CRYPTO - echo '#define DROPBEAR_3DES 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_ENABLE_CBC_MODE 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_SHA1_96_HMAC 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h endef @@ -75,6 +79,8 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) +DROPBEAR_LICENSE += , Unlicense, WTFPL +DROPBEAR_LICENSE_FILES += libtommath/LICENSE libtomcrypt/LICENSE DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else define DROPBEAR_BUILD_FEATURED diff --git a/buildroot/package/dropwatch/0001-binutils-2.23.1.patch b/buildroot/package/dropwatch/0001-binutils-2.23.1.patch deleted file mode 100644 index 86b1822bc..000000000 --- a/buildroot/package/dropwatch/0001-binutils-2.23.1.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ffad73a59d3c831dfab66d4d06f1ab25fce66f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 18 Jul 2019 22:58:07 +0200 -Subject: [PATCH] Fix for binutils 2.23.1 - -libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf. -So include config.h now that dropwatch uses autoconf - -Signed-off-by: Gustavo Zacarias -[Retrieved (and slightly updated) from: -https://git.buildroot.net/buildroot/tree/package/dropwatch/0001-binutils-2.23.1.patch] -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/nhorman/dropwatch/commit/0ffad73a59d3c831dfab66d4d06f1ab25fce66f2] ---- - src/lookup.c | 3 +++ - src/lookup_bfd.c | 2 ++ - src/lookup_kas.c | 2 ++ - 3 files changed, 7 insertions(+) - -diff --git a/src/lookup.c b/src/lookup.c -index ba54991..521e292 100644 ---- a/src/lookup.c -+++ b/src/lookup.c -@@ -24,6 +24,9 @@ - * 1) /usr/lib/debug/ using libbfd - * 2) /proc/kallsyms - */ -+ -+#include "config.h" -+ - #include - #include - #include -diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c -index cc7010b..2c08e5e 100644 ---- a/src/lookup_bfd.c -+++ b/src/lookup_bfd.c -@@ -22,6 +22,8 @@ - * symbollic name using the bfd library - */ - -+#include "config.h" -+ - #include - #include - #include -diff --git a/src/lookup_kas.c b/src/lookup_kas.c -index 5e05630..2300220 100644 ---- a/src/lookup_kas.c -+++ b/src/lookup_kas.c -@@ -22,6 +22,8 @@ - * symbolic name using /proc/kallsyms - */ - -+#include "config.h" -+ - #include - #include - #include diff --git a/buildroot/package/dropwatch/0002-Make-binutils-optional.patch b/buildroot/package/dropwatch/0002-Make-binutils-optional.patch deleted file mode 100644 index 2694e99b6..000000000 --- a/buildroot/package/dropwatch/0002-Make-binutils-optional.patch +++ /dev/null @@ -1,146 +0,0 @@ -From a9d1b6adb4e47ae89d55274ff3f7121122e15975 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 1 Aug 2019 17:42:16 +0200 -Subject: [PATCH] Make binutils optional - -Add an option to enable or disable bfd support to allow the user to use -dropwatch without binutils - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nhorman/dropwatch/pull/10] ---- - configure.ac | 10 ++++++++++ - src/Makefile.am | 9 +++++++-- - src/lookup.c | 8 ++++++++ - src/lookup.h | 4 ++++ - src/lookup_kas.c | 1 - - 5 files changed, 29 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 97e21fe..c01a9f4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,15 @@ PKG_CHECK_MODULES([LIBNL3], [libnl-3.0], [], [AC_MSG_ERROR([libnl-3.0 is require - # Fallback on using -lreadline as readline.pc is only available since version 8.0 - PKG_CHECK_MODULES([READLINE], [readline], [], [READLINE_LIBS=-lreadline]) - -+AC_ARG_WITH([bfd], -+ [AS_HELP_STRING([--without-bfd], [Build without bfd library (default: yes)])], -+ [with_bfd=$withval], -+ [with_bfd=yes]) -+AS_IF([test "x$with_bfd" != "xno"], [ -+ AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([Couldn't find or include bfd.h])]) -+]) -+AM_CONDITIONAL(USE_BFD, test "x$with_bfd" != "xno") -+ - AC_OUTPUT(Makefile src/Makefile doc/Makefile tests/Makefile) - - AC_MSG_NOTICE() -@@ -25,3 +34,4 @@ AC_MSG_NOTICE([Target: $target]) - AC_MSG_NOTICE([Installation prefix: $prefix]) - AC_MSG_NOTICE([Compiler: $CC]) - AC_MSG_NOTICE([Compiler flags: $CFLAGS]) -+AC_MSG_NOTICE([BFD library support: $with_bfd]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 16db0b4..994fbd8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,7 +2,12 @@ - bin_PROGRAMS = dropwatch - - AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS) --AM_LDFLAGS = $(LIBNL3_LIBS) -lnl-genl-3 -lbfd $(READLINE_LIBS) -+AM_LDFLAGS = $(LIBNL3_LIBS) -lnl-genl-3 $(READLINE_LIBS) - AM_CPPFLAGS = -D_GNU_SOURCE - --dropwatch_SOURCES = main.c lookup_bfd.c lookup.c lookup_kas.c -+dropwatch_SOURCES = main.c lookup.c lookup_kas.c -+ -+if USE_BFD -+dropwatch_SOURCES += lookup_bfd.c -+AM_LDFLAGS += -lbfd -+endif -diff --git a/src/lookup.c b/src/lookup.c -index 521e292..ec5e847 100644 ---- a/src/lookup.c -+++ b/src/lookup.c -@@ -30,7 +30,9 @@ - #include - #include - #include -+#ifdef HAVE_BFD_H - #include -+#endif - #include - #include - #include -@@ -38,7 +40,9 @@ - - #include "lookup.h" - -+#ifdef HAVE_BFD_H - extern struct lookup_methods bfd_methods; -+#endif - extern struct lookup_methods kallsym_methods; - - static int lookup_null_init(void) -@@ -75,17 +79,21 @@ int init_lookup(lookup_init_method_t method) - methods = &null_methods; - break; - case METHOD_AUTO: -+#ifdef HAVE_BFD_H - methods = &bfd_methods; - if (methods->lookup_init() == 0) - return 0; -+#endif - methods = &kallsym_methods; - if (methods->lookup_init() == 0) - return 0; - methods = NULL; - return -1; -+#ifdef HAVE_BFD_H - case METHOD_DEBUGINFO: - methods = &bfd_methods; - break; -+#endif - case METHOD_KALLSYMS: - methods = &kallsym_methods; - break; -diff --git a/src/lookup.h b/src/lookup.h -index e6568d8..2c56a92 100644 ---- a/src/lookup.h -+++ b/src/lookup.h -@@ -25,6 +25,8 @@ - * 2) /proc/kallsyms - */ - -+#include "config.h" -+ - #include - #include - -@@ -44,7 +46,9 @@ - typedef enum { - METHOD_NULL = 0, - METHOD_AUTO, -+#ifdef HAVE_BFD_H - METHOD_DEBUGINFO, -+#endif - METHOD_KALLSYMS - } lookup_init_method_t; - -diff --git a/src/lookup_kas.c b/src/lookup_kas.c -index 2300220..9a1a148 100644 ---- a/src/lookup_kas.c -+++ b/src/lookup_kas.c -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.20.1 - diff --git a/buildroot/package/dropwatch/Config.in b/buildroot/package/dropwatch/Config.in index cf11a03d4..8dfb4ace5 100644 --- a/buildroot/package/dropwatch/Config.in +++ b/buildroot/package/dropwatch/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DROPWATCH depends on BR2_TOOLCHAIN_HAS_THREADS # libnl select BR2_PACKAGE_READLINE select BR2_PACKAGE_LIBNL + select BR2_PACKAGE_LIBPCAP help Dropwatch is an interactive utility for monitoring and recording packets that are dropped by the kernel diff --git a/buildroot/package/dropwatch/dropwatch.hash b/buildroot/package/dropwatch/dropwatch.hash index e0e03ad88..867a7f12f 100644 --- a/buildroot/package/dropwatch/dropwatch.hash +++ b/buildroot/package/dropwatch/dropwatch.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3a95b7ff0d609f581c120a4072e6a97d044f900824b4f4d3ac83fdcc5f3e96cf dropwatch-1.5.1.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 b748b66a816c1f94531446c0451da5461a4a31b0949244bb867d741c6ac0148b dropwatch-1.5.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/dropwatch/dropwatch.mk b/buildroot/package/dropwatch/dropwatch.mk index c5873ccf7..36608ad8b 100644 --- a/buildroot/package/dropwatch/dropwatch.mk +++ b/buildroot/package/dropwatch/dropwatch.mk @@ -4,11 +4,9 @@ # ################################################################################ -DROPWATCH_VERSION = 1.5.1 +DROPWATCH_VERSION = 1.5.3 DROPWATCH_SITE = $(call github,nhorman,dropwatch,v$(DROPWATCH_VERSION)) -DROPWATCH_DEPENDENCIES = libnl readline host-pkgconf $(TARGET_NLS_DEPENDENCIES) -# Until upstream updates their tree with a proper license -# blurb: https://github.com/nhorman/dropwatch/issues/14 +DROPWATCH_DEPENDENCIES = libnl readline libpcap host-pkgconf $(TARGET_NLS_DEPENDENCIES) DROPWATCH_LICENSE = GPL-2.0+ DROPWATCH_LICENSE_FILES = COPYING # From git diff --git a/buildroot/package/duktape/duktape.hash b/buildroot/package/duktape/duktape.hash index b50ae7329..4c55e3988 100644 --- a/buildroot/package/duktape/duktape.hash +++ b/buildroot/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 810e1dab50dfd3040cac4bb18b96d749a5fdebfd898a7bfe74512044c1a89880 duktape-2.5.0.tar.gz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz +sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt diff --git a/buildroot/package/duktape/duktape.mk b/buildroot/package/duktape/duktape.mk index 004757188..aadd60924 100644 --- a/buildroot/package/duktape/duktape.mk +++ b/buildroot/package/duktape/duktape.mk @@ -4,8 +4,10 @@ # ################################################################################ -DUKTAPE_VERSION = 2.5.0 -DUKTAPE_SITE = $(call github,svaarala,duktape-releases,v$(DUKTAPE_VERSION)) +DUKTAPE_VERSION = 2.6.0 +DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz +DUKTAPE_SITE = \ + https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES diff --git a/buildroot/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch b/buildroot/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..eeda03bcf --- /dev/null +++ b/buildroot/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch @@ -0,0 +1,72 @@ +From 02153cb0b2d1083dcd587798d9ef7ce963739622 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 19 Aug 2020 18:46:17 +0200 +Subject: [PATCH] dump1090.h: fix build with gcc 10 + +Fix the following build failures on gcc 10 (where -fno-common is enabled +by default): + +/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; /home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here + +/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: multiple definition of `tDF'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: first defined here +/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: view1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here + +Fixes: + - http://autobuild.buildroot.org/results/88dc97fcaa649014edb3b54a5dd4bd8ec4715bbd + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MalcolmRobb/dump1090/pull/96] +--- + dump1090.c | 3 +++ + dump1090.h | 4 ++-- + view1090.c | 3 +++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/dump1090.c b/dump1090.c +index 60882fc..1482224 100644 +--- a/dump1090.c ++++ b/dump1090.c +@@ -29,6 +29,9 @@ + // + #include "coaa.h" + #include "dump1090.h" ++ ++struct modes Modes; ++ + // + // ============================= Utility functions ========================== + // +diff --git a/dump1090.h b/dump1090.h +index 9ad4de0..283e760 100644 +--- a/dump1090.h ++++ b/dump1090.h +@@ -235,10 +235,10 @@ struct stDF { + uint64_t llTimestamp; // Timestamp at which the this packet was received + uint32_t addr; // Timestamp at which the this packet was received + unsigned char msg[MODES_LONG_MSG_BYTES]; // the binary +-} tDF; ++}; + + // Program global state +-struct { // Internal state ++extern struct modes { // Internal state + pthread_t reader_thread; + + pthread_mutex_t data_mutex; // Mutex to synchronize buffer access +diff --git a/view1090.c b/view1090.c +index 0b9b8b9..cc072fc 100644 +--- a/view1090.c ++++ b/view1090.c +@@ -29,6 +29,9 @@ + // + #include "coaa.h" + #include "view1090.h" ++ ++struct modes Modes; ++ + // + // ============================= Utility functions ========================== + // +-- +2.27.0 + diff --git a/buildroot/package/dvb-apps/0006-fix-glibc-2.31.patch b/buildroot/package/dvb-apps/0006-fix-glibc-2.31.patch new file mode 100644 index 000000000..079a24f14 --- /dev/null +++ b/buildroot/package/dvb-apps/0006-fix-glibc-2.31.patch @@ -0,0 +1,21 @@ +dvbdate: fix compilation error with glibc 2.31 + +as stime func doesn't exists anymore in newer versions of glibc >= 2.31 due +to obseletion, a replacment with clock_settime is inorder to fix the issue. + +Signed-off-by: Dagg Stompler + +--- a/util/dvbdate/dvbdate.c ++++ b/util/dvbdate/dvbdate.c +@@ -309,7 +309,10 @@ + */ + int set_time(time_t * new_time) + { +- if (stime(new_time)) { ++ struct timespec s = {0}; ++ s.tv_sec = new_time; ++ ++ if (clock_settime(CLOCK_REALTIME, &s)) { + perror("Unable to set time"); + return -1; + } diff --git a/buildroot/package/e2fsprogs/0001-create_inode-set-xattrs-to-the-root-directory-as-wel.patch b/buildroot/package/e2fsprogs/0001-create_inode-set-xattrs-to-the-root-directory-as-wel.patch new file mode 100644 index 000000000..2e9c3ccef --- /dev/null +++ b/buildroot/package/e2fsprogs/0001-create_inode-set-xattrs-to-the-root-directory-as-wel.patch @@ -0,0 +1,46 @@ +From 1826d8965057bd84517156a4b75c81bdfdae9ebc Mon Sep 17 00:00:00 2001 +From: Antoine Tenart +Date: Wed, 1 Jul 2020 10:06:03 +0200 +Subject: [PATCH] create_inode: set xattrs to the root directory as well + +populate_fs do copy the xattrs for all files and directories, but the +root directory is skipped and as a result its extended attributes aren't +set. This is an issue when using mkfs to build a full system image that +can be used with SElinux in enforcing mode without making any runtime +fix at first boot. + +This patch adds logic to set the root directory's extended attributes. + +[Uspstream status: sent to the mailing list and has a Reviewed-by tag, +https://lore.kernel.org/linux-ext4/20200717100846.497546-1-antoine.tenart@bootlin.com/] + +Signed-off-by: Antoine Tenart +--- + misc/create_inode.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/misc/create_inode.c b/misc/create_inode.c +index e8d1df6b55a5..fe66faf1b53d 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -1050,9 +1050,17 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino, + file_info.path_max_len = 255; + file_info.path = calloc(file_info.path_max_len, 1); + ++ retval = set_inode_xattr(fs, root, source_dir); ++ if (retval) { ++ com_err(__func__, retval, ++ _("while copying xattrs on root directory")); ++ goto out; ++ } ++ + retval = __populate_fs(fs, parent_ino, source_dir, root, &hdlinks, + &file_info, fs_callbacks); + ++out: + free(file_info.path); + free(hdlinks.hdl); + return retval; +-- +2.26.2 + diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk index f6642d8de..eb82a55ce 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.mk +++ b/buildroot/package/e2fsprogs/e2fsprogs.mk @@ -17,6 +17,8 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux +E2FSPROGS_SELINUX_MODULES = fstools + # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway. # Disable fuse2fs as well to avoid carrying over deps, and it's unused diff --git a/buildroot/package/earlyoom/Config.in b/buildroot/package/earlyoom/Config.in new file mode 100644 index 000000000..a3cac273f --- /dev/null +++ b/buildroot/package/earlyoom/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_EARLYOOM + bool "earlyoom" + depends on BR2_USE_MMU + help + Early OOM daemon for Linux. + + User space daemon for triggering Linux OOM killer + before running out of memory, avoiding situations + where the machine becomes unresponsive from out of + control swapping. + + https://github.com/rfjakob/earlyoom diff --git a/buildroot/package/earlyoom/S02earlyoom b/buildroot/package/earlyoom/S02earlyoom new file mode 100644 index 000000000..c02495af9 --- /dev/null +++ b/buildroot/package/earlyoom/S02earlyoom @@ -0,0 +1,49 @@ +#!/bin/sh + +DAEMON="earlyoom" +PIDFILE="/var/run/$DAEMON.pid" + +EARLYOOM_ARGS="" + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf() 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \ + -- $EARLYOOM_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/earlyoom/earlyoom.hash b/buildroot/package/earlyoom/earlyoom.hash new file mode 100644 index 000000000..b0095cb8e --- /dev/null +++ b/buildroot/package/earlyoom/earlyoom.hash @@ -0,0 +1,4 @@ +# locally calculated +sha256 b81804fc4470f996014d52252a87a1cf3b43d3d8754140035b10dcee349302b8 earlyoom-1.6.tar.gz +# License files, locally calculated +sha256 e730b3ec729de46d987ae73f30ed337e4cbe832f09205330acfa71848c6e0087 LICENSE diff --git a/buildroot/package/earlyoom/earlyoom.mk b/buildroot/package/earlyoom/earlyoom.mk new file mode 100644 index 000000000..066a479bd --- /dev/null +++ b/buildroot/package/earlyoom/earlyoom.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# earlyoom +# +################################################################################ + +EARLYOOM_VERSION = 1.6 +EARLYOOM_SITE = $(call github,rfjakob,earlyoom,v$(EARLYOOM_VERSION)) +EARLYOOM_LICENSE = MIT +EARLYOOM_LICENSE_FILES = LICENSE + +EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom +EARLYOOM_INSTALL_TARGETS = install-default install-bin +EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"' + +EARLYOOM_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + PREFIX=/usr + +define EARLYOOM_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(EARLYOOM_MAKE_OPTS) -C $(@D) \ + $(EARLYOOM_BUILD_TARGETS) CFLAGS=$(EARLYOOM_CFLAGS) +endef + +define EARLYOOM_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(EARLYOOM_MAKE_OPTS) -C $(@D) \ + $(EARLYOOM_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) +endef + +define EARLYOOM_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 $(EARLYOOM_PKGDIR)/S02earlyoom \ + $(TARGET_DIR)/etc/init.d/S02earlyoom +endef + +define EARLYOOM_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/earlyoom.service \ + $(TARGET_DIR)/usr/lib/systemd/system/earlyoom.service +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/easy-rsa/easy-rsa.hash b/buildroot/package/easy-rsa/easy-rsa.hash index 5f5a490cb..e363e570d 100644 --- a/buildroot/package/easy-rsa/easy-rsa.hash +++ b/buildroot/package/easy-rsa/easy-rsa.hash @@ -1,6 +1,6 @@ # Locally computed: (after verifying gpg sig) -sha512 1e0eb08fb343345c2bc079d622474f1b34dda3a0517b119efc7cb09113ab467f1346a6678e67d65e535bd404c2abb350d47a00c8f24e4541d54dbeb5600fab72 EasyRSA-unix-v3.0.6.tgz +sha512 fd2cde4725cffd60c6af1b6aeaff0dbf15f31f0f322c9df75c22838e2297ba9dc3bba610d956464c8227bd74b3e63840e2a3da41fbc5ee1c79c1e7f5350adc94 EasyRSA-3.0.8.tgz # Hash for license files -sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md -sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt +sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt diff --git a/buildroot/package/easy-rsa/easy-rsa.mk b/buildroot/package/easy-rsa/easy-rsa.mk index b3c57439a..4ec011e17 100644 --- a/buildroot/package/easy-rsa/easy-rsa.mk +++ b/buildroot/package/easy-rsa/easy-rsa.mk @@ -4,8 +4,8 @@ # ################################################################################ -EASY_RSA_VERSION = 3.0.6 -EASY_RSA_SOURCE = EasyRSA-unix-v$(EASY_RSA_VERSION).tgz +EASY_RSA_VERSION = 3.0.8 +EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/v$(EASY_RSA_VERSION) EASY_RSA_LICENSE = GPL-2.0 EASY_RSA_LICENSE_FILES = COPYING.md gpl-2.0.txt diff --git a/buildroot/package/easydbus/Config.in b/buildroot/package/easydbus/Config.in index 1fe8689cc..5f2f3a22b 100644 --- a/buildroot/package/easydbus/Config.in +++ b/buildroot/package/easydbus/Config.in @@ -3,12 +3,13 @@ config BR2_PACKAGE_EASYDBUS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_LIBGLIB2 help Easy to use DBus library for Lua. https://github.com/mniestroj/easydbus -comment "easydbus needs a toolchain w/ wchar, threads" +comment "easydbus needs a toolchain w/ wchar, threads, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4 diff --git a/buildroot/package/easydbus/easydbus.hash b/buildroot/package/easydbus/easydbus.hash index 49245709f..08a4f038d 100644 --- a/buildroot/package/easydbus/easydbus.hash +++ b/buildroot/package/easydbus/easydbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4626d6af3d9000d7e6ee9723abba7cd5f01d1c52420a80d8259dfa2d884faa11 easydbus-b86721147b265dfefc9a857669408cb6eb3d6560.tar.gz -sha256 dec3b3103cd6889045da86fc7da22bd25545966e5bd7c214791b922dec19588b LICENSE +sha256 8cec24bff40f056d4874ed9d6fb73c9f1efbc5eff14528e1b49f1a162b197f26 easydbus-0.1.0.tar.gz +sha256 dec3b3103cd6889045da86fc7da22bd25545966e5bd7c214791b922dec19588b LICENSE diff --git a/buildroot/package/easydbus/easydbus.mk b/buildroot/package/easydbus/easydbus.mk index 5e6de73c3..57d0c2239 100644 --- a/buildroot/package/easydbus/easydbus.mk +++ b/buildroot/package/easydbus/easydbus.mk @@ -4,8 +4,8 @@ # ################################################################################ -EASYDBUS_VERSION = b86721147b265dfefc9a857669408cb6eb3d6560 -EASYDBUS_SITE = $(call github,mniestroj,easydbus,$(EASYDBUS_VERSION)) +EASYDBUS_VERSION = 0.1.0 +EASYDBUS_SITE = $(call github,mniestroj,easydbus,v$(EASYDBUS_VERSION)) EASYDBUS_DEPENDENCIES = luainterpreter libglib2 EASYDBUS_LICENSE = MIT EASYDBUS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch b/buildroot/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch new file mode 100644 index 000000000..3f13613e9 --- /dev/null +++ b/buildroot/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch @@ -0,0 +1,57 @@ +From 89ad9c143825b13d028c2f1713d55e83135d5c0f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Sep 2020 15:38:33 +0200 +Subject: [PATCH] CMakesLists.txt: fix static build with pcap + +Use pkg-config to find the dependencies of pcap such as libnl otherwise +a static-only build will fail on: + +[100%] Linking C executable ef +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcap.a(pcap-linux.o): in function `nl80211_init': +pcap-linux.c:(.text+0x460): undefined reference to `nl_socket_alloc' +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: pcap-linux.c:(.text+0x498): undefined reference to `genl_connect' + +Fixes: + - http://autobuild.buildroot.org/results/99062bfc8c21c32bc835acae675aede7c9cf0c90 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/microchip-ung/easyframes/pull/2] +--- + CMakeLists.txt | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a62a950..5be128c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,13 +7,21 @@ include_directories(src) + + + set(_LIBPCAP "") +-FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h) +-FIND_LIBRARY(PCAP_LIBRARY NAMES pcap) +- +-if (PCAP_LIBRARY) ++find_package(PkgConfig) ++pkg_check_modules(PCAP libpcap) ++if (PCAP_FOUND) + add_definitions(-DHAS_LIBPCAP) +- include_directories(${PCAP_INCLUDE_DIR}) +- set(_LIBPCAP ${PCAP_LIBRARY}) ++ include_directories(${PCAP_INCLUDE_DIRS}) ++ set(_LIBPCAP ${PCAP_LIBRARIES}) ++else() ++ FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h) ++ FIND_LIBRARY(PCAP_LIBRARY NAMES pcap) ++ ++ if (PCAP_LIBRARY) ++ add_definitions(-DHAS_LIBPCAP) ++ include_directories(${PCAP_INCLUDE_DIR}) ++ set(_LIBPCAP ${PCAP_LIBRARY}) ++ endif() + endif() + + add_library(libef STATIC +-- +2.28.0 + diff --git a/buildroot/package/easyframes/0002-Fix-different-compiling-issues.patch b/buildroot/package/easyframes/0002-Fix-different-compiling-issues.patch new file mode 100644 index 000000000..e4d16a73a --- /dev/null +++ b/buildroot/package/easyframes/0002-Fix-different-compiling-issues.patch @@ -0,0 +1,91 @@ +From d3d179c3c39ec10ec636b325325ad8e18ae9542f Mon Sep 17 00:00:00 2001 +From: Horatiu Vultur +Date: Tue, 1 Sep 2020 13:03:47 +0200 +Subject: [PATCH] Fix different compiling issues + +[Retrieved from: +https://github.com/microchip-ung/easyframes/commit/d3d179c3c39ec10ec636b325325ad8e18ae9542f] +Signed-off-by: Fabrice Fontaine +--- + src/ef-exec.c | 4 ++-- + src/ef-parse-bytes.c | 8 ++++++-- + src/ef.h | 4 ++-- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/src/ef-exec.c b/src/ef-exec.c +index 3d184a0..824164e 100644 +--- a/src/ef-exec.c ++++ b/src/ef-exec.c +@@ -108,7 +108,7 @@ int ring_wait_for_init(tpacket_ring *ring) { + + + int raw_socket(cmd_socket_t *cmd_socket) { +- int s, res, val, ifidx; ++ int s, res, val, ifidx, i; + struct sockaddr_ll sa = {}; + struct packet_mreq mr = {}; + +@@ -194,7 +194,7 @@ int raw_socket(cmd_socket_t *cmd_socket) { + // + // TODO: This does not seem to be needed, if we uses a RX ring buffer + // instead (atleast that seems to work for libpcap) +- for (int i = 0; i < 10000; ++i) { ++ for (i = 0; i < 10000; ++i) { + struct msghdr msg = { 0 }; + int res = recvmsg(s, &msg, MSG_DONTWAIT); + if (res < 0) +diff --git a/src/ef-parse-bytes.c b/src/ef-parse-bytes.c +index 1dd590f..1785f45 100644 +--- a/src/ef-parse-bytes.c ++++ b/src/ef-parse-bytes.c +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + + struct start_with { +@@ -212,7 +213,9 @@ buf_t *parse_bytes(const char *s, int bytes) { + for (s = data_begin; *s; ++s) { + int match_found = 0; + for (i = 0; i < sizeof(has_chars)/sizeof(has_chars[0]); ++i) { +- for (const char *set_i = has_chars[i].char_set; *set_i; ++set_i) { ++ const char *set_i; ++ ++ for (set_i = has_chars[i].char_set; *set_i; ++set_i) { + if (*s == *set_i) { + has_mask |= has_chars[i].mask; + match_found = 1; +@@ -313,6 +316,7 @@ buf_t *parse_bytes(const char *s, int bytes) { + ((has_mask & ~(HAS_HEX_COL)) == 0) && (has_mask & HAS_COLON)) { + // This will be treated as a mac-address + uint8_t m[6] = {}; ++ const char *x; + + // We want to be able to write something like this (like we RFC2373 + // specifies for IPv6): +@@ -334,7 +338,7 @@ buf_t *parse_bytes(const char *s, int bytes) { + + //po("line: %d data_begin: %s\n", __LINE__, data_begin); + +- for (const char *x = data_begin; *x; ++x) { ++ for (x = data_begin; *x; ++x) { + int colon = 0; + int val = 0; + +diff --git a/src/ef.h b/src/ef.h +index 8926c25..f4c1629 100644 +--- a/src/ef.h ++++ b/src/ef.h +@@ -59,8 +59,8 @@ void bl_check(buf_list_t *b); + void bl_reset(buf_list_t *b); + void bset_value(buf_t *b, uint8_t v); + +-inline void bl_init(buf_list_t *b) { bl_reset(b); } +-inline void bl_destroy(buf_list_t *b) { bl_reset(b); } ++static inline void bl_init(buf_list_t *b) { bl_reset(b); } ++static inline void bl_destroy(buf_list_t *b) { bl_reset(b); } + + int bl_printf_append(buf_list_t *b, const char *format, ...) + __attribute__ ((format (printf, 2, 3))); diff --git a/buildroot/package/easyframes/Config.in b/buildroot/package/easyframes/Config.in new file mode 100644 index 000000000..b73afe058 --- /dev/null +++ b/buildroot/package/easyframes/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_EASYFRAMES + bool "easyframes" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBPCAP + help + This is a small and simple command-line tool for network + testing. The tool makes it simple to compose a frame, + inject and express what and where frames are expected to be + received. + + https://github.com/microchip-ung/easyframes diff --git a/buildroot/package/easyframes/easyframes.hash b/buildroot/package/easyframes/easyframes.hash new file mode 100644 index 000000000..0f16e0caa --- /dev/null +++ b/buildroot/package/easyframes/easyframes.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 3c0449b3129c29b5ecf67b689f1a75ffc65fde3c5f62811e2f0439ce4f4af392 easyframes-0.3.tar.gz +sha256 24f37598e822a1411fb7164ce7eb3ef120aea8279016399abc282c2381ce3f57 COPYING diff --git a/buildroot/package/easyframes/easyframes.mk b/buildroot/package/easyframes/easyframes.mk new file mode 100644 index 000000000..1821ce703 --- /dev/null +++ b/buildroot/package/easyframes/easyframes.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# easyframes +# +################################################################################ + +EASYFRAMES_VERSION = 0.3 +EASYFRAMES_SITE = $(call github,microchip-ung,easyframes,v$(EASYFRAMES_VERSION)) +EASYFRAMES_DEPENDENCIES = host-pkgconf libpcap +EASYFRAMES_LICENSE = MIT +EASYFRAMES_LICENSE_FILES = COPYING + +$(eval $(cmake-package)) diff --git a/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch deleted file mode 100644 index bd7bead09..000000000 --- a/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 12:31:58 +0200 -Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW - -Fixes compilation with musl libc - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit f8079671326e9fd0 - - include/ethernetdb.h | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/include/ethernetdb.h b/include/ethernetdb.h -index 46d8bfd1b7e5..1683abe01987 100644 ---- a/include/ethernetdb.h -+++ b/include/ethernetdb.h -@@ -38,21 +38,20 @@ struct ethertypeent { - - /* Open ethertype data base files and mark them as staying open even - after a later search if STAY_OPEN is non-zero. */ --extern void setethertypeent(int __stay_open) __THROW; -+extern void setethertypeent(int __stay_open); - - /* Close ethertype data base files and clear `stay open' flag. */ --extern void endethertypeent(void) __THROW; -+extern void endethertypeent(void); - - /* Get next entry from ethertype data base file. Open data base if - necessary. */ --extern struct ethertypeent *getethertypeent(void) __THROW; -+extern struct ethertypeent *getethertypeent(void); - - /* Return entry from ethertype data base for network with NAME. */ --extern struct ethertypeent *getethertypebyname(__const char *__name) -- __THROW; -+extern struct ethertypeent *getethertypebyname(__const char *__name); - - /* Return entry from ethertype data base which number is PROTO. */ --extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; -+extern struct ethertypeent *getethertypebynumber(int __ethertype); - - - #endif /* ethernetdb.h */ --- -2.11.0 - diff --git a/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch b/buildroot/package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch similarity index 91% rename from buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch rename to buildroot/package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch index 687eb6a37..525e8a28b 100644 --- a/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch +++ b/buildroot/package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch @@ -16,6 +16,10 @@ Upstream: https://github.com/openembedded/meta-openembedded/commit/7f723007364ba79de05447671e83d4eefb3097dc Signed-off-by: Matthew Weber +[ryanbarnett3@gmail.com: + - changed EBTABLES executable to /usr/sbin/ebtables-legacy +] +Signed-off-by: Ryan Barnett --- ebtables-save.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) @@ -29,7 +33,7 @@ index 0000000..2d7fc4e @@ -0,0 +1,43 @@ +#!/bin/bash + -+EBTABLES="/sbin/ebtables" ++EBTABLES="/usr/sbin/ebtables-legacy" + +[ -x "$EBTABLES" ] || exit 1 + diff --git a/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch b/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch deleted file mode 100644 index 5e9f534b4..000000000 --- a/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 16 Feb 2017 14:41:48 +0200 -Subject: [PATCH] Fix musl compatibility - -Include netinet/ether.h before kernel headers to suppress the conflicting -definition of struct ethhdr. - -Signed-off-by: Baruch Siach ---- -Upstream status: not upstreamable; depends on Buildroot local musl patch ---- - include/ebtables_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/ebtables_u.h b/include/ebtables_u.h -index 35a5bcc54c86..268b1fd599d2 100644 ---- a/include/ebtables_u.h -+++ b/include/ebtables_u.h -@@ -24,6 +24,7 @@ - #ifndef EBTABLES_U_H - #define EBTABLES_U_H - #include -+#include - #include - #include - --- -2.11.0 - diff --git a/buildroot/package/ebtables/Config.in b/buildroot/package/ebtables/Config.in index 4fc4b30de..703e55a3c 100644 --- a/buildroot/package/ebtables/Config.in +++ b/buildroot/package/ebtables/Config.in @@ -10,17 +10,14 @@ if BR2_PACKAGE_EBTABLES config BR2_PACKAGE_EBTABLES_UTILS_SAVE bool "ebtables save" - depends on BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash help - Install the ebtables-save tool + Install the ebtables-legacy-save tool config BR2_PACKAGE_EBTABLES_UTILS_RESTORE bool "ebtables restore" - depends on !BR2_STATIC_LIBS help - Install the ebtables-restore tool - -comment "ebtables-restore needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS + Install the ebtables-legacy-restore tool endif diff --git a/buildroot/package/ebtables/ebtables.hash b/buildroot/package/ebtables/ebtables.hash index f9222b889..98106b0d6 100644 --- a/buildroot/package/ebtables/ebtables.hash +++ b/buildroot/package/ebtables/ebtables.hash @@ -1,3 +1,4 @@ +# ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum +sha256 b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a ebtables-2.0.11.tar.gz # Locally computed -sha256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d ebtables-v2.0.10-4.tar.gz -sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/buildroot/package/ebtables/ebtables.mk b/buildroot/package/ebtables/ebtables.mk index 117cd5e99..e8b982206 100644 --- a/buildroot/package/ebtables/ebtables.mk +++ b/buildroot/package/ebtables/ebtables.mk @@ -4,45 +4,31 @@ # ################################################################################ -EBTABLES_VERSION = 2.0.10-4 -EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz +EBTABLES_VERSION = 2.0.11 EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING -EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) -EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) - -define EBTABLES_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \ - CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D) -endef ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE - $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/sbin/ebtables-save -endef -endif -ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),y) -define EBTABLES_INSTALL_TARGET_UTILS_RESTORE - $(INSTALL) -m 0755 -D $(@D)/ebtables-restore $(TARGET_DIR)/sbin/ebtables-restore -endef -endif - -ifeq ($(BR2_STATIC_LIBS),y) -define EBTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables + $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_TARGET_UTILS_SAVE else -define EBTABLES_INSTALL_TARGET_CMDS - $(foreach so,$(wildcard $(@D)/*.so $(@D)/extensions/*.so), \ - $(INSTALL) -m 0755 -D $(so) \ - $(TARGET_DIR)/lib/ebtables/$(notdir $(so)) - ) - $(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables - $(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes - $(EBTABLES_INSTALL_TARGET_UTILS_RESTORE) - $(EBTABLES_INSTALL_TARGET_UTILS_SAVE) +# ebtables-legacy-save is installed by default, thus remove it from target +define EBTABLES_REMOVE_UTILS_SAVE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-save endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_SAVE endif -$(eval $(generic-package)) +# ebtables-legacy-restore is installed by default, thus remove it if not +# selected +ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_RESTORE),) +define EBTABLES_REMOVE_UTILS_RESTORE + $(RM) -f $(TARGET_DIR)/usr/sbin/ebtables-legacy-restore +endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_RESTORE +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/ed/ed.hash b/buildroot/package/ed/ed.hash index 96c814d3c..3169923c3 100644 --- a/buildroot/package/ed/ed.hash +++ b/buildroot/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From http://lists.gnu.org/archive/html/bug-ed/2019-01/msg00010.html -sha256 ad4489c0ad7a108c514262da28e6c2a426946fb408a3977ef1ed34308bdfd174 ed-1.15.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2020-02/msg00002.html +sha256 cfc07a14ab048a758473ce222e784fbf031485bcd54a76f74acfee1f390d8b2c ed-1.16.tar.lz # Locally calculated -sha256 f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c COPYING +sha256 f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c COPYING diff --git a/buildroot/package/ed/ed.mk b/buildroot/package/ed/ed.mk index 6ef8f951c..deb900e28 100644 --- a/buildroot/package/ed/ed.mk +++ b/buildroot/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.15 +ED_VERSION = 1.16 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-3.0+ diff --git a/buildroot/package/edid-decode/Config.in b/buildroot/package/edid-decode/Config.in index 701c70031..ddf1942c6 100644 --- a/buildroot/package/edid-decode/Config.in +++ b/buildroot/package/edid-decode/Config.in @@ -1,6 +1,12 @@ config BR2_PACKAGE_EDID_DECODE bool "edid-decode" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 help Decode EDID data in human-readable format. https://git.linuxtv.org/edid-decode.git/ + +comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" + depends on !!BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/edid-decode/edid-decode.hash b/buildroot/package/edid-decode/edid-decode.hash index e0a9c1852..3d7e94540 100644 --- a/buildroot/package/edid-decode/edid-decode.hash +++ b/buildroot/package/edid-decode/edid-decode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27fcf4c8693ec6fe020b18c78c70ddba9a8b3ea8c55fcfad2a38103128ec5e36 edid-decode-6def7bc83dfb0338632e06a8b14c93faa6af8879.tar.gz -sha256 4b4a7e6d7c358bb5b982eaa84d228cd9e99b75a5fefd3af01272957bf2016b5b edid-decode.c +sha256 327fe14531ddebe74a730efc30209e68efbd86c11375b5576cbe23af3d691150 edid-decode-188950472c19492547e298b27f9da0d72cf826df.tar.gz +sha256 9bc7ab961e9a07dc84eaa0210af388def56d024357e79671fb89fe27d073eed7 LICENSE diff --git a/buildroot/package/edid-decode/edid-decode.mk b/buildroot/package/edid-decode/edid-decode.mk index c43f1ae7d..7e463c02b 100644 --- a/buildroot/package/edid-decode/edid-decode.mk +++ b/buildroot/package/edid-decode/edid-decode.mk @@ -4,18 +4,19 @@ # ################################################################################ -EDID_DECODE_VERSION = 6def7bc83dfb0338632e06a8b14c93faa6af8879 +EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT -EDID_DECODE_LICENSE_FILES = edid-decode.c +EDID_DECODE_LICENSE_FILES = LICENSE define EDID_DECODE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endef define EDID_DECODE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) diff --git a/buildroot/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch b/buildroot/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch new file mode 100644 index 000000000..185926ac4 --- /dev/null +++ b/buildroot/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch @@ -0,0 +1,36 @@ +From 51dfe1863ddc8c5dd576405a9bbb8bca875c1142 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 1 Aug 2020 02:25:47 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: use "gl_deps" as engine + dependencies + +Meson trigger an error since "engine_gl_drm" variable doesn't exist. + +src/modules/ecore_evas/engines/drm/meson.build:10:2: ERROR: Unknown variable "engine_gl_drm". + +Instead use "gl_deps" as engine dependencies. + +Upstream status: +https://sourceforge.net/p/enlightenment/mailman/message/37075016/ + +Signed-off-by: Romain Naour +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index 58071010d0..0741d7fccd 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -3,7 +3,7 @@ engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm] + + if get_option('opengl') != 'none' + config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1') +- engine_deps += [engine_gl_drm] ++ engine_deps += [gl_deps] + endif + + engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) +-- +2.25.4 + diff --git a/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch b/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch deleted file mode 100644 index bfc12fd5b..000000000 --- a/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001 -From: Cedric BAIL -Date: Wed, 17 Jul 2019 11:12:18 -0700 -Subject: [PATCH] eina: set EINA_VALUE_EMPTY during library init. - -This is a work around compiler/linker limit on some system as reported -by Romain Naour. - -Reviewed-by: Mike Blumenkrantz -Differential Revision: https://phab.enlightenment.org/D9348 - -(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d) -[Romain: backport to 1.22.x] -Signed-off-by: Romain Naour ---- - src/lib/eina/eina_value.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c -index c75a5f1235..942a6d533e 100644 ---- a/src/lib/eina/eina_value.c -+++ b/src/lib/eina/eina_value.c -@@ -58,7 +58,7 @@ static Eina_Hash *_eina_value_inner_mps = NULL; - static Eina_Lock _eina_value_inner_mps_lock; - static char *_eina_value_mp_choice = NULL; - static int _eina_value_log_dom = -1; --static const Eina_Value _eina_value_empty = EINA_VALUE_EMPTY; -+static Eina_Value _eina_value_empty; - - #ifdef ERR - #undef ERR -@@ -5404,6 +5404,7 @@ eina_value_inner_free(size_t size, void *mem) - Eina_Bool - eina_value_init(void) - { -+ const Eina_Value empty = EINA_VALUE_EMPTY; - const char *choice, *tmp; - - _eina_value_log_dom = eina_log_domain_register("eina_value", -@@ -5490,6 +5491,8 @@ eina_value_init(void) - - EINA_ERROR_VALUE_FAILED = eina_error_msg_static_register("Eina_Value failed to copy/convert."); - -+ memcpy(&_eina_value_empty, &empty, sizeof (empty)); -+ - return EINA_TRUE; - - on_init_fail_hash: --- -2.21.0 - diff --git a/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch b/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch deleted file mode 100644 index 1b54bfdf0..000000000 --- a/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch +++ /dev/null @@ -1,222 +0,0 @@ -From c245b576aad09ac5faeb800de7f7c4fef87c6363 Mon Sep 17 00:00:00 2001 -From: Tom Callaway -Date: Fri, 31 Jan 2020 12:40:45 +0000 -Subject: [PATCH] Fix build with gcc 10 (which has -fno-common enabled by - default). - -EFL failed to build from source in Fedora Rawhide as a result of the update to GCC 10. GCC 10 enables -fno-common by default, and this found three issues in EFL: - - # The eina benchmark code defined int key_size in a header that was included in multiple places. - #/usr/bin/ld: bin/elementary/elementary_test-test_ui_clock.o:(.bss.dt1+0x0): multiple definition of `dt1'; bin/elementary/elementary_test-test_datetime.o:(.bss.dt1+0x0): first defined here - The elementary test code defines the "dt1", "dt2", "dt3" vars in two code files which are compiled together (but these variables do not appear to be used globally) - # The eio test code defines the "ee" var in two code files which are compiled together (but this variable does not appear to be used globally) - -I've fixed these issues and confirmed locally that the code builds again in Fedora. - -Reviewed-by: Marcel Hollerbach -Differential Revision: https://phab.enlightenment.org/D11259 - -Patch taken from upstream: https://github.com/Enlightenment/efl/commit/c245b576aad09ac5faeb800de7f7c4fef87c6363 -Signed-off-by: Heiko Thiery ---- - src/benchmarks/eina/eina_bench.h | 2 +- - src/benchmarks/eina/eina_bench_crc_hash.c | 1 + - src/bin/elementary/test_ui_clock.c | 90 +++++++++++------------ - src/tests/eio/eio_test_map.c | 10 +-- - 4 files changed, 52 insertions(+), 51 deletions(-) - -diff --git a/src/benchmarks/eina/eina_bench.h b/src/benchmarks/eina/eina_bench.h -index a38d70433e..747ac6f39f 100644 ---- a/src/benchmarks/eina/eina_bench.h -+++ b/src/benchmarks/eina/eina_bench.h -@@ -21,7 +21,7 @@ - - #include "eina_benchmark.h" - --int key_size; -+extern int key_size; - - void eina_bench_hash(Eina_Benchmark *bench); - void eina_bench_crc_hash_short(Eina_Benchmark *bench); -diff --git a/src/benchmarks/eina/eina_bench_crc_hash.c b/src/benchmarks/eina/eina_bench_crc_hash.c -index b6734489a3..7750233ed4 100644 ---- a/src/benchmarks/eina/eina_bench_crc_hash.c -+++ b/src/benchmarks/eina/eina_bench_crc_hash.c -@@ -26,6 +26,7 @@ - uint64_t CityHash64(const char *buf, size_t len); - #endif - -+int key_size; - char *key_str=NULL; - - void repchar(int n) -diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c -index 79e9074ead..9973b25cd3 100644 ---- a/src/bin/elementary/test_ui_clock.c -+++ b/src/bin/elementary/test_ui_clock.c -@@ -6,7 +6,7 @@ - - /* A simple test, just displaying clock in its default format */ - --Evas_Object *dt1, *dt2, *dt3, *dt4; -+Evas_Object *uicdt1, *uicdt2, *uicdt3, *uicdt4; - - static void - _changed_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) -@@ -28,19 +28,19 @@ _bt_clicked(void *data EINA_UNUSED, const Efl_Event *ev) - new_time.tm_mday = 26; - new_time.tm_hour = 9; - new_time.tm_min = 0; -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); -- efl_ui_clock_time_set(dt1, new_time); -- -- elm_object_disabled_set(dt1, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); -+ efl_ui_clock_time_set(uicdt1, new_time); -+ -+ elm_object_disabled_set(uicdt1, EINA_TRUE); - elm_object_disabled_set(ev->object, EINA_TRUE); - -- efl_del(dt2); -- efl_del(dt3); -- dt2 = dt3 = NULL; -+ efl_del(uicdt2); -+ efl_del(uicdt3); -+ uicdt2 = uicdt3 = NULL; - } - - void -@@ -56,33 +56,33 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ - efl_content_set(win, efl_added), - efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240))); - -- dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), -- efl_pack(bx, efl_added)); -- -- dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_pack(bx, efl_added)); -- elm_object_disabled_set(dt2, EINA_TRUE); -- -- dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_pack(bx, efl_added)); -+ uicdt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), -+ efl_pack(bx, efl_added)); -+ -+ uicdt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_pack(bx, efl_added)); -+ elm_object_disabled_set(uicdt2, EINA_TRUE); -+ -+ uicdt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_pack(bx, efl_added)); - - efl_add(EFL_UI_TEXTBOX_CLASS, bx, - efl_text_set(efl_added, "Editable Clock:"), -@@ -92,12 +92,12 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ - efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)), - efl_pack(bx, efl_added)); - -- dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_pack(bx, efl_added)); -+ uicdt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_pack(bx, efl_added)); - - efl_add(EFL_UI_BUTTON_CLASS, win, - efl_text_set(efl_added, "Back to the future..."), -diff --git a/src/tests/eio/eio_test_map.c b/src/tests/eio/eio_test_map.c -index fdb0631a9d..f794f73d73 100644 ---- a/src/tests/eio/eio_test_map.c -+++ b/src/tests/eio/eio_test_map.c -@@ -14,7 +14,7 @@ - - #include "eio_suite.h" - --Eina_File *ee; -+Eina_File *eie; - - static void - _done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED) -@@ -25,7 +25,7 @@ _done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED) - static void - _open_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, Eina_File *ef) - { -- ee = ef; -+ eie = ef; - ecore_main_loop_quit(); - } - -@@ -70,17 +70,17 @@ EFL_START_TEST(eio_test_map_simple) - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_map_all(ee, EINA_FILE_POPULATE, _filter_cb, _map_cb, -+ ef = eio_file_map_all(eie, EINA_FILE_POPULATE, _filter_cb, _map_cb, - _error_cb, data); - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_map_new(ee, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, -+ ef = eio_file_map_new(eie, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, - _map_cb, _error_cb, data); - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_close(ee, _done_cb, _error_cb, NULL); -+ ef = eio_file_close(eie, _done_cb, _error_cb, NULL); - ecore_main_loop_begin(); - fail_if(!ef); - --- -2.20.1 - diff --git a/buildroot/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch b/buildroot/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch new file mode 100644 index 000000000..89ec838a7 --- /dev/null +++ b/buildroot/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch @@ -0,0 +1,37 @@ +From 8548b02c487ba7e9d78489c6db58812ee5cfb197 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 1 Aug 2020 01:01:00 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: fix "gl_drm" include + directory + +The Evas_Engine_GL_Drm.h file is in "gl_drm" directory, not "drm". + +../src/modules/ecore_evas/engines/drm/ecore_evas_drm.c:23:11: fatal error: Evas_Engine_GL_Drm.h: No such file or directory + 23 | # include + | ^~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. + +Upstream status: +https://sourceforge.net/p/enlightenment/mailman/message/37075004/ + +Signed-off-by: Romain Naour +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index 0741d7fccd..edda1abd71 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -6,7 +6,7 @@ if get_option('opengl') != 'none' + engine_deps += [gl_deps] + endif + +-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) ++engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_drm')) + + shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], +-- +2.25.4 + diff --git a/buildroot/package/efl/Config.in b/buildroot/package/efl/Config.in index ce1e51e2f..e4e4c7216 100644 --- a/buildroot/package/efl/Config.in +++ b/buildroot/package/efl/Config.in @@ -11,8 +11,11 @@ config BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUAJIT select BR2_PACKAGE_DBUS select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG # Emile needs libjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS && BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_LZ4 select BR2_PACKAGE_ZLIB help @@ -23,8 +26,7 @@ config BR2_PACKAGE_EFL if BR2_PACKAGE_EFL config BR2_PACKAGE_EFL_BULLET - bool "Enable bullet support (recommended)" - default y + bool "Enable bullet support" select BR2_PACKAGE_BULLET help If you have chosen to disable physics support, this disables @@ -128,8 +130,7 @@ comment "efl's libmount support needs udev /dev management (eeze)" config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool - default y if BR2_PACKAGE_EFL_BULLET && \ - BR2_PACKAGE_EFL_EEZE && \ + default y if BR2_PACKAGE_EFL_EEZE && \ BR2_PACKAGE_EFL_FONTCONFIG && \ BR2_PACKAGE_EFL_GSTREAMER1 && \ BR2_PACKAGE_EFL_LIBFRIBIDI && \ @@ -216,58 +217,36 @@ config BR2_PACKAGE_EFL_OPENGL_NONE endchoice # OpenGL support -config BR2_PACKAGE_EFL_ELPUT - bool "Elput" - depends on BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - help - The elput library is an efl abstraction for the libinput - library which can be used by various other subsystems - (ecore_fb, ecore_drm, etc) to handle interfacing with - libinput without having to duplicate the code in each - subsystem. - -comment "Elput support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE - config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. + Since efl 1.23.x, the drm option enable the elput library + which is an efl abstraction for the libinput library which + can be used by various other subsystems (ecore_fb, ecore_drm, + etc) to handle interfacing with libinput without having to + duplicate the code in each subsystem. + comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ || !BR2_PACKAGE_EFL_EEZE comment "libevas loaders" -config BR2_PACKAGE_EFL_PNG - bool "libevas png loader" - select BR2_PACKAGE_LIBPNG - help - This enables the loader code that loads png files using - libpng. - config BR2_PACKAGE_EFL_JPEG bool "libevas jpeg loader" + select BR2_PACKAGE_OPENJPEG help This enables the loader code that loads jpeg files using libjpeg. -config BR2_PACKAGE_EFL_GIF - bool "libevas gif loader" - select BR2_PACKAGE_GIFLIB - help - This enables the loader code that loads gif files using - giflib. - config BR2_PACKAGE_EFL_TIFF bool "libevas tiff loader" select BR2_PACKAGE_TIFF @@ -288,6 +267,7 @@ config BR2_PACKAGE_EFL_LIBRAW config BR2_PACKAGE_EFL_SVG bool "SVG loader" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG @@ -296,6 +276,7 @@ config BR2_PACKAGE_EFL_SVG This option enables the Evas generic SVG loader comment "SVG loader needs a toolchain w/ gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/efl/efl.hash b/buildroot/package/efl/efl.hash index c60495418..11e69633b 100644 --- a/buildroot/package/efl/efl.hash +++ b/buildroot/package/efl/efl.hash @@ -1,11 +1,13 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz.sha256 -sha256 7e7a4199b1e90d400dab2491db6032f8e0b26bab65ec19c9f8a97a82394331c8 efl-1.22.3.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.25.0.tar.xz.sha256sum +sha256 53941f910daf5d1b5162bfdb0dc66f1a04e55a0f2dd7760da0ad63713370956e efl-1.25.0.tar.xz -sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE -sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING -sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD -sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL -sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL -sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT -sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL +sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE +sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING +sha256 e5133b4034a4749a781e2220ffb230b60a282b88861f1124d69a58abd5143994 COPYING.images +sha256 c95bae1d1ce0235ecccd3560b772ec1efb97f348a79f0fbe0a634f0c2ccefe2c licenses/COPYING.ASL +sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD +sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL +sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL +sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT +sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL diff --git a/buildroot/package/efl/efl.mk b/buildroot/package/efl/efl.mk index d8364ed76..d77cb3092 100644 --- a/buildroot/package/efl/efl.mk +++ b/buildroot/package/efl/efl.mk @@ -4,13 +4,15 @@ # ################################################################################ -EFL_VERSION = 1.22.3 +EFL_VERSION = 1.25.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ COPYING \ + COPYING.images \ + licenses/COPYING.ASL \ licenses/COPYING.BSD \ licenses/COPYING.FTL \ licenses/COPYING.GPL \ @@ -21,157 +23,146 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - jpeg luajit lz4 zlib + giflib jpeg libpng luajit lz4 zlib $(TARGET_NLS_DEPENDENCIES) # Configure options: -# --disable-lua-old: build elua for the target. -# --disable-sdl: disable sdl2 support. -# --disable-spectre: disable spectre image loader. -# --disable-xinput22: disable X11 XInput v2.2+ support. -# --disable-vnc-server: remove libvncserver dependency. -# --enable-liblz4: use liblz4 from lz4 package. -# --with-net-control=none: disable connman networkmanager. -# --with-doxygen: disable doxygen documentation +# elua=true: build elua for the target. +# sdl=false: disable sdl2 support. +# embedded-lz4=false: use liblz4 from lz4 package. +# native-arch-optimization=false: avoid optimization flags added by meson. +# network-backend=none: disable connman networkmanager. EFL_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/bin/eet \ - --with-eldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \ - --with-elementary-codegen=$(HOST_DIR)/bin/elementary_codegen \ - --with-elm-prefs-cc=$(HOST_DIR)/bin/elm_prefs_cc \ - --with-elua=$(HOST_DIR)/bin/elua \ - --with-eolian-gen=$(HOST_DIR)/bin/eolian_gen \ - --disable-image-loader-jp2k \ - --with-net-control=none \ - --disable-lua-old \ - --disable-sdl \ - --disable-spectre \ - --disable-xinput22 \ - --disable-vnc-server \ - --enable-liblz4 \ - --with-doxygen=no + -Davahi=false \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Ddotnet=false \ + -Decore-imf-loaders-disabler=ibus,scim,xim \ + -Delua=true \ + -Dembedded-lz4=false \ + -Dlua-interpreter=luajit \ + -Dnative-arch-optimization=false \ + -Dnetwork-backend=none \ + -Dpixman=false \ + -Dsdl=false \ + -Dvnc-server=false + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +EFL_CONF_OPTS += -Dnls=true +else +EFL_CONF_OPTS += -Dnls=false +endif + +EFL_BINDINGS = lua ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -EFL_CONF_OPTS += --enable-cxx-bindings \ - --with-eolian-cxx=$(HOST_DIR)/bin/eolian_cxx -else -EFL_CONF_OPTS += --disable-cxx-bindings +EFL_BINDINGS += cxx endif +EFL_CONF_OPTS += -Dbindings=$(subst $(space),$(comma),$(EFL_BINDINGS)) + ifeq ($(BR2_PACKAGE_EFL_EEZE),y) EFL_DEPENDENCIES += udev -EFL_CONF_OPTS += --enable-libeeze +EFL_CONF_OPTS += -Deeze=true else -EFL_CONF_OPTS += --disable-libeeze +EFL_CONF_OPTS += -Deeze=false endif ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux -EFL_CONF_OPTS += --enable-libmount +EFL_CONF_OPTS += -Dlibmount=true else -EFL_CONF_OPTS += --disable-libmount +EFL_CONF_OPTS += -Dlibmount=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) -EFL_CONF_OPTS += --enable-systemd +EFL_CONF_OPTS += -Dsystemd=true EFL_DEPENDENCIES += systemd else -EFL_CONF_OPTS += --disable-systemd +EFL_CONF_OPTS += -Dsystemd=false endif ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -EFL_CONF_OPTS += --enable-fontconfig +EFL_CONF_OPTS += -Dfontconfig=true EFL_DEPENDENCIES += fontconfig else -EFL_CONF_OPTS += --disable-fontconfig +EFL_CONF_OPTS += -Dfontconfig=false endif ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -EFL_CONF_OPTS += --enable-fribidi +EFL_CONF_OPTS += -Dfribidi=true EFL_DEPENDENCIES += libfribidi else -EFL_CONF_OPTS += --disable-fribidi +EFL_CONF_OPTS += -Dfribidi=false endif ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) -EFL_CONF_OPTS += --enable-gstreamer1 +EFL_CONF_OPTS += -Dgstreamer=true EFL_DEPENDENCIES += gstreamer1 gst1-plugins-base else -EFL_CONF_OPTS += --disable-gstreamer1 +EFL_CONF_OPTS += -Dgstreamer=false endif ifeq ($(BR2_PACKAGE_BULLET),y) -EFL_CONF_OPTS += --enable-physics +EFL_CONF_OPTS += -Dphysics=true EFL_DEPENDENCIES += bullet else -EFL_CONF_OPTS += --disable-physics +EFL_CONF_OPTS += -Dphysics=false endif ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -EFL_CONF_OPTS += --enable-audio +EFL_CONF_OPTS += -Daudio=true EFL_DEPENDENCIES += libsndfile else -EFL_CONF_OPTS += --disable-audio +EFL_CONF_OPTS += -Daudio=false endif ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -EFL_CONF_OPTS += --enable-pulseaudio +EFL_CONF_OPTS += -Dpulseaudio=true EFL_DEPENDENCIES += pulseaudio else -EFL_CONF_OPTS += --disable-pulseaudio +EFL_CONF_OPTS += -Dpulseaudio=false endif ifeq ($(BR2_PACKAGE_HARFBUZZ),y) EFL_DEPENDENCIES += harfbuzz -EFL_CONF_OPTS += --enable-harfbuzz +EFL_CONF_OPTS += -Dharfbuzz=true else -EFL_CONF_OPTS += --disable-harfbuzz +EFL_CONF_OPTS += -Dharfbuzz=false endif ifeq ($(BR2_PACKAGE_TSLIB),y) EFL_DEPENDENCIES += tslib -EFL_CONF_OPTS += --enable-tslib +EFL_CONF_OPTS += -Dtslib=true else -EFL_CONF_OPTS += --disable-tslib +EFL_CONF_OPTS += -Dtslib=false endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) EFL_DEPENDENCIES += libglib2 -EFL_CONF_OPTS += --with-glib=yes +EFL_CONF_OPTS += -Dglib=true else -EFL_CONF_OPTS += --with-glib=no +EFL_CONF_OPTS += -Dglib=false endif # Prefer openssl (the default) over gnutls. ifeq ($(BR2_PACKAGE_OPENSSL),y) EFL_DEPENDENCIES += openssl -EFL_CONF_OPTS += --with-crypto=openssl -else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) +EFL_CONF_OPTS += -Dcrypto=openssl +else EFL_DEPENDENCIES += gnutls libgcrypt -EFL_CONF_OPTS += --with-crypto=gnutls \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -EFL_CONF_OPTS += --with-crypto=none -endif # BR2_PACKAGE_OPENSSL - -ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) -EFL_CONF_OPTS += --enable-elput -EFL_DEPENDENCIES += libinput -else -EFL_CONF_OPTS += --disable-elput +EFL_CONF_OPTS += -Dcrypto=gnutls endif ifeq ($(BR2_PACKAGE_EFL_FB),y) -EFL_CONF_OPTS += --enable-fb +EFL_CONF_OPTS += -Dfb=true else -EFL_CONF_OPTS += --disable-fb +EFL_CONF_OPTS += -Dfb=false endif ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y) -EFL_CONF_OPTS += \ - --with-x11=xlib \ - --with-x=$(STAGING_DIR) \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib +EFL_CONF_OPTS += -Dx11=true \ + -Dxinput2=true \ + -Dxinput22=true EFL_DEPENDENCIES += \ xlib_libX11 \ @@ -185,100 +176,82 @@ EFL_DEPENDENCIES += \ xlib_libXScrnSaver \ xlib_libXtst else -EFL_CONF_OPTS += --with-x11=none +EFL_CONF_OPTS += -Dx11=false endif ifeq ($(BR2_PACKAGE_EFL_OPENGL),y) -EFL_CONF_OPTS += --with-opengl=full +EFL_CONF_OPTS += -Dopengl=full EFL_DEPENDENCIES += libgl # OpenGL ES requires EGL else ifeq ($(BR2_PACKAGE_EFL_OPENGLES),y) -EFL_CONF_OPTS += --with-opengl=es --enable-egl +EFL_CONF_OPTS += -Dopengl=es-egl EFL_DEPENDENCIES += libegl libgles else ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y) -EFL_CONF_OPTS += --with-opengl=none +EFL_CONF_OPTS += -Dopengl=none endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) -EFL_CONF_OPTS += --enable-drm -EFL_DEPENDENCIES += libdrm libegl mesa3d +EFL_CONF_OPTS += -Ddrm=true +EFL_DEPENDENCIES += libdrm libegl libinput mesa3d else -EFL_CONF_OPTS += --disable-drm +EFL_CONF_OPTS += -Ddrm=false endif -# The EFL Wayland support requires Evas GLES DRM engine support -# which depends on wayland-client to build. -# So enable gl_drm only when wayland support is selected. ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y) EFL_DEPENDENCIES += wayland wayland-protocols -EFL_CONF_OPTS += --enable-wayland --enable-gl-drm +EFL_CONF_OPTS += -Dwl=true else -EFL_CONF_OPTS += --disable-wayland --disable-gl-drm +EFL_CONF_OPTS += -Dwl=false endif EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) -# Loaders that need external dependencies needs to be --enable-XXX=yes -# otherwise the default is '=static'. -# All other loaders are statically built-in -ifeq ($(BR2_PACKAGE_EFL_PNG),y) -EFL_CONF_OPTS += --enable-image-loader-png=yes -EFL_DEPENDENCIES += libpng -else -EFL_CONF_OPTS += --disable-image-loader-png -endif +# json evas loader is disabled by default by upstream. +# Disable libspectre (ps). +# Keep all other evas loader enabled or handled below. +EFL_EVAS_LOADERS_DISABLER = avif gst json ps -ifeq ($(BR2_PACKAGE_EFL_JPEG),y) -EFL_CONF_OPTS += --enable-image-loader-jpeg=yes # efl already depends on jpeg. +ifeq ($(BR2_PACKAGE_EFL_JPEG),y) +EFL_DEPENDENCIES += openjpeg else -EFL_CONF_OPTS += --disable-image-loader-jpeg -endif - -ifeq ($(BR2_PACKAGE_EFL_GIF),y) -EFL_CONF_OPTS += --enable-image-loader-gif=yes -EFL_DEPENDENCIES += giflib -else -EFL_CONF_OPTS += --disable-image-loader-gif +EFL_EVAS_LOADERS_DISABLER += jp2k endif ifeq ($(BR2_PACKAGE_EFL_TIFF),y) -EFL_CONF_OPTS += --enable-image-loader-tiff=yes EFL_DEPENDENCIES += tiff else -EFL_CONF_OPTS += --disable-image-loader-tiff +EFL_EVAS_LOADERS_DISABLER += tiff endif ifeq ($(BR2_PACKAGE_EFL_WEBP),y) -EFL_CONF_OPTS += --enable-image-loader-webp=yes EFL_DEPENDENCIES += webp else -EFL_CONF_OPTS += --disable-image-loader-webp +EFL_EVAS_LOADERS_DISABLER += webp endif ifeq ($(BR2_PACKAGE_POPPLER),y) # poppler needs c++11 EFL_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" EFL_DEPENDENCIES += poppler -EFL_CONF_OPTS += --enable-poppler else -EFL_CONF_OPTS += --disable-poppler +EFL_EVAS_LOADERS_DISABLER += pdf endif ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y) EFL_DEPENDENCIES += libraw -EFL_CONF_OPTS += --enable-libraw else -EFL_CONF_OPTS += --disable-libraw +EFL_EVAS_LOADERS_DISABLER += raw endif ifeq ($(BR2_PACKAGE_EFL_SVG),y) EFL_DEPENDENCIES += librsvg cairo -EFL_CONF_OPTS += --enable-librsvg else -EFL_CONF_OPTS += --disable-librsvg +EFL_EVAS_LOADERS_DISABLER += rsvg endif +EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(EFL_EVAS_LOADERS_DISABLER)) + ifeq ($(BR2_PACKAGE_UPOWER),) # upower ecore system module is only useful if upower # dbus service is available. @@ -295,7 +268,7 @@ ifeq ($(BR2_PACKAGE_LIBUNWIND),y) EFL_DEPENDENCIES += libunwind endif -$(eval $(autotools-package)) +$(eval $(meson-package)) ################################################################################ # @@ -311,73 +284,76 @@ $(eval $(autotools-package)) # * host-dbus: for Eldbus # * host-freetype: for libevas # * host-libglib2: for libecore -# * host-libjpeg, host-libpng: for libevas image loader +# * host-giflib, host-libjpeg, host-libpng: for libevas image loader # * host-luajit for Elua tool for the host +# * host-openssl: cryptography backends. HOST_EFL_DEPENDENCIES = \ host-pkgconf \ host-dbus \ host-freetype \ + host-giflib \ host-libglib2 \ host-libjpeg \ host-libpng \ host-luajit \ + host-openssl \ host-zlib # Configure options: -# --disable-audio, --disable-multisense remove libsndfile dependency. -# --disable-fontconfig: remove dependency on fontconfig. -# --disable-fribidi: remove dependency on libfribidi. -# --disable-gstreamer1: remove dependency on gtreamer 1.0. -# --disable-libeeze: remove libudev dependency. -# --disable-libmount: remove dependency on host-util-linux libmount. -# --disable-lua-old: build elua for the host. -# --disable-physics: remove Bullet dependency. -# --disable-poppler: disable poppler image loader. -# --disable-spectre: disable spectre image loader. -# --disable-systemd: disable systemd dependency. -# --disable-vnc-server: remove libvncserver dependency. -# --enable-image-loader-gif=no: disable Gif dependency. -# --enable-image-loader-tiff=no: disable Tiff dependency. -# --with-crypto=none: remove dependencies on openssl or gnutls. -# --with-doxygen: disable doxygen documentation -# --with-net-control=none: disable connman networkmanager. -# --with-x11=none: remove dependency on X.org. +# audio=false: remove libsndfile dependency. +# eeze=false: remove libudev dependency. +# libmount=false: remove dependency on host-util-linux libmount. +# elua=true: build elua for the host. +# physics=false: remove Bullet dependency. +# network-backend=none: remove network-backend (connman). +# embedded-lz4=true: use lz4 bundled in efl. HOST_EFL_CONF_OPTS += \ - --disable-audio \ - --disable-fontconfig \ - --disable-fribidi \ - --disable-gstreamer1 \ - --disable-libeeze \ - --disable-libmount \ - --disable-libraw \ - --disable-librsvg \ - --disable-lua-old \ - --disable-multisense \ - --disable-physics \ - --disable-poppler \ - --disable-spectre \ - --disable-systemd \ - --disable-xcf \ - --disable-vnc-server \ - --enable-image-loader-gif=no \ - --enable-image-loader-jpeg=yes \ - --enable-image-loader-png=yes \ - --enable-image-loader-tiff=no \ - --with-crypto=none \ - --with-doxygen=no \ - --with-glib=yes \ - --with-net-control=none \ - --with-opengl=none \ - --with-x11=none + -Daudio=false \ + -Davahi=false \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dcrypto=openssl \ + -Ddotnet=false \ + -Decore-imf-loaders-disabler=ibus,scim,xim \ + -Dedje-sound-and-video=false \ + -Deeze=false \ + -Delua=true \ + -Dembedded-lz4=true \ + -Dfontconfig=false \ + -Dfribidi=false \ + -Dglib=true \ + -Dgstreamer=false \ + -Dharfbuzz=false \ + -Dlibmount=false \ + -Dlua-interpreter=luajit \ + -Dnetwork-backend=none \ + -Dnls=false \ + -Dopengl=none \ + -Dphysics=false \ + -Dpixman=false \ + -Dpulseaudio=false \ + -Dsdl=false \ + -Dsystemd=false \ + -Dv4l2=false \ + -Dvnc-server=false \ + -Dx11=false \ + -Dxinput22=false + +# List of modular image/vector loaders to disable in efl +HOST_EFL_EVAS_LOADERS_DISABLER = avif bmp dds eet generic gst ico json \ + jp2k pdf pmaps ps psd raw rsvg tga tgv tiff wbmp webp xcf xpm + +HOST_EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(HOST_EFL_EVAS_LOADERS_DISABLER)) + +HOST_EFL_BINDINGS = lua # Enable Eolian language bindings to provide eolian_cxx tool for the # host which is required to build Eolian language bindings for the # target. ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -HOST_EFL_CONF_OPTS += --enable-cxx-bindings -else -HOST_EFL_CONF_OPTS += --disable-cxx-bindings +HOST_EFL_BINDINGS += cxx endif +HOST_EFL_CONF_OPTS += -Dbindings=$(subst $(space),$(comma),$(HOST_EFL_BINDINGS)) # Always disable upower system module from host as it's # not useful and would try to use the output/host/var @@ -388,4 +364,4 @@ define HOST_EFL_HOOK_REMOVE_UPOWER endef HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER -$(eval $(host-autotools-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/eigen/Config.in b/buildroot/package/eigen/Config.in index 48752e0c8..ef0a16f2f 100644 --- a/buildroot/package/eigen/Config.in +++ b/buildroot/package/eigen/Config.in @@ -13,13 +13,5 @@ config BR2_PACKAGE_EIGEN http://eigen.tuxfamily.org/ -if BR2_PACKAGE_EIGEN - -config BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES - bool "unsupported modules" - help - Install eigen unsupported modules -endif - comment "eigen needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/eigen/eigen.hash b/buildroot/package/eigen/eigen.hash index e5c840402..5ec561ad1 100644 --- a/buildroot/package/eigen/eigen.hash +++ b/buildroot/package/eigen/eigen.hash @@ -1,8 +1,8 @@ # Locally computed -sha256 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce 3.3.7.tar.bz2 -sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 COPYING.MPL2 -sha256 c83230b770f17ef1386ea1fd3681271dd98aa93646bdbfb5bff3a1b7050fff9d COPYING.README +sha256 685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11 eigen-3.3.7.tar.bz2 +sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 COPYING.MPL2 +sha256 c83230b770f17ef1386ea1fd3681271dd98aa93646bdbfb5bff3a1b7050fff9d COPYING.README diff --git a/buildroot/package/eigen/eigen.mk b/buildroot/package/eigen/eigen.mk index 5c9e02844..164548971 100644 --- a/buildroot/package/eigen/eigen.mk +++ b/buildroot/package/eigen/eigen.mk @@ -5,38 +5,16 @@ ################################################################################ EIGEN_VERSION = 3.3.7 -EIGEN_SOURCE = $(EIGEN_VERSION).tar.bz2 -EIGEN_SITE = https://bitbucket.org/eigen/eigen/get +EIGEN_SOURCE = eigen-$(EIGEN_VERSION).tar.bz2 +EIGEN_SITE = https://gitlab.com/libeigen/eigen/-/archive/$(EIGEN_VERSION) EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README EIGEN_INSTALL_STAGING = YES EIGEN_INSTALL_TARGET = NO -EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3 +EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO -ifeq ($(BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES),y) -define EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS - mkdir -p $(EIGEN_DEST_DIR)/unsupported - cp -a $(@D)/unsupported/Eigen $(EIGEN_DEST_DIR)/unsupported -endef -endif +# Default Eigen CMake installs .pc file in /usr/share/pkgconfig +# change it to /usr/lib/pkgconfig, to be consistent with other packages. +EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig -# Generate the .pc file at build time -define EIGEN_BUILD_CMDS - sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \ - -e 's,^Cflags: .*,Cflags: -I$$\{prefix\}/include/eigen3,' \ - -e 's,^prefix.*,prefix=/usr,' \ - $(@D)/eigen3.pc.in >$(@D)/eigen3.pc -endef - -# This package only consists of headers that need to be -# copied over to the sysroot for compile time use -define EIGEN_INSTALL_STAGING_CMDS - $(RM) -r $(EIGEN_DEST_DIR) - mkdir -p $(EIGEN_DEST_DIR) - cp -a $(@D)/Eigen $(EIGEN_DEST_DIR) - $(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS) - $(INSTALL) -D -m 0644 $(@D)/eigen3.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/eigen3.pc -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch b/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch index 36bd46217..7b3c45932 100644 --- a/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch +++ b/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch @@ -27,29 +27,28 @@ diff --git a/Makefile.am b/Makefile.am index 2ff444e7bf1d..70443abb4fb6 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory - +@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory + pkginclude_HEADERS = version.h - + +if ENABLE_PROGS +PROGS_SUBDIR = src +endif + - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ -- backends src po tests -+ backends $(PROGS_SUBDIR) po tests - + SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \ +- libasm debuginfod src po doc tests ++ libasm debuginfod $(PROGS_SUBDIR) po doc tests + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/configure.ac b/configure.ac index c2c1d90b2133..7b4c38381cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -345,6 +345,12 @@ AC_SUBST([LIBEBL_SUBDIR]) - AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") - AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) - +@@ -390,6 +390,12 @@ + [tests_use_rpath=$enableval], [tests_use_rpath=no]) + AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + +AC_ARG_ENABLE([progs], + AS_HELP_STRING([--enable-progs], [enable progs]), + enable_progs=$enableval, @@ -59,6 +58,6 @@ index c2c1d90b2133..7b4c38381cca 100644 dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= --- +-- 2.11.0 diff --git a/buildroot/package/elfutils/Config.in b/buildroot/package/elfutils/Config.in index f094e7b86..5f45de14a 100644 --- a/buildroot/package/elfutils/Config.in +++ b/buildroot/package/elfutils/Config.in @@ -1,11 +1,13 @@ -comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) config BR2_PACKAGE_ELFUTILS bool "elfutils" depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS # Only glibc and uClibc implement the myriad of required GNUisms depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB diff --git a/buildroot/package/elfutils/elfutils.hash b/buildroot/package/elfutils/elfutils.hash index d8a1ce391..65ee764bc 100644 --- a/buildroot/package/elfutils/elfutils.hash +++ b/buildroot/package/elfutils/elfutils.hash @@ -1,8 +1,6 @@ -# From https://sourceware.org/elfutils/ftp/0.177/md5.sum -md5 0b583722f911e1632544718d502aab87 elfutils-0.177.tar.bz2 -# From https://sourceware.org/elfutils/ftp/0.177/sha512.sum -sha512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f elfutils-0.177.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.181/sha512.sum +sha512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36 elfutils-0.181.tar.bz2 # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3 diff --git a/buildroot/package/elfutils/elfutils.mk b/buildroot/package/elfutils/elfutils.mk index c3df7303b..3d37c4634 100644 --- a/buildroot/package/elfutils/elfutils.mk +++ b/buildroot/package/elfutils/elfutils.mk @@ -4,14 +4,14 @@ # ################################################################################ -ELFUTILS_VERSION = 0.177 +ELFUTILS_VERSION = 0.181 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz +ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) +HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz # We patch configure.ac ELFUTILS_AUTORECONF = YES @@ -48,6 +48,10 @@ ELFUTILS_DEPENDENCIES += musl-fts ELFUTILS_LDFLAGS += -lfts endif +# disable for now, needs "distro" support +ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod +HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod + ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" diff --git a/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch b/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch deleted file mode 100644 index f64e3d9a8..000000000 --- a/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3ca3044859f40d7c595daf0a93393352e4999fb7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 30 May 2019 23:46:27 +0200 -Subject: [PATCH] ell/ecc.h: fix build with uclibc - -ssize_t is defined in sys/types.h - -Fixes: - - http://autobuild.buildroot.org/results/444c9deb728fb041e560d940145f96cc4f455080 - -Signed-off-by: Fabrice Fontaine ---- - ell/ecc.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ell/ecc.h b/ell/ecc.h -index 26a5889..65c49e8 100644 ---- a/ell/ecc.h -+++ b/ell/ecc.h -@@ -27,6 +27,8 @@ - extern "C" { - #endif - -+#include // for ssize_t -+ - #define L_ECC_MAX_DIGITS 6 - #define L_ECC_SCALAR_MAX_BYTES L_ECC_MAX_DIGITS * 8 - #define L_ECC_POINT_MAX_BYTES L_ECC_SCALAR_MAX_BYTES * 2 --- -2.20.1 - diff --git a/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch b/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch new file mode 100644 index 000000000..ba6cafa7a --- /dev/null +++ b/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch @@ -0,0 +1,68 @@ +From 60b4cd4c703be380aef194d31a1ffc4b42431bde Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 9 Apr 2020 22:21:36 +0200 +Subject: [PATCH] ell/rtnl: fix compile with older toolchains + +Older toolchains need to include sys/types.h and sys/socket.h before +linux/if.h, RTA_PREF was introduces with linux-4.1.x. + +Fixes: + + In file included from ell/rtnl.c:28:0: + .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:185:19: error: field 'ifru_addr' has incomplete type + .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:186:19: error: field 'ifru_dstaddr' has incomplete type + .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:187:19: error: field 'ifru_broadaddr' has incomplete type + .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:188:19: error: field 'ifru_netmask' has incomplete type + .../arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:189:20: error: field 'ifru_hwaddr' has incomplete type + ell/rtnl.c: In function 'l_rtnl_route_extract': + ell/rtnl.c:120:8: error: 'RTA_PREF' undeclared (first use in this function) + +[Upstream: https://lists.ofono.org/hyperkitty/list/ell@lists.01.org/thread/TOJ5XEY7X6WMOMJHX4KWI5LFEOX2QTBQ] +Signed-off-by: Peter Seiderer +--- + configure.ac | 2 ++ + ell/rtnl.c | 7 ++++++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0351f89..3be35a4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -113,6 +113,8 @@ AC_CHECK_LIB(dl, dlopen, dummy=yes, + + AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) + ++AC_CHECK_DECLS([RTA_PREF], [], [], [[#include ]]) ++ + AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], + [enable ell/glib main loop example]), + [enable_glib=${enableval}]) +diff --git a/ell/rtnl.c b/ell/rtnl.c +index dc83937..3493d34 100644 +--- a/ell/rtnl.c ++++ b/ell/rtnl.c +@@ -25,8 +25,9 @@ + #endif + + #define _GNU_SOURCE +-#include ++#include + #include ++#include + #include + + #include "util.h" +@@ -35,6 +36,10 @@ + #include "rtnl.h" + #include "private.h" + ++#if defined HAVE_DECL_RTA_PREF && !HAVE_DECL_RTA_PREF ++#define RTA_PREF 20 ++#endif ++ + static size_t rta_add_u8(void *rta_buf, unsigned short type, uint8_t value) + { + struct rtattr *rta = rta_buf; +-- +2.26.0 + diff --git a/buildroot/package/ell/Config.in b/buildroot/package/ell/Config.in index f27d581f9..d33715487 100644 --- a/buildroot/package/ell/Config.in +++ b/buildroot/package/ell/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_ELL bool "ell" depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR help @@ -8,6 +9,7 @@ config BR2_PACKAGE_ELL https://01.org/ell -comment "ell needs a toolchain w/ dynamic library, wchar" +comment "ell needs a toolchain w/ dynamic library, wchar, headers >= 4.12" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/buildroot/package/ell/ell.hash b/buildroot/package/ell/ell.hash index 02e6e27b5..43324e658 100644 --- a/buildroot/package/ell/ell.hash +++ b/buildroot/package/ell/ell.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 b6a4b46807391ea69f9271074cc778aa74263af2bea3f797ab0c092e8dedd21f ell-0.24.tar.gz +sha256 fc3fd66739008fabf4b62f8bc1b37110cc44b9e8233c34f8d991939d0e0247b6 ell-0.33.tar.gz # License files -sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/ell/ell.mk b/buildroot/package/ell/ell.mk index 6cafdd73d..f35c02250 100644 --- a/buildroot/package/ell/ell.mk +++ b/buildroot/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.24 +ELL_VERSION = 0.33 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git ELL_SITE_METHOD = git ELL_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/empty/empty.hash b/buildroot/package/empty/empty.hash index 47e957707..c5fbc2b4a 100644 --- a/buildroot/package/empty/empty.hash +++ b/buildroot/package/empty/empty.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 empty-0.6.20b.tgz +sha256 2fccd0faa1b3deaec1add679cbde3f34250e45872ad5df463badd4bb4edeb797 empty-0.6.21b.tgz sha256 f01dbe3c624084900b9df1393d9062518b2bc0487acd6a3300ebd6e71352d112 COPYRIGHT diff --git a/buildroot/package/empty/empty.mk b/buildroot/package/empty/empty.mk index 5e3ed42be..a9b8080a8 100644 --- a/buildroot/package/empty/empty.mk +++ b/buildroot/package/empty/empty.mk @@ -4,11 +4,12 @@ # ################################################################################ -EMPTY_VERSION = 0.6.20b +EMPTY_VERSION = 0.6.21b EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) EMPTY_LICENSE = BSD-3-Clause EMPTY_LICENSE_FILES = COPYRIGHT +EMPTY_STRIP_COMPONENTS = 0 define EMPTY_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all diff --git a/buildroot/package/enchant/Config.in b/buildroot/package/enchant/Config.in index 86b2fade8..4a39d03f8 100644 --- a/buildroot/package/enchant/Config.in +++ b/buildroot/package/enchant/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_ENCHANT Enchant is a spell-checking library that provides a consistent API across a number of spell-checking system backends. - http://www.abisource.com/projects/enchant/ + https://abiword.github.io/enchant/ comment "enchant needs a toolchain w/ C++, threads, wchar" depends on BR2_USE_MMU diff --git a/buildroot/package/enchant/enchant.hash b/buildroot/package/enchant/enchant.hash index f5709f08e..84d738ffa 100644 --- a/buildroot/package/enchant/enchant.hash +++ b/buildroot/package/enchant/enchant.hash @@ -1,4 +1,3 @@ -# From http://www.abisource.com/downloads/enchant/1.6.0/MD5SUM -md5 de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz # locally computed -sha256 d0db934167997c8b8c863af297b3653aa98500bca0a7c05e9c6ec0dabf4f67d4 COPYING.LIB +sha256 a29c5777c4e45fcac2595c15c49d6d2aa434fa5e7c993dff3f9f367b65fe472a enchant-2.2.11.tar.gz +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING.LIB diff --git a/buildroot/package/enchant/enchant.mk b/buildroot/package/enchant/enchant.mk index 69402c1af..c342600bd 100644 --- a/buildroot/package/enchant/enchant.mk +++ b/buildroot/package/enchant/enchant.mk @@ -4,8 +4,9 @@ # ################################################################################ -ENCHANT_VERSION = 1.6.0 -ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION) +ENCHANT_VERSION = 2.2.11 +ENCHANT_SITE = \ + https://github.com/AbiWord/enchant/releases/download/v$(ENCHANT_VERSION) ENCHANT_INSTALL_STAGING = YES ENCHANT_DEPENDENCIES = libglib2 host-pkgconf ENCHANT_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/enlightenment/Config.in b/buildroot/package/enlightenment/Config.in index 2cd6512e1..91cdd896f 100644 --- a/buildroot/package/enlightenment/Config.in +++ b/buildroot/package/enlightenment/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ENLIGHTENMENT bool "enlightenment" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # efl svg -> librsvg # libevas-generic-loaders-svg -> librsvg -> glib2 / pango depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP @@ -17,7 +18,6 @@ config BR2_PACKAGE_ENLIGHTENMENT select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start - select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_SVG select BR2_PACKAGE_XCB_UTIL_KEYSYMS help @@ -30,6 +30,7 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ diff --git a/buildroot/package/enlightenment/enlightenment.hash b/buildroot/package/enlightenment/enlightenment.hash index f692a67aa..7f0f3f3e7 100644 --- a/buildroot/package/enlightenment/enlightenment.hash +++ b/buildroot/package/enlightenment/enlightenment.hash @@ -1,3 +1,4 @@ -# From https://www.enlightenment.org/news/e23_release -sha256 b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8 enlightenment-0.23.0.tar.xz -sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING +# From https://www.enlightenment.org/news/e24.2 +sha256 be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 enlightenment-0.24.2.tar.xz +sha256 17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a COPYING +sha256 f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/buildroot/package/enlightenment/enlightenment.mk b/buildroot/package/enlightenment/enlightenment.mk index 43f79d59d..12827964e 100644 --- a/buildroot/package/enlightenment/enlightenment.mk +++ b/buildroot/package/enlightenment/enlightenment.mk @@ -4,11 +4,12 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.23.0 +ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment -ENLIGHTENMENT_LICENSE = BSD-2-Clause -ENLIGHTENMENT_LICENSE_FILES = COPYING +ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) +ENLIGHTENMENT_LICENSE_FILES = COPYING \ + src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ @@ -20,7 +21,8 @@ ENLIGHTENMENT_CONF_OPTS = \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ -Deet=$(HOST_DIR)/bin/eet \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ - -Dpam=false + -Dpam=false \ + -Dpolkit=false # enlightenment.pc and /usr/lib/enlightenment/modules/*.so ENLIGHTENMENT_INSTALL_STAGING = YES diff --git a/buildroot/package/environment-setup/Config.in.host b/buildroot/package/environment-setup/Config.in.host new file mode 100644 index 000000000..c67e37573 --- /dev/null +++ b/buildroot/package/environment-setup/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_ENVIRONMENT_SETUP + bool "host environment-setup" + help + Install an helper script to setup a build environment + based on Buildroot. It's useful when you export an sdk + and want to use Buildroot to build an external project. diff --git a/buildroot/package/environment-setup/environment-setup b/buildroot/package/environment-setup/environment-setup new file mode 100644 index 000000000..813aa01c7 --- /dev/null +++ b/buildroot/package/environment-setup/environment-setup @@ -0,0 +1,18 @@ +cat <<'EOF' + _ _ _ _ _ +| |__ _ _(_) | __| |_ __ ___ ___ | |_ +| '_ \| | | | | |/ _` | '__/ _ \ / _ \| __| +| |_) | |_| | | | (_| | | | (_) | (_) | |_ +|_.__/ \__,_|_|_|\__,_|_| \___/ \___/ \__| + + Making embedded Linux easy! + +Some tips: +* PATH now contains the SDK utilities +* Standard autotools variables (CC, LD, CFLAGS) are exported +* To configure do "./configure $CONFIGURE_FLAGS" or use + the "configure" alias +* To build CMake-based projects, use the "cmake" alias + +EOF +SDK_PATH=$(dirname $(realpath "${BASH_SOURCE[0]}")) diff --git a/buildroot/package/environment-setup/environment-setup.mk b/buildroot/package/environment-setup/environment-setup.mk new file mode 100644 index 000000000..fb87c6f0b --- /dev/null +++ b/buildroot/package/environment-setup/environment-setup.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# environment-setup +# +################################################################################ + +ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup + +define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS + cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) + for var in $(TARGET_CONFIGURE_OPTS); do \ + printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ + done + printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) + printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --program-prefix=\"\n" >> $(ENVIRONMENT_SETUP_FILE) + printf "alias configure=\"./configure \$${CONFIGURE_FLAGS}\"\n" \ + >> $(ENVIRONMENT_SETUP_FILE) + printf "alias cmake=\"cmake \ + -DCMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake \ + -DCMAKE_INSTALL_PREFIX=/usr\"\n" >> $(ENVIRONMENT_SETUP_FILE) + $(SED) 's%$(HOST_DIR)%\$$SDK_PATH%g' \ + -e 's%$(HOST_DIR)/bin/%%g' \ + -e '/^export "PATH=/c\' \ + $(ENVIRONMENT_SETUP_FILE) + printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \ + >> $(ENVIRONMENT_SETUP_FILE) +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/erofs-utils/Config.in b/buildroot/package/erofs-utils/Config.in new file mode 100644 index 000000000..ffb2a891d --- /dev/null +++ b/buildroot/package/erofs-utils/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_EROFS_UTILS + bool "erofs-utils" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Userspace utilities for EROFS filesystem + + https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git + +if BR2_PACKAGE_EROFS_UTILS + +config BR2_PACKAGE_EROFS_UTILS_LZ4 + bool "lz4 support" + select BR2_PACKAGE_LZ4 + help + Support LZ4 compression algorithm + +endif diff --git a/buildroot/package/erofs-utils/Config.in.host b/buildroot/package/erofs-utils/Config.in.host new file mode 100644 index 000000000..c6fbc3888 --- /dev/null +++ b/buildroot/package/erofs-utils/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_EROFS_UTILS + bool "host erofs-utils" + select BR2_PACKAGE_HOST_UTIL_LINUX + help + Userspace utilities for EROFS filesystem + + https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git diff --git a/buildroot/package/erofs-utils/erofs-utils.hash b/buildroot/package/erofs-utils/erofs-utils.hash new file mode 100644 index 000000000..31624b181 --- /dev/null +++ b/buildroot/package/erofs-utils/erofs-utils.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 a14a30d0d941f6642cad130fbba70a2493fabbe7baa09a8ce7d20745ea3385d6 erofs-utils-1.1.tar.gz +sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/buildroot/package/erofs-utils/erofs-utils.mk b/buildroot/package/erofs-utils/erofs-utils.mk new file mode 100644 index 000000000..edc5288b1 --- /dev/null +++ b/buildroot/package/erofs-utils/erofs-utils.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# erofs-utils +# +################################################################################ + +EROFS_UTILS_VERSION = 1.1 +EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot +EROFS_UTILS_LICENSE = GPL-2.0+ +EROFS_UTILS_LICENSE_FILES = COPYING + +# From a git tree: no generated autotools files +EROFS_UTILS_AUTORECONF = YES + +EROFS_UTILS_DEPENDENCIES = host-pkgconf util-linux + +ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y) +EROFS_UTILS_DEPENDENCIES += lz4 +EROFS_UTILS_CONF_OPTS += --enable-lz4 +else +EROFS_UTILS_CONF_OPTS += --disable-lz4 +endif + +HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 +HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/ethtool/ethtool.hash b/buildroot/package/ethtool/ethtool.hash index 86c71d738..3c17fca51 100644 --- a/buildroot/package/ethtool/ethtool.hash +++ b/buildroot/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b ethtool-5.4.tar.xz +sha256 2f3b54d08d048f5977b80cb6cb4744994370def7553ee634d39dbbb6ccf87546 ethtool-5.8.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/buildroot/package/ethtool/ethtool.mk b/buildroot/package/ethtool/ethtool.mk index ce4f2d862..1668171f3 100644 --- a/buildroot/package/ethtool/ethtool.mk +++ b/buildroot/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.4 +ETHTOOL_VERSION = 5.8 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 @@ -12,4 +12,11 @@ ETHTOOL_LICENSE_FILES = LICENSE COPYING ETHTOOL_CONF_OPTS = \ $(if $(BR2_PACKAGE_ETHTOOL_PRETTY_PRINT),--enable-pretty-dump,--disable-pretty-dump) +ifeq ($(BR2_PACKAGE_LIBMNL),y) +ETHTOOL_DEPENDENCIES += host-pkgconf libmnl +ETHTOOL_CONF_OPTS += --enable-netlink +else +ETHTOOL_CONF_OPTS += --disable-netlink +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/eudev/Config.in b/buildroot/package/eudev/Config.in index b1d2f37a7..0e5bd0cee 100644 --- a/buildroot/package/eudev/Config.in +++ b/buildroot/package/eudev/Config.in @@ -5,7 +5,9 @@ config BR2_PACKAGE_EUDEV depends on BR2_USE_WCHAR # needs C99 compiler depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD help diff --git a/buildroot/package/eudev/eudev.mk b/buildroot/package/eudev/eudev.mk index 99b5befd0..d4133a5ac 100644 --- a/buildroot/package/eudev/eudev.mk +++ b/buildroot/package/eudev/eudev.mk @@ -18,7 +18,8 @@ EUDEV_CONF_OPTS = \ --enable-kmod \ --enable-blkid -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod +# eudev requires only the util-linux libraries at build time +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) @@ -48,11 +49,10 @@ define EUDEV_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev endef -# Required by default rules for input devices -define EUDEV_USERS - - - input -1 * - - - Input device group - - - render -1 * - - - DRI rendering nodes - - - kvm -1 * - - - kvm nodes +# Avoid installing S10udev with openrc, as the service is started by a unit +# from the udev-gentoo-scripts package. +define EUDEV_INSTALL_INIT_OPENRC + @: endef HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf diff --git a/buildroot/package/evemu/0002-evemu-Update-struct-input_event.patch b/buildroot/package/evemu/0002-evemu-Update-struct-input_event.patch new file mode 100644 index 000000000..50fabaf4d --- /dev/null +++ b/buildroot/package/evemu/0002-evemu-Update-struct-input_event.patch @@ -0,0 +1,110 @@ +From 30973c0bc053b2198cafb1899a0843688d5bb541 Mon Sep 17 00:00:00 2001 +From: Deepa Dinamani +Date: Mon, 15 Jan 2018 17:18:49 -0800 +Subject: [PATCH] evemu: Update struct input_event + +The struct input_event is not y2038 safe. +Update the struct according to the kernel patch: +https://lkml.org/lkml/2018/1/6/324 + +Signed-off-by: Deepa Dinamani +Signed-off-by: Peter Hutterer +[Retrieved from: +https://gitlab.freedesktop.org/libevdev/evemu/-/commit/30973c0bc053b2198cafb1899a0843688d5bb541] +Signed-off-by: Fabrice Fontaine +--- + src/evemu.c | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + +diff --git a/src/evemu.c b/src/evemu.c +index a8a949b..c7ff561 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -771,7 +771,7 @@ int evemu_write_event(FILE *fp, const struct input_event *ev) + { + int rc; + rc = fprintf(fp, "E: %lu.%06u %04x %04x %04d ", +- ev->time.tv_sec, (unsigned)ev->time.tv_usec, ++ ev->input_event_sec, (unsigned)ev->input_event_usec, + ev->type, ev->code, ev->value); + rc += write_event_desc(fp, ev); + return rc; +@@ -800,13 +800,19 @@ int evemu_record(FILE *fp, int fd, int ms) + if (ret < 0) + return ret; + if (ret == sizeof(ev)) { ++ struct timeval tv; + long time; + ++ tv.tv_sec = ev.input_event_sec; ++ tv.tv_usec = ev.input_event_usec; ++ + if (offset == 0) +- offset = time_to_long(&ev.time) - 1; ++ offset = time_to_long(&tv) - 1; + +- time = time_to_long(&ev.time); +- ev.time = long_to_time(time - offset); ++ time = time_to_long(&tv); ++ tv = long_to_time(time - offset); ++ ev.input_event_sec = tv.tv_sec; ++ ev.input_event_usec = tv.tv_usec; + evemu_write_event(fp, &ev); + fflush(fp); + } +@@ -839,8 +845,8 @@ int evemu_read_event(FILE *fp, struct input_event *ev) + return -1; + } + +- ev->time.tv_sec = sec; +- ev->time.tv_usec = usec; ++ ev->input_event_sec = sec; ++ ev->input_event_usec = usec; + ev->type = type; + ev->code = code; + ev->value = value; +@@ -852,8 +858,8 @@ out: + + int evemu_create_event(struct input_event *ev, int type, int code, int value) + { +- ev->time.tv_sec = 0; +- ev->time.tv_usec = 0; ++ ev->input_event_sec = 0; ++ ev->input_event_usec = 0; + ev->type = type; + ev->code = code; + ev->value = value; +@@ -873,6 +879,7 @@ static inline unsigned long us2s(unsigned long us) + int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + struct timeval *evtime) + { ++ struct timeval tv; + unsigned long usec; + const unsigned long ERROR_MARGIN = 150; /* µs */ + int ret; +@@ -882,14 +889,18 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + return ret; + + if (evtime) { +- if (evtime->tv_sec == 0 && evtime->tv_usec == 0) +- *evtime = ev->time; +- usec = time_to_long(&ev->time) - time_to_long(evtime); ++ if (evtime->tv_sec == 0 && evtime->tv_usec == 0) { ++ evtime->tv_sec = ev->input_event_sec; ++ evtime->tv_usec = ev->input_event_usec; ++ } ++ tv.tv_sec = ev->input_event_sec; ++ tv.tv_usec = ev->input_event_usec; ++ usec = time_to_long(&tv) - time_to_long(evtime); + if (usec > ERROR_MARGIN * 2) { + if (usec > s2us(10)) + error(INFO, "Sleeping for %lds.\n", us2s(usec)); + usleep(usec - ERROR_MARGIN); +- *evtime = ev->time; ++ *evtime = tv; + } + } + +-- +2.24.1 + diff --git a/buildroot/package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch b/buildroot/package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch new file mode 100644 index 000000000..55221aca2 --- /dev/null +++ b/buildroot/package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch @@ -0,0 +1,52 @@ +From fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 23 Mar 2020 11:04:11 +0100 +Subject: [PATCH] src/evemu.c: fix build with kernels >= 4.16 + +Commit 30973c0b forgot to update all occurences of input_event, this +will result in the following build failure with kernel >= 4.16: + +evemu.c: In function 'write_event_desc': +evemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'? + time = millis(&ev->time); + ^~~~ + type + +Fixes: + - http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb] +--- + src/evemu.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/evemu.c b/src/evemu.c +index c7ff561..42dbe1d 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -733,11 +733,6 @@ out: + return rc; + } + +-static inline unsigned long millis(const struct timeval *tv) +-{ +- return tv->tv_sec * 1000 + tv->tv_usec/1000; +-} +- + static int write_event_desc(FILE *fp, const struct input_event *ev) + { + int rc; +@@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev) + libevdev_event_code_get_name(ev->type, ev->code), + ev->value); + } else { +- time = millis(&ev->time); ++ time = ev->input_event_sec * 1000 + ev->input_event_usec/1000; + dt = time - last_ms; + last_ms = time; + rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n", +-- +2.24.1 + diff --git a/buildroot/package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch b/buildroot/package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch new file mode 100644 index 000000000..0ff3ee852 --- /dev/null +++ b/buildroot/package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch @@ -0,0 +1,47 @@ +From 1babf63444b7b7f3c84e2561fbdecd5fd5a0e36f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Mar 2020 09:06:29 +0100 +Subject: [PATCH] src/evemu.c: fix build with kernels < 4.16 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 30973c0b fixed the build with kernels >= 4.16 but as a side +effect, build with kernels < 4.16 is now failing on: + +evemu.c:892:18: error: ‘struct input_event’ has no member named ‘input_event_usec’ + tv.tv_usec = ev->input_event_usec; + ^~ + +Fix this error by defining input_event_sec and input_event_usec if +needed + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://gitlab.freedesktop.org/libevdev/evemu/-/commit/1babf63444b7b7f3c84e2561fbdecd5fd5a0e36f] +--- + src/evemu.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/evemu.c b/src/evemu.c +index 42dbe1d..2f457c1 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -63,6 +63,14 @@ + + #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#endif ++ ++#ifndef input_event_usec ++#define input_event_usec time.tv_usec ++#endif ++ + enum error_level { + INFO, + WARNING, +-- +2.24.1 + diff --git a/buildroot/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/buildroot/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 000000000..e39ccb641 --- /dev/null +++ b/buildroot/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,46 @@ +From 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 11:58:58 -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 + +Signed-off-by: Khem Raj +Signed-off-by: Baruch Siach +--- +Upstream status: commit 648f5c1a9e0 + + evtest.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/evtest.c b/evtest.c +index 548c203564d3..8d592f42bdca 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -61,6 +61,11 @@ + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define BITS_PER_LONG (sizeof(long) * 8) + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) + #define OFF(x) ((x)%BITS_PER_LONG) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) + type = ev[i].type; + code = ev[i].code; + +- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); ++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec); + + if (type == EV_SYN) { + if (code == SYN_MT_REPORT) +-- +2.25.1 + diff --git a/buildroot/package/execline/execline.hash b/buildroot/package/execline/execline.hash index cef4959bd..ac6239e86 100644 --- a/buildroot/package/execline/execline.hash +++ b/buildroot/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 05205c6869ae65a51c63d0e805572573806f6474aa21e12c49dd5654d3ceed33 execline-2.5.3.0.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 a24c76f097ff44fe50b63b89bcde5d6ba9a481aecddbe88ee01b0e5a7b314556 execline-2.6.1.0.tar.gz +sha256 5443ac67e8d74ac614ced7bc64211ce90ccedb7778a68bfe9e68a8b234c9503e COPYING diff --git a/buildroot/package/execline/execline.mk b/buildroot/package/execline/execline.mk index 74ad91e4a..e2423e953 100644 --- a/buildroot/package/execline/execline.mk +++ b/buildroot/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.5.3.0 +EXECLINE_VERSION = 2.6.1.0 EXECLINE_SITE = http://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING diff --git a/buildroot/package/exempi/exempi.hash b/buildroot/package/exempi/exempi.hash index e8b71a483..5ea968305 100644 --- a/buildroot/package/exempi/exempi.hash +++ b/buildroot/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 100b3d5b1b3370bc2e31c0978991716c4a4478246a2ac2df6382054a0ae89bc8 exempi-2.5.1.tar.bz2 -sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING +sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/buildroot/package/exempi/exempi.mk b/buildroot/package/exempi/exempi.mk index 2b6bd4fa8..3790b16b3 100644 --- a/buildroot/package/exempi/exempi.mk +++ b/buildroot/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.1 +EXEMPI_VERSION = 2.5.2 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES diff --git a/buildroot/package/exfat-utils/Config.in b/buildroot/package/exfat-utils/Config.in index 9dfbbfcfb..4e8f167db 100644 --- a/buildroot/package/exfat-utils/Config.in +++ b/buildroot/package/exfat-utils/Config.in @@ -4,6 +4,13 @@ config BR2_PACKAGE_EXFAT_UTILS help exFAT filesystem utilities. + This is the set of user-space utilities that go together + with the FUSE-based exfat driver from package/exfat. + + If you're using the exfat driver from the official Linux + kernel (merged as of Linux 5.7), you must use the user-space + utilities from package/exfatprogs. + https://github.com/relan/exfat comment "exfat-utils needs a toolchain w/ wchar" diff --git a/buildroot/package/exfatprogs/Config.in b/buildroot/package/exfatprogs/Config.in new file mode 100644 index 000000000..4f50427a6 --- /dev/null +++ b/buildroot/package/exfatprogs/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_EXFATPROGS + bool "exfatprogs" + depends on BR2_USE_WCHAR + help + exFAT filesystem userspace utilities. + + This is the set of tools that works together with the exfat + driver in the official Linux kernel (merged in Linux 5.7). + + If you're using the FUSE-based exfat support (from + package/exfat), you must use the corresponding user-space + programs in package/exfat-utils. + + https://github.com/exfatprogs/exfatprogs + +comment "exfatprogs needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/buildroot/package/exfatprogs/Config.in.host b/buildroot/package/exfatprogs/Config.in.host new file mode 100644 index 000000000..d4a0b0c24 --- /dev/null +++ b/buildroot/package/exfatprogs/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_EXFATPROGS + bool "host exfatprogs" + help + exFAT filesystem userspace utilities + + This is the set of tools that works together with the exfat + driver in the official Linux kernel (merged in Linux 5.7). + + If you're using the FUSE-based exfat support (from + package/exfat), you must use the corresponding user-space + programs in package/exfat-utils. + + https://github.com/exfatprogs/exfatprogs diff --git a/buildroot/package/exfatprogs/exfatprogs.hash b/buildroot/package/exfatprogs/exfatprogs.hash new file mode 100644 index 000000000..d251bce5e --- /dev/null +++ b/buildroot/package/exfatprogs/exfatprogs.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 982883f208a694962dff0654f4421a1a726d7d71068a0c84b93a10688179a186 exfatprogs-1.0.4.tar.gz +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/buildroot/package/exfatprogs/exfatprogs.mk b/buildroot/package/exfatprogs/exfatprogs.mk new file mode 100644 index 000000000..56db82cd8 --- /dev/null +++ b/buildroot/package/exfatprogs/exfatprogs.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# exfatprogs +# +################################################################################ + +EXFATPROGS_VERSION = 1.0.4 +EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) +EXFATPROGS_LICENSE = GPL-2.0+ +EXFATPROGS_LICENSE_FILES = COPYING +EXFATPROGS_DEPENDENCIES = host-pkgconf +HOST_EXFATPROGS_DEPENDENCIES = host-pkgconf + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch b/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch deleted file mode 100644 index e97bd78a6..000000000 --- a/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 19f6e36d3473ddba1a211e7af9352a10febb7270 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Fri, 1 May 2020 16:27:48 +0200 -Subject: [PATCH] Makefile-Base: fix version.{h,sh} generation with parallel - build - -When using parallel make (make -j) the build sometimes fails either -during 'make' or during 'make install'. - -Error messages look either like: - - make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4' - /bin/sh scripts/source_checks - `Makefile' is up to date. - - make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4/build-br' - /bin/sh ../scripts/Configure-os.c - ../scripts/reversion: Your copy of Exim lacks any version information. - Makefile:785: recipe for target 'version.sh' failed - -or like: - - DESTDIR=/home/buildroot/autobuild/instance-2/output-1/target INSTALL_ARG="-no_chown -no_symlink" build=br /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4 CFLAGS="-std=c99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " install - make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4' - /bin/sh scripts/source_checks - `Makefile' is up to date. - - make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4/build-br' - /home/buildroot/autobuild/instance-2/output-1/host/bin/i586-linux-gcc version.c - version.c: In function 'version_init': - version.c:32:1: error: expected expression before ';' token - ; - ^ - -This is due to the rule: - - version.h version.sh:: - @../scripts/reversion - -that executes reversion twice, once to satisfy the version.h target and -once for version.sh. This is unnecessary because reversion generates both -files anyway, but harmless without parallel build. When using parallel make -however reversion is sporadically run in a time sequence such that the -generated files are being used by other rules while they are being -rewritten by the second reversion instance. - -Fix by making only one of the two targets run reversion, and the other one -depend on it. - -Fixes builds found by the Buildroot autobuilders: - http://autobuild.buildroot.net/results/ebf/ebfccad007e216564889645a07f5487747116331// - http://autobuild.buildroot.net/results/56a/56a8457efcb32579ad6da99a769b6438dd0db267// - http://autobuild.buildroot.net/results/6a1/6a1f8a352649baf767b094cb6bbe2a7397fa7fac// - http://autobuild.buildroot.net/results/5ed/5ed1c42b3d33198f32d1267e5cc2b1fa1211495a// - http://autobuild.buildroot.net/results/b30/b304569948fd481ce33ecd052a1036153c5d459e// - http://autobuild.buildroot.net/results/d2c/d2c7abfe08672e53ff890127f787f8d2e84860f4// - -Signed-off-by: Luca Ceresoli -Upstream-status: patch submitted (https://bugs.exim.org/show_bug.cgi?id=2566) - ---- - OS/Makefile-Base | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/OS/Makefile-Base b/OS/Makefile-Base -index b66678bee4de..4966c25b5359 100644 ---- a/OS/Makefile-Base -+++ b/OS/Makefile-Base -@@ -664,9 +664,11 @@ PHDRS = ../config.h \ - - # Update Exim's version information and build the version object. - --version.h version.sh:: -+version.sh:: - @../scripts/reversion - -+version.h: version.sh -+ - cnumber.h: version.h - - version.o: $(HDRS) cnumber.h version.h version.c --- -2.26.2 - diff --git a/buildroot/package/exim/exim.hash b/buildroot/package/exim/exim.hash index 7cedf1bc8..265a95c6f 100644 --- a/buildroot/package/exim/exim.hash +++ b/buildroot/package/exim/exim.hash @@ -1,6 +1,6 @@ -# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha256sums.txt -sha256 537d366ee18ed357656f54f255f8f9e11bde9684fcaaecaaa56f84cdbcd3e405 exim-4.93.0.4.tar.xz -# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha512sums.txt -sha512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96 exim-4.93.0.4.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt +sha256 f77ee8faf04f5db793243c3ae81c1f4e452cd6ad7dd515a80edf755c4b144bdb exim-4.94.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt +sha512 3bf95ade30902327403e7308089a3e423761da5b0745397dace7c7fd15ba3838d93e0ee418f1fed57606f79e57b793c7c7407e5c0d526146f0036126d5d95316 exim-4.94.tar.xz # Locally calculated -sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE +sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index 90ec36416..19a62f497 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -4,9 +4,9 @@ # ################################################################################ -EXIM_VERSION = 4.93.0.4 +EXIM_VERSION = 4.94 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz -EXIM_SITE = https://ftp.exim.org/pub/exim/exim4/fixes +EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ EXIM_LICENSE_FILES = LICENCE EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf diff --git a/buildroot/package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch b/buildroot/package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch new file mode 100644 index 000000000..7b9fa4881 --- /dev/null +++ b/buildroot/package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch @@ -0,0 +1,58 @@ +From 2f6d2e5795382f0d6e22f5aea52e8104110d24ad Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 19 Jul 2020 16:29:15 +0200 +Subject: [PATCH] cmake/compilerFlags.cmake: properly detect availability of + flags + +Instead of relying on fragile and complex logic to decide if a +compiler flag is available or not, use the check_c_compiler_flag() +macro provided by the CMake standard library. + +This for example avoids using -fcf-protection on architectures that +don't support this option. + +[Upstream: https://github.com/Exiv2/exiv2/pull/1252. The submitted +patch is slightly different than this one, due to other changes +between 0.27.3 and master.] +Signed-off-by: Thomas Petazzoni +--- + cmake/compilerFlags.cmake | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 0418aa61..be430977 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -1,4 +1,5 @@ + # These flags applies to exiv2lib, the applications, and to the xmp code ++include(CheckCCompilerFlag) + + if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) +@@ -25,13 +26,16 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) +- if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) +- endif() +- +- if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +- OR (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7) # Not in Clang 3.4.2 +- ) ++ check_c_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION) ++ check_c_compiler_flag(-fcf-protection HAS_FCF_PROTECTION) ++ check_c_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG) ++ if(HAS_FSTACK_CLASH_PROTECTION) ++ add_compile_options(-fstack-clash-protection) ++ endif() ++ if(GCC_HAS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ if(GCC_HAS_FSTACK_PROTECTOR_STRONG) + add_compile_options(-fstack-protector-strong) + endif() + endif() +--- +2.26.2 + diff --git a/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch b/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch deleted file mode 100644 index f26006e3a..000000000 --- a/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7890776c62398ca1005e8edc32786859d60fcf7 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 6 Oct 2019 15:05:20 +0200 -Subject: [PATCH] crwimage: Check offset and size against total size - -Corrupted or specially crafted CRW images might exceed the overall -buffersize. - -Fixes #1019 - -(cherry picked from commit 683451567284005cd24e1ccb0a76ca401000968b) -[Retrieved (and slightly updated to keep only the fix) from: -https://github.com/Exiv2/exiv2/commit/50e9dd964a439da357798344ed1dd86edcadf0ec] -Signed-off-by: Fabrice Fontaine ---- - src/crwimage_int.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp -index 29311fdb7..c0d955350 100644 ---- a/src/crwimage_int.cpp -+++ b/src/crwimage_int.cpp -@@ -268,6 +268,9 @@ namespace Exiv2 { - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "Reading directory 0x" << std::hex << tag() << "\n"; - #endif -+ if (this->offset() + this->size() > size) -+ throw Error(kerOffsetOutOfRange); -+ - readDirectory(pData + offset(), this->size(), byteOrder); - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "<---- 0x" << std::hex << tag() << "\n"; diff --git a/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch b/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch deleted file mode 100644 index 400bf342c..000000000 --- a/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 1b917c3f7dd86336a9f6fda4456422c419dfe88c Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Tue, 1 Oct 2019 17:39:44 +0100 -Subject: [PATCH] Fix #1011 fix_1011_jp2_readmetadata_loop - -[Retrieved (and slighlty updated to keep only the fix) from: -https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8] -Signed-off-by: Fabrice Fontaine ---- - src/jp2image.cpp | 25 +++++++++++++++---- - test/data/Jp2Image_readMetadata_loop.poc | Bin 0 -> 738 bytes - tests/bugfixes/github/test_CVE_2017_17725.py | 4 +-- - tests/bugfixes/github/test_issue_1011.py | 13 ++++++++++ - 4 files changed, 35 insertions(+), 7 deletions(-) - create mode 100755 test/data/Jp2Image_readMetadata_loop.poc - create mode 100644 tests/bugfixes/github/test_issue_1011.py - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index d5cd1340a..0de088d62 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -18,10 +18,6 @@ - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. - */ - --/* -- File: jp2image.cpp --*/ -- - // ***************************************************************************** - - // included header files -@@ -197,6 +193,16 @@ namespace Exiv2 - return result; - } - -+static void boxes_check(size_t b,size_t m) -+{ -+ if ( b > m ) { -+#ifdef EXIV2_DEBUG_MESSAGES -+ std::cout << "Exiv2::Jp2Image::readMetadata box maximum exceeded" << std::endl; -+#endif -+ throw Error(kerCorruptedMetadata); -+ } -+} -+ - void Jp2Image::readMetadata() - { - #ifdef EXIV2_DEBUG_MESSAGES -@@ -219,9 +225,12 @@ namespace Exiv2 - Jp2BoxHeader subBox = {0,0}; - Jp2ImageHeaderBox ihdr = {0,0,0,0,0,0,0,0}; - Jp2UuidBox uuid = {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; -+ size_t boxes = 0 ; -+ size_t boxem = 1000 ; // boxes max - - while (io_->read((byte*)&box, sizeof(box)) == sizeof(box)) - { -+ boxes_check(boxes++,boxem ); - position = io_->tell(); - box.length = getLong((byte*)&box.length, bigEndian); - box.type = getLong((byte*)&box.type, bigEndian); -@@ -251,8 +260,12 @@ namespace Exiv2 - - while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox) && subBox.length ) - { -+ boxes_check(boxes++, boxem) ; - subBox.length = getLong((byte*)&subBox.length, bigEndian); - subBox.type = getLong((byte*)&subBox.type, bigEndian); -+ if (subBox.length > io_->size() ) { -+ throw Error(kerCorruptedMetadata); -+ } - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "Exiv2::Jp2Image::readMetadata: " - << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl; -@@ -308,7 +321,9 @@ namespace Exiv2 - } - - io_->seek(restore,BasicIo::beg); -- io_->seek(subBox.length, Exiv2::BasicIo::cur); -+ if ( io_->seek(subBox.length, Exiv2::BasicIo::cur) != 0 ) { -+ throw Error(kerCorruptedMetadata); -+ } - restore = io_->tell(); - } - break; diff --git a/buildroot/package/exiv2/exiv2.hash b/buildroot/package/exiv2/exiv2.hash index 7937d3f57..94ab4ac63 100644 --- a/buildroot/package/exiv2/exiv2.hash +++ b/buildroot/package/exiv2/exiv2.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934 exiv2-0.27.2.tar.gz +sha256 6398bc743c32b85b2cb2a604273b8c90aa4eb0fd7c1700bf66cbb2712b4f00c1 exiv2-0.27.3.tar.gz sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/buildroot/package/exiv2/exiv2.mk b/buildroot/package/exiv2/exiv2.mk index a2590ecdf..78b9c2e42 100644 --- a/buildroot/package/exiv2/exiv2.mk +++ b/buildroot/package/exiv2/exiv2.mk @@ -4,22 +4,11 @@ # ################################################################################ -EXIV2_VERSION = 0.27.2 +EXIV2_VERSION = 0.27.3 EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION)) EXIV2_INSTALL_STAGING = YES -EXIV2_LICENSE = GPL-2.0+, BSD-3-Clause -EXIV2_LICENSE_FILES = COPYING COPYING-CMAKE-SCRIPTS - -# CVE-2019-13504 is misclassified (by our CVE tracker) as affecting version -# 0.27.2, while in fact both commits that fixed this issue are already in this -# version. -EXIV2_IGNORE_CVES += CVE-2019-13504 - -# 0001-crwimage-Check-offset-and-size-against-total-size.patch -EXIV2_IGNORE_CVES += CVE-2019-17402 - -# 0002-fix_1011_jp2_readmetadata_loop.patch -EXIV2_IGNORE_CVES += CVE-2019-20421 +EXIV2_LICENSE = GPL-2.0+ +EXIV2_LICENSE_FILES = COPYING EXIV2_CONF_OPTS += -DEXIV2_BUILD_SAMPLES=OFF diff --git a/buildroot/package/expat/expat.hash b/buildroot/package/expat/expat.hash index 588e881d0..5a8dd4128 100644 --- a/buildroot/package/expat/expat.hash +++ b/buildroot/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.9/ -md5 d2384fa607223447e713e1b9bd272376 expat-2.2.9.tar.xz -sha1 90a361e4c97f8c469479ffadc0de0b121a911fb5 expat-2.2.9.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.2.10/ +md5 e0fe49a6b3480827c9455e4cfc799133 expat-2.2.10.tar.xz +sha1 a333b95121a718a77ee481dbade5efcd72a32eb8 expat-2.2.10.tar.xz # Locally calculated -sha256 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 expat-2.2.9.tar.xz -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING +sha256 5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2 expat-2.2.10.tar.xz +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/buildroot/package/expat/expat.mk b/buildroot/package/expat/expat.mk index 38e5dee75..bb04ab1a9 100644 --- a/buildroot/package/expat/expat.mk +++ b/buildroot/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.9 +EXPAT_VERSION = 2.2.10 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES diff --git a/buildroot/package/ezxml/0001-allow-compiler-override.patch b/buildroot/package/ezxml/0001-allow-compiler-override.patch deleted file mode 100644 index 827872b71..000000000 --- a/buildroot/package/ezxml/0001-allow-compiler-override.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urpN ezxml/GNUmakefile ezxml.patched/GNUmakefile ---- ezxml/GNUmakefile 2006-03-25 18:44:04.000000000 +0100 -+++ ezxml.patched/GNUmakefile 2008-02-24 13:57:37.000000000 +0100 -@@ -21,10 +21,10 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --CC = gcc --AR = ar -+CC ?= gcc -+AR ?= ar - RM = rm -f --CFLAGS = -Wall -O2 -+CFLAGS ?= -Wall -O2 - DEBUG_CFLAGS = -O0 -g - OBJS = ezxml.o - LIB = libezxml.a diff --git a/buildroot/package/ezxml/Config.in b/buildroot/package/ezxml/Config.in deleted file mode 100644 index 8a1643b11..000000000 --- a/buildroot/package/ezxml/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EZXML - bool "ezxml" - help - ezXML is a XML parser C library that is simple and easy to - use. - - http://ezxml.sf.net diff --git a/buildroot/package/ezxml/ezxml.hash b/buildroot/package/ezxml/ezxml.hash deleted file mode 100644 index bf04b0e00..000000000 --- a/buildroot/package/ezxml/ezxml.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 a68d52257dcb0ff2ad3d71c8c64311edb8030254bb8b581e229aeaba6231cdf9 ezxml-0.8.6.tar.gz -sha256 e82e49402f6b21176c65eead46dbd39d8f7a3c28b052589d8b307dfc8f78a03f license.txt diff --git a/buildroot/package/ezxml/ezxml.mk b/buildroot/package/ezxml/ezxml.mk deleted file mode 100644 index f1e18aa68..000000000 --- a/buildroot/package/ezxml/ezxml.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# ezxml -# -################################################################################ - -EZXML_VERSION = 0.8.6 -EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION) -EZXML_INSTALL_STAGING = YES -EZXML_LICENSE = MIT -EZXML_LICENSE_FILES = license.txt - -EZXML_CFLAGS = $(TARGET_CFLAGS) - -# mmap code uses madvise which isn't available on nommu uClibc -ifeq ($(BR2_USE_MMU),) -EZXML_CFLAGS += -D EZXML_NOMMAP -endif - -define EZXML_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f GNUmakefile \ - CC="$(TARGET_CC)" CFLAGS="$(EZXML_CFLAGS)" AR=$(TARGET_AR) -endef - -define EZXML_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/ezxml.h $(STAGING_DIR)/usr/include/ezxml.h - $(INSTALL) -D -m 0644 $(@D)/libezxml.a $(STAGING_DIR)/usr/lib/libezxml.a -endef - -define EZXML_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/ezxml.h $(TARGET_DIR)/usr/include/ezxml.h - $(INSTALL) -D -m 0644 $(@D)/libezxml.a $(TARGET_DIR)/usr/lib/libezxml.a -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch b/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch deleted file mode 100644 index aac60e70b..000000000 --- a/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 22 Sep 2019 10:06:35 +0200 -Subject: [PATCH] mkfs/Makefile.am: fix build without blkid - -Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in -libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid -option so use ${libblkid_LIBS} instead - -Signed-off-by: Fabrice Fontaine ---- - mkfs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am -index cae2f93..83e2389 100644 ---- a/mkfs/Makefile.am -+++ b/mkfs/Makefile.am -@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la - libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c - libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD - libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include --libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \ -+libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \ - -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) - - install-exec-hook: --- -2.23.0 - diff --git a/buildroot/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch b/buildroot/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch deleted file mode 100644 index b420e27a0..000000000 --- a/buildroot/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch +++ /dev/null @@ -1,195 +0,0 @@ -From eee12fe5e2e6c5f71bc7cbe25a608b730fd5362e Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Fri, 7 Aug 2020 10:02:31 +0800 -Subject: [PATCH] fsck.f2fs: correct return value -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As Norbert Lange reported: - -" -$ fsck.f2fs -a /dev/mmcblk0p5; echo $? -Info: Fix the reported corruption. -Info: Mounted device! -Info: Check FS only on RO mounted device -Error: Failed to open the device! -255 -" - -Michael Laß reminds: - -" -I think the return value is exactly the problem here. See fsck(8) ( -https://linux.die.net/man/8/fsck) which specifies the return values. -Systemd looks at these and decides how to proceed: - -https://github.com/systemd/systemd/blob/a859abf062cef1511e4879c4ee39c6036ebeaec8/src/fsck/fsck.c#L407 - -That means, if fsck.f2fs returns 255, then -the FSCK_SYSTEM_SHOULD_REBOOT bit is set and systemd will reboot. -" - -So the problem here is fsck.f2fs didn't return correct value to userspace -apps, result in later unexpected behavior of rebooting, let's fix this. - -Reported-by: Norbert Lange -Reported-by: Michael Laß -Signed-off-by: Chao Yu -Signed-off-by: Norbert Lange ---- - fsck/fsck.h | 11 +++++++++++ - fsck/main.c | 45 +++++++++++++++++++++++++++++++-------------- - 2 files changed, 42 insertions(+), 14 deletions(-) - -diff --git a/fsck/fsck.h b/fsck/fsck.h -index ccf4a39..c8aeb06 100644 ---- a/fsck/fsck.h -+++ b/fsck/fsck.h -@@ -13,6 +13,17 @@ - - #include "f2fs.h" - -+enum { -+ FSCK_SUCCESS = 0, -+ FSCK_ERROR_CORRECTED = 1 << 0, -+ FSCK_SYSTEM_SHOULD_REBOOT = 1 << 1, -+ FSCK_ERRORS_LEFT_UNCORRECTED = 1 << 2, -+ FSCK_OPERATIONAL_ERROR = 1 << 3, -+ FSCK_USAGE_OR_SYNTAX_ERROR = 1 << 4, -+ FSCK_USER_CANCELLED = 1 << 5, -+ FSCK_SHARED_LIB_ERROR = 1 << 7, -+}; -+ - struct quota_ctx; - - #define FSCK_UNMATCHED_EXTENT 0x00000001 -diff --git a/fsck/main.c b/fsck/main.c -index 8c62a14..b0f2ec3 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -591,7 +591,7 @@ void f2fs_parse_options(int argc, char *argv[]) - error_out(prog); - } - --static void do_fsck(struct f2fs_sb_info *sbi) -+static int do_fsck(struct f2fs_sb_info *sbi) - { - struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - u32 flag = le32_to_cpu(ckpt->ckpt_flags); -@@ -614,7 +614,7 @@ static void do_fsck(struct f2fs_sb_info *sbi) - } else { - MSG(0, "[FSCK] F2FS metadata [Ok..]"); - fsck_free(sbi); -- return; -+ return FSCK_SUCCESS; - } - - if (!c.ro) -@@ -646,7 +646,7 @@ static void do_fsck(struct f2fs_sb_info *sbi) - ret = quota_init_context(sbi); - if (ret) { - ASSERT_MSG("quota_init_context failure: %d", ret); -- return; -+ return FSCK_OPERATIONAL_ERROR; - } - } - fsck_chk_orphan_node(sbi); -@@ -654,8 +654,14 @@ static void do_fsck(struct f2fs_sb_info *sbi) - F2FS_FT_DIR, TYPE_INODE, &blk_cnt, NULL); - fsck_chk_quota_files(sbi); - -- fsck_verify(sbi); -+ ret = fsck_verify(sbi); - fsck_free(sbi); -+ -+ if (!c.bug_on) -+ return FSCK_SUCCESS; -+ if (!ret) -+ return FSCK_ERROR_CORRECTED; -+ return FSCK_ERRORS_LEFT_UNCORRECTED; - } - - static void do_dump(struct f2fs_sb_info *sbi) -@@ -763,7 +769,7 @@ static int do_sload(struct f2fs_sb_info *sbi) - int main(int argc, char **argv) - { - struct f2fs_sb_info *sbi; -- int ret = 0; -+ int ret = 0, ret2; - clock_t start = clock(); - - f2fs_init_configuration(); -@@ -771,10 +777,15 @@ int main(int argc, char **argv) - f2fs_parse_options(argc, argv); - - if (c.func != DUMP && f2fs_devs_are_umounted() < 0) { -- if (errno == EBUSY) -+ if (errno == EBUSY) { -+ if (c.func == FSCK) -+ return FSCK_OPERATIONAL_ERROR; - return -1; -+ } - if (!c.ro || c.func == DEFRAG) { - MSG(0, "\tError: Not available on mounted device!\n"); -+ if (c.func == FSCK) -+ return FSCK_OPERATIONAL_ERROR; - return -1; - } - -@@ -789,8 +800,11 @@ int main(int argc, char **argv) - } - - /* Get device */ -- if (f2fs_get_device_info() < 0) -+ if (f2fs_get_device_info() < 0) { -+ if (c.func == FSCK) -+ return FSCK_OPERATIONAL_ERROR; - return -1; -+ } - - fsck_again: - memset(&gfsck, 0, sizeof(gfsck)); -@@ -808,7 +822,7 @@ fsck_again: - - switch (c.func) { - case FSCK: -- do_fsck(sbi); -+ ret = do_fsck(sbi); - break; - #ifdef WITH_DUMP - case DUMP: -@@ -856,8 +870,8 @@ fsck_again: - char ans[255] = {0}; - retry: - printf("Do you want to fix this partition? [Y/N] "); -- ret = scanf("%s", ans); -- ASSERT(ret >= 0); -+ ret2 = scanf("%s", ans); -+ ASSERT(ret2 >= 0); - if (!strcasecmp(ans, "y")) - c.fix_on = 1; - else if (!strcasecmp(ans, "n")) -@@ -869,12 +883,15 @@ retry: - goto fsck_again; - } - } -- ret = f2fs_finalize_device(); -- if (ret < 0) -- return ret; -+ ret2 = f2fs_finalize_device(); -+ if (ret2) { -+ if (c.func == FSCK) -+ return FSCK_OPERATIONAL_ERROR; -+ return ret2; -+ } - - printf("\nDone: %lf secs\n", (clock() - start) / (double)CLOCKS_PER_SEC); -- return 0; -+ return ret; - - out_err: - if (sbi->ckpt) --- -2.27.0 - diff --git a/buildroot/package/f2fs-tools/f2fs-tools.hash b/buildroot/package/f2fs-tools/f2fs-tools.hash index 4eb4d1470..dedd88495 100644 --- a/buildroot/package/f2fs-tools/f2fs-tools.hash +++ b/buildroot/package/f2fs-tools/f2fs-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d f2fs-tools-1.13.0.tar.gz +sha256 619263d4e2022152a1472c1d912eaae104f20bd227ce0bb9d41d1d6608094bd1 f2fs-tools-1.14.0.tar.gz sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/buildroot/package/f2fs-tools/f2fs-tools.mk b/buildroot/package/f2fs-tools/f2fs-tools.mk index a9536dc8e..ced283d25 100644 --- a/buildroot/package/f2fs-tools/f2fs-tools.mk +++ b/buildroot/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = 1.13.0 +F2FS_TOOLS_VERSION = 1.14.0 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux diff --git a/buildroot/package/faad2/faad2.hash b/buildroot/package/faad2/faad2.hash index 1a03bc9b7..e9aa78051 100644 --- a/buildroot/package/faad2/faad2.hash +++ b/buildroot/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a faad2-2.9.1.tar.gz +sha256 9728b2b94f94ab49363cd229e7377fbe6ef3c311c5cd80da662d53ddb0ee091d faad2-2.9.2.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/buildroot/package/faad2/faad2.mk b/buildroot/package/faad2/faad2.mk index 9ec9d8f52..69c44461f 100644 --- a/buildroot/package/faad2/faad2.mk +++ b/buildroot/package/faad2/faad2.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAAD2_VERSION = 2.9.1 +FAAD2_VERSION = 2.9.2 FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION))) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING diff --git a/buildroot/package/fakeroot/0001-hide-dlsym-error.patch b/buildroot/package/fakeroot/0001-hide-dlsym-error.patch deleted file mode 100644 index 2c61fab24..000000000 --- a/buildroot/package/fakeroot/0001-hide-dlsym-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Hide error from dlsym() - dlsym(), starting in glibc 2.24 actually reports errors. In our case, - we try to get ACL functions which are not in the glibc. This causes - failures in test suites, so hide those messages for non-debugging - purposes for now. It also makes the build logs annoying to read. -Author: Julian Andres Klode -Origin: vendor -Bug-Debian: https://bugs.debian.org/830912 -Forwarded: no -Last-Update: 2016-08-12 - -Signed-off-by: Maxime Hadjinlian - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -256,10 +256,16 @@ void load_library_symbols(void){ - /* clear dlerror() just in case dlsym() legitimately returns NULL */ - msg = dlerror(); - *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); -+ - if ( (msg = dlerror()) != NULL){ -- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); --/* abort ();*/ -+#ifdef LIBFAKEROOT_DEBUGGING -+ if (fakeroot_debug) { -+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); -+/* abort ();*/ -+ } -+#endif - } -+ - } - } - diff --git a/buildroot/package/fakeroot/0001-skip-doc-subdirs.patch b/buildroot/package/fakeroot/0001-skip-doc-subdirs.patch new file mode 100644 index 000000000..91663fb64 --- /dev/null +++ b/buildroot/package/fakeroot/0001-skip-doc-subdirs.patch @@ -0,0 +1,14 @@ +For some reason, version 1.25 and up is missing all localized doc, +and thus fails on the install stage. + +Skip the directories. + +Signed-off-by: Norbert Lange +--- fakeroot-1.25.1.org/doc/Makefile.am 2020-09-22 23:52:20.000000000 +0200 ++++ fakeroot-1.25.1/doc/Makefile.am 2020-09-24 11:05:27.611298673 +0200 +@@ -1,5 +1,4 @@ + AUTOMAKE_OPTIONS=foreign +-SUBDIRS = de es fr nl pt sv + + man_MANS = faked.1 fakeroot.1 + diff --git a/buildroot/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch b/buildroot/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch deleted file mode 100644 index 4e81b4912..000000000 --- a/buildroot/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a853f21633693f9eefc4949660253a5328d2d2f3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 13 Aug 2017 23:21:54 +0200 -Subject: [PATCH] communicate: check return status of msgrcv() - -msgrcv can return with -1 to indicate an error condition. -One such error is to have been interrupted by a signal. - -Being interrupted by a signal is very rare in this code, except in a -very special condition: a highly-parallel (1000 jobs!) mksquashfs on -a filesystem with extended attributes, where we see errors like (those -are mksquashfs errors): - llistxattr for titi/603/883 failed in read_attrs, because Unknown - error 1716527536 - -See: https://bugs.busybox.net/show_bug.cgi?id=10141 - -In this case, we just have to retry the call to msgrcv(). - -Signed-off-by: "Yann E. MORIN" ---- - communicate.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/communicate.c b/communicate.c -index 293f404..787bb63 100644 ---- a/communicate.c -+++ b/communicate.c -@@ -553,10 +553,13 @@ void send_get_fakem(struct fake_msg *buf) - l=msgrcv(msg_get, - (struct my_msgbuf*)buf, - sizeof(*buf)-sizeof(buf->mtype),0,0); -- while((buf->serial!=serial)||buf->pid!=pid); -+ while(((l==-1)&&(errno==EINTR))||(buf->serial!=serial)||buf->pid!=pid); - - semaphore_down(); - -+ if(l==-1) -+ buf->xattr.flags_rc=errno; -+ - /* - (nah, may be wrong, due to allignment) - --- -2.11.0 - diff --git a/buildroot/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch b/buildroot/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch deleted file mode 100644 index 07b206b68..000000000 --- a/buildroot/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8e9a7a8c72a9fe407d296ec0ffeb56b2cd271959 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 16 Sep 2019 22:00:29 -0500 -Subject: [PATCH] Select TCP when lack of SYSV IPC - -Update to add a configure test to build and install the TCP IPC version -when detecting SYSV IPC MsgQ support isn't available. - -The issue was initially discovered on Windows Services for Linux -(WSL1.0). WSL does have some SysV IPC, but no message Q's, which is -required by fakeroot/faked by default. - -Fixes: -https://github.com/Microsoft/WSL/issues/2465 - -Additional bug reports: -https://bugs.busybox.net/show_bug.cgi?id=11366 - -Upstream: -https://salsa.debian.org/clint/fakeroot/merge_requests/2 - -Signed-off-by: Jean-Francois Doyon -Signed-off-by: Matthew Weber ---- - configure.ac | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a9189e6..1650f77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,42 @@ AC_CACHE_CHECK([which IPC method to use], - [ac_cv_use_ipc], - [ac_cv_use_ipc=sysv]) - -+if test $ac_cv_use_ipc = "sysv"; then -+ AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host]) -+ -+ AC_LANG_PUSH(C) -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+int main() { -+ -+ srandom(time(NULL)+getpid()*33151); -+ key_t msg_key = random(); -+ int msg_get = msgget(msg_key, IPC_CREAT|0600); -+ -+ if (msg_get==-1) { -+ return 1; -+ } else { -+ msgctl(msg_get, IPC_RMID, NULL); -+ return 0; -+ } -+ -+}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp]) -+ -+ if test $ac_cv_use_ipc = "tcp"; then -+ AC_MSG_RESULT([No, using TCP]) -+ else -+ AC_MSG_RESULT([Yes]) -+ fi -+ -+ AC_LANG_POP(C) -+fi -+ - AC_ARG_WITH([dbformat], - AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@], - [database format to use: either inode (default) or path]), --- -2.17.1 - diff --git a/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch b/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch deleted file mode 100644 index fc7454337..000000000 --- a/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Forward supported flags to fstatat, this fixes issues like -using an empty path - -Upstream BR: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959876 - -Signed-off-by: Norbert Lange - -diff -burN fakeroot-1.20.2.org/libfakeroot.c fakeroot-1.20.2/libfakeroot.c ---- fakeroot-1.20.2.org/libfakeroot.c 2014-10-05 17:16:00.000000000 +0200 -+++ fakeroot-1.20.2/libfakeroot.c 2020-05-10 22:24:18.896625085 +0200 -@@ -880,7 +880,7 @@ - /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should - be when we stat it. */ - INT_STRUCT_STAT st; -- r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & AT_SYMLINK_NOFOLLOW)); -+ r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT))); - - if(r) - return(r); -@@ -1017,7 +1017,7 @@ - - /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should - be when we stat it. */ -- r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & AT_SYMLINK_NOFOLLOW); -+ r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT)); - - if(r) - return(r); diff --git a/buildroot/package/fakeroot/fakeroot.hash b/buildroot/package/fakeroot/fakeroot.hash index d1d959df6..1a23d9e8d 100644 --- a/buildroot/package/fakeroot/fakeroot.hash +++ b/buildroot/package/fakeroot/fakeroot.hash @@ -1,6 +1,4 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 -# Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 +# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.25.3-1.dsc +sha256 8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c fakeroot_1.25.3.orig.tar.gz # License files, locally calculated -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/fakeroot/fakeroot.mk b/buildroot/package/fakeroot/fakeroot.mk index 1be99071b..957f0a53b 100644 --- a/buildroot/package/fakeroot/fakeroot.mk +++ b/buildroot/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot +FAKEROOT_VERSION = 1.25.3 +FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20201008T205817Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off @@ -15,7 +15,7 @@ HOST_FAKEROOT_DEPENDENCIES = host-acl HOST_FAKEROOT_CONF_ENV = \ ac_cv_header_sys_capability_h=no \ ac_cv_func_capset=no -# 0003-Select-TCP-when-lack-of-SYSV-IPC.patch touches configure.ac +# upstream does not ship with configure script anymore HOST_FAKEROOT_AUTORECONF = YES FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING diff --git a/buildroot/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch b/buildroot/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch deleted file mode 100644 index 489c7269f..000000000 --- a/buildroot/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: Alexander Dahl -Date: Wed, 28 Oct 2015 16:04:13 +0100 -Subject: [PATCH] cmake: use INTERPROCEDURAL_OPTIMIZATION target property - -Instead of hacking on compiler flags use the cmake way for handling -interprocedural optimization. Tests showed cmake currently ignores this -for gcc and clang, at least on Debian Wheezy and Jessie. This actually -results in no interprocedural optimization for the moment. However it -allows to compile fastd against a toolchain without LTO support, which -was broken because of a hack included here for finding binutils. - -According to the upstream author of fastd the main reason for enabling -LTO was binary size on an OpenWRT target for Freifunk Gluon, where they -have very few space left on devices with only 4 MB flash memory. - -Signed-off-by: Alexander Dahl ---- - cmake/checks.cmake | 14 -------------- - src/CMakeLists.txt | 9 +++++++++ - 2 files changed, 9 insertions(+), 14 deletions(-) - -diff --git a/cmake/checks.cmake b/cmake/checks.cmake -index 27c073f..8a671a1 100644 ---- a/cmake/checks.cmake -+++ b/cmake/checks.cmake -@@ -10,20 +10,6 @@ if(ARCH_X86 OR ARCH_X86_64) - endif(ARCH_X86 OR ARCH_X86_64) - - -- --if(ENABLE_LTO) -- set(CFLAGS_LTO "-flto") -- set(CFLAGS_NO_LTO "-fno-lto") -- -- check_c_compiler_flag("-fwhole-program" HAVE_FLAG_WHOLE_PROGRAM) -- if(HAVE_FLAG_WHOLE_PROGRAM) -- set(LDFLAGS_LTO "-flto -fwhole-program") -- else(HAVE_FLAG_WHOLE_PROGRAM) -- set(LDFLAGS_LTO "-flto") -- endif(HAVE_FLAG_WHOLE_PROGRAM) --endif(ENABLE_LTO) -- -- - check_c_source_compiles(" - #include - #include -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 829b3ab..7612b40 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -48,6 +48,15 @@ add_executable(fastd - set_property(TARGET fastd PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") - set_property(TARGET fastd PROPERTY LINK_FLAGS "${PTHREAD_LDFLAGS} ${LIBUECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER} ${JSON_C_LDFLAGS_OTHER} ${LDFLAGS_LTO}") - set_property(TARGET fastd APPEND PROPERTY INCLUDE_DIRECTORIES ${LIBCAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS} ${JSON_C_INCLUDE_DIR}) -+if(ENABLE_LTO) -+ set_target_properties(fastd PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION ON -+ ) -+else(ENABLE_LTO) -+ set_target_properties(fastd PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION OFF -+ ) -+endif(ENABLE_LTO) - target_link_libraries(fastd protocols methods ciphers macs ${RT_LIBRARY} ${LIBCAP_LIBRARY} ${LIBUECC_LIBRARIES} ${NACL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${JSON_C_LIBRARIES}) - - add_dependencies(fastd version) --- -2.1.4 - diff --git a/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch b/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch deleted file mode 100644 index 88c1953d8..000000000 --- a/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a925a4cab1b722a2a24b0c1d2a1925f3b766de61 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Thu, 2 Mar 2017 21:43:39 +0100 -Subject: [PATCH] CMakeList: do not overwrite module path - -Currently, the CMakeList.txt completely overwrites the CMAKE_MODULE_PATH -variable. - -This is problematic when an upper-layer buildsystem wants to set its own -module path to use custom modules. - -For example, Buldroot [0] provides a custom platform description [1] to fix -cross-compilation issue. Overwriting the module path means that this -custom platform description is not found [2]. - -Providing such a custom platform description is what the upstream cmake -devs suggest [3], quoting: - - If a toolchain file specifies CMAKE_SYSTEM_NAME such that a custom - `Platform/MySystem.cmake` file is loaded then the latter can set - them [*] as needed for the target platform. - -[*] offending settings causing RPATH issues during cross-compilation. - -So we need to append our source tree to the module path, not replace it -blindly. - -[0] https://buildroot.org/ -[1] https://git.buildroot.org/buildroot/tree/support/misc/Buildroot.cmake -[2] http://autobuild.buildroot.net/results/69f/69fb2e3b549a069e2898506db918423e6742c589/build-end.log -[3] http://public.kitware.com/pipermail/cmake/2017-February/065063.html - -Signed-off-by: "Yann E. MORIN" ---- -Patch applied upstream: -https://git.universe-factory.net/fastd/commit/?id=a925a4cab1b722a2a24b0c1d2a1925f3b766de61 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61689b1..2c9c61a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8.8) - --set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - cmake_policy(SET CMP0017 OLD) # Prefer modules in our module directory - - project(FASTD C ASM) --- -2.7.4 - diff --git a/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch b/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch deleted file mode 100644 index 854b3e74c..000000000 --- a/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 4b8c4f54bbd70849fc91679bea44b4e1dfb0526d Mon Sep 17 00:00:00 2001 -From: Matthias Schiffer -Date: Wed, 18 Oct 2017 20:11:30 +0200 -Subject: [PATCH] cipher: remove aes128-ctr NaCl implementation - -New versions of libsodium have dropped support for aes128-ctr. AES support -is only available with OpenSSL now. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 4b8c4f54bb - - doc/source/manual/config.rst | 1 - - src/crypto/cipher/aes128_ctr/CMakeLists.txt | 1 - - src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 6 -- - .../aes128_ctr/nacl/cipher_aes128_ctr_nacl.c | 76 ---------------------- - 4 files changed, 84 deletions(-) - delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt - delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c - -diff --git a/doc/source/manual/config.rst b/doc/source/manual/config.rst -index 0abebeb4c245..94d7a9495ef0 100644 ---- a/doc/source/manual/config.rst -+++ b/doc/source/manual/config.rst -@@ -70,7 +70,6 @@ Example config: - * ``aes128-ctr``: AES128 in counter mode - - - ``openssl``: Use implementation from OpenSSL's libcrypto -- - ``nacl``: Use implementation from NaCl or libsodium - - * ``null``: No encryption (for authenticated-only methods using composed_gmac) - -diff --git a/src/crypto/cipher/aes128_ctr/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/CMakeLists.txt -index 0588fed798e2..58e8c6b3371c 100644 ---- a/src/crypto/cipher/aes128_ctr/CMakeLists.txt -+++ b/src/crypto/cipher/aes128_ctr/CMakeLists.txt -@@ -1,3 +1,2 @@ - fastd_cipher(aes128-ctr aes128_ctr.c) - add_subdirectory(openssl) --add_subdirectory(nacl) -diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt -deleted file mode 100644 -index 676aa5d48ec4..000000000000 ---- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt -+++ /dev/null -@@ -1,6 +0,0 @@ --fastd_cipher_impl(aes128-ctr nacl -- cipher_aes128_ctr_nacl.c --) --fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS}) --fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES}) --fastd_cipher_impl_require(aes128-ctr nacl NACL) -diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c -deleted file mode 100644 -index ead632640414..000000000000 ---- a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c -+++ /dev/null -@@ -1,76 +0,0 @@ --/* -- Copyright (c) 2012-2016, Matthias Schiffer -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions are met: -- -- 1. Redistributions of source code must retain the above copyright notice, -- this list of conditions and the following disclaimer. -- 2. 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. -- -- 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. --*/ -- --/** -- \file -- -- The aes128-ctr implementation from NaCl --*/ -- -- --#include "../../../../crypto.h" --#include "../../../../alloc.h" -- --#include -- -- --/** The cipher state */ --struct __attribute__((aligned(16))) fastd_cipher_state { -- uint8_t d[crypto_stream_aes128ctr_BEFORENMBYTES] __attribute__((aligned(16))); /**< The unpacked AES key */ --}; -- -- --/** Initializes the cipher state */ --static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) { -- fastd_block128_t k; -- memcpy(k.b, key, sizeof(fastd_block128_t)); -- -- fastd_cipher_state_t *state = fastd_new_aligned(fastd_cipher_state_t, 16); -- crypto_stream_aes128ctr_beforenm(state->d, k.b); -- -- return state; --} -- --/** XORs data with the aes128-ctr cipher stream */ --static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) { -- crypto_stream_aes128ctr_xor_afternm(out->b, in->b, len, iv, state->d); -- return true; --} -- --/** Frees the cipher state */ --static void aes128_ctr_free(fastd_cipher_state_t *state) { -- if (state) { -- secure_memzero(state, sizeof(*state)); -- free(state); -- } --} -- -- --/** The nacl aes128-ctr implementation */ --const fastd_cipher_t fastd_cipher_aes128_ctr_nacl = { -- .init = aes128_ctr_init, -- .crypt = aes128_ctr_crypt, -- .free = aes128_ctr_free, --}; --- -2.15.0 - diff --git a/buildroot/package/fastd/Config.in b/buildroot/package/fastd/Config.in index c4f296dd6..5319d6850 100644 --- a/buildroot/package/fastd/Config.in +++ b/buildroot/package/fastd/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_FASTD select BR2_PACKAGE_LIBUECC select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL - select BR2_PACKAGE_LIBCAP help Fast and Secure Tunneling Daemon diff --git a/buildroot/package/fastd/fastd.hash b/buildroot/package/fastd/fastd.hash index accdf087e..b59085e0e 100644 --- a/buildroot/package/fastd/fastd.hash +++ b/buildroot/package/fastd/fastd.hash @@ -1,5 +1,3 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 e53236d3049f64f7955ad9556da099eb fastd-18.tar.xz # computed locally -sha256 714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 fastd-18.tar.xz -sha256 c3095dd0adffc03eaeba9c7cd81f06962ef4797a836e49468b3dccc2802ff904 COPYRIGHT +sha256 942f33bcd794bcb8e19da4c30c875bdfd4d0f1c24ec4dcdf51237791bbfb0d4c fastd-21.tar.xz +sha256 1f5acece57466eac89108f934a196be09b7676fa2d637e78d6657ee1a7d644ac COPYRIGHT diff --git a/buildroot/package/fastd/fastd.mk b/buildroot/package/fastd/fastd.mk index e67acdbf1..bbec63d96 100644 --- a/buildroot/package/fastd/fastd.mk +++ b/buildroot/package/fastd/fastd.mk @@ -4,38 +4,44 @@ # ################################################################################ -FASTD_VERSION = 18 -FASTD_SITE = https://projects.universe-factory.net/attachments/download/86 +FASTD_VERSION = 21 +FASTD_SITE = https://github.com/NeoRaider/fastd/releases/download/v$(FASTD_VERSION) FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz FASTD_LICENSE = BSD-2-Clause FASTD_LICENSE_FILES = COPYRIGHT -FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON -FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap +FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +FASTD_CONF_OPTS += -Dcapabilities=enabled +FASTD_DEPENDENCIES += libcap +else +FASTD_CONF_OPTS += -Dcapabilities=disabled +endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -FASTD_CONF_OPTS += -DENABLE_OPENSSL=ON +FASTD_CONF_OPTS += -Dcipher_aes128-ctr=enabled FASTD_DEPENDENCIES += openssl else -FASTD_CONF_OPTS += -DENABLE_OPENSSL=OFF +FASTD_CONF_OPTS += -Dcipher_aes128-ctr=disabled endif ifeq ($(BR2_PACKAGE_FASTD_STATUS_SOCKET),y) -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=ON +FASTD_CONF_OPTS += -Dstatus_socket=enabled FASTD_DEPENDENCIES += json-c else -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=OFF +FASTD_CONF_OPTS += -Dstatus_socket=disabled endif ifeq ($(BR2_INIT_SYSTEMD),y) -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=ON +FASTD_CONF_OPTS += -Dsystemd=enabled else -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=OFF +FASTD_CONF_OPTS += -Dsystemd=disabled endif ifeq ($(BR2_GCC_ENABLE_LTO),y) -FASTD_CONF_OPTS += -DENABLE_LTO=ON +FASTD_CONF_OPTS += -Db_lto=true else -FASTD_CONF_OPTS += -DENABLE_LTO=OFF +FASTD_CONF_OPTS += -Db_lto=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch b/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch deleted file mode 100644 index 8cff7ef8c..000000000 --- a/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix pixel format report - -When fbgrab tells about the framebuffer pixel format, blue and green -are accidentally swapped in 'length' and 'msb_right' columns. Let's -order everything as RGB. - -Upstream-Status: Submitted [Gunnar Monell ] - -Signed-off-by: Timo Ketola - -diff -u a/fbgrab.c b/fbgrab.c ---- a/fbgrab.c 2018-03-07 11:42:04.739250433 +0200 -+++ b/fbgrab.c 2018-03-07 11:43:26.128043877 +0200 -@@ -169,8 +169,8 @@ - fprintf(stderr, "bits_per_pixel: %i\n", fb_varinfo_p->bits_per_pixel); - fprintf(stderr, "grayscale: %s\n", fb_varinfo_p->grayscale ? "true" : "false"); - fprintf(stderr, "red: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->red.offset, fb_varinfo_p->red.length, fb_varinfo_p->red.msb_right); -- fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); -- fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); -+ fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); -+ fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); - fprintf(stderr, "alpha: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->transp.offset, fb_varinfo_p->transp.length, fb_varinfo_p->transp.msb_right); - fprintf(stderr, "pixel format: %s\n", fb_varinfo_p->nonstd == 0 ? "standard" : "non-standard"); - } diff --git a/buildroot/package/fbgrab/fbgrab.hash b/buildroot/package/fbgrab/fbgrab.hash index 6cd19dc1d..414a93c99 100644 --- a/buildroot/package/fbgrab/fbgrab.hash +++ b/buildroot/package/fbgrab/fbgrab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3314a932f830e32feaf36914e1b43326529fe35b7eb7410ff55f16c930ddfbcb fbgrab-1.3.1.tar.gz +sha256 2bfdad379579c4ca1a910d0a8ac63183ef2c12a45e6b7d402fd045d83bb3faee fbgrab-1.3.3.tar.gz sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk index 43fd0ba94..6d2f09bc2 100644 --- a/buildroot/package/fbgrab/fbgrab.mk +++ b/buildroot/package/fbgrab/fbgrab.mk @@ -4,7 +4,7 @@ # ################################################################################ -FBGRAB_VERSION = 1.3.1 +FBGRAB_VERSION = 1.3.3 FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION)) FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPL-2.0 diff --git a/buildroot/package/fbterm/fbterm.mk b/buildroot/package/fbterm/fbterm.mk index 712d4f97f..996482780 100644 --- a/buildroot/package/fbterm/fbterm.mk +++ b/buildroot/package/fbterm/fbterm.mk @@ -10,12 +10,6 @@ FBTERM_LICENSE = GPL-2.0+ FBTERM_LICENSE_FILES = COPYING FBTERM_DEPENDENCIES = fontconfig liberation -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -# fontconfig uses pthreads if available, but fbterm forgets to link -# with it breaking static builds -FBTERM_CONF_ENV += LIBS='-lpthread' -endif - ifeq ($(BR2_PACKAGE_GPM),y) FBTERM_DEPENDENCIES += gpm FBTERM_CONF_OPTS += --enable-gpm diff --git a/buildroot/package/feh/feh.hash b/buildroot/package/feh/feh.hash index 2bfe5e48a..806bca08c 100644 --- a/buildroot/package/feh/feh.hash +++ b/buildroot/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c feh-3.2.1.tar.bz2 -sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING +sha256 388f9dcc8284031023364355e23a82c276e79ca614f2dcd64d2f927857a4531e feh-3.5.tar.bz2 +sha256 2c3a31327dc3cc3331aa6e759d378e4f66d0ece7174a0d5aa137f3cba4bf0509 COPYING diff --git a/buildroot/package/feh/feh.mk b/buildroot/package/feh/feh.mk index 973eed60b..c1dae9db8 100644 --- a/buildroot/package/feh/feh.mk +++ b/buildroot/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 3.2.1 +FEH_VERSION = 3.5 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt diff --git a/buildroot/package/fetchmail/fetchmail.hash b/buildroot/package/fetchmail/fetchmail.hash index 08a7a0ef4..b40ce7f7b 100644 --- a/buildroot/package/fetchmail/fetchmail.hash +++ b/buildroot/package/fetchmail/fetchmail.hash @@ -1,6 +1,7 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/36773211/ -sha1 1aadf078ed8fb1b6c93e9126cc0375b1f740301a fetchmail-6.4.1.tar.xz -sha256 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0 fetchmail-6.4.1.tar.xz -sha512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0 fetchmail-6.4.1.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37037213/ +sha256 26cd936ece146e056cdf79a676a33738b4eab0a5ae2edf3fce5ba034721b09bd fetchmail-6.4.8.tar.xz +# From https://sourceforge.net/projects/fetchmail/files/branch_6.4/ +sha1 900386d69e2731999f142d5c16b4f2b69ed87f7a fetchmail-6.4.8.tar.xz +md5 4e5e67efe498038032576fa24c7f848e fetchmail-6.4.8.tar.xz # Locally computed: -sha256 89d6efe79c78f965b256e007d6acc367fff982c59b6195fb6ec5895ea0fc9bd5 COPYING +sha256 89d6efe79c78f965b256e007d6acc367fff982c59b6195fb6ec5895ea0fc9bd5 COPYING diff --git a/buildroot/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk index b8e3c667e..1835059f6 100644 --- a/buildroot/package/fetchmail/fetchmail.mk +++ b/buildroot/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).1 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).8 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING diff --git a/buildroot/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/buildroot/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch new file mode 100644 index 000000000..951ce4186 --- /dev/null +++ b/buildroot/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch @@ -0,0 +1,43 @@ +From bf8eae2d30a205bb76ac625e04c0351106981b9e Mon Sep 17 00:00:00 2001 +From: Parker Ernest <@> +Date: Sun, 23 Feb 2020 13:22:42 +0100 +Subject: [PATCH] swscale/x86/yuv2rgb: Fix build without SSSE3 + +commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on +x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II + +Signed-off-by: Michael Niedermayer +[bernd.kuhls@t-online.de: + - retrieved from upstream patchwork: + https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/ +] +Signed-off-by: Bernd Kuhls +[yann.morin.1998@free.fr: fix reference top patchwork and SoB order] +Signed-off-by: Yann E. MORIN +--- + libswscale/x86/yuv2rgb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c +index c12e88cbb5..4791e5b93a 100644 +--- a/libswscale/x86/yuv2rgb.c ++++ b/libswscale/x86/yuv2rgb.c +@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) + #if HAVE_X86ASM + int cpu_flags = av_get_cpu_flags(); + ++#if HAVE_SSSE3 + if (EXTERNAL_SSSE3(cpu_flags)) { + switch (c->dstFormat) { + case AV_PIX_FMT_RGB32: +@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) + return yuv420_rgb15_ssse3; + } + } ++#endif + + if (EXTERNAL_MMXEXT(cpu_flags)) { + switch (c->dstFormat) { +-- +2.26.2 + diff --git a/buildroot/package/ffmpeg/0002-configure-use-require_pkg_config-to-check-for-wavpac.patch b/buildroot/package/ffmpeg/0002-configure-use-require_pkg_config-to-check-for-wavpac.patch new file mode 100644 index 000000000..49c3ccee9 --- /dev/null +++ b/buildroot/package/ffmpeg/0002-configure-use-require_pkg_config-to-check-for-wavpac.patch @@ -0,0 +1,31 @@ +From a507a9cd6525d5b3a1eea32e25a139b4023800a2 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 20 Sep 2020 13:48:00 +0200 +Subject: [PATCH] configure: use require_pkg_config to check for wavpack + +Fixes static builds with toolchains needing "-lm" for math functions. + +Patch sent upstream: +http://ffmpeg.org/pipermail/ffmpeg-devel/2020-September/270127.html + +Signed-off-by: Bernd Kuhls +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 5d68695192..4e6c6edd30 100755 +--- a/configure ++++ b/configure +@@ -6438,7 +6438,7 @@ enabled libvpx && { + fi + } + +-enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack ++enabled libwavpack && require_pkg_config libwavpack wavpack "wavpack/wavpack.h" WavpackOpenFileOutput + enabled libwebp && { + enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion + enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } +-- +2.27.0 + diff --git a/buildroot/package/ffmpeg/ffmpeg.hash b/buildroot/package/ffmpeg/ffmpeg.hash index 752372619..959a562b8 100644 --- a/buildroot/package/ffmpeg/ffmpeg.hash +++ b/buildroot/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0d5da81feba073ee78e0f18e0966bcaf91464ae75e18e9a0135186249e3d2a0b ffmpeg-4.2.4.tar.xz +sha256 ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb ffmpeg-4.3.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 -sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index ca90242f9..6b7437411 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 4.2.4 +FFMPEG_VERSION = 4.3.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -282,10 +282,7 @@ endif # To avoid a circular dependency only use opencv if opencv itself does # not depend on ffmpeg. -ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx) -FFMPEG_CONF_OPTS += --enable-libopencv -FFMPEG_DEPENDENCIES += opencv -else ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) FFMPEG_CONF_OPTS += --enable-libopencv FFMPEG_DEPENDENCIES += opencv3 else diff --git a/buildroot/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch b/buildroot/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch new file mode 100644 index 000000000..8d6830ac8 --- /dev/null +++ b/buildroot/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch @@ -0,0 +1,49 @@ +From 5e8865c0e08861558c1253c521dc9098d0c773ee Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Mon, 16 Mar 2020 08:30:36 -0600 +Subject: [PATCH] t/io_uring: don't use *rand48_r() variants + +Not available on all platforms. + +Signed-off-by: Jens Axboe + +[Patch from upstream +https://github.com/axboe/fio/commit/5e8865c0e08861558c1253c521dc9098d0c773ee] +Signed-off-by: Heiko Thiery +--- + t/io_uring.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/t/io_uring.c b/t/io_uring.c +index e84a2b6b..d48db1e9 100644 +--- a/t/io_uring.c ++++ b/t/io_uring.c +@@ -63,7 +63,6 @@ struct file { + struct submitter { + pthread_t thread; + int ring_fd; +- struct drand48_data rand; + struct io_sq_ring sq_ring; + struct io_uring_sqe *sqes; + struct io_cq_ring cq_ring; +@@ -170,7 +169,7 @@ static void init_io(struct submitter *s, unsigned index) + } + f->pending_ios++; + +- lrand48_r(&s->rand, &r); ++ r = lrand48(); + offset = (r % (f->max_blocks - 1)) * BS; + + if (register_files) { +@@ -286,7 +285,7 @@ static void *submitter_fn(void *data) + + printf("submitter=%d\n", gettid()); + +- srand48_r(pthread_self(), &s->rand); ++ srand48(pthread_self()); + + prepped = 0; + do { +-- +2.20.1 + diff --git a/buildroot/package/fio/0002-Makefile-fix-build-of-io_uring-on-sh4.patch b/buildroot/package/fio/0002-Makefile-fix-build-of-io_uring-on-sh4.patch new file mode 100644 index 000000000..69bda93d3 --- /dev/null +++ b/buildroot/package/fio/0002-Makefile-fix-build-of-io_uring-on-sh4.patch @@ -0,0 +1,33 @@ +From e1985f9097f37748efdc29239eb3fb6a00b12f27 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 23 May 2020 19:07:40 +0200 +Subject: [PATCH] Makefile: fix build of io_uring on sh4 + +SuperH compile currently fails with: + +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/8.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: t/io_uring.o: in function `submitter_fn': +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/fio-3.19/t/io_uring.c:131: undefined reference to `arch_flags' +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/8.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/fio-3.19/t/io_uring.c:367: undefined reference to `arch_flags' +collect2: error: ld returned 1 exit status + +Fix that by ensuring we have a stub arch.o with the necessary arch flags + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/axboe/fio/commit/e1985f9097f37748efdc29239eb3fb6a00b12f27] +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index f1e984f5f..e39621954 100644 +--- a/Makefile ++++ b/Makefile +@@ -283,6 +283,7 @@ T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o + T_PIPE_ASYNC_PROGS = t/read-to-pipe-async + + T_IOU_RING_OBJS = t/io_uring.o ++T_IOU_RING_OBJS += t/arch.o + T_IOU_RING_PROGS = t/io_uring + + T_MEMLOCK_OBJS = t/memlock.o diff --git a/buildroot/package/fio/fio.hash b/buildroot/package/fio/fio.hash index 4b6c9b8c1..d95deb20b 100644 --- a/buildroot/package/fio/fio.hash +++ b/buildroot/package/fio/fio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2aa68326266ef074ecc0892ebfe165e28c981282f345ee05f9d06f11ada3f052 fio-3.17.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE +sha256 a2f885834900f554127718716338914791f5d72800b6f9e3edf173b94b5a2e4e fio-3.19.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/buildroot/package/fio/fio.mk b/buildroot/package/fio/fio.mk index 5761d1c28..3ddd74eda 100644 --- a/buildroot/package/fio/fio.mk +++ b/buildroot/package/fio/fio.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIO_VERSION = 3.17 +FIO_VERSION = 3.19 FIO_SITE = http://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE diff --git a/buildroot/package/flannel/flannel.hash b/buildroot/package/flannel/flannel.hash index 57c2daf6d..8195140f8 100644 --- a/buildroot/package/flannel/flannel.hash +++ b/buildroot/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 v0.5.5.tar.gz +sha256 7375318b288bcff733aabfe1a1007d478cb9091cdaffe68c8253ddd93bc070ed v0.12.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/flannel/flannel.mk b/buildroot/package/flannel/flannel.mk index 0af06c765..8aa960f08 100644 --- a/buildroot/package/flannel/flannel.mk +++ b/buildroot/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.5.5 +FLANNEL_VERSION = 0.12.0 FLANNEL_SITE = https://github.com/coreos/flannel/archive FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz diff --git a/buildroot/package/flashrom/0001-spi.patch b/buildroot/package/flashrom/0001-spi.patch deleted file mode 100644 index 22ffcb54d..000000000 --- a/buildroot/package/flashrom/0001-spi.patch +++ /dev/null @@ -1,25 +0,0 @@ -linux_spi: add missing include - -Some defines (e.g. _IOC_SIZEBITS) are defined in linux/ioctl.h, -so it must be included before it is used, by SPI_IOC_MESSAGE -from linux/spi/spidev.h - -Fixes build errors with the musl C library, as seen in these -Buildroot autobuilder failures: - - http://autobuild.buildroot.org/results/2a3/2a3744007c630c267575a638ebcd83a4b97644f5/build-end.log - http://autobuild.buildroot.org/results/3de/3de936d9be79e151e66af15193084d82a0f2c04a/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/linux_spi.c flashrom-0.9.8/linux_spi.c ---- flashrom-0.9.8.orig/linux_spi.c 2015-10-28 19:42:38.480285847 +0100 -+++ flashrom-0.9.8/linux_spi.c 2015-10-28 19:43:15.492994613 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include "flash.h" diff --git a/buildroot/package/flashrom/Config.in b/buildroot/package/flashrom/Config.in index c333c2973..182a3f454 100644 --- a/buildroot/package/flashrom/Config.in +++ b/buildroot/package/flashrom/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS bool default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arc default y if BR2_arm || BR2_armeb default y if BR2_i386 || BR2_x86_64 default y if BR2_m68k diff --git a/buildroot/package/flashrom/flashrom.hash b/buildroot/package/flashrom/flashrom.hash index 6622758a5..97df4fe9a 100644 --- a/buildroot/package/flashrom/flashrom.hash +++ b/buildroot/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.1.tar.bz2.asc -sha256 aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19 flashrom-v1.1.tar.bz2 -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +# https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2.asc +sha256 e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b flashrom-v1.2.tar.bz2 +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/flashrom/flashrom.mk b/buildroot/package/flashrom/flashrom.mk index 6b9e6dde9..5554082bc 100644 --- a/buildroot/package/flashrom/flashrom.mk +++ b/buildroot/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.1 +FLASHROM_VERSION = 1.2 FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ @@ -28,13 +28,6 @@ else FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no endif -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) -FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no -endif - ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes diff --git a/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch deleted file mode 100644 index f3e82101b..000000000 --- a/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001 -From: Vladimir Glavnyy <31897320+vglavnyy@users.noreply.github.com> -Date: Fri, 10 May 2019 00:15:29 +0700 -Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337) - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066] ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0640c37b5..30be238fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH) - message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}") - endif() - --# Auto-detect locale-narrow 'strtod_l' function. -+# Auto-detect locale-narrow 'strtod_l' and 'strtoull_l' functions. - if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT) -+ set(FLATBUFFERS_LOCALE_INDEPENDENT 0) - if(MSVC) -- check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) -+ check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) -+ check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) - else() -- check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) -+ check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) -+ check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) -+ endif() -+ if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L) -+ set(FLATBUFFERS_LOCALE_INDEPENDENT 1) - endif() - endif() - add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$) diff --git a/buildroot/package/flatbuffers/flatbuffers.hash b/buildroot/package/flatbuffers/flatbuffers.hash index 0cbdb6fe5..82ef94279 100644 --- a/buildroot/package/flatbuffers/flatbuffers.hash +++ b/buildroot/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b flatbuffers-1.11.0.tar.gz -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 LICENSE.txt +sha256 62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45 flatbuffers-1.12.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/flatbuffers/flatbuffers.mk b/buildroot/package/flatbuffers/flatbuffers.mk index dcb5579e6..6a71ea9c7 100644 --- a/buildroot/package/flatbuffers/flatbuffers.mk +++ b/buildroot/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = 1.11.0 +FLATBUFFERS_VERSION = 1.12.0 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/flite/0002-fix-alsa-static.patch b/buildroot/package/flite/0001-fix-alsa-static.patch similarity index 77% rename from buildroot/package/flite/0002-fix-alsa-static.patch rename to buildroot/package/flite/0001-fix-alsa-static.patch index 12adb9e01..7ed4899cc 100644 --- a/buildroot/package/flite/0002-fix-alsa-static.patch +++ b/buildroot/package/flite/0001-fix-alsa-static.patch @@ -3,8 +3,8 @@ Use pkg-config to determine alsa link flags. This fixes static linking. Signed-off-by: Baruch Siach diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in ---- flite-1.4-release.orig/flite-1.4-release/configure.in 2009-08-14 23:46:38.000000000 +0300 -+++ flite-1.4-release/flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300 +--- flite-1.4-release.orig/configure.in 2009-08-14 23:46:38.000000000 +0300 ++++ flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300 @@ -275,7 +275,10 @@ #endif], [AUDIODRIVER="alsa" diff --git a/buildroot/package/flite/0001-now-honor-DESTDIR-env.-var.patch b/buildroot/package/flite/0001-now-honor-DESTDIR-env.-var.patch deleted file mode 100644 index 2d5fb6853..000000000 --- a/buildroot/package/flite/0001-now-honor-DESTDIR-env.-var.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 658f3243238efe951f6242fa384e990d77078afc Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Fri, 27 Dec 2013 17:42:39 +0100 -Subject: [PATCH] now honor DESTDIR env. var. - -Flite used a handwritten a Makefile which doesn't honor DESTDIR environment -variable, though it uses autoconf. - -Signed-off-by: Samuel Martin ---- - config/config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/config.in b/config/config.in -index 914d2bf..43f1a56 100644 ---- a/flite-1.4-release/config/config.in -+++ b/flite-1.4-release/config/config.in -@@ -49,6 +49,6 @@ include $(TOP)/config/$(langvox).lv - prefix = @prefix@ - exec_prefix = @exec_prefix@ - EXEEXT = @EXEEXT@ --INSTALLBINDIR = @bindir@ --INSTALLLIBDIR = @libdir@ --INSTALLINCDIR = @includedir@/flite -+INSTALLBINDIR = $(DESTDIR)@bindir@ -+INSTALLLIBDIR = $(DESTDIR)@libdir@ -+INSTALLINCDIR = $(DESTDIR)@includedir@/flite --- -1.8.5.2 - diff --git a/buildroot/package/flite/0003-fix-alsa-version-check.patch b/buildroot/package/flite/0003-fix-alsa-version-check.patch deleted file mode 100644 index 8832ac371..000000000 --- a/buildroot/package/flite/0003-fix-alsa-version-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] fix alsa version check - -Check the entire alsa version, and not just the subminor - As this broke -with the recent alsa 1.0.x -> 1.1.0 release. - -It is not clear what major/minor versions the check was supposed to be -against (0.9 or 1.0). I went with 1.0.11 to be on the safe side. - -Signed-off-by: Peter Korsgaard ---- - flite-1.4-release/configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: flite-1.4/flite-1.4-release/configure.in -=================================================================== ---- flite-1.4.orig/flite-1.4-release/configure.in -+++ flite-1.4/flite-1.4-release/configure.in -@@ -270,7 +270,7 @@ - # the one I know -- you can still specific --with-audio=alsa - AC_TRY_COMPILE([#include ], - [int j= -- #if SND_LIB_SUBMINOR >= 11 -+ #if SND_LIB_VERSION >= 0x1000b - 3; - #endif], - [AUDIODRIVER="alsa" diff --git a/buildroot/package/flite/Config.in b/buildroot/package/flite/Config.in index 2bbd256f2..0bb15511b 100644 --- a/buildroot/package/flite/Config.in +++ b/buildroot/package/flite/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_FLITE an alternative synthesis engine to Festival for voices built using the FestVox suite of voice building tools. - http://www.speech.cs.cmu.edu/flite + http://www.festvox.org/flite comment "flite needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/buildroot/package/flite/flite.hash b/buildroot/package/flite/flite.hash index 67d6941ea..f21a21d18 100644 --- a/buildroot/package/flite/flite.hash +++ b/buildroot/package/flite/flite.hash @@ -1,4 +1,4 @@ # locally computed hash -sha256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c flite-1.4-release.tar.bz2 +sha256 c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85 flite-2.1-release.tar.bz2 # License files, locally calculated -sha256 4cbeaee8c9a8f23f251f0ce56e9212d244d9ea6b0dbe48601623d920054249a1 flite-1.4-release/COPYING +sha256 d31bceaf2823d56a8c9400f7bde3b17140e739e991eb4f203bdcf9827754ab59 COPYING diff --git a/buildroot/package/flite/flite.mk b/buildroot/package/flite/flite.mk index 72376e56c..fd5f4ec17 100644 --- a/buildroot/package/flite/flite.mk +++ b/buildroot/package/flite/flite.mk @@ -4,28 +4,11 @@ # ################################################################################ -FLITE_VERSION = 1.4 +FLITE_VERSION = 2.1 FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2 -FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION) -# $ tar tf flite-1.4-release.tar.bz2 -# ... -# flite-1.4-release//install-sh -# flite-1.4-release//mkinstalldirs -# flite-1.4-release//Exports.def -# flite-1.4-release//flite.sln -# flite-1.4-release//fliteDll.vcproj -# flite-1.4-release/config/Makefile -# flite-1.4-release/config/common_make_rules -# flite-1.4-release/config/project.mak -# flite-1.4-release/config/config.in -# flite-1.4-release/config/system.mak.in -# -# So, we set FLITE_STRIP_COMPONENTS=0 to avoid writing to "/", and then -# build in flite-1.4-release/ -FLITE_STRIP_COMPONENTS = 0 -FLITE_SUBDIR = flite-$(FLITE_VERSION)-release +FLITE_SITE = http://www.festvox.org/flite/packed/flite-$(FLITE_VERSION) FLITE_LICENSE = BSD-4-Clause -FLITE_LICENSE_FILES = $(FLITE_SUBDIR)/COPYING +FLITE_LICENSE_FILES = COPYING FLITE_INSTALL_STAGING = YES # Patching configure.in diff --git a/buildroot/package/fluidsynth/Config.in b/buildroot/package/fluidsynth/Config.in index c1cb92348..7c8836b60 100644 --- a/buildroot/package/fluidsynth/Config.in +++ b/buildroot/package/fluidsynth/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_FLUIDSYNTH depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + # the .pc file installed by fluidsynth does not mention its + # indirect dependencies in Libs.private. + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 help FluidSynth is a real-time software synthesizer based on the @@ -115,6 +118,7 @@ config BR2_PACKAGE_FLUIDSYNTH_READLINE endif # BR2_PACKAGE_FLUIDSYNTH -comment "fluidsynth needs a toolchain w/ threads, wchar" +comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/buildroot/package/fluidsynth/fluidsynth.hash b/buildroot/package/fluidsynth/fluidsynth.hash index f7c9c88cd..17e37e247 100644 --- a/buildroot/package/fluidsynth/fluidsynth.hash +++ b/buildroot/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348 fluidsynth-2.1.1.tar.gz +sha256 b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00 fluidsynth-2.1.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/buildroot/package/fluidsynth/fluidsynth.mk b/buildroot/package/fluidsynth/fluidsynth.mk index b06db23cc..5756df544 100644 --- a/buildroot/package/fluidsynth/fluidsynth.mk +++ b/buildroot/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.1.1 +FLUIDSYNTH_VERSION = 2.1.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE diff --git a/buildroot/package/fmt/fmt.hash b/buildroot/package/fmt/fmt.hash index 24d05e778..1f45c212f 100644 --- a/buildroot/package/fmt/fmt.hash +++ b/buildroot/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365 fmt-6.1.2.tar.gz -sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst +sha256 decfdf9ad274070fa85f26407b816f5a4d82205ae86bac1990be658d0795ea4d fmt-7.0.3.zip +sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/buildroot/package/fmt/fmt.mk b/buildroot/package/fmt/fmt.mk index 5dc3088e8..0539dcc02 100644 --- a/buildroot/package/fmt/fmt.mk +++ b/buildroot/package/fmt/fmt.mk @@ -4,8 +4,9 @@ # ################################################################################ -FMT_VERSION = 6.1.2 -FMT_SITE = $(call github,fmtlib,fmt,$(FMT_VERSION)) +FMT_VERSION = 7.0.3 +FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) +FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception FMT_LICENSE_FILES = LICENSE.rst FMT_INSTALL_STAGING = YES @@ -14,4 +15,8 @@ FMT_CONF_OPTS = \ -DFMT_INSTALL=ON \ -DFMT_TEST=OFF +define FMT_EXTRACT_CMDS + $(UNZIP) -d $(BUILD_DIR) $(FMT_DL_DIR)/$(FMT_SOURCE) +endef + $(eval $(cmake-package)) diff --git a/buildroot/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch b/buildroot/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch new file mode 100644 index 000000000..eed9dba00 --- /dev/null +++ b/buildroot/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch @@ -0,0 +1,44 @@ +From 40ec04a8bf36dd8d0aa3da98b167792ce2dcd114 Mon Sep 17 00:00:00 2001 +From: Silvan Scherrer +Date: Sun, 20 Sep 2020 12:52:08 +0200 +Subject: [PATCH] add pthread as a dependency of a static lib + +Downloaded from https://trac.netlabs.org/ports/changeset/2220 + +Patch sent upstream: +https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 2 ++ + fontconfig.pc.in | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f3189a7..594d6fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -690,6 +690,8 @@ fi + have_pthread=false + if test "$os_win32" = no; then + AX_PTHREAD([have_pthread=true]) ++ AC_SUBST(PTHREAD_CFLAGS) ++ AC_SUBST(PTHREAD_LIBS) + fi + if $have_pthread; then + LIBS="$PTHREAD_LIBS $LIBS" +diff --git a/fontconfig.pc.in b/fontconfig.pc.in +index 61b35fb..f823bac 100644 +--- a/fontconfig.pc.in ++++ b/fontconfig.pc.in +@@ -14,5 +14,5 @@ Version: @VERSION@ + Requires: @PKGCONFIG_REQUIRES@ + Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ +-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ ++Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ @PTHREAD_LIBS@ ++Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ @PTHREAD_CFLAGS@ +-- +2.27.0 + diff --git a/buildroot/package/fontconfig/fontconfig.mk b/buildroot/package/fontconfig/fontconfig.mk index 7387452b0..ee82cc1de 100644 --- a/buildroot/package/fontconfig/fontconfig.mk +++ b/buildroot/package/fontconfig/fontconfig.mk @@ -7,6 +7,8 @@ FONTCONFIG_VERSION = 2.13.1 FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 +# 0002-add-pthread-as-a-dependency-of-a-static-lib.patch +FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf util-linux HOST_FONTCONFIG_DEPENDENCIES = \ diff --git a/buildroot/package/fping/fping.hash b/buildroot/package/fping/fping.hash index 0aa0330b5..0b2233f37 100644 --- a/buildroot/package/fping/fping.hash +++ b/buildroot/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a fping-4.2.tar.gz +sha256 ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 fping-5.0.tar.gz # Hash for license file -sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING +sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/buildroot/package/fping/fping.mk b/buildroot/package/fping/fping.mk index 5d3ad59e5..24aca3236 100644 --- a/buildroot/package/fping/fping.mk +++ b/buildroot/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 4.2 +FPING_VERSION = 5.0 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING diff --git a/buildroot/package/freescale-imx/Config.in b/buildroot/package/freescale-imx/Config.in index 711e8f72c..b0c7de843 100644 --- a/buildroot/package/freescale-imx/Config.in +++ b/buildroot/package/freescale-imx/Config.in @@ -49,6 +49,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM bool "imx8mm" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + bool "imx8mn" + config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" endchoice @@ -66,7 +69,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 - default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool @@ -77,7 +82,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO bool - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU bool @@ -87,6 +93,7 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X source "package/freescale-imx/imx-alsa-plugins/Config.in" @@ -101,6 +108,7 @@ source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" +source "package/freescale-imx/imx-seco/Config.in" if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" source "package/freescale-imx/libz160/Config.in" diff --git a/buildroot/package/freescale-imx/firmware-imx/Config.in b/buildroot/package/freescale-imx/firmware-imx/Config.in index 56d5b8074..587f40242 100644 --- a/buildroot/package/freescale-imx/firmware-imx/Config.in +++ b/buildroot/package/freescale-imx/firmware-imx/Config.in @@ -4,7 +4,83 @@ config BR2_PACKAGE_FIRMWARE_IMX help Firmware blobs for the Freescale i.MX SoCs. - It contains blobs for SDMA and VPU. + It contains blobs for SDMA, VPU, HDMI, EDPC, and DDR + training. This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_FIRMWARE_IMX + +config BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME + string + default "imx25" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + +config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME + string + default "imx27" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S + +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +choice + bool "DDR training binaries" + default BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 + help + Choose the DDR training binaries to be used depending on the + kind of memory that is available on the target board (DDR4, + LPDDR4, etc...). + +config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 + bool "lpddr4" + help + Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin) + +config BR2_PACKAGE_FIRMWARE_IMX_DDR4 + bool "DDR4" + help + Use DDR4 binaries (i.e.: ddr4_*_201810.bin). + +endchoice # DDR training FW + +config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN + hex "(LP)DDR IMEM padding length" + default 0x8000 + help + The IMEM firmware will be padded to this length + +config BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN + hex "(LP)DDR DMEM padding length" + default 0x4000 + help + The DMEM firmware will be padded to this length + +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +endif # BR2_PACKAGE_FIRMWARE_IMX diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash index 85f203311..b0a150205 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c115d5d0d115fc14754671bd2428f672f9f99677988588accef2fbca2c3f749c firmware-imx-8.1.1.bin -sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA -sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING +sha256 5ca1f8b6e6b191594d17ac7b51c38cdbc2ff808d15568ab4b0bbeb5dc6c621f6 firmware-imx-8.8.bin +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk index b251fcda2..fb3cfe640 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.1.1 +FIRMWARE_IMX_VERSION = 8.8 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin @@ -12,63 +12,125 @@ FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement FIRMWARE_IMX_LICENSE_FILES = EULA COPYING FIRMWARE_IMX_REDISTRIBUTE = NO -FIRMWARE_IMX_BLOBS = sdma vpu +FIRMWARE_IMX_INSTALL_IMAGES = YES define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) -FIRMWARE_IMX_INSTALL_IMAGES = YES -FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys -define FIRMWARE_IMX_PREPARE_LPDDR4_FW - $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem_pad.bin - $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem_pad.bin - cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_imem_pad.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_dmem_pad.bin > \ - $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_fw.bin +# +# DDR firmware +# + +define FIRMWARE_IMX_PREPARE_DDR_FW + $(TARGET_OBJCOPY) -I binary -O binary \ + --pad-to $(BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN) --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1)).bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1))_pad.bin + $(TARGET_OBJCOPY) -I binary -O binary \ + --pad-to $(BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN) --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2)).bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2))_pad.bin + cat $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(1))_pad.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(2))_pad.bin > \ + $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(3)).bin endef -define FIRMWARE_IMX_INSTALL_IMAGES_CMDS +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. - $(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,1d) - $(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,2d) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_pmu_train_1d_imem,lpddr4_pmu_train_1d_dmem,lpddr4_pmu_train_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_pmu_train_2d_imem,lpddr4_pmu_train_2d_dmem,lpddr4_pmu_train_2d_fw) cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of ddr4_* and generate ddr4_fw.bin. + # ddr4_fw.bin is needed when generating imx8-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + ddr4_imem_1d_201810,ddr4_dmem_1d_201810,ddr4_1d_201810_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + ddr4_imem_2d_201810,ddr4_dmem_2d_201810,ddr4_2d_201810_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \ + $(BINARIES_DIR)/ddr4_201810_fw.bin + ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +endif + +# +# HDMI firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW),y) +define FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -FIRMWARE_IMX_INSTALL_IMAGES = YES -define FIRMWARE_IMX_INSTALL_IMAGES_CMDS - # SECO firmware is needed when generating imx8-boot-sd.bin which - # is done in post-image script. - cp $(@D)/firmware/seco/mx8qx-ahab-container.img \ - $(BINARIES_DIR)/ahab-container.img -endef -define FIRMWARE_IMX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \ - $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin - $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \ - $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin -endef -else -define FIRMWARE_IMX_INSTALL_TARGET_CMDS +endif + +# +# EPDC firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW),y) +define FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW mkdir -p $(TARGET_DIR)/lib/firmware/imx - for blobdir in $(FIRMWARE_IMX_BLOBS); do \ - cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ - done cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw endef endif +# +# SDMA firmware +# + +FIRMWARE_IMX_SDMA_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME)) +ifneq ($(FIRMWARE_IMX_SDMA_FW_NAME),) +define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx/sdma + cp -r $(@D)/firmware/sdma/sdma-$(FIRMWARE_IMX_SDMA_FW_NAME)*.bin \ + $(TARGET_DIR)/lib/firmware/imx/sdma/ +endef +endif + +# +# VPU firmware +# + +FIRMWARE_IMX_VPU_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME)) +ifneq ($(FIRMWARE_IMX_VPU_FW_NAME),) +define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu + cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin \ + $(TARGET_DIR)/lib/firmware/imx/vpu/ +endef +endif + +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + $(FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW) + $(FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW) +endef + +define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) +endef + $(eval $(generic-package)) diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 98ca7fbe7..4ff592648 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-arm.bin -sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 010bab5780476f26406e16b058514453dc235a0e7f4b995fa03c976d06e5cb96 imx-gpu-g2d-6.4.0.p2.4-arm.bin +sha256 553bbe9ee1caa222fd14b835deb2afedf9ed936b7a13424328df75892286f666 imx-gpu-g2d-6.4.0.p2.4-aarch64.bin +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 770017097..15cfe66f0 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64 +IMX_GPU_G2D_VERSION = 6.4.0.p2.4-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.0.p1.0-arm +IMX_GPU_G2D_VERSION = 6.4.0.p2.4-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 1a67b53ac..6de74a949 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36 imx-gpu-viv-6.4.0.p1.0-aarch32.bin -sha256 45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27 imx-gpu-viv-6.4.0.p1.0-aarch64.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5 imx-gpu-viv-6.4.0.p2.4-aarch32.bin +sha256 a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720 imx-gpu-viv-6.4.0.p2.4-aarch64.bin +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 646d4e367..fca8a4d44 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch64 +IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch32 +IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -58,15 +58,6 @@ define IMX_GPU_VIV_BUILD_CMDS ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so endef -ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) -define IMX_GPU_VIV_FIXUP_FB_HEADERS - $(SED) '39i\ - #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\ - #define EGL_API_FB \n\ - #endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h -endef -endif - ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc @@ -89,7 +80,6 @@ endif define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr - $(IMX_GPU_VIV_FIXUP_FB_HEADERS) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) for lib in egl gbm glesv1_cm glesv2 vg; do \ $(INSTALL) -m 0644 -D \ diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index 013201911..bd8de5b86 100644 --- a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c7b8fe249ba529d85bfe8540e073b73e4fcdf65ee56022c319e53e0065ff1549 imx-sc-firmware-1.2.1.bin -sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA -sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING +sha256 5a28180217975f3d78fcfac15e46b0a942910fadf078e4af76deb6dc498136ed imx-sc-firmware-1.2.7.1.bin +sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 6a768ea10..954cfc407 100644 --- a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.2.1 +IMX_SC_FIRMWARE_VERSION = 1.2.7.1 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-seco/Config.in b/buildroot/package/freescale-imx/imx-seco/Config.in new file mode 100644 index 000000000..1877664a0 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-seco/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_IMX_SECO + bool "imx-seco" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + help + Firmware file for the i.MX8 and i.MX8X Security Controller. + + This library is provided by Freescale as-is and doesn't have + an upstream. diff --git a/buildroot/package/freescale-imx/imx-seco/imx-seco.hash b/buildroot/package/freescale-imx/imx-seco/imx-seco.hash new file mode 100644 index 000000000..930801e83 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-seco/imx-seco.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 52ba07633e0f8707d8c26724b5cd03ef96444c8de1e0e134acac50acacf3e7dd imx-seco-3.6.3.bin +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING diff --git a/buildroot/package/freescale-imx/imx-seco/imx-seco.mk b/buildroot/package/freescale-imx/imx-seco/imx-seco.mk new file mode 100644 index 000000000..be3f3c441 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-seco/imx-seco.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# imx-seco +# +################################################################################ + +IMX_SECO_VERSION = 3.6.3 +IMX_SECO_SITE = $(FREESCALE_IMX_SITE) +IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin + +IMX_SECO_LICENSE = NXP Semiconductor Software License Agreement +IMX_SECO_LICENSE_FILES = EULA COPYING +IMX_SECO_REDISTRIBUTE = NO + +define IMX_SECO_EXTRACT_CMDS + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE)) +endef + +IMX_SECO_INSTALL_IMAGES = YES + +# SECO firmware is needed when generating imx8-boot-sd.bin which +# is done in post-image script. +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +define IMX_SECO_INSTALL_IMAGES_CMDS + cp $(@D)/firmware/seco/mx8qxb0-ahab-container.img \ + $(BINARIES_DIR)/ahab-container.img +endef +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y) +define IMX_SECO_INSTALL_IMAGES_CMDS + cp $(@D)/firmware/seco/mx8qmb0-ahab-container.img \ + $(BINARIES_DIR)/ahab-container.img +endef +endif + +$(eval $(generic-package)) diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch index 951ead982..f5a67cd51 100644 --- a/buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch @@ -1,6 +1,6 @@ -From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001 +From e776e7360f80da9ac03f81a5df27d8b7fabc7ac7 Mon Sep 17 00:00:00 2001 From: Gary Bisson -Date: Thu, 12 Jul 2018 11:38:28 +0200 +Date: Thu, 26 Mar 2020 16:00:33 +0100 Subject: [PATCH] Fix ion.h header inclusion to be standard NXP "solution" was to manually copy the header to include/linux. @@ -9,25 +9,44 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h Signed-off-by: Gary Bisson --- - Makefile | 2 ++ - decoder_sw/software/linux/dwl/dwl_linux.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) + Makefile_G1G2 | 4 ++-- + Makefile_H1 | 4 ++-- + decoder_sw/software/linux/dwl/dwl_linux.c | 2 +- + h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/Makefile b/Makefile -index b74e23a..a5ce22b 100755 ---- a/Makefile -+++ b/Makefile -@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so +diff --git a/Makefile_G1G2 b/Makefile_G1G2 +index 8280cce..4c9fc34 100755 +--- a/Makefile_G1G2 ++++ b/Makefile_G1G2 +@@ -10,8 +10,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so + INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver - INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include -+# ION header location +-#INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include +-INCLUDE_HEADERS += -I$(SDKTARGETSYSROOT)/usr/include/imx ++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include +INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \ +diff --git a/Makefile_H1 b/Makefile_H1 +index 9ab62e1..8d366e3 100755 +--- a/Makefile_H1 ++++ b/Makefile_H1 +@@ -17,8 +17,8 @@ ENV += -DMEMALLOC_MODULE_PATH=\\\"/dev/ion\\\" + #ENV += -DSDRAM_LM_BASE=0x00000000 + ENV += -DEWL_NO_HW_TIMEOUT + ENV += -DUSE_ION +-#ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include +-ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx ++ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + LIBENCNAME = libcodec_enc + LIBSENC = -L./ -lhantro_h1 -lpthread diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c -index 8183660..ed37d86 100644 +index 9b057f0..43225f6 100755 --- a/decoder_sw/software/linux/dwl/dwl_linux.c +++ b/decoder_sw/software/linux/dwl/dwl_linux.c @@ -41,7 +41,7 @@ @@ -36,9 +55,22 @@ index 8183660..ed37d86 100644 #ifdef USE_ION -#include +#include + #include + #include + #ifdef ANDROID +diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c +index fef1307..20b6f95 100755 +--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c ++++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c +@@ -49,7 +49,7 @@ + + #include "linux/hx280enc.h" + #ifdef USE_ION +-#include ++#include + #include + #include #ifdef ANDROID - #include - #endif -- -2.18.0 +2.25.1 diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch b/buildroot/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch new file mode 100644 index 000000000..eb18043c4 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch @@ -0,0 +1,51 @@ +From 4f51b0a6b9a36cc56fa06eb0f76596d8e387f980 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Fri, 27 Mar 2020 23:17:30 +0100 +Subject: [PATCH] Fix build with uclibc toolchain + +From: Laurent Gauthier (OSS) + +By default, backtrace support is disabled in uclibc. In that case the +execinfo.h header file is missing, producing a build error. + +Signed-off-by: Laurent Gauthier (OSS) +Signed-off-by: Gary Bisson +--- + openmax_il/source/dbgmacros.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/openmax_il/source/dbgmacros.h b/openmax_il/source/dbgmacros.h +index 3771c91..37ae09f 100755 +--- a/openmax_il/source/dbgmacros.h ++++ b/openmax_il/source/dbgmacros.h +@@ -50,13 +50,6 @@ + # define __USE_GNU + #endif + +-#ifndef ANDROID +-#include +-#include +-#endif +-#include +-#include +- + /***************** + ** DEBUG FLAGS ** + *****************/ +@@ -76,6 +69,13 @@ + #define TRACE_FILE "trace.log" + #endif + ++#ifndef ANDROID ++#include ++#include ++#endif ++#include ++#include ++ + #ifdef LOG_IN_FILE + #define TRACE(...) \ + { \ +-- +2.25.1 + diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 4fa48fb80..7f02f9246 100644 --- a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,3 +1,3 @@ -sha256 cbc648e41f005aad209f74c9e5dd346138dca12efeb7b27e471de7474c4da302 imx-vpu-hantro-1.6.0.bin -sha256 0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a COPYING -sha256 faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a EULA +sha256 8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5 imx-vpu-hantro-1.15.0.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index a82899e64..dbdbd4dc7 100644 --- a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.6.0 +IMX_VPU_HANTRO_VERSION = 1.15.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux @@ -15,7 +15,8 @@ IMX_VPU_HANTRO_MAKE_ENV = \ $(TARGET_CONFIGURE_OPTS) \ CROSS_COMPILE="$(TARGET_CROSS)" \ SDKTARGETSYSROOT=$(STAGING_DIR) \ - LINUX_KERNEL_ROOT=$(LINUX_DIR) + LINUX_KERNEL_ROOT=$(LINUX_DIR) \ + PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING diff --git a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash index 5fa93d805..81ea35a7f 100644 --- a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash +++ b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f imx-vpu-5.4.38.bin -sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING -sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA +sha256 b7bb67b00daf436fd91a2760c2db375a962e2c919045ce8bf81bd54b95d999c5 imx-vpu-5.4.39.1.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA diff --git a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk index e30237508..e61b9f829 100644 --- a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_VERSION = 5.4.38 +IMX_VPU_VERSION = 5.4.39.1 IMX_VPU_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in index 038bd4d48..4cea37a46 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in @@ -11,6 +11,6 @@ config BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV source code of the same version as base and include fixes and improvements developed by FSL Community. - This module is only meant for NXP-based kernel up to 4.1.x. + This module is only meant for NXP-based kernel. https://github.com/Freescale/kernel-module-imx-gpu-viv diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index 19341db6b..b9b93aeb5 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ad910b7d36dc433bbbe85808d278312e9199635aaa5d00097b70ffab11bde9e6 kernel-module-imx-gpu-viv-86354002bea77acd9ce1812712e9d8485b377ec8.tar.gz +sha256 52b7425453fa32300e4779220d5deebd4a43a7525991ce3e5ce27eba909780f3 kernel-module-imx-gpu-viv-f2e8483fbda59bf2482f77efb0804c014848f749.tar.gz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index c76a5ee38..2cea11708 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = 86354002bea77acd9ce1812712e9d8485b377ec8 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = f2e8483fbda59bf2482f77efb0804c014848f749 KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 @@ -16,5 +16,9 @@ KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \ KERNEL_MODULE_IMX_GPU_VIV_MODULE_SUBDIRS = kernel-module-imx-gpu-viv-src +define KERNEL_MODULE_IMX_GPU_VIV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash index a863dbfcf..d7fb58fb6 100644 --- a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash +++ b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0dec5b78f655e175936806396b89b4997c8e543a1c84683a19ea2b6f36e01d7e freeswitch-mod-bcg729-1.0.4.tar.gz -sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195 LICENSE +sha256 ada0640094b5b3b4a767ec360213bfed624e698c9932b2f9ceb76eb1c0f5a246 freeswitch-mod-bcg729-1.0.5.tar.gz +sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195 LICENSE diff --git a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk index f92a49005..d820756c0 100644 --- a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk +++ b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_MOD_BCG729_VERSION = 1.0.4 +FREESWITCH_MOD_BCG729_VERSION = 1.0.5 FREESWITCH_MOD_BCG729_SITE = $(call github,xadhoom,mod_bcg729,v$(FREESWITCH_MOD_BCG729_VERSION)) FREESWITCH_MOD_BCG729_LICENSE = MPL-1.1 FREESWITCH_MOD_BCG729_LICENSE_FILES = LICENSE diff --git a/buildroot/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/buildroot/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch new file mode 100644 index 000000000..cd0a3ab4c --- /dev/null +++ b/buildroot/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch @@ -0,0 +1,44 @@ +From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Oct 2020 23:06:36 +0200 +Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv + 3.4.9 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use cvScalar instead of CV_RGB to avoid the following build failure with +opencv 3.4.9: + +mod_cv.cpp:693:24: error: conversion from ‘cv::Scalar {aka cv::Scalar_}’ to non-scalar type ‘CvScalar’ requested + CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); + ^ + +Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since +version 3.4.2 and +https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f + +It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/signalwire/freeswitch/pull/914] +--- + src/mod/applications/mod_cv/mod_cv.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp +index 582f925abf..bbec755e91 100644 +--- a/src/mod/applications/mod_cv/mod_cv.cpp ++++ b/src/mod/applications/mod_cv/mod_cv.cpp +@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) + //printf("WTF %d\n", object_neighbors); + //cout << "Detected " << object_neighbors << " object neighbors" << endl; + const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); +- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); ++ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); + rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); + + parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); +-- +2.28.0 + diff --git a/buildroot/package/freeswitch/Config.in b/buildroot/package/freeswitch/Config.in index bd961314e..bad101486 100644 --- a/buildroot/package/freeswitch/Config.in +++ b/buildroot/package/freeswitch/Config.in @@ -11,11 +11,13 @@ config BR2_PACKAGE_FREESWITCH select BR2_PACKAGE_JPEG # src/mod/applications/mod_cv/mod_cv.cpp includes # highgui.h, imgproc.hpp & objdetect.hpp - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_IMGPROC if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV + select BR2_PACKAGE_OPENCV3_LIB_HIGHGUI if BR2_PACKAGE_OPENCV3 + select BR2_PACKAGE_OPENCV3_LIB_IMGPROC if BR2_PACKAGE_OPENCV3 + select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_SOFIA_SIP + select BR2_PACKAGE_SPANDSP select BR2_PACKAGE_SPEEX select BR2_PACKAGE_SPEEXDSP select BR2_PACKAGE_SQLITE diff --git a/buildroot/package/freeswitch/freeswitch.hash b/buildroot/package/freeswitch/freeswitch.hash index f300e69bf..d95e05c0b 100644 --- a/buildroot/package/freeswitch/freeswitch.hash +++ b/buildroot/package/freeswitch/freeswitch.hash @@ -1,19 +1,12 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.md5 -md5 89d66f87f0f6c2471aa95aee48f55fdc freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha1 -sha1 90dac82cb4fb8fc11e399fd4bdac7163fb40259b freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha256 -sha256 1fd46dee82ecc52ac90ebab6bd454e34c64950fae7d6dc0589c8daa14bfc7d34 freeswitch-1.10.2.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.5.-release.tar.xz.sha256 +sha256 3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327 freeswitch-1.10.5.-release.tar.xz # Locally computed -sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING -sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt -sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c -sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING -sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE +sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING +sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt +sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE +sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE +sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/buildroot/package/freeswitch/freeswitch.mk b/buildroot/package/freeswitch/freeswitch.mk index 5985df4a6..721988053 100644 --- a/buildroot/package/freeswitch/freeswitch.mk +++ b/buildroot/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.2 +FREESWITCH_VERSION = 1.10.5 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -12,17 +12,12 @@ FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ Apache-2.0 (apr, apr-util), \ - LGPL-2.0+ (sofia-sip), \ - LGPL-2.1, GPL-2.0 (spandsp), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ libs/apr-util/LICENSE \ - libs/sofia-sip/COPYING \ - libs/sofia-sip/COPYRIGHTS \ - libs/spandsp/COPYING \ libs/srtp/LICENSE # required dependencies @@ -32,6 +27,8 @@ FREESWITCH_DEPENDENCIES = \ libcurl \ openssl \ pcre \ + spandsp \ + sofia-sip \ speex \ sqlite \ tiff \ @@ -277,8 +274,8 @@ FREESWITCH_DEPENDENCIES += libsoundtouch FREESWITCH_ENABLED_MODULES += applications/mod_soundtouch endif -ifeq ($(BR2_PACKAGE_OPENCV),y) -FREESWITCH_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV3),y) +FREESWITCH_DEPENDENCIES += opencv3 FREESWITCH_ENABLED_MODULES += applications/mod_cv endif diff --git a/buildroot/package/freetype/freetype.hash b/buildroot/package/freetype/freetype.hash index c4e75c327..7fc00f1c9 100644 --- a/buildroot/package/freetype/freetype.hash +++ b/buildroot/package/freetype/freetype.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.1/ -md5 bd42e75127f8431923679480efb5ba8f freetype-2.10.1.tar.xz -sha1 79874ef4eaa52025126b71d836453b8279bdd331 freetype-2.10.1.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.2/ +md5 7c0d5a39f232d7eb9f9d7da76bf08074 freetype-2.10.2.tar.xz +sha1 b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875 freetype-2.10.2.tar.xz # Locally calculated -sha256 16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f freetype-2.10.1.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT -sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT -sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT +sha256 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b freetype-2.10.2.tar.xz +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT +sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/buildroot/package/freetype/freetype.mk b/buildroot/package/freetype/freetype.mk index 9cf75d162..f4d71bedf 100644 --- a/buildroot/package/freetype/freetype.mk +++ b/buildroot/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.1 +FREETYPE_VERSION = 2.10.2 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES @@ -20,6 +20,7 @@ FREETYPE_CONF_OPTS = --without-harfbuzz HOST_FREETYPE_DEPENDENCIES = host-pkgconf HOST_FREETYPE_CONF_OPTS = \ + --without-brotli \ --without-bzip2 \ --without-harfbuzz \ --without-png \ @@ -36,6 +37,13 @@ else FREETYPE_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_BROTLI),y) +FREETYPE_DEPENDENCIES += brotli +FREETYPE_CONF_OPTS += --with-brotli +else +FREETYPE_CONF_OPTS += --without-brotli +endif + ifeq ($(BR2_PACKAGE_BZIP2),y) FREETYPE_DEPENDENCIES += bzip2 FREETYPE_CONF_OPTS += --with-bzip2 diff --git a/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch b/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch new file mode 100644 index 000000000..1eb693703 --- /dev/null +++ b/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch @@ -0,0 +1,30 @@ +From 838cb35e08eb98acbc27637808162105ae2c4549 Mon Sep 17 00:00:00 2001 +From: Michal Ruprich +Date: Wed, 17 Jun 2020 13:47:30 +0200 +Subject: [PATCH] build: find all future minor versions of python3 + +This way we can find every python from 3.8 further + +Signed-off-by: Michal Ruprich + +[Retrieved from: +https://github.com/FRRouting/frr/commit/838cb35e08eb98acbc27637808162105ae2c4549] +Signed-off-by: Fabrice Fontaine +--- + m4/ax_python.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 +index 9f43ea0ab12..91d12b99b43 100644 +--- a/m4/ax_python.m4 ++++ b/m4/ax_python.m4 +@@ -186,7 +186,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_MSG_RESULT([yes]) + + PYTHON_CFLAGS="`\"$pycfg\" --includes`" +- if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then ++ minor_ver=${py_ver#*\.} ++ if test $((minor_ver)) -gt 7; then + PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`" + else + PYTHON_LIBS="`\"$pycfg\" --ldflags`" diff --git a/buildroot/package/frr/Config.in b/buildroot/package/frr/Config.in new file mode 100644 index 000000000..911913292 --- /dev/null +++ b/buildroot/package/frr/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_FRR + bool "frr" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # libyang + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_BASH + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBNL + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_JSON_C + help + The FRRouting Protocol Suite. + + FRR is free software that implements and manages various + IPv4 and IPv6 routing protocols. + + https://frrouting.org + +comment "frr needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/frr/S50frr b/buildroot/package/frr/S50frr new file mode 100644 index 000000000..0c128353e --- /dev/null +++ b/buildroot/package/frr/S50frr @@ -0,0 +1,46 @@ +#!/bin/sh + +DAEMON="frr" + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + install -m 755 -o frr -g frr -d /var/run/frr + install -m 755 -o frr -g frr -d /var/log/frr + + printf 'Starting %s: ' "$DAEMON" + /usr/sbin/frrinit.sh start + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + /usr/sbin/frrinit.sh stop + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/buildroot/package/frr/frr.hash b/buildroot/package/frr/frr.hash new file mode 100644 index 000000000..1c8c27ec4 --- /dev/null +++ b/buildroot/package/frr/frr.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a frr-7.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/frr/frr.mk b/buildroot/package/frr/frr.mk new file mode 100644 index 000000000..6beaf776a --- /dev/null +++ b/buildroot/package/frr/frr.mk @@ -0,0 +1,70 @@ +################################################################################ +# +# frr +# +################################################################################ + +FRR_VERSION = 7.4 +FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) +FRR_LICENSE = GPL-2.0 +FRR_LICENSE_FILES = COPYING +FRR_AUTORECONF = YES + +FRR_DEPENDENCIES = host-frr readline json-c \ + libyang libnl c-ares + +HOST_FRR_DEPENDENCIES = host-flex host-bison host-python3 + +FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ + --sysconfdir=/etc/frr \ + --localstatedir=/var/run/frr \ + --with-moduledir=/usr/lib/frr/modules \ + --enable-configfile-mask=0640 \ + --enable-logfile-mask=0640 \ + --enable-multipath=256 \ + --disable-ospfclient \ + --enable-shell-access \ + --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ + --disable-capabilities \ + --enable-fpm + +HOST_FRR_CONF_OPTS = --enable-clippy-only + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FRR_CONF_ENV += LIBS=-latomic +endif + +define HOST_FRR_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/lib/clippy $(HOST_DIR)/bin/clippy +endef + +define FRR_INSTALL_CONFIG_FILES + $(foreach f,daemons daemons.conf frr.conf vtysh.conf support_bundle_commands.conf,\ + $(INSTALL) -D -m 0640 $(@D)/tools/etc/frr/$(f) \ + $(TARGET_DIR)/etc/frr/$(f) + ) + $(RM) $(TARGET_DIR)/etc/frr/*.sample +endef +FRR_POST_INSTALL_TARGET_HOOKS += FRR_INSTALL_CONFIG_FILES + +define FRR_PERMISSIONS + /etc/frr/daemons f 640 frr frr - - - - - + /etc/frr/daemons.conf f 640 frr frr - - - - - + /etc/frr/frr.conf f 640 frr frr - - - - - + /etc/frr/vtysh.conf f 640 frr frrvty - - - - - + /etc/frr/support_bundle_commands.conf f 640 frr frr +endef + +define FRR_USERS + frr -1 frr -1 * /var/run/frr - frrvty FRR user priv +endef + +define FRR_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 $(FRR_PKGDIR)/S50frr \ + $(TARGET_DIR)/etc/init.d/S50frr +endef + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/fswebcam/fswebcam.hash b/buildroot/package/fswebcam/fswebcam.hash index 28f604547..bac162678 100644 --- a/buildroot/package/fswebcam/fswebcam.hash +++ b/buildroot/package/fswebcam/fswebcam.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474 fswebcam-20140113.tar.xz +sha256 5702771cee6e3fa0f2bbbb72ecf3e5a253ff458c1f648f7e7c0d477e39f0ec80 fswebcam-e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/buildroot/package/fswebcam/fswebcam.mk b/buildroot/package/fswebcam/fswebcam.mk index 8f823f4d0..3a5b8c9ee 100644 --- a/buildroot/package/fswebcam/fswebcam.mk +++ b/buildroot/package/fswebcam/fswebcam.mk @@ -4,9 +4,8 @@ # ################################################################################ -FSWEBCAM_VERSION = 20140113 -FSWEBCAM_SOURCE = fswebcam-$(FSWEBCAM_VERSION).tar.xz -FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files +FSWEBCAM_VERSION = e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33 +FSWEBCAM_SITE = $(call github,fsphil,fswebcam,$(FSWEBCAM_VERSION)) FSWEBCAM_LICENSE = GPL-2.0 FSWEBCAM_LICENSE_FILES = LICENSE diff --git a/buildroot/package/fuse-overlayfs/Config.in b/buildroot/package/fuse-overlayfs/Config.in new file mode 100644 index 000000000..30a3372cb --- /dev/null +++ b/buildroot/package/fuse-overlayfs/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_FUSE_OVERLAYFS + bool "fuse-overlayfs" + depends on BR2_USE_MMU # libfuse3 + depends on !BR2_STATIC_LIBS # libfuse3 + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse3 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + select BR2_PACKAGE_LIBFUSE3 + help + FUSE-overlayfs is an implementation of overlay+shiftfs in + FUSE, intended to be used for rootless containers. + + http://github.com/containers/fuse-overlayfs + +comment "fuse-overlayfs needs a toolchain w/ threads, dynamic library, headers >= 3.15" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 diff --git a/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash b/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash new file mode 100644 index 000000000..0c52e05cc --- /dev/null +++ b/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 5df218732244059057686194b0e1fef66fb822d4087db48af88e1bc29bb1afde fuse-overlayfs-1.2.0.tar.gz +# Locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk b/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk new file mode 100644 index 000000000..67bd9d1c7 --- /dev/null +++ b/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# fuse-overlayfs +# +################################################################################ + +FUSE_OVERLAYFS_VERSION = 1.2.0 +FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) +FUSE_OVERLAYFS_LICENSE = GPL-3.0 +FUSE_OVERLAYFS_LICENSE_FILES = COPYING + +FUSE_OVERLAYFS_AUTORECONF = YES +FUSE_OVERLAYFS_DEPENDENCIES = libfuse3 host-pkgconf + +$(eval $(autotools-package)) diff --git a/buildroot/package/fwts/0001-build-do-not-use-Werror.patch b/buildroot/package/fwts/0001-build-do-not-use-Werror.patch index c3ea2efc2..07f64b35b 100644 --- a/buildroot/package/fwts/0001-build-do-not-use-Werror.patch +++ b/buildroot/package/fwts/0001-build-do-not-use-Werror.patch @@ -10,7 +10,7 @@ newer versions that introduce new warnings. Remove use of -Werror. Signed-off-by: Erico Nunes -[Fabrice: updated for 19.09.00] +[Fabrice: updated for 20.08.00] Signed-off-by: Fabrice Fontaine --- configure.ac | 2 +- @@ -40,9 +40,9 @@ index 52c637dd..d9d73f1c 100644 -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ - -Wno-address-of-packed-member - - bin_PROGRAMS = fwts + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ + -Wno-long-long -Wredundant-decls -Wshadow \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am index 54de7f44..e129ed16 100644 --- a/src/lib/src/Makefile.am diff --git a/buildroot/package/fwts/Config.in b/buildroot/package/fwts/Config.in index 269f065fd..ff28a4a40 100644 --- a/buildroot/package/fwts/Config.in +++ b/buildroot/package/fwts/Config.in @@ -2,13 +2,11 @@ config BR2_PACKAGE_FWTS bool "fwts" depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBBSD help Firmware Test Suite (FWTS) is a test suite that performs @@ -36,7 +34,6 @@ endif comment "fwts needs a glibc toolchain w/ wchar, threads" depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd - depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/fwts/fwts.hash b/buildroot/package/fwts/fwts.hash index 633807773..9b0567315 100644 --- a/buildroot/package/fwts/fwts.hash +++ b/buildroot/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 91075982d067deef86d2830d622c27ed5f5c0b04dfd712902343a67fee753bfd fwts-V19.09.00.tar.gz +sha256 bfe7993f1dd328b96a90ecfe92df67063df21afe4b4a103e498da6625c7c71b7 fwts-V20.08.00.tar.gz # Hash for license file -sha256 9cfdcde669bcdbd2eb640dca6ed3f9b5ae381d100ac208f9dca6e12e61ad639c debian/copyright +sha256 379eab3c1071a6f5b8acd3632586577ec9c47ef10601b10467e890b8ff8b3842 debian/copyright diff --git a/buildroot/package/fwts/fwts.mk b/buildroot/package/fwts/fwts.mk index 853f27af4..e4e9defeb 100644 --- a/buildroot/package/fwts/fwts.mk +++ b/buildroot/package/fwts/fwts.mk @@ -4,14 +4,14 @@ # ################################################################################ -FWTS_VERSION = 19.09.00 +FWTS_VERSION = 20.08.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom FWTS_LICENSE_FILES = debian/copyright FWTS_AUTORECONF = YES -FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 libbsd \ +FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) diff --git a/buildroot/package/fwup/Config.in b/buildroot/package/fwup/Config.in index fd40cf326..0e3c57d33 100644 --- a/buildroot/package/fwup/Config.in +++ b/buildroot/package/fwup/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_FWUP # required by libarchive to include zip compression select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBSODIUM help Fwup is a scriptable embedded Linux firmware update creator and runner. diff --git a/buildroot/package/fwup/fwup.hash b/buildroot/package/fwup/fwup.hash index 337883f9a..87263192e 100644 --- a/buildroot/package/fwup/fwup.hash +++ b/buildroot/package/fwup/fwup.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20302dc96cef88438034e15551e178bb0652c28d99aa7ca5260100cb3bebbc2a fwup-1.2.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9890f0328796f4315e6c1188df5c103855c530fbc14fbc8c12f4b24066c975f1 fwup-1.8.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/fwup/fwup.mk b/buildroot/package/fwup/fwup.mk index e1e546776..77eaa528f 100644 --- a/buildroot/package/fwup/fwup.mk +++ b/buildroot/package/fwup/fwup.mk @@ -4,12 +4,12 @@ # ################################################################################ -FWUP_VERSION = 1.2.5 +FWUP_VERSION = 1.8.0 FWUP_SITE = $(call github,fhunleth,fwup,v$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE -FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive libsodium -HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive host-libsodium +FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive +HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive FWUP_AUTORECONF = YES FWUP_CONF_ENV = ac_cv_path_HELP2MAN="" diff --git a/buildroot/package/gauche/0001-fix-so-suffix.patch b/buildroot/package/gauche/0001-fix-so-suffix.patch deleted file mode 100644 index 8a0937681..000000000 --- a/buildroot/package/gauche/0001-fix-so-suffix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cefd57f76f7faec4143bf1e42ed148cad973c1f4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 12 Aug 2019 23:17:21 +0200 -Subject: [PATCH] configure.ac: fix so suffix - -With uclibc or musl configuration, $host does not match to '*-linux-gnu*'. - -Signed-off-by: Hiroshi Kawashima -[Retrieved (and slightly updated) from: -https://git.buildroot.net/buildroot/tree/package/gauche/0001-fix-so-suffix.patch] -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/shirok/Gauche/pull/508] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 15092a2d6..b82b762a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -641,7 +641,7 @@ AS_CASE([$host], - SHLIB_MAIN_LDFLAGS="" - SHLIB_OK=ok - ], -- [*-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*], [ -+ [*-linux-*|*-*-gnu*|*freebsd*|*dragonfly*], [ - SHLIB_SO_CFLAGS="-fPIC" - SHLIB_SO_LDFLAGS="$rpath -shared -o" - SHLIB_SO_SUFFIX="so" --- -2.20.1 - diff --git a/buildroot/package/gauche/gauche.hash b/buildroot/package/gauche/gauche.hash index 600c46fbd..dea23c1e3 100644 --- a/buildroot/package/gauche/gauche.hash +++ b/buildroot/package/gauche/gauche.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gauche/files/Gauche/ -sha1 ff7878ab19c56b49b4b6d77009300a3592cc903c Gauche-0.9.8.tgz -md5 efd1b12cd5708d9e1e4358ab2d2e1e32 Gauche-0.9.8.tgz +sha1 ad5e15021764b733ec913cca8b77c9a53d4ee997 Gauche-0.9.9.tgz +md5 20d8ed835ae0bc97cceed78a71f9857b Gauche-0.9.9.tgz # Locally calculated -sha256 3eb30d1051d8b48999fe46511c9f6983057735312c9832b7db13f9db140db74b Gauche-0.9.8.tgz -sha256 d537f80c0bb3cc203bc2675b766b9de9573243026fa3e8ad78368abd4b14aac8 COPYING +sha256 4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb Gauche-0.9.9.tgz +sha256 13cb582677dbcdc5b34313c59b4a014e74ef2f5fd80e514a0bd98fd8a4e45bed COPYING diff --git a/buildroot/package/gauche/gauche.mk b/buildroot/package/gauche/gauche.mk index 2a30a2b39..252037936 100644 --- a/buildroot/package/gauche/gauche.mk +++ b/buildroot/package/gauche/gauche.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAUCHE_VERSION = 0.9.8 +GAUCHE_VERSION = 0.9.9 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) diff --git a/buildroot/package/gawk/gawk.hash b/buildroot/package/gawk/gawk.hash index f80f2b202..91e506607 100644 --- a/buildroot/package/gawk/gawk.hash +++ b/buildroot/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.0.1.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794 gawk-5.0.1.tar.xz +sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gawk/gawk.mk b/buildroot/package/gawk/gawk.mk index 1a5f87f60..16906f6f9 100644 --- a/buildroot/package/gawk/gawk.mk +++ b/buildroot/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.0.1 +GAWK_VERSION = 5.1.0 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk diff --git a/buildroot/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch deleted file mode 100644 index 75ad53605..000000000 --- a/buildroot/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport from upstream, see -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.5.0.orig/gcc/config/m68k/m68k.c gcc-5.5.0/gcc/config/m68k/m68k.c ---- gcc-5.5.0.orig/gcc/config/m68k/m68k.c 2015-01-15 14:28:42.000000000 +0100 -+++ gcc-5.5.0/gcc/config/m68k/m68k.c 2018-02-17 19:34:33.146309632 +0100 -@@ -196,6 +196,8 @@ - const_tree, bool); - static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); - static bool m68k_output_addr_const_extra (FILE *, rtx); -+static machine_mode m68k_promote_function_mode (const_tree, machine_mode, -+ int *, const_tree, int); - static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; - - /* Initialize the GCC target structure. */ -@@ -338,6 +340,9 @@ - #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL - #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 - -+#undef TARGET_PROMOTE_FUNCTION_MODE -+#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode -+ - static const struct attribute_spec m68k_attribute_table[] = - { - /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, -@@ -6548,4 +6553,20 @@ - == m68k_fk_interrupt_handler)); - } - -+/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ -+ -+static machine_mode -+m68k_promote_function_mode (const_tree type, machine_mode mode, -+ int *punsignedp ATTRIBUTE_UNUSED, -+ const_tree fntype ATTRIBUTE_UNUSED, -+ int for_return) -+{ -+ /* Promote libcall arguments narrower than int to match the normal C -+ ABI (for which promotions are handled via -+ TARGET_PROMOTE_PROTOTYPES). */ -+ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) -+ return SImode; -+ return mode; -+} -+ - #include "gt-m68k.h" diff --git a/buildroot/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch b/buildroot/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch deleted file mode 100644 index 6e73331ea..000000000 --- a/buildroot/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001 -From: hjl -Date: Thu, 24 May 2018 20:21:54 +0000 -Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux - -Cherry-pick compiler-rt revision 333213: - - has been removed from glibc 2.28 by: - -commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 -Author: Adhemerval Zanella -Date: Sun Mar 18 11:28:59 2018 +0800 - - Deprecate ustat syscall interface - -This patch uses pre-computed size of struct ustat for Linux. - - PR sanitizer/85835 - * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't - include for Linux. - (SIZEOF_STRUCT_USTAT): New. - (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4 - -Downloaded from upstream commit -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b - -Signed-off-by: Bernd Kuhls ---- - libsanitizer/ChangeLog | 8 ++++++++ - .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 31a5e69..8017afd 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include - #include - #include - #include -@@ -247,7 +246,19 @@ namespace __sanitizer { - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); -+ // Use pre-computed size of struct ustat to avoid which -+ // has been removed from glibc 2.28. -+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ -+ || defined(__x86_64__) -+#define SIZEOF_STRUCT_USTAT 32 -+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ -+ || defined(__powerpc__) || defined(__s390__) -+#define SIZEOF_STRUCT_USTAT 20 -+#else -+#error Unknown size of struct ustat -+#endif -+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID --- -2.9.3 - diff --git a/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch b/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a..000000000 --- a/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index c11ad35aa..000000000 --- a/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 4a7cbd2..9cc765e 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -439,7 +439,7 @@ powerpc*-*-*) - cpu_type=rs6000 - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac --- -2.6.2 - diff --git a/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch b/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa4..000000000 --- a/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1b..000000000 --- a/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch b/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch deleted file mode 100644 index b73005918..000000000 --- a/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch deleted file mode 100644 index d8c74f959..000000000 --- a/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 89bd94250827f887b38211ac048b4006229dc9c0 Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Fri, 26 Aug 2016 10:23:20 +0000 -Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton - - PR target/70473 - * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce - reservation duration to 15 cycles. - (cortex_a8_vfp_macs): Likewise. - (cortex_a8_vfp_macd): Likewise. - (cortex_a8_vfp_divs): Likewise. - (cortex_a8_vfp_divd): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] -Signed-off-by: Thomas Petazzoni ---- - gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md -index 04fa01e..4e6d05d 100644 ---- a/gcc/config/arm/cortex-a8-neon.md -+++ b/gcc/config/arm/cortex-a8-neon.md -@@ -357,30 +357,34 @@ - (eq_attr "type" "fmuls")) - "cortex_a8_vfp,cortex_a8_vfplite*11") - -+;; Don't model a reservation for more than 15 cycles as this explodes the -+;; state space of the automaton for little gain. It is unlikely that the -+;; scheduler will find enough instructions to hide the full latency of the -+;; instructions. - (define_insn_reservation "cortex_a8_vfp_muld" 17 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmuld")) -- "cortex_a8_vfp,cortex_a8_vfplite*16") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macs" 21 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacs,ffmas")) -- "cortex_a8_vfp,cortex_a8_vfplite*20") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macd" 26 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacd,ffmad")) -- "cortex_a8_vfp,cortex_a8_vfplite*25") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divs" 37 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivs, fsqrts")) -- "cortex_a8_vfp,cortex_a8_vfplite*36") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divd" 65 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivd, fsqrtd")) -- "cortex_a8_vfp,cortex_a8_vfplite*64") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - ;; Comparisons can actually take 7 cycles sometimes instead of four, - ;; but given all the other instructions lumped into type=ffarith that --- -2.7.4 - diff --git a/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch b/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch deleted file mode 100644 index 9d29090a2..000000000 --- a/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch +++ /dev/null @@ -1,166 +0,0 @@ -Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc - -From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001 -From: "Edgar E. Iglesias" -Date: Mon, 18 Jun 2012 20:18:13 +0200 -Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support. - -Changelog - -2013-03-18 Edgar E. Iglesias - David Holsgrove - - * common/config/microblaze/microblaze-common.c: Remove - TARGET_EXCEPT_UNWIND_INFO definition. - * config/microblaze/microblaze-protos.h: Add - microblaze_eh_return prototype. - * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register, - microblaze_expand_epilogue, microblaze_return_addr): Handle - calls_eh_return - (microblaze_eh_return): New function. - * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET, - EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX, - ASM_PREFERRED_EH_DATA_FORMAT - * gcc/config/microblaze/microblaze.md: Define eh_return pattern. - -Signed-off-by: David Holsgrove -Signed-off-by: Edgar E. Iglesias ---- - gcc/common/config/microblaze/microblaze-common.c | 3 --- - gcc/config/microblaze/microblaze-protos.h | 1 + - gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++---- - gcc/config/microblaze/microblaze.h | 15 ++++++++++++ - gcc/config/microblaze/microblaze.md | 11 +++++++++ - 5 files changed, 52 insertions(+), 7 deletions(-) - -Index: b/gcc/common/config/microblaze/microblaze-common.c -=================================================================== ---- a/gcc/common/config/microblaze/microblaze-common.c -+++ b/gcc/common/config/microblaze/microblaze-common.c -@@ -37,7 +37,4 @@ - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table - --#undef TARGET_EXCEPT_UNWIND_INFO --#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info -- - struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; -Index: b/gcc/config/microblaze/microblaze-protos.h -=================================================================== ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -56,6 +56,7 @@ - extern int symbol_mentioned_p (rtx); - extern int label_mentioned_p (rtx); - extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); -+extern void microblaze_eh_return (rtx op0); - #endif /* RTX_CODE */ - - /* Declare functions in microblaze-c.c. */ -Index: b/gcc/config/microblaze/microblaze.c -=================================================================== ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -1959,6 +1959,11 @@ - if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) - return 1; - -+ if (crtl->calls_eh_return -+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) { -+ return 1; -+ } -+ - if (!crtl->is_leaf) - { - if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -@@ -1986,6 +1991,13 @@ - return 1; - } - -+ if (crtl->calls_eh_return -+ && (regno == EH_RETURN_DATA_REGNO (0) -+ || regno == EH_RETURN_DATA_REGNO (1))) -+ { -+ return 1; -+ } -+ - return 0; - } - -@@ -3067,6 +3079,12 @@ - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); - } - -+ if (crtl->calls_eh_return) -+ emit_insn (gen_addsi3 (stack_pointer_rtx, -+ stack_pointer_rtx, -+ gen_rtx_raw_REG (SImode, -+ MB_EH_STACKADJ_REGNUM))); -+ - emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + - MB_ABI_SUB_RETURN_ADDR_REGNUM))); - } -@@ -3364,10 +3382,13 @@ - if (count != 0) - return NULL_RTX; - -- return gen_rtx_PLUS (Pmode, -- get_hard_reg_initial_val (Pmode, -- MB_ABI_SUB_RETURN_ADDR_REGNUM), -- GEN_INT (8)); -+ return get_hard_reg_initial_val (Pmode, -+ MB_ABI_SUB_RETURN_ADDR_REGNUM); -+} -+ -+void microblaze_eh_return (rtx op0) -+{ -+ emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0)); - } - - /* Queue an .ident string in the queue of top-level asm statements. -Index: b/gcc/config/microblaze/microblaze.h -=================================================================== ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -184,6 +184,21 @@ - #define INCOMING_RETURN_ADDR_RTX \ - gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) - -+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ -+#define RETURN_ADDR_OFFSET (8) -+ -+/* Describe how we implement __builtin_eh_return. */ -+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) -+ -+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM -+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) -+ -+/* Select a format to encode pointers in exception handling data. CODE -+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is -+ true if the symbol may be affected by dynamic relocations. */ -+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ -+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) -+ - /* Use DWARF 2 debugging information by default. */ - #define DWARF2_DEBUGGING_INFO - #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -Index: b/gcc/config/microblaze/microblaze.md -=================================================================== ---- a/gcc/config/microblaze/microblaze.md -+++ b/gcc/config/microblaze/microblaze.md -@@ -2272,4 +2272,15 @@ - (set_attr "mode" "SI") - (set_attr "length" "4")]) - -+; This is used in compiling the unwind routines. -+(define_expand "eh_return" -+ [(use (match_operand 0 "general_operand" ""))] -+ "" -+ " -+{ -+ microblaze_eh_return(operands[0]); -+ DONE; -+}") -+ - (include "sync.md") -+ diff --git a/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch b/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 9e97d945d..000000000 --- a/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -5239,7 +5239,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -992,7 +992,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // Precision is always used except for hexfloat format. - const bool __use_prec = - (__io.flags() & ios_base::floatfield) != ios_base::floatfield; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -578,7 +578,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -195,7 +195,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -192,7 +192,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch b/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f55..000000000 --- a/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch b/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index aa1376c44..000000000 --- a/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md -index 30f4c1f..773d4f9 100644 ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h -index e59bede..12056f7 100644 ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index 675aacf..5b0243a 100644 ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md -index e02209e..d7dfa11 100644 ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..206ff80 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands) - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return !TARGET_WINDOWED_ABI -@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode) - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter) - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..0e673a3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -761,8 +761,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -774,15 +774,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -796,21 +797,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -881,7 +883,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -896,8 +898,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -912,13 +914,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -991,7 +994,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1002,8 +1005,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt -index 2fd6cee..21c6e96 100644 ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ mtext-section-literals - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions --- -1.8.1.4 - diff --git a/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch b/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index 4056f8b8e..000000000 --- a/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 40507bf199440082ed69b777986d50c31efe2520 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 4d451c8..ef0703f 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif - retw -+#else -+ mov a8, a8 -+ retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - #endif - -@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch b/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 23db3d863..000000000 --- a/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index c52f5a8..56797bd 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2995,6 +2995,11 @@ xtensa*-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h -new file mode 100644 -index 0000000..4606020 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC 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, or (at your option) any later -+version. -+ -+GCC 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 GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt -new file mode 100644 -index 0000000..95ef777 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC 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, or (at your option) any later -+; version. -+; -+; GCC 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 GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -diff --git a/libgcc/config.host b/libgcc/config.host -index 2c64756..2ee92c1 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1295,6 +1295,11 @@ xtensa*-*-linux*) - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" --- -1.8.1.4 - diff --git a/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch b/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch deleted file mode 100644 index 870b079e3..000000000 --- a/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2b4b5775554c91a63ccae4ee566db696b633652e Mon Sep 17 00:00:00 2001 -From: jcmvbkbc -Date: Wed, 10 Jun 2015 15:07:40 +0000 -Subject: [PATCH] xtensa: implement trap pattern - -2015-06-10 Max Filippov -gcc/ - * config/xtensa/xtensa.h (TARGET_DEBUG): New definition. - * config/xtensa/xtensa.md (define_attr "type"): New type "trap". - (define_insn "trap"): New definition. - -Signed-off-by: Max Filippov - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224330 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/config/xtensa/xtensa.h | 1 + - gcc/config/xtensa/xtensa.md | 15 ++++++++++++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h -index 615f741..fb8702c 100644 ---- a/gcc/config/xtensa/xtensa.h -+++ b/gcc/config/xtensa/xtensa.h -@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size; - #define TARGET_THREADPTR XCHAL_HAVE_THREADPTR - #define TARGET_LOOPS XCHAL_HAVE_LOOPS - #define TARGET_WINDOWED_ABI (XSHAL_ABI == XTHAL_ABI_WINDOWED) -+#define TARGET_DEBUG XCHAL_HAVE_DEBUG - - #define TARGET_DEFAULT \ - ((XCHAL_HAVE_L32R ? 0 : MASK_CONST16) | \ -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..a577aa3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -86,7 +86,7 @@ - ;; Attributes. - - (define_attr "type" -- "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry" -+ "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap" - (const_string "unknown")) - - (define_attr "mode" -@@ -1764,6 +1764,19 @@ - [(set_attr "length" "0") - (set_attr "type" "nop")]) - -+(define_insn "trap" -+ [(trap_if (const_int 1) (const_int 0))] -+ "" -+{ -+ if (TARGET_DEBUG) -+ return "break\t1, 15"; -+ else -+ return (TARGET_DENSITY ? "ill.n" : "ill"); -+} -+ [(set_attr "type" "trap") -+ (set_attr "mode" "none") -+ (set_attr "length" "3")]) -+ - ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't - ;; know if a frame pointer is required until the reload pass, and - ;; because there may be an incoming argument value in the hard frame --- -2.1.4 - diff --git a/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch b/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch deleted file mode 100644 index 7a8c843e5..000000000 --- a/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 920a898d2a04933c13eb808a513bc5822e91f70a Mon Sep 17 00:00:00 2001 -From: sandra -Date: Tue, 12 May 2015 15:57:22 +0000 -Subject: [PATCH] gcc/nios2: Add IJMP_REGS enum - -2015-05-12 Chung-Lin Tang - Sandra Loosemore - - gcc/ - * config/nios2/nios2.h (enum reg_class): Add IJMP_REGS enum - value. - (REG_CLASS_NAMES): Add "IJMP_REGS". - (REG_CLASS_CONTENTS): Add new entry for IJMP_REGS. - * config/nios2/nios2.md (indirect_jump,*tablejump): Adjust to - use new "c" register constraint. - * config/nios2/constraint.md (c): New register constraint - corresponding to IJMP_REGS. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223082 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Romain: rebase on gcc 5.4] -Signed-off-by: Romain Naour ---- - gcc/config/nios2/constraints.md | 3 +++ - gcc/config/nios2/nios2.h | 11 +++++++---- - gcc/config/nios2/nios2.md | 4 ++-- - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/nios2/constraints.md b/gcc/config/nios2/constraints.md -index f4bd9f7..735f892 100644 ---- a/gcc/config/nios2/constraints.md -+++ b/gcc/config/nios2/constraints.md -@@ -39,6 +39,9 @@ - - ;; Register constraints - -+(define_register_constraint "c" "IJMP_REGS" -+ "A register suitable for an indirect jump.") -+ - (define_register_constraint "j" "SIB_REGS" - "A register suitable for an indirect sibcall.") - -diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h -index 117983d..7c329ae 100644 ---- a/gcc/config/nios2/nios2.h -+++ b/gcc/config/nios2/nios2.h -@@ -173,6 +173,7 @@ enum reg_class - { - NO_REGS, - SIB_REGS, -+ IJMP_REGS, - GP_REGS, - ALL_REGS, - LIM_REG_CLASSES -@@ -183,6 +184,7 @@ enum reg_class - #define REG_CLASS_NAMES \ - { "NO_REGS", \ - "SIB_REGS", \ -+ "IJMP_REGS", \ - "GP_REGS", \ - "ALL_REGS" } - -@@ -190,10 +192,11 @@ enum reg_class - - #define REG_CLASS_CONTENTS \ - { \ -- /* NO_REGS */ { 0, 0}, \ -- /* SIB_REGS */ { 0xfe0c, 0}, \ -- /* GP_REGS */ {~0, 0}, \ -- /* ALL_REGS */ {~0,~0} \ -+ /* NO_REGS */ { 0, 0}, \ -+ /* SIB_REGS */ { 0xfe0c, 0}, \ -+ /* IJMP_REGS */ { 0x7fffffff, 0}, \ -+ /* GP_REGS */ {~0, 0}, \ -+ /* ALL_REGS */ {~0,~0} \ - } - - -diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md -index 7b35d269..36ef101 100644 ---- a/gcc/config/nios2/nios2.md -+++ b/gcc/config/nios2/nios2.md -@@ -697,7 +697,7 @@ - ; check or adjust for overflow. - - (define_insn "indirect_jump" -- [(set (pc) (match_operand:SI 0 "register_operand" "r"))] -+ [(set (pc) (match_operand:SI 0 "register_operand" "c"))] - "" - "jmp\\t%0" - [(set_attr "type" "control")]) -@@ -811,7 +811,7 @@ - - (define_insn "*tablejump" - [(set (pc) -- (match_operand:SI 0 "register_operand" "r")) -+ (match_operand:SI 0 "register_operand" "c")) - (use (label_ref (match_operand 1 "" "")))] - "" - "jmp\\t%0" --- -2.5.5 - diff --git a/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch b/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch deleted file mode 100644 index 6e63de0cd..000000000 --- a/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c ---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c 2015-01-05 13:33:28.000000000 +0100 -+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c 2016-03-19 09:25:07.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch b/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch deleted file mode 100644 index fdf4ee724..000000000 --- a/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000) -Subject: libitm fixes for musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338 - -libitm fixes for musl support - -On behalf of Szabolcs.Nagy@arm.com - -2015-04-22 Gregor Richards - - * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h. - * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,7 @@ - - #ifdef __linux__ - #include --#include -+#include - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H diff --git a/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch b/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch deleted file mode 100644 index 13c08d6b9..000000000 --- a/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:18:16 +0000 (+0000) -Subject: fixincludes update for musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2dc727de2e87c2756a514cbb43cea23c99deaa3d - -fixincludes update for musl support - -On behalf of Szabolcs.Nagy@arm.com - -2015-04-22 Gregor Richards - - * mkfixinc.sh: Add *-musl* with no fixes. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} diff --git a/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch b/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch deleted file mode 100644 index ef470540d..000000000 --- a/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000) -Subject: unwind fix for musl -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4 - -unwind fix for musl - -On behalf of szabolcs.nagy@arm.com - -2015-04-22 Gregor Richards - Szabolcs Nagy - - * unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on - Linux if target provides dl_iterate_phdr. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -59,6 +59,12 @@ - - #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ - && defined(TARGET_DL_ITERATE_PHDR) \ -+ && defined(__linux__) -+# define USE_PT_GNU_EH_FRAME -+#endif -+ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) \ - && (defined(__DragonFly__) || defined(__FreeBSD__)) - # define ElfW __ElfN - # define USE_PT_GNU_EH_FRAME diff --git a/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch deleted file mode 100644 index c85213125..000000000 --- a/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:24:11 +0000 (+0000) -Subject: libstdc++, libgfortran gthr workaround for musl -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=1e5f711c11cb80ce609db9e9c1d8b2da0f7b5b61 - -libstdc++, libgfortran gthr workaround for musl - -On behalf of szabolcs.nagy@arm.com - -[libstdc++-v3/] -2015-04-22 Szabolcs Nagy - - * config/os/generic/os_defines.h (_GLIBCXX_GTHREAD_USE_WEAK): Define. - * configure.host (os_include_dir): Set to "os/generic" for linux-musl*. - -[libgfortran/] -2015-04-22 Szabolcs Nagy - - * acinclude.m4 (GTHREAD_USE_WEAK): Define as 0 for *-*-musl*. - * configure: Regenerate. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libgfortran/acinclude.m4 -=================================================================== ---- a/libgfortran/acinclude.m4 -+++ b/libgfortran/acinclude.m4 -@@ -100,7 +100,7 @@ - [Define to 1 if the target supports #pragma weak]) - fi - case "$host" in -- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) -+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) - AC_DEFINE(GTHREAD_USE_WEAK, 0, - [Define to 0 if the target shouldn't use #pragma weak]) - ;; -Index: b/libgfortran/configure -=================================================================== ---- a/libgfortran/configure -+++ b/libgfortran/configure -@@ -26447,7 +26447,7 @@ - - fi - case "$host" in -- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) -+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) - - $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h - -Index: b/libstdc++-v3/config/os/generic/os_defines.h -=================================================================== ---- a/libstdc++-v3/config/os/generic/os_defines.h -+++ b/libstdc++-v3/config/os/generic/os_defines.h -@@ -33,4 +33,9 @@ - // System-specific #define, typedefs, corrections, etc, go here. This - // file will come before all others. - -+// Disable the weak reference logic in gthr.h for os/generic because it -+// is broken on every platform unless there is implementation specific -+// workaround in gthr-posix.h and at link-time for static linking. -+#define _GLIBCXX_GTHREAD_USE_WEAK 0 -+ - #endif -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -271,6 +271,9 @@ - freebsd*) - os_include_dir="os/bsd/freebsd" - ;; -+ linux-musl*) -+ os_include_dir="os/generic" -+ ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" diff --git a/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch b/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch deleted file mode 100644 index 85491406c..000000000 --- a/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch +++ /dev/null @@ -1,285 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 08:25:47 +0000 (+0000) -Subject: [PATCH 2/13] musl libc config -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29c16f8ef226fbf98af373a4b2ceb - -[PATCH 2/13] musl libc config - -2015-05-08 Gregor Richards - Szabolcs Nagy - - * config.gcc (LIBC_MUSL): New tm_defines macro. - * config/linux.h (OPTION_MUSL): Define. - (MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,) - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,) - (INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,) - (INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,) - (INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define. - * config/linux.opt (mmusl): New option. - * doc/invoke.texi (GNU/Linux Options): Document -mmusl. - * configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*. - (gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*. - * configure: Regenerate. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -575,7 +575,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # 32-bit x86 processors supported by --with-arch=. Each processor - # MUST be separated by exactly one space. -@@ -720,6 +720,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -50,21 +52,25 @@ - } while (0) - - /* Determine which dynamic linker to use depending on whether GLIBC or -- uClibc or Bionic is the default C library and whether -- -muclibc or -mglibc or -mbionic has been passed to change the default. */ -+ uClibc or Bionic or musl is the default C library and whether -+ -muclibc or -mglibc or -mbionic or -mmusl has been passed to change -+ the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -81,24 +87,100 @@ - #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" -+/* Should be redefined for each target that supports musl. */ -+#define MUSL_DYNAMIC_LINKER "/dev/null" -+#define MUSL_DYNAMIC_LINKER32 "/dev/null" -+#define MUSL_DYNAMIC_LINKER64 "/dev/null" -+#define MUSL_DYNAMIC_LINKERX32 "/dev/null" - - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) - - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) - -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -+ - #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ - /* This is a *uclinux* target. We don't define below macros to normal linux - versions, because doing so would require *uclinux* targets to include -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -28,5 +28,9 @@ - Use GNU C library - - muclibc --Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) -+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic) -+Use musl C library -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -27809,6 +27813,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5298,6 +5302,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/doc/invoke.texi -=================================================================== ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -667,7 +667,7 @@ - -mcpu=@var{cpu}} - - @emph{GNU/Linux Options} --@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol -+@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol - -tno-android-cc -tno-android-ld} - - @emph{H8/300 Options} -@@ -15324,13 +15324,19 @@ - @item -mglibc - @opindex mglibc - Use the GNU C library. This is the default except --on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets. -+on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and -+@samp{*-*-linux-*android*} targets. - - @item -muclibc - @opindex muclibc - Use uClibc C library. This is the default on - @samp{*-*-linux-*uclibc*} targets. - -+@item -mmusl -+@opindex mmusl -+Use the musl C library. This is the default on -+@samp{*-*-linux-*musl*} targets. -+ - @item -mbionic - @opindex mbionic - Use Bionic C library. This is the default on diff --git a/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch b/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch deleted file mode 100644 index 92e743685..000000000 --- a/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch +++ /dev/null @@ -1,130 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 08:30:40 +0000 (+0000) -Subject: [PATCH 0/13] Add musl support to GCC -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e - -[PATCH 0/13] Add musl support to GCC - -2015-05-08 Szabolcs Nagy - - * config/glibc-stdint.h (OPTION_MUSL): Define. - (INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE): - Change the definition based on OPTION_MUSL for 64 bit targets. - * config/linux.h (OPTION_MUSL): Redefine. - * config/alpha/linux.h (OPTION_MUSL): Redefine. - * config/rs6000/linux.h (OPTION_MUSL): Redefine. - * config/rs6000/linux64.h (OPTION_MUSL): Redefine. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/alpha/linux.h -=================================================================== ---- a/gcc/config/alpha/linux.h -+++ b/gcc/config/alpha/linux.h -@@ -61,10 +61,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; -Index: b/gcc/config/glibc-stdint.h -=================================================================== ---- a/gcc/config/glibc-stdint.h -+++ b/gcc/config/glibc-stdint.h -@@ -22,6 +22,12 @@ - see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - . */ - -+/* Systems using musl libc should use this header and make sure -+ OPTION_MUSL is defined correctly before using the TYPE macros. */ -+#ifndef OPTION_MUSL -+#define OPTION_MUSL 0 -+#endif -+ - #define SIG_ATOMIC_TYPE "int" - - #define INT8_TYPE "signed char" -@@ -43,12 +49,12 @@ - #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") - - #define INT_FAST8_TYPE "signed char" --#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") --#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") -+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") -+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") - #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int") - #define UINT_FAST8_TYPE "unsigned char" --#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") --#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") -+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") -+#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") - #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") - - #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,11 +32,13 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL - #define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL - #define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - -Index: b/gcc/config/rs6000/linux.h -=================================================================== ---- a/gcc/config/rs6000/linux.h -+++ b/gcc/config/rs6000/linux.h -@@ -30,10 +30,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -299,10 +299,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; diff --git a/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch b/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch deleted file mode 100644 index 6b473f989..000000000 --- a/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 15:16:50 +0000 (+0000) -Subject: [PATCH 6/13] mips musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c887472b587bef87d433c51cf1ebc8 - -[PATCH 6/13] mips musl support - -2015-05-08 Gregor Richards - Szabolcs Nagy - - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Define. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Define. - (GNU_USER_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -37,7 +37,13 @@ - #define UCLIBC_DYNAMIC_LINKERN32 \ - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) diff --git a/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch b/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch deleted file mode 100644 index 3f2fe5df7..000000000 --- a/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: ktkachov -Date: Fri, 15 May 2015 13:20:01 +0000 (+0000) -Subject: [PATCH 9/13] x86 musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c - -[PATCH 9/13] x86 musl support - -On behalf of Szabolcs Nagy. - -2015-05-15 Gregor Richards - - * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define. - * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,6 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" diff --git a/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch b/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch deleted file mode 100644 index 906355a79..000000000 --- a/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: ktkachov -Date: Wed, 27 May 2015 13:17:11 +0000 (+0000) -Subject: [PATCH 4/13] arm musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=de799bd087ab9a179768fea75bd195a31d3432a4 - -[PATCH 4/13] arm musl support - -On behalf of szabolcs.nagy@arm.com - -2015-05-27 Gregor Richards - - * config/arm/linux-eabi.h (MUSL_DYNAMIC_LINKER): Define. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC diff --git a/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch b/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch deleted file mode 100644 index 3d032f51b..000000000 --- a/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: jgreenhalgh -Date: Wed, 27 May 2015 16:46:39 +0000 (+0000) -Subject: [PATCH 3/13] aarch64 musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=b3ff21cf0531be91bc3fb8200296a7633090ec78 - -[PATCH 3/13] aarch64 musl support - -gcc/Changelog: - -2015-05-27 Gregor Richards - Szabolcs Nagy - - * config/aarch64/aarch64-linux.h (MUSL_DYNAMIC_LINKER): Define. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -23,6 +23,9 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+ - #undef ASAN_CC1_SPEC - #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" - diff --git a/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch b/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch deleted file mode 100644 index 6fe499340..000000000 --- a/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add dynamic linker support for uClibc-ng/musl - -Signed-off-by: Waldemar Brodkorb - - -diff -Nur gcc-5.4.0.orig/gcc/config/microblaze/linux.h gcc-5.4.0/gcc/config/microblaze/linux.h ---- gcc-5.4.0.orig/gcc/config/microblaze/linux.h 2015-05-28 16:08:19.000000000 +0200 -+++ gcc-5.4.0/gcc/config/microblaze/linux.h 2016-10-23 17:09:46.962010871 +0200 -@@ -28,7 +28,26 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+ -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+ -+#if DEFAULT_LIBC == LIBC_UCLIBC -+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } diff --git a/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch b/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch deleted file mode 100644 index f4905a423..000000000 --- a/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch +++ /dev/null @@ -1,75 +0,0 @@ -Add support for musl on ppc32 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h ---- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 15:46:45.000000000 +0200 -+++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-11-27 13:12:33.226953738 +0100 -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #undef CC1_SPEC -@@ -757,17 +760,23 @@ - - #define LINK_START_LINUX_SPEC "" - -+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -889,6 +898,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h gcc-5.4.0/gcc/config/rs6000/sysv4le.h ---- gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h 2015-09-24 15:46:45.000000000 +0200 -+++ gcc-5.4.0/gcc/config/rs6000/sysv4le.h 2016-11-27 13:12:33.226953738 +0100 -@@ -31,3 +31,5 @@ - /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */ - #define LINUX64_DEFAULT_ABI_ELFv2 - -+#undef MUSL_DYNAMIC_LINKER_E -+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le") -diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc ---- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200 -+++ gcc-5.4.0/gcc/config.gcc 2016-11-27 13:14:17.149638148 +0100 -@@ -2413,6 +2413,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ powerpc*-*-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi diff --git a/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch b/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch deleted file mode 100644 index 6fdfacc6e..000000000 --- a/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6e9cad5fc3bdd0a1fa24ae172d4d4c1e3179a51c Mon Sep 17 00:00:00 2001 -From: nsz -Date: Tue, 20 Oct 2015 18:13:15 +0000 -Subject: [PATCH] musl support for sh - - * config/sh/linux.h (MUSL_DYNAMIC_LINKER): Define. - (MUSL_DYNAMIC_LINKER_E, MUSL_DYNAMIC_LINKER_FP): Define. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229095 138bc75d-0d04-0410-961f-82ee72b054a4 -[Thomas: backport from gcc 6.x] -Signed-off-by: Thomas Petazzoni ---- - gcc/config/sh/linux.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h -index 0f5d614..61cf777 100644 ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -43,6 +43,27 @@ along with GCC; see the file COPYING3. If not see - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN -+#define MUSL_DYNAMIC_LINKER_E "%{mb:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{!ml:eb}" -+#endif -+ -+#if TARGET_CPU_DEFAULT & (MASK_HARD_SH2A_DOUBLE | MASK_SH4) -+/* "-nofpu" if any nofpu option is specified. */ -+#define MUSL_DYNAMIC_LINKER_FP \ -+ "%{m1|m2|m2a-nofpu|m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-300-nofpu|" \ -+ "m4-340|m4-400|m4-500|m4al:-nofpu}" -+#else -+/* "-nofpu" if none of the hard fpu options are specified. */ -+#define MUSL_DYNAMIC_LINKER_FP "%{m2a|m4|m4-100|m4-200|m4-300|m4a:;:-nofpu}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ -+ "%{mfdpic:-fdpic}.so.1" -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef SUBTARGET_LINK_EMUL_SUFFIX --- -2.7.4 - diff --git a/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch b/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 07f9a7395..000000000 --- a/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack ---- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-5.3.0/libgcc/config/t-stack 2016-03-07 03:25:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch b/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch deleted file mode 100644 index 490a55b45..000000000 --- a/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc ---- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200 -+++ gcc-5.4.0/gcc/config.gcc 2016-07-01 21:26:02.772958441 +0200 -@@ -808,6 +808,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch b/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch deleted file mode 100644 index 337d376b7..000000000 --- a/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Thu, 25 Aug 2016 14:13:02 +0000 -Subject: [PATCH] [mips] Add support for mips*r6-*-musl - -gcc/ - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Vincent: tweak to not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - gcc/config/mips/linux.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index fa253b6..dc51c45 100644 ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - - #undef MUSL_DYNAMIC_LINKER32 --#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER32 \ -+ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - #undef MUSL_DYNAMIC_LINKER64 --#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" --#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER64 \ -+ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 \ -+ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ --- -2.10.0 - diff --git a/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch b/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch deleted file mode 100644 index 29c5c010e..000000000 --- a/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0ff63500a600b758cd88ebcd048d7150df9ac881 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 22:36:15 +0200 -Subject: [PATCH] uclibc-conf - -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - contrib/regression/objs-gcc.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh -index 60b0497fea2..6dc7eadff36 100755 ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch b/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch deleted file mode 100644 index c2c345031..000000000 --- a/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1d0a47a72a1357e4a298d611bd2499e1b72c6f86 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 22:46:18 +0200 -Subject: [PATCH] arm softfloat libgcc - -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - gcc/config/arm/linux-elf.h | 2 +- - libgcc/config/arm/t-linux | 7 ++++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index 3d62367ae68..dad0b97d39f 100644 ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -58,7 +58,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux -index 3d520decafb..e7bc042d4e4 100644 ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch deleted file mode 100644 index 7821d0602..000000000 --- a/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a605662776a3bd50ebbb84509958cb42f44ec998 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Tue, 2 May 2017 23:21:46 +0200 -Subject: [PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h -index 641aa823901..4f8e0102b90 100644 ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch b/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch deleted file mode 100644 index 0ae6876ee..000000000 --- a/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 01fb9550fd858e441c3c2f358318af6e28e56181 Mon Sep 17 00:00:00 2001 -From: eager -Date: Sat, 27 May 2017 18:29:40 +0000 -Subject: [PATCH] Revert: 2016-01-21 Ajit Agarwal - - See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html. - - * config/microblaze/microblaze.h - (FIXED_REGISTERS): Update in macro. - (CALL_USED_REGISTERS): Update in macro. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Waldemar Brodkorb -Signed-off-by: Romain Naour ---- - gcc/config/microblaze/microblaze.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h -index 66e4ef5c3db..2c9ece1d6c6 100644 ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe; - #define FIXED_REGISTERS \ - { \ - 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ -- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - - #define CALL_USED_REGISTERS \ - { \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - #define GP_REG_FIRST 0 --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch b/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch deleted file mode 100644 index 0c7ab3677..000000000 --- a/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch +++ /dev/null @@ -1,323 +0,0 @@ -From f1c05207166a16d0a6242f2fa642adc439f835a8 Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Tue, 5 Jun 2018 09:50:16 +0000 -Subject: [PATCH] PR target/81497: Fix arm_acle.h for C++ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When trying to compile something with arm_acle.h using G++ we get a number of nasty errors: -arm_acle.h:48:49: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive] - return __builtin_arm_ldc (__coproc, __CRd, __p); - -This is because the intrinsics that are supposed to be void return the "result" of their builtin, -which is void. C lets that slide but C++ complains. - -After fixing that we run into further errors: -arm_acle.h:48:46: error: invalid conversion from 'const void*' to 'const int*' [-fpermissive] - return __builtin_arm_ldc (__coproc, __CRd, __p); - ^~~ -Because the pointer arguments in these intrinsics are void pointers but the builtin -expects int pointers. So this patch introduces new qualifiers for void pointers and their -const-qualified versions and uses that in the specification of these intrinsics. - -This gives us the opportunity of creating an arm subdirectory in g++.dg and inaugurates it -with the first arm-specific C++ tests (in that directory). - - PR target/81497 - * config/arm/arm-builtins.c (arm_type_qualifiers): Add - qualifier_void_pointer and qualifier_const_void_pointer. - (arm_ldc_qualifiers, arm_stc_qualifiers): Use the above. - (arm_init_builtins): Handle the above. - * config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc, - __arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2, - __arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for - void intrinsics. - - * g++.target/arm/arm.exp: New file. - * g++.target/arm/pr81497.C: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4 -Upstream-Status: Merged (gcc-8-branch) -Signed-off-by: Gaël PORTAY -[gportay: drop gcc/{,testsuite/}ChangeLog changes] -Signed-off-by: Romain Naour ---- - gcc/config/arm/arm-builtins.c | 42 +++++++++++++--------- - gcc/config/arm/arm_acle.h | 28 +++++++-------- - gcc/testsuite/g++.target/arm/arm.exp | 50 ++++++++++++++++++++++++++ - gcc/testsuite/g++.target/arm/pr81497.C | 9 +++++ - 4 files changed, 99 insertions(+), 30 deletions(-) - create mode 100644 gcc/testsuite/g++.target/arm/arm.exp - create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C - -diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c -index d3b67184362..dd56f13251f 100644 ---- a/gcc/config/arm/arm-builtins.c -+++ b/gcc/config/arm/arm-builtins.c -@@ -75,7 +75,11 @@ enum arm_type_qualifiers - /* Lane indices - must be within range of previous argument = a vector. */ - qualifier_lane_index = 0x200, - /* Lane indices for single lane structure loads and stores. */ -- qualifier_struct_load_store_lane_index = 0x400 -+ qualifier_struct_load_store_lane_index = 0x400, -+ /* A void pointer. */ -+ qualifier_void_pointer = 0x800, -+ /* A const void pointer. */ -+ qualifier_const_void_pointer = 0x802 - }; - - /* The qualifier_internal allows generation of a unary builtin from -@@ -185,7 +189,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS] - static enum arm_type_qualifiers - arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - = { qualifier_void, qualifier_unsigned_immediate, -- qualifier_unsigned_immediate, qualifier_const_pointer }; -+ qualifier_unsigned_immediate, qualifier_const_void_pointer }; - #define LDC_QUALIFIERS \ - (arm_ldc_qualifiers) - -@@ -193,7 +197,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - static enum arm_type_qualifiers - arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - = { qualifier_void, qualifier_unsigned_immediate, -- qualifier_unsigned_immediate, qualifier_pointer }; -+ qualifier_unsigned_immediate, qualifier_void_pointer }; - #define STC_QUALIFIERS \ - (arm_stc_qualifiers) - -@@ -1079,19 +1083,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d, - if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode)) - op_mode = GET_MODE_INNER (op_mode); - -- eltype = arm_simd_builtin_type -- (op_mode, -- (qualifiers & qualifier_unsigned) != 0, -- (qualifiers & qualifier_poly) != 0); -- gcc_assert (eltype != NULL); -- -- /* Add qualifiers. */ -- if (qualifiers & qualifier_const) -- eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); -- -- if (qualifiers & qualifier_pointer) -- eltype = build_pointer_type (eltype); -- -+ /* For void pointers we already have nodes constructed by the midend. */ -+ if (qualifiers & qualifier_void_pointer) -+ eltype = qualifiers & qualifier_const -+ ? const_ptr_type_node : ptr_type_node; -+ else -+ { -+ eltype -+ = arm_simd_builtin_type (op_mode, -+ (qualifiers & qualifier_unsigned) != 0, -+ (qualifiers & qualifier_poly) != 0); -+ gcc_assert (eltype != NULL); -+ -+ /* Add qualifiers. */ -+ if (qualifiers & qualifier_const) -+ eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); -+ -+ if (qualifiers & qualifier_pointer) -+ eltype = build_pointer_type (eltype); -+ } - /* If we have reached arg_num == 0, we are at a non-void - return type. Otherwise, we are still processing - arguments. */ -diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h -index 972e28edb86..69c29df4313 100644 ---- a/gcc/config/arm/arm_acle.h -+++ b/gcc/config/arm/arm_acle.h -@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1, - const unsigned int __CRd, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); -+ __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc (__coproc, __CRd, __p); -+ __builtin_arm_ldc (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldcl (__coproc, __CRd, __p); -+ __builtin_arm_ldcl (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc (__coproc, __CRd, __p); -+ __builtin_arm_stc (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stcl (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stcl (__coproc, __CRd, __p); -+ __builtin_arm_stcl (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) -@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1, - uint32_t __value, const unsigned int __CRn, const unsigned int __CRm, - const unsigned int __opc2) - { -- return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); -+ __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); - } - - __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) -@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1, - const unsigned int __CRd, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); -+ __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc2 (__coproc, __CRd, __p); -+ __builtin_arm_ldc2 (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc2l (__coproc, __CRd, __p); -+ __builtin_arm_ldc2l (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc2 (__coproc, __CRd, __p); -+ __builtin_arm_stc2 (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc2l (__coproc, __CRd, __p); -+ __builtin_arm_stc2l (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) -@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1, - uint32_t __value, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); -+ __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); - } - - __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) -@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1, - uint64_t __value, const unsigned int __CRm) - { -- return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); -+ __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); - } - - __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) -@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1, - uint64_t __value, const unsigned int __CRm) - { -- return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); -+ __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); - } - - __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) -diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp -new file mode 100644 -index 00000000000..1a169d2f220 ---- /dev/null -+++ b/gcc/testsuite/g++.target/arm/arm.exp -@@ -0,0 +1,50 @@ -+# Specific regression driver for arm. -+# Copyright (C) 2009-2018 Free Software Foundation, Inc. -+# -+# This file is part of GCC. -+# -+# GCC 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, or (at your option) -+# any later version. -+# -+# GCC 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 GCC; see the file COPYING3. If not see -+# . */ -+ -+# GCC testsuite that uses the `dg.exp' driver. -+ -+# Exit immediately if this isn't an arm target. -+if {![istarget arm*-*-*] } then { -+ return -+} -+ -+# Load support procs. -+load_lib g++-dg.exp -+ -+global DEFAULT_CXXFLAGS -+if ![info exists DEFAULT_CXXFLAGS] then { -+ set DEFAULT_CXXFLAGS " -pedantic-errors" -+} -+ -+ -+global dg_runtest_extra_prunes -+set dg_runtest_extra_prunes "" -+lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" -+ -+# Initialize `dg'. -+dg-init -+ -+# Main loop. -+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ -+ "" $DEFAULT_CXXFLAGS -+ -+# All done. -+set dg_runtest_extra_prunes "" -+dg-finish -+ -diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C -new file mode 100644 -index 00000000000..0519a3a3045 ---- /dev/null -+++ b/gcc/testsuite/g++.target/arm/pr81497.C -@@ -0,0 +1,9 @@ -+/* { dg-do compile } */ -+/* { dg-require-effective-target arm_thumb2_ok } */ -+ -+#include -+ -+int main () -+{ -+ return 0; -+} --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch deleted file mode 100644 index de0f45334..000000000 --- a/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1d78555bfc753039546ce5ca655dece67732e7bd Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Thu, 22 Nov 2018 12:19:11 +0000 -Subject: [PATCH] gcc: define _REENTRANT for RISC-V when -pthread is passed - -The detection of pthread support fails on RISC-V unless _REENTRANT -is defined. Added the CPP_SPEC definition from gcc 8.1.0 to correct -this. - -Signed-off-by: Mark Corbin -Signed-off-by: Romain Naour ---- - gcc/config/riscv/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index 4b2f7b6e1fd..b00d23ddfa0 100644 ---- a/gcc/config/riscv/linux.h -+++ b/gcc/config/riscv/linux.h -@@ -47,6 +47,8 @@ along with GCC; see the file COPYING3. If not see - - #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" - -+#define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ - #define LINK_SPEC "\ - -melf" XLEN_SPEC "lriscv \ - %{shared} \ --- -2.21.0 - diff --git a/buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch deleted file mode 100644 index e75588bf4..000000000 --- a/buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 24 Sep 2019 04:15:17 -0700 -Subject: [PATCH] xtensa: fix PR target/91880 - -Xtensa hwloop_optimize segfaults when zero overhead loop is about to be -inserted as the first instruction of the function. -Insert zero overhead loop instruction into new basic block before the -loop when basic block that precedes the loop is empty. - -2019-09-26 Max Filippov -gcc/ - * config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead - loop instruction into new basic block before the loop when basic - block that precedes the loop is empty. - -Signed-off-by: Max Filippov ---- -Backported from: r276166 - - gcc/config/xtensa/xtensa.c | 5 ++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index ee5612441e25..2527468d57db 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -4174,7 +4174,9 @@ hwloop_optimize (hwloop_info loop) - - seq = get_insns (); - -- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1) -+ entry_after = BB_END (entry_bb); -+ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1 -+ || !entry_after) - { - basic_block new_bb; - edge e; -@@ -4195,7 +4197,6 @@ hwloop_optimize (hwloop_info loop) - } - else - { -- entry_after = BB_END (entry_bb); - while (DEBUG_INSN_P (entry_after) - || (NOTE_P (entry_after) - && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK --- -2.11.0 - diff --git a/buildroot/package/gcc/Config.in.host b/buildroot/package/gcc/Config.in.host index 243310f61..10688ff56 100644 --- a/buildroot/package/gcc/Config.in.host +++ b/buildroot/package/gcc/Config.in.host @@ -4,7 +4,7 @@ choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_CSKY if BR2_csky - default BR2_GCC_VERSION_8_X + default BR2_GCC_VERSION_9_X help Select the version of gcc you wish to use. @@ -20,40 +20,16 @@ config BR2_GCC_VERSION_CSKY depends on BR2_csky select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -config BR2_GCC_VERSION_5_X - bool "gcc 5.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 - # Broken or unsupported architectures - depends on !BR2_arc - depends on !BR2_or1k - # musl on ppc64 and mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # glibc >= 2.30 needs gcc >= 6.2 on all architectures. - depends on !BR2_TOOLCHAIN_USES_GLIBC - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -config BR2_GCC_VERSION_7_X - bool "gcc 7.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - # Broken or unsupported architectures - depends on !BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 - config BR2_GCC_VERSION_8_X bool "gcc 8.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_9 # Broken or unsupported architectures depends on !BR2_or1k - # powerpc spe support has been deprecated since gcc 8.x. - # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_powerpc_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_GCC_VERSION_9_X bool "gcc 9.x" - # or1k needs binutils >= 2.32 - depends on !(BR2_or1k && BR2_BINUTILS_VERSION_2_31_X) + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE @@ -63,6 +39,17 @@ config BR2_GCC_VERSION_9_X depends on !BR2_csky select BR2_TOOLCHAIN_GCC_AT_LEAST_9 +config BR2_GCC_VERSION_10_X + bool "gcc 10.x" + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # C-SKY sk610 needs abiv1, which is not supported in + # upstream gcc. C-SKY gcc upstream support not tested + # with upstream binutils and glibc. + depends on !BR2_csky + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + endchoice # libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x @@ -85,11 +72,10 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string - default "5.5.0" if BR2_GCC_VERSION_5_X - default "7.5.0" if BR2_GCC_VERSION_7_X default "8.4.0" if BR2_GCC_VERSION_8_X default "9.3.0" if BR2_GCC_VERSION_9_X - default "arc-2019.09-release" if BR2_GCC_VERSION_ARC + default "10.2.0" if BR2_GCC_VERSION_10_X + default "arc-2020.09-release" if BR2_GCC_VERSION_ARC default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch b/buildroot/package/gcc/arc-2020.09-release/0100-uclibc-conf.patch similarity index 100% rename from buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch rename to buildroot/package/gcc/arc-2020.09-release/0100-uclibc-conf.patch diff --git a/buildroot/package/gcc/gcc.hash b/buildroot/package/gcc/gcc.hash index d9df3408d..2208095a2 100644 --- a/buildroot/package/gcc/gcc.hash +++ b/buildroot/package/gcc/gcc.hash @@ -1,14 +1,12 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.5.0/sha512.sum -sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1 gcc-5.5.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.5.0/sha512.sum -sha512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60 gcc-7.5.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/sha512.sum sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/sha512.sum +sha512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e gcc-10.2.0.tar.xz # Locally calculated (fetched from Github) -sha512 84648d13f174102733e06ccdf7b351150babe06af0f2b99b8dfb2b2d3c3f13e424547349939806fe19932ad347977cad79cd8b37be9cbb03e6a4d03cdf95a72e gcc-arc-2019.09-release.tar.gz +sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz # Locally calculated (fetched from https://github.com/c-sky/gcc) diff --git a/buildroot/package/gcc/gcc.mk b/buildroot/package/gcc/gcc.mk index b58f17575..5e419f7ed 100644 --- a/buildroot/package/gcc/gcc.mk +++ b/buildroot/package/gcc/gcc.mk @@ -32,14 +32,6 @@ endef # Apply patches # -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -define HOST_GCC_APPLY_POWERPC_PATCH - $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) 1000-powerpc-link-with-math-lib.patch.conditional -endef -endif -endif - # gcc is a special package, not named gcc, but gcc-initial and # gcc-final, but patches are nonetheless stored in package/gcc in the # tree, and potentially in BR2_GLOBAL_PATCH_DIR directories as well. @@ -90,7 +82,8 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ --with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \ - --with-bugurl="http://bugs.buildroot.net/" + --with-bugurl="http://bugs.buildroot.net/" \ + --without-zstd # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work @@ -105,6 +98,12 @@ ifeq ($(BR2_ENABLE_DEBUG),y) GCC_COMMON_TARGET_CFLAGS += -Wno-error endif +# Make sure libgcc & libstdc++ always get built with -matomic on ARC700 +ifeq ($(GCC_TARGET_CPU):$(BR2_ARC_ATOMIC_EXT),arc700:y) +GCC_COMMON_TARGET_CFLAGS += -matomic +GCC_COMMON_TARGET_CXXFLAGS += -matomic +endif + # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" @@ -123,7 +122,7 @@ endif ifeq ($(BR2_USE_WCHAR)$(BR2_TOOLCHAIN_HAS_LIBQUADMATH),yy) HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath else -HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath +HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath --disable-libquadmath-support endif # libsanitizer requires wordexp, not in default uClibc config. Also @@ -224,6 +223,7 @@ endif # Enable proper double/long double for SPE ABI ifeq ($(BR2_powerpc_SPE),y) HOST_GCC_COMMON_CONF_OPTS += \ + --enable-obsolete \ --enable-e500_double \ --with-long-double-128 endif @@ -253,6 +253,11 @@ HOST_GCC_COMMON_CONF_OPTS += \ --with-long-double-128 endif +ifeq ($(BR2_s390x),y) +HOST_GCC_COMMON_CONF_OPTS += \ + --with-long-double-128 +endif + HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' # For gcc-initial, we need to tell gcc that the C library will be @@ -283,11 +288,6 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ ifeq ($(BR2_xtensa),y) HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) endif -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -HOST_GCC_COMMON_CCACHE_HASH_FILES += package/gcc/$(GCC_VERSION)/1000-powerpc-link-with-math-lib.patch.conditional -endif -endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) # and a reference to the Buildroot git revision (BR2_VERSION_FULL), diff --git a/buildroot/package/gconf/gconf.mk b/buildroot/package/gconf/gconf.mk index 60ced95e1..c468d1433 100644 --- a/buildroot/package/gconf/gconf.mk +++ b/buildroot/package/gconf/gconf.mk @@ -13,4 +13,11 @@ GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \ GCONF_LICENSE = LGPL-2.0+ GCONF_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GCONF_CONF_OPTS += --enable-introspection +GCONF_DEPENDENCIES += gobject-introspection +else +GCONF_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/gcr/gcr.mk b/buildroot/package/gcr/gcr.mk index 2fe583978..97a0e2206 100644 --- a/buildroot/package/gcr/gcr.mk +++ b/buildroot/package/gcr/gcr.mk @@ -23,6 +23,13 @@ GCR_CONF_OPTS = \ GCR_LICENSE = LGPL-2.1+ GCR_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GCR_DEPENDENCIES += gobject-introspection host-libxslt +GCR_CONF_OPTS += --with-introspection +else +GCR_CONF_OPTS += --without-introspection +endif + # Only the X11 backend is supported for the simple GUI ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) GCR_DEPENDENCIES += libgtk3 diff --git a/buildroot/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch b/buildroot/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch deleted file mode 100644 index fa1647495..000000000 --- a/buildroot/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 083849deeeec2854b2657b46380273ee13f4fa1b Mon Sep 17 00:00:00 2001 -From: Sergio Durigan Junior -Date: Wed, 12 Sep 2018 13:16:02 -0400 -Subject: [PATCH] Move 'is_regular_file' from common-utils.c to filestuff.c - -There is no reason for 'is_regular_file' to be in common-utils.c; it -belongs to 'filestuff.c'. This commit moves the function definition -and its prototype to the appropriate files. - -The motivation behind this move is a failure that happens on certain -cross-compilation environments when compiling the IPA library, due to -the way gnulib probes the need for a 'stat' call replacement. Because -configure checks when cross-compiling are more limited, gnulib decides -that it needs to substitute the 'stat' calls its own 'rpl_stat'; -however, the IPA library doesn't link with gnulib, which leads to an -error when compiling 'common-utils.c': - - ... - /opt/x86-core2--musl--bleeding-edge-2018.09-1/bin/i686-buildroot-linux-musl-g++ -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -I. -I. -I./../common -I./../regformats -I./.. -I./../../include -I./../gnulib/import -Ibuild-gnulib-gdbserver/import -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized -DGDBSERVER \ - -Wl,--dynamic-list=./proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipa.o linux-i386-ipa.o linux-x86-tdesc-ipa.o arch/i386-ipa.o -ldl -pthread - /opt/x86-core2--musl--bleeding-edge-2018.09-1/lib/gcc/i686-buildroot-linux-musl/8.2.0/../../../../i686-buildroot-linux-musl/bin/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)': - common-utils.c:(.text+0x695): undefined reference to `rpl_stat' - collect2: error: ld returned 1 exit status - Makefile:413: recipe for target 'libinproctrace.so' failed - make[1]: *** [libinproctrace.so] Error 1 - ... - -More details can also be found at: - - https://sourceware.org/ml/gdb-patches/2018-09/msg00304.html - -The most simple fix for this problem is to move 'is_regular_file' to -'filestuff.c', which is not used by IPA. This ends up making the -files more logically organized as well, since 'is_regular_file' is a -file operation. - -No regressions found. - -gdb/ChangeLog: -2018-09-12 Sergio Durigan Junior - - * common/common-utils.c: Don't include ''. - (is_regular_file): Move to... - * common/filestuff.c (is_regular_file): ... here. - * common/common-utils.h (is_regular_file): Move to... - * common/filestuff.h (is_regular_file): ... here. - -(cherry picked from commit 3c025cfe5efc44eb4dfb03b53dca28e75096dd1e) -[Romain: backport to gdb 8.1 and remove ChangeLog enty] -Signed-off-by: Romain Naour ---- - gdb/common/common-utils.c | 30 ------------------------------ - gdb/common/common-utils.h | 5 ----- - gdb/common/filestuff.c | 31 +++++++++++++++++++++++++++++++ - gdb/common/filestuff.h | 5 +++++ - 4 files changed, 36 insertions(+), 35 deletions(-) - -diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c -index 80de826ba78..90a06390141 100644 ---- a/gdb/common/common-utils.c -+++ b/gdb/common/common-utils.c -@@ -20,7 +20,6 @@ - #include "common-defs.h" - #include "common-utils.h" - #include "host-defs.h" --#include - #include - - /* The xmalloc() (libiberty.h) family of memory management routines. -@@ -411,32 +410,3 @@ stringify_argv (const std::vector &args) - } - - /* See common/common-utils.h. */ -- --bool --is_regular_file (const char *name, int *errno_ptr) --{ -- struct stat st; -- const int status = stat (name, &st); -- -- /* Stat should never fail except when the file does not exist. -- If stat fails, analyze the source of error and return true -- unless the file does not exist, to avoid returning false results -- on obscure systems where stat does not work as expected. */ -- -- if (status != 0) -- { -- if (errno != ENOENT) -- return true; -- *errno_ptr = ENOENT; -- return false; -- } -- -- if (S_ISREG (st.st_mode)) -- return true; -- -- if (S_ISDIR (st.st_mode)) -- *errno_ptr = EISDIR; -- else -- *errno_ptr = EINVAL; -- return false; --} -diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h -index 5408c354693..2320318de74 100644 ---- a/gdb/common/common-utils.h -+++ b/gdb/common/common-utils.h -@@ -146,9 +146,4 @@ in_inclusive_range (T value, T low, T high) - return value >= low && value <= high; - } - --/* Return true if the file NAME exists and is a regular file. -- If the result is false then *ERRNO_PTR is set to a useful value assuming -- we're expecting a regular file. */ --extern bool is_regular_file (const char *name, int *errno_ptr); -- - #endif -diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c -index f5a754ffa66..fa10165a7ca 100644 ---- a/gdb/common/filestuff.c -+++ b/gdb/common/filestuff.c -@@ -417,3 +417,34 @@ make_cleanup_close (int fd) - *saved_fd = fd; - return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree); - } -+ -+/* See common/filestuff.h. */ -+ -+bool -+is_regular_file (const char *name, int *errno_ptr) -+{ -+ struct stat st; -+ const int status = stat (name, &st); -+ -+ /* Stat should never fail except when the file does not exist. -+ If stat fails, analyze the source of error and return true -+ unless the file does not exist, to avoid returning false results -+ on obscure systems where stat does not work as expected. */ -+ -+ if (status != 0) -+ { -+ if (errno != ENOENT) -+ return true; -+ *errno_ptr = ENOENT; -+ return false; -+ } -+ -+ if (S_ISREG (st.st_mode)) -+ return true; -+ -+ if (S_ISDIR (st.st_mode)) -+ *errno_ptr = EISDIR; -+ else -+ *errno_ptr = EINVAL; -+ return false; -+} -diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h -index 92a2a5f4c70..cc6dd861379 100644 ---- a/gdb/common/filestuff.h -+++ b/gdb/common/filestuff.h -@@ -84,4 +84,9 @@ extern int gdb_pipe_cloexec (int filedes[2]); - - extern struct cleanup *make_cleanup_close (int fd); - -+/* Return true if the file NAME exists and is a regular file. -+ If the result is false then *ERRNO_PTR is set to a useful value assuming -+ we're expecting a regular file. */ -+extern bool is_regular_file (const char *name, int *errno_ptr); -+ - #endif /* FILESTUFF_H */ --- -2.14.4 - diff --git a/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch deleted file mode 100644 index 1e85d9314..000000000 --- a/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001 -From: James Clarke -Date: Fri, 19 Jan 2018 17:22:49 +0000 -Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including - gdb_wait.h - -On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which -contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot -define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included -earlier; include it from linux-ptrace.h so it can never come afterwards. - -gdb/ChangeLog: - - * nat/linux-ptrace.c: Remove unnecessary reinclusion of - gdb_ptrace.h, and move including gdb_wait.h ... - * nat/linux-ptrace.h: ... to here. - -Signed-off-by: Fabrice Fontaine -[Retrieved (and updated to remove ChangeLog update) from: -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8] ---- - gdb/ChangeLog | 6 ++++++ - gdb/nat/linux-ptrace.c | 2 -- - gdb/nat/linux-ptrace.h | 1 + - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 5c4ddc9..1f21ef0 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -21,8 +21,6 @@ - #include "linux-procfs.h" - #include "linux-waitpid.h" - #include "buffer.h" --#include "gdb_wait.h" --#include "gdb_ptrace.h" - #ifdef HAVE_SYS_PROCFS_H - #include - #endif -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 60967a3..dc180fb 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -21,6 +21,7 @@ - struct buffer; - - #include "nat/gdb_ptrace.h" -+#include "gdb_wait.h" - - #ifdef __UCLIBC__ - #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) --- -2.9.3 - diff --git a/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch b/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch new file mode 100644 index 000000000..989a5b134 --- /dev/null +++ b/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch @@ -0,0 +1,42 @@ +From e00c211d51bec301cf04719b77076a8783ef44b5 Mon Sep 17 00:00:00 2001 +From: Raul Tambre +Date: Sat, 4 May 2019 15:48:17 -0400 +Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in + python/lib/gdb/command/prompt.py + +The 'is' operator is not meant to be used for comparisons. It currently working +is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning +for this. + +(cherry picked from commit b6484282f85bf7f11451b2441599c241d302ad9d) +[Romain: backport to gdb 8.x] +Signed-off-by: Romain Naour +--- + gdb/python/lib/gdb/command/prompt.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py +index 3d662a7d3f..04b9e49c22 100644 +--- a/gdb/python/lib/gdb/command/prompt.py ++++ b/gdb/python/lib/gdb/command/prompt.py +@@ -45,7 +45,7 @@ The currently defined substitutions are: + self.hook_set = False + + def get_show_string (self, pvalue): +- if self.value is not '': ++ if self.value: + return "The extended prompt is: " + self.value + else: + return "The extended prompt is not set." +@@ -57,7 +57,7 @@ The currently defined substitutions are: + return "" + + def before_prompt_hook(self, current): +- if self.value is not '': ++ if self.value: + return gdb.prompt.substitute_prompt(self.value) + else: + return None +-- +2.25.4 + diff --git a/buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.3.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to buildroot/package/gdb/8.3.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.3.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to buildroot/package/gdb/8.3.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.3.1/0003-use-asm-sgidefs.h.patch similarity index 100% rename from buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch rename to buildroot/package/gdb/8.3.1/0003-use-asm-sgidefs.h.patch diff --git a/buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.3.1/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch rename to buildroot/package/gdb/8.3.1/0004-gdbserver-fix-build-for-m68k.patch diff --git a/buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.3.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to buildroot/package/gdb/8.3.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/buildroot/package/gdb/8.3.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch b/buildroot/package/gdb/8.3.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch new file mode 100644 index 000000000..989a5b134 --- /dev/null +++ b/buildroot/package/gdb/8.3.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch @@ -0,0 +1,42 @@ +From e00c211d51bec301cf04719b77076a8783ef44b5 Mon Sep 17 00:00:00 2001 +From: Raul Tambre +Date: Sat, 4 May 2019 15:48:17 -0400 +Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in + python/lib/gdb/command/prompt.py + +The 'is' operator is not meant to be used for comparisons. It currently working +is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning +for this. + +(cherry picked from commit b6484282f85bf7f11451b2441599c241d302ad9d) +[Romain: backport to gdb 8.x] +Signed-off-by: Romain Naour +--- + gdb/python/lib/gdb/command/prompt.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py +index 3d662a7d3f..04b9e49c22 100644 +--- a/gdb/python/lib/gdb/command/prompt.py ++++ b/gdb/python/lib/gdb/command/prompt.py +@@ -45,7 +45,7 @@ The currently defined substitutions are: + self.hook_set = False + + def get_show_string (self, pvalue): +- if self.value is not '': ++ if self.value: + return "The extended prompt is: " + self.value + else: + return "The extended prompt is not set." +@@ -57,7 +57,7 @@ The currently defined substitutions are: + return "" + + def before_prompt_hook(self, current): +- if self.value is not '': ++ if self.value: + return gdb.prompt.substitute_prompt(self.value) + else: + return None +-- +2.25.4 + diff --git a/buildroot/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 75% rename from buildroot/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to buildroot/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 9e011c728..ab8dc626f 100644 --- a/buildroot/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/buildroot/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From 2acd9d3eb703b9a64ac92b3880ed546bec92af95 Mon Sep 17 00:00:00 2001 +From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Aug 2016 17:32:50 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -7,7 +7,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.0] +[Rebase on gdb 8.3] Signed-off-by: Romain Naour --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ @@ -15,12 +15,12 @@ Signed-off-by: Romain Naour 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 33a9feb..1a9141f 100644 +index 1b695e53fe9..1978347c02c 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include #include +#if !defined(__GLIBC__) +# define pt_regs uapi_pt_regs @@ -30,15 +30,15 @@ index 33a9feb..1a9141f 100644 +# undef pt_regs +#endif - #include "nat/ppc-linux.h" - #include "linux-ppc-tdesc.h" + #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 5837ea1..7233929 100644 +index f1561b3b357..40399361c09 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H +#if !defined(__GLIBC__) +# define pt_regs uapi_pt_regs @@ -51,5 +51,5 @@ index 5837ea1..7233929 100644 /* This sometimes isn't defined. */ -- -2.9.4 +2.21.0 diff --git a/buildroot/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 89% rename from buildroot/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to buildroot/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch index d31e5dd11..9d508fbf1 100644 --- a/buildroot/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ b/buildroot/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -1,8 +1,8 @@ -From dfe4a40bc9d2fc1fd1b1a11ed733a0c0a1f59f3c Mon Sep 17 00:00:00 2001 +From ef630288fdc2d4d22651702672f9d5c9cd767e5b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on - !GLIBC systems +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems Fixes a pt_{dsp,}regs redefinition when building with the musl C library on SuperH. @@ -19,7 +19,7 @@ Signed-off-by: Romain Naour 1 file changed, 8 insertions(+) diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index ac084c9..08e104a 100644 +index 0953721a190..c331c1382f7 100644 --- a/gdb/gdbserver/linux-sh-low.c +++ b/gdb/gdbserver/linux-sh-low.c @@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; @@ -39,5 +39,5 @@ index ac084c9..08e104a 100644 #define sh_num_regs 41 -- -2.9.4 +2.21.0 diff --git a/buildroot/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/9.2/0003-use-asm-sgidefs.h.patch similarity index 90% rename from buildroot/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch rename to buildroot/package/gdb/9.2/0003-use-asm-sgidefs.h.patch index d30336904..2909f62c6 100644 --- a/buildroot/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch +++ b/buildroot/package/gdb/9.2/0003-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 +From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use @@ -23,7 +23,7 @@ Signed-off-by: Vicente Olivert Riera 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index f2df1b9907..d24664cb56 100644 +index e68ed1e4da9..bc42aa59685 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -36,5 +36,5 @@ index f2df1b9907..d24664cb56 100644 #include #include "inf-ptrace.h" -- -2.13.1 +2.21.0 diff --git a/buildroot/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 94% rename from buildroot/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch rename to buildroot/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch index 451bed312..d71829389 100644 --- a/buildroot/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch +++ b/buildroot/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch @@ -1,4 +1,4 @@ -From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 +From 448e481aab86c823d908530038e20a14213db0a2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 22 Jun 2018 22:40:26 +0200 Subject: [PATCH] gdbserver: fix build for m68k @@ -32,7 +32,7 @@ Signed-off-by: Romain Naour 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 5594f10f927..19b4ef7b259 100644 +index 16f639d02fc..969d9973737 100644 --- a/gdb/gdbserver/linux-m68k-low.c +++ b/gdb/gdbserver/linux-m68k-low.c @@ -17,16 +17,17 @@ @@ -58,5 +58,5 @@ index 5594f10f927..19b4ef7b259 100644 #define m68k_num_gregs 18 -- -2.14.4 +2.21.0 diff --git a/buildroot/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 82% rename from buildroot/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to buildroot/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch index dea24725f..1df545268 100644 --- a/buildroot/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ b/buildroot/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -1,4 +1,4 @@ -From 887c667089e5417fdc7c5bbb364b027e86a7c113 Mon Sep 17 00:00:00 2001 +From d84ecfa3a8c8fbade89229ac66c09f2a97ab00fb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Jun 2018 23:33:55 +0200 Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h @@ -30,22 +30,24 @@ Fixes the following build issue: vfork Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour --- gdb/nat/fork-inferior.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c -index 8b59387fa5..05167628a6 100644 +index fe9360a5039..626fe7c1fbf 100644 --- a/gdb/nat/fork-inferior.c +++ b/gdb/nat/fork-inferior.c -@@ -26,6 +26,7 @@ - #include "common-gdbthread.h" - #include "signals-state-save-restore.h" - #include "gdb_tilde_expand.h" +@@ -27,6 +27,7 @@ + #include "gdbsupport/pathstuff.h" + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" +#include "linux-ptrace.h" #include extern char **environ; -- -2.14.4 +2.21.0 diff --git a/buildroot/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch b/buildroot/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch new file mode 100644 index 000000000..813a1054a --- /dev/null +++ b/buildroot/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch @@ -0,0 +1,101 @@ +From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001 +From: Sebastian Huber +Date: Wed, 1 Jul 2020 19:29:55 +0200 +Subject: [PATCH] sim/ppc: Fix linker error with -fno-common + +GCC 10 enables -fno-common by default. This resulted in a multiple +definition linker error since global variables were declared and defined +in a header file: + + ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of + `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here + +sim/ppc + + * ld-insn.h (last_model, last_model_data, last_model_function, + last_model_internal, last_model_macro, last_model_static): + Delete. + (max_model_fields_len, model_data, model_functions, + model_internal, model_macros, model_static, models): Declare, but do not + define. + * ld-insn.c (last_model, last_model_data, last_model_function, + last_model_internal, last_model_macro, last_model_static, + max_model_fields_len, model_data, model_functions, + model_internal, model_macros, model_static, models): Define. + +Signed-off-by: Maxim Kochetkov +Fetch from: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 +--- + sim/ppc/ld-insn.c | 18 ++++++++++++++++++ + sim/ppc/ld-insn.h | 24 +++++++----------------- + 2 files changed, 25 insertions(+), 17 deletions(-) + +diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c +index e39131ca133..585071a861f 100644 +--- a/sim/ppc/ld-insn.c ++++ b/sim/ppc/ld-insn.c +@@ -28,6 +28,24 @@ + + #include "igen.h" + ++static model *last_model; ++ ++static insn *last_model_macro; ++static insn *last_model_function; ++static insn *last_model_internal; ++static insn *last_model_static; ++static insn *last_model_data; ++ ++model *models; ++ ++insn *model_macros; ++insn *model_functions; ++insn *model_internal; ++insn *model_static; ++insn *model_data; ++ ++int max_model_fields_len; ++ + static void + update_depth(insn_table *entry, + lf *file, +diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h +index 88318ffa2b3..52baeaa2d84 100644 +--- a/sim/ppc/ld-insn.h ++++ b/sim/ppc/ld-insn.h +@@ -200,25 +200,15 @@ extern insn_table *load_insn_table + table_include *includes, + cache_table **cache_rules); + +-model *models; +-model *last_model; ++extern model *models; + +-insn *model_macros; +-insn *last_model_macro; ++extern insn *model_macros; ++extern insn *model_functions; ++extern insn *model_internal; ++extern insn *model_static; ++extern insn *model_data; + +-insn *model_functions; +-insn *last_model_function; +- +-insn *model_internal; +-insn *last_model_internal; +- +-insn *model_static; +-insn *last_model_static; +- +-insn *model_data; +-insn *last_model_data; +- +-int max_model_fields_len; ++extern int max_model_fields_len; + + extern void insn_table_insert_insn + (insn_table *table, +-- +2.18.4 + diff --git a/buildroot/package/gdb/Config.in b/buildroot/package/gdb/Config.in index 4c787d49a..48ec3e020 100644 --- a/buildroot/package/gdb/Config.in +++ b/buildroot/package/gdb/Config.in @@ -49,11 +49,6 @@ config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY depends on !BR2_riscv - # Simultaneous build of gdbserver and full gdb is not possible - # with arc-2019.09. This bug comes from upstream GDB. So - # simultaneous usage of full gdb and gdbserver is temporaly - # disabled for ARC until a fix becomes available. - depends on !(BR2_arc && BR2_PACKAGE_GDB_DEBUGGER) help Build the gdbserver stub to run on the target. A full gdb is needed to debug the progam. diff --git a/buildroot/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host index 5315f1049..4b868e225 100644 --- a/buildroot/package/gdb/Config.in.host +++ b/buildroot/package/gdb/Config.in.host @@ -32,10 +32,28 @@ config BR2_PACKAGE_HOST_GDB_TUI help This option enables terminal user interface (TUI) for gdb -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python support" +choice + prompt "Python support" + default BR2_PACKAGE_HOST_GDB_NOPYTHON help - This option enables the Python support in the cross gdb. + Select the version of Python you wish to use + +config BR2_PACKAGE_HOST_GDB_NOPYTHON + bool "None" + help + This option disables Python support in the cross gdb. + +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "Python 2" + help + This option enables the Python 2 support in the cross gdb. + +config BR2_PACKAGE_HOST_GDB_PYTHON3 + bool "Python 3" + help + This option enables the Python 3 support in the cross gdb. + +endchoice config BR2_PACKAGE_HOST_GDB_SIM bool "Simulator support" @@ -45,21 +63,21 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_8_2 + default BR2_GDB_VERSION_8_3 depends on !BR2_arc depends on !BR2_csky help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_8_1 - bool "gdb 8.1.x" - config BR2_GDB_VERSION_8_2 bool "gdb 8.2.x" config BR2_GDB_VERSION_8_3 bool "gdb 8.3.x" +config BR2_GDB_VERSION_9_2 + bool "gdb 9.2.x" + endchoice endif @@ -67,9 +85,9 @@ endif # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2019.09-release-gdb" if BR2_arc + default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "8.1.1" if BR2_GDB_VERSION_8_1 default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB - default "8.3" if BR2_GDB_VERSION_8_3 + default "8.3.1" if BR2_GDB_VERSION_8_3 + default "9.2" if BR2_GDB_VERSION_9_2 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/buildroot/package/gdb/gdb.hash b/buildroot/package/gdb/gdb.hash index b98d6d6a6..1f14eeafa 100644 --- a/buildroot/package/gdb/gdb.hash +++ b/buildroot/package/gdb/gdb.hash @@ -1,10 +1,10 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9 gdb-8.1.1.tar.xz -sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz -sha512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1 gdb-8.3.tar.xz +sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz +sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz +sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz # Locally calculated (fetched from Github) -sha512 c33818f8679d99d5315220578864b04b87f69c46ebe62472809ee6e1d260e5ec84d598f38d80c127a2045d6624f28803c2720d89434204acbd94e988a45870f1 gdb-arc-2019.09-release-gdb.tar.gz +sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz # Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) -sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz +sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz diff --git a/buildroot/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk index 469f25ff9..f31b168bf 100644 --- a/buildroot/package/gdb/gdb.mk +++ b/buildroot/package/gdb/gdb.mk @@ -12,6 +12,9 @@ ifeq ($(BR2_arc),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y +# recent gdb versions (>= 10) have gdbserver moved at the top-level, +# which requires a different build logic. +GDB_GDBSERVER_TOPLEVEL = y endif ifeq ($(BR2_csky),y) @@ -23,19 +26,30 @@ endif GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB -# We only want gdbserver and not the entire debugger. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),) +# On gdb < 10, if you want to build only gdbserver, you need to +# configure only gdb/gdbserver. +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(GDB_GDBSERVER_TOPLEVEL),) GDB_SUBDIR = gdb/gdbserver -HOST_GDB_SUBDIR = . + +# When we want to build the full gdb, or for very recent versions of +# gdb with gdbserver at the top-level, out of tree build is mandatory, +# so we create a 'build' subdirectory in the gdb sources, and build +# from there. else -GDB_DEPENDENCIES = ncurses \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GDB_SUBDIR = build +define GDB_CONFIGURE_SYMLINK + mkdir -p $(@D)/$(GDB_SUBDIR) + ln -sf ../configure $(@D)/$(GDB_SUBDIR)/configure +endef +GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK endif # For the host variant, we really want to build with XML support, # which is needed to read XML descriptions of target architectures. We # also need ncurses. -HOST_GDB_DEPENDENCIES = host-expat host-ncurses +# As for libiberty, gdb may use a system-installed one if present, so +# we must ensure ours is installed first. +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true @@ -126,13 +140,29 @@ GDB_CONF_OPTS = \ --without-x \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ - $(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \ - --with-curses \ --without-included-gettext \ --disable-werror \ --enable-static \ --without-mpfr +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) +GDB_CONF_OPTS += \ + --enable-gdb \ + --with-curses +GDB_DEPENDENCIES = ncurses \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) +else +GDB_CONF_OPTS += \ + --disable-gdb \ + --without-curses +endif + +ifeq ($(BR2_PACKAGE_GDB_SERVER),y) +GDB_CONF_OPTS += --enable-gdbserver +else +GDB_CONF_OPTS += --disable-gdbserver +endif + # When gdb is built as C++ application for ARC it segfaults at runtime # So we pass --disable-build-with-cxx config option to force gdb not to # be built as C++ app. @@ -237,6 +267,9 @@ endif ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 HOST_GDB_DEPENDENCIES += host-python +else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 +HOST_GDB_DEPENDENCIES += host-python3 else HOST_GDB_CONF_OPTS += --without-python endif @@ -247,6 +280,17 @@ else HOST_GDB_CONF_OPTS += --disable-sim endif +# Since gdb 9, in-tree builds for GDB are not allowed anymore, +# so we create a 'build' subdirectory in the gdb sources, and +# build from there. +HOST_GDB_SUBDIR = build + +define HOST_GDB_CONFIGURE_SYMLINK + mkdir -p $(@D)/build + ln -sf ../configure $(@D)/build/configure +endef +HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_CONFIGURE_SYMLINK + # legacy $arch-linux-gdb symlink define HOST_GDB_ADD_SYMLINK cd $(HOST_DIR)/bin && \ diff --git a/buildroot/package/gdbm/0001-fix-build-with-gcc-10.patch b/buildroot/package/gdbm/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..cd1417c81 --- /dev/null +++ b/buildroot/package/gdbm/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,96 @@ +From 9fecb6ce056f25837dffac95260d5a80b9f468c0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 19 Aug 2020 10:37:07 +0200 +Subject: [PATCH] fix build with gcc 10 + +Move initialisation of global variables to main functions to fix the +following build failure with gcc 10: + +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./libgdbmapp.a(parseopt.o):(.bss+0x2c): multiple definition of `parseopt_program_args'; gdbm_dump.o:(.data.rel.local+0x28): first defined here +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./libgdbmapp.a(parseopt.o):(.bss+0x30): multiple definition of `parseopt_program_doc'; gdbm_dump.o:(.data.rel.local+0x2c): first defined here +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./libgdbmapp.a(parseopt.o):(.bss+0x2c): multiple definition of `parseopt_program_args'; gdbm_load.o:(.data.rel.local+0xa0): first defined here +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./libgdbmapp.a(parseopt.o):(.bss+0x30): multiple definition of `parseopt_program_doc'; gdbm_load.o:(.data.rel.local+0xa4): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/d09b5368bb624df629296359a5abcdd37ba61e9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to Sergey Poznyakoff ] +--- + src/gdbm_dump.c | 5 +++-- + src/gdbm_load.c | 5 +++-- + src/gdbmtool.c | 5 +++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/src/gdbm_dump.c b/src/gdbm_dump.c +index 82fb5af..67574ac 100644 +--- a/src/gdbm_dump.c ++++ b/src/gdbm_dump.c +@@ -19,8 +19,6 @@ + # include "gdbmapp.h" + # include "gdbmdefs.h" + +-char *parseopt_program_doc = "dump a GDBM database to a file"; +-char *parseopt_program_args = "DB_FILE [FILE]"; + struct gdbm_option optab[] = { + { 'H', "format", "binary|ascii|0|1", N_("select dump format") }, + { 0 } +@@ -36,6 +34,9 @@ main (int argc, char **argv) + char *dbname, *filename; + FILE *fp; + ++ parseopt_program_doc = "dump a GDBM database to a file"; ++ parseopt_program_args = "DB_FILE [FILE]"; ++ + #ifdef HAVE_SETLOCALE + setlocale (LC_ALL, ""); + #endif +diff --git a/src/gdbm_load.c b/src/gdbm_load.c +index 2d96ada..1b2739c 100644 +--- a/src/gdbm_load.c ++++ b/src/gdbm_load.c +@@ -29,8 +29,6 @@ int mode; + uid_t owner_uid; + gid_t owner_gid; + +-char *parseopt_program_doc = "load a GDBM database from a file"; +-char *parseopt_program_args = "FILE [DB_FILE]"; + struct gdbm_option optab[] = { + { 'r', "replace", NULL, N_("replace records in the existing database") }, + { 'm', "mode", N_("MODE"), N_("set file mode") }, +@@ -100,6 +98,9 @@ main (int argc, char **argv) + int cache_size = 0; + int block_size = 0; + ++ parseopt_program_doc = "load a GDBM database from a file"; ++ parseopt_program_args = "FILE [DB_FILE]"; ++ + #ifdef HAVE_SETLOCALE + setlocale (LC_ALL, ""); + #endif +diff --git a/src/gdbmtool.c b/src/gdbmtool.c +index bbadbae..69bc3b1 100644 +--- a/src/gdbmtool.c ++++ b/src/gdbmtool.c +@@ -1535,8 +1535,6 @@ command_lookup (const char *str, struct locus *loc, struct command **pcmd) + return found->tok; + } + +-char *parseopt_program_doc = N_("examine and/or modify a GDBM database"); +-char *parseopt_program_args = N_("DBFILE [COMMAND [ARG ...]]"); + + enum { + OPT_LEX_TRACE = 256, +@@ -2053,6 +2051,9 @@ main (int argc, char *argv[]) + char *source = NULL; + instream_t input = NULL; + ++ parseopt_program_doc = N_("examine and/or modify a GDBM database"); ++ parseopt_program_args = N_("DBFILE [COMMAND [ARG ...]]"); ++ + set_progname (argv[0]); + #if GDBM_DEBUG_ENABLE + gdbm_debug_printer = debug_printer; +-- +2.27.0 + diff --git a/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk b/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk index 3320827d0..0266e0497 100644 --- a/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk @@ -24,6 +24,14 @@ HOST_GDK_PIXBUF_CONF_ENV = \ gio_can_sniff=no GDK_PIXBUF_CONF_OPTS = --disable-glibtest +HOST_GDK_PIXBUF_CONF_OPTS = --disable-introspection + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GDK_PIXBUF_CONF_OPTS += --enable-introspection +GDK_PIXBUF_DEPENDENCIES += gobject-introspection +else +GDK_PIXBUF_CONF_OPTS += --disable-introspection +endif ifneq ($(BR2_PACKAGE_LIBPNG),y) GDK_PIXBUF_CONF_OPTS += --without-libpng diff --git a/buildroot/package/genimage/genimage.hash b/buildroot/package/genimage/genimage.hash index fb5d23550..fbec5ce57 100644 --- a/buildroot/package/genimage/genimage.hash +++ b/buildroot/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e9b43d1288f4e216d6c79de2a0c53ce1bd41f93cec750d8ab057aa2d0b0ee4a genimage-12.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4206e253226a384386c01591251f2ed1ea3485ef63f1e696db03600e1213db79 genimage-13.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/genimage/genimage.mk b/buildroot/package/genimage/genimage.mk index 896039390..dde8f8b9e 100644 --- a/buildroot/package/genimage/genimage.mk +++ b/buildroot/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 12 +GENIMAGE_VERSION = 13 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse diff --git a/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch b/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch deleted file mode 100644 index 5a9f3b7da..000000000 --- a/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f63b15e690581d898da56ef2540b6199f5728e58 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 11 Feb 2020 19:14:53 +0100 -Subject: [PATCH] tests/Makefile.am: don't add -lpthread - -Don't add -lpthread unconditionally to oomtest_LDADD to avoid a build -failure without threads, it will be added to LIBS by configure.ac if -needed - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/cminyard/gensio/commit/f63b15e690581d898da56ef2540b6199f5728e58] ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index a280acc..b4335c5 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -127,7 +127,7 @@ test_fuzz: test_fuzz_certauth test_fuzz_mux test_fuzz_ssl test_fuzz_telnet \ - - oomtest_SOURCES = oomtest.c - --oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) -lpthread -+oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) - - noinst_PROGRAMS = oomtest - diff --git a/buildroot/package/gensio/gensio.hash b/buildroot/package/gensio/gensio.hash index 623b41904..ecf9d5e15 100644 --- a/buildroot/package/gensio/gensio.hash +++ b/buildroot/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 53c027dfaaf374f57d5f36a6250fc018 gensio-1.5.1.tar.gz -sha1 8329d7828016e643f60b8b3e70564d32cd03008f gensio-1.5.1.tar.gz +md5 bef0312c68ef541f85893c6bc85930ed gensio-2.1.5.tar.gz +sha1 f23b4017aba5a6f9066f734ffb600fa36b1399c0 gensio-2.1.5.tar.gz # Locally computed: -sha256 c1ed28f5bd72185dba666a900d29afbecba58727d6c0dde4a182143273fc1e6b gensio-1.5.1.tar.gz +sha256 e497043a0415177652bfb2b1d045e4605cd5726bbcfe790ef6f555ac25825c12 gensio-2.1.5.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/buildroot/package/gensio/gensio.mk b/buildroot/package/gensio/gensio.mk index 0386b30fd..1170ec00f 100644 --- a/buildroot/package/gensio/gensio.mk +++ b/buildroot/package/gensio/gensio.mk @@ -4,13 +4,11 @@ # ################################################################################ -GENSIO_VERSION = 1.5.1 +GENSIO_VERSION = 2.1.5 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES -# We're patching configure.ac -GENSIO_AUTORECONF = YES GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ diff --git a/buildroot/package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch b/buildroot/package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch new file mode 100644 index 000000000..6898e8ebe --- /dev/null +++ b/buildroot/package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch @@ -0,0 +1,51 @@ +From 0ac781b0b0deef5c02c32a70ac484f882c3f4dd0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Dec 2019 18:55:57 +0100 +Subject: [PATCH] fix matroska build without js, taglib or atrailers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +i2i function is used in matroska_handler.cc but this function is defined +only if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) +as a result compilation fails if HAVE_MATROSKA is set but HAVE_JS, +HAVE_TAGLIG or ATRAILERS are not. + +Backported from: 0ac781b0b0deef5c02c32a70ac484f882c3f4dd0 + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jörg Krause +--- + src/string_converter.cc | 2 +- + src/string_converter.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/string_converter.cc b/src/string_converter.cc +index f669c661..7a3c55d7 100644 +--- a/src/string_converter.cc ++++ b/src/string_converter.cc +@@ -218,7 +218,7 @@ Ref StringConverter::p2i() + } + #endif + +-#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) ++#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) || defined(HAVE_MATROSKA) + + Ref StringConverter::i2i() + { +diff --git a/src/string_converter.h b/src/string_converter.h +index 58495430..f75bf833 100644 +--- a/src/string_converter.h ++++ b/src/string_converter.h +@@ -65,7 +65,7 @@ public: + static zmm::Ref p2i(); + + #endif +-#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) ++#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) || defined(HAVE_MATROSKA) + /// \brief safeguard - internal to internal - needed to catch some + /// scenarious where the user may have forgotten to add proper conversion + /// in the script. +-- +2.26.1 + diff --git a/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch b/buildroot/package/gerbera/0002-cmake-FindLibMagic-cmake-fix-static-linking.patch similarity index 89% rename from buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch rename to buildroot/package/gerbera/0002-cmake-FindLibMagic-cmake-fix-static-linking.patch index 5a189614f..f6cc276e7 100644 --- a/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch +++ b/buildroot/package/gerbera/0002-cmake-FindLibMagic-cmake-fix-static-linking.patch @@ -1,4 +1,4 @@ -From 64f49c6131f4112e5efd8b69094235f13882ccf5 Mon Sep 17 00:00:00 2001 +From 7fdcabd80c823694d190e5baa8c657ffcae5e777 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 31 Jan 2020 17:14:11 +0100 Subject: [PATCH] cmake/FindLibMagic.cmake: fix static linking @@ -18,10 +18,16 @@ compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' +It should be noted that libmagic.pc is not currently provided in the +official file package (which provides libmagic), an issue has been +opened to add libmagic.pc: https://bugs.astron.com/view.php?id=136 + Fixes: - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/gerbera/gerbera/commit/7fdcabd80c823694d190e5baa8c657ffcae5e777] --- cmake/FindLibMagic.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) @@ -55,6 +61,3 @@ index f68ab923..04995af4 100644 MARK_AS_ADVANCED( MAGIC_LIBRARIES MAGIC_INCLUDE_DIRS ) --- -2.24.1 - diff --git a/buildroot/package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch b/buildroot/package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch new file mode 100644 index 000000000..128d61704 --- /dev/null +++ b/buildroot/package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch @@ -0,0 +1,37 @@ +From aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Dec 2019 22:57:18 +0100 +Subject: [PATCH] cmake/FindMatroska: fix static linking + +Fix static linking with libmatrasoka by adding PC_EBM_LIBRARIES to +EBML_LIBRARIES and PC_MAT_LIBRARIES to MATROSKA_LIBRARIES + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/gerbera/gerbera/commit/aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d] +--- + cmake/FindMatroska.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindMatroska.cmake b/cmake/FindMatroska.cmake +index 4b09a5ec..12ca593d 100644 +--- a/cmake/FindMatroska.cmake ++++ b/cmake/FindMatroska.cmake +@@ -23,7 +23,7 @@ FIND_LIBRARY(EBML_LIBRARY ebml + FIND_PACKAGE_HANDLE_STANDARD_ARGS(EBML + REQUIRED_VARS EBML_LIBRARY EBML_INCLUDE_DIR) + if (EBML_FOUND) +- set (EBML_LIBRARIES ${EBML_LIBRARY}) ++ set (EBML_LIBRARIES ${EBML_LIBRARY} ${PC_EBM_LIBRARIES}) + set (EBML_INCLUDE_DIRS ${EBML_INCLUDE_DIR} ) + endif () + MARK_AS_ADVANCED( +@@ -41,7 +41,7 @@ find_library(MATROSKA_LIBRARY matroska + FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATROSKA + REQUIRED_VARS MATROSKA_LIBRARY MATROSKA_INCLUDE_DIR) + if (MATROSKA_FOUND) +- set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY}) ++ set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY} ${PC_MAT_LIBRARIES}) + set (MATROSKA_INCLUDE_DIRS ${MATROSKA_INCLUDE_DIR} ) + endif () + MARK_AS_ADVANCED( diff --git a/buildroot/package/gerbera/config.xml b/buildroot/package/gerbera/config.xml index fa990d150..ddaaa7f18 100644 --- a/buildroot/package/gerbera/config.xml +++ b/buildroot/package/gerbera/config.xml @@ -79,6 +79,9 @@ + + + @@ -107,6 +110,7 @@ + diff --git a/buildroot/package/gerbera/gerbera.hash b/buildroot/package/gerbera/gerbera.hash index 533a90388..b1fdcbf2d 100644 --- a/buildroot/package/gerbera/gerbera.hash +++ b/buildroot/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c7fbb6104dd03ed22d114c7b1fbe95eb7f90893148630e16b0a4c23f1f631341 gerbera-1.3.4.tar.gz -sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md +sha256 904a9031c85ac805e4c139f363510226952683d7257acd1dee25ba1e97fd7651 gerbera-1.4.0.tar.gz +sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/buildroot/package/gerbera/gerbera.mk b/buildroot/package/gerbera/gerbera.mk index 21c683695..7f0ac664f 100644 --- a/buildroot/package/gerbera/gerbera.mk +++ b/buildroot/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.3.4 +GERBERA_VERSION = 1.4.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md @@ -63,6 +63,13 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) GERBERA_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBMATROSKA),y) +GERBERA_DEPENDENCIES += libmatroska +GERBERA_CONF_OPTS += -DWITH_MATROSKA=ON +else +GERBERA_CONF_OPTS += -DWITH_MATROSKA=OFF +endif + ifeq ($(BR2_PACKAGE_MYSQL),y) GERBERA_DEPENDENCIES += mysql GERBERA_CONF_OPTS += -DWITH_MYSQL=ON diff --git a/buildroot/package/gettext-gnu/0001-error_print_progname.patch b/buildroot/package/gettext-gnu/0001-error_print_progname.patch index 189d28b57..7e1d3c55c 100644 --- a/buildroot/package/gettext-gnu/0001-error_print_progname.patch +++ b/buildroot/package/gettext-gnu/0001-error_print_progname.patch @@ -1,6 +1,11 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, +[Updated to apply cleanly with 0.20.1] +Signed-off-by: Adam Duskett +--- +diff --git a/gettext-tools/gnulib-lib/error.h b/gettext-tools/gnulib-lib/error.h +index 61771cc..4221684 100644 +--- a/gettext-tools/gnulib-lib/error.h ++++ b/gettext-tools/gnulib-lib/error.h +@@ -68,7 +68,10 @@ extern void error_at_line (int __status, int __errnum, const char *__fname, /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ @@ -10,5 +15,6 @@ +#endif +void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ extern DLL_VARIABLE unsigned int error_message_count; +-- diff --git a/buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch b/buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch deleted file mode 100644 index 5f5e5f6c2..000000000 --- a/buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Tue, 16 May 2017 00:27:57 +0200 -Subject: [PATCH] Update after gnulib changed. - -For buildroot we only need to update wint_t.m4 to fix autoreconf with -certain packages which already contain the updated version of this file. -Otherwise autoreconf will break: - -http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html -https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a - -Patch backported from upstream commit: -http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f - -Needed for coreutils bump to 8.27 - -Signed-off-by: Bernd Kuhls - -diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4 -index 8ff2a5b5a..d30b8bcf8 100644 ---- a/gettext-runtime/m4/wint_t.m4 -+++ b/gettext-runtime/m4/wint_t.m4 -@@ -1,11 +1,12 @@ --# wint_t.m4 serial 5 (gettext-0.18.2) --dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. -+# wint_t.m4 serial 7 -+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. --dnl Test whether has the 'wint_t' type. -+dnl Test whether has the 'wint_t' type and whether gnulib's -+dnl or would, if present, override 'wint_t'. - dnl Prerequisite: AC_PROG_CC - - AC_DEFUN([gt_TYPE_WINT_T], -@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gt_cv_c_wint_t=no])]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) -+ -+ dnl Determine whether gnulib's or would, if present, -+ dnl override 'wint_t'. -+ AC_CACHE_CHECK([whether wint_t is too small], -+ [gl_cv_type_wint_t_too_small], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+#if !(defined __GLIBC__ && !defined __UCLIBC__) -+# include -+# include -+# include -+#endif -+#include -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ ]])], -+ [gl_cv_type_wint_t_too_small=no], -+ [gl_cv_type_wint_t_too_small=yes])]) -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+]) -+ -+dnl Prerequisites of the 'wint_t' override. -+AC_DEFUN([gl_TYPE_WINT_T_PREREQ], -+[ -+ AC_CHECK_HEADERS_ONCE([crtdefs.h]) -+ if test $ac_cv_header_crtdefs_h = yes; then -+ HAVE_CRTDEFS_H=1 -+ else -+ HAVE_CRTDEFS_H=0 - fi -+ AC_SUBST([HAVE_CRTDEFS_H]) - ]) diff --git a/buildroot/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch b/buildroot/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch new file mode 100644 index 000000000..5334a36bb --- /dev/null +++ b/buildroot/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch @@ -0,0 +1,142 @@ +From e4b3a3f56fa6fc2a51769e286545f0631bb4837c Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sat, 18 May 2019 23:33:06 +0200 +Subject: [PATCH] build: Restore the ability to build gettext-tools separately, part 1. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported by Hanspeter Niederstrasser +in . + +Code based on patch by Miguel Ángel Arruga Vivas . + +* autogen.sh: Copy libtextstyle.m4 for use by gettext-tools. +* gettext-tools/configure.ac: New option --with-installed-libtextstyle. +(USE_INSTALLED_LIBTEXTSTYLE): New conditional. +* gettext-tools/src/Makefile.am (textstyle.h): Disable rule if +USE_INSTALLED_LIBTEXTSTYLE is true. +(LT_LIBTEXTSTYLE): New variable. +(libgettextsrc_la_LDFLAGS): Use it instead of hardcoding a relative filename of +libtextstyle.la. +* configure.ac: Filter out --with-installed-libtextstyle from inherited --help +output. +* Makefile.am (distcheck-hook): Compare different copies of libtextstyle.m4. +* PACKAGING: Document that gettext-tools's configure needs to be invoked with +--with-installed-libtextstyle. + +Upstream-status: committed. +https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=e4b3a3f56fa6fc2a51769e286545f0631bb4837c + +Signed-off-by: Bruno Haible +[Backported to 0.20.1] +Signed-off-by: Adam Duskett +--- + PACKAGING | 2 +- + autogen.sh | 1 + + configure.ac | 2 +- + gettext-tools/configure.ac | 16 ++++++++++++++++ + gettext-tools/src/Makefile.am | 8 +++++++- + 5 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/PACKAGING b/PACKAGING +index a8ce979..52b80ac 100644 +--- a/PACKAGING ++++ b/PACKAGING +@@ -42,7 +42,7 @@ The 'libtextstyle' binary package can be installed by doing + The 'gettext-tools' binary package can be installed by doing + + cd gettext-tools +- ./configure ++ ./configure --with-installed-libtextstyle + make + make install + +diff --git a/autogen.sh b/autogen.sh +index 5c28b6f..2ccf373 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -268,6 +268,7 @@ if ! $skip_gnulib; then + $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \ + --import --avoid=array-list-tests --avoid=linkedhash-list-tests --avoid=hash-tests --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \ + `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $? ++ $GNULIB_TOOL --copy-file m4/libtextstyle.m4 gettext-tools/gnulib-m4/libtextstyle.m4 || exit $? + # In gettext-tools/libgrep: + GNULIB_MODULES_TOOLS_FOR_LIBGREP=' + mbrlen +diff --git a/configure.ac b/configure.ac +index 38db6fd..0c84bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_CANONICAL_HOST + dnl Optional Features: AC_ARG_ENABLE calls + dnl Optional Packages: AC_ARG_WITH calls + dnl Some influential environment variables: AC_ARG_VAR calls +-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ]) ++esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle; } | sed -f build-aux/ac-help.sed ]) + + AC_CONFIG_FILES([Makefile]) + +diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac +index cf1dd73..a6816b8 100644 +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -121,6 +121,22 @@ AM_CONDITIONAL([PACKAGE_IS_GETTEXT_TOOLS], [true]) + AM_CONDITIONAL([PRELOADABLE_LIBINTL], + [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes]) + ++dnl This option allows to build gettext-tools without (re)building libtextstyle. ++AC_ARG_WITH([installed-libtextstyle], ++ [AS_HELP_STRING([--with-installed-libtextstyle], ++ [Use an already installed libtextstyle.])], ++ [gt_use_installed_libtextstyle=$withval], ++ [gt_use_installed_libtextstyle=no]) ++if test "$gt_use_installed_libtextstyle" != no; then ++ gl_LIBTEXTSTYLE ++else ++ test -f ../libtextstyle/Makefile || { ++ AC_MSG_ERROR([When building the gettext-tools package without building the entire gettext package, you need to pass the --with-installed-libtextstyle option to configure.]) ++ } ++fi ++AM_CONDITIONAL([USE_INSTALLED_LIBTEXTSTYLE], ++ [test "$gt_use_installed_libtextstyle" != no]) ++ + dnl This line internationalizes the bison generated parsers. + BISON_I18N + +diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am +index b98b7ab..af3dcee 100644 +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -250,6 +250,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c + cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML) + cldr_plurals_LDADD = libgettextsrc.la $(LDADD) + ++if USE_INSTALLED_LIBTEXTSTYLE ++LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@ ++else + # How to get the include files of libtextstyle. + textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + here=`pwd`; \ +@@ -257,6 +260,9 @@ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" + BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h + MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h ++# Where to find the built libtextstyle library. ++LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la ++endif + + # How to build libgettextsrc.la. + # Need ../gnulib-lib/libgettextlib.la. +@@ -268,7 +274,7 @@ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyl + # use iconv(). + libgettextsrc_la_LDFLAGS = \ + -release @VERSION@ \ +- ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) ../../libtextstyle/lib/libtextstyle.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined ++ ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) $(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined + + # OS/2 does not support a DLL name longer than 8 characters. + if OS2 +-- +2.24.1 + diff --git a/buildroot/package/gettext-gnu/gettext-gnu.hash b/buildroot/package/gettext-gnu/gettext-gnu.hash index 5a621ae2d..4c17fb3e0 100644 --- a/buildroot/package/gettext-gnu/gettext-gnu.hash +++ b/buildroot/package/gettext-gnu/gettext-gnu.hash @@ -1,6 +1,7 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz -# License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB diff --git a/buildroot/package/gettext-gnu/gettext-gnu.mk b/buildroot/package/gettext-gnu/gettext-gnu.mk index 28662e0de..ee7e97baf 100644 --- a/buildroot/package/gettext-gnu/gettext-gnu.mk +++ b/buildroot/package/gettext-gnu/gettext-gnu.mk @@ -4,19 +4,20 @@ # ################################################################################ -GETTEXT_GNU_VERSION = 0.19.8.1 +# Please keep in sync with package/libtextstyle/libtextstyle.mk +GETTEXT_GNU_VERSION = 0.20.1 GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz GETTEXT_GNU_INSTALL_STAGING = YES GETTEXT_GNU_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest) GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB -# 0002-Update-after-gnulib-changed.patch +# 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch GETTEXT_GNU_AUTORECONF = YES GETTEXT_GNU_PROVIDES = gettext GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) # Avoid using the bundled subset of libxml2 -HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 +HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 host-libtextstyle GETTEXT_GNU_CONF_OPTS += \ --disable-libasprintf \ @@ -38,7 +39,8 @@ HOST_GETTEXT_GNU_CONF_OPTS = \ --disable-native-java \ --disable-csharp \ --disable-relocatable \ - --without-emacs + --without-emacs \ + --with-installed-libtextstyle # Force the build of libintl, even if the C library provides a stub # gettext implementation diff --git a/buildroot/package/gettext-tiny/gettext-tiny.hash b/buildroot/package/gettext-tiny/gettext-tiny.hash index 9232fe853..5155b4191 100644 --- a/buildroot/package/gettext-tiny/gettext-tiny.hash +++ b/buildroot/package/gettext-tiny/gettext-tiny.hash @@ -1,7 +1,6 @@ # Locally Computed: -sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz -sha256 b57aa4fdc1c614c28d41c1e2d5c4090935964c5f86291ba7d1c99ffd1d698b34 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 extra/COPYING -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz +sha256 29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383 gettext-tiny-0.3.2.tar.gz +sha256 4c938aa3d8fa3c184bba5e87a8a2febc89560627c9d0567536879e3eca1a7b4f LICENSE +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b extra/COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz diff --git a/buildroot/package/gettext-tiny/gettext-tiny.mk b/buildroot/package/gettext-tiny/gettext-tiny.mk index 09a98f99b..c297cb1fe 100644 --- a/buildroot/package/gettext-tiny/gettext-tiny.mk +++ b/buildroot/package/gettext-tiny/gettext-tiny.mk @@ -4,8 +4,8 @@ # ################################################################################ -GETTEXT_TINY_VERSION = adaa9c64921e80f2b8dd3610ffb508618b9204f3 -GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,$(GETTEXT_TINY_VERSION)) +GETTEXT_TINY_VERSION = 0.3.2 +GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,v$(GETTEXT_TINY_VERSION)) GETTEXT_TINY_LICENSE = MIT, GPL-3.0+ (extra gettext) GETTEXT_TINY_INSTALL_STAGING = YES GETTEXT_TINY_LICENSE_FILES = LICENSE @@ -14,12 +14,11 @@ HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING GETTEXT_TINY_PROVIDES = gettext # needed for gettextize -GETTEXT_TINY_ARCHIVE_VERSION = 0.19.8 +GETTEXT_TINY_ARCHIVE_VERSION = 0.20.1 GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ gettext-tools/misc/gettextize.in \ gettext-tools/po/Makevars.template \ - gettext-runtime/m4/lock.m4 \ gettext-runtime/po/boldquot.sed \ gettext-runtime/po/en@boldquot.header \ gettext-runtime/po/en@quot.header \ @@ -83,7 +82,6 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/gettextize $(HOST_DIR)/bin/gettextize $(INSTALL) -m 0644 -D $(@D)/build-aux/config.rpath $(HOST_DIR)/share/gettext-tiny/config.rpath - $(INSTALL) -m 0644 -D $(@D)/extra/lock.m4 $(HOST_DIR)/share/gettext-tiny/m4/lock.m4 $(INSTALL) -m 0644 -D $(@D)/extra/Makefile.in.in $(HOST_DIR)/share/gettext-tiny/po/Makefile.in.in $(INSTALL) -m 0644 -D $(@D)/extra/boldquot.sed $(HOST_DIR)/share/gettext-tiny/po/boldquot.sed $(INSTALL) -m 0644 -D $(@D)/extra/en@boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en@boldquot.header diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk index 31d23fd20..e8d35a50b 100644 --- a/buildroot/package/ghostscript/ghostscript.mk +++ b/buildroot/package/ghostscript/ghostscript.mk @@ -24,8 +24,9 @@ GHOSTSCRIPT_DEPENDENCIES = \ # Inspired by linuxfromscratch: # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html define GHOSTSCRIPT_REMOVE_LIBS - rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2mt \ - $(@D)/libpng $(@D)/tiff $(@D)/zlib + rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jbig2dec $(@D)/jpeg \ + $(@D)/lcms2mt $(@D)/libpng $(@D)/openjpeg $(@D)/tiff \ + $(@D)/zlib endef GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS @@ -36,15 +37,20 @@ GHOSTSCRIPT_CONF_ENV = \ GHOSTSCRIPT_CONF_OPTS = \ --disable-compile-inits \ - --disable-cups \ --enable-fontconfig \ --with-fontpath=/usr/share/fonts \ --enable-freetype \ --disable-gtk \ - --without-jbig2dec \ --without-libpaper \ --with-system-libtiff +ifeq ($(BR2_PACKAGE_JBIG2DEC),y) +GHOSTSCRIPT_DEPENDENCIES += jbig2dec +GHOSTSCRIPT_CONF_OPTS += --with-jbig2dec +else +GHOSTSCRIPT_CONF_OPTS += --without-jbig2dec +endif + ifeq ($(BR2_PACKAGE_LIBIDN),y) GHOSTSCRIPT_DEPENDENCIES += libidn GHOSTSCRIPT_CONF_OPTS += --with-libidn @@ -52,6 +58,22 @@ else GHOSTSCRIPT_CONF_OPTS += --without-libidn endif +ifeq ($(BR2_PACKAGE_OPENJPEG),y) +GHOSTSCRIPT_DEPENDENCIES += openjpeg +GHOSTSCRIPT_CONF_OPTS += --enable-openjpeg +else +GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg +endif + +ifeq ($(BR2_PACKAGE_CUPS),y) +GHOSTSCRIPT_DEPENDENCIES += cups +GHOSTSCRIPT_CONF_OPTS += \ + CUPSCONFIG=$(STAGING_DIR)/usr/bin/cups-config \ + --enable-cups +else +GHOSTSCRIPT_CONF_OPTS += --disable-cups +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-x diff --git a/buildroot/package/git/git.hash b/buildroot/package/git/git.hash index 5734fea17..d04359022 100644 --- a/buildroot/package/git/git.hash +++ b/buildroot/package/git/git.hash @@ -1,4 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 da8c594c21ef965cdff427f27a7a384833d96d4d67f3a13915b498009646ef29 git-2.24.3.tar.xz -sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING -sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 +sha256 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848 git-2.26.2.tar.xz +# Locally calculated +sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING +sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/buildroot/package/git/git.mk b/buildroot/package/git/git.mk index d5e81b529..0a67a7e1e 100644 --- a/buildroot/package/git/git.mk +++ b/buildroot/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.24.3 +GIT_VERSION = 2.26.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/buildroot/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash index 88649d842..336e0aa07 100644 --- a/buildroot/package/glib-networking/glib-networking.hash +++ b/buildroot/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.62/glib-networking-2.62.4.sha256sum -sha256 c18f289eec480fdce12044c0a06f77521edf9f460d16ad4213de61f2a3b294cf glib-networking-2.62.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.64/glib-networking-2.64.3.sha256sum +sha256 937a06b124052813bfc0b0b86bff42016ff01067582e1aca65bb6dbe0845a168 glib-networking-2.64.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk index e1d4823ad..295c7516c 100644 --- a/buildroot/package/glib-networking/glib-networking.mk +++ b/buildroot/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.62 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).4 +GLIB_NETWORKING_VERSION_MAJOR = 2.64 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).3 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES diff --git a/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash b/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash deleted file mode 100644 index ce378c0bd..000000000 --- a/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 703877c0df77fce00719fe55cc62b07bb8d5f44fdb704bbb1b0bf2cf38afe10a glibc-06983fe52cfe8e4779035c27e8cc5d2caab31531.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash b/buildroot/package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash similarity index 54% rename from buildroot/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash rename to buildroot/package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash index 21ee1faea..a1b2ae12f 100644 --- a/buildroot/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash +++ b/buildroot/package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) -sha256 ce788d30851a215d58ff94c972d9cff5956725cc5ee906298711ddc63078c315 glibc-2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d.tar.gz +sha256 e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176 glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/buildroot/package/glibc/arc-2019.09-release/glibc.hash b/buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash similarity index 52% rename from buildroot/package/glibc/arc-2019.09-release/glibc.hash rename to buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash index 296035c49..c6259a474 100644 --- a/buildroot/package/glibc/arc-2019.09-release/glibc.hash +++ b/buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) -sha256 0e0fd7603938fd8ebd793385a3d72c6e1fba22e16a600a16cc953a93f0e85943 glibc-arc-2019.09-release.tar.gz +sha256 07f3804abbc6a23315f09568686c0e5bb81d714251cf537d25a36f826cae540b glibc-2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/buildroot/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash b/buildroot/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash new file mode 100644 index 000000000..558591522 --- /dev/null +++ b/buildroot/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash @@ -0,0 +1,7 @@ +# Locally calculated (fetched from Github) +sha256 c3828224d69a42f5b6982cbec8ae01cf494fe975ce9023e36ff2c10a2fb93e42 glibc-2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/buildroot/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk index 08170fbbc..4721177d8 100644 --- a/buildroot/package/glibc/glibc.mk +++ b/buildroot/package/glibc/glibc.mk @@ -4,20 +4,24 @@ # ################################################################################ -ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2019.09-release -GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_RISCV_32),y) -GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531 -GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION)) -else ifeq ($(BR2_csky),y) +ifeq ($(BR2_csky),y) GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176 GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d +ifeq ($(BR2_arc),y) +# ARC support in upstream was merged in 2.32 release +# This can be removed once BR upgrades to 2.32 or later +GLIBC_VERSION = 2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5 +else ifeq ($(BR2_RISCV_32),y) +# RISC-V 32-bit (RV32) requires glibc 2.33 or newer +# Until 2.33 is released, just use master +GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99 +else +GLIBC_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d +endif # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -130,8 +134,8 @@ define GLIBC_CONFIGURE_CMDS --enable-shared \ $(if $(BR2_x86_64),--enable-lock-elision) \ --with-pkgversion="Buildroot" \ - --without-cvs \ --disable-profile \ + --disable-werror \ --without-gd \ --enable-obsolete-rpc \ --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ diff --git a/buildroot/package/glmark2/glmark2.hash b/buildroot/package/glmark2/glmark2.hash index ffd1ba2d5..33a99de12 100644 --- a/buildroot/package/glmark2/glmark2.hash +++ b/buildroot/package/glmark2/glmark2.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6a9de46c098406895411b629fe8fadfdce92360500f0f10e4cc60a889a1692eb glmark2-9e01aef1a786b28aca73135a5b00f85c357e8f5e.tar.gz +sha256 9ad57e4eec0049c47a367b57f5f8d3e31e4c488b1d5d6673a75f1b2282e40888 glmark2-c493520253fbfe3676c8b34b6f91a7c9a838fc8e.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI diff --git a/buildroot/package/glmark2/glmark2.mk b/buildroot/package/glmark2/glmark2.mk index 3d31003d0..ec62faada 100644 --- a/buildroot/package/glmark2/glmark2.mk +++ b/buildroot/package/glmark2/glmark2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLMARK2_VERSION = 9e01aef1a786b28aca73135a5b00f85c357e8f5e +GLMARK2_VERSION = c493520253fbfe3676c8b34b6f91a7c9a838fc8e GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI diff --git a/buildroot/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch b/buildroot/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch new file mode 100644 index 000000000..56a2d4982 --- /dev/null +++ b/buildroot/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch @@ -0,0 +1,25 @@ +src/connectiontcpserver.cpp: fix musl build + +Build on musl fails on: + +connectiontcpserver.cpp:131:13: error: 'strerror' was not declared in this scope + + strerror( err ) + " (errno: " + util::int2string( err ) + ")"; + ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a61a91bb6e1156eff5fb756f9dccfc2bb6c0f277 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.camaya.net/ticket/?id=291] + +diff -Nuar gloox-1.0.23-orig/src/connectiontcpserver.cpp gloox-1.0.23/src/connectiontcpserver.cpp +--- gloox-1.0.23-orig/src/connectiontcpserver.cpp 2020-06-05 23:22:59.624018949 +0200 ++++ gloox-1.0.23/src/connectiontcpserver.cpp 2020-06-05 23:26:20.708027221 +0200 +@@ -36,6 +36,7 @@ + # include + # include + # include ++# include + # include + # include + # include diff --git a/buildroot/package/gloox/Config.in b/buildroot/package/gloox/Config.in new file mode 100644 index 000000000..91e9f06e3 --- /dev/null +++ b/buildroot/package/gloox/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_GLOOX + bool "gloox" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MPC + help + gloox is a portable high-level Jabber/XMPP library for C++. It + is fully compliant with the XMPP RFCs, supports all of the + XMPP features (including SRV lookups, TLS, SASL, roster + management, and privacy lists), and implements several XEPs + that make it ideal for writing any kind of Jabber/XMPP client + or component. + + https://camaya.net/gloox/ + +comment "gloox needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/gloox/gloox.hash b/buildroot/package/gloox/gloox.hash new file mode 100644 index 000000000..6419db90f --- /dev/null +++ b/buildroot/package/gloox/gloox.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 ae1462be2a2eb8fe5cd054825143617c53c2c9c7195606cb5a5ba68c0f68f9c9 gloox-1.0.24.tar.bz2 +sha256 40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af LICENSE diff --git a/buildroot/package/gloox/gloox.mk b/buildroot/package/gloox/gloox.mk new file mode 100644 index 000000000..b741d5ebc --- /dev/null +++ b/buildroot/package/gloox/gloox.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# gloox +# +################################################################################ + +GLOOX_VERSION = 1.0.24 +GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2 +GLOOX_SITE = https://camaya.net/download +GLOOX_LICENSE = GPL-3.0 with OpenSSL exception +GLOOX_LICENSE_FILES = LICENSE +GLOOX_INSTALL_STAGING = YES +GLOOX_DEPENDENCIES = mpc +GLOOX_CONF_OPTS = \ + --without-libidn \ + --enable-getaddrinfo \ + --without-examples \ + --without-tests + +GLOOX_CXXFLAGS = $(TARGET_CXXFLAGS) +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLOOX_CXXFLAGS += -O0 +endif +GLOOX_CONF_ENV += CXXFLAGS="$(GLOOX_CXXFLAGS)" + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GLOOX_CONF_ENV += LIBS=-latomic +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GLOOX_CONF_OPTS += --with-zlib +GLOOX_DEPENDENCIES += zlib +else +GLOOX_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GLOOX_CONF_OPTS += --with-openssl --without-gnutls +GLOOX_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +GLOOX_CONF_OPTS += --with-gnutls --without-openssl +GLOOX_DEPENDENCIES += gnutls +else +GLOOX_CONF_OPTS += --without-gnutls --without-openssl +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/glorytun/glorytun.hash b/buildroot/package/glorytun/glorytun.hash index 30e8fd34a..9d1b79778 100644 --- a/buildroot/package/glorytun/glorytun.hash +++ b/buildroot/package/glorytun/glorytun.hash @@ -1,2 +1,2 @@ -sha256 457552232c72d5fec7ba46382784685c2e8167d49d8182ab3afbfb2b0bce1b01 glorytun-0.2.2.tar.gz -sha256 02e492aa724ce3a64800ed9429cbabf811935ad1be95d667fae9187baa94e359 LICENSE +sha256 137d9c525a05bb605163df0465367d36e943715ca773ce43d5ea66f0597600a3 glorytun-0.3.4.tar.gz +sha256 3d9ddddb8807c305287d9dbab58473e5307e9c91651c43c654a0828855d2b373 LICENSE diff --git a/buildroot/package/glorytun/glorytun.mk b/buildroot/package/glorytun/glorytun.mk index 9207388d7..d128ae835 100644 --- a/buildroot/package/glorytun/glorytun.mk +++ b/buildroot/package/glorytun/glorytun.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLORYTUN_VERSION = 0.2.2 +GLORYTUN_VERSION = 0.3.4 GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION) GLORYTUN_DEPENDENCIES = libsodium host-pkgconf GLORYTUN_LICENSE = BSD-2-clause diff --git a/buildroot/package/gnupg2/gnupg2.hash b/buildroot/package/gnupg2/gnupg2.hash index 2dee44283..ac78385f7 100644 --- a/buildroot/package/gnupg2/gnupg2.hash +++ b/buildroot/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q4/000443.html -sha1 e24a1208ffe69d7436b2f27e99542a85f34d0ac0 gnupg-2.2.19.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2020q3/000448.html +sha1 bd949b4af7426e4afc13667d678503063c6aa4b5 gnupg-2.2.23.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.19.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0 gnupg-2.2.19.tar.bz2 -sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING +sha256 10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c gnupg-2.2.23.tar.bz2 +sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/buildroot/package/gnupg2/gnupg2.mk b/buildroot/package/gnupg2/gnupg2.mk index 28e946b40..af13a8d6c 100644 --- a/buildroot/package/gnupg2/gnupg2.mk +++ b/buildroot/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.19 +GNUPG2_VERSION = 2.2.23 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ diff --git a/buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch b/buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch index a9abfd06b..a557e279b 100644 --- a/buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch +++ b/buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch @@ -3,15 +3,16 @@ Add options to enable/disable docs and demos Originally written by Anthony Viallard . -[Vincent: adapt patch to 5.0.5 version] - Signed-off-by: Thomas Petazzoni +[Vincent: adapt patch to 5.0.5 version] Signed-off-by: Vicente Olivert Riera +[Michael: adapt patch to 5.4.0 version] +Signed-off-by: Michael Fischer -diff -rup a/configure.in b/configure.in ---- a/configure.in 2016-09-07 05:14:29.000000000 +0100 -+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000 -@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200 ++++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200 +@@ -713,6 +713,17 @@ [ Define if you want to read .gnuplot from current directory (SECURITY RISK!).]) fi @@ -24,13 +25,14 @@ diff -rup a/configure.in b/configure.in +dnl Does nothing here, is passed on to the demo subdir +AC_ARG_ENABLE(demo,dnl +[ --disable-demo do not build demo files]) ++ + dnl Sort help/subtopic tables by row or column AC_ARG_WITH(row-help,dnl [ --with-row-help format help and subtopic tables by row (default) -@@ -1303,6 +1313,24 @@ fi - dnl No configuration option for this one yet - AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported]) +@@ -1095,6 +1106,24 @@ + AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions]) + fi +dnl build doc files +if test "$enable_doc" != no; then @@ -53,15 +55,15 @@ diff -rup a/configure.in b/configure.in dnl Substitute variables AC_SUBST(PACKAGE) AC_SUBST(VERSION_MAJOR) -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100 -+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000 +diff -Naur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200 ++++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share +-SUBDIRS = config m4 term src docs man demo share ++SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \ + EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ + PATCHLEVEL PGPKEYS README RELEASE_NOTES \ diff --git a/buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch b/buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch deleted file mode 100644 index 690a82652..000000000 --- a/buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix usage of gdlib-config - -gnuplot configure.in script properly takes care of finding -gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config -instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG -has defined. Which means that whenever a gdlib-config binary not in -the PATH is being used, it does not use it. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -537,9 +537,9 @@ - if test "$with_gd" != no; then - AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config]) - if test -n "$GDLIB_CONFIG"; then -- libgd_CPPFLAGS=`gdlib-config --cflags` -- libgd_LDFLAGS=`gdlib-config --ldflags` -- libgd_LIBS=`gdlib-config --libs` -+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags` -+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags` -+ libgd_LIBS=`$GDLIB_CONFIG --libs` - elif test -d "$with_gd"; then - libgd_CPPFLAGS="-I$with_gd/include" - libgd_LDFLAGS="-L$with_gd/lib" diff --git a/buildroot/package/gnuplot/0002-without-history.patch b/buildroot/package/gnuplot/0002-without-history.patch new file mode 100644 index 000000000..6091da841 --- /dev/null +++ b/buildroot/package/gnuplot/0002-without-history.patch @@ -0,0 +1,17 @@ +history.c: Patch to solve the 'undefined reference to gp_read_history' + +Signed-off-by: Michael Fischer + +diff -purN gnuplot-5.4.0.org/src/history.c gnuplot-5.4.0/src/history.c +--- gnuplot-5.4.0.org/src/history.c 2019-12-10 07:22:32.000000000 +0100 ++++ gnuplot-5.4.0/src/history.c 2020-09-14 10:07:36.525441702 +0200 +@@ -91,7 +91,9 @@ write_history(char *filename) + void + read_history(char *filename) + { +- gp_read_history(filename); ++#ifdef GNUPLOT_HISTORY ++ gp_read_history(filename); ++#endif + } + diff --git a/buildroot/package/gnuplot/gnuplot.hash b/buildroot/package/gnuplot/gnuplot.hash index 1f3a08bb0..260b78314 100644 --- a/buildroot/package/gnuplot/gnuplot.hash +++ b/buildroot/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/ -md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz -sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.0/ +md5 ac586178f3b031dea82cd3890cefb21b gnuplot-5.4.0.tar.gz +sha1 b4660dff7d047a453c55fd77faba11f63bb2d5ed gnuplot-5.4.0.tar.gz # Locally computed -sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz +sha256 eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47 gnuplot-5.4.0.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/buildroot/package/gnuplot/gnuplot.mk b/buildroot/package/gnuplot/gnuplot.mk index d59605c57..ef9ef2ac6 100644 --- a/buildroot/package/gnuplot/gnuplot.mk +++ b/buildroot/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.0.6 +GNUPLOT_VERSION = 5.4.0 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright diff --git a/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch b/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch deleted file mode 100644 index e00ed226c..000000000 --- a/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d6647680612276f2321cc6a83964e9264fca42a1 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Wed, 15 Jan 2020 17:23:08 +0100 -Subject: [PATCH] add boost unit_test_framework required only when - ENABLE_TESTING=ON - -Signed-off-by: Gwenhael Goavec-Merou ---- - CMakeLists.txt | 7 +++---- - cmake/Modules/GnuradioConfig.cmake.in | 16 +++++++++++++--- - cmake/Modules/GrBoost.cmake | 5 ++++- - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a47a945f9..58add6136 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,9 @@ GR_CHECK_BUILD_TYPE(${CMAKE_BUILD_TYPE}) - SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") - message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") - -+include(GrComponent) -+GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING) -+ - # Set the version information here - SET(VERSION_MAJOR 3) - SET(VERSION_API 8) -@@ -377,10 +380,6 @@ GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON - SIX_FOUND - ) - --GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING -- Boost_FOUND --) -- - if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage") - include(CodeCoverage) - setup_target_for_coverage(coverage "ctest || exit 0" coverage) -diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in -index 1e5ad20ec..f59e74b8b 100644 ---- a/cmake/Modules/GnuradioConfig.cmake.in -+++ b/cmake/Modules/GnuradioConfig.cmake.in -@@ -24,15 +24,25 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}") - - find_dependency(LOG4CPP) - find_dependency(MPLIB) --find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" COMPONENTS -+ -+set(BOOST_REQUIRED_COMPONENTS - date_time - program_options - filesystem - system - regex - thread -- unit_test_framework -- ) -+) -+ -+if (NOT ENABLE_TESTING) -+ set(ENABLE_TESTING @ENABLE_TESTING@ CACHE BOOL "Enable testing support") -+endif() -+ -+if(ENABLE_TESTING) -+ list(APPEND BOOST_REQUIRED_COMPONENTS unit_test_framework) -+endif(ENABLE_TESTING) -+ -+find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - find_dependency(Volk) - set(ENABLE_PYTHON @ENABLE_PYTHON@ CACHE BOOL "Enable Python & SWIG") - if(${ENABLE_PYTHON}) -diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake -index cd4b120f7..670e61054 100644 ---- a/cmake/Modules/GrBoost.cmake -+++ b/cmake/Modules/GrBoost.cmake -@@ -33,9 +33,12 @@ set(BOOST_REQUIRED_COMPONENTS - system - regex - thread -- unit_test_framework - ) - -+if(ENABLE_TESTING) -+ list(APPEND BOOST_REQUIRED_COMPONENTS unit_test_framework) -+endif(ENABLE_TESTING) -+ - if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") - list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix - endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") --- -2.24.1 - diff --git a/buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch b/buildroot/package/gnuradio/0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch similarity index 100% rename from buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch rename to buildroot/package/gnuradio/0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch diff --git a/buildroot/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch b/buildroot/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch new file mode 100644 index 000000000..4f3d89212 --- /dev/null +++ b/buildroot/package/gnuradio/0002-boost_qualify_placeholders_with_their_full_namespace.patch @@ -0,0 +1,1025 @@ +From 5752be31d17be80203d9fc44a73661712542bfe1 Mon Sep 17 00:00:00 2001 +From: ponce +Date: Sun, 17 May 2020 14:02:57 +0200 +Subject: [PATCH] boost: qualify placeholders with their full namespace. + +This is needed with boost >= 1.73.0. + +[Upstream status: https://github.com/gnuradio/gnuradio/pull/3566] + +Signed-off-by: ponce +Signed-off-by: Gwenhael Goavec-Merou +--- + .../(exported from wiki) Message Passing.txt | 8 +++--- + gnuradio-runtime/lib/block.cc | 3 ++- + gr-analog/lib/sig_source_impl.cc | 4 ++- + gr-blocks/lib/copy_impl.cc | 4 ++- + gr-blocks/lib/message_debug_impl.cc | 13 +++++++--- + gr-blocks/lib/message_strobe_impl.cc | 5 ++-- + gr-blocks/lib/message_strobe_random_impl.cc | 5 ++-- + gr-blocks/lib/multiply_matrix_impl.cc | 11 +++++--- + gr-blocks/lib/mute_impl.cc | 5 ++-- + gr-blocks/lib/nop_impl.cc | 5 ++-- + gr-blocks/lib/pdu_filter_impl.cc | 5 ++-- + gr-blocks/lib/pdu_remove_impl.cc | 5 ++-- + gr-blocks/lib/pdu_set_impl.cc | 4 ++- + gr-blocks/lib/random_pdu_impl.cc | 5 ++-- + gr-blocks/lib/repeat_impl.cc | 5 ++-- + gr-blocks/lib/socket_pdu_impl.cc | 18 ++++++++----- + .../lib/tagged_stream_multiply_length_impl.cc | 7 +++--- + gr-blocks/lib/tuntap_pdu_impl.cc | 3 ++- + gr-digital/lib/chunks_to_symbols_impl.cc | 5 ++-- + .../lib/constellation_receiver_cb_impl.cc | 14 ++++++----- + gr-digital/lib/costas_loop_cc_impl.cc | 4 ++- + gr-digital/lib/crc32_async_bb_impl.cc | 8 ++++-- + gr-digital/lib/header_payload_demux_impl.cc | 7 +++--- + .../lib/protocol_formatter_async_impl.cc | 4 ++- + gr-fec/lib/async_decoder_impl.cc | 8 ++++-- + gr-fec/lib/async_encoder_impl.cc | 8 ++++-- + gr-fec/lib/depuncture_bb_impl.cc | 4 ++- + gr-fec/lib/puncture_bb_impl.cc | 4 ++- + gr-fec/lib/puncture_ff_impl.cc | 4 ++- + gr-filter/lib/freq_xlating_fir_filter_impl.cc | 2 +- + gr-filter/lib/mmse_resampler_cc_impl.cc | 5 ++-- + gr-filter/lib/mmse_resampler_ff_impl.cc | 5 ++-- + gr-qtgui/lib/const_sink_c_impl.cc | 5 ++-- + gr-qtgui/lib/edit_box_msg_impl.cc | 4 ++- + gr-qtgui/lib/freq_sink_c_impl.cc | 12 ++++++--- + gr-qtgui/lib/freq_sink_f_impl.cc | 12 ++++++--- + gr-qtgui/lib/histogram_sink_f_impl.cc | 5 ++-- + gr-qtgui/lib/sink_c_impl.cc | 4 ++- + gr-qtgui/lib/sink_f_impl.cc | 4 ++- + gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++- + gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++- + gr-qtgui/lib/time_sink_c_impl.cc | 4 ++- + gr-qtgui/lib/time_sink_f_impl.cc | 4 ++- + gr-qtgui/lib/waterfall_sink_c_impl.cc | 13 +++++++--- + gr-qtgui/lib/waterfall_sink_f_impl.cc | 13 +++++++--- + gr-uhd/lib/usrp_block_impl.cc | 25 ++++++++++++------- + gr-uhd/lib/usrp_source_impl.cc | 5 ++-- + gr-zeromq/lib/pub_msg_sink_impl.cc | 4 ++- + gr-zeromq/lib/push_msg_sink_impl.cc | 4 ++- + 49 files changed, 216 insertions(+), 107 deletions(-) + +diff --git a/docs/usage-manual/(exported from wiki) Message Passing.txt b/docs/usage-manual/(exported from wiki) Message Passing.txt +index 4654bd5dac..551e710228 100644 +--- a/docs/usage-manual/(exported from wiki) Message Passing.txt ++++ b/docs/usage-manual/(exported from wiki) Message Passing.txt +@@ -94,7 +94,7 @@ must then bind this port to the message handler. For this, we use + Boost's 'bind' function: + + set_msg_handler(pmt::pmt_t port_id, +- boost::bind(&block_class::message_handler_function, this, _1)); ++ boost::bind(&block_class::message_handler_function, this, boost::placeholders::_1)); + + In Python: + +@@ -241,15 +241,15 @@ The constructor of this block looks like this: + { + message_port_register_in(pmt::mp("print")); + set_msg_handler(pmt::mp("print"), +- boost::bind(&message_debug_impl::print, this, _1)); ++ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("store")); + set_msg_handler(pmt::mp("store"), +- boost::bind(&message_debug_impl::store, this, _1)); ++ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("print_pdu")); + set_msg_handler(pmt::mp("print_pdu"), +- boost::bind(&message_debug_impl::print_pdu, this, _1)); ++ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); + } + + +diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc +index 5914283908..fca4cab97e 100644 +--- a/gnuradio-runtime/lib/block.cc ++++ b/gnuradio-runtime/lib/block.cc +@@ -61,7 +61,8 @@ block::block(const std::string& name, + { + global_block_registry.register_primitive(alias(), this); + message_port_register_in(d_system_port); +- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1)); ++ set_msg_handler(d_system_port, ++ boost::bind(&block::system_handler, this, boost::placeholders::_1)); + + configure_default_loggers(d_logger, d_debug_logger, symbol_name()); + } +diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc +index b73b32982d..01c5fbfdb0 100644 +--- a/gr-analog/lib/sig_source_impl.cc ++++ b/gr-analog/lib/sig_source_impl.cc +@@ -67,7 +67,9 @@ sig_source_impl::sig_source_impl(double sampling_freq, + this->set_phase(phase); + this->message_port_register_in(pmt::mp("freq")); + this->set_msg_handler(pmt::mp("freq"), +- boost::bind(&sig_source_impl::set_frequency_msg, this, _1)); ++ boost::bind(&sig_source_impl::set_frequency_msg, ++ this, ++ boost::placeholders::_1)); + } + + template +diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc +index c377e57b1e..b55196c24b 100644 +--- a/gr-blocks/lib/copy_impl.cc ++++ b/gr-blocks/lib/copy_impl.cc +@@ -44,7 +44,9 @@ copy_impl::copy_impl(size_t itemsize) + d_enabled(true) + { + message_port_register_in(pmt::mp("en")); +- set_msg_handler(pmt::mp("en"), boost::bind(©_impl::handle_enable, this, _1)); ++ set_msg_handler( ++ pmt::mp("en"), ++ boost::bind(©_impl::handle_enable, this, boost::placeholders::_1)); + } + + copy_impl::~copy_impl() {} +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index a8c84aa509..916f97ca3d 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/gr-blocks/lib/message_debug_impl.cc +@@ -90,14 +90,19 @@ message_debug_impl::message_debug_impl() + : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)) + { + message_port_register_in(pmt::mp("print")); +- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); ++ set_msg_handler( ++ pmt::mp("print"), ++ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("store")); +- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); ++ set_msg_handler( ++ pmt::mp("store"), ++ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("print_pdu")); +- set_msg_handler(pmt::mp("print_pdu"), +- boost::bind(&message_debug_impl::print_pdu, this, _1)); ++ set_msg_handler( ++ pmt::mp("print_pdu"), ++ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); + } + + message_debug_impl::~message_debug_impl() {} +diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc +index 038eeae5a1..d131b81662 100644 +--- a/gr-blocks/lib/message_strobe_impl.cc ++++ b/gr-blocks/lib/message_strobe_impl.cc +@@ -53,8 +53,9 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) + message_port_register_out(d_port); + + message_port_register_in(pmt::mp("set_msg")); +- set_msg_handler(pmt::mp("set_msg"), +- boost::bind(&message_strobe_impl::set_msg, this, _1)); ++ set_msg_handler( ++ pmt::mp("set_msg"), ++ boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1)); + } + + message_strobe_impl::~message_strobe_impl() {} +diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc +index 0ab5d6adc7..53e641fba4 100644 +--- a/gr-blocks/lib/message_strobe_random_impl.cc ++++ b/gr-blocks/lib/message_strobe_random_impl.cc +@@ -74,8 +74,9 @@ message_strobe_random_impl::message_strobe_random_impl( + new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this))); + + message_port_register_in(pmt::mp("set_msg")); +- set_msg_handler(pmt::mp("set_msg"), +- boost::bind(&message_strobe_random_impl::set_msg, this, _1)); ++ set_msg_handler( ++ pmt::mp("set_msg"), ++ boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1)); + } + + long message_strobe_random_impl::next_delay() +diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc +index e1b9c746c6..e38953baba 100644 +--- a/gr-blocks/lib/multiply_matrix_impl.cc ++++ b/gr-blocks/lib/multiply_matrix_impl.cc +@@ -235,9 +235,10 @@ multiply_matrix_impl::multiply_matrix_impl( + + pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); + message_port_register_in(port_name); +- set_msg_handler( +- port_name, +- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); ++ set_msg_handler(port_name, ++ boost::bind(&multiply_matrix_impl::msg_handler_A, ++ this, ++ boost::placeholders::_1)); + } + + template <> +@@ -257,7 +258,9 @@ multiply_matrix_impl::multiply_matrix_impl( + pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); + message_port_register_in(port_name); + set_msg_handler(port_name, +- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); ++ boost::bind(&multiply_matrix_impl::msg_handler_A, ++ this, ++ boost::placeholders::_1)); + } + + +diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc +index bd65ce2075..5c732f8f4f 100644 +--- a/gr-blocks/lib/mute_impl.cc ++++ b/gr-blocks/lib/mute_impl.cc +@@ -47,8 +47,9 @@ mute_impl::mute_impl(bool mute) + d_mute(mute) + { + this->message_port_register_in(pmt::intern("set_mute")); +- this->set_msg_handler(pmt::intern("set_mute"), +- boost::bind(&mute_impl::set_mute_pmt, this, _1)); ++ this->set_msg_handler( ++ pmt::intern("set_mute"), ++ boost::bind(&mute_impl::set_mute_pmt, this, boost::placeholders::_1)); + } + + template +diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc +index db216d97a4..e9baee5878 100644 +--- a/gr-blocks/lib/nop_impl.cc ++++ b/gr-blocks/lib/nop_impl.cc +@@ -44,8 +44,9 @@ nop_impl::nop_impl(size_t sizeof_stream_item) + { + // Arrange to have count_received_msgs called when messages are received. + message_port_register_in(pmt::mp("port")); +- set_msg_handler(pmt::mp("port"), +- boost::bind(&nop_impl::count_received_msgs, this, _1)); ++ set_msg_handler( ++ pmt::mp("port"), ++ boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1)); + } + + nop_impl::~nop_impl() {} +diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc +index b0748eec02..63cfe47e4c 100644 +--- a/gr-blocks/lib/pdu_filter_impl.cc ++++ b/gr-blocks/lib/pdu_filter_impl.cc +@@ -44,8 +44,9 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert) + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&pdu_filter_impl::handle_msg, this, _1)); ++ set_msg_handler( ++ pdu::pdu_port_id(), ++ boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1)); + } + + void pdu_filter_impl::handle_msg(pmt::pmt_t pdu) +diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc +index 19cc4dc76a..2b97f827b2 100644 +--- a/gr-blocks/lib/pdu_remove_impl.cc ++++ b/gr-blocks/lib/pdu_remove_impl.cc +@@ -42,8 +42,9 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k) + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&pdu_remove_impl::handle_msg, this, _1)); ++ set_msg_handler( ++ pdu::pdu_port_id(), ++ boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1)); + } + + void pdu_remove_impl::handle_msg(pmt::pmt_t pdu) +diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc +index 40fbc3cd83..af59ef70f3 100644 +--- a/gr-blocks/lib/pdu_set_impl.cc ++++ b/gr-blocks/lib/pdu_set_impl.cc +@@ -43,7 +43,9 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v) + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1)); ++ set_msg_handler( ++ pdu::pdu_port_id(), ++ boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1)); + } + + void pdu_set_impl::handle_msg(pmt::pmt_t pdu) +diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc +index 75d825aefa..6c142c3531 100644 +--- a/gr-blocks/lib/random_pdu_impl.cc ++++ b/gr-blocks/lib/random_pdu_impl.cc +@@ -52,8 +52,9 @@ random_pdu_impl::random_pdu_impl(int min_items, + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pmt::mp("generate")); +- set_msg_handler(pmt::mp("generate"), +- boost::bind(&random_pdu_impl::generate_pdu, this, _1)); ++ set_msg_handler( ++ pmt::mp("generate"), ++ boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1)); + if (length_modulo < 1) + throw std::runtime_error("length_module must be >= 1"); + if (max_items < length_modulo) +diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc +index 189fbc8948..d6569625da 100644 +--- a/gr-blocks/lib/repeat_impl.cc ++++ b/gr-blocks/lib/repeat_impl.cc +@@ -44,8 +44,9 @@ repeat_impl::repeat_impl(size_t itemsize, int interp) + d_interp(interp) + { + message_port_register_in(pmt::mp("interpolation")); +- set_msg_handler(pmt::mp("interpolation"), +- boost::bind(&repeat_impl::msg_set_interpolation, this, _1)); ++ set_msg_handler( ++ pmt::mp("interpolation"), ++ boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1)); + } + + void repeat_impl::msg_set_interpolation(pmt::pmt_t msg) +diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc +index df69f07ad2..163eec3a68 100644 +--- a/gr-blocks/lib/socket_pdu_impl.cc ++++ b/gr-blocks/lib/socket_pdu_impl.cc +@@ -101,7 +101,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, + start_tcp_accept(); + + set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); ++ boost::bind(&socket_pdu_impl::tcp_server_send, ++ this, ++ boost::placeholders::_1)); + } else if (type == "TCP_CLIENT") { + boost::system::error_code error = boost::asio::error::host_not_found; + d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); +@@ -111,7 +113,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, + d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay)); + + set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); ++ boost::bind(&socket_pdu_impl::tcp_client_send, ++ this, ++ boost::placeholders::_1)); + + d_tcp_socket->async_read_some( + boost::asio::buffer(d_rxbuf), +@@ -130,8 +134,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); + +- set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&socket_pdu_impl::udp_send, this, _1)); ++ set_msg_handler( ++ pdu::pdu_port_id(), ++ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); + } else if (type == "UDP_CLIENT") { + d_udp_socket.reset( + new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); +@@ -143,8 +148,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); + +- set_msg_handler(pdu::pdu_port_id(), +- boost::bind(&socket_pdu_impl::udp_send, this, _1)); ++ set_msg_handler( ++ pdu::pdu_port_id(), ++ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); + } else + throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type"); + +diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc +index 30f4c46dc6..34b95d647d 100644 +--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc ++++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc +@@ -49,9 +49,10 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl( + set_tag_propagation_policy(TPP_DONT); + set_relative_rate(1, 1); + message_port_register_in(pmt::intern("set_scalar")); +- set_msg_handler( +- pmt::intern("set_scalar"), +- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); ++ set_msg_handler(pmt::intern("set_scalar"), ++ boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, ++ this, ++ boost::placeholders::_1)); + } + + tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {} +diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc +index 4343ae1dc3..0d9d7e28c7 100644 +--- a/gr-blocks/lib/tuntap_pdu_impl.cc ++++ b/gr-blocks/lib/tuntap_pdu_impl.cc +@@ -96,7 +96,8 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag) + + // set up input message port + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), ++ boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1)); + } + + int tuntap_pdu_impl::tun_alloc(char* dev, int flags) +diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc +index 26d590a66e..a6810a69eb 100644 +--- a/gr-digital/lib/chunks_to_symbols_impl.cc ++++ b/gr-digital/lib/chunks_to_symbols_impl.cc +@@ -53,8 +53,9 @@ chunks_to_symbols_impl::chunks_to_symbols_impl( + this->message_port_register_in(pmt::mp("set_symbol_table")); + this->set_msg_handler( + pmt::mp("set_symbol_table"), +- boost::bind( +- &chunks_to_symbols_impl::handle_set_symbol_table, this, _1)); ++ boost::bind(&chunks_to_symbols_impl::handle_set_symbol_table, ++ this, ++ boost::placeholders::_1)); + } + + template +diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc +index 7fb7559d5e..7e216ece56 100644 +--- a/gr-digital/lib/constellation_receiver_cb_impl.cc ++++ b/gr-digital/lib/constellation_receiver_cb_impl.cc +@@ -61,14 +61,16 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl( + "This receiver only works with constellations of dimension 1."); + + message_port_register_in(pmt::mp("set_constellation")); +- set_msg_handler( +- pmt::mp("set_constellation"), +- boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1)); ++ set_msg_handler(pmt::mp("set_constellation"), ++ boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, ++ this, ++ boost::placeholders::_1)); + + message_port_register_in(pmt::mp("rotate_phase")); +- set_msg_handler( +- pmt::mp("rotate_phase"), +- boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1)); ++ set_msg_handler(pmt::mp("rotate_phase"), ++ boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, ++ this, ++ boost::placeholders::_1)); + } + + constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {} +diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc +index c3b30834eb..e1229e6f4a 100644 +--- a/gr-digital/lib/costas_loop_cc_impl.cc ++++ b/gr-digital/lib/costas_loop_cc_impl.cc +@@ -82,7 +82,9 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr) + + message_port_register_in(pmt::mp("noise")); + set_msg_handler(pmt::mp("noise"), +- boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1)); ++ boost::bind(&costas_loop_cc_impl::handle_set_noise, ++ this, ++ boost::placeholders::_1)); + } + + costas_loop_cc_impl::~costas_loop_cc_impl() {} +diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc +index bffbb2a737..66143866c0 100644 +--- a/gr-digital/lib/crc32_async_bb_impl.cc ++++ b/gr-digital/lib/crc32_async_bb_impl.cc +@@ -48,9 +48,13 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check) + message_port_register_out(d_out_port); + + if (check) +- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1)); ++ set_msg_handler( ++ d_in_port, ++ boost::bind(&crc32_async_bb_impl::check, this, boost::placeholders::_1)); + else +- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1)); ++ set_msg_handler( ++ d_in_port, ++ boost::bind(&crc32_async_bb_impl::calc, this, boost::placeholders::_1)); + } + + crc32_async_bb_impl::~crc32_async_bb_impl() {} +diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc +index 98c805fb20..7cc1e0a4ed 100644 +--- a/gr-digital/lib/header_payload_demux_impl.cc ++++ b/gr-digital/lib/header_payload_demux_impl.cc +@@ -150,9 +150,10 @@ header_payload_demux_impl::header_payload_demux_impl( + } + set_tag_propagation_policy(TPP_DONT); + message_port_register_in(msg_port_id()); +- set_msg_handler( +- msg_port_id(), +- boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); ++ set_msg_handler(msg_port_id(), ++ boost::bind(&header_payload_demux_impl::parse_header_data_msg, ++ this, ++ boost::placeholders::_1)); + for (size_t i = 0; i < special_tags.size(); i++) { + d_special_tags.push_back(pmt::string_to_symbol(special_tags[i])); + d_special_tags_last_value.push_back(pmt::PMT_NIL); +diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc +index 84b693745d..c08bbb9aeb 100644 +--- a/gr-digital/lib/protocol_formatter_async_impl.cc ++++ b/gr-digital/lib/protocol_formatter_async_impl.cc +@@ -55,7 +55,9 @@ protocol_formatter_async_impl::protocol_formatter_async_impl( + message_port_register_out(d_pld_port); + + set_msg_handler(d_in_port, +- boost::bind(&protocol_formatter_async_impl::append, this, _1)); ++ boost::bind(&protocol_formatter_async_impl::append, ++ this, ++ boost::placeholders::_1)); + } + + protocol_formatter_async_impl::~protocol_formatter_async_impl() {} +diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc +index e7a668c832..5d68d13ae7 100644 +--- a/gr-fec/lib/async_decoder_impl.cc ++++ b/gr-fec/lib/async_decoder_impl.cc +@@ -65,10 +65,14 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, + if (d_packed) { + d_pack = new blocks::kernel::pack_k_bits(8); + set_msg_handler(d_in_port, +- boost::bind(&async_decoder_impl::decode_packed, this, _1)); ++ boost::bind(&async_decoder_impl::decode_packed, ++ this, ++ boost::placeholders::_1)); + } else { + set_msg_handler(d_in_port, +- boost::bind(&async_decoder_impl::decode_unpacked, this, _1)); ++ boost::bind(&async_decoder_impl::decode_unpacked, ++ this, ++ boost::placeholders::_1)); + } + + // The maximum frame size is set by the initial frame size of the decoder. +diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc +index 811d55601f..506ae5c7e9 100644 +--- a/gr-fec/lib/async_encoder_impl.cc ++++ b/gr-fec/lib/async_encoder_impl.cc +@@ -64,7 +64,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, + + if (d_packed) { + set_msg_handler(d_in_port, +- boost::bind(&async_encoder_impl::encode_packed, this, _1)); ++ boost::bind(&async_encoder_impl::encode_packed, ++ this, ++ boost::placeholders::_1)); + + d_unpack = new blocks::kernel::unpack_k_bits(8); + +@@ -74,7 +76,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, + + } else { + set_msg_handler(d_in_port, +- boost::bind(&async_encoder_impl::encode_unpacked, this, _1)); ++ boost::bind(&async_encoder_impl::encode_unpacked, ++ this, ++ boost::placeholders::_1)); + } + + if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) { +diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc +index 27d00bb5bb..f64dad45fc 100644 +--- a/gr-fec/lib/depuncture_bb_impl.cc ++++ b/gr-fec/lib/depuncture_bb_impl.cc +@@ -74,7 +74,9 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha + set_fixed_rate(true); + set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes)); + set_output_multiple(d_puncsize); +- // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1)); ++ // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, ++ // this, ++ // boost::placeholders::_1)); + } + + depuncture_bb_impl::~depuncture_bb_impl() {} +diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc +index a365d6a69f..f2078d8c57 100644 +--- a/gr-fec/lib/puncture_bb_impl.cc ++++ b/gr-fec/lib/puncture_bb_impl.cc +@@ -72,7 +72,9 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay) + set_fixed_rate(true); + set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); + set_output_multiple(d_puncsize - d_puncholes); +- // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1)); ++ // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, ++ // this, ++ // boost::placeholders::_1)); + } + + puncture_bb_impl::~puncture_bb_impl() {} +diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc +index c95288d691..95fb649a8b 100644 +--- a/gr-fec/lib/puncture_ff_impl.cc ++++ b/gr-fec/lib/puncture_ff_impl.cc +@@ -72,7 +72,9 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay) + set_fixed_rate(true); + set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); + set_output_multiple(d_puncsize - d_puncholes); +- // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1)); ++ // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, ++ // this, ++ // boost::placeholders::_1)); + } + + puncture_ff_impl::~puncture_ff_impl() {} +diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc +index 8ddc967ba1..50ec589472 100644 +--- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc ++++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc +@@ -72,7 +72,7 @@ freq_xlating_fir_filter_impl::freq_xlating_fir_filter_impl( + boost::bind( + &freq_xlating_fir_filter_impl::handle_set_center_freq, + this, +- _1)); ++ boost::placeholders::_1)); + } + + template +diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc +index 59f9eacfab..bdce51716a 100644 +--- a/gr-filter/lib/mmse_resampler_cc_impl.cc ++++ b/gr-filter/lib/mmse_resampler_cc_impl.cc +@@ -52,8 +52,9 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r + + set_inverse_relative_rate(d_mu_inc); + message_port_register_in(pmt::intern("msg_in")); +- set_msg_handler(pmt::intern("msg_in"), +- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1)); ++ set_msg_handler( ++ pmt::intern("msg_in"), ++ boost::bind(&mmse_resampler_cc_impl::handle_msg, this, boost::placeholders::_1)); + } + + mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; } +diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc +index 342d9f7678..3d72727114 100644 +--- a/gr-filter/lib/mmse_resampler_ff_impl.cc ++++ b/gr-filter/lib/mmse_resampler_ff_impl.cc +@@ -53,8 +53,9 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r + set_inverse_relative_rate(d_mu_inc); + + message_port_register_in(pmt::intern("msg_in")); +- set_msg_handler(pmt::intern("msg_in"), +- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1)); ++ set_msg_handler( ++ pmt::intern("msg_in"), ++ boost::bind(&mmse_resampler_ff_impl::handle_msg, this, boost::placeholders::_1)); + } + + mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; } +diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc +index 852f6ee109..04d421d037 100644 +--- a/gr-qtgui/lib/const_sink_c_impl.cc ++++ b/gr-qtgui/lib/const_sink_c_impl.cc +@@ -69,8 +69,9 @@ const_sink_c_impl::const_sink_c_impl(int size, + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), +- boost::bind(&const_sink_c_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); + + for (int i = 0; i < d_nconnections; i++) { + d_residbufs_real.push_back( +diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc +index 8713aa820e..39546cbf3a 100644 +--- a/gr-qtgui/lib/edit_box_msg_impl.cc ++++ b/gr-qtgui/lib/edit_box_msg_impl.cc +@@ -158,7 +158,9 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, + message_port_register_out(d_port); + message_port_register_in(pmt::mp("val")); + +- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1)); ++ set_msg_handler( ++ pmt::mp("val"), ++ boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1)); + } + + edit_box_msg_impl::~edit_box_msg_impl() +diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc +index 3a34df6ec6..fe231699fd 100644 +--- a/gr-qtgui/lib/freq_sink_c_impl.cc ++++ b/gr-qtgui/lib/freq_sink_c_impl.cc +@@ -82,17 +82,23 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize, + + // setup bw input port + message_port_register_in(d_port_bw); +- set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1)); ++ set_msg_handler( ++ d_port_bw, ++ boost::bind(&freq_sink_c_impl::handle_set_bw, this, boost::placeholders::_1)); + + // setup output message port to post frequency when display is + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); +- set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1)); ++ set_msg_handler( ++ d_port, ++ boost::bind(&freq_sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&freq_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); + + d_main_gui = NULL; + +diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc +index c14bfc31fd..7090d8699e 100644 +--- a/gr-qtgui/lib/freq_sink_f_impl.cc ++++ b/gr-qtgui/lib/freq_sink_f_impl.cc +@@ -82,17 +82,23 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize, + + // setup bw input port + message_port_register_in(d_port_bw); +- set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1)); ++ set_msg_handler( ++ d_port_bw, ++ boost::bind(&freq_sink_f_impl::handle_set_bw, this, boost::placeholders::_1)); + + // setup output message port to post frequency when display is + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); +- set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1)); ++ set_msg_handler( ++ d_port, ++ boost::bind(&freq_sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&freq_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); + + d_main_gui = NULL; + +diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc +index d16de932ca..1602d18968 100644 +--- a/gr-qtgui/lib/histogram_sink_f_impl.cc ++++ b/gr-qtgui/lib/histogram_sink_f_impl.cc +@@ -81,8 +81,9 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size, + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), +- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); + + // +1 for the PDU buffer + for (int i = 0; i < d_nconnections + 1; i++) { +diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc +index d3feb9d16c..73136e789e 100644 +--- a/gr-qtgui/lib/sink_c_impl.cc ++++ b/gr-qtgui/lib/sink_c_impl.cc +@@ -96,7 +96,9 @@ sink_c_impl::sink_c_impl(int fftsize, + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); +- set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1)); ++ set_msg_handler( ++ d_port, ++ boost::bind(&sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); + + d_main_gui = NULL; + +diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc +index 418b630b78..d31023a51d 100644 +--- a/gr-qtgui/lib/sink_f_impl.cc ++++ b/gr-qtgui/lib/sink_f_impl.cc +@@ -95,7 +95,9 @@ sink_f_impl::sink_f_impl(int fftsize, + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); +- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1)); ++ set_msg_handler( ++ d_port, ++ boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); + + d_main_gui = NULL; + +diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc +index 045c216b00..3aa503ccfc 100644 +--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc ++++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc +@@ -84,7 +84,9 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); + set_msg_handler(pmt::mp("in"), +- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1)); ++ boost::bind(&time_raster_sink_b_impl::handle_pdus, ++ this, ++ boost::placeholders::_1)); + + d_scale = 1.0f; + +diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc +index d186f319da..b3516e5be9 100644 +--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc ++++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc +@@ -84,7 +84,9 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); + set_msg_handler(pmt::mp("in"), +- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1)); ++ boost::bind(&time_raster_sink_f_impl::handle_pdus, ++ this, ++ boost::placeholders::_1)); + + d_icols = static_cast(ceil(d_cols)); + d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment()); +diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc +index b73a1c1ad3..83fbda298a 100644 +--- a/gr-qtgui/lib/time_sink_c_impl.cc ++++ b/gr-qtgui/lib/time_sink_c_impl.cc +@@ -80,7 +80,9 @@ time_sink_c_impl::time_sink_c_impl(int size, + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); + + // +2 for the PDU message buffers + for (unsigned int n = 0; n < d_nconnections + 2; n++) { +diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc +index df13998d75..dd5ed12c8b 100644 +--- a/gr-qtgui/lib/time_sink_f_impl.cc ++++ b/gr-qtgui/lib/time_sink_f_impl.cc +@@ -80,7 +80,9 @@ time_sink_f_impl::time_sink_f_impl(int size, + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); + + // +1 for the PDU buffer + for (unsigned int n = 0; n < d_nconnections + 1; n++) { +diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc +index fcf2ed98bc..da38d32baa 100644 +--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc ++++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc +@@ -118,19 +118,24 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, + // setup bw input port + message_port_register_in(d_port_bw); + set_msg_handler(d_port_bw, +- boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1)); ++ boost::bind(&waterfall_sink_c_impl::handle_set_bw, ++ this, ++ boost::placeholders::_1)); + + // setup output message port to post frequency when display is + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); + set_msg_handler(d_port, +- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1)); ++ boost::bind(&waterfall_sink_c_impl::handle_set_freq, ++ this, ++ boost::placeholders::_1)); + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), +- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&waterfall_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); + } + + waterfall_sink_c_impl::~waterfall_sink_c_impl() +diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc +index aa1037a472..d4231a564c 100644 +--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc ++++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc +@@ -116,19 +116,24 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, + // setup bw input port + message_port_register_in(d_port_bw); + set_msg_handler(d_port_bw, +- boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1)); ++ boost::bind(&waterfall_sink_f_impl::handle_set_bw, ++ this, ++ boost::placeholders::_1)); + + // setup output message port to post frequency when display is + // double-clicked + message_port_register_out(d_port); + message_port_register_in(d_port); + set_msg_handler(d_port, +- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1)); ++ boost::bind(&waterfall_sink_f_impl::handle_set_freq, ++ this, ++ boost::placeholders::_1)); + + // setup PDU handling input port + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), +- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&waterfall_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); + } + + waterfall_sink_f_impl::~waterfall_sink_f_impl() +diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc +index 4f030159ff..697d633c1b 100644 +--- a/gr-uhd/lib/usrp_block_impl.cc ++++ b/gr-uhd/lib/usrp_block_impl.cc +@@ -137,12 +137,18 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, + // Set up message ports: + message_port_register_in(pmt::mp("command")); + set_msg_handler(pmt::mp("command"), +- boost::bind(&usrp_block_impl::msg_handler_command, this, _1)); ++ boost::bind(&usrp_block_impl::msg_handler_command, ++ this, ++ boost::placeholders::_1)); + + // cuz we lazy: +-#define REGISTER_CMD_HANDLER(key, _handler) \ +- register_msg_cmd_handler(key, \ +- boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3)) ++#define REGISTER_CMD_HANDLER(key, _handler) \ ++ register_msg_cmd_handler(key, \ ++ boost::bind(&usrp_block_impl::_handler, \ ++ this, \ ++ boost::placeholders::_1, \ ++ boost::placeholders::_2, \ ++ boost::placeholders::_3)) + // Register default command handlers: + REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq); + REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain); +@@ -257,11 +263,12 @@ bool usrp_block_impl::_check_mboard_sensors_locked() + } else if (_dev->get_clock_source(mboard_index) == "mimo") { + sensor_name = "mimo_locked"; + } +- if (not _wait_for_locked_sensor( +- get_mboard_sensor_names(mboard_index), +- sensor_name, +- boost::bind( +- &usrp_block_impl::get_mboard_sensor, this, _1, mboard_index))) { ++ if (not _wait_for_locked_sensor(get_mboard_sensor_names(mboard_index), ++ sensor_name, ++ boost::bind(&usrp_block_impl::get_mboard_sensor, ++ this, ++ boost::placeholders::_1, ++ mboard_index))) { + GR_LOG_WARN( + d_logger, + boost::format( +diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc +index a2ff0821bd..5e6bd43285 100644 +--- a/gr-uhd/lib/usrp_source_impl.cc ++++ b/gr-uhd/lib/usrp_source_impl.cc +@@ -57,8 +57,9 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr, + + _samp_rate = this->get_samp_rate(); + _samps_per_packet = 1; +- register_msg_cmd_handler(cmd_tag_key(), +- boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1)); ++ register_msg_cmd_handler( ++ cmd_tag_key(), ++ boost::bind(&usrp_source_impl::_cmd_handler_tag, this, boost::placeholders::_1)); + } + + usrp_source_impl::~usrp_source_impl() {} +diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc +index b5da7421ef..957cfa411d 100644 +--- a/gr-zeromq/lib/pub_msg_sink_impl.cc ++++ b/gr-zeromq/lib/pub_msg_sink_impl.cc +@@ -62,7 +62,9 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind) + } + + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&pub_msg_sink_impl::handler, this, boost::placeholders::_1)); + } + + pub_msg_sink_impl::~pub_msg_sink_impl() +diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc +index 4140781ab9..7d07d3a30e 100644 +--- a/gr-zeromq/lib/push_msg_sink_impl.cc ++++ b/gr-zeromq/lib/push_msg_sink_impl.cc +@@ -62,7 +62,9 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind) + } + + message_port_register_in(pmt::mp("in")); +- set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1)); ++ set_msg_handler( ++ pmt::mp("in"), ++ boost::bind(&push_msg_sink_impl::handler, this, boost::placeholders::_1)); + } + + push_msg_sink_impl::~push_msg_sink_impl() diff --git a/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch b/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch deleted file mode 100644 index aa160ea41..000000000 --- a/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 08f335450b9809acdbe88d894449ccd6d4a9ec75 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Wed, 15 Jan 2020 17:27:15 +0100 -Subject: [PATCH] lib/CMakeLists: fix neon version detection - -Signed-off-by: Gwenhael Goavec-Merou ---- - volk/lib/CMakeLists.txt | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index f969f2e..b85a22b 100644 ---- a/volk/lib/CMakeLists.txt -+++ b/volk/lib/CMakeLists.txt -@@ -144,7 +144,7 @@ set(HAVE_AVX_CVTPI32_PS 0) - if(CPU_IS_x86) - # check to see if the compiler/linker works with xgetb instruction - if (NOT MSVC) -- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __asm__ __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }") -+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "#include \n unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __VOLK_ASM __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }") - else (NOT MSVC) - #MSVC defines an intrinsic - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "#include \n #include \n int main() { int avxSupported = 0; \n#if (_MSC_FULL_VER >= 160040219) \nint cpuInfo[4]; __cpuid(cpuInfo, 1);\nif ((cpuInfo[2] & (1 << 27) || 0) && (cpuInfo[2] & (1 << 28) || 0)) \n{\nunsigned long long xcrFeatureMask = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);\n avxSupported = (xcrFeatureMask & 0x6) == 6;}\n#endif \n return 1- avxSupported; }") -@@ -263,17 +263,17 @@ check_c_source_compiles("#include \nint main(){ uint8_t *dest; uint8 - neon_compile_result) - - if(neon_compile_result) -- check_c_source_compiles("int main(){asm volatile(\"vrev32.8 q0, q0\");}" -+ check_c_source_compiles("#include \n int main(){__VOLK_ASM volatile(\"vrev32.8 q0, q0\");}" - have_neonv7_result ) -- check_c_source_compiles("int main(){asm volatile(\"sub v1.4s,v1.4s,v1.4s\");}" -+ check_c_source_compiles("#include \n int main(){__VOLK_ASM volatile(\"sub v1.4s,v1.4s,v1.4s\");}" - have_neonv8_result ) - -- if (have_neonv7_result) -- OVERRULE_ARCH(neonv8 "CPU is armv7") -+ if (NOT have_neonv7_result) -+ OVERRULE_ARCH(neonv7 "Compiler doesn't support neonv7") - endif() - -- if (have_neonv8_result) -- OVERRULE_ARCH(neonv7 "CPU is armv8") -+ if (NOT have_neonv8_result) -+ OVERRULE_ARCH(neonv8 "Compiler doesn't support neonv8") - endif() - else(neon_compile_result) - OVERRULE_ARCH(neon "Compiler doesn't support NEON") --- -2.24.1 - diff --git a/buildroot/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch b/buildroot/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch new file mode 100644 index 000000000..6b8987fa5 --- /dev/null +++ b/buildroot/package/gnuradio/0003-gnuradio-runtime_pmt-dont-hardcode-INTERFACE_INCLUDE_DIRECTORIES.patch @@ -0,0 +1,57 @@ +From 84dea8284c521f08508bb2dcbc99db3b5d3438fd Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Thu, 27 Aug 2020 17:32:09 +0200 +Subject: [PATCH] gnuradio-runtime_pmt: dont hardcode + INTERFACE_INCLUDE_DIRECTORIES + +gnuradio-runtimeTargets.cmake and gnuradio-pmtTargets.cmake are filled +using CMAKE_INSTALL_PREFIX for INSTALL_INTERFACE. + +Since CMAKE_INSTALL_PREFIX, in buildroot, is set to /usr, these files contains +path to host system. + +With BR2_COMPILER_PARANOID_UNSAFE_PATH package using gnuradio fails with: +arm-linux-gnueabihf-g++: ERROR: unsafe header/library path used in cross-compilation: '-isystem' '/usr/include' + +By simply providing 'include', produced .cmake contains: +INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +instead of +INTERFACE_INCLUDE_DIRECTORIES "/usr/include" + +[Upstream status: https://github.com/gnuradio/gnuradio/pull/3737] + +Signed-off-by: Gwenhael Goavec-Merou +--- + gnuradio-runtime/lib/CMakeLists.txt | 2 +- + gnuradio-runtime/lib/pmt/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt +index 5aa90a5e1..fc32f473b 100644 +--- a/gnuradio-runtime/lib/CMakeLists.txt ++++ b/gnuradio-runtime/lib/CMakeLists.txt +@@ -214,7 +214,7 @@ target_link_libraries(gnuradio-runtime PUBLIC + + target_include_directories(gnuradio-runtime + PUBLIC +- $ ++ $ + $ + $ + PRIVATE +diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt +index 9fb98d0fc..6dfcd945c 100644 +--- a/gnuradio-runtime/lib/pmt/CMakeLists.txt ++++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt +@@ -33,7 +33,7 @@ target_link_libraries(gnuradio-pmt + + target_include_directories(gnuradio-pmt + PUBLIC +- $ ++ $ + $ + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ + ) +-- +2.26.2 + diff --git a/buildroot/package/gnuradio/Config.in b/buildroot/package/gnuradio/Config.in index 6d438bcd6..cd31ce886 100644 --- a/buildroot/package/gnuradio/Config.in +++ b/buildroot/package/gnuradio/Config.in @@ -54,6 +54,14 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT help GNU Radio ctrlport block +config BR2_PACKAGE_GNURADIO_DTV + bool "gr-dtv support" + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_FEC + select BR2_PACKAGE_GNURADIO_FILTER + help + various digital television standards blocks + config BR2_PACKAGE_GNURADIO_FEC bool "gr-fec support" select BR2_PACKAGE_GNURADIO_BLOCKS @@ -63,7 +71,7 @@ config BR2_PACKAGE_GNURADIO_FEC config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON @@ -126,6 +134,20 @@ config BR2_PACKAGE_GNURADIO_PAGER help FLEX pager decoder implementation blocks +config BR2_PACKAGE_GNURADIO_QTGUI + bool "gr-qtgui" + depends on BR2_PACKAGE_GNURADIO_PYTHON + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_GNURADIO_FFT + select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_PYTHON_PYQT5 + select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime + select BR2_PACKAGE_QT5BASE_GUI # runtime + select BR2_PACKAGE_QT5BASE_WIDGETS # runtime + select BR2_PACKAGE_QWT + help + GNU Radio Qt scopes + config BR2_PACKAGE_GNURADIO_TRELLIS bool "gr-trellis support" select BR2_PACKAGE_GNURADIO_DIGITAL diff --git a/buildroot/package/gnuradio/gnuradio.hash b/buildroot/package/gnuradio/gnuradio.hash index 7c3811077..2f147761d 100644 --- a/buildroot/package/gnuradio/gnuradio.hash +++ b/buildroot/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092 gnuradio-3.8.0.0.tar.gz +sha256 e15311e7da9fe2bb790cc36321d7eb2d93b9dfa0c1552fa5d534dd99d22873be gnuradio-3.8.1.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gnuradio/gnuradio.mk b/buildroot/package/gnuradio/gnuradio.mk index 41d4619f7..0a818cfc2 100644 --- a/buildroot/package/gnuradio/gnuradio.mk +++ b/buildroot/package/gnuradio/gnuradio.mk @@ -4,13 +4,20 @@ # ################################################################################ -GNURADIO_VERSION = 3.8.0.0 -GNURADIO_SITE = https://gnuradio.org/releases/gnuradio +GNURADIO_VERSION = 3.8.1.0 +GNURADIO_SITE = https://github.com/gnuradio/gnuradio/releases/download/v$(GNURADIO_VERSION) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO +# needed to determine site-packages path +ifeq ($(BR2_PACKAGE_PYTHON),y) +GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) +else ifeq ($(BR2_PACKAGE_PYTHON3),y) +GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) +endif + # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ @@ -27,7 +34,6 @@ GNURADIO_CONF_OPTS = \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ - -DENABLE_GR_QTGUI=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND # For third-party blocks, the gnuradio libraries are mandatory at @@ -87,6 +93,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_DTV),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) GNURADIO_DEPENDENCIES += gsl GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON @@ -108,8 +120,12 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GNURADIO_DEPENDENCIES += python3 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to install python modules in site-packages and to use +# correct path for python libraries +GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ + -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif @@ -120,6 +136,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) +GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt +GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON else diff --git a/buildroot/package/go/Config.in.host b/buildroot/package/go/Config.in.host index 3f16dbaec..87942c7a1 100644 --- a/buildroot/package/go/Config.in.host +++ b/buildroot/package/go/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ - || BR2_mips64 || BR2_mips64el + || BR2_mips64 || BR2_mips64el || BR2_s390x depends on !BR2_ARM_CPU_ARMV4 # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index ce8e27c97..9d651a1bf 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,4 @@ # From https://golang.org/dl/ -sha256 5fb43171046cf8784325e67913d55f88a683435071eef8e9da1aa8a1588fcf5d go1.13.15.src.tar.gz +sha256 28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d go1.15.2.src.tar.gz +sha256 896a602570e54c8cdfc2c1348abd4ffd1016758d0bd086ccd9787dbfc9b64888 go1.15.3.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index 1f95bec82..dc3b35ff5 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.13.15 +GO_VERSION = 1.15.3 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -12,10 +12,23 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache +# We pass an empty GOBIN, otherwise "go install: cannot install +# cross-compiled binaries when GOBIN is set" +HOST_GO_COMMON_ENV = \ + GO111MODULE=on \ + GOFLAGS=-mod=vendor \ + GOROOT="$(HOST_GO_ROOT)" \ + GOPATH="$(HOST_GO_GOPATH)" \ + GOPROXY=off \ + PATH=$(BR_PATH) \ + GOBIN= \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) + ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) ifeq ($(BR2_arm),y) @@ -41,17 +54,21 @@ else ifeq ($(BR2_mips64),y) GO_GOARCH = mips64 else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le +else ifeq ($(BR2_s390x),y) +GO_GOARCH = s390x endif # For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ - GO111MODULE=off \ + $(HOST_GO_COMMON_ENV) \ GOARCH=$(GO_GOARCH) \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ - GOROOT="$(HOST_GO_ROOT)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ + CGO_CFLAGS="$(TARGET_CFLAGS)" \ + CGO_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + CGO_LDFLAGS="$(TARGET_LDFLAGS)" \ GOTOOLDIR="$(HOST_GO_TOOLDIR)" # The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is @@ -77,6 +94,17 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +# For the convenience of host golang packages +HOST_GO_HOST_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOARCH="" \ + GOCACHE="$(HOST_GO_HOST_CACHE)" \ + CC="$(HOST_CCNOCCACHE)" \ + CXX="$(HOST_CXXNOCCACHE)" \ + CGO_CFLAGS="$(HOST_CFLAGS)" \ + CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ + CGO_LDFLAGS="$(HOST_LDFLAGS)" + # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ diff --git a/buildroot/package/gobject-introspection/0001-disable-tests.patch b/buildroot/package/gobject-introspection/0001-disable-tests.patch new file mode 100644 index 000000000..c75c7512d --- /dev/null +++ b/buildroot/package/gobject-introspection/0001-disable-tests.patch @@ -0,0 +1,34 @@ +From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 3 Feb 2020 10:07:15 -0800 +Subject: [PATCH] disable tests + +If introspection data on the host is not built, meson throws the error: +"Unknown variable "typelibs". Because tests are not required, removing +the subdir tests alltogether fixes this issue. + +Signed-off-by: Adam Duskett +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index eed4d6b..5058664 100644 +--- a/meson.build ++++ b/meson.build +@@ -214,12 +214,6 @@ if get_option('build_introspection_data') == true + endif + subdir('docs') + +-# The tests will also run, which is not possible if they +-# were built for a different architecture. +-if not meson.is_cross_build() +- subdir('tests') +-endif +- + install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) + install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) + +-- +2.24.1 + diff --git a/buildroot/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/buildroot/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch new file mode 100644 index 000000000..08835d3ec --- /dev/null +++ b/buildroot/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -0,0 +1,29 @@ +From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 14 Mar 2018 12:07:10 -0400 +Subject: [PATCH] Add rpath links to ccompiler + +This patch allows gobject-introspection to process extra paths passed to the +compiler via the GIR_EXTRA_LIBS_PATH variable. + +Signed-off-by: Adam Duskett +--- + giscanner/ccompiler.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index a8bd5b1..51bb9bc 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -229,6 +229,8 @@ class CCompiler(object): + + for envvar in runtime_path_envvar: + if envvar in os.environ: ++ for envvar_path in os.environ[envvar].split(':'): ++ args.append("-Wl,-rpath-link," + envvar_path) + os.environ[envvar] = \ + os.pathsep.join(runtime_paths + [os.environ[envvar]]) + else: +-- +2.14.3 + diff --git a/buildroot/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/buildroot/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch new file mode 100644 index 000000000..d43dc1393 --- /dev/null +++ b/buildroot/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch @@ -0,0 +1,28 @@ +From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 5 Sep 2018 16:46:52 +0200 +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper + +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. +It is not an error per se, but it breaks subprocess.check_output(). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/shlibs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index d67df95..80352a6 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): + args.extend(['otool', '-L', binary.args[0]]) + else: + args.extend(['ldd', binary.args[0]]) +- output = subprocess.check_output(args) ++ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout + if isinstance(output, bytes): + output = output.decode("utf-8", "replace") + diff --git a/buildroot/package/gobject-introspection/Config.in b/buildroot/package/gobject-introspection/Config.in new file mode 100644 index 000000000..57c569704 --- /dev/null +++ b/buildroot/package/gobject-introspection/Config.in @@ -0,0 +1,49 @@ +config BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on !BR2_RISCV_32 # qemu-riscv32 segfaults in qemu-5.0.0 + +config BR2_PACKAGE_GOBJECT_INTROSPECTION + bool "gobject-introspection" + depends on BR2_USE_MMU # python3, libglib2 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + # While gcc 4.8 might be compatible with gobject-introspection, + # The autobuilders use some toolchains from codesourcery which + # have gcc 4.8 and a very old version of glibc, which will cause + # compile errors with locale.c. As such, require 4.9 until this + # can be verified. + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_USES_GLIBC + # gobject-introspection does not require python3 to run on the + # target; however, because the tools run in a qemu wrapper, a + # cross-compiled python3 must be installed to staging. As there + # is no current mechanism to tell Buildroot only to install + # python to staging, then python must also be installed + # unconditionally to the target when building + # gobject-introspection. + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_HOST_QEMU + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_ZLIB + help + GObject introspection is a middleware layer between C + libraries (using GObject) and language bindings. The C library + can be scanned at compile time and generate a metadata file, + in addition to the actual native C library. Then at runtime, + language bindings can read this metadata and automatically + provide bindings to call into the C library. + + https://wiki.gnome.org/action/show/Projects/GObjectIntrospection + +comment "gobject-introspection needs python3" + depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + +comment "gobject-introspection needs a glibc toolchain, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/gobject-introspection/g-ir-compiler.in b/buildroot/package/gobject-introspection/g-ir-compiler.in new file mode 100644 index 000000000..3313cc501 --- /dev/null +++ b/buildroot/package/gobject-introspection/g-ir-compiler.in @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@" diff --git a/buildroot/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/buildroot/package/gobject-introspection/g-ir-scanner-lddwrapper.in new file mode 100644 index 000000000..c19314566 --- /dev/null +++ b/buildroot/package/gobject-introspection/g-ir-scanner-lddwrapper.in @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@" diff --git a/buildroot/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/buildroot/package/gobject-introspection/g-ir-scanner-qemuwrapper.in new file mode 100644 index 000000000..cad7ef875 --- /dev/null +++ b/buildroot/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel +# is older than the target kernel. +# Use a modules directory which does not exist so we don't load random things +# which may then get deleted (or their dependencies) and potentially segfault +GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \ +@QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ +-L $(dirname $0)/../../ \ +-E LD_LIBRARY_PATH=${GIR_EXTRA_LIBS_PATH}:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \ +"$@" + +if [[ $? -ne 0 ]]; then + echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help." + echo 'Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"' + exit 1 +fi diff --git a/buildroot/package/gobject-introspection/g-ir-scanner.in b/buildroot/package/gobject-introspection/g-ir-scanner.in new file mode 100644 index 000000000..22df7be30 --- /dev/null +++ b/buildroot/package/gobject-introspection/g-ir-scanner.in @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +# These environment variables are empty by default, and as such ccompiler.py +# defaults to either using the system tools (CC, CXX, and CPP) or leaving +# the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.) +# Export these variables to ensure all build systems can generate .gir and +# .typelib files properly. +export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" +export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" +export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" +export CPPFLAGS="${CPPFLAGS:-@TARGET_CPPFLAGS@}" +export CFLAGS="${CFLAGS:-@TARGET_CFLAGS@}" +export CXXFLAGS="${CXXFLAGS:-@TARGET_CXXFLAGS@}" +export LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}" + +export GI_SCANNER_DISABLE_CACHE=1 + +${HOST_DIR}/bin/g-ir-scanner \ +--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ +--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \ +--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \ +--add-include-path=$(dirname $0)/../share/gir-1.0 "$@" diff --git a/buildroot/package/gobject-introspection/gobject-introspection.hash b/buildroot/package/gobject-introspection/gobject-introspection.hash new file mode 100644 index 000000000..68bf63e05 --- /dev/null +++ b/buildroot/package/gobject-introspection/gobject-introspection.hash @@ -0,0 +1,4 @@ +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.sha256sum +sha256 80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7 gobject-introspection-1.64.1.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/buildroot/package/gobject-introspection/gobject-introspection.mk b/buildroot/package/gobject-introspection/gobject-introspection.mk new file mode 100644 index 000000000..eefb2c83f --- /dev/null +++ b/buildroot/package/gobject-introspection/gobject-introspection.mk @@ -0,0 +1,146 @@ +################################################################################ +# +# gobject-introspection +# +################################################################################ + +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.64 +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1 +GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) +GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz +GOBJECT_INTROSPECTION_INSTALL_STAGING = YES +GOBJECT_INTROSPECTION_AUTORECONF = YES +GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l + +GOBJECT_INTROSPECTION_DEPENDENCIES = \ + host-autoconf-archive \ + host-gobject-introspection \ + host-prelink-cross \ + host-qemu \ + libffi \ + libglib2 \ + python3 \ + zlib + +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-libglib2 \ + host-python3 + +# g-ir-scanner will default to /usr/bin/ld for linking if this is not set. +GOBJECT_INTROSPECTION_NINJA_ENV += \ + CC="$(TARGET_CC)" + +# When building, gobject-introspection uses tools/g-ir-scanner to build several +# .gir and .typelib files. g-ir-scanner does not use LDFLAGS, and by default, +# links to the system-installed libglib2 path. To remedy this issue, defining +# LD_LIBRARY_PATH forces g-ir-scanner to use our host installed libglib2 files. +HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ + LD_LIBRARY_PATH="$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(HOST_DIR)/lib" + +# Use the host gi-scanner to prevent the scanner from generating incorrect +# elf classes. +GOBJECT_INTROSPECTION_CONF_OPTS = \ + -Dgi_cross_use_host_gi=true \ + -Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ + -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ + -Dbuild_introspection_data=true \ + -Ddoctool=disabled + +ifeq ($(BR2_PACKAGE_CAIRO),y) +GOBJECT_INTROSPECTION_DEPENDENCIES += cairo +GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=enabled +else +GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled +endif + +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME} +GOBJECT_INTROSPECTION_CONF_ENV = \ + GI_SCANNER_DISABLE_CACHE=1 + +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ + GI_SCANNER_DISABLE_CACHE=1 + +# Make sure g-ir-tool-template uses the host python. +define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in +endef +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH + +# Perform the following: +# - Just as above, Ensure that g-ir-tool-template.in uses the host python. +# - Install all of the wrappers needed to build gobject-introspection. +# - Create a safe modules directory which does not exist so we don't load random things +# which may then get deleted (or their dependencies) and potentially segfault +define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in + + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper + + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + + # Use a modules directory which does not exist so we don't load random things + # which may then get deleted (or their dependencies) and potentially segfault + mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy +endef +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS + +# Move the real compiler and scanner to .real, and replace them with the wrappers. +# Using .real has the following advantages: +# - There is no need to change the logic for other packages. +# - The wrappers call the .real files using qemu. +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + # Move the real binaries to their names.real, then replace them with + # the wrappers. + $(foreach w,g-ir-compiler g-ir-scanner, + mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real + $(INSTALL) -D -m 755 \ + $(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w) + ) + $(SED) "s%@BASENAME_TARGET_CPP@%$(notdir $(TARGET_CPP))%g" \ + -e "s%@BASENAME_TARGET_CC@%$(notdir $(TARGET_CC))%g" \ + -e "s%@BASENAME_TARGET_CXX@%$(notdir $(TARGET_CXX))%g" \ + -e "s%@TARGET_CPPFLAGS@%$(TARGET_CPPFLAGS)%g" \ + -e "s%@TARGET_CFLAGS@%$(TARGET_CFLAGS)%g" \ + -e "s%@TARGET_CXXFLAGS@%$(TARGET_CXXFLAGS)%g" \ + -e "s%@TARGET_LDFLAGS@%$(TARGET_LDFLAGS)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner + + # Gobject-introspection installs Makefile.introspection in + # $(STAGING_DIR)/usr/share which is needed for autotools-based programs to + # build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc + # uses $(prefix)/share as the directory, which + # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share. + # Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR) + # to the correct location. + $(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + # By default, girdir and typelibdir use datadir and libdir as their prefix, + # of which pkg-config appends the sysroot directory. This results in files + # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files. + # Changing the prefix to exec_prefix prevents this error. + $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc +endef +GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + +# Only .typelib files are needed to run. +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete +endef +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch b/buildroot/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch new file mode 100644 index 000000000..36a8ddc5b --- /dev/null +++ b/buildroot/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch @@ -0,0 +1,43 @@ +From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 19 Jan 2020 19:53:41 +0000 +Subject: [PATCH] src/headers/daemon.h: avoid redefinition of + 'last_selection_time' + +Noticed build failure on gcc-10 as: + +``` +gcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm +ld: twiddler.o:gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here +ld: synaptics.o:git/gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Signed-off-by: Sergei Trofimovich +Signed-off-by: Heiko Thiery +--- + src/headers/daemon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/headers/daemon.h b/src/headers/daemon.h +index a8936ad..24a1a97 100644 +--- a/src/headers/daemon.h ++++ b/src/headers/daemon.h +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3], + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + +-- +2.20.1 + diff --git a/buildroot/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch b/buildroot/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch new file mode 100644 index 000000000..7ab863d4a --- /dev/null +++ b/buildroot/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch @@ -0,0 +1,148 @@ +From 727c37ef78f2229998ac51942f5d11c754d0c6b9 Mon Sep 17 00:00:00 2001 +From: Robert Hancock +Date: Mon, 13 Jul 2020 17:33:48 -0600 +Subject: [PATCH] Fix errors during gpsd 3.20 cross-compilation + +Adapt some post-3.20 changes to the gpsd SConstruct file from the +gpsd master branch to fix issues when cross-compiling. Original +commits did not cherry-pick cleanly onto 3.20 due to other +upstream changes. + +Signed-off-by: Robert Hancock +--- + SConstruct | 81 ++++++++++++++++++++++-------------------------------- + 1 file changed, 33 insertions(+), 48 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 33e0ff326..93e8fcfea 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -386,13 +386,16 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python + # So we rely on MergeFlags/ParseFlags to do the right thing for us. + env['STRIP'] = "strip" + env['PKG_CONFIG'] = "pkg-config" +-for i in ["AR", "CC", "CXX", "LD", +- "PKG_CONFIG", "STRIP", "TAR"]: ++for i in ["AR", # linker for static libs, usually "ar" ++ "CC", ++ "CXX", ++ # "LD", # scons does not use LD, usually "ld" ++ "PKG_CONFIG", ++ "SHLINK", # linker for shared libs, usually "gcc" or "g++", NOT "ld" ++ "STRIP", ++ "TAR"]: + if i in os.environ: +- j = i +- if i == "LD": +- i = "SHLINK" +- env[i] = os.getenv(j) ++ env[i] = os.getenv(i) + for i in ["ARFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS", "SHLINKFLAGS", + "CPPFLAGS", "CCFLAGS", "LINKFLAGS"]: + if i in os.environ: +@@ -483,7 +486,7 @@ devenv = (("ADDR2LINE", "addr2line"), + ("GCCBUG", "gccbug"), + ("GCOV", "gcov"), + ("GPROF", "gprof"), +- ("LD", "ld"), ++ # ("LD", "ld"), # scons does not use LD + ("NM", "nm"), + ("OBJCOPY", "objcopy"), + ("OBJDUMP", "objdump"), +@@ -565,6 +568,22 @@ def CheckXsltproc(context): + return ret + + ++def CheckTime_t(context): ++ context.Message('Checking if sizeof(time_t) is 64 bits... ') ++ ret = context.TryLink(""" ++ #include ++ ++ int main(int argc, char **argv) { ++ static int test_array[1 - 2 * ((long int) sizeof(time_t) < 8 )]; ++ test_array[0] = 0; ++ (void) argc; (void) argv; ++ return 0; ++ } ++ """, '.c') ++ context.Result(ret) ++ return ret ++ ++ + def CheckCompilerOption(context, option): + context.Message('Checking if compiler accepts %s... ' % (option,)) + old_CFLAGS = context.env['CFLAGS'][:] # Get a *copy* of the old list +@@ -597,42 +616,6 @@ def CheckHeaderDefines(context, file, define): + return ret + + +-def CheckSizeOf(context, type): +- """Check sizeof 'type'""" +- context.Message('Checking size of ' + type + '... ') +- +- program = """ +-#include +-#include +- +-/* +- * The CheckSizeOf function does not have a way for the caller to +- * specify header files to be included to provide the type being +- * checked. As a workaround until that is remedied, include the +- * header required for time_t, which is the sole current use of this +- * function. +- */ +-#include +- +-int main() { +- printf("%d", (int)sizeof(""" + type + """)); +- return 0; +-} +-""" +- +- # compile it +- ret = context.TryCompile(program, '.c') +- if 0 == ret: +- announce('ERROR: TryCompile failed\n') +- # fall back to sizeof(time_t) is 8 +- return '8' +- +- # run it +- ret = context.TryRun(program, '.c') +- context.Result(ret[0]) +- return ret[1] +- +- + def CheckCompilerDefines(context, define): + context.Message('Checking if compiler supplies %s... ' % (define,)) + ret = context.TryLink(""" +@@ -708,8 +691,8 @@ config = Configure(env, custom_tests={ + 'CheckCompilerOption': CheckCompilerOption, + 'CheckHeaderDefines': CheckHeaderDefines, + 'CheckPKG': CheckPKG, +- 'CheckSizeOf': CheckSizeOf, + 'CheckXsltproc': CheckXsltproc, ++ 'CheckTime_t': CheckTime_t, + 'GetPythonValue': GetPythonValue, + }) + +@@ -1043,11 +1026,13 @@ else: + confdefs.append("/* #undef HAVE_%s_H */\n" + % hdr.replace("/", "_").upper()) + +- sizeof_time_t = config.CheckSizeOf("time_t") +- confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) +- announce("sizeof(time_t) is %s" % sizeof_time_t) +- if 4 >= int(sizeof_time_t): ++ if 0 == config.CheckTime_t(): + announce("WARNING: time_t is too small. It will fail in 2038") ++ sizeof_time_t = 4 ++ else: ++ sizeof_time_t = 8 ++ ++ confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) + + # check function after libraries, because some function require libraries + # for example clock_gettime() require librt on Linux glibc < 2.17 +-- +2.18.4 + diff --git a/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch b/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch deleted file mode 100644 index 641afa30a..000000000 --- a/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eb7cce5dbb53a64cf55ac0d9a7fa4dcbebd4b173 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 14 Aug 2017 23:24:38 +0200 -Subject: [PATCH] SConstruct: do not force -O2 by default - --O2 can cause problems on some architectures, so do not force it by - default. - -Signed-off-by: Waldemar Brodkorb ---- - SConstruct | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index fe444a2..93d91a4 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -330,8 +330,6 @@ if not 'CCFLAGS' in os.environ: - # Should we build with optimisation? - if env['debug'] or env['coveraging']: - env.Append(CCFLAGS=['-O0']) -- else: -- env.Append(CCFLAGS=['-O2']) - - # Get a slight speedup by not doing automatic RCS and SCCS fetches. - env.SourceCode('.', None) --- -2.9.4 - diff --git a/buildroot/package/gpsd/Config.in b/buildroot/package/gpsd/Config.in index ea0dea3ba..3e13f1ba7 100644 --- a/buildroot/package/gpsd/Config.in +++ b/buildroot/package/gpsd/Config.in @@ -44,9 +44,6 @@ config BR2_PACKAGE_GPSD_PROFILING comment "profiling support not available with uClibc-based toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC -config BR2_PACKAGE_GPSD_PPS - bool "PPS time syncing support" - config BR2_PACKAGE_GPSD_USER bool "GPSD privilege revocation user" diff --git a/buildroot/package/gpsd/gpsd.hash b/buildroot/package/gpsd/gpsd.hash index 40f2b7c99..af53fc05b 100644 --- a/buildroot/package/gpsd/gpsd.hash +++ b/buildroot/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 gpsd-3.19.tar.gz +sha256 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50 gpsd-3.20.tar.gz sha256 13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b COPYING diff --git a/buildroot/package/gpsd/gpsd.mk b/buildroot/package/gpsd/gpsd.mk index 49de4b256..57955b789 100644 --- a/buildroot/package/gpsd/gpsd.mk +++ b/buildroot/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.19 +GPSD_VERSION = 3.20 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING @@ -25,7 +25,6 @@ GPSD_SCONS_OPTS = \ strip=no \ python=no \ qt=no \ - ntpshm=yes \ systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) ifeq ($(BR2_PACKAGE_NCURSES),y) @@ -163,9 +162,6 @@ GPSD_SCONS_OPTS += ublox=no endif # Features -ifneq ($(BR2_PACKAGE_GPSD_PPS),y) -GPSD_SCONS_OPTS += pps=no -endif ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) GPSD_SCONS_OPTS += squelch=yes endif @@ -200,7 +196,10 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" +GPSD_SCONS_ENV += \ + LDFLAGS="$(GPSD_LDFLAGS)" \ + CFLAGS="$(GPSD_CFLAGS)" \ + CCFLAGS="$(GPSD_CFLAGS)" define GPSD_BUILD_CMDS (cd $(@D); \ diff --git a/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch b/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch new file mode 100644 index 000000000..518639387 --- /dev/null +++ b/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch @@ -0,0 +1,42 @@ +From 22e69d77d745b42ca85fefdf8c9f7625b852b964 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Wed, 26 Feb 2020 22:08:28 +0100 +Subject: [PATCH] gptcurses: partially revert "Tweaks for building on the + latest XCode for macOS" + +This partially reverts commit bbd6b4cc67ffcdf7b2a6bd5008d28006cb147393. + +Fixes: + +| gptcurses.cc:29:10: fatal error: ncursesw/ncurses.h: No such file or directory +| 29 | #include +| | ^~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Pierre-Jean Texier +[Retrieved from: +https://sourceforge.net/u/texierp/gptfdisk/ci/22e69d77d745b42ca85fefdf8c9f7625b852b964 +Upstream status (with meson build system): +https://sourceforge.net/p/gptfdisk/code/merge-requests/21] +--- + gptcurses.cc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/gptcurses.cc b/gptcurses.cc +index 1b18cf2..4ebfde1 100644 +--- a/gptcurses.cc ++++ b/gptcurses.cc +@@ -23,11 +23,7 @@ + #include + #include + #include +-#ifdef __APPLE__ + #include +-#else +-#include +-#endif + #include "gptcurses.h" + #include "support.h" + +-- +2.26.2 + diff --git a/buildroot/package/gptfdisk/0001-ldlibs.patch b/buildroot/package/gptfdisk/0001-ldlibs.patch deleted file mode 100644 index ca1d7fbfe..000000000 --- a/buildroot/package/gptfdisk/0001-ldlibs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add $(LDLIBS) support to enable clean static builds (for libintl). - -Signed-off-by: Gustavo Zacarias - -diff -Nura gptfdisk-0.8.10.orig/Makefile gptfdisk-0.8.10/Makefile ---- gptfdisk-0.8.10.orig/Makefile 2015-05-01 08:45:14.667748141 -0300 -+++ gptfdisk-0.8.10/Makefile 2015-05-01 08:45:42.685699419 -0300 -@@ -14,19 +14,19 @@ - all: cgdisk gdisk sgdisk fixparts - - gdisk: $(LIB_OBJS) gdisk.o gpttext.o -- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk -+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid $(LDLIBS) -o gdisk - # $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk - - cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o -- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw -o cgdisk -+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw $(LDLIBS) -o cgdisk - # $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk - - sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o -- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk -+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt $(LDLIBS) -o sgdisk - # $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk - - fixparts: $(MBR_LIB_OBJS) fixparts.o -- $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts -+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) $(LDLIBS) -o fixparts - - lint: #no pre-reqs - lint $(SRCS) diff --git a/buildroot/package/gptfdisk/gptfdisk.hash b/buildroot/package/gptfdisk/gptfdisk.hash index 0e52d9917..bff17dcc2 100644 --- a/buildroot/package/gptfdisk/gptfdisk.hash +++ b/buildroot/package/gptfdisk/gptfdisk.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.4/ -md5 5ecc3c44913bb6b53d3708d1ac7ac295 gptfdisk-1.0.4.tar.gz -sha1 4c2d60bedd4eac1014727e3b126de96966205410 gptfdisk-1.0.4.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.5/ +md5 58dac67c85e46ca87b587231549aefe6 gptfdisk-1.0.5.tar.gz +sha1 b642aa628cbc9fa63e9a73dad5acc588042527ac gptfdisk-1.0.5.tar.gz # Locally computed -sha256 b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d gptfdisk-1.0.4.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f gptfdisk-1.0.5.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/gptfdisk/gptfdisk.mk b/buildroot/package/gptfdisk/gptfdisk.mk index afe4a7288..e848837b7 100644 --- a/buildroot/package/gptfdisk/gptfdisk.mk +++ b/buildroot/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.4 +GPTFDISK_VERSION = 1.0.5 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING diff --git a/buildroot/package/gqrx/gqrx.hash b/buildroot/package/gqrx/gqrx.hash index 8f5f2ca43..bfa4411c2 100644 --- a/buildroot/package/gqrx/gqrx.hash +++ b/buildroot/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9 gqrx-2.12.1.tar.gz +sha256 ff3a9e350f730823dec8edb38cddfd72f602c909cc4ac39082c445eb66f88d96 gqrx-2.13.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/buildroot/package/gqrx/gqrx.mk b/buildroot/package/gqrx/gqrx.mk index b3438ac1f..dd15db289 100644 --- a/buildroot/package/gqrx/gqrx.mk +++ b/buildroot/package/gqrx/gqrx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GQRX_VERSION = 2.12.1 +GQRX_VERSION = 2.13.2 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK diff --git a/buildroot/package/gqview/0001-make.patch b/buildroot/package/gqview/0001-make.patch deleted file mode 100644 index 0b1626ffc..000000000 --- a/buildroot/package/gqview/0001-make.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.in 2006-12-02 20:41:25.000000000 -0500 -+++ b/src/Makefile.in 2008-02-13 14:00:25.000000000 -0500 -@@ -200,7 +200,7 @@ SUBDIRS = icons - DIST_SUBDIRS = icons - INCLUDES = -I$(srcdir) -I$(builddir) \ - -I$(top_srcdir) -I$(top_builddir) \ -- -I$(includedir) $(GTK_CFLAGS) -+ $(GTK_CFLAGS) - - module_SLIK = \ - intl.h \ diff --git a/buildroot/package/gqview/Config.in b/buildroot/package/gqview/Config.in deleted file mode 100644 index a654dc41f..000000000 --- a/buildroot/package/gqview/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GQVIEW - bool "gqview" - depends on BR2_PACKAGE_LIBGTK2 - help - GQview is an image viewer for Unix operating systems - - http://gqview.sourceforge.net/ diff --git a/buildroot/package/gqview/gqview.hash b/buildroot/package/gqview/gqview.hash deleted file mode 100644 index 3d1330d4f..000000000 --- a/buildroot/package/gqview/gqview.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546 gqview-2.1.5.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/gqview/gqview.mk b/buildroot/package/gqview/gqview.mk deleted file mode 100644 index 083763084..000000000 --- a/buildroot/package/gqview/gqview.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# gqview -# -################################################################################ - -GQVIEW_VERSION = 2.1.5 -GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview -GQVIEW_DEPENDENCIES = host-pkgconf libgtk2 -GQVIEW_CONF_ENV = LIBS="-lm" -GQVIEW_LICENSE = GPL-2.0 -GQVIEW_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/buildroot/package/gr-osmosdr/Config.in b/buildroot/package/gr-osmosdr/Config.in index 1e80137f3..a38082af9 100644 --- a/buildroot/package/gr-osmosdr/Config.in +++ b/buildroot/package/gr-osmosdr/Config.in @@ -14,6 +14,7 @@ if BR2_PACKAGE_GR_OSMOSDR config BR2_PACKAGE_GR_OSMOSDR_PYTHON bool "python support" depends on BR2_PACKAGE_GNURADIO_PYTHON + depends on BR2_PACKAGE_PYTHON3 help Enable Python support diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.hash b/buildroot/package/gr-osmosdr/gr-osmosdr.hash index 4a1e56aba..2acd85f32 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.hash +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 48f92dc02b86ce6d299b35db249f2c8099bb45326c979b6225a020a4188e4204 gr-osmosdr-46698a67e7e06419eefaf45c95129c0c12669045.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 5a7ce7afee38a56191b5d16cb4a91c92476729ff16ed09cbba5a3851ac619713 gr-osmosdr-0.2.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.mk b/buildroot/package/gr-osmosdr/gr-osmosdr.mk index fcc817fe8..919b43961 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.mk +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.mk @@ -4,15 +4,15 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 46698a67e7e06419eefaf45c95129c0c12669045 -GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION)) +GR_OSMOSDR_VERSION = 0.2.2 +GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING # gr-osmosdr prevents doing an in-source-tree build GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO -GR_OSMOSDR_DEPENDENCIES = gnuradio host-python-cheetah +GR_OSMOSDR_DEPENDENCIES = gnuradio host-python3 GR_OSMOSDR_CONF_OPTS = \ -DENABLE_DEFAULT=OFF \ @@ -24,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GR_OSMOSDR_DEPENDENCIES += python3 else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif diff --git a/buildroot/package/granite/0001-meson-add-introspection-option.patch b/buildroot/package/granite/0001-meson-add-introspection-option.patch new file mode 100644 index 000000000..4b32fb13c --- /dev/null +++ b/buildroot/package/granite/0001-meson-add-introspection-option.patch @@ -0,0 +1,73 @@ +From 4d5ddcdb9c03d4e829fe7080e497a00f0b379eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jun 2020 17:33:31 +0200 +Subject: [PATCH] meson: add introspection option + +This will allow the user to build granite without gobject-introspection + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/elementary/granite/pull/410] +--- + lib/meson.build | 38 ++++++++++++++++++++------------------ + meson_options.txt | 1 + + 2 files changed, 21 insertions(+), 18 deletions(-) + +diff --git a/lib/meson.build b/lib/meson.build +index a9fc4ed4..770feeb5 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -98,24 +98,26 @@ install_data( + install_dir: include_dir + ) + +-# typelib generation isn't automated yet +-g_ir_compiler = find_program('g-ir-compiler') +-custom_target( +- granite_typelib, +- command: [ +- g_ir_compiler, +- '--shared-library', +- '@PLAINNAME@', +- '--output', +- '@OUTPUT@', +- join_paths(meson.current_build_dir(), granite_gir), +- ], +- input: libgranite, +- output: granite_typelib, +- depends: libgranite, +- install: true, +- install_dir: join_paths(get_option('libdir'), 'girepository-1.0'), +-) ++if get_option('introspection') ++ # typelib generation isn't automated yet ++ g_ir_compiler = find_program('g-ir-compiler') ++ custom_target( ++ granite_typelib, ++ command: [ ++ g_ir_compiler, ++ '--shared-library', ++ '@PLAINNAME@', ++ '--output', ++ '@OUTPUT@', ++ join_paths(meson.current_build_dir(), granite_gir), ++ ], ++ input: libgranite, ++ output: granite_typelib, ++ depends: libgranite, ++ install: true, ++ install_dir: join_paths(get_option('libdir'), 'girepository-1.0'), ++ ) ++endif + + libgranite_dep = declare_dependency( + link_with: libgranite, +diff --git a/meson_options.txt b/meson_options.txt +index 9d9f62e9..bd1a1d6f 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1 +1,2 @@ + option('documentation', type: 'boolean', value: false, description: 'generate documentation with gtk-doc and valadoc') ++option('introspection', type: 'boolean', value: true, description: 'Whether to build introspection files') +-- +2.26.2 + diff --git a/buildroot/package/granite/Config.in b/buildroot/package/granite/Config.in index fef5e27ad..726bde1b2 100644 --- a/buildroot/package/granite/Config.in +++ b/buildroot/package/granite/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_GRANITE An extension to GTK+ that provides several useful widgets and classes to ease application development. - https://launchpad.net/granite + https://github.com/elementary/granite comment "granite needs libgtk3 and a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/buildroot/package/granite/granite.hash b/buildroot/package/granite/granite.hash index 48f62604f..5378b30cb 100644 --- a/buildroot/package/granite/granite.hash +++ b/buildroot/package/granite/granite.hash @@ -1,6 +1,3 @@ -# From https://launchpad.net/granite/0.4/0.4.1/+download/granite-0.4.1.tar.xz/+md5 -md5 b1002c0488bb9ade0ef89730c4f84393 granite-0.4.1.tar.xz -# Calculated based on the hash above -sha256 8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c granite-0.4.1.tar.xz # Locally computed +sha256 8194031cac3b87d84a3fab9c30270485ce73f8b8ec23f26c9152b6859c8a18fd granite-5.4.0.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/granite/granite.mk b/buildroot/package/granite/granite.mk index f824ba7fd..d5dd1fa1f 100644 --- a/buildroot/package/granite/granite.mk +++ b/buildroot/package/granite/granite.mk @@ -4,13 +4,18 @@ # ################################################################################ -GRANITE_VERSION_MAJOR = 0.4 -GRANITE_VERSION = $(GRANITE_VERSION_MAJOR).1 -GRANITE_SITE = https://launchpad.net/granite/$(GRANITE_VERSION_MAJOR)/$(GRANITE_VERSION)/+download -GRANITE_SOURCE = granite-$(GRANITE_VERSION).tar.xz +GRANITE_VERSION = 5.4.0 +GRANITE_SITE = $(call github,elementary,granite,$(GRANITE_VERSION)) GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3 GRANITE_INSTALL_STAGING = YES GRANITE_LICENSE = LGPL-3.0+ GRANITE_LICENSE_FILES = COPYING -$(eval $(cmake-package)) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GRANITE_CONF_OPTS += -Dintrospection=true +GRANITE_DEPENDENCIES += gobject-introspection +else +GRANITE_CONF_OPTS += -Dintrospection=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch b/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch deleted file mode 100644 index 250463c2f..000000000 --- a/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c989fcf192d01d26866faf6405a28ba4fdce64c3 Mon Sep 17 00:00:00 2001 -From: Stephen Kelly -Date: Sun, 21 Jul 2019 16:00:41 +0100 -Subject: [PATCH] Remove vestigial -ansi flag - -This causes the compiler to not operate in C++11 mode, meaning that -headers such as issue errors. -[Retrieved from: -https://github.com/steveire/grantlee/commit/c989fcf192d01d26866faf6405a28ba4fdce64c3] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d51110..9172213 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ endif() - - if (CMAKE_COMPILER_IS_GNUCXX) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") - - if (CMAKE_BUILD_TYPE MATCHES TestCocoon) - # Needed on 64 bit diff --git a/buildroot/package/grantlee/grantlee.hash b/buildroot/package/grantlee/grantlee.hash index 2be423bd9..6508aa70c 100644 --- a/buildroot/package/grantlee/grantlee.hash +++ b/buildroot/package/grantlee/grantlee.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz +# Locally calculated +sha256 139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a grantlee-5.2.0.tar.gz # Hash for license file -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/buildroot/package/grantlee/grantlee.mk b/buildroot/package/grantlee/grantlee.mk index 575b63fef..7079679ca 100644 --- a/buildroot/package/grantlee/grantlee.mk +++ b/buildroot/package/grantlee/grantlee.mk @@ -4,8 +4,8 @@ # ################################################################################ -GRANTLEE_VERSION = 5.1.0 -GRANTLEE_SITE = http://downloads.grantlee.org +GRANTLEE_VERSION = 5.2.0 +GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION)) GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPL-2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB diff --git a/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch b/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch new file mode 100644 index 000000000..6fac7d030 --- /dev/null +++ b/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch @@ -0,0 +1,78 @@ +# HG changeset patch +# User Bob Friesenhahn +# Date 1590851896 18000 +# Sat May 30 10:18:16 2020 -0500 +# Node ID 50395430a37188d0d197e71bd85ed6dd0f649ee3 +# Parent 4917a4242fc0a12f2f6baa10f1c5a9b3e68c20dd +MNG: Fix small heap overwrite or assertion if magnifying and image to be magnified has rows or columns == 1. + +[Retrieved (and updated to remove ChangeLog and version changes) from: +https://sourceforge.net/p/graphicsmagick/code/ci/50395430a37188d0d197e71bd85ed6dd0f649ee3] +Signed-off-by: Fabrice Fontaine + +diff -r 4917a4242fc0 -r 50395430a371 coders/png.c +--- a/coders/png.c Fri May 01 13:49:13 2020 -0500 ++++ b/coders/png.c Sat May 30 10:18:16 2020 -0500 +@@ -5304,7 +5304,7 @@ + if (logging) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + "MAGN chunk (%lu bytes): " +- "First_magnified_object_id=%u, Last_magnified_object_id=%u, " ++ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, " + "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, " + "X_method=%u, Y_method=%u", + length, +@@ -5679,6 +5679,8 @@ + /* + If magnifying and a supported method is requested then + magnify the image. ++ ++ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN + */ + if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) && + ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5))) +@@ -5689,7 +5691,28 @@ + + if (logging) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), +- " Processing MNG MAGN chunk"); ++ " Processing MNG MAGN chunk: MB=%u, ML=%u," ++ " MR=%u, MT=%u, MX=%u, MY=%u," ++ " X_method=%u, Y_method=%u", ++ mng_info->magn_mb,mng_info->magn_ml, ++ mng_info->magn_mr,mng_info->magn_mt, ++ mng_info->magn_mx,mng_info->magn_my, ++ mng_info->magn_methx, ++ mng_info->magn_methy); ++ ++ /* ++ If the image width is 1, then X magnification is done ++ by simple pixel replication. ++ */ ++ if (image->columns == 1) ++ mng_info->magn_methx = 1; ++ ++ /* ++ If the image height is 1, then Y magnification is done ++ by simple pixel replication. ++ */ ++ if (image->rows == 1) ++ mng_info->magn_methy = 1; + + if (mng_info->magn_methx == 1) + { +@@ -5734,12 +5757,10 @@ + Image + *large_image; + +- int +- yy; +- + long + m, +- y; ++ y, ++ yy; + + register long + x; diff --git a/buildroot/package/graphicsmagick/Config.in b/buildroot/package/graphicsmagick/Config.in new file mode 100644 index 000000000..1e47d6739 --- /dev/null +++ b/buildroot/package/graphicsmagick/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GRAPHICSMAGICK + bool "graphicsmagick" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + help + GraphicsMagick is the swiss army knife of image processing. + It provides a robust and efficient collection of tools + and libraries which support reading, writing, + and manipulating an image in over 89 major formats + including important formats like DPX, GIF, JPEG, JPEG-2000, + PNG, PDF, PNM, TIFF, and WebP. + + http://www.graphicsmagick.org/ + +comment "graphicsmagick needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/graphicsmagick/graphicsmagick.hash b/buildroot/package/graphicsmagick/graphicsmagick.hash new file mode 100644 index 000000000..cb91ff0d0 --- /dev/null +++ b/buildroot/package/graphicsmagick/graphicsmagick.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 188a8d6108fea87a0208723e8d206ec1d4d7299022be8ce5d0a9720509250250 GraphicsMagick-1.3.35.tar.xz +sha256 1d28851631892098e0bf8653fd4e89f3524184d136391b54c664e89251ca3a9a Copyright.txt diff --git a/buildroot/package/graphicsmagick/graphicsmagick.mk b/buildroot/package/graphicsmagick/graphicsmagick.mk new file mode 100644 index 000000000..7e7187048 --- /dev/null +++ b/buildroot/package/graphicsmagick/graphicsmagick.mk @@ -0,0 +1,127 @@ +################################################################################ +# +# graphicsmagick +# +################################################################################ + +GRAPHICSMAGICK_VERSION = 1.3.35 +GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz +GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) +GRAPHICSMAGICK_LICENSE = MIT +GRAPHICSMAGICK_LICENSE_FILES = Copyright.txt + +GRAPHICSMAGICK_INSTALL_STAGING = YES +GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config + +# 0001-MNG-Fix-small-heap-overwrite-or-assertion.patch +GRAPHICSMAGICK_IGNORE_CVES += CVE-2020-12672 + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +GRAPHICSMAGICK_CONFIG_SCRIPTS += GraphicsMagick++-config +endif + +GRAPHICSMAGICK_CONF_OPTS = \ + --without-dps \ + --without-fpx \ + --without-jbig \ + --without-perl \ + --without-trio \ + --without-wmf \ + --without-x \ + --with-gs-font-dir=/usr/share/fonts/gs + +GRAPHICSMAGICK_DEPENDENCIES = host-pkgconf + +ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y) +GRAPHICSMAGICK_CONF_OPTS += --enable-openmp +else +GRAPHICSMAGICK_CONF_OPTS += --disable-openmp +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +GRAPHICSMAGICK_CONF_OPTS += --with-ttf +GRAPHICSMAGICK_CONF_ENV += ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config +GRAPHICSMAGICK_DEPENDENCIES += freetype +else +GRAPHICSMAGICK_CONF_OPTS += --without-ttf +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +GRAPHICSMAGICK_CONF_OPTS += --with-jpeg +GRAPHICSMAGICK_DEPENDENCIES += jpeg +else +GRAPHICSMAGICK_CONF_OPTS += --without-jpeg +endif + +ifeq ($(BR2_PACKAGE_OPENJPEG),y) +GRAPHICSMAGICK_CONF_OPTS += --with-jp2 +GRAPHICSMAGICK_DEPENDENCIES += openjpeg +else +GRAPHICSMAGICK_CONF_OPTS += --without-jp2 +endif + +ifeq ($(BR2_PACKAGE_LCMS2),y) +GRAPHICSMAGICK_CONF_OPTS += --with-lcms2 +GRAPHICSMAGICK_DEPENDENCIES += lcms2 +else +GRAPHICSMAGICK_CONF_OPTS += --without-lcms2 +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +GRAPHICSMAGICK_CONF_OPTS += --with-png +GRAPHICSMAGICK_DEPENDENCIES += libpng +else +GRAPHICSMAGICK_CONF_OPTS += --without-png +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +GRAPHICSMAGICK_CONF_OPTS += --with-xml +GRAPHICSMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config +GRAPHICSMAGICK_DEPENDENCIES += libxml2 +else +GRAPHICSMAGICK_CONF_OPTS += --without-xml +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +GRAPHICSMAGICK_CONF_OPTS += --with-tiff +GRAPHICSMAGICK_DEPENDENCIES += tiff +else +GRAPHICSMAGICK_CONF_OPTS += --without-tiff +endif + +ifeq ($(BR2_PACKAGE_WEBP_MUX),y) +GRAPHICSMAGICK_CONF_OPTS += --with-webp +GRAPHICSMAGICK_DEPENDENCIES += webp +else +GRAPHICSMAGICK_CONF_OPTS += --without-webp +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +GRAPHICSMAGICK_CONF_OPTS += --with-lzma +GRAPHICSMAGICK_DEPENDENCIES += xz +else +GRAPHICSMAGICK_CONF_OPTS += --without-lzma +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GRAPHICSMAGICK_CONF_OPTS += --with-zlib +GRAPHICSMAGICK_DEPENDENCIES += zlib +else +GRAPHICSMAGICK_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_BZIP2),y) +GRAPHICSMAGICK_CONF_OPTS += --with-bzlib +GRAPHICSMAGICK_DEPENDENCIES += bzip2 +else +GRAPHICSMAGICK_CONF_OPTS += --without-bzlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +GRAPHICSMAGICK_CONF_OPTS += --with-zstd +GRAPHICSMAGICK_DEPENDENCIES += zstd +else +GRAPHICSMAGICK_CONF_OPTS += --without-zstd +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/grep/grep.hash b/buildroot/package/grep/grep.hash index 4aa7b4ecb..fae3b73e8 100644 --- a/buildroot/package/grep/grep.hash +++ b/buildroot/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# http://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz.sig +# http://ftp.gnu.org/gnu/grep/grep-3.5.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514 grep-3.3.tar.xz -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 b82ac77707c2ab945520c8404c9fa9f890f7791a62cf2103cf6238acad87a44a grep-3.5.tar.xz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/buildroot/package/grep/grep.mk b/buildroot/package/grep/grep.mk index cc80553eb..bdc22fa46 100644 --- a/buildroot/package/grep/grep.mk +++ b/buildroot/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.3 +GREP_VERSION = 3.5 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ diff --git a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch index 2da657762..c6de0c183 100644 --- a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch +++ b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch @@ -17,12 +17,12 @@ Signed-off-by: Robert Rose 1 file changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc76cf5..7a22b08 100644 +index be695c2..45c2fcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13420,6 +13420,18 @@ target_link_libraries(grpc_cli - endif (gRPC_BUILD_TESTS) - if (gRPC_BUILD_CODEGEN) +@@ -11199,6 +11199,18 @@ target_link_libraries(grpc_cli + endif() + if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) +if (gRPC_NATIVE_CPP_PLUGIN) + @@ -39,14 +39,14 @@ index fc76cf5..7a22b08 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc ) -@@ -13457,6 +13469,7 @@ if (gRPC_INSTALL) +@@ -11233,6 +11245,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() +endif() - endif (gRPC_BUILD_CODEGEN) - if (gRPC_BUILD_CODEGEN) + endif() + if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CSHARP_PLUGIN) -- -2.20.0.rc0.387.gc7a69e6b6c-goog +2.26.2 diff --git a/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch index 86586d850..32493ac1a 100644 --- a/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch @@ -17,12 +17,12 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89e834b..c7bd2ad 100644 +index 45c2fcb..0b2be4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -97,6 +97,12 @@ endif() - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +include(CheckSymbolExists) +check_symbol_exists(pthread_setname_np pthread.h HAVE_PTHREAD_SETNAME_NP) @@ -30,14 +30,14 @@ index 89e834b..c7bd2ad 100644 + add_definitions(-DHAVE_PTHREAD_SETNAME_NP) +endif () + - if (MSVC) + if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 031c0c3..a29a9dc 100644 +index 4f213ff..55ecd9d 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h -@@ -181,7 +181,9 @@ +@@ -168,7 +168,9 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -48,5 +48,4 @@ index 031c0c3..a29a9dc 100644 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 -- -2.14.4 - +2.26.63 diff --git a/buildroot/package/grpc/Config.in b/buildroot/package/grpc/Config.in index 43f446d8d..d1bf0d078 100644 --- a/buildroot/package/grpc/Config.in +++ b/buildroot/package/grpc/Config.in @@ -1,14 +1,18 @@ config BR2_PACKAGE_GRPC bool "grpc" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf - depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp + depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBABSEIL_CPP select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_RE2 select BR2_PACKAGE_ZLIB help A language-neutral, platform-neutral, open source, remote @@ -16,8 +20,10 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/buildroot/package/grpc/grpc.hash b/buildroot/package/grpc/grpc.hash index 5201f7210..b26469480 100644 --- a/buildroot/package/grpc/grpc.hash +++ b/buildroot/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ffbe61269160ea745e487f79b0fd06b6edd3d50c6d9123f053b5634737cf2f69 grpc-1.25.0.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a grpc-1.33.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk index 39f612379..04c741fe9 100644 --- a/buildroot/package/grpc/grpc.mk +++ b/buildroot/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.25.0 +GRPC_VERSION = 1.33.2 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE @@ -12,17 +12,20 @@ GRPC_LICENSE_FILES = LICENSE GRPC_INSTALL_STAGING = YES # Need to use host grpc_cpp_plugin during cross compilation. -GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib -HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib +GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib +HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ + host-re2 host-zlib # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have # installed a cmake config file, but buildroot uses c-ares' autotools build, # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ -DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin @@ -61,11 +64,21 @@ GRPC_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" HOST_GRPC_CONF_OPTS = \ + -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package +# With gcc 4.8 (at least on ubuntu) there is a bug in LTO which breaks +# the linkage of the grpc_cpp_plugin with libprotobuf and pthread. This +# additional flag fixes this. +ifeq ($(BR2_HOST_GCC_AT_LEAST_4_9),) +HOST_GRPC_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS) -Wl,--no-as-needed" +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index c37b7377d..d530517cd 100644 --- a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.33/gsettings-desktop-schemas-3.33.1.sha256sum -sha256 bd337f13955856140fdbd3073c56d4adca20333f8bdac41e429c3dca4730cdff gsettings-desktop-schemas-3.33.1.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum +sha256 004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9 gsettings-desktop-schemas-3.36.1.tar.xz # Hash for license file -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 98d16745b..8573c75fd 100644 --- a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.33 +GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.36 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) diff --git a/buildroot/package/gsl/gsl.hash b/buildroot/package/gsl/gsl.hash index 8a979d6e8..0d40a7549 100644 --- a/buildroot/package/gsl/gsl.hash +++ b/buildroot/package/gsl/gsl.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d gsl-2.5.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gsl/gsl.mk b/buildroot/package/gsl/gsl.mk index d3c764787..416955b72 100644 --- a/buildroot/package/gsl/gsl.mk +++ b/buildroot/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.5 +GSL_VERSION = 2.6 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 diff --git a/buildroot/package/gssdp/gssdp.hash b/buildroot/package/gssdp/gssdp.hash index ad1483667..f31f21942 100644 --- a/buildroot/package/gssdp/gssdp.hash +++ b/buildroot/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.4.sha256sum: -sha256 ab29f6eaed476cd4bd1004034620cc25d45102c08656bdf2301a667c95bc0d46 gssdp-1.0.4.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.2/gssdp-1.2.3.sha256sum: +sha256 a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8 gssdp-1.2.3.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gssdp/gssdp.mk b/buildroot/package/gssdp/gssdp.mk index 8b44320ba..02b10d961 100644 --- a/buildroot/package/gssdp/gssdp.mk +++ b/buildroot/package/gssdp/gssdp.mk @@ -4,18 +4,22 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 1.0 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).4 +GSSDP_VERSION_MAJOR = 1.2 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.0+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup -GSSDP_CONF_OPTS = \ - -Dexamples=false \ - -Dintrospection=false \ - -Dvapi=false +GSSDP_CONF_OPTS = -Dexamples=false + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GSSDP_CONF_OPTS += -Dintrospection=true -Dvapi=true +GSSDP_DEPENDENCIES += host-vala gobject-introspection +else +GSSDP_CONF_OPTS += -Dintrospection=false -Dvapi=false +endif ifeq ($(BR2_PACKAGE_LIBGTK3),y) GSSDP_DEPENDENCIES += libgtk3 diff --git a/buildroot/package/gstreamer1/Config.in b/buildroot/package/gstreamer1/Config.in index bb5c1d2af..4a8111333 100644 --- a/buildroot/package/gstreamer1/Config.in +++ b/buildroot/package/gstreamer1/Config.in @@ -8,12 +8,13 @@ source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" +source "package/gstreamer1/gst1-devtools/Config.in" source "package/gstreamer1/gst1-imx/Config.in" source "package/gstreamer1/gst1-interpipe/Config.in" source "package/gstreamer1/gst1-libav/Config.in" +source "package/gstreamer1/gst1-python/Config.in" source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-shark/Config.in" -source "package/gstreamer1/gst1-validate/Config.in" source "package/gstreamer1/gst1-vaapi/Config.in" source "package/gstreamer1/gst-omx/Config.in" source "package/gstreamer1/gstreamer1-editing-services/Config.in" diff --git a/buildroot/package/gstreamer1/gst-omx/Config.in b/buildroot/package/gstreamer1/gst-omx/Config.in index d2e477648..efe3d211d 100644 --- a/buildroot/package/gstreamer1/gst-omx/Config.in +++ b/buildroot/package/gstreamer1/gst-omx/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_GST_OMX help GStreamer plug-in to use OpenMAX API. - http://cgit.freedesktop.org/gstreamer/gst-omx + https://cgit.freedesktop.org/gstreamer/gst-omx comment "gst-omx requires a OpenMAX implementation" depends on !BR2_PACKAGE_HAS_LIBOPENMAX diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash index 85487f349..e4dfe61fa 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.16.2.tar.xz.sha256sum -sha256 11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439 gst-omx-1.16.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.1.tar.xz.sha256sum +sha256 42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965 gst-omx-1.18.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk index 5ed9e3ce2..2a9f7b6b1 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,33 +4,27 @@ # ################################################################################ -GST_OMX_VERSION = 1.16.2 +GST_OMX_VERSION = 1.18.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx GST_OMX_LICENSE = LGPL-2.1 GST_OMX_LICENSE_FILES = COPYING +GST_OMX_CONF_OPTS = \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dtools=disabled \ + -Ddoc=disabled + ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) GST_OMX_VARIANT = rpi -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -else ifeq ($(BR2_PACKAGE_BELLAGIO),y) -GST_OMX_VARIANT = bellagio -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -DOMX_VERSION_MAJOR=1 \ - -DOMX_VERSION_MINOR=1 \ - -DOMX_VERSION_REVISION=2 \ - -DOMX_VERSION_STEP=0" +GST_OMX_CONF_OPTS += -Dheader_path=$(STAGING_DIR)/usr/include/IL else GST_OMX_VARIANT = generic endif -GST_OMX_CONF_OPTS += --with-omx-target=$(GST_OMX_VARIANT) +GST_OMX_CONF_OPTS += -Dtarget=$(GST_OMX_VARIANT) GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax @@ -42,4 +36,4 @@ endef GST_OMX_POST_PATCH_HOOKS += GST_OMX_FIXUP_CONFIG_PATHS -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-validate/Config.in b/buildroot/package/gstreamer1/gst1-devtools/Config.in similarity index 59% rename from buildroot/package/gstreamer1/gst1-validate/Config.in rename to buildroot/package/gstreamer1/gst1-devtools/Config.in index 63bce613e..55cf25d53 100644 --- a/buildroot/package/gstreamer1/gst1-validate/Config.in +++ b/buildroot/package/gstreamer1/gst1-devtools/Config.in @@ -1,6 +1,7 @@ -config BR2_PACKAGE_GST1_VALIDATE - bool "gst1-validate" +config BR2_PACKAGE_GST1_DEVTOOLS + bool "gst1-devtools" depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_GSTREAMER1_CHECK select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON @@ -8,12 +9,10 @@ config BR2_PACKAGE_GST1_VALIDATE # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help - GstValidate is a tool that allows GStreamer developers to - check that the GstElements they write behave the way they - are supposed to. + GStreamer development tools (gst-validate). - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org -comment "gst1-validate depends on python" +comment "gst1-devtools depends on python" depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash new file mode 100644 index 000000000..eea0086d7 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -0,0 +1,3 @@ +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.1.tar.xz.sha256sum +sha256 712212babd2238233d55beecfc0fe1ea8db18e8807ac6ab05a64505b2c7ab0df gst-devtools-1.18.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk new file mode 100644 index 000000000..4b64c8502 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# gst1-devtools +# +################################################################################ + +GST1_DEVTOOLS_VERSION = 1.18.1 +GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz +GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools +GST1_DEVTOOLS_LICENSE = LGPL-2.1+ +GST1_DEVTOOLS_LICENSE_FILES = validate/COPYING +GST1_DEVTOOLS_INSTALL_STAGING = YES + +GST1_DEVTOOLS_DEPENDENCIES = \ + gstreamer1 \ + gst1-plugins-base \ + json-glib \ + $(if $(BR2_PACKAGE_CAIRO),cairo) + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +GST1_DEVTOOLS_DEPENDENCIES += host-python3 python3 +else +GST1_DEVTOOLS_DEPENDENCIES += host-python python +endif + +ifeq ($(BR2_PACKAGE_GST1_RTSP_SERVER),y) +GST1_DEVTOOLS_DEPENDENCIES += gst1-rtsp-server +endif + +GST1_DEVTOOLS_CONF_OPTS = \ + -Dvalidate=enabled \ + -Ddebug_viewer=disabled \ + -Dintrospection=disabled \ + -Dtests=disabled \ + -Ddoc=disabled + +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch b/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch deleted file mode 100644 index dcc586311..000000000 --- a/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 66bc1c2b9c74dab4706a1ca3696e863ed8d30433 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 15 Dec 2019 14:24:54 +0000 -Subject: [PATCH] waf: update to 2.0.12 - -Prepare to allow building with python3. - -Signed-off-by: Max Krummenacher -[Titouan: backport part from upstream, but drop the update of waf itself] -Signed-off-by: Titouan Christophe ---- - wscript | 3 ++- - 2 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/wscript b/wscript -index c3a9926..f076b64 100644 ---- a/wscript -+++ b/wscript -@@ -152,7 +152,8 @@ def configure(conf): - - # test for GStreamer libraries - -- gst_version_str = conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) -+ conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) -+ gst_version_str = conf.check_cfg(modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) - gst_version = [int(x) for x in re.match('(\d*)\.(\d*)\.(\d*)', gst_version_str).groups()] - conf.env['GSTREAMER_VERSION'] = gst_version - diff --git a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash index 0ef01d71e..0a701a058 100644 --- a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026 gst1-imx-0.13.0.tar.gz +sha256 21feb24130c18e4a1f8cc4f72d575903d1f9134dd0604e41e91b5e783d81e320 gst1-imx-0.13.1.tar.gz sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE diff --git a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk index 115607727..f091b4f98 100644 --- a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_IMX_VERSION = 0.13.0 +GST1_IMX_VERSION = 0.13.1 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) GST1_IMX_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 0ce6ad460..476461148 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 6dc2c9d5ff4c3777d40712199a0cafa6bc0058327bca5a20e31d743a46e1ad21 gst1-interpipe-9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1.tar.gz +sha256 4b0d8c5fabe1705ba92ac8409d7d138429df5874ba196101cdd1871936719b1a gst1-interpipe-94dea528dc9e2d0df02fdf2114deecfef6a23740.tar.gz # Hashes for license files: -sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING +sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index 87e5f2e5d..9d3402d02 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1 +GST1_INTERPIPE_VERSION = 94dea528dc9e2d0df02fdf2114deecfef6a23740 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module @@ -13,9 +13,10 @@ GST1_INTERPIPE_GIT_SUBMODULES = YES GST1_INTERPIPE_LICENSE = LGPL-2.1 GST1_INTERPIPE_LICENSE_FILES = COPYING -# from git source -GST1_INTERPIPE_AUTORECONF = YES - GST1_INTERPIPE_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base -$(eval $(autotools-package)) +GST1_INTERPIPE_CONF_OPTS = \ + -Dtests=disabled \ + -Denable-gtk-doc=false + +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-libav/Config.in b/buildroot/package/gstreamer1/gst1-libav/Config.in index 23d78b6ad..e58a3532f 100644 --- a/buildroot/package/gstreamer1/gst1-libav/Config.in +++ b/buildroot/package/gstreamer1/gst1-libav/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_GST1_LIBAV The codecs, muxers, bitstreams and filters to build can be selected in the ffmpeg package. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash index 15e4d859e..0b4e50338 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz.sha256sum -sha256 c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2 gst-libav-1.16.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.1.tar.xz.sha256sum +sha256 39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8 gst-libav-1.18.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk index fdd4d6cc2..783bafee2 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,39 +4,12 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.16.2 +GST1_LIBAV_VERSION = 1.18.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav - -GST1_LIBAV_DEPENDENCIES = \ - host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \ - $(if $(BR2_PACKAGE_BZIP2),bzip2) \ - $(if $(BR2_PACKAGE_XZ),xz) -GST1_LIBAV_LICENSE = GPL-2.0+ +GST1_LIBAV_LICENSE = LGPL-2.0+ GST1_LIBAV_LICENSE_FILES = COPYING -GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux +GST1_LIBAV_DEPENDENCIES = host-pkgconf ffmpeg gstreamer1 gst1-plugins-base +GST1_LIBAV_CONF_OPTS = -Ddoc=disabled -# fixes arm build: https://bugzilla.gnome.org/show_bug.cgi?id=694416 -ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) -GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc" -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib -GST1_LIBAV_DEPENDENCIES += zlib -else -GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib -GST1_LIBAV_DEPENDENCIES += bzip2 -else -GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib -endif - -GST1_LIBAV_CONF_OPTS = \ - --with-system-libav \ - --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)" - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch deleted file mode 100644 index 02e91e33e..000000000 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1bc387f8feaab9020be72e88cf26ccc1a67a6a10 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 22 Aug 2020 23:33:48 +0200 -Subject: [PATCH] meson: allow the user to disable opencv - -Allow the user to really disable opencv through meson (i.e. --Dopencv=disabled). - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1533] ---- - gst-libs/gst/opencv/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build -index 6cc4602f3..fb6c46e40 100644 ---- a/gst-libs/gst/opencv/meson.build -+++ b/gst-libs/gst/opencv/meson.build -@@ -13,7 +13,7 @@ opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false) - if not opencv_dep.found() - opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false) - endif --if opencv_dep.found() -+if not get_option('opencv').disabled() and opencv_dep.found() - gstopencv = library('gstopencv-' + api_version, - opencv_sources, - c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'], --- -2.28.0 - diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in index 08de5d218..191820df1 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in @@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD A set of plug-ins for GStreamer that may be of poor quality or lacking some features. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_BAD @@ -87,8 +87,13 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS Collection of elements that may or may not be useful for debugging +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC + bool "dvbsubenc" + help + DVB subpicture encoding support + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" + bool "dvbsuboverlay" help DVB subtitle renderer plugin @@ -232,6 +237,21 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE help Removes silence from an audio stream +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST + bool "rist" + help + RIST streaming + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2 + bool "rtmp2" + help + RTMP sink/source (rtmp2sink, rtmp2src) + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2 + bool "rtp" + help + RTP (rtpsrc/rtpsink) + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP bool "rtmp" select BR2_PACKAGE_RTMPDUMP @@ -268,6 +288,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC help subtitle encoders +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN + bool "switchbin" + help + Switching between paths based on input caps + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE bool "timecode" @@ -297,17 +322,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M help Demuxes/decodes YUV4MPEG streams -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF - bool "yadif" - help - YADIF deinterlacing filter - comment "plugins with external dependencies" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" + depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS +comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ bool "bluez" depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 @@ -395,6 +423,7 @@ comment "fdk-aac needs a toolchain w/ C++" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH bool "fluidsynth" + depends on !BR2_STATIC_LIBS # fluidsynth depends on BR2_USE_WCHAR # fluidsynth depends on BR2_TOOLCHAIN_HAS_THREADS # fluidsynth depends on BR2_USE_MMU # fluidsynth @@ -402,9 +431,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH help Fluidsynth MIDI decoder plugin -comment "fluidsynth needs a toolchain w/ threads, wchar" +comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL bool "gl" @@ -489,14 +519,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS select BR2_PACKAGE_OPENAL -comment "openal plugin needs a toolchain w/ NPTL, C++" +comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 bool "openh264" @@ -527,6 +559,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz @@ -535,6 +568,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG RSVG plugin library comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_SYNC_4 @@ -613,6 +647,13 @@ comment "wpe needs the gst1-plugins-base opengl library and wpewebkit" depends on !BR2_PACKAGE_WPEWEBKIT \ || !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS + bool "v4l2codecs" + depends on BR2_PACKAGE_HAS_UDEV # libgudev + select BR2_PACKAGE_LIBGUDEV + help + Video4Linux Stateless CODECs support + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 7b59b4dbe..573178dc2 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,4 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz.sha256sum -sha256 f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 gst-plugins-bad-1.16.2.tar.xz -sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING -sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.1.tar.xz.sha256sum +sha256 c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2 gst-plugins-bad-1.18.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ef36e4dc0..78a378544 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,14 +4,14 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.16.2 +GST1_PLUGINS_BAD_VERSION = 1.18.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES # Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. -GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING +GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+ GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) @@ -23,19 +23,22 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ -Dwinks=disabled \ -Dandroidmedia=disabled \ -Dapplemedia=disabled \ - -Dintrospection=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ - -Dglib-checks=disabled + -Dglib-checks=disabled \ + -Dextra-checks=disabled \ + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Davtp=disabled \ -Dopensles=disabled \ -Duvch264=disabled \ -Dmsdk=disabled \ -Dvoamrwbenc=disabled \ -Dbs2b=disabled \ -Dchromaprint=disabled \ + -Dd3d11=disabled \ -Ddc1394=disabled \ -Ddts=disabled \ -Dresindvd=disabled \ @@ -45,6 +48,8 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dkate=disabled \ -Dladspa=disabled \ -Dlv2=disabled \ + -Dmediafoundation=disabled \ + -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ -Dmplex=disabled \ @@ -58,11 +63,23 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dgme=disabled \ -Dvdpau=disabled \ -Dspandsp=disabled \ + -Dsvthevcenc=disabled \ + -Dtranscode=disabled \ + -Dwasapi2=disabled \ + -Dzxing=disabled \ + -Dmagicleap=disabled \ -Diqa=disabled \ -Dopencv=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += gobject-introspection +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libdrm wayland wayland-protocols @@ -174,6 +191,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled else @@ -362,6 +385,24 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drist=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drist=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump @@ -405,6 +446,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled else @@ -447,13 +494,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled -endif - # Plugins with dependencies ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) @@ -705,6 +745,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libgudev +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled GST1_PLUGINS_BAD_DEPENDENCIES += x265 diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch deleted file mode 100644 index b778f7a12..000000000 --- a/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 443244e54d1e2813560d364b44b35d49b3987b67 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 3 Mar 2020 17:07:24 +0100 -Subject: [PATCH] meson: static linkig of tools needs gmodule_dep - -Add gmodule_dep (analog to gstreamer/tools/meson.build). - -Fixes: - -.../bin/ld: .../usr/lib/libgstreamer-1.0.a(gstplugin.c.o): in function `gst_plugin_register_func': -gstplugin.c:(.text+0x3bc): undefined reference to `g_module_make_resident' -.../bin/ld: .../usr/lib/libgstreamer-1.0.a(gstplugin.c.o): in function `_priv_gst_plugin_load_file_for_registry': -gstplugin.c:(.text+0x1228): undefined reference to `g_module_supported' -.../bin/ld: gstplugin.c:(.text+0x126c): undefined reference to `g_module_open' -.../bin/ld: gstplugin.c:(.text+0x1368): undefined reference to `g_module_symbol' -.../bin/ld: gstplugin.c:(.text+0x1494): undefined reference to `g_module_supported' -.../bin/ld: gstplugin.c:(.text+0x17f4): undefined reference to `g_module_close' -.../bin/ld: gstplugin.c:(.text+0x1a2c): undefined reference to `g_module_error' - -[Upstream suggested: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/587 ] -Signed-off-by: Peter Seiderer ---- - tools/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/meson.build b/tools/meson.build -index 57595fb47..bcbe11ca1 100644 ---- a/tools/meson.build -+++ b/tools/meson.build -@@ -1,4 +1,4 @@ --tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep] -+tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep, gmodule_dep] - - executable('gst-device-monitor-@0@'.format(api_version), - 'gst-device-monitor.c', --- -2.25.1 - diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/Config.in b/buildroot/package/gstreamer1/gst1-plugins-base/Config.in index f60d54033..ceed55890 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-base/Config.in @@ -6,10 +6,16 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE help A basic set of well-supported plug-ins for GStreamer. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_BASE +config BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS + bool "install tools" + help + Install the gst-discoverer, gst-device-monitor and gst-play + tools. + comment "dependency-less plugins" config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER @@ -63,6 +69,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO help GIO elements +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_TYPEFINDER + bool "gio-typefinder" + help + GIO typefinder elements + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION bool "overlaycomposition" help diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 2074c0272..87f0d4e58 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz.sha256sum -sha256 b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a gst-plugins-base-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.1.tar.xz.sha256sum +sha256 1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641 gst-plugins-base-1.18.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 42fe09bf5..f5b0e0a4e 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.16.2 +GST1_PLUGINS_BASE_VERSION = 1.18.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES @@ -17,8 +17,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ - -Dgtk_doc=disabled \ - -Dintrospection=disabled + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BASE_CONF_OPTS += \ @@ -26,11 +25,25 @@ GST1_PLUGINS_BASE_CONF_OPTS += \ -Dlibvisual=disabled \ -Diso-codes=disabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=disabled +endif + GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES) GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) # These plugins are listed in the order from ./configure --help + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dintrospection=enabled +GST1_PLUGINS_BASE_DEPENDENCIES += gobject-introspection +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=enabled @@ -143,6 +156,12 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO_TYPEFINDER),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio-typefinder=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio-typefinder=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION),y) GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=enabled else diff --git a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash index 129be67c3..cfb62b062 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d317b892bf1c99e9999a6d9b027a22c4ea2940f1ac504c03560b3d476e1c9c8 gst-bayer2rgb-neon-v0.3.tar.bz2 +sha256 307725640203083df7dfb7f9c2b8bb9583accf7b8c06238dd92d6150a9fd8b04 gst-bayer2rgb-neon-0.4.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 734800a74..5139463ca 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -4,8 +4,8 @@ # ################################################################################ -GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 0.3 -GST1_PLUGINS_BAYER2RGB_NEON_SOURCE = gst-bayer2rgb-neon-v$(GST1_PLUGINS_BAYER2RGB_NEON_VERSION).tar.bz2 +GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 0.4 +GST1_PLUGINS_BAYER2RGB_NEON_SOURCE = gst-bayer2rgb-neon-$(GST1_PLUGINS_BAYER2RGB_NEON_VERSION).tar.bz2 GST1_PLUGINS_BAYER2RGB_NEON_SITE = https://git.phytec.de/gst-bayer2rgb-neon/snapshot GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in index 37aad31de..4dcf26766 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in @@ -8,7 +8,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD A set of well-supported plug-ins for GStreamer under the preferred license. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_GOOD @@ -279,7 +279,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL bool "qmlgl (qt5)" depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative-quick select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -287,11 +286,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL help QT5 plugin which includes elements qmlglsrc and qmlglsink -comment "qmlgl (qt5) plugin needs an OpenGL-capable Qt5 backend" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST - config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2 bool "shout2" select BR2_PACKAGE_LIBSHOUT diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 075338b14..9960282e7 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz.sha256sum -sha256 40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319 gst-plugins-good-1.16.2.tar.xz -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.1.tar.xz.sha256sum +sha256 e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c gst-plugins-good-1.18.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index eed4bfe11..1ea1fc4c6 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.16.2 +GST1_PLUGINS_GOOD_VERSION = 1.18.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING @@ -15,12 +15,18 @@ GST1_PLUGINS_GOOD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_GOOD_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dasm=disabled \ -Ddirectsound=disabled \ -Dwaveform=disabled \ + -Drpicamsrc=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ -Daalib=disabled \ - -Dlibcaca=disabled + -Dlibcaca=disabled \ + -Ddoc=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in b/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in index c24ec7ae7..ba1998989 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY A set of well-supported plug-ins for GStreamer, but might pose problems for distributors. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GST1_PLUGINS_UGLY diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index e5df44ab9..7646706f0 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz.sha256sum -sha256 5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca gst-plugins-ugly-1.16.2.tar.xz -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.1.tar.xz.sha256sum +sha256 18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725 gst-plugins-ugly-1.18.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 0261dc323..88c142a13 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.16.2 +GST1_PLUGINS_UGLY_VERSION = 1.18.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -15,7 +15,8 @@ GST1_PLUGINS_UGLY_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_UGLY_CONF_OPTS += \ -Dexamples=disabled \ - -Dtests=disabled + -Dtests=disabled \ + -Ddoc=disabled GST1_PLUGINS_UGLY_CONF_OPTS += \ -Da52dec=disabled \ diff --git a/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch b/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch new file mode 100644 index 000000000..edff445a7 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch @@ -0,0 +1,43 @@ +From 10707f437f2fc3632067c6a0efa4432f7ebaf362 Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge +Date: Fri, 13 Dec 2019 10:46:20 +0200 +Subject: [PATCH] backport of "fix build with Python 3.8 by also checking for + python-3.X-embed.pc" + +Since Python 3.8 the normal checks don't include the Python libraries +anymore and linking of the gst-python module would fail. + +See also https://github.com/mesonbuild/meson/issues/5629 + +Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 + +Upstream commit: 22f28155d86e27c4134de4ed2861264003fcfd23 + +Signed-off-by: Sebastian Dröge +Signed-off-by: Adam Duskett +--- + meson.build | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/meson.build b/meson.build +index 744b7ce..492af1a 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,6 +25,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d + pymod = import('python') + python = pymod.find_installation(get_option('python')) + python_dep = python.dependency(required : true) ++pythonver = python.language_version() ++ ++# Workaround for https://github.com/mesonbuild/meson/issues/5629 ++# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 ++python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false) ++if not python_dep.found() ++ python_dep = python.dependency(required : true) ++endif + + python_abi_flags = python.get_variable('ABIFLAGS', '') + pylib_loc = get_option('libpython-dir') +-- +2.24.1 + diff --git a/buildroot/package/gstreamer1/gst1-python/Config.in b/buildroot/package/gstreamer1/gst1-python/Config.in new file mode 100644 index 000000000..791562fea --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-python/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_GST1_PYTHON + bool "gst1-python" + depends on BR2_USE_MMU # libglib2, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection + select BR2_PACKAGE_GOBJECT_INTROSPECTION + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PYTHON_GOBJECT + help + GStreamer python overrides for the gobject-introspection-based + pygst bindings. + + https://gstreamer.freedesktop.org/modules/gst-python.html + +comment "gst1-python needs python3" + depends on !BR2_PACKAGE_PYTHON3 + +comment "gst1-python needs a glibc toolchain, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.hash b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash new file mode 100644 index 000000000..1d3c687dd --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash @@ -0,0 +1,3 @@ +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz.sha256sum +sha256 208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8 gst-python-1.16.2.tar.xz +sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.mk b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk new file mode 100644 index 000000000..122c3dd99 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# gst1-python +# +################################################################################ + +GST1_PYTHON_VERSION = 1.16.2 +GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz +GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python +GST1_PYTHON_INSTALL_STAGING = YES +GST1_PYTHON_LICENSE_FILES = COPYING +GST1_PYTHON_LICENSE = LGPL-2.1+ + +GST1_PYTHON_DEPENDENCIES = \ + gstreamer1 \ + python-gobject + +# A sysconfigdata_name must be manually specified or the resulting .so +# will have a x86_64 prefix, which causes "from gi.repository import Gst" +# to fail. A pythonpath must be specified or the host python path will be +# used resulting in a "not a valid python" error. +GST1_PYTHON_CONF_ENV += \ + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) + +# Due to the CONF_ENV options, libpython-dir must be set manually +# or else the error: "Python dynamic library path could not be determined" +# occurs. We set the libpython-dir to /usr/lib as this path is hard-coded +# into the resulting .so file as /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so. +# Because we provide PYTHONPATH=$(PYTHON3_PATH) above, the logic in the meson +# file uses the above python path to determine if /usr/lib/ has the proper .so +# file. Because Buildroot provides the appropriate paths, the meson file finds +# the correct .so file, and the resulting compiled library has the appropriate +# path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so +GST1_PYTHON_CONF_OPTS += \ + -Dlibpython-dir=/usr/lib/ + +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/Config.in b/buildroot/package/gstreamer1/gst1-rtsp-server/Config.in index 5869952f5..f0294795a 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/Config.in +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_GST1_RTSP_SERVER help RTSP server library based on GStreamer. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index f3dca615c..135dc60e3 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.16.2.tar.xz.sha256sum -sha256 de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e gst-rtsp-server-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.1.tar.xz.sha256sum +sha256 10a82865c3d199e66731017ca4b120bad071df9889e60cfe4dd6c49d953ef754 gst-rtsp-server-1.18.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index df873ad73..944a71134 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.16.2 +GST1_RTSP_SERVER_VERSION = 1.18.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ @@ -20,16 +20,23 @@ GST1_RTSP_SERVER_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_RTSP_SERVER_CONF_OPTS = \ -Dexamples=disabled \ - -Dtests=disabled + -Dtests=disabled \ + -Ddoc=disabled GST1_RTSP_SERVER_CONF_OPTS += \ -Dexamples=disabled \ -Dtests=disabled \ - -Dintrospection=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_RTSP_SERVER_CONF_OPTS += -Dintrospection=enabled +GST1_RTSP_SERVER_DEPENDENCIES += gobject-introspection +else +GST1_RTSP_SERVER_CONF_OPTS += -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_LIBCGROUP),y) GST1_RTSP_SERVER_DEPENDENCIES += libcgroup endif diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash index 6bf4739ab..6f8365cb1 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 3c1f865533750f9fe511336e673e89bc93ac05e896bd3f4fc68d3cc0c142a861 gst1-shark-v0.6.1.tar.gz +sha256 aec7f0bbb81775922da2c94a4f84b64b5efd38a616f0d07eb4c3ddb5770b728d gst1-shark-v0.7.1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk index 6dc702b48..146d1f845 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.6.1 +GST1_SHARK_VERSION = v0.7.1 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index f9bec2483..8c7dee6c3 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.16.2.tar.xz.sha256sum -sha256 191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601 gstreamer-vaapi-1.16.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.1.tar.xz.sha256sum +sha256 400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea gstreamer-vaapi-1.18.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 00a6ec5e0..800cfe439 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.16.2 +GST1_VAAPI_VERSION = 1.18.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ @@ -18,16 +18,19 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - --disable-x11 \ - --disable-glx \ - --disable-wayland \ - --disable-egl \ - --disable-gtk-doc-html + -Dwith_drm=yes \ + -Dwith_x11=no \ + -Dwith_glx=no \ + -Dwith_wayland=no \ + -Dwith_egl=no \ + -Dexamples=disabled \ + -Dtest=disabled \ + -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += --enable-encoders +GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes else -GST1_VAAPI_CONF_OPTS += --disable-encoders +GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash deleted file mode 100644 index 9a0fbf66a..000000000 --- a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.16.2.tar.xz.sha256sum -sha256 4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca gst-validate-1.16.2.tar.xz -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk deleted file mode 100644 index 38b50b673..000000000 --- a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# gst1-validate -# -################################################################################ - -GST1_VALIDATE_VERSION = 1.16.2 -GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz -GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate -GST1_VALIDATE_LICENSE = LGPL-2.1+ -GST1_VALIDATE_LICENSE_FILES = COPYING - -GST1_VALIDATE_DEPENDENCIES = \ - gstreamer1 \ - gst1-plugins-base \ - json-glib \ - $(if $(BR2_PACKAGE_CAIRO),cairo) - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -GST1_VALIDATE_DEPENDENCIES += host-python3 python3 -else -GST1_VALIDATE_DEPENDENCIES += host-python python -endif - -GST1_VALIDATE_CONF_OPTS = \ - --disable-introspection \ - --disable-sphinx-doc - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch b/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch new file mode 100644 index 000000000..8b60299ce --- /dev/null +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch @@ -0,0 +1,74 @@ +From 248290c5c49b25b72b40017857c6118c51ef614e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 18 Oct 2020 16:08:36 +0200 +Subject: [PATCH] utils.c: fix static build + +Static build fails since version 1.17.1 and +https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/commit/1e488d4311420b5ca193155ad8ab05509c9a4a37 +on: + +FAILED: tools/ges-launch-1.0 +/srv/storage/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -o tools/ges-launch-1.0 tools/ges-launch-1.0.p/ges-validate.c.o tools/ges-launch-1.0.p/ges-launch.c.o tools/ges-launch-1.0.p/ges-launcher.c.o tools/ges-launch-1.0.p/utils.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,-Bsymbolic-functions -static -Wl,--start-group ges/libges-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstreamer-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgobject-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libglib-2.0.a -pthread /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcre.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libffi.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgmodule-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstbase-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstvideo-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstpbutils-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstaudio-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgsttag-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstcontroller-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgio-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libblkid.a -lm -Wl,--end-group +/srv/storage/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(err.os): in function `warn': +err.c:(.text+0x1d8): multiple definition of `warn'; tools/ges-launch-1.0.p/utils.c.o:utils.c:(.text+0x9bc): first defined here + +So rename warn function to gst_warn + +Fixes: + - http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/216] +--- + tools/ges-launcher.c | 2 +- + tools/utils.c | 2 +- + tools/utils.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c +index ad2921cc..9eb1f615 100644 +--- a/tools/ges-launcher.c ++++ b/tools/ges-launcher.c +@@ -261,7 +261,7 @@ _set_rendering_details (GESLauncher * self) + } + + if (!prof) { +- warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); ++ gst_warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); + g_free (opts->format); + + opts->format = +diff --git a/tools/utils.c b/tools/utils.c +index 7ad64522..fe79f0a1 100644 +--- a/tools/utils.c ++++ b/tools/utils.c +@@ -222,7 +222,7 @@ ok (const gchar * format, ...) + } + + void +-warn (const gchar * format, ...) ++gst_warn (const gchar * format, ...) + { + va_list var_args; + +diff --git a/tools/utils.h b/tools/utils.h +index ac18ab5a..e2f0ac67 100644 +--- a/tools/utils.h ++++ b/tools/utils.h +@@ -29,9 +29,9 @@ void print_enum (GType enum_type); + + void print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args); + void ok (const gchar * format, ...); +-void warn (const gchar * format, ...); ++void gst_warn (const gchar * format, ...); + void printerr (const gchar * format, ...); + + gchar * get_file_extension (gchar * uri); + void describe_encoding_profile (GstEncodingProfile *profile); +-void print_timeline(GESTimeline *timeline); +\ No newline at end of file ++void print_timeline(GESTimeline *timeline); +-- +2.28.0 + diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in b/buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in index fe4687049..9c41e8142 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -15,4 +15,4 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES GStreamer Editing Services is a high-level library for facilitating the creation of audio/video non-linear editors. - http://gstreamer.freedesktop.org + https://gstreamer.freedesktop.org diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 8724f3949..4b97105f3 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,6 +1,6 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.16.2.tar.xz.sha256sum -sha256 0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16 gstreamer-editing-services-1.16.2.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.1.tar.xz.sha256sum +sha256 e93cb3f1896565c57defa72758e49b6eb6685e0f804abd184f395c94822a3927 gst-editing-services-1.18.1.tar.xz # Hashes for license files: -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index e2bb747d0..a802e824d 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,9 +4,9 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.16.2 -GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz -GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.1 +GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz +GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ GSTREAMER1_EDITING_SERVICES_LICENSE_FILES = COPYING COPYING.LIB GSTREAMER1_EDITING_SERVICES_INSTALL_STAGING = YES @@ -15,25 +15,23 @@ GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ gst1-plugins-good \ - $(if $(BR2_PACKAGE_GST1_VALIDATE),gst1-validate) \ libxml2 -GSTREAMER1_EDITING_SERVICES_CONF_OPTS = --disable-benchmarks +GSTREAMER1_EDITING_SERVICES_CONF_OPTS = \ + -Ddoc=disabled \ + -Dexamples=disabled \ + -Dintrospection=disabled \ + -Dtests=disabled \ + -Dtools=enabled \ + -Dbash-completion=disabled \ + -Dxptv=disabled \ + -Dpython=disabled -# examples need GTK2/3 with X11 backend -ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3_X11),) -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --enable-examples - -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=2.0 -GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk2 +ifeq ($(BR2_PACKAGE_GST1_DEVTOOLS),y) +GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += gst1-devtools +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += -Dvalidate=enabled else -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=3.0 -GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk3 +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += -Dvalidate=disabled endif -else -GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --disable-examples -endif - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gstreamer1/Config.in b/buildroot/package/gstreamer1/gstreamer1/Config.in index 0626bcc96..5609d8699 100644 --- a/buildroot/package/gstreamer1/gstreamer1/Config.in +++ b/buildroot/package/gstreamer1/gstreamer1/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_GSTREAMER1 GStreamer is an open source multimedia framework. This 1.x version of Gstreamer is incompatible with Gstreamer 0.10.x. - http://gstreamer.freedesktop.org/ + https://gstreamer.freedesktop.org/ if BR2_PACKAGE_GSTREAMER1 diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash index dd379e602..d970e9c64 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.16.2.tar.xz.sha256sum -sha256 e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e gstreamer-1.16.2.tar.xz -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.1.tar.xz.sha256sum +sha256 79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba gstreamer-1.18.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk index 4eb3158b8..963a7006d 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.16.2 +GSTREAMER1_VERSION = 1.18.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES @@ -15,17 +15,19 @@ GSTREAMER1_CONF_OPTS = \ -Dexamples=disabled \ -Dtests=disabled \ -Dbenchmarks=disabled \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) \ -Dgtk_doc=disabled \ - -Dintrospection=disabled \ + -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ - -Dgobject-cast-checks=disabled \ + -Dextra-checks=disabled \ -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dgst_parse=true \ -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ - -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) + -Ddoc=disabled GSTREAMER1_DEPENDENCIES = \ host-bison \ @@ -36,6 +38,13 @@ GSTREAMER1_DEPENDENCIES = \ $(if $(BR2_PACKAGE_VALGRIND),valgrind) \ $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GSTREAMER1_CONF_OPTS += -Dintrospection=enabled +GSTREAMER1_DEPENDENCIES += gobject-introspection +else +GSTREAMER1_CONF_OPTS += -Dintrospection=disabled +endif + GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) diff --git a/buildroot/package/guile/0003-workaround-ice-ssa-corruption.patch b/buildroot/package/guile/0003-workaround-ice-ssa-corruption.patch deleted file mode 100644 index 54f3158a9..000000000 --- a/buildroot/package/guile/0003-workaround-ice-ssa-corruption.patch +++ /dev/null @@ -1,64 +0,0 @@ -libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O - -While compiling with option -g -O, there was a ssa corruption: -.. -Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE. -sp_48(ab) and sp_3476(ab) -guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine': -guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption - #define VM_NAME vm_debug_engine - ^ -guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME' - VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) - ^ -Please submit a full bug report, -with preprocessed source if appropriate. -See for instructions. -... - -Tweak libguile/vm-i-system.c to add boundary value check to workaround it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia - -Fixes Buildroot autobuilder failures on AArch64. - -Signed-off-by: Thomas Petazzoni ---- - libguile/vm-i-system.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c ---- a/libguile/vm-i-system.c -+++ b/libguile/vm-i-system.c -@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6, - /* now shuffle up, from walk to ntotal */ - { - scm_t_ptrdiff nshuf = sp - walk + 1, i; -- sp = (fp - 1) + ntotal + nshuf; -- CHECK_OVERFLOW (); -- for (i = 0; i < nshuf; i++) -- sp[-i] = walk[nshuf-i-1]; -+ /* check the value of nshuf to workaround ice ssa corruption */ -+ /* while compiling with -O -g */ -+ if (nshuf > 0) -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } -+ else -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } - } - /* and fill optionals & keyword args with SCM_UNDEFINED */ - while (walk <= (fp - 1) + ntotal) --- -1.9.1 - diff --git a/buildroot/package/guile/guile.hash b/buildroot/package/guile/guile.hash index 47ac00975..a163f59fc 100644 --- a/buildroot/package/guile/guile.hash +++ b/buildroot/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz +sha256 6b7947dc2e3d115983846a268b8f5753c12fd5547e42fbf2b97d75a3b79f0d31 guile-3.0.4.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/guile/guile.mk b/buildroot/package/guile/guile.mk index 499286107..5750b85f4 100644 --- a/buildroot/package/guile/guile.mk +++ b/buildroot/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 2.0.14 +GUILE_VERSION = 3.0.4 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES diff --git a/buildroot/package/gupnp-av/gupnp-av.mk b/buildroot/package/gupnp-av/gupnp-av.mk index c670ab6d4..55436d0e5 100644 --- a/buildroot/package/gupnp-av/gupnp-av.mk +++ b/buildroot/package/gupnp-av/gupnp-av.mk @@ -13,4 +13,11 @@ GUPNP_AV_LICENSE_FILES = COPYING GUPNP_AV_INSTALL_STAGING = YES GUPNP_AV_DEPENDENCIES = host-pkgconf libglib2 libxml2 gupnp +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GUPNP_AV_CONF_OPTS += --enable-introspection +GUPNP_AV_DEPENDENCIES += gobject-introspection +else +GUPNP_AV_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/gupnp-dlna/gupnp-dlna.mk b/buildroot/package/gupnp-dlna/gupnp-dlna.mk index 6f9ff8a58..85d30b7cd 100644 --- a/buildroot/package/gupnp-dlna/gupnp-dlna.mk +++ b/buildroot/package/gupnp-dlna/gupnp-dlna.mk @@ -15,7 +15,9 @@ GUPNP_DLNA_LICENSE_FILES = COPYING GUPNP_DLNA_INSTALL_STAGING = YES GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2 -GUPNP_DLNA_CONF_OPTS = --disable-legacy-gstreamer-metadata-backend +GUPNP_DLNA_CONF_OPTS = \ + --disable-introspection \ + --disable-legacy-gstreamer-metadata-backend ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend diff --git a/buildroot/package/gupnp-tools/gupnp-tools.hash b/buildroot/package/gupnp-tools/gupnp-tools.hash index b7015e13a..30f1b8293 100644 --- a/buildroot/package/gupnp-tools/gupnp-tools.hash +++ b/buildroot/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.15.sha256sum: -sha256 336ef4a09b9fc83444a1594c8215e2bed55fbea5b6d1bf6b54c63104b4c497ab gupnp-tools-0.8.15.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.0.sha256sum: +sha256 41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d gupnp-tools-0.10.0.tar.xz # Locally computed: -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/gupnp-tools/gupnp-tools.mk b/buildroot/package/gupnp-tools/gupnp-tools.mk index 6852697b8..182b0145c 100644 --- a/buildroot/package/gupnp-tools/gupnp-tools.mk +++ b/buildroot/package/gupnp-tools/gupnp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_TOOLS_VERSION_MAJOR = 0.8 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).15 +GUPNP_TOOLS_VERSION_MAJOR = 0.10 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).0 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) diff --git a/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch b/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch new file mode 100644 index 000000000..05b07b49c --- /dev/null +++ b/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch @@ -0,0 +1,60 @@ +From 9225b076d107538209fbd5b8bbc21a68d1b2c016 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 Jul 2020 22:42:44 +0200 +Subject: [PATCH] Revert "build: Always build gupnp-binding-tool manpage" + +This reverts commit 23f54c2a1e8718e836224d68dafded091604a677 until +upstream decides what to do between adding a new option or renaming +gtk_doc into documentation: +https://gitlab.gnome.org/GNOME/gupnp/-/issues/17 + +Signed-off-by: Fabrice Fontaine +--- + doc/meson.build | 2 -- + meson.build | 5 ++++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index b71b657..478650b 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -4,7 +4,6 @@ version_xml = configure_file(input: 'version.xml.in', + output: 'version.xml', configuration: + entities) + +-if get_option('gtk_doc') + gnome.gtkdoc('gupnp', + main_xml : 'gupnp-docs.xml', + src_dir : [join_paths(meson.source_root(), 'libgupnp'), +@@ -27,7 +26,6 @@ gnome.gtkdoc('gupnp', + 'gupnp-types-private.h' + ], + install : true) +-endif + + xsltproc = find_program('xsltproc', required: false) + if xsltproc.found() +diff --git a/meson.build b/meson.build +index 28c40b2..dea0a49 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,12 +31,15 @@ dependencies = [ + subdir('libgupnp') + subdir('tests') + subdir('tools') +-subdir('doc') + + if get_option('vapi') and get_option('introspection') + subdir('vala') + endif + ++if get_option('gtk_doc') ++ subdir('doc') ++endif ++ + if get_option('examples') + subdir('examples') + endif +-- +2.27.0 + diff --git a/buildroot/package/gupnp/gupnp.hash b/buildroot/package/gupnp/gupnp.hash index 6997c8de5..60339ec9c 100644 --- a/buildroot/package/gupnp/gupnp.hash +++ b/buildroot/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.5.sha256sum: -sha256 e9359fa8ed70c3c2b2b987869262ebb5c5ed1365726b7a9e8e59b3471e5c37f5 gupnp-1.0.5.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.4.sha256sum: +sha256 f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1 gupnp-1.2.4.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gupnp/gupnp.mk b/buildroot/package/gupnp/gupnp.mk index e47506ed8..e90787eb8 100644 --- a/buildroot/package/gupnp/gupnp.mk +++ b/buildroot/package/gupnp/gupnp.mk @@ -4,13 +4,21 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 1.0 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).5 +GUPNP_VERSION_MAJOR = 1.2 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.0+ GUPNP_LICENSE_FILES = COPYING GUPNP_INSTALL_STAGING = YES GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux +GUPNP_CONF_OPTS = -Dexamples=false -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true +GUPNP_DEPENDENCIES += host-vala gobject-introspection +else +GUPNP_CONF_OPTS += -Dintrospection=false -Dvapi=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch b/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch deleted file mode 100644 index b5a6d024c..000000000 --- a/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d8d0c8c40049cfd824b2b90d0cd47914052b9811 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Wed, 2 Jan 2019 17:13:27 +0100 -Subject: [PATCH] admin: Prevent access if any authentication agent isn't - available - -The backend currently allows to access and modify files without prompting -for password if any polkit authentication agent isn't available. This seems -isn't usually problem, because polkit agents are integral parts of -graphical environments / linux distributions. The agents can't be simply -disabled without root permissions and are automatically respawned. However, -this might be a problem in some non-standard cases. - -This affects only users which belong to wheel group (i.e. those who are -already allowed to use sudo). It doesn't allow privilege escalation for -users, who don't belong to that group. - -Let's return permission denied error also when the subject can't be -authorized by any polkit agent to prevent this behavior. - -Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/355 - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gvfs/commit/d8d0c8c40049cfd824b2b90d0cd47914052b9811] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsbackendadmin.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c -index ec0f2392..0f849008 100644 ---- a/daemon/gvfsbackendadmin.c -+++ b/daemon/gvfsbackendadmin.c -@@ -130,8 +130,7 @@ check_permission (GVfsBackendAdmin *self, - return FALSE; - } - -- is_authorized = polkit_authorization_result_get_is_authorized (result) || -- polkit_authorization_result_get_is_challenge (result); -+ is_authorized = polkit_authorization_result_get_is_authorized (result); - - g_object_unref (result); - --- -2.24.1 - diff --git a/buildroot/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/buildroot/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch new file mode 100644 index 000000000..3ee4a28e9 --- /dev/null +++ b/buildroot/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch @@ -0,0 +1,78 @@ +From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jul 2020 10:00:50 +0200 +Subject: [PATCH] meson.build: fix linking with libmetadata + +libmetadata is built as a static library and depends on libgvfscommon so +change the dependencies order to put libgvfscommon_dep after +libmetadata_dep or gvfsd-metadata will fail to link on: + +FAILED: metadata/gvfsd-metadata +/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata@exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata +metadata/libmetadata.a(metatree.c.o): In function `safe_open': +metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' +collect2: error: ld returned 1 exit status + +Apply this change in the whole source code and not only for +gvfsd-metadata to avoid any other build failures. + +Fixes: + - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] +--- + client/meson.build | 2 +- + metadata/meson.build | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/client/meson.build b/client/meson.build +index 8f57d0d3..1d251481 100644 +--- a/client/meson.build ++++ b/client/meson.build +@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( + + deps = [ + gio_unix_dep, +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ] + + cflags = [ +diff --git a/metadata/meson.build b/metadata/meson.build +index 4e120d18..5699e6f2 100644 +--- a/metadata/meson.build ++++ b/metadata/meson.build +@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( + ) + + deps = [ +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ] + + if enable_gudev +@@ -105,8 +105,8 @@ if enable_devel_utils + app + '.c', + include_directories: top_inc, + dependencies: [ +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ], + c_args: cflags, + ) +@@ -119,6 +119,7 @@ if enable_devel_utils + include_directories: top_inc, + dependencies: [ + libmetadata_dep, ++ libgvfscommon_dep, + libxml_dep, + ], + c_args: cflags, +-- +2.27.0 + diff --git a/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch b/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch deleted file mode 100644 index 42174153d..000000000 --- a/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 5cd76d627f4d1982b6e77a0e271ef9301732d09e Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Thu, 23 May 2019 10:24:36 +0200 -Subject: [PATCH] admin: Add query_info_on_read/write functionality - -Admin backend doesn't implement query_info_on_read/write which might -potentially lead to some race conditions which aren't really wanted -especially in case of admin backend. Let's add this missing functionality. - -[Retrieved fom: -https://gitlab.gnome.org/GNOME/gvfs/commit/5cd76d627f4d1982b6e77a0e271ef9301732d09e] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsbackendadmin.c | 79 +++++++++++++++++++++++++++++++++------ - 1 file changed, 67 insertions(+), 12 deletions(-) - -diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c -index 65a979e7..23d16f16 100644 ---- a/daemon/gvfsbackendadmin.c -+++ b/daemon/gvfsbackendadmin.c -@@ -42,6 +42,8 @@ - #include "gvfsjobopenforwrite.h" - #include "gvfsjobqueryattributes.h" - #include "gvfsjobqueryinfo.h" -+#include "gvfsjobqueryinforead.h" -+#include "gvfsjobqueryinfowrite.h" - #include "gvfsjobread.h" - #include "gvfsjobseekread.h" - #include "gvfsjobseekwrite.h" -@@ -155,6 +157,19 @@ complete_job (GVfsJob *job, - g_vfs_job_succeeded (job); - } - -+static void -+fix_file_info (GFileInfo *info) -+{ -+ /* Override read/write flags, since the above call will use access() -+ * to determine permissions, which does not honor our privileged -+ * capabilities. -+ */ -+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); -+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); -+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); -+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); -+} -+ - static void - do_query_info (GVfsBackend *backend, - GVfsJobQueryInfo *query_info_job, -@@ -180,19 +195,57 @@ do_query_info (GVfsBackend *backend, - if (error != NULL) - goto out; - -- /* Override read/write flags, since the above call will use access() -- * to determine permissions, which does not honor our privileged -- * capabilities. -- */ -- g_file_info_set_attribute_boolean (real_info, -- G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); -- g_file_info_set_attribute_boolean (real_info, -- G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); -- g_file_info_set_attribute_boolean (real_info, -- G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); -- g_file_info_set_attribute_boolean (real_info, -- G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); -+ fix_file_info (real_info); -+ g_file_info_copy_into (real_info, info); -+ g_object_unref (real_info); -+ -+ out: -+ complete_job (job, error); -+} -+ -+static void -+do_query_info_on_read (GVfsBackend *backend, -+ GVfsJobQueryInfoRead *query_info_job, -+ GVfsBackendHandle handle, -+ GFileInfo *info, -+ GFileAttributeMatcher *matcher) -+{ -+ GVfsJob *job = G_VFS_JOB (query_info_job); -+ GFileInputStream *stream = handle; -+ GError *error = NULL; -+ GFileInfo *real_info; -+ -+ real_info = g_file_input_stream_query_info (stream, query_info_job->attributes, -+ job->cancellable, &error); -+ if (error != NULL) -+ goto out; -+ -+ fix_file_info (real_info); -+ g_file_info_copy_into (real_info, info); -+ g_object_unref (real_info); -+ -+ out: -+ complete_job (job, error); -+} -+ -+static void -+do_query_info_on_write (GVfsBackend *backend, -+ GVfsJobQueryInfoWrite *query_info_job, -+ GVfsBackendHandle handle, -+ GFileInfo *info, -+ GFileAttributeMatcher *matcher) -+{ -+ GVfsJob *job = G_VFS_JOB (query_info_job); -+ GFileOutputStream *stream = handle; -+ GError *error = NULL; -+ GFileInfo *real_info; -+ -+ real_info = g_file_output_stream_query_info (stream, query_info_job->attributes, -+ job->cancellable, &error); -+ if (error != NULL) -+ goto out; - -+ fix_file_info (real_info); - g_file_info_copy_into (real_info, info); - g_object_unref (real_info); - -@@ -868,6 +921,8 @@ g_vfs_backend_admin_class_init (GVfsBackendAdminClass * klass) - backend_class->mount = do_mount; - backend_class->open_for_read = do_open_for_read; - backend_class->query_info = do_query_info; -+ backend_class->query_info_on_read = do_query_info_on_read; -+ backend_class->query_info_on_write = do_query_info_on_write; - backend_class->read = do_read; - backend_class->create = do_create; - backend_class->append_to = do_append_to; --- -2.24.1 - diff --git a/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch b/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch deleted file mode 100644 index 04138b395..000000000 --- a/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch +++ /dev/null @@ -1,34 +0,0 @@ -From daf1163aba229afcfddf0f925aef7e97047e8959 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Thu, 23 May 2019 10:29:08 +0200 -Subject: [PATCH] admin: Allow changing file owner - -CAP_CHOWN is dropped together with other privilages and thus the backend -can't change file owner. This might be probably e.g. in case of copy -operation when G_FILE_COPY_ALL_METADATA is used. Let's keep CAP_CHOWN -to fix this. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gvfs/commit/daf1163aba229afcfddf0f925aef7e97047e8959] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsbackendadmin.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c -index 23d16f16..a74d09cf 100644 ---- a/daemon/gvfsbackendadmin.c -+++ b/daemon/gvfsbackendadmin.c -@@ -968,7 +968,8 @@ g_vfs_backend_admin_init (GVfsBackendAdmin *self) - - #define REQUIRED_CAPS (CAP_TO_MASK(CAP_FOWNER) | \ - CAP_TO_MASK(CAP_DAC_OVERRIDE) | \ -- CAP_TO_MASK(CAP_DAC_READ_SEARCH)) -+ CAP_TO_MASK(CAP_DAC_READ_SEARCH) | \ -+ CAP_TO_MASK(CAP_CHOWN)) - - static void - acquire_caps (uid_t uid) --- -2.24.1 - diff --git a/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch b/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch deleted file mode 100644 index 22fe57002..000000000 --- a/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 3895e09d784ebec0fbc4614d5c37068736120e1d Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Thu, 23 May 2019 10:33:30 +0200 -Subject: [PATCH] admin: Use fsuid to ensure correct file ownership - -Files created over admin backend should be owned by root, but they are -owned by the user itself. This is because the daemon drops the uid to -make dbus connection work. Use fsuid and euid to fix this issue. - -Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/21 - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gvfs/commit/3895e09d784ebec0fbc4614d5c37068736120e1d] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsbackendadmin.c | 29 +++++++---------------------- - 1 file changed, 7 insertions(+), 22 deletions(-) - -diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c -index a74d09cf..32b51b1a 100644 ---- a/daemon/gvfsbackendadmin.c -+++ b/daemon/gvfsbackendadmin.c -@@ -157,19 +157,6 @@ complete_job (GVfsJob *job, - g_vfs_job_succeeded (job); - } - --static void --fix_file_info (GFileInfo *info) --{ -- /* Override read/write flags, since the above call will use access() -- * to determine permissions, which does not honor our privileged -- * capabilities. -- */ -- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); -- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); -- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); -- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); --} -- - static void - do_query_info (GVfsBackend *backend, - GVfsJobQueryInfo *query_info_job, -@@ -195,7 +182,6 @@ do_query_info (GVfsBackend *backend, - if (error != NULL) - goto out; - -- fix_file_info (real_info); - g_file_info_copy_into (real_info, info); - g_object_unref (real_info); - -@@ -220,7 +206,6 @@ do_query_info_on_read (GVfsBackend *backend, - if (error != NULL) - goto out; - -- fix_file_info (real_info); - g_file_info_copy_into (real_info, info); - g_object_unref (real_info); - -@@ -245,7 +230,6 @@ do_query_info_on_write (GVfsBackend *backend, - if (error != NULL) - goto out; - -- fix_file_info (real_info); - g_file_info_copy_into (real_info, info); - g_object_unref (real_info); - -@@ -977,14 +961,15 @@ acquire_caps (uid_t uid) - struct __user_cap_header_struct hdr; - struct __user_cap_data_struct data; - -- /* Tell kernel not clear capabilities when dropping root */ -- if (prctl (PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) -- g_error ("prctl(PR_SET_KEEPCAPS) failed"); -- -- /* Drop root uid, but retain the required permitted caps */ -- if (setuid (uid) < 0) -+ /* Set euid to user to make dbus work */ -+ if (seteuid (uid) < 0) - g_error ("unable to drop privs"); - -+ /* Set fsuid to still behave like root when working with files */ -+ setfsuid (0); -+ if (setfsuid (-1) != 0) -+ g_error ("setfsuid failed"); -+ - memset (&hdr, 0, sizeof(hdr)); - hdr.version = _LINUX_CAPABILITY_VERSION; - --- -2.24.1 - diff --git a/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch b/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch deleted file mode 100644 index 29f7573a6..000000000 --- a/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d5dfd823c94045488aef8727c553f1e0f7666b90 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Fri, 24 May 2019 09:43:43 +0200 -Subject: [PATCH] admin: Ensure correct ownership when moving to file:// uri - -User and group is not restored properly when moving (or copying with -G_FILE_COPY_ALL_METADATA) from admin:// to file://, because it is handled -by GIO fallback code, which doesn't run with root permissions. Let's -handle this case with pull method to ensure correct ownership. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gvfs/commit/d5dfd823c94045488aef8727c553f1e0f7666b90] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsbackendadmin.c | 46 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 46 insertions(+) - -diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c -index 32b51b1a..9a7e8295 100644 ---- a/daemon/gvfsbackendadmin.c -+++ b/daemon/gvfsbackendadmin.c -@@ -807,6 +807,51 @@ do_move (GVfsBackend *backend, - complete_job (job, error); - } - -+static void -+do_pull (GVfsBackend *backend, -+ GVfsJobPull *pull_job, -+ const char *source, -+ const char *local_path, -+ GFileCopyFlags flags, -+ gboolean remove_source, -+ GFileProgressCallback progress_callback, -+ gpointer progress_callback_data) -+{ -+ GVfsBackendAdmin *self = G_VFS_BACKEND_ADMIN (backend); -+ GVfsJob *job = G_VFS_JOB (pull_job); -+ GError *error = NULL; -+ GFile *src_file, *dst_file; -+ -+ /* Pull method is necessary when user/group needs to be restored, return -+ * G_IO_ERROR_NOT_SUPPORTED in other cases to proceed with the fallback code. -+ */ -+ if (!(flags & G_FILE_COPY_ALL_METADATA)) -+ { -+ g_vfs_job_failed_literal (G_VFS_JOB (job), G_IO_ERROR, -+ G_IO_ERROR_NOT_SUPPORTED, -+ _("Operation not supported")); -+ return; -+ } -+ -+ if (!check_permission (self, job)) -+ return; -+ -+ src_file = g_file_new_for_path (source); -+ dst_file = g_file_new_for_path (local_path); -+ -+ if (remove_source) -+ g_file_move (src_file, dst_file, flags, job->cancellable, -+ progress_callback, progress_callback_data, &error); -+ else -+ g_file_copy (src_file, dst_file, flags, job->cancellable, -+ progress_callback, progress_callback_data, &error); -+ -+ g_object_unref (src_file); -+ g_object_unref (dst_file); -+ -+ complete_job (job, error); -+} -+ - static void - do_query_settable_attributes (GVfsBackend *backend, - GVfsJobQueryAttributes *query_job, -@@ -927,6 +972,7 @@ g_vfs_backend_admin_class_init (GVfsBackendAdminClass * klass) - backend_class->set_attribute = do_set_attribute; - backend_class->delete = do_delete; - backend_class->move = do_move; -+ backend_class->pull = do_pull; - backend_class->query_settable_attributes = do_query_settable_attributes; - backend_class->query_writable_namespaces = do_query_writable_namespaces; - } --- -2.24.1 - diff --git a/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch b/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch deleted file mode 100644 index 56bef26b0..000000000 --- a/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 70dbfc68a79faac49bd3423e079cb6902522082a Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Wed, 5 Jun 2019 13:33:38 +0100 -Subject: [PATCH] gvfsdaemon: Check that the connecting client is the same user - -Otherwise, an attacker who learns the abstract socket address from -netstat(8) or similar could connect to it and issue D-Bus method -calls. - -Signed-off-by: Simon McVittie - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gvfs/commit/70dbfc68a79faac49bd3423e079cb6902522082a] -Signed-off-by: Fabrice Fontaine ---- - daemon/gvfsdaemon.c | 36 +++++++++++++++++++++++++++++++++++- - 1 file changed, 35 insertions(+), 1 deletion(-) - -diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c -index 406d4f8e..be148a7b 100644 ---- a/daemon/gvfsdaemon.c -+++ b/daemon/gvfsdaemon.c -@@ -79,6 +79,7 @@ struct _GVfsDaemon - - gint mount_counter; - -+ GDBusAuthObserver *auth_observer; - GDBusConnection *conn; - GVfsDBusDaemon *daemon_skeleton; - GVfsDBusMountable *mountable_skeleton; -@@ -171,6 +172,8 @@ g_vfs_daemon_finalize (GObject *object) - } - if (daemon->conn != NULL) - g_object_unref (daemon->conn); -+ if (daemon->auth_observer != NULL) -+ g_object_unref (daemon->auth_observer); - - g_hash_table_destroy (daemon->registered_paths); - g_hash_table_destroy (daemon->client_connections); -@@ -236,6 +239,35 @@ name_vanished_handler (GDBusConnection *connection, - daemon->lost_main_daemon = TRUE; - } - -+/* -+ * Authentication observer signal handler that authorizes connections -+ * from the same uid as this process. This matches the behaviour of a -+ * libdbus DBusServer/DBusConnection when no DBusAllowUnixUserFunction -+ * has been set, but is not the default in GDBus. -+ */ -+static gboolean -+authorize_authenticated_peer_cb (GDBusAuthObserver *observer, -+ G_GNUC_UNUSED GIOStream *stream, -+ GCredentials *credentials, -+ G_GNUC_UNUSED gpointer user_data) -+{ -+ gboolean authorized = FALSE; -+ -+ if (credentials != NULL) -+ { -+ GCredentials *own_credentials; -+ -+ own_credentials = g_credentials_new (); -+ -+ if (g_credentials_is_same_user (credentials, own_credentials, NULL)) -+ authorized = TRUE; -+ -+ g_object_unref (own_credentials); -+ } -+ -+ return authorized; -+} -+ - static void - g_vfs_daemon_init (GVfsDaemon *daemon) - { -@@ -265,6 +297,8 @@ g_vfs_daemon_init (GVfsDaemon *daemon) - - daemon->conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); - g_assert (daemon->conn != NULL); -+ daemon->auth_observer = g_dbus_auth_observer_new (); -+ g_signal_connect (daemon->auth_observer, "authorize-authenticated-peer", G_CALLBACK (authorize_authenticated_peer_cb), NULL); - - daemon->daemon_skeleton = gvfs_dbus_daemon_skeleton_new (); - g_signal_connect (daemon->daemon_skeleton, "handle-get-connection", G_CALLBACK (handle_get_connection), daemon); -@@ -876,7 +910,7 @@ handle_get_connection (GVfsDBusDaemon *object, - server = g_dbus_server_new_sync (address1, - G_DBUS_SERVER_FLAGS_NONE, - guid, -- NULL, /* GDBusAuthObserver */ -+ daemon->auth_observer, - NULL, /* GCancellable */ - &error); - g_free (guid); --- -2.24.1 - diff --git a/buildroot/package/gvfs/Config.in b/buildroot/package/gvfs/Config.in index 44a75210e..5a6b3e73e 100644 --- a/buildroot/package/gvfs/Config.in +++ b/buildroot/package/gvfs/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_GVFS depends on BR2_USE_WCHAR # glib2 depends on BR2_USE_MMU # dbus, glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_SHARED_MIME_INFO @@ -15,6 +17,7 @@ config BR2_PACKAGE_GVFS https://wiki.gnome.org/action/show/Projects/gvfs -comment "gvfs needs a toolchain w/ wchar, threads" +comment "gvfs needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_STATIC_LIBS diff --git a/buildroot/package/gvfs/gvfs.hash b/buildroot/package/gvfs/gvfs.hash index 6b7403ffa..2ee945e71 100644 --- a/buildroot/package/gvfs/gvfs.hash +++ b/buildroot/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.31/gvfs-1.31.4.sha256sum -sha256 55244d447d040884dfb335fde638274cb6f2794285ada7fa84bcbbd34f06be04 gvfs-1.31.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum +sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz # Hash for license file -sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING +sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/buildroot/package/gvfs/gvfs.mk b/buildroot/package/gvfs/gvfs.mk index b3b18a348..c5104e8db 100644 --- a/buildroot/package/gvfs/gvfs.mk +++ b/buildroot/package/gvfs/gvfs.mk @@ -4,60 +4,45 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.31 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).4 +GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES -GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info \ +GVFS_DEPENDENCIES = \ + host-pkgconf \ + host-libglib2 \ + dbus \ + gsettings-desktop-schemas \ + libglib2 \ + shared-mime-info \ $(TARGET_NLS_DEPENDENCIES) GVFS_LICENSE = LGPL-2.0+ GVFS_LICENSE_FILES = COPYING -GVFS_LIBS = $(TARGET_NLS_LIBS) -# 0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch -GVFS_IGNORE_CVES += CVE-2019-3827 - -# package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch -GVFS_IGNORE_CVES += CVE-2019-12448 - -# 0003-admin-Allow-changing-file-owner.patch -# 0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch -GVFS_IGNORE_CVES += CVE-2019-12447 - -# 0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch -GVFS_IGNORE_CVES += CVE-2019-12449 - -# 0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch -GVFS_IGNORE_CVES += CVE-2019-12795 - -# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent -# build system from searching the host paths. -GVFS_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - LIBS="$(GVFS_LIBS)" +GVFS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) # Most of these are missing library support GVFS_CONF_OPTS = \ - --disable-afc \ - --disable-gdu \ - --disable-goa \ - --disable-google \ - --disable-libmtp \ - --disable-udisks2 + -Dafc=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dmtp=false \ + -Dsftp=false \ + -Dudisks2=false ifeq ($(BR2_PACKAGE_AVAHI),y) GVFS_DEPENDENCIES += avahi -GVFS_CONF_OPTS += --enable-avahi +GVFS_CONF_OPTS += -Ddnssd=true else -GVFS_CONF_OPTS += --disable-avahi +GVFS_CONF_OPTS += -Ddnssd=false endif ifeq ($(BR2_PACKAGE_GCR),y) GVFS_DEPENDENCIES += gcr -GVFS_CONF_OPTS += --enable-gcr +GVFS_CONF_OPTS += -Dgcr=true else -GVFS_CONF_OPTS += --disable-gcr +GVFS_CONF_OPTS += -Dgcr=false endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) @@ -66,121 +51,110 @@ endif ifeq ($(BR2_PACKAGE_LIBGUDEV),y) GVFS_DEPENDENCIES += libgudev -GVFS_CONF_OPTS += --enable-gudev +GVFS_CONF_OPTS += -Dgudev=true else -GVFS_CONF_OPTS += --disable-gudev +GVFS_CONF_OPTS += -Dgudev=false endif ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) GVFS_DEPENDENCIES += libarchive -GVFS_CONF_OPTS += \ - --enable-archive \ - --with-archive-includes=$(STAGING_DIR)/usr \ - --with-archive-libs=$(STAGING_DIR)/usr -GVFS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libarchive` +GVFS_CONF_OPTS += -Darchive=true else -GVFS_CONF_OPTS += --disable-archive +GVFS_CONF_OPTS += -Darchive=false endif ifeq ($(BR2_PACKAGE_LIBBLURAY),y) GVFS_DEPENDENCIES += libbluray -GVFS_CONF_OPTS += --enable-bluray +GVFS_CONF_OPTS += -Dbluray=true else -GVFS_CONF_OPTS += --disable-bluray +GVFS_CONF_OPTS += -Dbluray=false endif ifeq ($(BR2_PACKAGE_LIBCAP)$(BR2_PACKAGE_POLKIT),yy) GVFS_DEPENDENCIES += libcap polkit -GVFS_CONF_OPTS += --enable-admin +GVFS_CONF_OPTS += -Dadmin=true else -GVFS_CONF_OPTS += --disable-admin +GVFS_CONF_OPTS += -Dadmin=false endif ifeq ($(BR2_PACKAGE_LIBCDIO_PARANOIA)$(BR2_PACKAGE_LIBGUDEV),yy) GVFS_DEPENDENCIES += libcdio-paranoia libgudev -GVFS_CONF_OPTS += --enable-cdda +GVFS_CONF_OPTS += -Dcdda=true else -GVFS_CONF_OPTS += --disable-cdda +GVFS_CONF_OPTS += -Dcdda=false endif -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -GVFS_DEPENDENCIES += libfuse -GVFS_CONF_OPTS += --enable-fuse +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +GVFS_DEPENDENCIES += libfuse3 +GVFS_CONF_OPTS += -Dfuse=true else -GVFS_CONF_OPTS += --disable-fuse +GVFS_CONF_OPTS += -Dfuse=false endif # AFP support is anon-only without libgcrypt which isn't very useful ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -GVFS_CONF_OPTS += --enable-afp +GVFS_CONF_OPTS += \ + -Dafp=true \ + -Dgcrypt=true GVFS_DEPENDENCIES += libgcrypt else -GVFS_CONF_OPTS += --disable-afp +GVFS_CONF_OPTS += \ + -Dafp=false \ + -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_LIBGPHOTO2)$(BR2_PACKAGE_LIBGUDEV),yy) GVFS_DEPENDENCIES += libgphoto2 libgudev -GVFS_CONF_OPTS += --enable-gphoto2 +GVFS_CONF_OPTS += -Dgphoto2=true else -GVFS_CONF_OPTS += --disable-gphoto2 -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -GVFS_CONF_OPTS += --enable-gtk -GVFS_DEPENDENCIES += libgtk3 -else -GVFS_CONF_OPTS += --disable-gtk +GVFS_CONF_OPTS += -Dgphoto2=false endif ifeq ($(BR2_PACKAGE_LIBNFS),y) -GVFS_CONF_OPTS += --enable-nfs +GVFS_CONF_OPTS += -Dnfs=true GVFS_DEPENDENCIES += libnfs else -GVFS_CONF_OPTS += --disable-nfs +GVFS_CONF_OPTS += -Dnfs=false endif ifeq ($(BR2_PACKAGE_LIBSECRET),y) GVFS_DEPENDENCIES += libsecret -GVFS_CONF_OPTS += --enable-keyring +GVFS_CONF_OPTS += -Dkeyring=true else -GVFS_CONF_OPTS += --disable-keyring +GVFS_CONF_OPTS += -Dkeyring=false endif ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy) GVFS_DEPENDENCIES += libsoup libxml2 -GVFS_CONF_OPTS += --enable-http +GVFS_CONF_OPTS += -Dhttp=true else -GVFS_CONF_OPTS += --disable-http +GVFS_CONF_OPTS += -Dhttp=false endif ifeq ($(BR2_PACKAGE_LIBUSB),y) GVFS_DEPENDENCIES += libusb -GVFS_CONF_OPTS += --enable-libusb +GVFS_CONF_OPTS += -Dlibusb=true else -GVFS_CONF_OPTS += --disable-libusb +GVFS_CONF_OPTS += -Dlibusb=false endif ifeq ($(BR2_PACKAGE_SAMBA4),y) GVFS_DEPENDENCIES += samba4 -GVFS_CONF_OPTS += \ - --enable-samba \ - --with-samba-includes=$(STAGING_DIR)/usr/include/samba-4.0 \ - --with-samba-libs=$(STAGING_DIR)/usr/lib \ - ac_cv_lib_smbclient_smbc_option_get=yes +GVFS_CONF_OPTS += -Dsmb=true else -GVFS_CONF_OPTS += --disable-samba +GVFS_CONF_OPTS += -Dsmb=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) GVFS_DEPENDENCIES += systemd +GVFS_CONF_OPTS += -Dlogind=true else -GVFS_CONF_OPTS += --disable-libsystemd-login +GVFS_CONF_OPTS += \ + -Dlogind=false \ + -Dsystemduserunitdir=no \ + -Dtmpfilesdir=no endif -define GVFS_REMOVE_USELESS_BINARY - rm $(TARGET_DIR)/usr/bin/gvfs-less -endef - define GVFS_REMOVE_TARGET_SCHEMAS rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml endef @@ -190,8 +164,7 @@ define GVFS_COMPILE_SCHEMAS endef GVFS_POST_INSTALL_TARGET_HOOKS += \ - GVFS_REMOVE_USELESS_BINARY \ GVFS_REMOVE_TARGET_SCHEMAS \ GVFS_COMPILE_SCHEMAS -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index b89bda834..a127af919 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.1/src/haproxy-2.1.4.tar.gz.sha256 -sha256 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd haproxy-2.1.4.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.4.tar.gz.sha256 +sha256 87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2 haproxy-2.2.4.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index e59896b48..70ff997fb 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 2.1 +HAPROXY_VERSION_MAJOR = 2.2 HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions @@ -15,6 +15,10 @@ HAPROXY_MAKE_OPTS = \ PREFIX=/usr \ TARGET=custom +ifeq ($(BR2_STATIC_LIBS),) +HAPROXY_MAKE_OPTS += USE_DL=1 +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) HAPROXY_LIBS += -latomic endif diff --git a/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch b/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch new file mode 100644 index 000000000..700f6f85e --- /dev/null +++ b/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch @@ -0,0 +1,33 @@ +From 432dfd0a1d8fe0a8df89e7ce828c520c7758f10c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 21:00:34 +0200 +Subject: [PATCH] src/meson.build: allow introspection when cross-compiling + +introspection can be enabled when cross-compiling on certains conditions +(for example it is supported by buildroot) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/harfbuzz/harfbuzz/pull/2692] +--- + src/meson.build | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 19290245..7db43508 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -637,11 +637,6 @@ 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() +- if not build_gir and get_option('introspection').enabled() +- error('Introspection support is requested but it isn\'t available in cross builds') +- endif +- + build_gir = build_gir and get_option('default_library') != 'static' + if not build_gir and get_option('introspection').enabled() + error('Introspection support is requested but the default library option should be shared or both') +-- +2.28.0 + diff --git a/buildroot/package/harfbuzz/Config.in b/buildroot/package/harfbuzz/Config.in index e8f407bb8..8bc88f428 100644 --- a/buildroot/package/harfbuzz/Config.in +++ b/buildroot/package/harfbuzz/Config.in @@ -6,12 +6,12 @@ config BR2_PACKAGE_HARFBUZZ help HarfBuzz is an OpenType text shaping engine - http://www.freedesktop.org/wiki/Software/HarfBuzz/ + https://harfbuzz.github.io/ Harfbuzz can make optional use of cairo, freetype, glib2 and icu packages if they are selected. -comment "harfbuzz needs a toolchain w/ C++, gcc => 4.8" +comment "harfbuzz needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/harfbuzz/harfbuzz.hash b/buildroot/package/harfbuzz/harfbuzz.hash index ba54f477a..dac859bbd 100644 --- a/buildroot/package/harfbuzz/harfbuzz.hash +++ b/buildroot/package/harfbuzz/harfbuzz.hash @@ -1,5 +1,3 @@ -# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz.sha256 -sha256 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12 harfbuzz-2.6.4.tar.xz - # Locally computed -sha256 1b32b6e2fea50440c128c5ba482f7691367c46fd0cd573b80fc863bf07964cea COPYING +sha256 b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce harfbuzz-2.7.2.tar.xz +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b COPYING diff --git a/buildroot/package/harfbuzz/harfbuzz.mk b/buildroot/package/harfbuzz/harfbuzz.mk index 3006b5ab9..fae9278b7 100644 --- a/buildroot/package/harfbuzz/harfbuzz.mk +++ b/buildroot/package/harfbuzz/harfbuzz.mk @@ -4,66 +4,92 @@ # ################################################################################ -HARFBUZZ_VERSION = 2.6.4 -HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release +HARFBUZZ_VERSION = 2.7.2 +HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING HARFBUZZ_INSTALL_STAGING = YES -HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no +HARFBUZZ_CONF_OPTS = \ + -Dfontconfig=disabled \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" # freetype & glib2 support required by host-pango HOST_HARFBUZZ_DEPENDENCIES = \ host-freetype \ host-libglib2 HOST_HARFBUZZ_CONF_OPTS = \ - --with-coretext=no \ - --with-uniscribe=no \ - --with-graphite2=no \ - --with-cairo=no \ - --with-icu=no \ - --with-freetype=yes \ - --with-glib=yes - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -# forgets to link test programs with -pthread breaking static link -HARFBUZZ_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif + -Dglib=enabled \ + -Dgobject=disabled \ + -Dcairo=disabled \ + -Dfontconfig=disabled \ + -Dicu=disabled \ + -Dgraphite=disabled \ + -Dfreetype=enabled \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" ifeq ($(BR2_PACKAGE_CAIRO),y) HARFBUZZ_DEPENDENCIES += cairo -HARFBUZZ_CONF_OPTS += --with-cairo=yes +HARFBUZZ_CONF_OPTS += -Dcairo=enabled else -HARFBUZZ_CONF_OPTS += --with-cairo=no +HARFBUZZ_CONF_OPTS += -Dcairo=disabled endif ifeq ($(BR2_PACKAGE_FREETYPE),y) HARFBUZZ_DEPENDENCIES += freetype -HARFBUZZ_CONF_OPTS += --with-freetype=yes +HARFBUZZ_CONF_OPTS += -Dfreetype=enabled else -HARFBUZZ_CONF_OPTS += --with-freetype=no +HARFBUZZ_CONF_OPTS += -Dfreetype=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +HARFBUZZ_DEPENDENCIES += gobject-introspection +HARFBUZZ_CONF_OPTS += \ + -Dgobject=enabled \ + -Dintrospection=enabled +else +HARFBUZZ_CONF_OPTS += \ + -Dgobject=disabled \ + -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_GRAPHITE2),y) HARFBUZZ_DEPENDENCIES += graphite2 -HARFBUZZ_CONF_OPTS += --with-graphite2=yes +HARFBUZZ_CONF_OPTS += -Dgraphite=enabled else -HARFBUZZ_CONF_OPTS += --with-graphite2=no +HARFBUZZ_CONF_OPTS += -Dgraphite=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) HARFBUZZ_DEPENDENCIES += libglib2 -HARFBUZZ_CONF_OPTS += --with-glib=yes +HARFBUZZ_CONF_OPTS += -Dglib=enabled else -HARFBUZZ_CONF_OPTS += --with-glib=no +HARFBUZZ_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_ICU),y) HARFBUZZ_DEPENDENCIES += icu -HARFBUZZ_CONF_OPTS += --with-icu=yes +HARFBUZZ_CONF_OPTS += -Dicu=enabled else -HARFBUZZ_CONF_OPTS += --with-icu=no +HARFBUZZ_CONF_OPTS += -Dicu=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/haveged/haveged.hash b/buildroot/package/haveged/haveged.hash index 2bb1fdd84..df8c48e21 100644 --- a/buildroot/package/haveged/haveged.hash +++ b/buildroot/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae haveged-1.9.8.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d17bd22fa1745daca5ac72e014ed3b0fe5720da4c115953124b1bf2a0aa2b04b haveged-1.9.13.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/haveged/haveged.mk b/buildroot/package/haveged/haveged.mk index cc834304d..924b499fa 100644 --- a/buildroot/package/haveged/haveged.mk +++ b/buildroot/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.8 +HAVEGED_VERSION = 1.9.13 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING diff --git a/buildroot/package/haveged/haveged.service b/buildroot/package/haveged/haveged.service index 91035c671..5a2336b0a 100644 --- a/buildroot/package/haveged/haveged.service +++ b/buildroot/package/haveged/haveged.service @@ -1,10 +1,22 @@ [Unit] -Description=Entropy Harvesting Daemon -Documentation=man:haveged(8) +# inspiration from upstream init.d/service.fedora +Description=Entropy Daemon based on the HAVEGE algorithm +Documentation=man:haveged(8) http://www.issihosts.com/haveged/ +DefaultDependencies=no +# This would wait for filesystems, but we only need /dev/random, which +# is certainly available after systemd initialised +# After=systemd-tmpfiles-setup-dev.service +Before=sysinit.target shutdown.target systemd-journald.service [Service] -ExecStart=/usr/sbin/haveged -F -w 1024 -v 1 -SuccessExitStatus=143 +ExecStart=/usr/sbin/haveged -w 1024 -v 1 --Foreground +Restart=always +SuccessExitStatus=137 143 + +# Only simple isolation methods that don't pull in dependencies +CapabilityBoundingSet=CAP_SYS_ADMIN +SecureBits=noroot-locked +ProtectSystem=full [Install] -WantedBy=multi-user.target +WantedBy=sysinit.target diff --git a/buildroot/package/hiawatha/hiawatha.hash b/buildroot/package/hiawatha/hiawatha.hash index 359a43542..2fba5600a 100644 --- a/buildroot/package/hiawatha/hiawatha.hash +++ b/buildroot/package/hiawatha/hiawatha.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9 hiawatha-10.10.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE +sha256 79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727 hiawatha-10.11.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/hiawatha/hiawatha.mk b/buildroot/package/hiawatha/hiawatha.mk index eefd0f6f8..126cb7110 100644 --- a/buildroot/package/hiawatha/hiawatha.mk +++ b/buildroot/package/hiawatha/hiawatha.mk @@ -4,12 +4,20 @@ # ################################################################################ -HIAWATHA_VERSION = 10.10 +HIAWATHA_VERSION = 10.11 HIAWATHA_SITE = https://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE +HIAWATHA_CONF_OPTS = \ + -DENABLE_TOOLKIT=OFF \ + -DCONFIG_DIR=/etc/hiawatha \ + -DLOG_DIR=/var/log \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON HIAWATHA_DEPENDENCIES += mbedtls @@ -17,13 +25,11 @@ else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -HIAWATHA_CONF_OPTS += \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_XSLT=OFF \ - -DCONFIG_DIR=/etc/hiawatha \ - -DLOG_DIR=/var/log \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha +ifeq ($(BR2_PACKAGE_LIBXSLT),y) +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=ON +HIAWATHA_DEPENDENCIES += libxslt +else +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF +endif $(eval $(cmake-package)) diff --git a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash index b1dcaf4ae..ec9635f05 100644 --- a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash +++ b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc hicolor-icon-theme-0.15.tar.xz +sha256 317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8 hicolor-icon-theme-0.17.tar.xz sha256 b0a64377d4ee87b7dbcf418ce4fb33ec3b2d7081b6732890e4af06b8118c4526 COPYING diff --git a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk index dec75c15c..088aecf31 100644 --- a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk +++ b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk @@ -4,7 +4,7 @@ # ################################################################################ -HICOLOR_ICON_THEME_VERSION = 0.15 +HICOLOR_ICON_THEME_VERSION = 0.17 HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz HICOLOR_ICON_THEME_LICENSE = GPL-2.0 diff --git a/buildroot/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch b/buildroot/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch new file mode 100644 index 000000000..b7fdb8791 --- /dev/null +++ b/buildroot/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch @@ -0,0 +1,47 @@ +From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 29 Aug 2020 23:19:26 +0200 +Subject: [PATCH] CMakeLists.txt: do not force SHARED + +Allow the user to build static libraries by removing SHARED from +ADD_LIBRARY calls. + +Here is an extract of +https://cmake.org/cmake/help/latest/command/add_library.html: + +"If no type is given explicitly the type is STATIC or SHARED based on +whether the current value of the variable BUILD_SHARED_LIBS is ON." + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable as is because it will +conflict with https://github.com/redis/hiredis/pull/851. So, this patch +will probably have to be reworked for 1.0.x] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1beccc6..fed79fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ IF(WIN32) + ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ADD_LIBRARY(hiredis ${hiredis_sources}) + + SET_TARGET_PROPERTIES(hiredis + PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +@@ -97,7 +97,7 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED ++ ADD_LIBRARY(hiredis_ssl + ${hiredis_ssl_sources}) + + IF (APPLE) +-- +2.28.0 + diff --git a/buildroot/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/buildroot/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch new file mode 100644 index 000000000..08a9ef985 --- /dev/null +++ b/buildroot/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch @@ -0,0 +1,57 @@ +From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Sep 2020 12:54:21 +0200 +Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler + +Define hiredis as a C project (and use a single PROJECT statement) to +avoid the following build failure if a C++ compiler is not found: + +CMake Error at CMakeLists.txt:3 (PROJECT): + The CMAKE_CXX_COMPILER: + + /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ + + is not a full path to an existing compiler tool. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +The only cpp source file is examples/example-qt.cpp which is never +compiled with cmake buildsystem. This file is compiled only with the +Makefile buildsystem so perhaps it should be removed. If it is added to +the cmake buildsystem, a call to enable_language(CXX) will have to be +added. + +Fixes: + - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/redis/hiredis/pull/872] +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4cbd438..9d65b7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,5 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0) + INCLUDE(GNUInstallDirs) +-PROJECT(hiredis) + + OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) + OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) +@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME) + SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") + MESSAGE("Detected version: ${VERSION}") + +-PROJECT(hiredis VERSION "${VERSION}") ++PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") + + # Hiredis requires C99 + SET(CMAKE_C_STANDARD 99) +-- +2.28.0 + diff --git a/buildroot/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch b/buildroot/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch new file mode 100644 index 000000000..7e6ef8bca --- /dev/null +++ b/buildroot/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch @@ -0,0 +1,28 @@ +From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001 +From: michael-grunder +Date: Fri, 28 Aug 2020 12:35:01 -0700 +Subject: [PATCH] Explicitly set c99 in CMake + +See #869 + +[Retrieved from: +https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1beccc69a..4cbd438d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}") + + PROJECT(hiredis VERSION "${VERSION}") + ++# Hiredis requires C99 ++SET(CMAKE_C_STANDARD 99) ++ + SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") + + SET(hiredis_sources diff --git a/buildroot/package/hiredis/hiredis.hash b/buildroot/package/hiredis/hiredis.hash index 2d50ce0f5..fc01d1f60 100644 --- a/buildroot/package/hiredis/hiredis.hash +++ b/buildroot/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913 hiredis-0.14.1.tar.gz +sha256 2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f hiredis-1.0.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/buildroot/package/hiredis/hiredis.mk b/buildroot/package/hiredis/hiredis.mk index 230fb2d18..27a26661c 100644 --- a/buildroot/package/hiredis/hiredis.mk +++ b/buildroot/package/hiredis/hiredis.mk @@ -4,66 +4,19 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 0.14 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).1 +HIREDIS_VERSION_MAJOR = 1.0 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_INSTALL_STAGING = YES +HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -HIREDIS_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - PREFIX=/usr - -HIREDIS_TARGETS = hiredis.pc -ifeq ($(BR2_STATIC_LIBS),y) -HIREDIS_TARGETS += static -else ifeq ($(BR2_SHARED_LIBS),y) -HIREDIS_TARGETS += dynamic -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -HIREDIS_TARGETS += dynamic static +ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) +HIREDIS_CONF_OPTS += -DENABLE_SSL=ON +HIREDIS_DEPENDENCIES += openssl +else +HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif -define HIREDIS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(HIREDIS_MAKE_OPTS) -C $(@D) \ - $(HIREDIS_TARGETS) -endef - -HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis - -ifeq ($(BR2_SHARED_LIBS),) -define HIREDIS_INSTALL_STAGING_STATIC_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.a \ - $(STAGING_DIR)/usr/lib/libhiredis.a -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define HIREDIS_INSTALL_STAGING_SHARED_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so -endef -define HIREDIS_INSTALL_TARGET_SHARED_LIB - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so -endef -endif - -# Do not call make install as this target will build shared and static libraries -define HIREDIS_INSTALL_STAGING_CMDS - mkdir -p $(HIREDIS_INCLUDE_DIR) - cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \ - $(@D)/alloc.h $(@D)/adapters $(HIREDIS_INCLUDE_DIR) - $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc - $(HIREDIS_INSTALL_STAGING_STATIC_LIB) - $(HIREDIS_INSTALL_STAGING_SHARED_LIB) -endef - -define HIREDIS_INSTALL_TARGET_CMDS - $(HIREDIS_INSTALL_TARGET_SHARED_LIB) -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch b/buildroot/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch deleted file mode 100644 index 81f9d1bd9..000000000 --- a/buildroot/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ae32d292ca641c08b6db8d2f7cfcce2a54d00835 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 20 Feb 2018 23:09:24 +0100 -Subject: [PATCH] MetersPanel: remove 0xe2 from MetersPanel.c - -This non ascii character trigger an issue with MakeHeader.py. - -./scripts/MakeHeader.py MetersPanel.c -Traceback (most recent call last): - File "./scripts/MakeHeader.py", line 32, in - for line in file.readlines(): - File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode - return codecs.ascii_decode(input, self.errors)[0] -UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128) - -http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6/build-end.log - -Signed-off-by: Romain Naour ---- - MetersPanel.c | 2 +- - MetersPanel.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/MetersPanel.c b/MetersPanel.c -index 3cf3e07..47296a4 100644 ---- a/MetersPanel.c -+++ b/MetersPanel.c -@@ -37,7 +37,7 @@ static const char* const MetersFunctions[] = {"Style ", "Move ", " - static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"}; - static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)}; - --// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese -+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese - // terminals, breaking our aligning. - // In , arrows (U+2019..U+2199) are - // considered "Ambiguous characters". -diff --git a/MetersPanel.h b/MetersPanel.h -index e00169c..e80754a 100644 ---- a/MetersPanel.h -+++ b/MetersPanel.h -@@ -29,7 +29,7 @@ struct MetersPanel_ { - - // Note: In code the meters are known to have bar/text/graph "Modes", but in UI - // we call them "Styles". --// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese -+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese - // terminals, breaking our aligning. - // In , arrows (U+2019..U+2199) are - // considered "Ambiguous characters". --- -2.14.3 - diff --git a/buildroot/package/htop/Config.in b/buildroot/package/htop/Config.in index c19ff27b7..7bb0fe6e0 100644 --- a/buildroot/package/htop/Config.in +++ b/buildroot/package/htop/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_HTOP htop is an interactive text-mode process viewer for Linux. It aims to be a better top. - http://hisham.hm/htop/ + https://htop.dev/ diff --git a/buildroot/package/htop/htop.hash b/buildroot/package/htop/htop.hash index e764644a0..fb8d0bff4 100644 --- a/buildroot/package/htop/htop.hash +++ b/buildroot/package/htop/htop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 htop-2.2.0.tar.gz -sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING +sha256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4 htop-3.0.2.tar.gz +sha256 c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be COPYING diff --git a/buildroot/package/htop/htop.mk b/buildroot/package/htop/htop.mk index dc84e3270..457926afe 100644 --- a/buildroot/package/htop/htop.mk +++ b/buildroot/package/htop/htop.mk @@ -4,8 +4,8 @@ # ################################################################################ -HTOP_VERSION = 2.2.0 -HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) +HTOP_VERSION = 3.0.2 +HTOP_SITE = https://dl.bintray.com/htop/source HTOP_DEPENDENCIES = ncurses # Prevent htop build system from searching the host paths HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) diff --git a/buildroot/package/htpdate/Config.in b/buildroot/package/htpdate/Config.in new file mode 100644 index 000000000..42c10c308 --- /dev/null +++ b/buildroot/package/htpdate/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HTPDATE + bool "htpdate" + depends on BR2_USE_MMU # fork() + help + The HTTP Time Protocol (HTP) is used to synchronize a + computer's time with web servers as reference time source. + + https://github.com/angeloc/htpdate diff --git a/buildroot/package/htpdate/S43htpdate b/buildroot/package/htpdate/S43htpdate new file mode 100644 index 000000000..75f9a995f --- /dev/null +++ b/buildroot/package/htpdate/S43htpdate @@ -0,0 +1,51 @@ +#!/bin/sh + +DAEMON="htpdate" +PIDFILE="/var/run/$DAEMON.pid" + +HTPDATE_ARGS="-a -s -t https://google.com" +test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + -- -D -i "$PIDFILE" $HTPDATE_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/htpdate/htpdate.hash b/buildroot/package/htpdate/htpdate.hash new file mode 100644 index 000000000..b82b2bfa0 --- /dev/null +++ b/buildroot/package/htpdate/htpdate.hash @@ -0,0 +1,3 @@ +# Locally calculated: +sha256 267003ca4d5d191122bfd8f85a0fd2d0b7d751f7b04f5fde4e8f51e570c98d0b htpdate-1.2.5.tar.gz +sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/buildroot/package/htpdate/htpdate.mk b/buildroot/package/htpdate/htpdate.mk new file mode 100644 index 000000000..7a08738d2 --- /dev/null +++ b/buildroot/package/htpdate/htpdate.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# htpdate +# +################################################################################ + +HTPDATE_VERSION = 1.2.5 +HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_LICENSE = GPL-2.0+ +HTPDATE_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_DEPENDENCIES += openssl host-pkgconf +endif + +define HTPDATE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(HTPDATE_BUILD_OPTS) +endef + +define HTPDATE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +define HTPDATE_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/htpdate/S43htpdate \ + $(TARGET_DIR)/etc/init.d/S43htpdate +endef + +define HTPDATE_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/htpdate/htpdate.service \ + $(TARGET_DIR)/usr/lib/systemd/system/htpdate.service +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/htpdate/htpdate.service b/buildroot/package/htpdate/htpdate.service new file mode 100644 index 000000000..b7f1371b0 --- /dev/null +++ b/buildroot/package/htpdate/htpdate.service @@ -0,0 +1,13 @@ +[Unit] +Description=htpdate daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/htpdate.pid +Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" +EnvironmentFile=-/etc/default/htpdate +ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/hwdata/hwdata.hash b/buildroot/package/hwdata/hwdata.hash index 80e61e212..79f7b4ea3 100644 --- a/buildroot/package/hwdata/hwdata.hash +++ b/buildroot/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d90de6eb0937ad4c667e5f0edcc4ab3d6d91d2d2dbc08f70b5b99be3800ed836 hwdata-0.326.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE +sha256 1fb83c015ae9da1ee2a176041ca3e949ac2b71f23356a43c9c958b551ea57662 hwdata-0.335.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/buildroot/package/hwdata/hwdata.mk b/buildroot/package/hwdata/hwdata.mk index f32a0ef93..b6a79a44b 100644 --- a/buildroot/package/hwdata/hwdata.mk +++ b/buildroot/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.326 +HWDATA_VERSION = 0.335 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/i2c-tools/i2c-tools.hash b/buildroot/package/i2c-tools/i2c-tools.hash index 280a139c0..150bdb2e6 100644 --- a/buildroot/package/i2c-tools/i2c-tools.hash +++ b/buildroot/package/i2c-tools/i2c-tools.hash @@ -1,7 +1,7 @@ -# Locally computed -sha256 57b219efd183795bd545dd5a60d9eabbe9dcb6f8fb92bc7ba2122b87f98527d5 i2c-tools-4.1.tar.xz +# From https://www.kernel.org/pub/software/utils/i2c-tools/sha256sums.asc +sha256 37f2dabc7082d185903ff21d1f584b5dcb4dd2eb2c879bbd8d7c50ae900dacd6 i2c-tools-4.2.tar.xz # License files -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 b75b04b46320dff5e2b50a9c69b8e526b7db5087083ea3ba65533f08fc11b9f0 README +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 370e8bc3d45744170cc4b12dc5135b107fa40a00179a19973fbd714146dec04c README diff --git a/buildroot/package/i2c-tools/i2c-tools.mk b/buildroot/package/i2c-tools/i2c-tools.mk index d4d9c012f..c1770cf63 100644 --- a/buildroot/package/i2c-tools/i2c-tools.mk +++ b/buildroot/package/i2c-tools/i2c-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2C_TOOLS_VERSION = 4.1 +I2C_TOOLS_VERSION = 4.2 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) diff --git a/buildroot/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch b/buildroot/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch deleted file mode 100644 index bf5807f8d..000000000 --- a/buildroot/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5fec22461a6d8d1045c849e468436b00ec7f9616 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Apr 2018 20:11:21 +0200 -Subject: [PATCH] build/CMakeLists.txt: don't install source and license - -The CMakeLists.txt has the interesting (weird?) idea of installing the -license to /usr/LICENSE and the source code to /usr/src/, which is a -bit annoying. Let's not install such things. - -Signed-off-by: Thomas Petazzoni ---- - build/CMakeLists.txt | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt -index a6736a0b..3de79f3e 100644 ---- a/build/CMakeLists.txt -+++ b/build/CMakeLists.txt -@@ -473,36 +473,6 @@ if (WITH_BINARY) - endif () - endif () - --install(FILES ../LICENSE -- DESTINATION . -- COMPONENT Runtime -- ) --# Take a copy on Appveyor --install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE" -- DESTINATION . -- COMPONENT Runtime -- RENAME LICENSE_OPENSSL -- OPTIONAL # for local builds only! -- ) -- --file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*") --install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source) --# install(DIRECTORY ../ DESTINATION src/ --# # OPTIONAL --# COMPONENT Source FILES_MATCHING --# PATTERN .git EXCLUDE --# PATTERN "*.cpp" --# ) -- --file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h") --install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers) --# install(DIRECTORY ../ DESTINATION src/ --# # OPTIONAL --# COMPONENT Headers FILES_MATCHING --# PATTERN .git EXCLUDE --# PATTERN "*.h" --# ) -- - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Purple I2P, a C++ I2P daemon") - set(CPACK_PACKAGE_VENDOR "Purple I2P") - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md") --- -2.14.3 - diff --git a/buildroot/package/i2pd/i2pd.hash b/buildroot/package/i2pd/i2pd.hash index 0ae6ea05f..1a19ccf68 100644 --- a/buildroot/package/i2pd/i2pd.hash +++ b/buildroot/package/i2pd/i2pd.hash @@ -1,3 +1,4 @@ +# From https://github.com/PurpleI2P/i2pd/releases/download/2.33.0/SHA512SUMS +sha512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910 i2pd-2.33.0.tar.gz # Locally computed: -sha256 fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06 i2pd-2.29.0.tar.gz -sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE +sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE diff --git a/buildroot/package/i2pd/i2pd.mk b/buildroot/package/i2pd/i2pd.mk index c03114547..461f483d1 100644 --- a/buildroot/package/i2pd/i2pd.mk +++ b/buildroot/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.29.0 +I2PD_VERSION = 2.33.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch b/buildroot/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch new file mode 100644 index 000000000..c84e359a5 --- /dev/null +++ b/buildroot/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch @@ -0,0 +1,76 @@ +From 5aeb25abf13de43b9e497f6509209911dd1386b8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 26 Apr 2020 15:33:39 +0200 +Subject: [PATCH] Use LONG_BIT to define RADIX_BITS + +This allows to avoid having to support each CPU architecture +individually. + +Also, add the necessary defines in the makefile to expose +LONG_BIT. Adding those defines end up requiring using +as we're now using >= POSIX.1-2001 definitions of fd_set and friends. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + src/LibSupport.h | 17 +++-------------- + src/TcpServerPosix.c | 1 + + src/makefile | 2 ++ + 3 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/src/LibSupport.h b/src/LibSupport.h +index b2e6a51..0b59d18 100644 +--- a/src/LibSupport.h ++++ b/src/LibSupport.h +@@ -64,20 +64,9 @@ + #ifndef _LIB_SUPPORT_H_ + #define _LIB_SUPPORT_H_ + +-#ifndef RADIX_BITS +-# if defined(__x86_64__) || defined(__x86_64) \ +- || defined(__amd64__) || defined(__amd64) || defined(_WIN64) || defined(_M_X64) \ +- || defined(_M_ARM64) || defined(__aarch64__) \ +- || defined(__powerpc64__) || defined(__ppc64__) +-# define RADIX_BITS 64 +-# elif defined(__i386__) || defined(__i386) || defined(i386) \ +- || defined(_WIN32) || defined(_M_IX86) \ +- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) +-# define RADIX_BITS 32 +-# else +-# error Unable to determine RADIX_BITS from compiler environment +-# endif +-#endif // RADIX_BITS ++#include ++ ++#define RADIX_BITS LONG_BIT + + // These macros use the selected libraries to the proper include files. + #define LIB_QUOTE(_STRING_) #_STRING_ +diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c +index 20fcb29..bdac7aa 100644 +--- a/src/TcpServerPosix.c ++++ b/src/TcpServerPosix.c +@@ -66,6 +66,7 @@ + + #include + /* FIXME need Posix TCP socket code */ ++#include + #include + #include + #include +diff --git a/src/makefile b/src/makefile +index f124e78..6ee128e 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -46,6 +46,8 @@ CCFLAGS = -Wall \ + -c -ggdb -O0 \ + -DTPM_POSIX \ + -D_POSIX_ \ ++ -D_DEFAULT_SOURCE \ ++ -D_XOPEN_SOURCE=500 \ + -DTPM_NUVOTON + + # add this line for big endian platforms +-- +2.26.2 + diff --git a/buildroot/package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch b/buildroot/package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch new file mode 100644 index 000000000..ff82a1806 --- /dev/null +++ b/buildroot/package/ibm-sw-tpm2/0002-Remove-unused-global-variable-to-fix-compilation-with-GCC-10.patch @@ -0,0 +1,30 @@ +From 9bd2926c0f359f143141c32c2b261ca100d804c8 Mon Sep 17 00:00:00 2001 +From: Jonas Witschel +Date: Wed, 13 May 2020 10:56:03 +0200 +Subject: [PATCH] Remove unused global variable to fix compilation with GCC 10 + +GCC defaults to -fno-common, resulting in a compilation error: + +CryptSym.h:84: multiple definition of `tpmCryptKeySchedule' + +Since the global variable is not used anywhere, it can be removed. +[Retrieved from: +https://github.com/kgoldman/ibmswtpm2/pull/3/commits/9bd2926c0f359f143141c32c2b261ca100d804c8] +Signed-off-by: Fabrice Fontaine +--- + src/CryptSym.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CryptSym.h b/src/CryptSym.h +index 7b58e41..9a33b13 100644 +--- a/src/CryptSym.h ++++ b/src/CryptSym.h +@@ -81,7 +81,7 @@ union tpmCryptKeySchedule_t { + #else + uint32_t alignment; + #endif +-} tpmCryptKeySchedule; ++}; + /* Each block cipher within a library is expected to conform to the same calling conventions with + three parameters (keySchedule, in, and out) in the same order. That means that all algorithms + would use the same order of the same parameters. The code is written assuming the (keySchedule, diff --git a/buildroot/package/ibm-sw-tpm2/Config.in b/buildroot/package/ibm-sw-tpm2/Config.in new file mode 100644 index 000000000..b402ba715 --- /dev/null +++ b/buildroot/package/ibm-sw-tpm2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_IBM_SW_TPM2 + bool "ibm-sw-tpm2" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # ibm-sw-tpm2 + select BR2_PACKAGE_OPENSSL + # libressl is not supported + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + This project is an implementation of the TCG TPM 2.0 + specification. It is based on the TPM specification Parts 3 + and 4 source code donated by Microsoft, with additional + files to complete the implementation. + + https://sourceforge.net/projects/ibmswtpm2/ + +comment "ibm-sw-tpm2 needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.hash b/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.hash new file mode 100644 index 000000000..f57dcbbb5 --- /dev/null +++ b/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.hash @@ -0,0 +1,6 @@ +# from https://sourceforge.net/projects/ibmswtpm2/files +sha1 a2a5335024a2edc1739f08b99e716fa355be627d ibmtpm1563.tar.gz +md5 13013612b3a13dc935fefe1a5684179c ibmtpm1563.tar.gz +# Locally computed: +sha256 fc3a17f8315c1f47670764f2384943afc0d3ba1e9a0422dacb08d455733bd1e9 ibmtpm1563.tar.gz +sha256 dd2d31b560011ea673e197251e710e52669d911367d83cd3cfd018f8ed58bde9 LICENSE diff --git a/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.mk b/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.mk new file mode 100644 index 000000000..58102667d --- /dev/null +++ b/buildroot/package/ibm-sw-tpm2/ibm-sw-tpm2.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# ibm-sw-tpm2 +# +################################################################################ + +IBM_SW_TPM2_VERSION = 1563 +IBM_SW_TPM2_SOURCE = ibmtpm$(IBM_SW_TPM2_VERSION).tar.gz +IBM_SW_TPM2_SITE = https://sourceforge.net/projects/ibmswtpm2/files +IBM_SW_TPM2_LICENSE = BSD-3-Clause +IBM_SW_TPM2_LICENSE_FILES = LICENSE +IBM_SW_TPM2_DEPENDENCIES = openssl + +define IBM_SW_TPM2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) +endef + +define IBM_SW_TPM2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) install \ + DESTDIR=$(TARGET_DIR) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/icu/0005-Fix-big-endian-build.patch b/buildroot/package/icu/0005-Fix-big-endian-build.patch deleted file mode 100644 index 2cb212901..000000000 --- a/buildroot/package/icu/0005-Fix-big-endian-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9be0b489a94b57419202c552022f25cb95bfac51 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 17 Apr 2019 16:41:58 +0200 -Subject: [PATCH] Fix big-endian build - -Bug-report: https://unicode-org.atlassian.net/browse/ICU-20533 -Patch taken from: https://bugs.gentoo.org/682170 - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - -Downloaded from -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch?h=master - -[Bernd: Fixed path] -Signed-off-by: Bernd Kuhls ---- - data/Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/source/data/Makefile.in b/source/data/Makefile.in -index 778b6c7..67203e7 100644 ---- a/source/data/Makefile.in -+++ b/source/data/Makefile.in -@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/$(ICUDATA_BASENAME_VERSION - # and convert it to the current type. - ifneq ($(ICUDATA_ARCHIVE),) - ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat --$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) -+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) -+ $(MKINSTALLDIRS) $(OUTDIR) - $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) - endif - else diff --git a/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch b/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch deleted file mode 100644 index 6587de484..000000000 --- a/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d9d99097a5b28f4204b3a15e82564e50f9e62f5a Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 3 Aug 2019 08:05:35 +0200 -Subject: [PATCH] ICU-20751 Fix nios2 build - -Nios2 supports double conversion, tested using qemu: - -./main || echo "correct" -correct -uname -a -Linux buildroot 4.19.16 #4 Sat Aug 3 14:46:48 CEST 2019 nios2 GNU/Linux - -Solves build error - -In file included from double-conversion.h:42:0, - from number_decimalquantity.cpp:19: -double-conversion-utils.h:119:2: error: #error Target architecture was not detected as supported by Double-Conversion. - #error Target architecture was not detected as supported by Double-Conversion. - -detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/91e/91eaec34708d91f8a05af189243be0b7cabce31b/ - -Patch sent upstream: https://github.com/unicode-org/icu/pull/725 -Bug report: https://unicode-org.atlassian.net/browse/ICU-20751 - -[Bernd: Fixed path] -Signed-off-by: Bernd Kuhls ---- - source/i18n/double-conversion-utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index 1e44fcaa0e..0cf993929f 100644 ---- a/source/i18n/double-conversion-utils.h -+++ b/source/i18n/double-conversion-utils.h -@@ -95,6 +95,7 @@ int main(int argc, char** argv) { - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ -+ defined(__nios2__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ - defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ --- -2.20.1 - diff --git a/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch b/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch deleted file mode 100644 index 278c6c61e..000000000 --- a/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 395f063b6af8885cc9d688eeeb44acf9d75c6045 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 3 Oct 2019 16:31:22 +0200 -Subject: [PATCH] double-conversion: enable for microblaze - -Signed-off-by: Peter Seiderer ---- - source/i18n/double-conversion-utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index 0cf9939..a00037e 100644 ---- a/source/i18n/double-conversion-utils.h -+++ b/source/i18n/double-conversion-utils.h -@@ -104,6 +104,7 @@ int main(int argc, char** argv) { - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ - defined(__or1k__) || defined(__arc__) || \ -+ defined(__microblaze__) || \ - defined(__EMSCRIPTEN__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) || \ --- -2.23.0 - diff --git a/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch b/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch deleted file mode 100644 index cb6be5188..000000000 --- a/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f8f37357fa7cc403848d2bafe6152a707ca3a074 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 28 Oct 2019 21:26:05 +0100 -Subject: [PATCH] double-conversion: enable for xtensa - -Signed-off-by: Peter Seiderer ---- - source/i18n/double-conversion-utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index a00037e..b3100ac 100644 ---- a/source/i18n/double-conversion-utils.h -+++ b/source/i18n/double-conversion-utils.h -@@ -104,7 +104,7 @@ int main(int argc, char** argv) { - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ - defined(__or1k__) || defined(__arc__) || \ -- defined(__microblaze__) || \ -+ defined(__microblaze__) || defined(__XTENSA__) || \ - defined(__EMSCRIPTEN__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) || \ --- -2.23.0 - diff --git a/buildroot/package/icu/Config.in b/buildroot/package/icu/Config.in index 32f35b9d9..b0c9eac83 100644 --- a/buildroot/package/icu/Config.in +++ b/buildroot/package/icu/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_ICU bool "icu" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 PR56019 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS # icu does some funky things by generating by itself an ELF # file, and it cannot easily be changed to generate FLAT @@ -26,8 +27,9 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH endif -comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" +comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/icu/icu.hash b/buildroot/package/icu/icu.hash index 5eb508d2c..5c10008d8 100644 --- a/buildroot/package/icu/icu.hash +++ b/buildroot/package/icu/icu.hash @@ -1,4 +1,3 @@ -# From https://github.com/unicode-org/icu/releases/download/release-65-1/SHASUM512.txt -sha512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 icu4c-65_1-src.tgz # Locally computed -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d LICENSE +sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc icu4c-67_1-src.tgz +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 LICENSE diff --git a/buildroot/package/icu/icu.mk b/buildroot/package/icu/icu.mk index 0b8aeeaee..c07ca2da3 100644 --- a/buildroot/package/icu/icu.mk +++ b/buildroot/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 65-1 +ICU_VERSION = 67-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) diff --git a/buildroot/package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch b/buildroot/package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..febeb7685 --- /dev/null +++ b/buildroot/package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch @@ -0,0 +1,38 @@ +From 4ce42974267dd969a597a7357d6c98ccbe8140f8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 17 Aug 2020 20:41:29 +0200 +Subject: [PATCH] src/interface.h: fix build with gcc 10 + +This will fix the following build failure: + +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -D_REENTRANT -DSYSCONFDIR="\"/etc\"" -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -pipe -W -Wall -Wno-unused-parameter -o ifplugstatus ifplugstatus.o interface.o -L/home/buildroot/autobuild/instance-1/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib -ldaemon +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interface.o:(.bss+0x0): multiple definition of `interface_do_message'; ifplugstatus.o:(.bss+0xc): first defined here +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interface.o:(.bss+0x4): multiple definition of `interface_auto_up'; ifplugstatus.o:(.bss+0x4): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/63f7c6fc4a2a30c8eb0298856a2615f816d50299 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to Lennart Poettering ] +--- + src/interface.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/interface.h b/src/interface.h +index 2f35a84..e603844 100644 +--- a/src/interface.h ++++ b/src/interface.h +@@ -21,8 +21,8 @@ + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-int interface_auto_up; +-int interface_do_message; ++extern int interface_auto_up; ++extern int interface_do_message; + + typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t; + +-- +2.27.0 + diff --git a/buildroot/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch b/buildroot/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..4bee03eb1 --- /dev/null +++ b/buildroot/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch @@ -0,0 +1,60 @@ +From 18a9f7732944bfe45023f9dd7528295e7d43e678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 12 Aug 2020 22:31:33 +0200 +Subject: [PATCH] ui_common.h: fix build with gcc 10 + +Define global variables as extern in header to fix the build with gcc 10 +which default to -fno-common: https://gcc.gnu.org/gcc-10/porting_to.html + +Fixes: + - http://autobuild.buildroot.org/results/55a8581f11e776439782c228441ef1c8c1243386 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to iftop-users@lists.beasts.org] +--- + ui_common.c | 6 ++++++ + ui_common.h | 10 +++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/ui_common.c b/ui_common.c +index dcf6646..b1027ec 100644 +--- a/ui_common.c ++++ b/ui_common.c +@@ -17,6 +17,12 @@ + + #include "ui_common.h" + ++sorted_list_type screen_list; ++host_pair_line totals; ++int peaksent, peakrecv, peaktotal; ++hash_type* screen_hash; ++hash_type* service_hash; ++ + /* 2, 10 and 40 seconds */ + int history_divs[HISTORY_DIVISIONS] = {1, 5, 20}; + +diff --git a/ui_common.h b/ui_common.h +index 63ae5bb..add72fe 100644 +--- a/ui_common.h ++++ b/ui_common.h +@@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { + + extern options_t options; + +-sorted_list_type screen_list; +-host_pair_line totals; +-int peaksent, peakrecv, peaktotal; ++extern sorted_list_type screen_list; ++extern host_pair_line totals; ++extern int peaksent, peakrecv, peaktotal; + extern history_type history_totals; +-hash_type* screen_hash; +-hash_type* service_hash; ++extern hash_type* screen_hash; ++extern hash_type* service_hash; + + void analyse_data(void); + void screen_list_init(void); +-- +2.27.0 + diff --git a/buildroot/package/ifupdown-scripts/Config.in b/buildroot/package/ifupdown-scripts/Config.in index 4b984bc30..166094c51 100644 --- a/buildroot/package/ifupdown-scripts/Config.in +++ b/buildroot/package/ifupdown-scripts/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" default y if BR2_ROOTFS_SKELETON_DEFAULT - depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, or the busybox one) to bring network up, or tear it down. diff --git a/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk b/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk index abb457577..5ef032142 100644 --- a/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk +++ b/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk @@ -4,13 +4,17 @@ # ################################################################################ +define IFUPDOWN_SCRIPTS_PREAMBLE + echo "# interface file auto-generated by buildroot" \ + > $(TARGET_DIR)/etc/network/interfaces +endef + define IFUPDOWN_SCRIPTS_LOCALHOST ( \ - echo "# interface file auto-generated by buildroot"; \ echo ; \ echo "auto lo"; \ echo "iface lo inet loopback"; \ - ) > $(TARGET_DIR)/etc/network/interfaces + ) >> $(TARGET_DIR)/etc/network/interfaces endef IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) @@ -25,21 +29,33 @@ define IFUPDOWN_SCRIPTS_DHCP echo " wait-delay 15"; \ echo " hostname \$$(hostname)"; \ ) >> $(TARGET_DIR)/etc/network/interfaces - $(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \ - $(TARGET_DIR)/etc/network/nfs_check +endef +define IFUPDOWN_SCRIPTS_DHCP_OPENRC + echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) + echo "ifdown $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifdown.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) endef endif define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/etc/network + $(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \ + $(TARGET_DIR)/etc/network/nfs_check $(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network) - $(IFUPDOWN_SCRIPTS_LOCALHOST) +endef + +define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_DHCP) + $(IFUPDOWN_SCRIPTS_DHCP_OPENRC) endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_PREAMBLE) + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef # ifupdown-scripts can not be selected when systemd-networkd is @@ -48,6 +64,9 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_PREAMBLE) + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef $(eval $(generic-package)) diff --git a/buildroot/package/igd2-for-linux/0001-fix-build-with-gcc-10.patch b/buildroot/package/igd2-for-linux/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..32474a3ad --- /dev/null +++ b/buildroot/package/igd2-for-linux/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,199 @@ +From 23ed73623810a0894c8efd9eb79dd38483794a3b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 20 Aug 2020 18:17:03 +0200 +Subject: [PATCH] fix build with gcc 10 + +This will fix build failures with -fno-common which is enabled by +default with gcc 10 + +Fixes: + - http://autobuild.buildroot.org/results/f296984c3851fc28341210e36ef1b55b2edac209 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/Orange-OpenSource/igd2-for-linux/commit/23ed73623810a0894c8efd9eb79dd38483794a3b] +Signed-off-by: Fabrice Fontaine +--- + linuxigd2/src/gatedevice.c | 37 +++++++++++++++++++++++++++++++++ + linuxigd2/src/gatedevice.h | 42 +++++++++----------------------------- + linuxigd2/src/pinholev6.c | 2 ++ + linuxigd2/src/pinholev6.h | 2 +- + linuxigd2/src/pmlist.c | 5 +++++ + linuxigd2/src/pmlist.h | 2 +- + linuxigd2/src/wanipv6fw.h | 3 --- + 7 files changed, 56 insertions(+), 37 deletions(-) + +diff --git a/linuxigd2/src/gatedevice.c b/linuxigd2/src/gatedevice.c +index 8be53e5..a50525d 100644 +--- a/linuxigd2/src/gatedevice.c ++++ b/linuxigd2/src/gatedevice.c +@@ -41,6 +41,43 @@ + #include "wanipv6fw.h" + #include "config.h" + ++// Thread which contains all kind of timers and threads used in gatedevice.c and deviceprotection.c ++TimerThread gExpirationTimerThread; ++ ++// IGD Device Globals ++UpnpDevice_Handle deviceHandle; ++UpnpDevice_Handle deviceHandleIPv6; ++UpnpDevice_Handle deviceHandleIPv6UlaGua; ++char *gateUDN; ++char *wanUDN; ++char *wanConnectionUDN; ++char *lanUDN; ++long int startup_time; ++unsigned long connection_stats[STATS_LIMIT]; // this is used for defining if connection is in idling ++long int idle_time; ++ ++// State Variables ++char ConnectionType[50]; ++char PossibleConnectionTypes[50]; ++char ConnectionStatus[20]; ++char LastConnectionError[35]; ++long int AutoDisconnectTime; ++long int IdleDisconnectTime; ++long int WarnDisconnectDelay; ++int RSIPAvailable; ++int NATEnabled; ++char ExternalIPAddress[INET6_ADDRSTRLEN]; ++int PortMappingNumberOfEntries; ++int PortMappingEnabled; ++char RemoteHost[INET6_ADDRSTRLEN]; // updated IPv6 addrss length 16 -> 46 ++long int SystemUpdateID; ++ ++// WANEthLinkConfig state variables ++char EthernetLinkStatus[12]; ++ ++char FirewallEnabled[2]; ++char InboundPinholeAllowed[2]; ++ + //Definitions for mapping expiration timer thread + static ThreadPool gExpirationThreadPool; + static ThreadPoolJob gEventUpdateJob; +diff --git a/linuxigd2/src/gatedevice.h b/linuxigd2/src/gatedevice.h +index 28d6b21..dbaa0c2 100644 +--- a/linuxigd2/src/gatedevice.h ++++ b/linuxigd2/src/gatedevice.h +@@ -33,42 +33,20 @@ + #include "util.h" + + // Thread which contains all kind of timers and threads used in gatedevice.c and deviceprotection.c +-TimerThread gExpirationTimerThread; ++extern TimerThread gExpirationTimerThread; + + // IGD Device Globals +-UpnpDevice_Handle deviceHandle; +-UpnpDevice_Handle deviceHandleIPv6; +-UpnpDevice_Handle deviceHandleIPv6UlaGua; +-char *gateUDN; +-char *wanUDN; +-char *wanConnectionUDN; +-char *lanUDN; +-long int startup_time; +-unsigned long connection_stats[STATS_LIMIT]; // this is used for defining if connection is in idling +-long int idle_time; +- +-// State Variables +-char ConnectionType[50]; +-char PossibleConnectionTypes[50]; +-char ConnectionStatus[20]; +-char LastConnectionError[35]; +-long int AutoDisconnectTime; +-long int IdleDisconnectTime; +-long int WarnDisconnectDelay; +-int RSIPAvailable; +-int NATEnabled; +-char ExternalIPAddress[INET6_ADDRSTRLEN]; +-int PortMappingNumberOfEntries; +-int PortMappingEnabled; +-char RemoteHost[INET6_ADDRSTRLEN]; // updated IPv6 addrss length 16 -> 46 +-long int SystemUpdateID; +- +-// WANEthLinkConfig state variables +-char EthernetLinkStatus[12]; ++extern UpnpDevice_Handle deviceHandle; ++extern UpnpDevice_Handle deviceHandleIPv6; ++extern UpnpDevice_Handle deviceHandleIPv6UlaGua; ++extern char *gateUDN; ++extern char *wanUDN; ++extern char *wanConnectionUDN; ++extern char *lanUDN; + + // Linked list for portmapping entries +-struct portMap *pmlist_Head; +-struct portMap *pmlist_Current; ++extern struct portMap *pmlist_Head; ++extern struct portMap *pmlist_Current; + + // WanIPConnection Actions + int EventHandler(Upnp_EventType EventType, void *Event, void *Cookie); +diff --git a/linuxigd2/src/pinholev6.c b/linuxigd2/src/pinholev6.c +index 44e8a19..78f886d 100644 +--- a/linuxigd2/src/pinholev6.c ++++ b/linuxigd2/src/pinholev6.c +@@ -41,6 +41,8 @@ extern "C" { + #include "gatedevice.h" + #include "pinholev6.h" + ++struct pinholev6 *ph_first; ++ + static const char * add_rule_str = "ip6tables -I %s " //upnp forward chain + "-i %s " //input interface + "-o %s " //output interface +diff --git a/linuxigd2/src/pinholev6.h b/linuxigd2/src/pinholev6.h +index 295b9f9..353ae27 100644 +--- a/linuxigd2/src/pinholev6.h ++++ b/linuxigd2/src/pinholev6.h +@@ -37,7 +37,7 @@ struct pinholev6 { + + struct pinholev6 *next; + +-} *ph_first; ++}; + + struct phv6_expirationEvent + { +diff --git a/linuxigd2/src/pmlist.c b/linuxigd2/src/pmlist.c +index 1b3fe05..95d0c61 100644 +--- a/linuxigd2/src/pmlist.c ++++ b/linuxigd2/src/pmlist.c +@@ -41,6 +41,11 @@ + #include "iptc.h" + #endif + ++// Linked list for portmapping entries ++struct portMap *pmlist_Head; ++struct portMap *pmlist_Current; ++struct portMap *pmlist_Tail; ++ + /** + * Create new portMap struct of rule to add iptables. + * portMap-struct is internal presentation of iptables rule in IGD. +diff --git a/linuxigd2/src/pmlist.h b/linuxigd2/src/pmlist.h +index 436d228..017500d 100644 +--- a/linuxigd2/src/pmlist.h ++++ b/linuxigd2/src/pmlist.h +@@ -57,7 +57,7 @@ struct portMap + + struct portMap* next; + struct portMap* prev; +-} *pmlist_Head, *pmlist_Tail, *pmlist_Current; ++}; + + //struct portMap* pmlist_NewNode(void); + struct portMap* pmlist_NewNode(int enabled, long int duration, char *remoteHost, +diff --git a/linuxigd2/src/wanipv6fw.h b/linuxigd2/src/wanipv6fw.h +index 55419fe..a50d267 100644 +--- a/linuxigd2/src/wanipv6fw.h ++++ b/linuxigd2/src/wanipv6fw.h +@@ -46,9 +46,6 @@ extern "C" { + #define ERR_SRC_ADD_WILDCARD 708 + #define ERR_NO_TRAFFIC 709 + +-char FirewallEnabled[2]; +-char InboundPinholeAllowed[2]; +- + //----------------------------------------------------------------------------- + + int InitFirewallv6(void); diff --git a/buildroot/package/ima-evm-utils/Config.in b/buildroot/package/ima-evm-utils/Config.in index 851e2456b..6c29c9de2 100644 --- a/buildroot/package/ima-evm-utils/Config.in +++ b/buildroot/package/ima-evm-utils/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_IMA_EVM_UTILS bool "ima-evm-utils" depends on BR2_USE_MMU # keyutils - depends on !BR2_STATIC_LIBS # keyutils + depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_KEYUTILS + select BR2_PACKAGE_TPM2_TSS help Linux Integrity Measurement Architecture (IMA) Extended Verification Module (EVM) tools. diff --git a/buildroot/package/ima-evm-utils/ima-evm-utils.hash b/buildroot/package/ima-evm-utils/ima-evm-utils.hash index 24be627d2..2cdba227a 100644 --- a/buildroot/package/ima-evm-utils/ima-evm-utils.hash +++ b/buildroot/package/ima-evm-utils/ima-evm-utils.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 ad8471b58c4df29abd51c80d74b1501cfe3289b60d32d1b318618a8fd26c0c0a ima-evm-utils-1.2.1.tar.gz +# sha1 from sourceforge, sha256 locally computed +sha1 034d163533ae5f9c06001b375ec7e5a1b09a3853 ima-evm-utils-1.3.2.tar.gz +sha256 c2b206e7f9fbe62a938b7ae59e31906fefae4d5351fe01db739bd8346b75d4a7 ima-evm-utils-1.3.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ima-evm-utils/ima-evm-utils.mk b/buildroot/package/ima-evm-utils/ima-evm-utils.mk index b944eda13..cc53e02dd 100644 --- a/buildroot/package/ima-evm-utils/ima-evm-utils.mk +++ b/buildroot/package/ima-evm-utils/ima-evm-utils.mk @@ -4,11 +4,11 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.2.1 +IMA_EVM_UTILS_VERSION = 1.3.2 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING -IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl +IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure IMA_EVM_UTILS_AUTORECONF = YES diff --git a/buildroot/package/imagemagick/Config.in.host b/buildroot/package/imagemagick/Config.in.host index bbe23baa6..e12d82939 100644 --- a/buildroot/package/imagemagick/Config.in.host +++ b/buildroot/package/imagemagick/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images diff --git a/buildroot/package/imlib2/imlib2.hash b/buildroot/package/imlib2/imlib2.hash index c52ce9d2f..68f6c91db 100644 --- a/buildroot/package/imlib2/imlib2.hash +++ b/buildroot/package/imlib2/imlib2.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.5.1/ -md5 390aa207693e051bb692f2db650c694b imlib2-1.5.1.tar.bz2 -sha1 3e97e7157380f0cfbdf4f3c950a7a00bdfa6072c imlib2-1.5.1.tar.bz2 +# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.6.1/ +md5 7b3fbcb974b48822b32b326c6a47764b imlib2-1.6.1.tar.bz2 +sha1 3b5f850e83cbb7481e33061348fb9c7a555c8c60 imlib2-1.6.1.tar.bz2 # Locally computed -sha256 fa4e57452b8843f4a70f70fd435c746ae2ace813250f8c65f977db5d7914baae imlib2-1.5.1.tar.bz2 -sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING -sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN +sha256 4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d imlib2-1.6.1.tar.bz2 +sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING +sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN diff --git a/buildroot/package/imlib2/imlib2.mk b/buildroot/package/imlib2/imlib2.mk index 1c2e924d5..a684ec5b5 100644 --- a/buildroot/package/imlib2/imlib2.mk +++ b/buildroot/package/imlib2/imlib2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMLIB2_VERSION = 1.5.1 +IMLIB2_VERSION = 1.6.1 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_LICENSE = Imlib2 diff --git a/buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/buildroot/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch similarity index 70% rename from buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch rename to buildroot/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch index 430122f7e..e8ba820f2 100644 --- a/buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch +++ b/buildroot/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch @@ -1,4 +1,4 @@ -From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001 +From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 8 Mar 2018 19:04:37 +0100 Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31 @@ -7,14 +7,14 @@ Signed-off-by: Erik Larsson Signed-off-by: Christopher Dahlberg Signed-off-by: Marcus Folkesson --- - iMX8M/mkimage_fit_atf.sh | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + iMX8M/mkimage_fit_atf.sh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 3a3bd10..727f746 100755 +index 95749b1..c1aa902 100755 --- a/iMX8M/mkimage_fit_atf.sh +++ b/iMX8M/mkimage_fit_atf.sh -@@ -11,29 +11,29 @@ if [ ! -f $BL31 ]; then +@@ -18,23 +18,23 @@ if [ ! -f $BL31 ]; then echo "ERROR: BL31 file $BL31 NOT found" >&2 exit 0 else @@ -26,33 +26,35 @@ index 3a3bd10..727f746 100755 -BL32="tee.bin" +[ -z "$BL32" ] && BL32="tee.bin" + LOADABLES="\"atf@1\"" if [ ! -f $BL32 ]; then BL32=/dev/null else -- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 + echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 - echo "tee.bin size: " >&2 - ls -lct tee.bin | awk '{print $5}' >&2 -+ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete $BL32" >&2 + echo "$BL32 size: " >&2 + ls -lct $BL32 | awk '{print $5}' >&2 + LOADABLES="$LOADABLES, \"tee@1\"" fi -BL33="u-boot-nodtb.bin" +[ -z "$BL33" ] && BL33="u-boot-nodtb.bin" + DEK_BLOB="dek_blob_fit_dummy.bin" - if [ ! -f $BL33 ]; then - echo "ERROR: $BL33 file NOT found" >&2 + if [ ! -f $DEK_BLOB ]; then +@@ -49,8 +49,8 @@ if [ ! -f $BL33 ]; then exit 0 else - + - echo "u-boot-nodtb.bin size: " >&2 - ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2 -+ echo "$BL33: " >&2 ++ echo "$BL33 size: " >&2 + ls -lct $BL33 | awk '{print $5}' >&2 fi for dtname in $* -- -2.7.4 +2.25.1 diff --git a/buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/buildroot/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch similarity index 52% rename from buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch rename to buildroot/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch index 1d5fe7759..7272c3ac6 100644 --- a/buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch +++ b/buildroot/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch @@ -1,4 +1,4 @@ -From a73f20fbe921c7ecff3efda23bc506fdd935ee4d Mon Sep 17 00:00:00 2001 +From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Tue, 6 Mar 2018 12:28:39 +0100 Subject: [PATCH] Add LDFLAGS to link step @@ -9,18 +9,18 @@ Signed-off-by: Erik Larsson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index 8346769..38a14bb 100644 +index d714259..aecf84b 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak -@@ -15,7 +15,7 @@ FW_DIR = imx-boot/imx-boot-tools/imx8mq - +@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT) $(MKIMG): mkimage_imx8.c + @echo "PLAT="$(PLAT) "HDMI="$(HDMI) @echo "Compiling mkimage_imx8" - $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz + $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz - $(DCD_CFG): $(DCD_CFG_SRC) - @echo "Converting iMX8M DCD file" + u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin + @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin -- -2.7.4 +2.25.1 diff --git a/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch b/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch index 9652a817b..0e817a1ac 100644 --- a/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch +++ b/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch @@ -1,7 +1,10 @@ -From e75feef80b51c9060e3702390040495312648ad2 Mon Sep 17 00:00:00 2001 +From b25b4324be4c0dd9ee5fecdf2981d291fb187686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 25 Feb 2019 22:15:55 +0100 Subject: [PATCH] Add unused fake version +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit The Makefile makes the assumption that the build process runs from a Git clone of the source code. @@ -14,7 +17,7 @@ Signed-off-by: André Hentschel 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index ccf42e8..6041574 100644 +index 49ef486..b966399 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS) @@ -29,5 +32,5 @@ index ccf42e8..6041574 100644 help: @echo $(CURR_DIR) -- -2.17.1 +2.25.1 diff --git a/buildroot/package/imx-mkimage/imx-mkimage.hash b/buildroot/package/imx-mkimage/imx-mkimage.hash index e75619b8d..6d5a329ed 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.hash +++ b/buildroot/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ceeb297bb0aee02d7b105ee245d00f3cafd74fc73ef0c6182b058b234d5bbbd7 imx-mkimage-rel_imx_4.14.98_2.0.0_ga.tar.gz +sha256 a7e4c1c45b0d36e088bd7891335aa3c726682750984b7ca072e3c6329def92cf imx-mkimage-rel_imx_4.19.35_1.1.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/imx-mkimage/imx-mkimage.mk b/buildroot/package/imx-mkimage/imx-mkimage.mk index a58ddf07b..ed0e435a7 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.mk +++ b/buildroot/package/imx-mkimage/imx-mkimage.mk @@ -4,14 +4,14 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_4.14.98_2.0.0_ga +IMX_MKIMAGE_VERSION = rel_imx_4.19.35_1.1.0 IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y) # i.MX8M needs a different binary define HOST_IMX_MKIMAGE_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ diff --git a/buildroot/package/imx-usb-loader/imx-usb-loader.hash b/buildroot/package/imx-usb-loader/imx-usb-loader.hash index 182116a25..7e1c09714 100644 --- a/buildroot/package/imx-usb-loader/imx-usb-loader.hash +++ b/buildroot/package/imx-usb-loader/imx-usb-loader.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5a17886042c09f0f16093031183a287a2a7ae0fa9cd8bdfa31e7b31cb92510d9 imx-usb-loader-4aa9809099dcece9a9225776321f3b4b5b896d78.tar.gz +sha256 4357907c9669874d3ccbf00395bf0b1733c26e6daea85d721f1c0cd897f4162c imx-usb-loader-30b43d69770cd69e84c045dc9dcabb1f3e9d975a.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/imx-usb-loader/imx-usb-loader.mk b/buildroot/package/imx-usb-loader/imx-usb-loader.mk index 594bbb9ca..1a0948692 100644 --- a/buildroot/package/imx-usb-loader/imx-usb-loader.mk +++ b/buildroot/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = 4aa9809099dcece9a9225776321f3b4b5b896d78 +IMX_USB_LOADER_VERSION = 30b43d69770cd69e84c045dc9dcabb1f3e9d975a IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/inadyn/Config.in b/buildroot/package/inadyn/Config.in index d03db83e3..3589823da 100644 --- a/buildroot/package/inadyn/Config.in +++ b/buildroot/package/inadyn/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_INADYN depends on BR2_USE_MMU # Uses fork() depends on !BR2_STATIC_LIBS # dlopen() select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBITE help INADYN is a free DynDNS client. It gives the possibility to have your own fixed hostname registered on the internet, diff --git a/buildroot/package/inadyn/inadyn.hash b/buildroot/package/inadyn/inadyn.hash index 2691ba0ef..8480e449c 100644 --- a/buildroot/package/inadyn/inadyn.hash +++ b/buildroot/package/inadyn/inadyn.hash @@ -1,5 +1,6 @@ -# From https://github.com/troglobit/inadyn/releases/download/v2.5/inadyn-2.5.tar.xz.md5 -md5 8a864d5186e54d24de2d7554fc01b3ec inadyn-2.5.tar.xz +# From https://github.com/troglobit/inadyn/releases/download/v2.7/inadyn-2.7.tar.xz.md5 +md5 3ab125df504a9755264a9ebeedbfa4de inadyn-2.7.tar.xz + # Locally computed -sha256 4a9ad208671f62912428413da0282450b2d2c4da38f3c95c4ac975d048c41fcd inadyn-2.5.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 eb03bc9d9c09dfbbc651b43a2eb5a967d0454a8293576df23784710dac50c6a4 inadyn-2.7.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/inadyn/inadyn.mk b/buildroot/package/inadyn/inadyn.mk index 5f6784925..7888f5a36 100644 --- a/buildroot/package/inadyn/inadyn.mk +++ b/buildroot/package/inadyn/inadyn.mk @@ -4,12 +4,12 @@ # ################################################################################ -INADYN_VERSION = 2.5 +INADYN_VERSION = 2.7 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz INADYN_LICENSE = GPL-2.0+ INADYN_LICENSE_FILES = COPYING -INADYN_DEPENDENCIES = host-pkgconf libconfuse libite +INADYN_DEPENDENCIES = host-pkgconf libconfuse ifeq ($(BR2_PACKAGE_OPENSSL),y) INADYN_CONF_OPTS += --enable-openssl diff --git a/buildroot/package/inotify-tools/Config.in b/buildroot/package/inotify-tools/Config.in index 1ca01b6e1..6b113d9e4 100644 --- a/buildroot/package/inotify-tools/Config.in +++ b/buildroot/package/inotify-tools/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_INOTIFY_TOOLS filesystem events. Provides the 'inotifywait' and 'inotifywatch' binaries. - https://github.com/rvoicilas/inotify-tools + https://github.com/inotify-tools/inotify-tools diff --git a/buildroot/package/inotify-tools/inotify-tools.hash b/buildroot/package/inotify-tools/inotify-tools.hash index 83dc22b4a..5984827f8 100644 --- a/buildroot/package/inotify-tools/inotify-tools.hash +++ b/buildroot/package/inotify-tools/inotify-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac inotify-tools-3.20.1.tar.gz -sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING +sha256 c5b018567814ea555d716f518b6e3ae243c733f7bd3e8585d81748a6da286f3c inotify-tools-3.20.2.2.tar.gz +sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING diff --git a/buildroot/package/inotify-tools/inotify-tools.mk b/buildroot/package/inotify-tools/inotify-tools.mk index 63626307c..b410ade33 100644 --- a/buildroot/package/inotify-tools/inotify-tools.mk +++ b/buildroot/package/inotify-tools/inotify-tools.mk @@ -4,11 +4,10 @@ # ################################################################################ -INOTIFY_TOOLS_VERSION = 3.20.1 -INOTIFY_TOOLS_SITE = $(call github,rvoicilas,inotify-tools,$(INOTIFY_TOOLS_VERSION)) +INOTIFY_TOOLS_VERSION = 3.20.2.2 +INOTIFY_TOOLS_SITE = https://github.com/inotify-tools/inotify-tools/releases/download/$(INOTIFY_TOOLS_VERSION) INOTIFY_TOOLS_LICENSE = GPL-2.0+ INOTIFY_TOOLS_LICENSE_FILES = COPYING INOTIFY_TOOLS_INSTALL_STAGING = YES -INOTIFY_TOOLS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.hash b/buildroot/package/intel-gmmlib/intel-gmmlib.hash index a23020673..1e8baba6c 100644 --- a/buildroot/package/intel-gmmlib/intel-gmmlib.hash +++ b/buildroot/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 60944d54a4992553f92d71ba9f8f4191d297407b564b0f24e9912b415689582e intel-gmmlib-19.2.3.tar.gz +sha256 bb874b41c499abb8f6253b1834e93a02ed9744de71f2503ee9cd4100af7c1860 intel-gmmlib-19.4.1.tar.gz sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.mk b/buildroot/package/intel-gmmlib/intel-gmmlib.mk index 7a943ed14..517fc0913 100644 --- a/buildroot/package/intel-gmmlib/intel-gmmlib.mk +++ b/buildroot/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 19.2.3 +INTEL_GMMLIB_VERSION = 19.4.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.hash b/buildroot/package/intel-mediadriver/intel-mediadriver.hash index f53d19a69..5d016695a 100644 --- a/buildroot/package/intel-mediadriver/intel-mediadriver.hash +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79279c991d918deaa52239dac55787b9c7562e520cd58744171b468d28b8af40 intel-media-19.2.1.tar.gz +sha256 a03bd75eefe9cb0245e3aab2723b3fef555d9f180a180b2c29d7b12d483d9ec2 intel-media-19.4.0r.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.mk b/buildroot/package/intel-mediadriver/intel-mediadriver.mk index 0acac52e3..c3157867e 100644 --- a/buildroot/package/intel-mediadriver/intel-mediadriver.mk +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 19.2.1 +INTEL_MEDIADRIVER_VERSION = 19.4.0r INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause diff --git a/buildroot/package/intel-mediasdk/intel-mediasdk.hash b/buildroot/package/intel-mediasdk/intel-mediasdk.hash index 2a582e611..103c8bb52 100644 --- a/buildroot/package/intel-mediasdk/intel-mediasdk.hash +++ b/buildroot/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03c11a0379b61e292e789fa3dc9308ce45f36d68b4ebf437806c0e2c32357970 intel-mediasdk-19.2.1.tar.gz +sha256 289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1 intel-mediasdk-19.4.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/buildroot/package/intel-mediasdk/intel-mediasdk.mk b/buildroot/package/intel-mediasdk/intel-mediasdk.mk index 368e10830..a2ffe081d 100644 --- a/buildroot/package/intel-mediasdk/intel-mediasdk.mk +++ b/buildroot/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 19.2.1 +INTEL_MEDIASDK_VERSION = 19.4.0 INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk index d3c0ac44e..043367770 100644 --- a/buildroot/package/intel-microcode/intel-microcode.mk +++ b/buildroot/package/intel-microcode/intel-microcode.mk @@ -27,4 +27,9 @@ else INTEL_MICROCODE_INSTALL_TARGET = NO endif +define INTEL_MICROCODE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +endef + $(eval $(generic-package)) diff --git a/buildroot/package/ipcalc/0001-Do-not-fail-to-build-if-ronn-is-missing.patch b/buildroot/package/ipcalc/0001-Do-not-fail-to-build-if-ronn-is-missing.patch new file mode 100644 index 000000000..419f4bba4 --- /dev/null +++ b/buildroot/package/ipcalc/0001-Do-not-fail-to-build-if-ronn-is-missing.patch @@ -0,0 +1,49 @@ +From 322294d7bf61f9fdf0e45e9b6c6013a7c6a35bfd Mon Sep 17 00:00:00 2001 +From: Derrick Lyndon Pallas +Date: Wed, 14 Oct 2020 18:25:54 +0000 +Subject: [PATCH] Do not fail to build if ronn is missing + +If ruby-ronn is missing, we can not compile the man page from markdown but +that should not prevent the application from building. + +Signed-off-by: Derrick Lyndon Pallas +--- + meson.build | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index a2169fc..981d4a4 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,16 +72,17 @@ ipcalc = executable('ipcalc', + install : true + ) + +-ronn = find_program('ronn', required: true) +- +-ipcalc_1 = custom_target( +- 'ipcalc.1', +- output : 'ipcalc.1', +- input : 'ipcalc.1.md', +- command : [ronn, '--pipe', '-r', '@INPUT@'], +- capture: true, +- install_dir: join_paths(get_option('mandir'), 'man1'), +- install: true +-) ++ronn = find_program('ronn', required: false) ++if ronn.found() ++ ipcalc_1 = custom_target( ++ 'ipcalc.1', ++ output : 'ipcalc.1', ++ input : 'ipcalc.1.md', ++ command : [ronn, '--pipe', '-r', '@INPUT@'], ++ capture: true, ++ install_dir: join_paths(get_option('mandir'), 'man1'), ++ install: true ++ ) ++endif + + subdir('tests') +-- +2.28.0 + diff --git a/buildroot/package/ipcalc/0002-Include-stdarg-for-va_list.patch b/buildroot/package/ipcalc/0002-Include-stdarg-for-va_list.patch new file mode 100644 index 000000000..9261ce383 --- /dev/null +++ b/buildroot/package/ipcalc/0002-Include-stdarg-for-va_list.patch @@ -0,0 +1,29 @@ +From 7795c02fb1e0f5fdbdf949007e52684c590235d4 Mon Sep 17 00:00:00 2001 +From: Derrick Lyndon Pallas +Date: Wed, 14 Oct 2020 18:40:38 +0000 +Subject: [PATCH] Include stdarg for va_list + +While several function signatures use va_list, stdarg was never included. +This fixes that. + +Signed-off-by: Derrick Lyndon Pallas +--- + ipcalc.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ipcalc.h b/ipcalc.h +index 0e81320..a220dc5 100644 +--- a/ipcalc.h ++++ b/ipcalc.h +@@ -20,6 +20,8 @@ + #ifndef _IPCALC_H + #define _IPCALC_H + ++#include /* for va_list */ ++ + #if defined(USE_GEOIP) + void geo_ip_lookup(const char *ip, char **country, char **ccode, char **city, char **coord); + int geo_setup(void); +-- +2.28.0 + diff --git a/buildroot/package/ipcalc/Config.in b/buildroot/package/ipcalc/Config.in new file mode 100644 index 000000000..5f5f7ad88 --- /dev/null +++ b/buildroot/package/ipcalc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_IPCALC + bool "ipcalc" + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + help + A modern IPv4/IPv6 ipcalc tool, assisting in network + calculations in command line and as a tool for scripts. + + https://gitlab.com/ipcalc/ipcalc diff --git a/buildroot/package/ipcalc/ipcalc.hash b/buildroot/package/ipcalc/ipcalc.hash new file mode 100644 index 000000000..df610eb69 --- /dev/null +++ b/buildroot/package/ipcalc/ipcalc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d7aca371335ab3e35364bcfe34cd0229db005be8bebb9236608ec318cb3f7748 ipcalc-1.0.0.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ipcalc/ipcalc.mk b/buildroot/package/ipcalc/ipcalc.mk new file mode 100644 index 000000000..c4ce8b9ce --- /dev/null +++ b/buildroot/package/ipcalc/ipcalc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# ipcalc +# +################################################################################ + +IPCALC_VERSION = 1.0.0 +IPCALC_SITE = https://gitlab.com/ipcalc/ipcalc/-/archive/$(IPCALC_VERSION) +IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 +IPCALC_LICENSE = GPL-2.0+ +IPCALC_LICENSE_FILES = COPYING + +IPCALC_CONF_OPTS = \ + -Duse_maxminddb=disabled \ + -Duse_geoip=disabled + +$(eval $(meson-package)) diff --git a/buildroot/package/iperf3/iperf3.hash b/buildroot/package/iperf3/iperf3.hash index 2e6cfd5ab..fa9d54f40 100644 --- a/buildroot/package/iperf3/iperf3.hash +++ b/buildroot/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.7.tar.gz.sha256 -sha256 d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c iperf-3.7.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.9.tar.gz.sha256 +sha256 24b63a26382325f759f11d421779a937b63ca1bc17c44587d2fcfedab60ac038 iperf-3.9.tar.gz # Locally computed -sha256 ee58f1e69139d39cfb055df15fe84453a379936dd45e44dbebf26c78afa3f5d4 LICENSE +sha256 9ef73096bdd5209dd979bfa1fec70aeb42a7255d2df3aec423642aa92d5e9f40 LICENSE diff --git a/buildroot/package/iperf3/iperf3.mk b/buildroot/package/iperf3/iperf3.mk index 3537b2382..f67fa1702 100644 --- a/buildroot/package/iperf3/iperf3.mk +++ b/buildroot/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.7 +IPERF3_VERSION = 3.9 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT @@ -12,8 +12,6 @@ IPERF3_LICENSE_FILES = LICENSE IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -IPERF3_CONF_OPTS += --disable-profiling - ifeq ($(BR2_PACKAGE_OPENSSL),y) # We intentionally don't pass --with-openssl, otherwise pkg-config is # not used, and indirect libraries are not picked up when static diff --git a/buildroot/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch b/buildroot/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch new file mode 100644 index 000000000..0b49160ba --- /dev/null +++ b/buildroot/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch @@ -0,0 +1,40 @@ +From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001 +From: Vaclav Dolezal +Date: Thu, 23 Jan 2020 11:26:32 +0100 +Subject: [PATCH] hpmfwupg: move variable definition to .c file + +Signed-off-by: Vaclav Dolezal +[Retrieved from: +https://github.com/ipmitool/ipmitool/commit/c3939dac2c060651361fc71516806f9ab8c38901] +Signed-off-by: Fabrice Fontaine +--- + include/ipmitool/ipmi_hpmfwupg.h | 2 +- + lib/ipmi_hpmfwupg.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h +index de65292b..07f597be 100644 +--- a/include/ipmitool/ipmi_hpmfwupg.h ++++ b/include/ipmitool/ipmi_hpmfwupg.h +@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { + char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; + }VERSIONINFO, *PVERSIONINFO; + +-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; + + #define TARGET_VER (0x01) + #define ROLLBACK_VER (0x02) +diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c +index 4aa8cecd..d63d2c15 100644 +--- a/lib/ipmi_hpmfwupg.c ++++ b/lib/ipmi_hpmfwupg.c +@@ -50,6 +50,8 @@ + + extern int verbose; + ++VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++ + int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, + int activate, int, int); + int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx); diff --git a/buildroot/package/ipmiutil/0001-no-build-doc.patch b/buildroot/package/ipmiutil/0001-no-build-doc.patch deleted file mode 100644 index ea7da9724..000000000 --- a/buildroot/package/ipmiutil/0001-no-build-doc.patch +++ /dev/null @@ -1,31 +0,0 @@ -configure: do not build doc - -Fixes: - http://autobuild.buildroot.org/results/2ec/2ecfb1143ba89ffa5cdc8096bb175b2c396c4670/ - http://autobuild.buildroot.org/results/c49/c497fc446140694084922d51fe6be308ce5c1c1a/ - http://autobuild.buildroot.org/results/434/434b156b5c9b5c7b65ffe6174cf4e029e7e3ffd8/ - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.ac b/configure.ac -index 344b27a71a35..41b6ea89167a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ LIB_DIR="/usr/lib" - isredhat=0 - init_scripts="scripts/ipmi_port.sh scripts/ipmiutil_evt scripts/ipmiutil_asy scripts/ipmiutil_wdt" - projdir=`pwd` --SUBDIR_S="doc scripts lib util" -+SUBDIR_S="scripts lib util" - os=Linux - - # ltmain.sh, config.sub, et al should have been created, but check to be sure. -@@ -162,7 +162,7 @@ AC_ARG_ENABLE([standalone], - LANPLUS_SAM="no" - LD_SAMX="" - CFLAGS="-O2" -- SUBDIR_S="doc scripts util" -+ SUBDIR_S="scripts util" - if test "x$cross_compiling" = "xyes"; then - # cross-compiling, so link with -static (e.g. Android ARM) - CROSS_LFLAGS="-static" diff --git a/buildroot/package/ipmiutil/ipmiutil.hash b/buildroot/package/ipmiutil/ipmiutil.hash index 3f89b9049..f87c2762d 100644 --- a/buildroot/package/ipmiutil/ipmiutil.hash +++ b/buildroot/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 0d448d14726e2fda0eb9451fb2866a5c ipmiutil-3.1.3.tar.gz -sha1 d20cb3194f4c5cb8c9fd64b3693d5b53dc9510d4 ipmiutil-3.1.3.tar.gz +md5 fab260bc834a0f3f9324a6365fc26eca ipmiutil-3.1.7.tar.gz +sha1 a0cd29820b15166120eb4a51e6239bfa6f9c65dd ipmiutil-3.1.7.tar.gz # Locally computed -sha256 b80303b6f05cbe48e728dd925fef201e9604a90cd3fc9c8af113367e8d6dbe57 ipmiutil-3.1.3.tar.gz -sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING +sha256 911fd6f8b33651b98863d57e678d2fc593bc43fcd2a21f5dc7d5db8f92128a9a ipmiutil-3.1.7.tar.gz +sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/buildroot/package/ipmiutil/ipmiutil.mk b/buildroot/package/ipmiutil/ipmiutil.mk index 9633914e1..d85b9643f 100644 --- a/buildroot/package/ipmiutil/ipmiutil.mk +++ b/buildroot/package/ipmiutil/ipmiutil.mk @@ -4,12 +4,10 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.3 +IPMIUTIL_VERSION = 3.1.7 IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING -# We're patching configure.ac -IPMIUTIL_AUTORECONF = YES IPMIUTIL_MAKE = $(MAKE1) diff --git a/buildroot/package/iproute2/0001-devlink-update-include-files.patch b/buildroot/package/iproute2/0001-devlink-update-include-files.patch new file mode 100644 index 000000000..8cc6e4ec6 --- /dev/null +++ b/buildroot/package/iproute2/0001-devlink-update-include-files.patch @@ -0,0 +1,55 @@ +From 12fafa27c7b306e6c397e858f4d5a8159500f659 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Thu, 11 Jun 2020 09:46:46 -0700 +Subject: devlink: update include files + +Use the tool iwyu to get more complete list of includes for +all the bits used by devlink. + +This should also fix build with musl libc. + +Fixes: c4dfddccef4e ("fix JSON output of mon command") +Reported-off-by: Dan Robertson +Signed-off-by: Stephen Hemminger + +[Retrieved from: +https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=12fafa27c7b306e6c397e858f4d5a8159500f659] +Signed-off-by: Fabrice Fontaine +--- + devlink/devlink.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/devlink/devlink.c b/devlink/devlink.c +index 507972c3..ce2e4676 100644 +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -19,18 +19,25 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + #include + #define _LINUX_SYSINFO_H /* avoid collision with musl header */ + #include + #include ++#include + #include + #include ++#include ++#include + #include + + #include "SNAPSHOT.h" + #include "list.h" + #include "mnlg.h" +-#include "json_writer.h" ++#include "json_print.h" + #include "utils.h" + #include "namespace.h" + +-- +cgit 1.2.3-1.el7 + diff --git a/buildroot/package/iproute2/iproute2.hash b/buildroot/package/iproute2/iproute2.hash index c451cfa94..b2a9e21e1 100644 --- a/buildroot/package/iproute2/iproute2.hash +++ b/buildroot/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b iproute2-5.5.0.tar.xz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21 iproute2-5.7.0.tar.xz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/iproute2/iproute2.mk b/buildroot/package/iproute2/iproute2.mk index 726849713..1b71f5c06 100644 --- a/buildroot/package/iproute2/iproute2.mk +++ b/buildroot/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 5.5.0 +IPROUTE2_VERSION = 5.7.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/buildroot/package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch b/buildroot/package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch new file mode 100644 index 000000000..c2b6a3151 --- /dev/null +++ b/buildroot/package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch @@ -0,0 +1,47 @@ +From 068f37c100e105fd8edcae07762613e8e33c5282 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 18 Aug 2020 20:26:58 +0200 +Subject: [PATCH] configure.ac: add AC_USE_SYSTEM_EXTENSIONS + +uint and alphasort come from glibc, and with ancient versions thereof, +they were guarded behind different sets of feature-test macros (see +manpage for scandir() for example), which were not default back then. + +In file included from iprdump.c:17:0: +iprlib.h:1866:2: error: unknown type name 'uint' + uint supported_with_min_ucode_level; + ^ + +iprlib.c: In function 'ipr_get_pci_slots': +iprlib.c:1999:48: error: 'alphasort' undeclared (first use in this function) + num_slots = scandir(rootslot, &slotdir, NULL, alphasort); + ^ + +Fix them by adding AC_USE_SYSTEM_EXTENSIONS in configure.ac + +Fixes: + - http://autobuild.buildroot.org/results/41fde4aa06f7c025bb05aa594716643b9010358f + +[Upstream status: https://github.com/bjking1/iprutils/pull/4] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: issue is with glibc, not gcc] +Signed-off-by: Yann E. MORIN +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 462a8b5..7f5fa7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,7 @@ AC_INIT([iprutils], [2.4.19.1], [iprdd-devel@lists.sourceforge.net]) + + AM_INIT_AUTOMAKE([1.9 foreign]) + AC_CONFIG_MACRO_DIR([build-aux]) ++AC_USE_SYSTEM_EXTENSIONS + + # Checks for programs. + AC_PROG_CC +-- +2.27.0 + diff --git a/buildroot/package/iprutils/iprutils.hash b/buildroot/package/iprutils/iprutils.hash index 423943b22..bcad6e6d0 100644 --- a/buildroot/package/iprutils/iprutils.hash +++ b/buildroot/package/iprutils/iprutils.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/ -md5 e4011051bba7470df3936cbba7dced98 iprutils-2.4.15.1.tar.gz -sha1 ed6c362ee3c6bd9023ee60d0d1a1ce5543c27c41 iprutils-2.4.15.1.tar.gz +# From https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.18/ +md5 df733f504dd4f96abf3272f679b25311 iprutils-2.4.18.1.tar.gz +sha1 701a1a9af6890d333904a92f0b01c26b92f821fa iprutils-2.4.18.1.tar.gz # Locally computed: -sha256 a733e65f8fb19565f2ef5191eaa2a14d816fabed0fc254ab4bbf1a4c7800ebe5 iprutils-2.4.15.1.tar.gz -sha256 59b4179e61248aff9cd2d6ee4cd1dbbd0ef48836fe2eeee19f4b16459785104a LICENSE +sha256 1c26aee3bf95517fcb844f35ff2711a39b46cbfb50619db1d792c93eeee6f43d iprutils-2.4.18.1.tar.gz +sha256 59b4179e61248aff9cd2d6ee4cd1dbbd0ef48836fe2eeee19f4b16459785104a LICENSE diff --git a/buildroot/package/iprutils/iprutils.mk b/buildroot/package/iprutils/iprutils.mk index 1165b3db0..9595125ac 100644 --- a/buildroot/package/iprutils/iprutils.mk +++ b/buildroot/package/iprutils/iprutils.mk @@ -4,11 +4,13 @@ # ################################################################################ -IPRUTILS_VERSION_MAJOR = 2.4.15 +IPRUTILS_VERSION_MAJOR = 2.4.18 IPRUTILS_VERSION = $(IPRUTILS_VERSION_MAJOR).1 IPRUTILS_SITE = https://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION_MAJOR) IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils zlib IPRUTILS_LICENSE = Common Public License Version 1.0 IPRUTILS_LICENSE_FILES = LICENSE +# We"re patching configure.ac +IPRUTILS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/ipset/ipset.hash b/buildroot/package/ipset/ipset.hash index 9c95ca420..fb200585d 100644 --- a/buildroot/package/ipset/ipset.hash +++ b/buildroot/package/ipset/ipset.hash @@ -1,6 +1,6 @@ -# From http://ipset.netfilter.org/ipset-7.5.tar.bz2.md5sum.txt -md5 1f3156c68f6fa6de03d8f3ca0539fb78 ipset-7.5.tar.bz2 +# From http://ipset.netfilter.org/ipset-7.6.tar.bz2.md5sum.txt +md5 e107b679c3256af795261cece864d6d9 ipset-7.6.tar.bz2 # Calculated based on the hash above -sha256 a57aee54ab6ffe9e04603a464bbf69d66db976500bb04dd04fd3fbd6efb36a0b ipset-7.5.tar.bz2 +sha256 0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db ipset-7.6.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/ipset/ipset.mk b/buildroot/package/ipset/ipset.mk index 383e90af3..869763d32 100644 --- a/buildroot/package/ipset/ipset.mk +++ b/buildroot/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.5 +IPSET_VERSION = 7.6 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf diff --git a/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch b/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch new file mode 100644 index 000000000..8d364b378 --- /dev/null +++ b/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch @@ -0,0 +1,58 @@ +From 6cb8af1ff3951e47def7a16db39289dc9d9c61fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= +Date: Tue, 23 Jun 2020 16:09:02 -0700 +Subject: libxtables: compiler warning fixes for NO_SHARED_LIBS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes two issues with NO_SHARED_LIBS: + - #include is ifdef'ed out and thus dlclose() + triggers an undeclared function compiler warning + - dlreg_add() is unused and thus triggers an unused + function warning + +Test: builds without warnings +Signed-off-by: Maciej Żenczykowski +Signed-off-by: Pablo Neira Ayuso + +[Retrieved from: +https://git.netfilter.org/iptables/commit/libxtables/xtables.c?id=6cb8af1ff3951e47def7a16db39289dc9d9c61fe] +Signed-off-by: Fabrice Fontaine +--- + libxtables/xtables.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libxtables/xtables.c b/libxtables/xtables.c +index 7fe42580..8907ba20 100644 +--- a/libxtables/xtables.c ++++ b/libxtables/xtables.c +@@ -206,6 +206,7 @@ struct xtables_target *xtables_targets; + static bool xtables_fully_register_pending_match(struct xtables_match *me); + static bool xtables_fully_register_pending_target(struct xtables_target *me); + ++#ifndef NO_SHARED_LIBS + /* registry for loaded shared objects to close later */ + struct dlreg { + struct dlreg *next; +@@ -237,6 +238,7 @@ static void dlreg_free(void) + dlreg = next; + } + } ++#endif + + void xtables_init(void) + { +@@ -267,7 +269,9 @@ void xtables_init(void) + + void xtables_fini(void) + { ++#ifndef NO_SHARED_LIBS + dlreg_free(); ++#endif + } + + void xtables_set_nfproto(uint8_t nfproto) +-- +cgit v1.2.3 + diff --git a/buildroot/package/iptables/iptables.hash b/buildroot/package/iptables/iptables.hash index 2e149aa11..725770543 100644 --- a/buildroot/package/iptables/iptables.hash +++ b/buildroot/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 iptables-1.8.3.tar.bz2 +sha256 d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309 iptables-1.8.5.tar.bz2 # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/iptables/iptables.mk b/buildroot/package/iptables/iptables.mk index ae5cf4ddd..442639f15 100644 --- a/buildroot/package/iptables/iptables.mk +++ b/buildroot/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.3 +IPTABLES_VERSION = 1.8.5 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES @@ -47,4 +47,11 @@ else IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy endif +define IPTABLES_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/iptraf-ng/Config.in b/buildroot/package/iptraf-ng/Config.in index 5c3b4848b..5c61b7c0e 100644 --- a/buildroot/package/iptraf-ng/Config.in +++ b/buildroot/package/iptraf-ng/Config.in @@ -1,13 +1,17 @@ config BR2_PACKAGE_IPTRAF_NG bool "iptraf-ng" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 select BR2_PACKAGE_NCURSES help - IPTraf-ng is a ncurses-based network monitoring utility. It - gathers data like TCP connection packet and byte counts, - interface statistics and activity indicators. + IPTraf-ng is a console-based network monitoring program for + Linux that gathers displays information about IP traffic. - https://fedorahosted.org/iptraf-ng/ + https://github.com/iptraf-ng/iptraf-ng IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org). + +comment "iptraf-ng needs a toolchain w/ kernel headers >= 3.14" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 diff --git a/buildroot/package/iptraf-ng/iptraf-ng.hash b/buildroot/package/iptraf-ng/iptraf-ng.hash index 0a257ec2f..314d5cee2 100644 --- a/buildroot/package/iptraf-ng/iptraf-ng.hash +++ b/buildroot/package/iptraf-ng/iptraf-ng.hash @@ -1,4 +1,3 @@ -# From https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz.sum -sha1 a2e51b0dd6b8c80583fc25d055850c96b3d2f544 iptraf-ng-1.1.4.tar.gz # Locally computed +sha256 9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870 iptraf-ng-1.2.1.tar.gz sha256 4e49bef38f621aac4a870da4b30011c7b7abc7256b218daec1c425b08448ae1e LICENSE diff --git a/buildroot/package/iptraf-ng/iptraf-ng.mk b/buildroot/package/iptraf-ng/iptraf-ng.mk index ac572b9ee..044630be4 100644 --- a/buildroot/package/iptraf-ng/iptraf-ng.mk +++ b/buildroot/package/iptraf-ng/iptraf-ng.mk @@ -4,16 +4,21 @@ # ################################################################################ -IPTRAF_NG_VERSION = 1.1.4 -IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng +IPTRAF_NG_VERSION = 1.2.1 +IPTRAF_NG_SITE = $(call github,iptraf-ng,iptraf-ng,v$(IPTRAF_NG_VERSION)) IPTRAF_NG_LICENSE = GPL-2.0+ IPTRAF_NG_LICENSE_FILES = LICENSE IPTRAF_NG_DEPENDENCIES = ncurses -IPTRAF_NG_MAKE_ENV = \ - NCURSES_LDFLAGS="-lpanel -lncurses" +define IPTRAF_NG_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + NCURSES_LDFLAGS="-lpanel -lncurses" \ + -C $(@D) +endef -IPTRAF_NG_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" +define IPTRAF_NG_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + prefix=/usr DESTDIR=$(TARGET_DIR) install +endef -$(eval $(autotools-package)) +$(eval $(generic-package)) diff --git a/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch b/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch deleted file mode 100644 index 851d04378..000000000 --- a/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5bb4432b8c194620c28a45a069de1b3dad692ac9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 28 Dec 2019 11:24:12 +0100 -Subject: [PATCH] meson.build: fix static build with libidn2 - -libidn2 can optionnaly depends on libunistring so use dependency -function instead of cc.find_library ro retrieve this dependency and -avoid the following build failure when building statically: - -FAILED: ping -/home/buildroot/autobuild/run/instance-1/output-1/host/bin/arm-linux-gcc -o ping 'ping@exe/ping.c.o' 'ping@exe/ping_common.c.o' 'ping@exe/ping6_common.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group libcommon.a -lm -lcap -lidn2 /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/7.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/lib/libatomic.a -lpthread /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a -lresolv -Wl,--end-group '-Wl,-rpath,$ORIGIN/' -Wl,-rpath-link,/home/buildroot/autobuild/run/instance-1/output-1/build/iputils-20190709/build/ -/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/7.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/run/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libidn2.a(lookup.o): in function `idn2_lookup_u8': -lookup.c:(.text+0x7c): undefined reference to `u8_strlen' - -Fixes: - - http://autobuild.buildroot.org/results/82d4738711a009959436fa419bd78c7a9540d33e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/iputils/iputils/pull/245] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 53c65b2..905cb96 100644 ---- a/meson.build -+++ b/meson.build -@@ -130,7 +130,7 @@ endif - - opt = get_option('USE_IDN') - if opt == true -- idn_dep = cc.find_library('idn2', required : false) -+ idn_dep = dependency('libidn2', required : false) - if idn_dep.found() - add_project_arguments('-DUSE_IDN', language : 'c') - conf.set('USE_IDN', 1, --- -2.24.0 - diff --git a/buildroot/package/iputils/Config.in b/buildroot/package/iputils/Config.in index b5d9141a7..0d4a4ba3f 100644 --- a/buildroot/package/iputils/Config.in +++ b/buildroot/package/iputils/Config.in @@ -7,3 +7,70 @@ config BR2_PACKAGE_IPUTILS etc. https://github.com/iputils/iputils + +if BR2_PACKAGE_IPUTILS + +config BR2_PACKAGE_IPUTILS_ARPING + bool "arping" + default y + help + Installs arping. + +config BR2_PACKAGE_IPUTILS_CLOCKDIFF + bool "clockdiff" + default y + help + Installs clockdiff. + +config BR2_PACKAGE_IPUTILS_PING + bool "ping" + default y + help + Installs ping. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "rarpd" + help + Installs rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "rdisc" + default y + help + Installs rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "rdisc (server code)" + default y + depends on BR2_PACKAGE_IPUTILS_RDISC + help + Builds rdisc with server code. + +config BR2_PACKAGE_IPUTILS_TFTPD + bool "tftpd" + help + Installs tftpd. + +config BR2_PACKAGE_IPUTILS_TRACEPATH + bool "tracepath" + default y + help + Installs tracepath. + +config BR2_PACKAGE_IPUTILS_TRACEROUTE6 + bool "traceroute6" + default y + help + Installs traceroute6. + +config BR2_PACKAGE_IPUTILS_NINFOD + bool "ninfod" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires + help + Installs ninfod. + +comment "ninfod needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +endif diff --git a/buildroot/package/iputils/iputils.hash b/buildroot/package/iputils/iputils.hash index 3630ae867..11f46bac2 100644 --- a/buildroot/package/iputils/iputils.hash +++ b/buildroot/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/s20190709/sha256sum.asc -sha256 a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a iputils-20190709.tar.gz +# https://github.com/iputils/iputils/releases/download/s20200821/sha256sum.asc +sha256 f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b iputils-20200821.tar.gz # Locally computed sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/buildroot/package/iputils/iputils.mk b/buildroot/package/iputils/iputils.mk index d09bc58b3..4f8d9cb76 100644 --- a/buildroot/package/iputils/iputils.mk +++ b/buildroot/package/iputils/iputils.mk @@ -11,12 +11,80 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20190709 +IPUTILS_VERSION = 20200821 IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# Selectively build binaries +IPUTILS_CONF_OPTS += \ + -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ + -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ + -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ + -DBUILD_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ + -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ + -DBUILD_TRACEROUTE6=$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),true,false) \ + -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) + +# +# arping +# +ifeq ($(BR2_PACKAGE_IPUTILS_ARPING),y) +IPUTILS_CONF_OPTS += -DBUILD_ARPING=true + +# move some binaries to the same location as where Busybox installs +# the corresponding applets, so that we have a single version of the +# tools (from iputils) +define IPUTILS_MOVE_ARPING_BINARY + mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_ARPING_BINARY + +else +IPUTILS_CONF_OPTS += -DBUILD_ARPING=false +endif + +# +# ping +# +ifeq ($(BR2_PACKAGE_IPUTILS_PING),y) +IPUTILS_CONF_OPTS += -DBUILD_PING=true + +# same reason to move the ping binary as for arping +ifeq ($(BR2_ROOTFS_MERGED_USR),) +define IPUTILS_MOVE_PING_BINARY + mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_PING_BINARY +endif + +# upstream requires distros to create symlink +define IPUTILS_CREATE_PING6_SYMLINK + ln -sf ping $(TARGET_DIR)/bin/ping6 +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK + +else +IPUTILS_CONF_OPTS += -DBUILD_PING=false +endif + +# +# tftpd +# +ifeq ($(BR2_PACKAGE_IPUTILS_TFTPD),y) +IPUTILS_CONF_OPTS += -DBUILD_TFTPD=true + +define IPUTILS_MOVE_TFTPD_BINARY + mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_TFTPD_BINARY + +else +IPUTILS_CONF_OPTS += -DBUILD_TFTPD=false +endif + +# Handle libraries ifeq ($(BR2_PACKAGE_LIBCAP),y) IPUTILS_CONF_OPTS += -DUSE_CAP=true IPUTILS_DEPENDENCIES += libcap @@ -31,80 +99,45 @@ else IPUTILS_CONF_OPTS += -DUSE_IDN=false endif -ifeq ($(BR2_PACKAGE_NETTLE),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle -IPUTILS_DEPENDENCIES += nettle -else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=gcrypt -IPUTILS_DEPENDENCIES += libgcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=openssl -IPUTILS_DEPENDENCIES += openssl -else -IPUTILS_CONF_OPTS += -DUSE_CRYPTO=kernel -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) IPUTILS_DEPENDENCIES += systemd endif -# ninfod requires -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -IPUTILS_NINFOD = n -endif - -ifeq ($(IPUTILS_NINFOD),n) -IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false -else -IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true -endif - ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) IPUTILS_CONF_OPTS += -DUSE_GETTEXT=true else IPUTILS_CONF_OPTS += -DUSE_GETTEXT=false endif -IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true - # XSL Stylesheets for DocBook 5 not packaged for buildroot IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false -# move iputils binaries to the same location as where Busybox installs -# the corresponding applets, so that we have a single version of the -# tools (from iputils) -define IPUTILS_MOVE_BINARIES - mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping - $(if $(BR2_ROOTFS_MERGED_USR),,\ - mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping) - mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd -endef -IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES - -# upstream requires distros to create symlink -define IPUTILS_CREATE_PING6_SYMLINK - ln -sf ping $(TARGET_DIR)/bin/ping6 -endef -IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK - # handle permissions ourselves IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true ifeq ($(BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES),y) define IPUTILS_PERMISSIONS - /usr/sbin/arping f 755 0 0 - - - - - - /usr/bin/clockdiff f 755 0 0 - - - - - - |xattr cap_net_raw+p - /bin/ping f 755 0 0 - - - - - - |xattr cap_net_raw+p - /usr/bin/traceroute6 f 755 0 0 - - - - - - |xattr cap_net_raw+p + $(if $(BR2_PACKAGE_IPUTILS_ARPING),\ + /usr/sbin/arping f 755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),\ + /usr/bin/clockdiff f 755 0 0 - - - - - + |xattr cap_net_raw+p,) + $(if $(BR2_PACKAGE_IPUTILS_PING),\ + /bin/ping f 755 0 0 - - - - - + |xattr cap_net_raw+p,) + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\ + /usr/bin/traceroute6 f 755 0 0 - - - - - + |xattr cap_net_raw+p,) endef else define IPUTILS_PERMISSIONS - /usr/sbin/arping f 755 0 0 - - - - - - /usr/bin/clockdiff f 4755 0 0 - - - - - - /bin/ping f 4755 0 0 - - - - - - /usr/bin/traceroute6 f 4755 0 0 - - - - - + $(if $(BR2_PACKAGE_IPUTILS_ARPING),\ + /usr/sbin/arping f 755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),\ + /usr/bin/clockdiff f 4755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_PING),\ + /bin/ping f 4755 0 0 - - - - -,) + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\ + /usr/bin/traceroute6 f 4755 0 0 - - - - -,) endef endif diff --git a/buildroot/package/iw/iw.hash b/buildroot/package/iw/iw.hash index 458262b71..0aa51563f 100644 --- a/buildroot/package/iw/iw.hash +++ b/buildroot/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 04afe857bc8dea67e461946de30ae1b012954b6965839c5c3fda7d0ed15505d5 iw-5.3.tar.xz +sha256 a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f iw-5.4.tar.xz # Locally calculated -sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING +sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/buildroot/package/iw/iw.mk b/buildroot/package/iw/iw.mk index fae65f739..2250ea413 100644 --- a/buildroot/package/iw/iw.mk +++ b/buildroot/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.3 +IW_VERSION = 5.4 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC diff --git a/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch b/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch new file mode 100644 index 000000000..97f8c5a8e --- /dev/null +++ b/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch @@ -0,0 +1,36 @@ +From 377df79e83e2127a087e1aa5ba6173e195e50933 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 10 Sep 2020 07:47:14 +0200 +Subject: [PATCH] src/ap.c: fix build with uclibc + +explicit_bzero is used in src/ap.c since commit +d55e00b31d7bccdbb2ea1cdeb0a749df77a51e47 but src/missing.h is not +included, as a result build with uclibc fails on: + +/srv/storage/autobuild/run/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/ap.o: in function `ap_probe_req_cb': +ap.c:(.text+0x23d8): undefined reference to `explicit_bzero' + +Fixes: + - http://autobuild.buildroot.org/results/c7a0096a269bfc52bd8e23d453d36d5bfb61441d + +Signed-off-by: Fabrice Fontaine +[Upstream: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=0a6de7932a61ec82aca4f78f71dab7247c897860] +--- + src/ap.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ap.c b/src/ap.c +index c972cfcb..ac705c31 100644 +--- a/src/ap.c ++++ b/src/ap.c +@@ -31,6 +31,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/iwd.h" + #include "src/module.h" + #include "src/scan.h" +-- +2.28.0 + diff --git a/buildroot/package/iwd/Config.in b/buildroot/package/iwd/Config.in index ed1ae8f56..4e85fb4fd 100644 --- a/buildroot/package/iwd/Config.in +++ b/buildroot/package/iwd/Config.in @@ -3,16 +3,19 @@ config BR2_PACKAGE_IWD depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell depends on !BR2_STATIC_LIBS # ell depends on BR2_USE_WCHAR # ell select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_ELL + select BR2_PACKAGE_OPENRESOLV if !BR2_PACKAGE_SYSTEMD_RESOLVED help iNet Wireless daemon (iwd) https://iwd.wiki.kernel.org/ -comment "iwd needs a toolchain w/ threads, dynamic library, wchar" +comment "iwd needs a toolchain w/ threads, dynamic library, wchar, headers >= 4.12" depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/buildroot/package/iwd/S40iwd b/buildroot/package/iwd/S40iwd new file mode 100644 index 000000000..6714ca995 --- /dev/null +++ b/buildroot/package/iwd/S40iwd @@ -0,0 +1,42 @@ +#!/bin/sh + +DAEMON="/usr/libexec/iwd" +PIDFILE="/var/run/iwd.pid" + +IWD_ARGS="" + +[ -r "/etc/default/iwd" ] && . "/etc/default/iwd" + +start() { + printf "Starting iwd:" + mkdir -p /tmp/iwd/hotspot + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" \ + -- $IWD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf "Stopping iwd:" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start|stop) + "$1";; + *) + echo "Usage: $0 {start|stop}" + exit 1 +esac diff --git a/buildroot/package/iwd/iwd.hash b/buildroot/package/iwd/iwd.hash index e7ba107a3..16e01ed47 100644 --- a/buildroot/package/iwd/iwd.hash +++ b/buildroot/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 f52ed3cc0dae1f9a82c601df638977f0f6d8d4629ba5e333b4743748a907c0e7 iwd-0.22.tar.gz +sha256 e4178a105021ef1b7b7c23cbc6f8e45cbab3bb0830da588b406ff4a281e9f948 iwd-1.9.tar.gz # License files -sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/iwd/iwd.mk b/buildroot/package/iwd/iwd.mk index fc8b83d1b..58d332dc0 100644 --- a/buildroot/package/iwd/iwd.mk +++ b/buildroot/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 0.22 +IWD_VERSION = 1.9 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+ @@ -46,4 +46,24 @@ else IWD_CONF_OPTS += --disable-systemd-service endif +ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) +IWD_RESOLV_SERVICE = systemd +else +IWD_RESOLV_SERVICE = resolvconf +endif + +define IWD_INSTALL_CONFIG_FILE + $(INSTALL) -D -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf + $(SED) 's,__RESOLV_SERVICE__,$(IWD_RESOLV_SERVICE),' $(TARGET_DIR)/etc/iwd/main.conf +endef + +IWD_POST_INSTALL_TARGET_HOOKS += IWD_INSTALL_CONFIG_FILE + +define IWD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/iwd/S40iwd \ + $(TARGET_DIR)/etc/init.d/S40iwd + mkdir -p $(TARGET_DIR)/var/lib/iwd + ln -sf /tmp/iwd/hotspot $(TARGET_DIR)/var/lib/iwd/hotspot +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/iwd/main.conf b/buildroot/package/iwd/main.conf new file mode 100644 index 000000000..22c1cd733 --- /dev/null +++ b/buildroot/package/iwd/main.conf @@ -0,0 +1,5 @@ +# use built-in dhcp client +[General] +EnableNetworkConfiguration=true +[Network] +NameResolvingService=__RESOLV_SERVICE__ diff --git a/buildroot/package/jailhouse/jailhouse.hash b/buildroot/package/jailhouse/jailhouse.hash index 9fb4d599d..13a260e8d 100644 --- a/buildroot/package/jailhouse/jailhouse.hash +++ b/buildroot/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8de2406f455db07794cc750238ce57bc897673ba2b68c56fc9ae2d8079142b33 jailhouse-0.11.tar.gz +sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/buildroot/package/jailhouse/jailhouse.mk b/buildroot/package/jailhouse/jailhouse.mk index 1aa785170..6356c5a7a 100644 --- a/buildroot/package/jailhouse/jailhouse.mk +++ b/buildroot/package/jailhouse/jailhouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.11 +JAILHOUSE_VERSION = 0.12 JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING diff --git a/buildroot/package/jansson/jansson.hash b/buildroot/package/jansson/jansson.hash index 5baec1968..5c1931698 100644 --- a/buildroot/package/jansson/jansson.hash +++ b/buildroot/package/jansson/jansson.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9 jansson-2.12.tar.gz -sha256 f0a0c95c64e9f49ec4cbfac8e7fee06823c85ee8ba4af5d57aaabb372347adc2 LICENSE +sha256 f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f jansson-2.13.1.tar.gz +sha256 1fff7d37d22157bcd81ab53b6c54da755d7c2f868f15807d9bde920f10730da0 LICENSE diff --git a/buildroot/package/jansson/jansson.mk b/buildroot/package/jansson/jansson.mk index b53381d46..83fb37016 100644 --- a/buildroot/package/jansson/jansson.mk +++ b/buildroot/package/jansson/jansson.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANSSON_VERSION = 2.12 +JANSSON_VERSION = 2.13.1 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE diff --git a/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index ac6b04507..b54c8cbec 100644 --- a/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -26,12 +26,12 @@ Signed-off-by: Adam Duskett create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/Makefile.am b/Makefile.am -index c6e9ad2..42d256b 100644 +index f961fdb..3ddbe59 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -140,6 +140,7 @@ janus_CFLAGS = \ - -DTRANSPORTDIR=\"$(transportdir)\" \ +@@ -151,6 +151,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ + -DLOGGERDIR=\"$(loggerdir)\" \ -DCONFDIR=\"$(confdir)\" \ + @GCC_WARN_UNUSED_BUT_SET@ \ $(BORINGSSL_CFLAGS) \ @@ -60,7 +60,7 @@ index ca17a29..beef91a 100644 + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=63 + JANUS_VERSION=103 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 diff --git a/buildroot/package/janus-gateway/Config.in b/buildroot/package/janus-gateway/Config.in index 45990b633..5d711fe74 100644 --- a/buildroot/package/janus-gateway/Config.in +++ b/buildroot/package/janus-gateway/Config.in @@ -18,6 +18,12 @@ menuconfig BR2_PACKAGE_JANUS_GATEWAY if BR2_PACKAGE_JANUS_GATEWAY +config BR2_PACKAGE_JANUS_GATEWAY_DEMOS + bool "HTML demos" + help + Install the demonstration website, as featured on + https://janus.conf.meetecho.com/ + comment "plugins" config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE @@ -76,12 +82,8 @@ comment "RabbitMQ transport needs a toolchain w/ dynamic library, threads" config BR2_PACKAGE_JANUS_GATEWAY_REST bool "REST (HTTP/HTTPS)" - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD -comment "REST transport needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS bool "Unix Sockets" default y diff --git a/buildroot/package/janus-gateway/janus-gateway.hash b/buildroot/package/janus-gateway/janus-gateway.hash index b74ec2511..ee71979b8 100644 --- a/buildroot/package/janus-gateway/janus-gateway.hash +++ b/buildroot/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 668758f06e2a158f83b89d17aad322959221fbeadcc5611c6f7a38ff76fd2896 janus-gateway-0.8.1.tar.gz -sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING +sha256 7f8c58e5c5ed94821ce877169da90c00e4adf81920ed383a2e0ec241960d121b janus-gateway-0.10.3.tar.gz +sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/buildroot/package/janus-gateway/janus-gateway.mk b/buildroot/package/janus-gateway/janus-gateway.mk index d17a80f78..bdf8d7a1e 100644 --- a/buildroot/package/janus-gateway/janus-gateway.mk +++ b/buildroot/package/janus-gateway/janus-gateway.mk @@ -4,14 +4,15 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.8.1 +JANUS_GATEWAY_VERSION = 0.10.3 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ - libsrtp host-gengetopt libglib2 openssl libconfig + libsrtp host-gengetopt libglib2 openssl libconfig \ + $(if $(BR2_PACKAGE_LIBOGG),libogg) # Straight out of the repository, no ./configure, and we also patch # configure.ac. @@ -21,6 +22,13 @@ JANUS_GATEWAY_CONF_OPTS = \ --disable-data-channels \ --disable-sample-event-handler +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_DEMOS),) +define JANUS_GATEWAY_REMOVE_DEMOS + $(RM) -fr $(TARGET_DIR)/usr/share/janus/demos/ +endef +JANUS_GATEWAY_POST_INSTALL_TARGET_HOOKS += JANUS_GATEWAY_REMOVE_DEMOS +endif + ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y) JANUS_GATEWAY_DEPENDENCIES += opus JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge @@ -72,7 +80,6 @@ JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom endif ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y) -JANUS_GATEWAY_DEPENDENCIES += libogg JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail @@ -112,4 +119,11 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +JANUS_GATEWAY_DEPENDENCIES += systemd +JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets +else +JANUS_GATEWAY_CONF_OPTS += --disable-systemd-sockets +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/jasper/jasper.hash b/buildroot/package/jasper/jasper.hash index 67ad90d73..5edf45e6d 100644 --- a/buildroot/package/jasper/jasper.hash +++ b/buildroot/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b9d16162a088617ada36450f2374d72165377cb64b33ed197c200bcfb73ec76c jasper-2.0.19.tar.gz -sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE +sha256 afc4166bff29b8a0dc46ed5e8d6a208d7976fccfd0b1146e3400c8b2948794a2 jasper-2.0.22.tar.gz +sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/buildroot/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk index f6ae2ead7..ab7cb933b 100644 --- a/buildroot/package/jasper/jasper.mk +++ b/buildroot/package/jasper/jasper.mk @@ -4,7 +4,7 @@ # ################################################################################ -JASPER_VERSION = 2.0.19 +JASPER_VERSION = 2.0.22 JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 diff --git a/buildroot/package/jbig2dec/Config.in b/buildroot/package/jbig2dec/Config.in new file mode 100644 index 000000000..d1440dca3 --- /dev/null +++ b/buildroot/package/jbig2dec/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_JBIG2DEC + bool "jbig2dec" + help + jbig2dec is a decoder implementation of the JBIG2 + image compression format. + + https://jbig2dec.com/ diff --git a/buildroot/package/jbig2dec/jbig2dec.hash b/buildroot/package/jbig2dec/jbig2dec.hash new file mode 100644 index 000000000..5a34af37f --- /dev/null +++ b/buildroot/package/jbig2dec/jbig2dec.hash @@ -0,0 +1,7 @@ +# https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530/MD5SUMS +# and SHA512SUMS are missing the hashes for this file. +# Locally computed: +sha256 279476695b38f04939aa59d041be56f6bade3422003a406a85e9792c27118a37 jbig2dec-0.19.tar.gz + +# Hash for license files: +sha256 1bf5258afe453934484fd0cea97508b72301633a6a78b0ae8a9ee44ac78f26d9 LICENSE diff --git a/buildroot/package/jbig2dec/jbig2dec.mk b/buildroot/package/jbig2dec/jbig2dec.mk new file mode 100644 index 000000000..59fcddfc1 --- /dev/null +++ b/buildroot/package/jbig2dec/jbig2dec.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# jbig2dec +# +################################################################################ + +JBIG2DEC_VERSION = 0.19 +JBIG2DEC_SITE = \ + https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530 +JBIG2DEC_LICENSE = AGPL-3.0+ +JBIG2DEC_LICENSE_FILES = LICENSE +JBIG2DEC_INSTALL_STAGING = YES +# tarball is missing install-sh, install.sh, or shtool +JBIG2DEC_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/jo/jo.hash b/buildroot/package/jo/jo.hash index 8190a15e2..8f1cc8fcd 100644 --- a/buildroot/package/jo/jo.hash +++ b/buildroot/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de25c95671a3b392c6bcaba0b15d48eb8e2435508008c29477982d2d2f5ade64 jo-1.3.tar.gz -sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING +sha256 24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2 jo-1.4.tar.gz +sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/buildroot/package/jo/jo.mk b/buildroot/package/jo/jo.mk index 5eb013245..24b499f34 100644 --- a/buildroot/package/jo/jo.mk +++ b/buildroot/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.3 +JO_VERSION = 1.4 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING diff --git a/buildroot/package/jpeg-turbo/Config.in.options b/buildroot/package/jpeg-turbo/Config.in.options new file mode 100644 index 000000000..8654b3095 --- /dev/null +++ b/buildroot/package/jpeg-turbo/Config.in.options @@ -0,0 +1,11 @@ +if BR2_PACKAGE_JPEG_TURBO + +config BR2_PACKAGE_JPEG_TURBO_TOOLS + bool "jpeg-turbo tools" + help + Libjpeg-turbo can also provide some tools like cjpeg, + djpeg, jpegtran, rdjpgcom, tjbench and wrjpgcom. + + If you want to keep them enable this option. + +endif diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.mk b/buildroot/package/jpeg-turbo/jpeg-turbo.mk index 126b47063..65debb251 100644 --- a/buildroot/package/jpeg-turbo/jpeg-turbo.mk +++ b/buildroot/package/jpeg-turbo/jpeg-turbo.mk @@ -41,10 +41,11 @@ ifeq ($(BR2_STATIC_LIBS),) JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif -define JPEG_TURBO_REMOVE_USELESS_TOOLS +ifeq ($(BR2_PACKAGE_JPEG_TURBO_TOOLS),) +define JPEG_TURBO_REMOVE_TOOLS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) endef - -JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS +JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_TOOLS +endif $(eval $(cmake-package)) diff --git a/buildroot/package/jpeg/Config.in b/buildroot/package/jpeg/Config.in index 97139c784..0a786060d 100644 --- a/buildroot/package/jpeg/Config.in +++ b/buildroot/package/jpeg/Config.in @@ -43,6 +43,8 @@ source "$BR2_BASE_DIR/.br2-external.in.jpeg" endchoice +source "package/jpeg-turbo/Config.in.options" + config BR2_PACKAGE_HAS_JPEG bool diff --git a/buildroot/package/jquery/jquery.hash b/buildroot/package/jquery/jquery.hash index ec43e7cd7..e9ef56a46 100644 --- a/buildroot/package/jquery/jquery.hash +++ b/buildroot/package/jquery/jquery.hash @@ -1,2 +1,2 @@ # Locally computed hashes, not provided by upstream -sha256 2ecd295d295bec062cedebe177e54b9d6b19fc0a841dc5c178c654c9ccff09c0 jquery-1.11.2.min.js +sha256 f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d jquery-3.5.1.min.js diff --git a/buildroot/package/jquery/jquery.mk b/buildroot/package/jquery/jquery.mk index f75eded8b..88ab84fa0 100644 --- a/buildroot/package/jquery/jquery.mk +++ b/buildroot/package/jquery/jquery.mk @@ -4,7 +4,7 @@ # ################################################################################ -JQUERY_VERSION = 1.11.2 +JQUERY_VERSION = 3.5.1 JQUERY_SITE = http://code.jquery.com JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js JQUERY_LICENSE = MIT diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash index c67cd3755..4d540f240 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31 json-3.7.3.tar.gz -sha256 7400586ce89c6a2cc65f6ca46997da5d356a230673d3a211e040b783f23578a1 LICENSE.MIT +sha256 7d0edf65f2ac7390af5e5a0b323b31202a6c11d744a74b588dc30f5a8c9865ba json-3.8.0.tar.gz +sha256 50be9457e5c9faaba5e60d9c73f8eabe9e0737a2d9c3e58357d856661862c18e LICENSE.MIT diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk index e6f1df96f..afc900b7d 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.7.3 +JSON_FOR_MODERN_CPP_VERSION = 3.8.0 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT diff --git a/buildroot/package/json-glib/json-glib.mk b/buildroot/package/json-glib/json-glib.mk index 7405b28b2..accdb4f88 100644 --- a/buildroot/package/json-glib/json-glib.mk +++ b/buildroot/package/json-glib/json-glib.mk @@ -17,7 +17,12 @@ JSON_GLIB_DEPENDENCIES = \ host-pkgconf \ libglib2 -JSON_GLIB_CONF_OPTS = -Dintrospection=false +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_DEPENDENCIES += gobject-introspection +else +JSON_GLIB_CONF_OPTS += -Dintrospection=false +endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) diff --git a/buildroot/package/jsoncpp/0001-Meson-updates.patch b/buildroot/package/jsoncpp/0001-Meson-updates.patch deleted file mode 100644 index 8a44c5b03..000000000 --- a/buildroot/package/jsoncpp/0001-Meson-updates.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 6bc55ec35d02931960ec1f5768fc9c56ab62ef66 Mon Sep 17 00:00:00 2001 -From: David Seifert <16636962+SoapGentoo@users.noreply.github.com> -Date: Tue, 7 Jan 2020 02:23:50 +0100 -Subject: [PATCH] Meson updates (#1124) - -* Modernize meson.build - -* Make tests optional -* Use `files()` for quick sanity checks - -* Bump version to 1.9.3 - -* Bump SOVERSION, as some functions were removed - and structs were changed, as determined by - libabigail. - -[Retrieved from: -https://github.com/open-source-parsers/jsoncpp/commit/6bc55ec35d02931960ec1f5768fc9c56ab62ef66] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - include/json/version.h | 4 ++-- - meson.build | 33 ++++++++++++++++++--------------- - meson_options.txt | 5 +++++ - 4 files changed, 26 insertions(+), 18 deletions(-) - create mode 100644 meson_options.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e063317..c05ddccb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ project(JSONCPP - # 2. /include/json/version.h - # 3. /CMakeLists.txt - # IMPORTANT: also update the SOVERSION!! -- VERSION 1.9.2 # [.[.[.]]] -+ VERSION 1.9.3 # [.[.[.]]] - LANGUAGES CXX) - - message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") -diff --git a/include/json/version.h b/include/json/version.h -index ff94372b..0f298341 100644 ---- a/include/json/version.h -+++ b/include/json/version.h -@@ -9,10 +9,10 @@ - // 3. /CMakeLists.txt - // IMPORTANT: also update the SOVERSION!! - --#define JSONCPP_VERSION_STRING "1.9.2" -+#define JSONCPP_VERSION_STRING "1.9.3" - #define JSONCPP_VERSION_MAJOR 1 - #define JSONCPP_VERSION_MINOR 9 --#define JSONCPP_VERSION_PATCH 2 -+#define JSONCPP_VERSION_PATCH 3 - #define JSONCPP_VERSION_QUALIFIER - #define JSONCPP_VERSION_HEXA \ - ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ -diff --git a/meson.build b/meson.build -index 1bc94a8a..c2932030 100644 ---- a/meson.build -+++ b/meson.build -@@ -9,7 +9,7 @@ project( - # 2. /include/json/version.h - # 3. /CMakeLists.txt - # IMPORTANT: also update the SOVERSION!! -- version : '1.9.2', -+ version : '1.9.3', - default_options : [ - 'buildtype=release', - 'cpp_std=c++11', -@@ -18,7 +18,7 @@ project( - meson_version : '>= 0.49.0') - - --jsoncpp_headers = [ -+jsoncpp_headers = files([ - 'include/json/allocator.h', - 'include/json/assertions.h', - 'include/json/config.h', -@@ -28,7 +28,8 @@ jsoncpp_headers = [ - 'include/json/reader.h', - 'include/json/value.h', - 'include/json/version.h', -- 'include/json/writer.h'] -+ 'include/json/writer.h', -+]) - jsoncpp_include_directories = include_directories('include') - - install_headers( -@@ -44,13 +45,12 @@ else - endif - - jsoncpp_lib = library( -- 'jsoncpp', -- [ jsoncpp_headers, -- 'src/lib_json/json_tool.h', -+ 'jsoncpp', files([ - 'src/lib_json/json_reader.cpp', - 'src/lib_json/json_value.cpp', -- 'src/lib_json/json_writer.cpp'], -- soversion : 22, -+ 'src/lib_json/json_writer.cpp', -+ ]), -+ soversion : 23, - install : true, - include_directories : jsoncpp_include_directories, - cpp_args: dll_export_flag) -@@ -66,18 +66,21 @@ import('pkgconfig').generate( - jsoncpp_dep = declare_dependency( - include_directories : jsoncpp_include_directories, - link_with : jsoncpp_lib, -- version : meson.project_version(), -- ) -+ version : meson.project_version()) - - # tests --python = import('python').find_installation() -+if meson.is_subproject() or not get_option('tests') -+ subdir_done() -+endif -+ -+python = import('python').find_installation('python3') - - jsoncpp_test = executable( -- 'jsoncpp_test', -- [ 'src/test_lib_json/jsontest.cpp', -- 'src/test_lib_json/jsontest.h', -+ 'jsoncpp_test', files([ -+ 'src/test_lib_json/jsontest.cpp', - 'src/test_lib_json/main.cpp', -- 'src/test_lib_json/fuzz.cpp'], -+ 'src/test_lib_json/fuzz.cpp', -+ ]), - include_directories : jsoncpp_include_directories, - link_with : jsoncpp_lib, - install : false, -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 00000000..9c215ae6 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,5 @@ -+option( -+ 'tests', -+ type : 'boolean', -+ value : true, -+ description : 'Enable building tests') diff --git a/buildroot/package/jsoncpp/jsoncpp.hash b/buildroot/package/jsoncpp/jsoncpp.hash index 100016761..45f0b161f 100644 --- a/buildroot/package/jsoncpp/jsoncpp.hash +++ b/buildroot/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0 jsoncpp-1.9.2.tar.gz +sha256 8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d jsoncpp-1.9.3.tar.gz sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE diff --git a/buildroot/package/jsoncpp/jsoncpp.mk b/buildroot/package/jsoncpp/jsoncpp.mk index f9761d4a6..276671694 100644 --- a/buildroot/package/jsoncpp/jsoncpp.mk +++ b/buildroot/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.9.2 +JSONCPP_VERSION = 1.9.3 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/kbd/Config.in b/buildroot/package/kbd/Config.in index 6cf2fc0dc..27cadf1af 100644 --- a/buildroot/package/kbd/Config.in +++ b/buildroot/package/kbd/Config.in @@ -2,7 +2,12 @@ config BR2_PACKAGE_KBD bool "kbd" # Uses fork() depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Generic help Keytable files and keyboard utilities. http://kernel.org/pub/linux/utils/kbd/ + +comment "kbd needs a toolchain w/ gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/kbd/kbd.hash b/buildroot/package/kbd/kbd.hash index cf29c5986..66ffaeb05 100644 --- a/buildroot/package/kbd/kbd.hash +++ b/buildroot/package/kbd/kbd.hash @@ -1,3 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 kbd-2.0.4.tar.xz -sha256 8682bd7a7fe88bad31bf94ee9795c73fd4bc27bfcd50fb135f36dd8762c52035 COPYING +sha256 685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a kbd-2.3.0.tar.xz +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING +sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/buildroot/package/kbd/kbd.mk b/buildroot/package/kbd/kbd.mk index c32d82a3e..928b5ffed 100644 --- a/buildroot/package/kbd/kbd.mk +++ b/buildroot/package/kbd/kbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -KBD_VERSION = 2.0.4 +KBD_VERSION = 2.3.0 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd KBD_CONF_OPTS = \ @@ -14,7 +14,7 @@ KBD_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf KBD_LICENSE = GPL-2.0+ -KBD_LICENSE_FILES = COPYING +KBD_LICENSE_FILES = COPYING CREDITS KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install diff --git a/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch b/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch deleted file mode 100644 index 3c6bc72a2..000000000 --- a/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dea6cfba122439b29cdcb833a59868dd51a4eae4 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Mon, 13 May 2019 14:25:26 +0100 -Subject: [PATCH] Ensure that -lm linker library flag is always set - -configure was testing whether it was necessary to add the -lm option, -but for some reason gcc adds it itself if -Os is not specified, but -does not add it if -Os is specified. Consequently if configure was -run without -Os, and make was run with -Os the link failed. - -The commit ensures that -lm is always used. - -Signed-off-by: Quentin Armitage -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/acassen/keepalived/commit/dea6cfba122439b29cdcb833a59868dd51a4eae4] ---- - configure.ac | 24 +++--------------------- - 1 file changed, 3 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5023900f4..ae420d5a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -340,6 +340,9 @@ WARNINGS_EXTRA="aggregate-return conversion padded pedantic sign-conversion stri - # We want _GNU_SOURCE defined always - add_to_var([CFLAGS], [-D_GNU_SOURCE]) - -+# fpclassify() needs -lm -+add_to_var([KA_LIBS], [-lm]) -+ - # Some sanity checks on configure options - AS_IF([test .$enable_vrrp = .no], - [ -@@ -779,27 +782,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[ - LDFLAGS=$SAV_LDFLAGS - ]) - --# Check if fpclassify() requires -lm --CFLAGS= --LDFLAGS= --AC_MSG_CHECKING([whether fpclassify() requires -lm]) --AC_LINK_IFELSE([AC_LANG_SOURCE([[ -- # include -- int main(int argc, char **argv) -- { -- double zero = 0.0; -- if (fpclassify(zero) == FP_ZERO) -- return 0; -- return 1; -- } -- ]])], -- AC_MSG_RESULT([no]), -- AC_MSG_RESULT([yes]) -- add_to_var([KA_LIBS], [-lm]) -- ) --CFLAGS=$SAV_CFLAGS --LDFLAGS=$SAV_LDFLAGS -- - # Checks for header files. - AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/prctl.h sys/socket.h sys/time.h syslog.h unistd.h], - [], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])]) diff --git a/buildroot/package/keepalived/Config.in b/buildroot/package/keepalived/Config.in index c71821545..2a0663fed 100644 --- a/buildroot/package/keepalived/Config.in +++ b/buildroot/package/keepalived/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_KEEPALIVED bool "keepalived" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # uses libdl - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 select BR2_PACKAGE_OPENSSL help The main goal of the keepalived project is to add a strong & @@ -15,6 +14,6 @@ config BR2_PACKAGE_KEEPALIVED http://www.keepalived.org/ -comment "keepalived needs a toolchain w/ dynamic library, headers >= 3.4" +comment "keepalived needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/keepalived/keepalived.hash b/buildroot/package/keepalived/keepalived.hash index 091821467..94af43c3e 100644 --- a/buildroot/package/keepalived/keepalived.hash +++ b/buildroot/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4 keepalived-2.0.15.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 245bf399e4320064996ac5507236a8896f545d005f6c4c3b91701bcbc5728c60 keepalived-2.1.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/keepalived/keepalived.mk b/buildroot/package/keepalived/keepalived.mk index 02c5a0cf3..1a42d0c88 100644 --- a/buildroot/package/keepalived/keepalived.mk +++ b/buildroot/package/keepalived/keepalived.mk @@ -4,14 +4,12 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.0.15 +KEEPALIVED_VERSION = 2.1.4 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CONF_OPTS = --disable-hardening -# We're patching configure.ac -KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c @@ -34,18 +32,18 @@ else KEEPALIVED_CONF_OPTS += --disable-libnl endif +ifeq ($(BR2_PACKAGE_IPTABLES),y) +KEEPALIVED_DEPENDENCIES += iptables +KEEPALIVED_CONF_OPTS += --enable-iptables +# ipset support only makes sense when iptables support is enabled. ifeq ($(BR2_PACKAGE_IPSET),y) KEEPALIVED_DEPENDENCIES += ipset KEEPALIVED_CONF_OPTS += --enable-libipset else KEEPALIVED_CONF_OPTS += --disable-libipset endif - -ifeq ($(BR2_PACKAGE_IPTABLES),y) -KEEPALIVED_DEPENDENCIES += iptables -KEEPALIVED_CONF_OPTS += --enable-libiptc else -KEEPALIVED_CONF_OPTS += --disable-libiptc +KEEPALIVED_CONF_OPTS += --disable-iptables endif ifeq ($(BR2_PACKAGE_LIBNFTNL),y) diff --git a/buildroot/package/kexec-lite/Config.in b/buildroot/package/kexec-lite/Config.in index 3e84f90d5..abfa95ab3 100644 --- a/buildroot/package/kexec-lite/Config.in +++ b/buildroot/package/kexec-lite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_KEXEC_LITE depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le depends on !BR2_STATIC_LIBS # dtc, elfutils depends on BR2_USE_WCHAR # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_DTC @@ -17,7 +18,8 @@ config BR2_PACKAGE_KEXEC_LITE https://github.com/antonblanchard/kexec-lite -comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_powerpc || BR2_powerpc64 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/buildroot/package/kexec-lite/kexec-lite.hash b/buildroot/package/kexec-lite/kexec-lite.hash index 01008236a..e2426a45c 100644 --- a/buildroot/package/kexec-lite/kexec-lite.hash +++ b/buildroot/package/kexec-lite/kexec-lite.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6eb115c8db3a071b970d7ba985ea5e2425e1e716952186f9a4fe329a2e2bb1ca kexec-lite-18ec88310c4134eca2f9e3c417cd09f5914bf633.tar.gz +sha256 1027c69721e8ee21614273a540e1dd505370d8d814845c0adaf838496105a35d kexec-lite-6b0130b3c1ea489e061cda2805e6f8b68dc96a76.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/kexec-lite/kexec-lite.mk b/buildroot/package/kexec-lite/kexec-lite.mk index e44c6df8f..45c5d4d8b 100644 --- a/buildroot/package/kexec-lite/kexec-lite.mk +++ b/buildroot/package/kexec-lite/kexec-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_LITE_VERSION = 18ec88310c4134eca2f9e3c417cd09f5914bf633 +KEXEC_LITE_VERSION = 6b0130b3c1ea489e061cda2805e6f8b68dc96a76 KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) KEXEC_LITE_LICENSE = GPL-2.0+ KEXEC_LITE_LICENSE_FILES = COPYING diff --git a/buildroot/package/kexec/0001-kexec-build-multiboot2-for-i386.patch b/buildroot/package/kexec/0001-kexec-build-multiboot2-for-i386.patch new file mode 100644 index 000000000..c67da98ce --- /dev/null +++ b/buildroot/package/kexec/0001-kexec-build-multiboot2-for-i386.patch @@ -0,0 +1,72 @@ +From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 18 Nov 2019 12:52:15 +1300 +Subject: kexec: build multiboot2 for i386 + +This addresses the following compilation issues when building for i386. + + kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_probe + kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~ + multiboot_x86_load + kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'? + multiboot2_x86_usage }, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_usage + make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1 + make: *** Waiting for unfinished jobs.... + +Signed-off-by: Chris Packham +Signed-off-by: Simon Horman + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615] +--- + kexec/arch/i386/Makefile | 2 +- + kexec/arch/i386/kexec-x86.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile +index 105cefd..f486103 100644 +--- a/kexec/arch/i386/Makefile ++++ b/kexec/arch/i386/Makefile +@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c ++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c + i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c +@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c + + dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ + kexec/arch/i386/crashdump-x86.h \ +- kexec/arch/i386/kexec-mb2-x86.c \ + kexec/arch/i386/kexec-x86.h \ + kexec/arch/i386/x86-linux-setup.h \ + kexec/arch/i386/include/arch/options.h +diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h +index 1b58c3b..0f941df 100644 +--- a/kexec/arch/i386/kexec-x86.h ++++ b/kexec/arch/i386/kexec-x86.h +@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); + void multiboot_x86_usage(void); + ++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info); ++void multiboot2_x86_usage(void); ++int multiboot2_x86_probe(const char *buf, off_t buf_len); ++ + int elf_x86_probe(const char *buf, off_t len); + int elf_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); +-- +cgit 1.2-0.3.lf.el7 + diff --git a/buildroot/package/kexec/0002-kexec-tools-Remove-duplicated-variable-declarations.patch b/buildroot/package/kexec/0002-kexec-tools-Remove-duplicated-variable-declarations.patch new file mode 100644 index 000000000..99cb9a282 --- /dev/null +++ b/buildroot/package/kexec/0002-kexec-tools-Remove-duplicated-variable-declarations.patch @@ -0,0 +1,102 @@ +From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Wed, 29 Jan 2020 13:38:19 +0800 +Subject: kexec-tools: Remove duplicated variable declarations + +When building kexec-tools for Fedora 32, following error is observed: + +/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple definition of `bzImage_support_efi_boot'; +kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here + +/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: multiple definition of `my_debug'; +kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first defined here + +/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: multiple definition of `arm64_mem'; +kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68: first defined here + +/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: multiple definition of `initrd_size'; +kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54: first defined here + +/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: multiple definition of `initrd_base'; +kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53: first defined here + +And apparently, these variables are wrongly declared multiple times. So +remove duplicated declaration. + +Signed-off-by: Kairui Song +Signed-off-by: Simon Horman +[Retrieved from: +https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=cc087b11462af9f971a2c090d07e8d780a867b50] +Signed-off-by: Fabrice Fontaine +--- + kexec/arch/arm64/kexec-arm64.h | 6 +++--- + kexec/arch/ppc64/kexec-elf-ppc64.c | 2 -- + kexec/arch/x86_64/kexec-bzImage64.c | 1 - + kexec/fs2dt.h | 2 +- + 4 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h +index 628de79..ed447ac 100644 +--- a/kexec/arch/arm64/kexec-arm64.h ++++ b/kexec/arch/arm64/kexec-arm64.h +@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **argv, const char *kernel_buf, + void zImage_arm64_usage(void); + + +-off_t initrd_base; +-off_t initrd_size; ++extern off_t initrd_base; ++extern off_t initrd_size; + + /** + * struct arm64_mem - Memory layout info. +@@ -65,7 +65,7 @@ struct arm64_mem { + }; + + #define arm64_mem_ngv UINT64_MAX +-struct arm64_mem arm64_mem; ++extern struct arm64_mem arm64_mem; + + uint64_t get_phys_offset(void); + uint64_t get_vp_offset(void); +diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c +index 3510b70..695b8b0 100644 +--- a/kexec/arch/ppc64/kexec-elf-ppc64.c ++++ b/kexec/arch/ppc64/kexec-elf-ppc64.c +@@ -44,8 +44,6 @@ + uint64_t initrd_base, initrd_size; + unsigned char reuse_initrd = 0; + const char *ramdisk; +-/* Used for enabling printing message from purgatory code */ +-int my_debug = 0; + + int elf_ppc64_probe(const char *buf, off_t len) + { +diff --git a/kexec/arch/x86_64/kexec-bzImage64.c b/kexec/arch/x86_64/kexec-bzImage64.c +index 8edb3e4..ba8dc48 100644 +--- a/kexec/arch/x86_64/kexec-bzImage64.c ++++ b/kexec/arch/x86_64/kexec-bzImage64.c +@@ -42,7 +42,6 @@ + #include + + static const int probe_debug = 0; +-int bzImage_support_efi_boot; + + int bzImage64_probe(const char *buf, off_t len) + { +diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h +index 7633273..fe24931 100644 +--- a/kexec/fs2dt.h ++++ b/kexec/fs2dt.h +@@ -30,7 +30,7 @@ extern struct bootblock bb[1]; + + /* Used for enabling printing message from purgatory code + * Only has implemented for PPC64 */ +-int my_debug; ++extern int my_debug; + extern int dt_no_old_root; + + void reserve(unsigned long long where, unsigned long long length); +-- +cgit 1.2.3-1.el7 + diff --git a/buildroot/package/kexec/Config.in b/buildroot/package/kexec/Config.in index 410e503d9..90a7bc267 100644 --- a/buildroot/package/kexec/Config.in +++ b/buildroot/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/buildroot/package/kexec/kexec.hash b/buildroot/package/kexec/kexec.hash index f87692b68..302e07906 100644 --- a/buildroot/package/kexec/kexec.hash +++ b/buildroot/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 kexec-tools-2.0.18.tar.xz +sha256 dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 kexec-tools-2.0.20.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/buildroot/package/kexec/kexec.mk b/buildroot/package/kexec/kexec.mk index b011c0b4e..63fcc074b 100644 --- a/buildroot/package/kexec/kexec.mk +++ b/buildroot/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.18 +KEXEC_VERSION = 2.0.20 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 diff --git a/buildroot/package/keyutils/0001-fix-install-rule.patch b/buildroot/package/keyutils/0001-fix-install-rule.patch index 26545716c..b8bad533b 100644 --- a/buildroot/package/keyutils/0001-fix-install-rule.patch +++ b/buildroot/package/keyutils/0001-fix-install-rule.patch @@ -11,7 +11,7 @@ Signed-off-by: Baruch Siach --- keyutils-1.5.9/Makefile.orig 2014-09-22 16:13:41.593562765 +0100 +++ keyutils-1.5.9/Makefile 2014-09-22 16:14:05.377963952 +0100 -@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0) +@@ -200,7 +200,7 @@ ifeq ($(NO_SOLIB),0) $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) mkdir -p $(DESTDIR)$(USRLIBDIR) diff --git a/buildroot/package/keyutils/0002-cifs.patch b/buildroot/package/keyutils/0002-cifs.patch index b2903f971..23f8e3312 100644 --- a/buildroot/package/keyutils/0002-cifs.patch +++ b/buildroot/package/keyutils/0002-cifs.patch @@ -6,8 +6,8 @@ Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support) diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf --- keyutils.orig/request-key.conf 2008-09-07 23:53:10.000000000 +0000 +++ keyutils/request-key.conf 2009-02-05 00:53:00.000000000 +0000 -@@ -34,4 +34,6 @@ - create user debug:* negate /bin/keyctl negate %k 30 %S +@@ -38,4 +38,6 @@ + create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +create cifs.spnego * * /usr/sbin/cifs.upcall -c %k diff --git a/buildroot/package/keyutils/Config.in b/buildroot/package/keyutils/Config.in index 7813de379..e4a2e846a 100644 --- a/buildroot/package/keyutils/Config.in +++ b/buildroot/package/keyutils/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_KEYUTILS These tools are used to control the key management system built into the Linux kernel. - http://people.redhat.com/~dhowells/keyutils/ + https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/ comment "keyutils needs a toolchain w/ dynamic library" depends on BR2_USE_MMU diff --git a/buildroot/package/keyutils/keyutils.hash b/buildroot/package/keyutils/keyutils.hash index d6781628c..35de0c782 100644 --- a/buildroot/package/keyutils/keyutils.hash +++ b/buildroot/package/keyutils/keyutils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115 keyutils-1.6.tar.bz2 -sha256 f46409d4822b2457b39bbd0e7881eecb396130eb8320b7748fa7e9488970aa6d LICENCE.GPL -sha256 0d15593e3a8ad90917f8509b5ac1e4b5e5d196434a68029aa9dc0858a4a4c521 LICENCE.LGPL +sha256 a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4 keyutils-1.6.3.tar.gz +sha256 f46409d4822b2457b39bbd0e7881eecb396130eb8320b7748fa7e9488970aa6d LICENCE.GPL +sha256 0d15593e3a8ad90917f8509b5ac1e4b5e5d196434a68029aa9dc0858a4a4c521 LICENCE.LGPL diff --git a/buildroot/package/keyutils/keyutils.mk b/buildroot/package/keyutils/keyutils.mk index c8de3a0df..cba57cf19 100644 --- a/buildroot/package/keyutils/keyutils.mk +++ b/buildroot/package/keyutils/keyutils.mk @@ -4,9 +4,8 @@ # ################################################################################ -KEYUTILS_VERSION = 1.6 -KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 -KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils +KEYUTILS_VERSION = 1.6.3 +KEYUTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL KEYUTILS_INSTALL_STAGING = YES @@ -23,6 +22,11 @@ ifeq ($(BR2_SHARED_LIBS),y) KEYUTILS_MAKE_PARAMS += NO_ARLIB=1 endif +# Touch cxx.stamp to avoid adding a C++ dependency +define KEYUTILS_CONFIGURE_CMDS + touch $(@D)/cxx.stamp +endef + define KEYUTILS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) endef diff --git a/buildroot/package/kf5/Config.in b/buildroot/package/kf5/Config.in index aecbb932f..030759f37 100644 --- a/buildroot/package/kf5/Config.in +++ b/buildroot/package/kf5/Config.in @@ -1,7 +1,6 @@ menuconfig BR2_PACKAGE_KF5 bool "KF5" depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_VERSION_LATEST help This option enables the KF5 KDE Frameworks. Sub-options allow to select which modules should be built. diff --git a/buildroot/package/kismet/0001-ncurses.patch b/buildroot/package/kismet/0001-ncurses.patch deleted file mode 100644 index af8fba52b..000000000 --- a/buildroot/package/kismet/0001-ncurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kismet-2009-06-R1/configure 2009-06-12 04:26:32.000000000 +0100 -+++ kismet-2009-06-R1.mod/configure 2009-08-05 11:27:43.000000000 +0100 -@@ -6981,7 +6981,7 @@ - - - # Add additional cflags since some distros bury panel.h --CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" -+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" - - termcontrol="none"; - diff --git a/buildroot/package/kismet/0002-nobsd.patch b/buildroot/package/kismet/0002-nobsd.patch deleted file mode 100644 index 451d9ce4a..000000000 --- a/buildroot/package/kismet/0002-nobsd.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nura kismet-2009-06-R1/ifcontrol.cc kismet-2009-06-R1-nobsd/ifcontrol.cc ---- kismet-2009-06-R1/ifcontrol.cc 2009-04-08 16:57:44.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/ifcontrol.cc 2009-09-01 12:54:44.000000000 -0300 -@@ -148,7 +148,7 @@ - devlinklen = readlink(devlink.c_str(), devlinktarget, 511); - if (devlinklen > 0) { - devlinktarget[devlinklen] = '\0'; -- rind = rindex(devlinktarget, '/'); -+ rind = strrchr(devlinktarget, '/'); - // If we found it and not at the end of the line - if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen) - return string(rind + 1); -diff -Nura kismet-2009-06-R1/iwcontrol.cc kismet-2009-06-R1-nobsd/iwcontrol.cc ---- kismet-2009-06-R1/iwcontrol.cc 2009-04-20 00:22:55.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/iwcontrol.cc 2009-09-01 12:54:44.000000000 -0300 -@@ -697,7 +697,7 @@ - return -1; - } - -- bzero(buffer, sizeof(buffer)); -+ memset(buffer, 0, sizeof(buffer)); - - memset(&wrq, 0, sizeof(struct iwreq)); - -@@ -732,7 +732,7 @@ - memcpy((char *) &range, buffer, sizeof(iw_range)); - } else { - /* Zero unknown fields */ -- bzero((char *) &range, sizeof(struct iw_range)); -+ memset((char *) &range, 0, sizeof(struct iw_range)); - - /* Initial part unmoved */ - memcpy((char *) &range, buffer, iwr15_off(num_channels)); -diff -Nura kismet-2009-06-R1/madwifing_control.cc kismet-2009-06-R1-nobsd/madwifing_control.cc ---- kismet-2009-06-R1/madwifing_control.cc 2009-03-22 23:19:19.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/madwifing_control.cc 2009-09-01 12:54:42.000000000 -0300 -@@ -34,7 +34,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch b/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch deleted file mode 100644 index 8d2b91140..000000000 --- a/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch +++ /dev/null @@ -1,44 +0,0 @@ -configure: fix ordering of ncurses libraries - -Says Vicente: - [T]he order is very important when doing static builds. - Otherwise we will see errors like this one: - - [...]/sysroot/usr/lib/libpanel.a(p_delete.o): - In function `del_panel': - p_delete.c:(.text+0x68): undefined reference to `_nc_panelhook' - -Fix the order configure adds libraries: new libraries should be added -at the *front* of the list, not at the end. - -Reported-by: Vicente Olivert Riera -Signed-off-by: "Yann E. MORIN" -Cc: Vicente Olivert Riera -[bernd.kuhls@t-online.de: update for 2016-07-R1] -Signed-off-by: Bernd Kuhls - -diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in ---- kismet-Kismet-2014-02-R1.orig/configure.ac 2014-02-19 05:37:43.000000000 +0100 -+++ kismet-Kismet-2014-02-R1/configure.ac 2014-12-26 16:46:55.770692349 +0100 -@@ -437,10 +434,10 @@ - AC_MSG_ERROR(Failed to find curses.h or ncurses.h. You probably need to install the curses-devel package from your distribution) - fi - -- LIBS="$LIBS $curseaux" -+ LIBS="$curseaux $LIBS" - AC_CHECK_LIB([panel], [new_panel], - AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib) -- curseaux="$curseaux -lpanel", -+ curseaux="-lpanel $curseaux", - AC_MSG_ERROR(Failed to find libpanel extension to curses/ncurses. Install it, or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)) - - AC_CHECK_HEADER([panel.h], [foundhpanel=yes]) -@@ -450,7 +447,7 @@ - - LIBS="$OLIBS" - -- CLIENTCLIBS="$CLIENTCLIBS $curseaux" -+ CLIENTCLIBS="$curseaux $CLIENTCLIBS" - fi - - AC_SUBST(CLIBS) diff --git a/buildroot/package/kismet/0004-no-include-host-paths.patch b/buildroot/package/kismet/0004-no-include-host-paths.patch deleted file mode 100644 index 6819bf425..000000000 --- a/buildroot/package/kismet/0004-no-include-host-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -configure: do not hard-code host paths - -configure hard-codes include dirs to contain /usr/include/ncurses. -Needless to say this does not work well for cross-compilation. - -Remove that directory from the include search dirs. - -Signed-off-by: "Yann E. MORIN" -Cc: Vicente Olivert Riera -[bernd.kuhls@t-online.de: update for 2016-07-R1] -Signed-off-by: Bernd Kuhls - -diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in ---- kismet-Kismet-2014-02-R1.orig/configure.ac 2014-02-19 05:37:43.000000000 +0100 -+++ kismet-Kismet-2014-02-R1/configure.ac 2014-12-26 16:46:55.770692349 +0100 -@@ -406,9 +406,6 @@ - ) - AC_SUBST(wantclient) - --# Add additional cflags since some distros bury panel.h --CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" -- - termcontrol="none"; - - if test "$wantclient" = "yes"; then diff --git a/buildroot/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch b/buildroot/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch deleted file mode 100644 index be694345d..000000000 --- a/buildroot/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1466cbbdef835634366b2eb3a284fdff5833338c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 19 Aug 2016 23:30:06 +0200 -Subject: [PATCH] dumpfile_tuntap: don't include linux/if_tun.h kernel header - -dumpfile_tuntap.h mixes userspace and kernel headers. - -As suggested in the musl wiki [1], remove the linux/include directives -and copy the required definitions. - -[1] http://wiki.musl-libc.org/wiki/FAQ - -Signed-off-by: Romain Naour ---- - dumpfile_tuntap.h | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/dumpfile_tuntap.h b/dumpfile_tuntap.h -index 37f50b6..8b23a2a 100644 ---- a/dumpfile_tuntap.h -+++ b/dumpfile_tuntap.h -@@ -64,17 +64,18 @@ - #include "packetchain.h" - #include "dumpfile.h" - --#ifdef SYS_LINUX --#include -+#ifdef SYS_LINUX -+/* TUNSETIFF ifr flags */ -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 - - // Linux IEEE80211 link typ to set - #define LNX_LINKTYPE_80211 801 --// If the system headers don't have the TUNSETLINK ioctl, define it here, --// and we'll figure it out at runtime --#ifndef TUNSETLINK --#define TUNSETLINK _IOW('T', 205, int) --#endif -- -+/* Ioctl defines */ -+#define TUNSETNOCSUM _IOW('T', 200, int) -+#define TUNSETIFF _IOW('T', 202, int) -+#define TUNSETLINK _IOW('T', 205, int) - #endif - - struct ipc_dft_open { --- -2.5.5 - diff --git a/buildroot/package/kismet/Config.in b/buildroot/package/kismet/Config.in index ab91c0e6f..4ef84731d 100644 --- a/buildroot/package/kismet/Config.in +++ b/buildroot/package/kismet/Config.in @@ -1,42 +1,75 @@ -comment "kismet needs a toolchain w/ threads, C++, dynamic library" +comment "kismet needs a toolchain w/ threads, C++" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" config BR2_PACKAGE_KISMET bool "kismet" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_NCURSES + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBNL + select BR2_PACKAGE_PROTOBUF_C + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_ZLIB help - Kismet - 802.11 layer2 wireless network detector, sniffer, - and intrusion detection system. + Kismet is a wireless network and device detector, sniffer, + wardriving tool, and WIDS (wireless intrusion detection) + framework. - Kismet will work with any wireless card which supports raw - monitoring (rfmon) mode, and can sniff 802.11b, 802.11a, and - 802.11g traffic. - - Kismet identifies networks by passively collecting packets - and detecting standard named networks, detecting (and given - time, decloaking) hidden networks, and infering the presence - of nonbeaconing networks via data traffic. + Kismet works with Wi-Fi interfaces, Bluetooth interfaces, some + SDR (software defined radio) hardware like the RTLSDR, and + other specialized capture hardware. http://www.kismetwireless.net if BR2_PACKAGE_KISMET -config BR2_PACKAGE_KISMET_CLIENT - bool "Install client" +config BR2_PACKAGE_KISMET_PYTHON_TOOLS + bool "Install python tools" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee + select BR2_PACKAGE_PYTHON_SETUPTOOLS + help + Enable Python and Python-related tools (RTL_433, RTLAMR, + RTLADSB and Freaklabs Zigbee) -config BR2_PACKAGE_KISMET_DRONE - bool "Install drone" +comment "python tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + +comment "python tools needs a glibc or musl toolchain w/ dynamic library, gcc >= 4.8" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + select BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_PROTOBUF + +comment "server needs a toolchain w/ dynamic library, gcc >= 4.8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "server needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 endif diff --git a/buildroot/package/kismet/kismet.hash b/buildroot/package/kismet/kismet.hash index 30780b1cc..c55e31ef9 100644 --- a/buildroot/package/kismet/kismet.hash +++ b/buildroot/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 kismet-2016-07-R1.tar.xz -sha256 92b9eae679d8efbcd7514f7ff1346e4c1d42d272cd10bcb724d1511d35e28cd1 debian/copyright +sha256 79c9c343cc055523ec1c8607bf63f26bb826d8ffaccc1e6e033c945c8ada664d kismet-2020-09-R4.tar.xz +sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/buildroot/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk index d3946d65f..54d014021 100644 --- a/buildroot/package/kismet/kismet.mk +++ b/buildroot/package/kismet/kismet.mk @@ -4,16 +4,20 @@ # ################################################################################ -KISMET_VERSION = 2016-07-R1 +KISMET_VERSION = 2020-09-R4 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code -KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl -KISMET_CONF_OPTS += --with-netlink-version=3 +KISMET_DEPENDENCIES = \ + host-pkgconf \ + libpcap \ + $(if $(BR2_PACKAGE_LIBNL),libnl) \ + $(if $(BR2_PACKAGE_PROTOBUF),protobuf) \ + protobuf-c \ + sqlite \ + zlib KISMET_LICENSE = GPL-2.0+ -KISMET_LICENSE_FILES = debian/copyright - -# We touch configure.in: -KISMET_AUTORECONF = YES +KISMET_LICENSE_FILES = LICENSE +KISMET_CONF_OPTS = --disable-debuglibs KISMET_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -23,43 +27,60 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +KISMET_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap +KISMET_CONF_OPTS += --enable-libcap +else +KISMET_CONF_OPTS += --disable-libcap +endif + +ifeq ($(BR2_PACKAGE_LIBUSB),y) +KISMET_DEPENDENCIES += libusb +KISMET_CONF_OPTS += --enable-libusb +else +KISMET_CONF_OPTS += --disable-libusb +endif + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +KISMET_DEPENDENCIES += lm-sensors +KISMET_CONF_OPTS += --enable-lmsensors +else +KISMET_CONF_OPTS += --disable-lmsensors endif ifeq ($(BR2_PACKAGE_PCRE),y) KISMET_DEPENDENCIES += pcre +KISMET_CONF_OPTS += --enable-pcre +else +KISMET_CONF_OPTS += --disable-pcre endif -ifeq ($(BR2_PACKAGE_KISMET_CLIENT),y) -KISMET_TARGET_BINARIES += kismet_client +ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) +KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_CONF_OPTS += \ + --enable-python-tools \ + --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +else +KISMET_CONF_OPTS += --disable-python-tools endif +KISMET_INSTALL_TARGET_OPTS += \ + DESTDIR=$(TARGET_DIR) \ + INSTUSR=$(shell id -u) \ + INSTGRP=$(shell id -g) \ + SUIDGROUP=$(shell id -g) + ifeq ($(BR2_PACKAGE_KISMET_SERVER),y) -KISMET_TARGET_BINARIES += kismet_server -KISMET_TARGET_CONFIGS += kismet.conf +KISMET_DEPENDENCIES += libmicrohttpd +KISMET_CONF_OPTS += --disable-capture-tools-only +KISMET_INSTALL_TARGET_OPTS += install +else +KISMET_CONF_OPTS += --enable-capture-tools-only +KISMET_INSTALL_TARGET_OPTS += binsuidinstall endif -ifeq ($(BR2_PACKAGE_KISMET_DRONE),y) -KISMET_TARGET_BINARIES += kismet_drone -KISMET_TARGET_CONFIGS += kismet_drone.conf -endif - -ifdef KISMET_TARGET_BINARIES -define KISMET_INSTALL_TARGET_BINARIES - $(INSTALL) -m 755 $(addprefix $(KISMET_DIR)/, $(KISMET_TARGET_BINARIES)) $(TARGET_DIR)/usr/bin -endef -endif - -ifdef KISMET_TARGET_CONFIGS -define KISMET_INSTALL_TARGET_CONFIGS - $(INSTALL) -m 644 $(addprefix $(KISMET_DIR)/conf/, $(KISMET_TARGET_CONFIGS)) $(TARGET_DIR)/etc -endef -endif - -define KISMET_INSTALL_TARGET_CMDS - $(KISMET_INSTALL_TARGET_BINARIES) - $(KISMET_INSTALL_TARGET_CONFIGS) -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch b/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch deleted file mode 100644 index 3be40d499..000000000 --- a/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 55a0a0aac503f5012ff2df7af37107544c757f19 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 22 Oct 2019 09:56:32 +0200 -Subject: [PATCH kmod] Do not check for undefined symbols when building the - Python modules - -kmod's configure.ac uses the -Wl,--no-undefined linker flag to verify -at link time that all symbols of shared libraries are available, and -that there are no undefined symbols. - -This make perfect sense for regular shared libraries. However, for -Python extensions, which will be dlopen()ed inside the Python -interpreter, it makes less sense. - -Since Python 3.8, there is a change in python-config script and -Python's pkg-config file: it no longer links Python extensions with -the libpython library. See -https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build -which states: - - On the other hand, pkg-config python3.8 --libs no longer contains - -lpython3.8. C extensions must not be linked to libpython (except on - Android and Cygwin, whose cases are handled by the script); this - change is backward incompatible on purpose. (Contributed by Victor - Stinner in bpo-36721.) - -So, when linking the kmod Python extensions, it currently fails with -numerous unresolved symbols, that were previously provided by -libpython: - -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__Pyx_PyObject_GetAttrStr': -list.c:(.text.__Pyx_PyObject_GetAttrStr+0x48): undefined reference to `PyObject_GetAttr' -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModListItem': -list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModListItem+0x78): undefined reference to `PyObject_CallFinalizerFromDealloc' -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModList': -list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModList+0x30): undefined reference to `PyErr_Fetch' - -[Complete log at http://autobuild.buildroot.net/results/79a/79a5a0398723e8cfea0d0aa3dec5f7649aee4c63/build-end.log] - -Linking with libpython is no longer recommended: those symbols should -remain unresolved in the Python extensions, as they wil be properly -resolved when the Python extension gets loaded into the Python -interpreter. - -Since we want to keep -Wl,--no-undefined globally in kmod, we leave -the configure.ac file unchanged, and instead, specifically in the -LDFLAGS used to build the Python extensions, we override --Wl,--no-undefined with -Wl,-z,undefs. Ideally, -Wl,--no-undefined is -the same as -Wl,-z,defs, and the effect of these options can be -canceled on the linker command line by a following -Wl,-z,undefs (see -the ld man page for details). - -Upstream: https://lore.kernel.org/linux-modules/20191024174710.9441-1-thomas.petazzoni@bootlin.com/ -Signed-off-by: Thomas Petazzoni -Cc: Victor Stinner ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c5c2f06..8e9c90d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -173,7 +173,7 @@ CPYTHON_MODULE_CFLAGS = \ - $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ - $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ - -fvisibility=default --CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -+CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs - - if BUILD_PYTHON - pkgpyexec_LTLIBRARIES = \ --- -2.21.0 - diff --git a/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch b/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch deleted file mode 100644 index f4d90d4c2..000000000 --- a/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7a55f18e14f606500fdeab6bc116ec74f3e5b1c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Nov 2019 17:40:32 +0100 -Subject: [PATCH] Makefile.am: filter -Wl,--no-undefined - -Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix -the build with python 3.8 as we still get link failure due to -'-z undefs' being ignored by some versions of ld: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored. - -/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored. - -So filter -Wl,--no-undefined to fix the issue - -Fixes: - - http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60 - - http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1 - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 8e9c90d..47505c1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \ - $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ - $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ - -fvisibility=default --CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs -+# Filter -Wl,--no-undefined to fix build with python 3.8 -+comma = , -+CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS)) -+CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared - - if BUILD_PYTHON - pkgpyexec_LTLIBRARIES = \ --- -2.24.0 - diff --git a/buildroot/package/kmod/Config.in.host b/buildroot/package/kmod/Config.in.host new file mode 100644 index 000000000..9dbbcea78 --- /dev/null +++ b/buildroot/package/kmod/Config.in.host @@ -0,0 +1,16 @@ +config BR2_PACKAGE_HOST_KMOD + bool "host kmod" + help + kmod is a set of tools to handle common tasks with Linux + kernel modules like insert, remove, list, check properties, + resolve dependencies and aliases. + +if BR2_PACKAGE_HOST_KMOD + +config BR2_PACKAGE_HOST_KMOD_GZ + bool "support gzip-compressed modules" + +config BR2_PACKAGE_HOST_KMOD_XZ + bool "support xz-compressed modules" + +endif diff --git a/buildroot/package/kmod/kmod.hash b/buildroot/package/kmod/kmod.hash index dea5c0c10..3cb60b2dd 100644 --- a/buildroot/package/kmod/kmod.hash +++ b/buildroot/package/kmod/kmod.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d kmod-26.tar.xz +sha256 c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c kmod-27.tar.xz # Locally calculated -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/kmod/kmod.mk b/buildroot/package/kmod/kmod.mk index e21f40a84..69615452c 100644 --- a/buildroot/package/kmod/kmod.mk +++ b/buildroot/package/kmod/kmod.mk @@ -4,12 +4,10 @@ # ################################################################################ -KMOD_VERSION = 26 +KMOD_VERSION = 27 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES -# 0002-Do-not-check-for-undefined-symbols-when-building-the.patch -KMOD_AUTORECONF = YES KMOD_DEPENDENCIES = host-pkgconf HOST_KMOD_DEPENDENCIES = host-pkgconf @@ -37,11 +35,22 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) KMOD_DEPENDENCIES += zlib KMOD_CONF_OPTS += --with-zlib +else +KMOD_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_XZ),y) KMOD_DEPENDENCIES += xz KMOD_CONF_OPTS += --with-xz +else +KMOD_CONF_OPTS += --without-xz +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +KMOD_DEPENDENCIES += openssl +KMOD_CONF_OPTS += --with-openssl +else +KMOD_CONF_OPTS += --without-openssl endif ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) @@ -73,6 +82,20 @@ else KMOD_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_HOST_KMOD_GZ),y) +HOST_KMOD_DEPENDENCIES += host-zlib +HOST_KMOD_CONF_OPTS += --with-zlib +else +HOST_KMOD_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_HOST_KMOD_XZ),y) +HOST_KMOD_DEPENDENCIES += host-xz +HOST_KMOD_CONF_OPTS += --with-xz +else +HOST_KMOD_CONF_OPTS += --without-xz +endif + # We only install depmod, since that's the only tool used for the # host. define HOST_KMOD_INSTALL_TOOLS diff --git a/buildroot/package/kmscube/kmscube.hash b/buildroot/package/kmscube/kmscube.hash index e306d0055..6a4140c54 100644 --- a/buildroot/package/kmscube/kmscube.hash +++ b/buildroot/package/kmscube/kmscube.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 254d34209740731a557469030c960bbfd2299485a2ad0cbed2f7040b56a292a7 kmscube-6cbd03ab94066dddbba7bedfde87c7c4319c18d5.tar.gz +sha256 ec135069d8bee7f4fe38cb9dc96fbbd56e0057290fa25eff8b5b314ee473c502 kmscube-4660a7dca6512b6e658759d00cff7d4ad2a2059d.tar.gz diff --git a/buildroot/package/kmscube/kmscube.mk b/buildroot/package/kmscube/kmscube.mk index 73d290c88..dc8c69186 100644 --- a/buildroot/package/kmscube/kmscube.mk +++ b/buildroot/package/kmscube/kmscube.mk @@ -4,10 +4,9 @@ # ################################################################################ -KMSCUBE_VERSION = 6cbd03ab94066dddbba7bedfde87c7c4319c18d5 +KMSCUBE_VERSION = 4660a7dca6512b6e658759d00cff7d4ad2a2059d KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm -KMSCUBE_AUTORECONF = YES -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch b/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch new file mode 100644 index 000000000..6ec080af9 --- /dev/null +++ b/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch @@ -0,0 +1,35 @@ +From aa54634ce7cbbfc844de945e73a9f34cdcb9bb12 Mon Sep 17 00:00:00 2001 +From: Peter Trompeter +Date: Fri, 15 May 2020 15:20:47 +0200 +Subject: [PATCH] fix compiler errors with gcc 10 + +[Retrieved from: +https://github.com/tomba/kmsxx/commit/aa54634ce7cbbfc844de945e73a9f34cdcb9bb12] +Signed-off-by: Fabrice Fontaine +--- + kms++/inc/kms++/pixelformats.h | 1 + + kms++util/src/opts.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/kms++/inc/kms++/pixelformats.h b/kms++/inc/kms++/pixelformats.h +index 784717d..4e73d5d 100644 +--- a/kms++/inc/kms++/pixelformats.h ++++ b/kms++/inc/kms++/pixelformats.h +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + namespace kms + { +diff --git a/kms++util/src/opts.cpp b/kms++util/src/opts.cpp +index afef452..5a14b84 100644 +--- a/kms++util/src/opts.cpp ++++ b/kms++util/src/opts.cpp +@@ -1,4 +1,5 @@ + #include ++#include + + #include + #include diff --git a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 11542f9c9..ecc6f2b77 100644 --- a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e99f1c8b28e176268644c07020aa92ad74d22e7244db1af69f31b767f8e845f kodi-audiodecoder-modplug-2.0.2-Leia.tar.gz -sha256 785e25c61cbc691e7cebcd1d084ca3e5f7a20d5e99ea89ddd2ce7aed6c94c27d src/ModplugCodec.cpp +sha256 6827f1ebefa5f281ace52bdf83b5ab95789c77b88a344524ead1b346668d57e7 kodi-audiodecoder-modplug-2.0.3-Leia.tar.gz +sha256 317f732723eb58745a9b22c234861dbd2d98972039543f6b549c7cb26eb2cb08 debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 6a501c237..8e1031053 100644 --- a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.3-Leia KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp +KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 756d85e80..8f04dc530 100644 --- a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c17f407d90dd08368aead5df8bacf7589b97bf1c0d1ea45c60cc7d0da26844c kodi-audiodecoder-nosefart-2.0.1-Leia.tar.gz -sha256 8ff36ab79bfc1960b47d01bb33ef106e8eca495a85b206192d8a26bbf8055821 src/NSFCodec.cpp +sha256 66305c9d654aed0b9efcf44b90acac0ab8db321dff57523d13faf67606cd78ce kodi-audiodecoder-nosefart-2.0.2-Leia.tar.gz +sha256 01a3f135925df23a5d8679ff633fe3d5021125224c9349acd2c35dd0cf3ea762 debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 1d9944d6c..8f437a737 100644 --- a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.2-Leia KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp +KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 7255319aa..308f2b6fe 100644 --- a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0dbff020e1988261680f2329fb6a29a034fede467885158ee63bae7e763d8e87 kodi-audiodecoder-sidplay-1.2.1-Leia.tar.gz -sha256 0a9cf3c7f8aaa2bbbe4cbf80307513eb99595ebb8179e8bc549159184bbdca3a src/SIDCodec.cpp +sha256 271e513a3094b163f986eb5bb5cbc70c7a602f5764cef255cc161cc5094e5648 kodi-audiodecoder-sidplay-1.2.2-Leia.tar.gz +sha256 dc915100daec3589f59b47f3438e8ec5ccc11ec25ccb3d0e7e66639764f31584 debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 83541d5ec..079ae0b20 100644 --- a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.1-Leia +KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.2-Leia KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp +KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2 $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index 1a4c9a0e7..c1c2eee2b 100644 --- a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 db39f1f4a892fede45a5bffadd760962b5f02ab62e095a35dc37298cf548013d kodi-audiodecoder-snesapu-2.0.1-Leia.tar.gz -sha256 44d53bc17eb40ff1bdce9418be001334a99af9f41cf36e917f766e44604f63f8 src/SPCCodec.cpp +sha256 e059f84b04b8e92e5ecc2989303f6a736f37d6e3bda939ac765499e616c91580 kodi-audiodecoder-snesapu-2.0.2-Leia.tar.gz +sha256 b7e8b234fc40687d647d929fc554b91cdaa4011e5e656e68c5c6ee8c4cdf81d2 debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index d78f91538..57504a17b 100644 --- a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.2-Leia KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp +KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index e5a96bdba..24b764061 100644 --- a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 75e219bf9abac3949dd3dd3fe908bc2b6e6b85654594e5494335e7e2f14dd1f1 kodi-audiodecoder-stsound-2.0.1-Leia.tar.gz -sha256 dea29ec20a9d23f0f85cd863a2ecf38fad8b9267e2f298f22a4b1adb0a2a853e src/YMCodec.cpp +sha256 3e14a7da3822002a90bf7d31a9f98541ae9ec2137c764dc94ca5b4de4ac8de82 kodi-audiodecoder-stsound-2.0.2-Leia.tar.gz +sha256 417ded3464139990f7898ac17c9eacde85dc0fafd3b3ca0c497d945b1bd93af5 debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index b20fc345f..679be5a7f 100644 --- a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_STSOUND_VERSION = 2.0.2-Leia KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp +KODI_AUDIODECODER_STSOUND_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index 0a8bdb279..ea56c38f6 100644 --- a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bc6dea6dca0949571a3123e26f27dc73c78b8a876362fc8e95649280f2557bc0 kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz -sha256 d1b64dcec44f6dfa0168a93bf1e1497e233cf3a6a475f60ca7e0a813510d6aba src/TimidityCodec.cpp +sha256 b20a3a23056aaf76c216c755f36dff03e943d7c086d3e3fca4c920b93113e073 kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index fa78a3d78..a4f0126c4 100644 --- a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.3-Leia +KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.5-Leia KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp +KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index c4a3cdf23..3ee9ebbfc 100644 --- a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6f1940d2a0607342cba8cffc0beb7c78caae5995c2d554a6079f4849997da7ba kodi-audiodecoder-vgmstream-1.1.4-Leia.tar.gz -sha256 976ef407b9b30a6c30dab03a8fbb32d0e7e45713b2121d9b378bfb15dc1dfc09 src/VGMCodec.cpp +sha256 28876be1e1317b3ec5c3a4fe415f20d92a4c5868912656c5e8ab9cdd7e3f32d8 kodi-audiodecoder-vgmstream-1.1.5-Leia.tar.gz +sha256 fc7c7ab8774d94fb2eccdf47e3b8052a3906e4b5ec8554191da321020c965d8e debian/copyright diff --git a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 81f482588..4e3cdab58 100644 --- a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.4-Leia +KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.5-Leia KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp +KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = debian/copyright KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 4f410b484..9f33d6c63 100644 --- a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e6b8ad024c171eb463339a1f136f3ee9465267ef7fd3b80a5f0007b0180f36e5 kodi-audioencoder-flac-2.0.5-Leia.tar.gz -sha256 ce7b890ad56521f1628569be22eff040ef2870213b89098e491d57f729e0d7b6 src/EncoderFlac.cpp +sha256 42e18fc2477ce5abc3efd89851a4bacc6b9436889a607a15f8232ef68b297f93 kodi-audioencoder-flac-2.0.6-Leia.tar.gz +sha256 21dc3eb9c75f1ed6367a4cf3f3999b299bc6c172da3730184edd2a5dd4d090aa debian/copyright diff --git a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 9940949c7..53c1f3deb 100644 --- a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 2.0.5-Leia +KODI_AUDIOENCODER_FLAC_VERSION = 2.0.6-Leia KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp +KODI_AUDIOENCODER_FLAC_LICENSE_FILES = debian/copyright KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index d66ab591a..cd3351e2b 100644 --- a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c9c0e700012e2763eb6d9ffcc80ccd87faf991e5cf58b30cabd51b435fd48614 kodi-audioencoder-lame-2.0.3-Leia.tar.gz -sha256 12d9ad0578d7a09ebb1bdb53d71798b81eed5072866b8bcfae5dff0c34a00b42 src/EncoderLame.cpp +sha256 9df54cf5c5ae3882a2d89d745c1d1f8b749e71a7f9305a1b059ecfd356995a36 kodi-audioencoder-lame-2.0.4-Leia.tar.gz +sha256 68a06632cc80eea941b07e27777788dcd4f7c5ba9c006e24f467a9d4bf4d3582 debian/copyright diff --git a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index a278a0f41..5d93e83ed 100644 --- a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 2.0.3-Leia +KODI_AUDIOENCODER_LAME_VERSION = 2.0.4-Leia KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp +KODI_AUDIOENCODER_LAME_LICENSE_FILES = debian/copyright KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame KODI_AUDIOENCODER_LAME_CONF_OPTS += \ -DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include diff --git a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index a316a7525..0b9463feb 100644 --- a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0bc1470ecef83ecc7e36239ef414abc49380394b551d35eb7bcc6704e74b469c kodi-audioencoder-vorbis-2.0.3-Leia.tar.gz -sha256 34c561f838b57d681bb795de0a26eacf610477a50cdca1ae707591ec607de42a src/EncoderVorbis.cpp +sha256 b4b2b1b7ae8bda35514f20ad0275b434f2b60fc93b1e17ca6e654ae145852b1f kodi-audioencoder-vorbis-2.0.4-Leia.tar.gz +sha256 706e890fc5c0496b72d3c36284abcc85f9c83b3f2b21db53a68439c538122a59 debian/copyright diff --git a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index 8b2b0fc64..b789d239b 100644 --- a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.3-Leia +KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.4-Leia KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp +KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = debian/copyright KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index a1bff2e00..9b9add216 100644 --- a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb6939551fa7da01a7f333702af1959771e7db46437647d32eb2b002b142c9a0 kodi-audioencoder-wav-2.0.2-Leia.tar.gz -sha256 20c587f004bcc79f3faee1000af6567fdf8676965130af51e733338b81b27be1 src/EncoderWav.cpp +sha256 03cb2810b2aa335fd308a5e2b6580d21ac840334c55fc891acc310633c3c49b4 kodi-audioencoder-wav-2.0.3-Leia.tar.gz +sha256 341a6317428fbc7c9d5b971d1c6162ea34be64649caa650ee0a05c06ae53a872 debian/copyright diff --git a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index 25551927d..b597b1b13 100644 --- a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 2.0.2-Leia +KODI_AUDIOENCODER_WAV_VERSION = 2.0.3-Leia KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp +KODI_AUDIOENCODER_WAV_LICENSE_FILES = debian/copyright KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 60bc0031b..b12c93ac1 100644 --- a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329 kodi-inputstream-adaptive-2.4.2-Leia.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL +sha256 222b7ad879146c62a1fc6016fc70ca1ca57b3b882882ebc54e0b772bf96482e7 kodi-inputstream-adaptive-2.4.6-Leia.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 1a083b188..30fbaf525 100644 --- a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.2-Leia +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.6-Leia KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL diff --git a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index c984f44e7..d472b89ba 100644 --- a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 69f63289bd560f8491fca32e98603afd05a6c94f0791856d873a36285d54c185 kodi-inputstream-rtmp-2.0.8-Leia.tar.gz -sha256 ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb debian/copyright +sha256 56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5 kodi-inputstream-rtmp-2.0.9-Leia.tar.gz +sha256 ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb debian/copyright diff --git a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index 6b62e6eb0..e850be40f 100644 --- a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 2.0.8-Leia +KODI_INPUTSTREAM_RTMP_VERSION = 2.0.9-Leia KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_RTMP_LICENSE_FILES = debian/copyright diff --git a/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 31003fe85..2c7f77d05 100644 --- a/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 18.5-Leia +KODI_JSONSCHEMABUILDER_VERSION = 18.9-Leia KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 15397c05c..d0cac8e4b 100644 --- a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0 kodi-peripheral-joystick-1.4.9-Leia.tar.gz -sha256 2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9 debian/copyright +sha256 e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0 kodi-peripheral-joystick-1.4.9-Leia.tar.gz +sha256 2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9 debian/copyright diff --git a/buildroot/package/kodi-peripheral-steamcontroller/Config.in b/buildroot/package/kodi-peripheral-steamcontroller/Config.in deleted file mode 100644 index a994f4c9f..000000000 --- a/buildroot/package/kodi-peripheral-steamcontroller/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER - bool "kodi-peripheral-steamcontroller" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBUSB - help - Steam controller driver for Kodi - - https://github.com/kodi-game/peripheral.steamcontroller diff --git a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash deleted file mode 100644 index 15706cb04..000000000 --- a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 aece8f4b4c4360ae6b8007c9a1d1ee39d90808053bc5b2e3e08e4c5c70a7f8db kodi-peripheral-steamcontroller-702fea828f9c5c94d0bd77dbb5fe78451edfa2ea.tar.gz -sha256 243622a4e1a2ba091ae1d433483ad8b34a7cc337048d5bef8072fbb324fbc79a debian/copyright diff --git a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk deleted file mode 100644 index 15607145b..000000000 --- a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-peripheral-steamcontroller -# -################################################################################ - -KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = 702fea828f9c5c94d0bd77dbb5fe78451edfa2ea -KODI_PERIPHERAL_STEAMCONTROLLER_SITE = $(call github,kodi-game,peripheral.steamcontroller,$(KODI_PERIPHERAL_STEAMCONTROLLER_VERSION)) -KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE_FILES = debian/copyright -KODI_PERIPHERAL_STEAMCONTROLLER_DEPENDENCIES = kodi-platform libusb - -$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 8067d495c..7443ac65d 100644 --- a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz -sha256 6d79d409e34af80656244d38643cfb60c715b19a266d82fb27c4ec8caf46bb5b src/addon.cpp +sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz +sha256 848ad4f3a480c953b556467fb9a315dd352ec1d267e012144c46adc571e39efb debian/copyright diff --git a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 0946a90d7..42d7af8a0 100644 --- a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -7,7 +7,7 @@ KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524 KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_XARCADE_LICENSE_FILES = src/addon.cpp +KODI_PERIPHERAL_XARCADE_LICENSE_FILES = debian/copyright KODI_PERIPHERAL_XARCADE_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch b/buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch index 18a74e7b5..cc514b002 100644 --- a/buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch +++ b/buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch @@ -6,6 +6,8 @@ Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make it cross-compilation friendly. +Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30 + Signed-off-by: Thomas Petazzoni --- CMakeLists.txt | 2 +- diff --git a/buildroot/package/kodi-platform/kodi-platform.hash b/buildroot/package/kodi-platform/kodi-platform.hash index 3c4da93af..29a43cf02 100644 --- a/buildroot/package/kodi-platform/kodi-platform.hash +++ b/buildroot/package/kodi-platform/kodi-platform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5b9b61c1c22b471d948b2c8de50f77ccadbd908869b13b5d98c42f447268d56 kodi-platform-915da086fa7b4ea72796052a04ed6de95501b95c.tar.gz -sha256 0c4ce7041d4a3059389fb8b6d85e417447072adbc149a55664e02cad6995b434 src/util/XMLUtils.h +sha256 159165ae641da5eb273885ce53b8a4b84e62a595c4974f9d12c1b5d1428ef25c kodi-platform-809c5e9d711e378561440a896fcb7dbcd009eb3d.tar.gz +sha256 2f4bc4c1244b679121749378ff1a2b4b4e318897dac3d346a236432948ebeea7 debian/copyright diff --git a/buildroot/package/kodi-platform/kodi-platform.mk b/buildroot/package/kodi-platform/kodi-platform.mk index 8bf517fa5..f1b97e325 100644 --- a/buildroot/package/kodi-platform/kodi-platform.mk +++ b/buildroot/package/kodi-platform/kodi-platform.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PLATFORM_VERSION = 915da086fa7b4ea72796052a04ed6de95501b95c +KODI_PLATFORM_VERSION = 809c5e9d711e378561440a896fcb7dbcd009eb3d KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) KODI_PLATFORM_LICENSE = GPL-2.0+ -KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h +KODI_PLATFORM_LICENSE_FILES = debian/copyright KODI_PLATFORM_INSTALL_STAGING = YES KODI_PLATFORM_DEPENDENCIES = libplatform kodi diff --git a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 1568f4b08..5c47dd30b 100644 --- a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d0fae3721715a17e1c1454dd7029eb8d18e7f761ed65e00f8c488c7c08433e8 kodi-pvr-argustv-3.5.4-Leia.tar.gz -sha256 9a5b69143f47289e5d649a78a0f0aaf21a75fa8866bd2b8c6c559e57cd221295 src/client.h +sha256 7bfedb27b2aec4015b2594df18b76fe42e97ec10f4b5cb9c6987b1a7a264c844 kodi-pvr-argustv-3.5.6-Leia.tar.gz +sha256 17bc5450fff10fc46484886690adbf20c369f5baff021435feab1187b9943834 debian/copyright diff --git a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index f59f4467a..73a9f1c76 100644 --- a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 3.5.4-Leia +KODI_PVR_ARGUSTV_VERSION = 3.5.6-Leia KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ -KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h +KODI_PVR_ARGUSTV_LICENSE_FILES = debian/copyright KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index 4bec77ddc..c2121df02 100644 --- a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz -sha256 2a643b774c0b5238ff2d284bad43ec69c2ad4b848b6c58a73dbabffa55d62bfe src/client.h +sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz +sha256 4200fb35edb052f04dc43d267a1ad59468cb899e7b4931756b5830039b82716d debian/copyright diff --git a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 423faf763..95bc7bbb4 100644 --- a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -7,7 +7,7 @@ KODI_PVR_DVBLINK_VERSION = 4.7.2-Leia KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ -KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h +KODI_PVR_DVBLINK_LICENSE_FILES = debian/copyright KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2 $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index f63f90714..ec2013412 100644 --- a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz -sha256 d60190aad6c2e704c7ef51693afec2530a54e357ed217313570004cc59c9a4d8 src/client.h +sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz +sha256 5757dbd6a8731e9395508cd7ab9ca0ea0c2863a7aac7136299d40549c88c9c2c debian/copyright diff --git a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index 4c221c012..b88d3d86c 100644 --- a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -7,7 +7,7 @@ KODI_PVR_DVBVIEWER_VERSION = 3.7.11-Leia KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ -KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h +KODI_PVR_DVBVIEWER_LICENSE_FILES = debian/copyright KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index ad777e538..e89ce6359 100644 --- a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 763500fb4a7210569f05dba8307d400e532dd0e72b24f1a1d2cd516695145190 kodi-pvr-filmon-2.4.4-Leia.tar.gz -sha256 8300bc67ff10aad7f271e96f867ad024fcdfc114caca04fefa437231945e6315 src/client.h +sha256 90988e4833c0f84ab08e08be3cd08b84e4ba2baf2ebc1545c62e5dbd6708d749 kodi-pvr-filmon-2.4.6-Leia.tar.gz +sha256 081907693b03f27cb1b17e0a440ae05fd8c8b4631be6fe6fdba4e18a5d40fdc5 debian/copyright diff --git a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index 44f13909f..078eae176 100644 --- a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 2.4.4-Leia +KODI_PVR_FILMON_VERSION = 2.4.6-Leia KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ -KODI_PVR_FILMON_LICENSE_FILES = src/client.h +KODI_PVR_FILMON_LICENSE_FILES = debian/copyright KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 1bc71c06f..1762289f0 100644 --- a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz -sha256 b184cd8a52f77f6c02c1da89dfc17dff989c50c400acab10148ab77f02723d84 src/client.h +sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz +sha256 9e76c8ce9e201f75c50c755982b9e2f15821280dedc5e953f685086912e1e39d debian/copyright diff --git a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 6e6dd4dfa..ae42f5c33 100644 --- a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -7,7 +7,7 @@ KODI_PVR_HDHOMERUN_VERSION = 3.5.0-Leia KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ -KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h +KODI_PVR_HDHOMERUN_LICENSE_FILES = debian/copyright KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash index ffbe36863..c9724404b 100644 --- a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fcf2df3566b196addf99d8166fa5a8b77635ac905214c36071d9e778cc42978e kodi-pvr-hts-4.4.20-Leia.tar.gz -sha256 a6cd848443278bf312680e08d13fa898e4242fd76de8c86aea5f09a51826885c src/client.h +sha256 6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c kodi-pvr-hts-4.4.21-Leia.tar.gz +sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright diff --git a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk index 0184f77ec..6a25cda00 100644 --- a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 4.4.20-Leia +KODI_PVR_HTS_VERSION = 4.4.21-Leia KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ -KODI_PVR_HTS_LICENSE_FILES = src/client.h +KODI_PVR_HTS_LICENSE_FILES = debian/copyright KODI_PVR_HTS_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 38e857138..2de9a4a15 100644 --- a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25eff252ad748e0cf166cd01b0f08e8fb3977c98a1b04cad9ef6509ea30c5fa9 kodi-pvr-iptvsimple-3.8.8-Leia.tar.gz -sha256 f5890f1869491e6e6674029355d40b1f4cf57f065da4f37d5b1b3d2dd41ba092 src/client.h +sha256 0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96 kodi-pvr-iptvsimple-3.9.8-Leia.tar.gz +sha256 50e33ec3cddb75e6c5c5eb1b3d38cc0adee7dec71d7244925106d4a2c4d5e31d debian/copyright diff --git a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 16007cf40..f1a087100 100644 --- a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 3.8.8-Leia +KODI_PVR_IPTVSIMPLE_VERSION = 3.9.8-Leia KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ -KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h +KODI_PVR_IPTVSIMPLE_LICENSE_FILES = debian/copyright KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform rapidxml $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index ce24491ec..53d4316d0 100644 --- a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz -sha256 b9966d774c89672efb8d6501d636038a77888c044d15e68af604e9366c1b1a0a src/client.h +sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz +sha256 f9df5b0c11a23b2d5ca84828c67412ecd8752df46527285aeff48f4d7988d367 debian/copyright diff --git a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 1b6ad39ef..a00711c66 100644 --- a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -7,7 +7,7 @@ KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 3.5.18-Leia KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ -KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h +KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = debian/copyright KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index a8aaef631..1896592cf 100644 --- a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 36d9142e0e19b904e1c4a6d8cd67063d291e63971f80a98a6f24b7f4554bb2e3 kodi-pvr-mythtv-5.10.15-Leia.tar.gz -sha256 ca8fee175b3a02d106870b991ed29b07dfc5024ce3992bbb872d0654467f132b src/client.h +sha256 b2048db252966d5f78828cacd41e85d00a522c03fe7f24a0f000f720fe7aff0a kodi-pvr-mythtv-5.10.19-Leia.tar.gz +sha256 0efb11009d447b39ec35d77dc265db3d1c3d261730bbc33b267587254d973ec8 debian/copyright diff --git a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index e644f9bc7..e902bab14 100644 --- a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 5.10.15-Leia +KODI_PVR_MYTHTV_VERSION = 5.10.19-Leia KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ -KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h +KODI_PVR_MYTHTV_LICENSE_FILES = debian/copyright KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 28bad5fca..345ece6df 100644 --- a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7b6ea2e79e469fc265d008d3ba8ebb7e286e789a8b4bc809681a254ff225775 kodi-pvr-nextpvr-3.3.18-Leia.tar.gz -sha256 71c90cfb2792702a6bc13dd10e34c2f181b5e923ab4ae2b1b0674c5b8867b2ad src/client.h +sha256 1f5576070a0bf076d1f28cdd547bc4ff134861c18a71cff7fd036eaacc357707 kodi-pvr-nextpvr-3.3.21-Leia.tar.gz +sha256 0bd576badce05c6b4315c415dabd77d80c871e72026c399f7a7bb8582e0911fe debian/copyright diff --git a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 059430ebb..b35216048 100644 --- a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 3.3.18-Leia +KODI_PVR_NEXTPVR_VERSION = 3.3.21-Leia KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ -KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h +KODI_PVR_NEXTPVR_LICENSE_FILES = debian/copyright KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index 472dc7862..3071dfac6 100644 --- a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz -sha256 69e4681abe815ce2f3ec2c9f34c2292e95e56424d9403fe91a91baeb23e91ec0 src/client.h +sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz +sha256 9d42154eabd84ae131cc6384a3ea0fc622c3551595564bec7a6bec8df4a57fbd debian/copyright diff --git a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index 1099e6621..ca86d46d8 100644 --- a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -7,7 +7,7 @@ KODI_PVR_NJOY_VERSION = 3.4.2-Leia KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ -KODI_PVR_NJOY_LICENSE_FILES = src/client.h +KODI_PVR_NJOY_LICENSE_FILES = debian/copyright KODI_PVR_NJOY_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-octonet/Config.in b/buildroot/package/kodi-pvr-octonet/Config.in new file mode 100644 index 000000000..b8bcd7e21 --- /dev/null +++ b/buildroot/package/kodi-pvr-octonet/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_KODI_PVR_OCTONET + bool "kodi-pvr-octonet" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp + select BR2_PACKAGE_JSON_FOR_MODERN_CPP + select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_LIBPLATFORM + help + DigitalDevices Octonet PVR client addon for Kodi + + https://github.com/DigitalDevices/pvr.octonet + +comment "kodi-pvr-octonet needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.hash b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.hash new file mode 100644 index 000000000..5ee0eeb6e --- /dev/null +++ b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e55d440afe3b1f1bc1529d1f662d4d18f5334ecf01e023d34d5a7e419b6fbf10 kodi-pvr-octonet-e35cc373476a92aee11ec8e8a14fb8fc086a4f84.tar.gz +sha256 8547bcbe8bd72c18ac285fd801fcbff8806a988913741b14497f4aba88bba403 debian/copyright diff --git a/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk new file mode 100644 index 000000000..890a28356 --- /dev/null +++ b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-pvr-octonet +# +################################################################################ + +KODI_PVR_OCTONET_VERSION = e35cc373476a92aee11ec8e8a14fb8fc086a4f84 +KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) +KODI_PVR_OCTONET_LICENSE = GPL-2.0+ +KODI_PVR_OCTONET_LICENSE_FILES = debian/copyright +KODI_PVR_OCTONET_DEPENDENCIES = json-for-modern-cpp kodi-platform libplatform + +$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 850ca7ac7..30fb81a90 100644 --- a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a9f1c5596786cf4cfa279d0b4477839ef7f5bb7267c65152dbcf7ae0bda56679 kodi-pvr-pctv-2.4.5-Leia.tar.gz -sha256 03798669132b75111ef5731f6f9c5e519faf088fe4ef3233289bc140e26d2845 src/client.h +sha256 10124e5444c6cfb0c77bad1d1122f6ba5fc233248d6b33066ba799f4dedceeee kodi-pvr-pctv-2.4.7-Leia.tar.gz +sha256 43376e70ae80133530c8ce71a3b0dcde8529a8162d3b3956009eb8fc0f5c559c debian/copyright diff --git a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 014d1d3f9..851788c96 100644 --- a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 2.4.5-Leia +KODI_PVR_PCTV_VERSION = 2.4.7-Leia KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ -KODI_PVR_PCTV_LICENSE_FILES = src/client.h +KODI_PVR_PCTV_LICENSE_FILES = debian/copyright KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 4db4f7974..cc129d90e 100644 --- a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz -sha256 31d746afd12ac7ebcbc2a4b525de77d31d10bc4f7a0a45830d6f899a2953bc95 src/client.h +sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz +sha256 f9fa34b2caa07376a7a976c1f0b1b9761b37449afd4ceb1e7afa283492054237 debian/copyright diff --git a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 1b1592320..0ae41171a 100644 --- a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -7,7 +7,7 @@ KODI_PVR_STALKER_VERSION = 3.4.10-Leia KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ -KODI_PVR_STALKER_LICENSE_FILES = src/client.h +KODI_PVR_STALKER_LICENSE_FILES = debian/copyright KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform libxml2 $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index 42fee0b5a..b753b994a 100644 --- a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz -sha256 d50cada312480496eeb901e1809cfadaea256f82359d2cb01ae44f28e2191b33 src/client.h +sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz +sha256 f535b79e33bdf4d270f8aed3fdcb92f807981f808d7f5e3c053c088e5ccf553b debian/copyright diff --git a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 8c8382a1d..b10bfc5b8 100644 --- a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -7,7 +7,7 @@ KODI_PVR_VBOX_VERSION = 4.7.0-Leia KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ -KODI_PVR_VBOX_LICENSE_FILES = src/client.h +KODI_PVR_VBOX_LICENSE_FILES = debian/copyright KODI_PVR_VBOX_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index c0e1d90bf..f7043b58a 100644 --- a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6afaf1f3f1e0670edb9dc01581a0d6c3f57502c791e19283eb63807e8936a768 kodi-pvr-vdr-vnsi-3.6.3-Leia.tar.gz -sha256 4da4a184b215913b33f48ee26990b34daa7a15e00cc23e60975d391b7168597b src/client.h +sha256 f0ea8907e77ca014429bbe73d07c3410cc7be25a6db0df157863b87d2684affb kodi-pvr-vdr-vnsi-3.6.4-Leia.tar.gz +sha256 28266596fdf4162d4f15985e0108cd9ddb42531ddad2297011649c1af49f7fe2 debian/copyright diff --git a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index ec8fc7fc7..f467fa98f 100644 --- a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 3.6.3-Leia +KODI_PVR_VDR_VNSI_VERSION = 3.6.4-Leia KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ -KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h +KODI_PVR_VDR_VNSI_LICENSE_FILES = debian/copyright KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index a8f81244f..e80e51bc7 100644 --- a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz -sha256 21f5b12ef73285dbf9709fd42b719b719285a7e8a6741913664b58b8e08374c8 src/client.h +sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz +sha256 e98518889de8d38eaa6ddcb086b6e3b86efed98b501a5c666b9cf48f79e6df5d debian/copyright diff --git a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 34ec5d238..bf1de1178 100644 --- a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -7,7 +7,7 @@ KODI_PVR_VUPLUS_VERSION = 3.28.9-Leia KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ -KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h +KODI_PVR_VUPLUS_LICENSE_FILES = debian/copyright KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi-platform tinyxml $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 643549ea7..d5387e853 100644 --- a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cb81f29cba23172d042e50bbab00cd64cd5670ad7350fd9d25301f63178e5f7 kodi-pvr-wmc-2.4.5-Leia.tar.gz -sha256 1a2f68003a1149b6f6480f4cc749089aed8cbf16529300cc8458c5c7925ce917 src/client.h +sha256 7fb150ba3b8b41cf164425b56ae5dda3a5fb2f64cdea7229900113965d492fee kodi-pvr-wmc-2.4.6-Leia.tar.gz +sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright diff --git a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 82397163f..c280f89df 100644 --- a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 2.4.5-Leia +KODI_PVR_WMC_VERSION = 2.4.6-Leia KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ -KODI_PVR_WMC_LICENSE_FILES = src/client.h +KODI_PVR_WMC_LICENSE_FILES = debian/copyright KODI_PVR_WMC_DEPENDENCIES = kodi-platform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-zattoo/Config.in b/buildroot/package/kodi-pvr-zattoo/Config.in new file mode 100644 index 000000000..ab7ff7003 --- /dev/null +++ b/buildroot/package/kodi-pvr-zattoo/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_KODI_PVR_ZATTOO + bool "kodi-pvr-zattoo" + select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_LIBPLATFORM + select BR2_PACKAGE_RAPIDXML + select BR2_PACKAGE_TINYXML2 + help + Kodi PVR-Addon for Zattoo + + https://github.com/rbuehlma/pvr.zattoo diff --git a/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash new file mode 100644 index 000000000..13201a429 --- /dev/null +++ b/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 19de7bc58bcf37bbcff5ad2cb2f095cb15a4217f9abec5c9ff30d0489dab89d2 kodi-pvr-zattoo-18.1.21-Leia.tar.gz +sha256 d3670aef89085fd6b97665967a8422c89324afbc4720daa0975696a2ee92e236 debian/copyright diff --git a/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk new file mode 100644 index 000000000..7afe92e87 --- /dev/null +++ b/buildroot/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-pvr-zattoo +# +################################################################################ + +KODI_PVR_ZATTOO_VERSION = 18.1.21-Leia +KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) +KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ +KODI_PVR_ZATTOO_LICENSE_FILES = debian/copyright +KODI_PVR_ZATTOO_DEPENDENCIES = kodi-platform libplatform rapidxml tinyxml2 + +$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 00d40413b..e6855a3bc 100644 --- a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c359f8bb6a2e9b42dcfb063cdf965ce0b3fc95761816d98160000aea33894241 kodi-screensaver-asteroids-2.3.2-Leia.tar.gz -sha256 297a1d34e6000f1b1a924f5ab75c16c2270968bfa47357dd8fa3799c9dfc47d8 debian/copyright +sha256 f4b54ed79eedd1a39e24dcbe8d372dbfc9edbc9358499ea9ab28777dd9082ee3 kodi-screensaver-asteroids-2.3.3-Leia.tar.gz +sha256 297a1d34e6000f1b1a924f5ab75c16c2270968bfa47357dd8fa3799c9dfc47d8 debian/copyright diff --git a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 278efb4ee..dcd0a3d34 100644 --- a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.2-Leia +KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.3-Leia KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = debian/copyright diff --git a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index b05c9a180..a7fc05789 100644 --- a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 ff018b5bdd353747a4e962c72ec622a74232e05eae1742a116259273f1db0552 kodi-screensaver-asterwave-3.0.3-Leia.tar.gz +sha256 d61bcdd8b74b50a26eab1597718b12ec260f6c6cdde0f143dbc1ce958ca86c69 kodi-screensaver-asterwave-3.0.5-Leia.tar.gz +sha256 a0268e081014f3a555be39f7eb0fff759424963324915ad2ea56bf26668685e7 debian/copyright diff --git a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index 82996bc3e..b982395ea 100644 --- a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,8 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.3-Leia +KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.5-Leia KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) +KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ +KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch deleted file mode 100644 index 378b3ad1d..000000000 --- a/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2 Mon Sep 17 00:00:00 2001 -From: Rechi -Date: Sun, 24 Mar 2019 10:53:31 +0100 -Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro - -Downloaded from upstream commit: -https://github.com/xbmc/screensaver.biogenesis/commit/86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2 - -Signed-off-by: Bernd Kuhls ---- - src/Life.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Life.cpp b/src/Life.cpp -index 762ad7d..68be133 100644 ---- a/src/Life.cpp -+++ b/src/Life.cpp -@@ -24,6 +24,7 @@ - - #include "types.h" - #include -+#include - #ifdef WIN32 - #include - #else diff --git a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index 851519a23..df07f9fbc 100644 --- a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1d1edff918d2a94ba0efd329a45294be47e73eef65f700d62b311eb750d0fef7 kodi-screensaver-biogenesis-2.2.2-Leia.tar.gz -sha256 2bca14bf4f7391885dc6bb7c7ef190238e529a03b92cb22c09a37c178bc94b76 src/Life.cpp +sha256 b0f721d112282f633a769e7b077c5dd52e5045a8f1ae32c4e602b0e2e937acb0 kodi-screensaver-biogenesis-2.2.3-Leia.tar.gz +sha256 d38b9e2768b49acdedcb21a202d12753c8f1d7e85e5ee24ff1e4aee3c7601a65 debian/copyright diff --git a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index 3888f2996..562c279ec 100644 --- a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.2-Leia +KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.3-Leia KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp +KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index eca5d805e..4ff614a99 100644 --- a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6d7a0036a118778117d1d1ebeca96903e66f49a166848a1c884aaf3ed65fdd46 kodi-screensaver-cpblobs-e65b34fb75ac258a8563169b9c00ebf739dbc7ca.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 afab934a2c93f73334943775f45f5a1d065e74714528bc700459d110e88e43a4 kodi-screensaver-cpblobs-3.0.5-Leia.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index bb6811dab..01f6bdf3d 100644 --- a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = e65b34fb75ac258a8563169b9c00ebf739dbc7ca +KODI_SCREENSAVER_CPBLOBS_VERSION = 3.0.5-Leia KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash index 407093f19..59e070325 100644 --- a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash +++ b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d8ed548222f1118964104fefc8ac3056dfe6c9d2ee35cd7c8355c9ea9fcaffc5 kodi-screensaver-crystalmorph-4439c84c38abf889e19a1863e745942c0d7f8203.tar.gz -sha256 febce1924ed772f22ec3fabec646b1401aad4f4a81a7f1baeb858f27ae4f5241 src/Fractal.cpp +sha256 d8ed548222f1118964104fefc8ac3056dfe6c9d2ee35cd7c8355c9ea9fcaffc5 kodi-screensaver-crystalmorph-4439c84c38abf889e19a1863e745942c0d7f8203.tar.gz +sha256 febce1924ed772f22ec3fabec646b1401aad4f4a81a7f1baeb858f27ae4f5241 src/Fractal.cpp diff --git a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 71734ee6e..87961fdae 100644 --- a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d95bc93d022b12fbfcbaedf1128292b40dd16276b65a3ffecb90707055e1d55f kodi-screensaver-greynetic-2.2.1-Leia.tar.gz -sha256 f3e1fc9e8f86842be8af2500e9b2a50ab8597ad997908228a00c3c8a4abb9426 src/GreyNetic.cpp +sha256 e9a24d3204e3d6d5b5302a865e37c6f2ae9e25a3536eeda4205830f5e0256555 kodi-screensaver-greynetic-2.2.3-Leia.tar.gz +sha256 2905fdee5c68dc4944c42711d45f47794e8fb881bd67d66d0875d10f9a2156a0 debian/copyright diff --git a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index f9b0be1ad..631132554 100644 --- a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.1-Leia +KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.3-Leia KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp +KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch deleted file mode 100644 index 75cadfcb1..000000000 --- a/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 404763f096a312e12c0dc4764834987797411745 Mon Sep 17 00:00:00 2001 -From: Rechi -Date: Sun, 24 Mar 2019 11:44:05 +0100 -Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro - -Downloaded from upstream commit: -https://github.com/xbmc/screensaver.matrixtrails/commit/404763f096a312e12c0dc4764834987797411745 - -Signed-off-by: Bernd Kuhls ---- - src/matrixtrails.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/matrixtrails.cpp b/src/matrixtrails.cpp -index 220855a..2817dbe 100644 ---- a/src/matrixtrails.cpp -+++ b/src/matrixtrails.cpp -@@ -25,6 +25,7 @@ - #include "matrixtrails.h" - #include "SOIL2/SOIL2.h" - -+#include - #include - - //////////////////////////////////////////////////////////////////////////// diff --git a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 01a26bf5f..26b95cbc7 100644 --- a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d2c795853c5a72184bb6720247d79c48b1d9fbc97e9c2913003a707d612e3ac kodi-screensaver-matrixtrails-2.2.1-Leia.tar.gz -sha256 5f8e5e8435ce1c5ca39d0cb081a9ae4d8ab56a8b6b7f438d7bbe65cdf1603453 src/matrixtrails.cpp +sha256 5a2f5bca0c197eea87f06376941c6d0ddbc81cf144d8c3854ac148fdec3400ec kodi-screensaver-matrixtrails-2.2.3-Leia.tar.gz +sha256 385a17599b44aaea10537374c1991c21a5e06153878917b12f96fc1cf8bbc118 debian/copyright diff --git a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 674a0116e..10d3d45e0 100644 --- a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.1-Leia -KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.3-Leia +KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp +KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch deleted file mode 100644 index f71e1899a..000000000 --- a/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6ca75e7d421a49b6124d0e1cd37a529c66a701cb Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 18 Jan 2020 20:01:21 +0100 -Subject: [PATCH] [Backport] Add missing cstddef includes - -Fixes build error with gcc 5.5.0. - -Backported from https://github.com/xbmc/screensaver.pingpong/pull/21 - -Patch sent upstream: -https://github.com/xbmc/screensaver.pingpong/pull/22 - -Signed-off-by: Bernd Kuhls ---- - src/pingpong.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pingpong.cpp b/src/pingpong.cpp -index e1df353..9cd9fb5 100644 ---- a/src/pingpong.cpp -+++ b/src/pingpong.cpp -@@ -24,6 +24,7 @@ - #include "main.h" - #include "pingpong.h" - -+#include - #include - - #define NUMQUADS 3 --- -2.20.1 - diff --git a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index b4e22420a..4b6114fd1 100644 --- a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d4e09509bf036b7d5c381cd4ecac926a59396fb481347a4056d843ae68d3a20d kodi-screensaver-pingpong-2.1.1-Leia.tar.gz -sha256 47ff769788026a338740772250197acd0a84f26b57dda49e5b14d63f2f2937ee src/readme.txt +sha256 b87e65d2e3c290de7167e1098899d5816103958a99769d84e930ffd2cbfa7d00 kodi-screensaver-pingpong-2.1.3-Leia.tar.gz +sha256 96e9b817ea6384e3d2c5241c8a0504df11d6f8bd0a2f58f25df7152da64f263c debian/copyright diff --git a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index 45f2d2303..929539f04 100644 --- a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.1-Leia +KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.3-Leia KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt +KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch deleted file mode 100644 index c463d42d5..000000000 --- a/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e1dbe7822b35b889fdc5ea54114ad3f9669d440e Mon Sep 17 00:00:00 2001 -From: Rechi -Date: Sun, 24 Mar 2019 10:55:44 +0100 -Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro - -Downloaded from upstream commit in master branch: -https://github.com/xbmc/screensaver.pyro/commit/e1dbe7822b35b889fdc5ea54114ad3f9669d440e - -Signed-off-by: Bernd Kuhls ---- - src/Pyro.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Pyro.cpp b/src/Pyro.cpp -index 3f873a2..6dfa764 100644 ---- a/src/Pyro.cpp -+++ b/src/Pyro.cpp -@@ -34,6 +34,7 @@ - #include "Pyro.h" - #include - #include -+#include - #include - - #ifdef WIN32 diff --git a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index fc41e80ee..fd51a7c1d 100644 --- a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55f867b703e5cf409f8e0a8a2c34373f896feb990004b5901b4efaee905d42e5 kodi-screensaver-pyro-3.0.0-Leia.tar.gz -sha256 b945c014a69091c728caa3fca547c2747911e61e1dd2cef9928cf92a6a45655f src/Pyro.cpp +sha256 cf9ed582b70460682175366641e6a00eaea085a1d3477a02710ba8398a1d17bd kodi-screensaver-pyro-3.0.1-Leia.tar.gz +sha256 24354cf1e6058ba0a95c7652eab9f1be2224c835ce36d14e82c0f401f65a53b7 debian/copyright diff --git a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index 7b3b63ab7..8a6ea93e8 100644 --- a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = 3.0.0-Leia +KODI_SCREENSAVER_PYRO_VERSION = 3.0.1-Leia KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp +KODI_SCREENSAVER_PYRO_LICENSE_FILES = debian/copyright KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 8f34b349e..f4987a44c 100644 --- a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz -sha256 fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6 debian/copyright +sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz +sha256 fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6 debian/copyright diff --git a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index 9a8246e9d..b65851730 100644 --- a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dca39e68d803cca3c1d9524df17feb3e12fc7eeae4166c6311a97dc68c29f523 kodi-screensaver-stars-2.1.3-Leia.tar.gz -sha256 962bb1e8e5da407e871adcdb6868371fdb2ca0c01e8ffb4bb01a8e87b1eafe88 src/StarField.cpp +sha256 98972a9af45015d902ade50db822dbded52d4473acde6bc4b01a5ab8c4af4269 kodi-screensaver-stars-2.1.4-Leia.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index a23f4d93f..ca51921b5 100644 --- a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = 2.1.3-Leia +KODI_SCREENSAVER_STARS_VERSION = 2.1.4-Leia KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp +KODI_SCREENSAVER_STARS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash index 113548bf6..fdd4e828f 100644 --- a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt +sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk b/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk index e33e680e1..7b13904ef 100644 --- a/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 18.5-Leia +KODI_TEXTUREPACKER_VERSION = 18.9-Leia KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/buildroot/package/kodi-vfs-rar/Config.in b/buildroot/package/kodi-vfs-rar/Config.in index f855fb6c9..2d8b68057 100644 --- a/buildroot/package/kodi-vfs-rar/Config.in +++ b/buildroot/package/kodi-vfs-rar/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_VFS_RAR bool "kodi-vfs-rar" - select BR2_PACKAGE_LIBPLATFORM + select BR2_PACKAGE_TINYXML help RAR VFS addon for Kodi diff --git a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash index f0b539852..22ad584fb 100644 --- a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 09a16bf0be13c7d9ed43c6608f662374cb3b8b35c05492ce1117f58270d8d005 kodi-vfs-rar-60f92ff28ee6c94211b628990696c60518bffcf6.tar.gz +sha256 5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f kodi-vfs-rar-2.3.2-Leia.tar.gz # License files -sha256 e0c2f13c3a78c8d2b91cb846b8a13fb650fcc88c0630e38ce9c0b7c34631d1cc lib/UnrarXLib/license.txt -sha256 2ddada473db917f5d0ed191d8b571aa04af8926807f61398e602b971eaf5ccb7 src/RarManager.h +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk index b113fa5a0..c0d52a1d2 100644 --- a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 60f92ff28ee6c94211b628990696c60518bffcf6 +KODI_VFS_RAR_VERSION = 2.3.2-Leia KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ -KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt src/RarManager.h -KODI_VFS_RAR_DEPENDENCIES = libplatform kodi +KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md +KODI_VFS_RAR_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 08115847b..a17c2d32c 100644 --- a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9 kodi-vfs-sftp-1.0.5-Leia.tar.gz -sha256 394c58f6cf5e728770c1ac7ea7d509fa54f950cad6e757a9f093344f5230b7b9 src/SFTPFile.cpp +sha256 dc3db18b6cef90cd518b741e5c9bc7b3f4412774ee60bf70b451a8d2fc88a091 kodi-vfs-sftp-1.0.6-Leia.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index 8657ebdce..3870ff9b5 100644 --- a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 1.0.5-Leia +KODI_VFS_SFTP_VERSION = 1.0.6-Leia KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ -KODI_VFS_SFTP_LICENSE_FILES = src/SFTPFile.cpp +KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md KODI_VFS_SFTP_DEPENDENCIES = kodi-platform libplatform libssh $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-fishbmc/Config.in b/buildroot/package/kodi-visualisation-fishbmc/Config.in index 9e2eabbdb..66c1565bd 100644 --- a/buildroot/package/kodi-visualisation-fishbmc/Config.in +++ b/buildroot/package/kodi-visualisation-fishbmc/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC bool "kodi-visualisation-fishbmc" - depends on BR2_PACKAGE_HAS_LIBGL help Fische visualiser for Kodi - https://github.com/notspiff/visualization.fishbmc - -comment "kodi-visualisation-fishbmc needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL + https://github.com/xbmc/visualization.fishbmc diff --git a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index e8b5c6cb5..4e215f331 100644 --- a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8142fe4a32c0c113945c5fc9745e54639ca73308371d292e3422730bfad1d064 kodi-visualisation-fishbmc-5.1.2-Leia.tar.gz -sha256 684792cea796ea39d086ffd6cf5cb7c70ab8188dcf493707ba90d081d28f787e visualization.fishbmc/LICENSE +sha256 a03d4f64a6d44625d6936fd3abd359a0a08d11252663cae9fc5d061bd489c006 kodi-visualisation-fishbmc-5.1.3-Leia.tar.gz +sha256 684792cea796ea39d086ffd6cf5cb7c70ab8188dcf493707ba90d081d28f787e visualization.fishbmc/LICENSE diff --git a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index a89c559d2..defc183ff 100644 --- a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 5.1.2-Leia +KODI_VISUALISATION_FISHBMC_VERSION = 5.1.3-Leia KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE diff --git a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index 4439240d7..c9fa7dea9 100644 --- a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49f193d32a14b26a39d6572fcbdd8b69a9e559f453bca017086336e985bf6b2c kodi-visualisation-goom-2.1.0-Leia.tar.gz -sha256 e5776a7262955801be2e19a84024cf4d0589253c8d77dd09a1db01bf5ed07683 src/Main.cpp +sha256 fdd656721f6d1b1962fd0a1e240eafb4710237ba70809dd0391cd10cacf4417c kodi-visualisation-goom-2.2.3-Leia.tar.gz +sha256 a6b36f495079206146ae0b11624a8db49a538f421ffe1341f8651c9e6b06f0b0 debian/copyright diff --git a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index 0184d8474..d83f857ae 100644 --- a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 2.1.0-Leia +KODI_VISUALISATION_GOOM_VERSION = 2.2.3-Leia KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp +KODI_VISUALISATION_GOOM_LICENSE_FILES = debian/copyright KODI_VISUALISATION_GOOM_DEPENDENCIES = glm kodi diff --git a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index fd29651b6..67ab8867e 100644 --- a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz -sha256 bf8d322650b3d36c6781a9d14c6194530d5677c14291d51e2a3992c6550a62da src/main.cpp +sha256 07724fc59cc5f960a941b8255af326e87fa9fbc8234498c7e21d8a46050e0dd4 kodi-visualisation-shadertoy-1.2.4-Leia.tar.gz +sha256 e33ac3ac6ca1bdd4a4a411481d43579d855622e7ecc207809b5f49ea617db480 debian/copyright diff --git a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index add0f3dde..865abf02c 100644 --- a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia +KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.4-Leia KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ -KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp +KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = debian/copyright KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 4064184a7..ae78fbd35 100644 --- a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/kodi-visualisation-starburst/Config.in b/buildroot/package/kodi-visualisation-starburst/Config.in new file mode 100644 index 000000000..af9eee7a4 --- /dev/null +++ b/buildroot/package/kodi-visualisation-starburst/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_KODI_VISUALISATION_STARBURST + bool "kodi-visualisation-starburst" + select BR2_PACKAGE_GLM + help + StarBurst visualization for Kodi + + https://github.com/xbmc/visualization.starburst diff --git a/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash new file mode 100644 index 000000000..834d71ae5 --- /dev/null +++ b/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5a06385dd4824373a00fe4e2139b3d851c51ed001f68671acf99d17ce348f5e2 kodi-visualisation-starburst-2.0.3-Leia.tar.gz +sha256 2e668b3da2f061a6d6ecc3cb96bdfb0f8fc9cc98c9e9f95454bc45b88708690f debian/copyright diff --git a/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk new file mode 100644 index 000000000..8d736f08e --- /dev/null +++ b/buildroot/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-visualisation-starburst +# +################################################################################ + +KODI_VISUALISATION_STARBURST_VERSION = 2.0.3-Leia +KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) +KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ +KODI_VISUALISATION_STARBURST_LICENSE_FILES = debian/copyright +KODI_VISUALISATION_STARBURST_DEPENDENCIES = glm kodi + +$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 80808663c..578b2ea8a 100644 --- a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b kodi-visualisation-waveform-3.1.1-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d734cbe9d7e661e8d4e61ff2bada423fd8dba33c5148b5044f4b1a1997c51376 kodi-visualisation-waveform-3.1.2-Leia.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 2d65df853..64a4db4fc 100644 --- a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.1-Leia +KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.2-Leia KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING diff --git a/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch b/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch deleted file mode 100644 index ec52f32d0..000000000 --- a/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 711845d533f9f6b5fe68b7cbcc8f369ce7efe445 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Thu, 5 Dec 2019 14:49:50 -0500 -Subject: [PATCH] Add missing cassert includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without these includes, ‘assert’ was not declared in this scope errors -occur. - -Backport of https://github.com/xbmc/xbmc/pull/17000 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/17213 - -Signed-off-by: Bernd Kuhls ---- - xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 2 ++ - xbmc/windowing/GraphicContext.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -index 222d1fa2c8..070ea0ae46 100644 ---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -@@ -33,6 +33,8 @@ - #include "utils/Variant.h" - #include "ServiceBroker.h" - -+#include -+ - #define SETTING_PROFILE_NAME "profile.name" - #define SETTING_PROFILE_IMAGE "profile.image" - #define SETTING_PROFILE_DIRECTORY "profile.directory" -diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp -index 1ced49671b..0ddbe64c9f 100644 ---- a/xbmc/windowing/GraphicContext.cpp -+++ b/xbmc/windowing/GraphicContext.cpp -@@ -24,6 +24,8 @@ - #include "guilib/GUIWindowManager.h" - #include "guilib/TextureManager.h" - -+#include -+ - using namespace KODI::MESSAGING; - - CGraphicContext::CGraphicContext(void) = default; --- -2.20.1 - diff --git a/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch b/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch deleted file mode 100644 index 04f57b41f..000000000 --- a/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch +++ /dev/null @@ -1,469 +0,0 @@ -From 206f55e78f3a5ad39fad17526d01558677f9477a Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Sat, 4 Jul 2020 11:01:37 +0200 -Subject: [PATCH] [webserver] Compatibility with libmicrohttpd 0.9.71 - -From the libmicrohttpd 0.9.71 release notes: - -The release introduces an 'enum MHD_Result' instead of -for certain API misuse bugs by providing better types (not everything is -an 'int'). While this does NOT change the binary API, this change -_will_ cause compiler warnings for all legacy code -- until 'int' is -replaced with 'enum MHD_Result'. - -Signed-off-by: Bernd Kuhls -[downloaded from upstream PR 18134] ---- - xbmc/network/WebServer.cpp | 42 +++++++++---------- - xbmc/network/WebServer.h | 30 ++++++------- - .../httprequesthandler/HTTPFileHandler.cpp | 2 +- - .../httprequesthandler/HTTPFileHandler.h | 2 +- - .../HTTPImageTransformationHandler.cpp | 2 +- - .../HTTPImageTransformationHandler.h | 2 +- - .../httprequesthandler/HTTPJsonRpcHandler.cpp | 2 +- - .../httprequesthandler/HTTPJsonRpcHandler.h | 2 +- - .../httprequesthandler/HTTPPythonHandler.cpp | 2 +- - .../httprequesthandler/HTTPPythonHandler.h | 2 +- - .../HTTPRequestHandlerUtils.cpp | 4 +- - .../HTTPRequestHandlerUtils.h | 4 +- - .../HTTPWebinterfaceAddonsHandler.cpp | 2 +- - .../HTTPWebinterfaceAddonsHandler.h | 2 +- - .../httprequesthandler/IHTTPRequestHandler.h | 10 ++++- - 15 files changed, 59 insertions(+), 51 deletions(-) - -diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp -index 783404227785..be507131092b 100644 ---- a/xbmc/network/WebServer.cpp -+++ b/xbmc/network/WebServer.cpp -@@ -86,7 +86,7 @@ static MHD_Response* create_response(size_t size, const void* data, int free, in - return MHD_create_response_from_buffer(size, const_cast(data), mode); - } - --int CWebServer::AskForAuthentication(const HTTPRequest& request) const -+MHD_RESULT CWebServer::AskForAuthentication(const HTTPRequest& request) const - { - struct MHD_Response *response = create_response(0, nullptr, MHD_NO, MHD_NO); - if (!response) -@@ -95,7 +95,7 @@ int CWebServer::AskForAuthentication(const HTTPRequest& request) const - return MHD_NO; - } - -- int ret = AddHeader(response, MHD_HTTP_HEADER_CONNECTION, "close"); -+ MHD_RESULT ret = AddHeader(response, MHD_HTTP_HEADER_CONNECTION, "close"); - if (!ret) - { - CLog::Log(LOGERROR, "CWebServer[%hu]: unable to prepare HTTP Unauthorized response", m_port); -@@ -105,7 +105,7 @@ int CWebServer::AskForAuthentication(const HTTPRequest& request) const - - LogResponse(request, MHD_HTTP_UNAUTHORIZED); - -- ret = MHD_queue_basic_auth_fail_response(request.connection, "XBMC", response); -+ ret = (MHD_RESULT) MHD_queue_basic_auth_fail_response(request.connection, "XBMC", response); - MHD_destroy_response(response); - - return ret; -@@ -135,7 +135,7 @@ bool CWebServer::IsAuthenticated(const HTTPRequest& request) const - return authenticated; - } - --int CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, -+MHD_RESULT CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -@@ -163,7 +163,7 @@ int CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, - return webServer->HandlePartialRequest(connection, connectionHandler, request, upload_data, upload_data_size, con_cls); - } - --int CWebServer::HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, const char *upload_data, size_t *upload_data_size, void **con_cls) -+MHD_RESULT CWebServer::HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, const char *upload_data, size_t *upload_data_size, void **con_cls) - { - std::unique_ptr conHandler(connectionHandler); - -@@ -276,7 +276,7 @@ int CWebServer::HandlePartialRequest(struct MHD_Connection *connection, Connecti - return SendErrorResponse(request, MHD_HTTP_NOT_FOUND, request.method); - } - --int CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, -+MHD_RESULT CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size) -@@ -294,13 +294,13 @@ int CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char * - return MHD_YES; - } - --int CWebServer::HandleRequest(const std::shared_ptr& handler) -+MHD_RESULT CWebServer::HandleRequest(const std::shared_ptr& handler) - { - if (handler == nullptr) - return MHD_NO; - - HTTPRequest request = handler->GetRequest(); -- int ret = handler->HandleRequest(); -+ MHD_RESULT ret = handler->HandleRequest(); - if (ret == MHD_NO) - { - CLog::Log(LOGERROR, "CWebServer[%hu]: failed to handle HTTP request for %s", m_port, request.pathUrl.c_str()); -@@ -348,7 +348,7 @@ int CWebServer::HandleRequest(const std::shared_ptr& handle - return FinalizeRequest(handler, responseDetails.status, response); - } - --int CWebServer::FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response) -+MHD_RESULT CWebServer::FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response) - { - if (handler == nullptr || response == nullptr) - return MHD_NO; -@@ -562,7 +562,7 @@ void CWebServer::FinalizePostDataProcessing(ConnectionHandler *connectionHandler - MHD_destroy_post_processor(connectionHandler->postprocessor); - } - --int CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const -+MHD_RESULT CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const - { - if (handler == nullptr) - return MHD_NO; -@@ -620,7 +620,7 @@ int CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const -+MHD_RESULT CWebServer::CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const - { - if (handler == nullptr) - return MHD_NO; -@@ -700,7 +700,7 @@ int CWebServer::CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const -+MHD_RESULT CWebServer::CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const - { - if (handler == nullptr) - return MHD_NO; -@@ -850,7 +850,7 @@ int CWebServer::CreateFileDownloadResponse(const std::shared_ptr(data), free ? MHD_YES : MHD_NO, copy ? MHD_YES : MHD_NO); - if (response == nullptr) -@@ -893,20 +893,20 @@ int CWebServer::CreateMemoryDownloadResponse(struct MHD_Connection *connection, - return MHD_YES; - } - --int CWebServer::SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const -+MHD_RESULT CWebServer::SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const - { - LogResponse(request, responseStatus); - -- int ret = MHD_queue_response(request.connection, responseStatus, response); -+ MHD_RESULT ret = MHD_queue_response(request.connection, responseStatus, response); - MHD_destroy_response(response); - - return ret; - } - --int CWebServer::SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const -+MHD_RESULT CWebServer::SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const - { - struct MHD_Response *response = nullptr; -- int ret = CreateErrorResponse(request.connection, errorType, method, response); -+ MHD_RESULT ret = CreateErrorResponse(request.connection, errorType, method, response); - if (ret == MHD_NO) - return MHD_NO; - -@@ -1296,10 +1296,10 @@ std::string CWebServer::CreateMimeTypeFromExtension(const char *ext) - return CMime::GetMimeType(ext); - } - --int CWebServer::AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const -+MHD_RESULT CWebServer::AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const - { - if (response == nullptr || name.empty()) -- return 0; -+ return MHD_NO; - - CLog::Log(LOGDEBUG, LOGWEBSERVER, "CWebServer[%hu] [OUT] %s: %s", m_port, name.c_str(), value.c_str()); - -diff --git a/xbmc/network/WebServer.h b/xbmc/network/WebServer.h -index c7a909304a21..1274a2e0ed40 100644 ---- a/xbmc/network/WebServer.h -+++ b/xbmc/network/WebServer.h -@@ -56,17 +56,17 @@ class CWebServer - - virtual void LogRequest(const char* uri) const; - -- virtual int HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, -+ virtual MHD_RESULT HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, - const char *upload_data, size_t *upload_data_size, void **con_cls); -- virtual int HandleRequest(const std::shared_ptr& handler); -- virtual int FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response); -+ virtual MHD_RESULT HandleRequest(const std::shared_ptr& handler); -+ virtual MHD_RESULT FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response); - - private: - struct MHD_Daemon* StartMHD(unsigned int flags, int port); - - std::shared_ptr FindRequestHandler(const HTTPRequest& request) const; - -- int AskForAuthentication(const HTTPRequest& request) const; -+ MHD_RESULT AskForAuthentication(const HTTPRequest& request) const; - bool IsAuthenticated(const HTTPRequest& request) const; - - bool IsRequestCacheable(const HTTPRequest& request) const; -@@ -76,18 +76,18 @@ class CWebServer - bool ProcessPostData(const HTTPRequest& request, ConnectionHandler *connectionHandler, const char *upload_data, size_t *upload_data_size, void **con_cls) const; - void FinalizePostDataProcessing(ConnectionHandler *connectionHandler) const; - -- int CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; -- int CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; -+ MHD_RESULT CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; -+ MHD_RESULT CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; - -- int CreateRedirect(struct MHD_Connection *connection, const std::string &strURL, struct MHD_Response *&response) const; -- int CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; -- int CreateErrorResponse(struct MHD_Connection *connection, int responseType, HTTPMethod method, struct MHD_Response *&response) const; -- int CreateMemoryDownloadResponse(struct MHD_Connection *connection, const void *data, size_t size, bool free, bool copy, struct MHD_Response *&response) const; -+ MHD_RESULT CreateRedirect(struct MHD_Connection *connection, const std::string &strURL, struct MHD_Response *&response) const; -+ MHD_RESULT CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; -+ MHD_RESULT CreateErrorResponse(struct MHD_Connection *connection, int responseType, HTTPMethod method, struct MHD_Response *&response) const; -+ MHD_RESULT CreateMemoryDownloadResponse(struct MHD_Connection *connection, const void *data, size_t size, bool free, bool copy, struct MHD_Response *&response) const; - -- int SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const; -- int SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const; -+ MHD_RESULT SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const; -+ MHD_RESULT SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const; - -- int AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const; -+ MHD_RESULT AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const; - - void LogRequest(const HTTPRequest& request) const; - void LogResponse(const HTTPRequest& request, int responseStatus) const; -@@ -100,11 +100,11 @@ class CWebServer - static ssize_t ContentReaderCallback (void *cls, uint64_t pos, char *buf, size_t max); - static void ContentReaderFreeCallback(void *cls); - -- static int AnswerToConnection (void *cls, struct MHD_Connection *connection, -+ static MHD_RESULT AnswerToConnection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls); -- static int HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, -+ static MHD_RESULT HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size); -diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp b/xbmc/network/httprequesthandler/HTTPFileHandler.cpp -index 2101d49f0911..26e53901dbfa 100644 ---- a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp -+++ b/xbmc/network/httprequesthandler/HTTPFileHandler.cpp -@@ -23,7 +23,7 @@ CHTTPFileHandler::CHTTPFileHandler(const HTTPRequest &request) - m_lastModified() - { } - --int CHTTPFileHandler::HandleRequest() -+MHD_RESULT CHTTPFileHandler::HandleRequest() - { - return !m_url.empty() ? MHD_YES : MHD_NO; - } -diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.h b/xbmc/network/httprequesthandler/HTTPFileHandler.h -index 3c74b5275092..6121315c6f5f 100644 ---- a/xbmc/network/httprequesthandler/HTTPFileHandler.h -+++ b/xbmc/network/httprequesthandler/HTTPFileHandler.h -@@ -19,7 +19,7 @@ class CHTTPFileHandler : public IHTTPRequestHandler - public: - ~CHTTPFileHandler() override = default; - -- int HandleRequest() override; -+ MHD_RESULT HandleRequest() override; - - bool CanHandleRanges() const override { return m_canHandleRanges; } - bool CanBeCached() const override { return m_canBeCached; } -diff --git a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp -index de42e7fd3017..6902be012532 100644 ---- a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp -+++ b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp -@@ -104,7 +104,7 @@ bool CHTTPImageTransformationHandler::CanHandleRequest(const HTTPRequest &reques - options.find(TRANSFORMATION_OPTION_HEIGHT) != options.end()); - } - --int CHTTPImageTransformationHandler::HandleRequest() -+MHD_RESULT CHTTPImageTransformationHandler::HandleRequest() - { - if (m_response.type == HTTPError) - return MHD_YES; -diff --git a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h -index c55015ec4eb0..0d17afc3250a 100644 ---- a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h -+++ b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h -@@ -23,7 +23,7 @@ class CHTTPImageTransformationHandler : public IHTTPRequestHandler - IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPImageTransformationHandler(request); } - bool CanHandleRequest(const HTTPRequest &request)const override; - -- int HandleRequest() override; -+ MHD_RESULT HandleRequest() override; - - bool CanHandleRanges() const override { return true; } - bool CanBeCached() const override { return true; } -diff --git a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp -index e8e2fa36924b..a4c3c198eba3 100644 ---- a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp -+++ b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp -@@ -25,7 +25,7 @@ bool CHTTPJsonRpcHandler::CanHandleRequest(const HTTPRequest &request) const - return (request.pathUrl.compare("/jsonrpc") == 0); - } - --int CHTTPJsonRpcHandler::HandleRequest() -+MHD_RESULT CHTTPJsonRpcHandler::HandleRequest() - { - CHTTPClient client(m_request.method); - bool isRequest = false; -diff --git a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h -index 67c14b666ef6..2659fd549c25 100644 ---- a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h -+++ b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h -@@ -24,7 +24,7 @@ class CHTTPJsonRpcHandler : public IHTTPRequestHandler - IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPJsonRpcHandler(request); } - bool CanHandleRequest(const HTTPRequest &request) const override; - -- int HandleRequest() override; -+ MHD_RESULT HandleRequest() override; - - HttpResponseRanges GetResponseData() const override; - -diff --git a/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp b/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp -index 5f9aeef10f2e..a07ef0d3ac31 100644 ---- a/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp -+++ b/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp -@@ -112,7 +112,7 @@ bool CHTTPPythonHandler::CanHandleRequest(const HTTPRequest &request) const - return true; - } - --int CHTTPPythonHandler::HandleRequest() -+MHD_RESULT CHTTPPythonHandler::HandleRequest() - { - if (m_response.type == HTTPError || m_response.type == HTTPRedirect) - return MHD_YES; -diff --git a/xbmc/network/httprequesthandler/HTTPPythonHandler.h b/xbmc/network/httprequesthandler/HTTPPythonHandler.h -index 03c150693ff4..166430e68d51 100644 ---- a/xbmc/network/httprequesthandler/HTTPPythonHandler.h -+++ b/xbmc/network/httprequesthandler/HTTPPythonHandler.h -@@ -25,7 +25,7 @@ class CHTTPPythonHandler : public IHTTPRequestHandler - bool CanBeCached() const override { return false; } - bool GetLastModifiedDate(CDateTime &lastModified) const override; - -- int HandleRequest() override; -+ MHD_RESULT HandleRequest() override; - - HttpResponseRanges GetResponseData() const override { return m_responseRanges; } - -diff --git a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp -index 80d1d6733475..f2ea1f2e51ed 100644 ---- a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp -+++ b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp -@@ -61,7 +61,7 @@ bool HTTPRequestHandlerUtils::GetRequestedRanges(struct MHD_Connection *connecti - return ranges.Parse(GetRequestHeaderValue(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_RANGE), totalLength); - } - --int HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) -+MHD_RESULT HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) - { - if (cls == nullptr || key == nullptr) - return MHD_NO; -@@ -72,7 +72,7 @@ int HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, - return MHD_YES; - } - --int HTTPRequestHandlerUtils::FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) -+MHD_RESULT HTTPRequestHandlerUtils::FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) - { - if (cls == nullptr || key == nullptr) - return MHD_NO; -diff --git a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h -index 9a07801914e4..0ec5ed1bf706 100644 ---- a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h -+++ b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h -@@ -25,6 +25,6 @@ class HTTPRequestHandlerUtils - private: - HTTPRequestHandlerUtils() = delete; - -- static int FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); -- static int FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); -+ static MHD_RESULT FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); -+ static MHD_RESULT FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); - }; -diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp -index 01a6b503bdf6..0716a5df96ca 100644 ---- a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp -+++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp -@@ -18,7 +18,7 @@ bool CHTTPWebinterfaceAddonsHandler::CanHandleRequest(const HTTPRequest &request - return (request.pathUrl.compare("/addons") == 0 || request.pathUrl.compare("/addons/") == 0); - } - --int CHTTPWebinterfaceAddonsHandler::HandleRequest() -+MHD_RESULT CHTTPWebinterfaceAddonsHandler::HandleRequest() - { - m_responseData = ADDON_HEADER; - ADDON::VECADDONS addons; -diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h -index e9b1c6d29a41..23cea36d1436 100644 ---- a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h -+++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h -@@ -21,7 +21,7 @@ class CHTTPWebinterfaceAddonsHandler : public IHTTPRequestHandler - IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPWebinterfaceAddonsHandler(request); } - bool CanHandleRequest(const HTTPRequest &request) const override; - -- int HandleRequest() override; -+ MHD_RESULT HandleRequest() override; - - HttpResponseRanges GetResponseData() const override; - -diff --git a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h -index 4b1e40a587a7..b3e19f34d3dd 100644 ---- a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h -+++ b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h -@@ -22,6 +22,14 @@ - - #include "utils/HttpRangeUtils.h" - -+#include -+ -+#if MHD_VERSION >= 0x00097002 -+#define MHD_RESULT enum MHD_Result -+#else -+#define MHD_RESULT int -+#endif -+ - class CDateTime; - class CWebServer; - -@@ -114,7 +122,7 @@ class IHTTPRequestHandler - * - * \return MHD_NO if a severe error has occurred otherwise MHD_YES. - */ -- virtual int HandleRequest() = 0; -+ virtual MHD_RESULT HandleRequest() = 0; - - /*! - * \brief Whether the HTTP response could also be provided in ranges. diff --git a/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch deleted file mode 100644 index 607c80610..000000000 --- a/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d1b2a27d2d2795fe82c103b49faef74b55df22c7 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 18 Jan 2020 14:49:16 +0100 -Subject: [PATCH] [Backport] Add missing cstddef includes - -Backport of https://github.com/xbmc/xbmc/pull/17214 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/17215 - -Signed-off-by: Bernd Kuhls ---- - .../rendering/VideoRenderers/RPRendererGuiTexture.cpp | 2 ++ - xbmc/pictures/SlideShowPicture.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp -index 5485358cad..ad2bf1b984 100644 ---- a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp -+++ b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp -@@ -17,6 +17,8 @@ - using namespace DirectX; - #endif - -+#include -+ - using namespace KODI; - using namespace RETRO; - -diff --git a/xbmc/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp -index 05848191d2..08fc754471 100644 ---- a/xbmc/pictures/SlideShowPicture.cpp -+++ b/xbmc/pictures/SlideShowPicture.cpp -@@ -32,6 +32,8 @@ using namespace DirectX; - using namespace Microsoft::WRL; - #endif - -+#include -+ - #define IMMEDIATE_TRANSITION_TIME 20 - - #define PICTURE_MOVE_AMOUNT 0.02f --- -2.20.1 - diff --git a/buildroot/package/kodi/Config.in b/buildroot/package/kodi/Config.in index b9eea78d5..31ad8630d 100644 --- a/buildroot/package/kodi/Config.in +++ b/buildroot/package/kodi/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ @@ -61,6 +62,7 @@ comment "kodi needs an OpenGL EGL backend with OpenGL support" menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL @@ -92,6 +94,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_PYTHON_2TO3 select BR2_PACKAGE_PYTHON_BSDDB select BR2_PACKAGE_PYTHON_CURSES select BR2_PACKAGE_PYTHON_PYEXPAT @@ -159,15 +162,11 @@ config BR2_PACKAGE_KODI_LIBBLURAY config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" - depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want Kodi to support HDMI CEC. -comment "hdmi cec support needs udev /dev management" - depends on !BR2_PACKAGE_HAS_UDEV - config BR2_PACKAGE_KODI_LCMS2 bool "lcms2" select BR2_PACKAGE_LCMS2 @@ -176,7 +175,6 @@ config BR2_PACKAGE_KODI_LCMS2 config BR2_PACKAGE_KODI_LIBMICROHTTPD bool "web server" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd select BR2_PACKAGE_LIBMICROHTTPD help Enable webserver feature @@ -255,13 +253,6 @@ config BR2_PACKAGE_KODI_LIBSMBCLIENT help Enable Samba support -config BR2_PACKAGE_KODI_LIBTHEORA - bool "theora" - select BR2_PACKAGE_LIBTHEORA - help - Enable Theora input support. - Select this if you want to play back OGG/OGV files (Video). - config BR2_PACKAGE_KODI_LIBUSB bool "usb" # https://github.com/xbmc/xbmc/blob/Jarvis/configure.ac#L1554 @@ -327,7 +318,6 @@ endmenu menu "Peripheral addons" source "package/kodi-peripheral-joystick/Config.in" - source "package/kodi-peripheral-steamcontroller/Config.in" source "package/kodi-peripheral-xarcade/Config.in" endmenu @@ -348,12 +338,14 @@ menu "PVR addons" source "package/kodi-pvr-mythtv/Config.in" source "package/kodi-pvr-nextpvr/Config.in" source "package/kodi-pvr-njoy/Config.in" + source "package/kodi-pvr-octonet/Config.in" source "package/kodi-pvr-pctv/Config.in" source "package/kodi-pvr-stalker/Config.in" source "package/kodi-pvr-vbox/Config.in" source "package/kodi-pvr-vdr-vnsi/Config.in" source "package/kodi-pvr-vuplus/Config.in" source "package/kodi-pvr-wmc/Config.in" + source "package/kodi-pvr-zattoo/Config.in" endmenu menu "Screensavers" @@ -384,6 +376,7 @@ menu "Visualisations" source "package/kodi-visualisation-goom/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" + source "package/kodi-visualisation-starburst/Config.in" source "package/kodi-visualisation-waveform/Config.in" endmenu diff --git a/buildroot/package/kodi/kodi.hash b/buildroot/package/kodi/kodi.hash index 578befec1..545f87909 100644 --- a/buildroot/package/kodi/kodi.hash +++ b/buildroot/package/kodi/kodi.hash @@ -1,7 +1,7 @@ # Locally computed -sha256 108979df8b41ab4168f5cdc0233f46e38767eda5921f4ccae16584e98d0d6b29 kodi-18.5-Leia.tar.gz -sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz -sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz -sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz -sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz -sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md +sha256 bdf8afa9356b1f815de9984801d3e0d2b46a719e747895b75528f20995c59d2b kodi-18.9-Leia.tar.gz +sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz +sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz +sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz +sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz +sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk index 2f2a92a88..80a8d4e6b 100644 --- a/buildroot/package/kodi/kodi.mk +++ b/buildroot/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 18.5-Leia +KODI_VERSION = 18.9-Leia KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md @@ -315,10 +315,6 @@ ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) KODI_DEPENDENCIES += lirc-tools endif -ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y) -KODI_DEPENDENCIES += libtheora -endif - # kodi needs libva & libva-glx ifeq ($(BR2_PACKAGE_KODI_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy) KODI_DEPENDENCIES += mesa3d libva diff --git a/buildroot/package/ktap/ktap.mk b/buildroot/package/ktap/ktap.mk index 3b9134da6..09daba5c5 100644 --- a/buildroot/package/ktap/ktap.mk +++ b/buildroot/package/ktap/ktap.mk @@ -25,5 +25,12 @@ endef KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) +define KTAP_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk b/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk index 19f8515cb..a972602fb 100644 --- a/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk @@ -35,13 +35,7 @@ KVM_UNIT_TESTS_CONF_OPTS =\ # compiler. However, for x86-64, we use the host compiler, as # kvm-unit-tests builds 32 bit code, which Buildroot toolchains for # x86-64 cannot do. -ifeq ($(BR2_x86_64),y) -# Arch Linux adds -fstack-protector even when building with -ffreestanding, but -# it doesn't link with the stack-protector library when -nostdlib is passed, -# which leads to a link error. Therefore, disable it explicitly to work around -# this bug in Arch Linux. https://bugs.archlinux.org/task/64270 -KVM_UNIT_TESTS_MAKE_OPTS += EXTRA_CFLAGS=-fno-stack-protector -else +ifeq ($(BR2_x86_64),) KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)" endif diff --git a/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch b/buildroot/package/lcdproc/0002-Add-missing-ioctl-header.patch similarity index 100% rename from buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch rename to buildroot/package/lcdproc/0002-Add-missing-ioctl-header.patch diff --git a/buildroot/package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch b/buildroot/package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch new file mode 100644 index 000000000..c8a3dc20a --- /dev/null +++ b/buildroot/package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch @@ -0,0 +1,46 @@ +From 084126b03f29b33ab3e657c66e8c6a439f27f8e1 Mon Sep 17 00:00:00 2001 +From: Harald Geyer +Date: Mon, 10 Feb 2020 13:15:10 +0100 +Subject: [PATCH] Fix compilation with GCC >= 10.x + +Starting with GCC >= 10.x, -fno-common is used as default +instead of -fcommon. This patch fixes the compilation. + +Closes: #148 + +Suggested-by: Conrad Kostecki +Signed-off-by: Harald Geyer + +[Retrieved from: +https://github.com/lcdproc/lcdproc/commit/084126b03f29b33ab3e657c66e8c6a439f27f8e1] +Signed-off-by: Fabrice Fontaine +--- + clients/lcdproc/iface.c | 1 + + clients/lcdproc/iface.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c +index 40e50cb7..1ac355bd 100644 +--- a/clients/lcdproc/iface.c ++++ b/clients/lcdproc/iface.c +@@ -32,6 +32,7 @@ + #define UNSET_INT -1 + #define UNSET_STR "\01" + ++IfaceInfo iface[MAX_INTERFACES]; + + static int iface_count = 0; /* number of interfaces */ + static char unit_label[10] = "B"; /* default unit label is Bytes */ +diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h +index cc6dbaaf..c1bd6b5b 100644 +--- a/clients/lcdproc/iface.h ++++ b/clients/lcdproc/iface.h +@@ -18,7 +18,7 @@ + /** max number of interfaces in multi-interface mode */ + #define MAX_INTERFACES 3 + +-IfaceInfo iface[MAX_INTERFACES]; /* interface info */ ++extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ + + /** Update screen content */ + int iface_screen(int rep, int display, int *flags_ptr); diff --git a/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch b/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch deleted file mode 100644 index c43d93434..000000000 --- a/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001 -From: Marti Maria -Date: Wed, 15 Aug 2018 20:07:56 +0200 -Subject: [PATCH] Upgrade Visual studio 2017 15.8 - -- Upgrade to 15.8 -- Add check on CGATS memory allocation (thanks to Quang Nguyen for -pointing out this) - -Signed-off-by: Peter Korsgaard ---- - Projects/VC2017/jpegicc/jpegicc.vcxproj | 1 + - Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj | 2 +- - Projects/VC2017/lcms2_static/lcms2_static.vcxproj | 2 +- - Projects/VC2017/linkicc/linkicc.vcxproj | 2 +- - Projects/VC2017/psicc/psicc.vcxproj | 2 +- - Projects/VC2017/testbed/testbed.vcxproj | 2 +- - Projects/VC2017/tiffdiff/tiffdiff.vcxproj | 2 +- - Projects/VC2017/tifficc/tifficc.vcxproj | 2 +- - Projects/VC2017/transicc/transicc.vcxproj | 1 + - src/cmscgats.c | 14 ++++++++++---- - 10 files changed, 19 insertions(+), 11 deletions(-) - -diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj -index ab26a53..39cfd00 100644 ---- a/Projects/VC2017/jpegicc/jpegicc.vcxproj -+++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj -@@ -22,6 +22,7 @@ - {62812507-F926-4968-96A9-17678460AD90} - jpegicc - Win32Proj -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj -index 4c8aa3f..d1bf3eb 100644 ---- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj -+++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj -@@ -22,7 +22,7 @@ - {8C51BE48-ADB8-4089-A9EC-F6BF993A0548} - lcms2_DLL - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj -index 2a9988a..9fc05ce 100644 ---- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj -+++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj -@@ -22,7 +22,7 @@ - {71DEDE59-3F1E-486B-A899-4283000F76B5} - lcms2_static - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj -index 30c2b4e..51586dd 100644 ---- a/Projects/VC2017/linkicc/linkicc.vcxproj -+++ b/Projects/VC2017/linkicc/linkicc.vcxproj -@@ -22,7 +22,7 @@ - {FBFBE1DC-DB84-4BA1-9552-B4780F457849} - linkicc - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj -index 9dcf89a..8f26e12 100644 ---- a/Projects/VC2017/psicc/psicc.vcxproj -+++ b/Projects/VC2017/psicc/psicc.vcxproj -@@ -22,7 +22,7 @@ - {EF6A8851-65FE-46F5-B9EF-14F0B671F693} - psicc - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj -index 0af3762..3f6aea3 100644 ---- a/Projects/VC2017/testbed/testbed.vcxproj -+++ b/Projects/VC2017/testbed/testbed.vcxproj -@@ -22,7 +22,7 @@ - {928A3A2B-46EF-4279-959C-513B3652FF0E} - testbed - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj -index 7edfe28..3a6d837 100644 ---- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj -+++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj -@@ -22,7 +22,7 @@ - {75B91835-CCD7-48BE-A606-A9C997D5DBEE} - tiffdiff - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj -index cd9f04c..5ef954f 100644 ---- a/Projects/VC2017/tifficc/tifficc.vcxproj -+++ b/Projects/VC2017/tifficc/tifficc.vcxproj -@@ -22,7 +22,7 @@ - {2256DE16-ED92-4A6F-9C54-F65BB61E64A2} - tifficc - Win32Proj -- 8.1 -+ 10.0.17134.0 - - - -diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj -index d9b77c6..b3173d8 100644 ---- a/Projects/VC2017/transicc/transicc.vcxproj -+++ b/Projects/VC2017/transicc/transicc.vcxproj -@@ -22,6 +22,7 @@ - {9EE22D66-C849-474C-9ED5-C3E141DAB160} - transicc - Win32Proj -+ 10.0.17134.0 - - - -diff --git a/src/cmscgats.c b/src/cmscgats.c -index 1a87613..8c3e96d 100644 ---- a/src/cmscgats.c -+++ b/src/cmscgats.c -@@ -1,7 +1,7 @@ - //--------------------------------------------------------------------------------- - // - // Little Color Management System --// Copyright (c) 1998-2017 Marti Maria Saguer -+// Copyright (c) 1998-2018 Marti Maria Saguer - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the "Software"), -@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8) - t-> nSamples = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS")); - t-> nPatches = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS")); - -- t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*)); -- if (t->Data == NULL) { -+ if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe) -+ { -+ SynError(it8, "AllocateDataSet: too much data"); -+ } -+ else { -+ t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*)); -+ if (t->Data == NULL) { - -- SynError(it8, "AllocateDataSet: Unable to allocate data array"); -+ SynError(it8, "AllocateDataSet: Unable to allocate data array"); -+ } - } - - } --- -2.11.0 - diff --git a/buildroot/package/lcms2/lcms2.hash b/buildroot/package/lcms2/lcms2.hash index 248a08cf8..c0916820f 100644 --- a/buildroot/package/lcms2/lcms2.hash +++ b/buildroot/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.9 -sha1 60bea9875e017dd1c466e988c2ad98f8766e4e55 lcms2-2.9.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.11 +sha1 7413047c74de29e20caa5c9afc1b12bf07bbf7a7 lcms2-2.11.tar.gz # Locally computed: -sha256 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 lcms2-2.9.tar.gz -sha256 c725daac91a9259ce5e195683c0eeb797d345035c36ac5ba114c9fa80e11639a COPYING +sha256 dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e lcms2-2.11.tar.gz +sha256 53ad5ca11b8f4079e9c9bfa61575927a33f53526d6d414287149ec3ab61e8e4d COPYING diff --git a/buildroot/package/lcms2/lcms2.mk b/buildroot/package/lcms2/lcms2.mk index b6c292b76..d42c8c9a1 100644 --- a/buildroot/package/lcms2/lcms2.mk +++ b/buildroot/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.9 +LCMS2_VERSION = 2.11 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING diff --git a/buildroot/package/lftp/lftp.hash b/buildroot/package/lftp/lftp.hash index a2f60f95b..e4c3305c0 100644 --- a/buildroot/package/lftp/lftp.hash +++ b/buildroot/package/lftp/lftp.hash @@ -1,7 +1,7 @@ -# From http://lftp.yar.ru/ftp/lftp-4.9.1.md5sum -md5 3da57b1960b1416e89a532c54a67a936 lftp-4.9.1.tar.xz +# From http://lftp.yar.ru/ftp/lftp-4.9.2.md5sum +md5 b3a272ecb7a2b60e3827776f90ffb2f3 lftp-4.9.2.tar.xz # Locally calculated after checking gpg signature -sha256 5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b lftp-4.9.1.tar.xz +sha256 c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d lftp-4.9.2.tar.xz # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/lftp/lftp.mk b/buildroot/package/lftp/lftp.mk index 9c568da67..1348e137d 100644 --- a/buildroot/package/lftp/lftp.mk +++ b/buildroot/package/lftp/lftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFTP_VERSION = 4.9.1 +LFTP_VERSION = 4.9.2 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ diff --git a/buildroot/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/buildroot/package/libaacs/0001-read_file.h-include-sys-types.h.patch new file mode 100644 index 000000000..9bb1e0453 --- /dev/null +++ b/buildroot/package/libaacs/0001-read_file.h-include-sys-types.h.patch @@ -0,0 +1,36 @@ +From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 21 Sep 2020 20:19:38 +0200 +Subject: [PATCH] read_file.h: include sys/types.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build error with uClibc and gcc-8.3.0: + +In file included from src/devtools/uk_dump.c:28: +src/devtools/read_file.h:24:44: error: unknown type name ‘off_t’ + static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) + +Upstream status: pending + +Signed-off-by: Bernd Kuhls +--- + src/devtools/read_file.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h +index 953b2ef..a5d185c 100644 +--- a/src/devtools/read_file.h ++++ b/src/devtools/read_file.h +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + + static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) +-- +2.27.0 + diff --git a/buildroot/package/libaacs/libaacs.hash b/buildroot/package/libaacs/libaacs.hash index 22310295f..62e389f2f 100644 --- a/buildroot/package/libaacs/libaacs.hash +++ b/buildroot/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2.sha512 -sha512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 +sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/buildroot/package/libaacs/libaacs.mk b/buildroot/package/libaacs/libaacs.mk index 143b0ff3d..3e0df1801 100644 --- a/buildroot/package/libaacs/libaacs.mk +++ b/buildroot/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.9.0 +LIBAACS_VERSION = 0.11.0 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libabseil-cpp/0001-force-position-independent-code.patch b/buildroot/package/libabseil-cpp/0001-force-position-independent-code.patch new file mode 100644 index 000000000..6bf46bf0c --- /dev/null +++ b/buildroot/package/libabseil-cpp/0001-force-position-independent-code.patch @@ -0,0 +1,38 @@ +From d170b19e500d85381369e379771be8d7816bcc92 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 21 Jul 2020 13:08:50 -0700 +Subject: [PATCH] force position independent code + +Without this option, programs building for arm64 or x86-64 will fail when +attempting to link to the built libraries with the following (abbreviated) +error: + +"relocation against `.rodata' can not be used when making a shared object; +recompile with -fPIC." + +Because libabseil-cpp builds static libraries, it is better to set the +POSITION_INDEPENDENT_CODE to ON instead of forcing fPIC, as forcing fPIC may +cause relocation errors when shared libraries link against the built static +libraries. + +Signed-off-by: Adam Duskett +--- + CMake/AbseilHelpers.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake +index 86ff9eb..bdb7a89 100644 +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -209,6 +209,8 @@ function(absl_cc_library) + set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) + set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) + ++ # Without this setting, other programs such as GRPC will fail when linking. ++ set_property(TARGET ${_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) + # When being installed, we lose the absl_ prefix. We want to put it back + # to have properly named lib files. This is a no-op when we are not being + # installed. +-- +2.26.2 + diff --git a/buildroot/package/libabseil-cpp/Config.in b/buildroot/package/libabseil-cpp/Config.in new file mode 100644 index 000000000..222e3a092 --- /dev/null +++ b/buildroot/package/libabseil-cpp/Config.in @@ -0,0 +1,33 @@ +# see absl/debugging/internal/examine_stack.cc for the list of +# architectures that are supported, and for which ucontext is used. +config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_UCONTEXT + +config BR2_PACKAGE_LIBABSEIL_CPP + bool "libabseil-cpp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # uses dlfcn.h + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS + help + Abseil is an open-source collection of C++ library code + designed to augment the C++ standard library. The Abseil + library code is collected from Google's own C++ code base, + has been extensively tested and used in production, and is + the same code we depend on in our daily coding lives. + + https://github.com/abseil/abseil-cpp + +comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libabseil-cpp/libabseil-cpp.hash b/buildroot/package/libabseil-cpp/libabseil-cpp.hash new file mode 100644 index 000000000..63c4b86d3 --- /dev/null +++ b/buildroot/package/libabseil-cpp/libabseil-cpp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bf3f13b13a0095d926b25640e060f7e13881bd8a792705dd9e161f3c2b9aa976 libabseil-cpp-20200923.2.tar.gz +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/buildroot/package/libabseil-cpp/libabseil-cpp.mk b/buildroot/package/libabseil-cpp/libabseil-cpp.mk new file mode 100644 index 000000000..9cff8f0ff --- /dev/null +++ b/buildroot/package/libabseil-cpp/libabseil-cpp.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# libabseil-cpp +# +################################################################################ + +LIBABSEIL_CPP_VERSION = 20200923.2 +LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) +LIBABSEIL_CPP_LICENSE = Apache-2.0 +LIBABSEIL_CPP_LICENSE_FILES = LICENSE +LIBABSEIL_CPP_INSTALL_STAGING = YES + +LIBABSEIL_CPP_CONF_OPTS = \ + -DCMAKE_CXX_STANDARD=11 \ + -DABSL_ENABLE_INSTALL=ON \ + -DABSL_USE_GOOGLETEST_HEAD=OFF \ + -DABSL_RUN_TESTS=OFF + +HOST_LIBABSEIL_CPP_CONF_OPTS = \ + -DCMAKE_CXX_STANDARD=11 \ + -DABSL_ENABLE_INSTALL=ON \ + -DABSL_USE_GOOGLETEST_HEAD=OFF \ + -DABSL_RUN_TESTS=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch b/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch new file mode 100644 index 000000000..2d5114337 --- /dev/null +++ b/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch @@ -0,0 +1,35 @@ +From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Sat, 3 Oct 2020 20:37:55 +0200 +Subject: [PATCH] libapparmor: add missing include for `socklen_t` + +While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't +include the `` header to make its declaration available. +While this works on systems using glibc via transitive includes, it +breaks compilation on musl libc. + +Fix the issue by including the header. + +Signed-off-by: Patrick Steinhardt +[Retrieved from: +https://gitlab.com/apparmor/apparmor/-/commit/47263a3a74d7973e7a54b17db6aa903701468ffd] +Signed-off-by: Fabrice Fontaine +--- + libraries/libapparmor/include/sys/apparmor.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h +index 32892d065..d70eff947 100644 +--- a/libraries/libapparmor/include/sys/apparmor.h ++++ b/libraries/libapparmor/include/sys/apparmor.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #ifdef __cplusplus +-- +GitLab + diff --git a/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch b/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch new file mode 100644 index 000000000..0510489d5 --- /dev/null +++ b/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch @@ -0,0 +1,37 @@ +From 0dbcbee70097ecde66708064ec1dedfa64e581e8 Mon Sep 17 00:00:00 2001 +From: Armin Kuster +Date: Wed, 7 Oct 2020 20:50:38 -0700 +Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray + +In cross build environments, using the hosts cpp gives incorrect +detection of reallocarray. Change cpp to a variable. + +fixes: +parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)': +| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope +| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1); + +Signed-off-by: Armin Kuster +[Retrieved from: +https://gitlab.com/ffontaine/apparmor/-/commit/0dbcbee70097ecde66708064ec1dedfa64e581e8] +Signed-off-by: Fabrice Fontaine +--- + parser/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parser/Makefile b/parser/Makefile +index acef3d77a..8250ac451 100644 +--- a/parser/Makefile ++++ b/parser/Makefile +@@ -54,7 +54,7 @@ endif + CPPFLAGS += -D_GNU_SOURCE + + STDLIB_INCLUDE:="\#include " +-HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true) ++HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true) + + WARNINGS = -Wall + CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS} +-- +GitLab + diff --git a/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch b/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch new file mode 100644 index 000000000..83981bfec --- /dev/null +++ b/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch @@ -0,0 +1,33 @@ +From a2a0d14b9c5046b76124c828a53b0e9cbc1bc5c8 Mon Sep 17 00:00:00 2001 +From: Armin Kuster +Date: Wed, 7 Oct 2020 08:27:11 -0700 +Subject: [PATCH] aa_status: Fix build issue with musl + +add limits.h + +aa_status.c:269:22: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'? +| 269 | real_exe = calloc(PATH_MAX + 1, sizeof(char)); + +Signed-off-by: Armin Kuster +[Retrieved from: +https://gitlab.com/apparmor/apparmor/-/commit/a2a0d14b9c5046b76124c828a53b0e9cbc1bc5c8] +Signed-off-by: Fabrice Fontaine +--- + binutils/aa_status.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/binutils/aa_status.c b/binutils/aa_status.c +index 78b034090..41f1954e9 100644 +--- a/binutils/aa_status.c ++++ b/binutils/aa_status.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +GitLab + diff --git a/buildroot/package/libapparmor/Config.in b/buildroot/package/libapparmor/Config.in new file mode 100644 index 000000000..dbfd2dc4a --- /dev/null +++ b/buildroot/package/libapparmor/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_LIBAPPARMOR + bool "libapparmor" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + help + AppArmor is an effective and easy-to-use Linux application + security system. AppArmor proactively protects the operating + system and applications from external or internal threats, + even zero-day attacks, by enforcing good behavior and + preventing even unknown application flaws from being + exploited. + + This package installs only the library. + + http://wiki.apparmor.net + +comment "libapparmor needs a toolchain w/ headers >= 3.16, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 diff --git a/buildroot/package/libapparmor/libapparmor.hash b/buildroot/package/libapparmor/libapparmor.hash new file mode 100644 index 000000000..0550a1846 --- /dev/null +++ b/buildroot/package/libapparmor/libapparmor.hash @@ -0,0 +1,6 @@ +# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace +sha256 66fd751fe51eb427d2aa864ee035b12d01d212fd595579275219b0148c43755e apparmor-3.0.0.tar.gz + +# locally computed +sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libraries/libapparmor/COPYING.LGPL diff --git a/buildroot/package/libapparmor/libapparmor.mk b/buildroot/package/libapparmor/libapparmor.mk new file mode 100644 index 000000000..5ece89b08 --- /dev/null +++ b/buildroot/package/libapparmor/libapparmor.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# libapparmor +# +################################################################################ + +# When updating the version here, please also update the apparmor package +LIBAPPARMOR_VERSION_MAJOR = 3.0 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).0 +LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz +LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION_MAJOR)/+download +LIBAPPARMOR_LICENSE = LGPL-2.1 +LIBAPPARMOR_LICENSE_FILES = LICENSE libraries/libapparmor/COPYING.LGPL + +LIBAPPARMOR_DEPENDENCIES = host-bison host-flex host-pkgconf +LIBAPPARMOR_SUBDIR = libraries/libapparmor +LIBAPPARMOR_INSTALL_STAGING = YES + +# Patches 0001 and 0002 touch Makefile.am and an m4 file +LIBAPPARMOR_AUTORECONF = YES + +# Most AppArmor tools will want to link to the static lib. +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +LIBAPPARMOR_CONF_OPTS = \ + ac_cv_prog_cc_c99=-std=gnu99 \ + --enable-static \ + --disable-man-pages + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBAPPARMOR_DEPENDENCIES += host-python3 host-swig python3 +LIBAPPARMOR_CONF_OPTS += \ + --with-python \ + PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON_CONFIG=$(STAGING_DIR)/usr/bin/python3-config \ + SWIG=$(SWIG) +else +LIBAPPARMOR_CONF_OPTS += --without-python +endif + +define LIBAPPARMOR_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_APPARMOR) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_APPARMOR) +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/libarchive/libarchive.hash b/buildroot/package/libarchive/libarchive.hash index 9da4eb3ba..066037809 100644 --- a/buildroot/package/libarchive/libarchive.hash +++ b/buildroot/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176 libarchive-3.4.2.tar.gz +sha256 ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39 libarchive-3.4.3.tar.gz # Locally computed: sha256 e1e3d4ba9d0b0ccba333b5f5539f7c6c9a3ef3d57a96cd165d2c45eaa1cd026d COPYING diff --git a/buildroot/package/libarchive/libarchive.mk b/buildroot/package/libarchive/libarchive.mk index ad0823e54..708ce637c 100644 --- a/buildroot/package/libarchive/libarchive.mk +++ b/buildroot/package/libarchive/libarchive.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.4.2 +LIBARCHIVE_VERSION = 3.4.3 LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING -LIBARCHIVE_CONF_OPTS = --without-mbedtls ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) @@ -92,6 +91,13 @@ else LIBARCHIVE_CONF_OPTS += --without-lzo2 endif +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBARCHIVE_DEPENDENCIES += mbedtls +LIBARCHIVE_CONF_OPTS += --with-mbedtls +else +LIBARCHIVE_CONF_OPTS += --without-mbedtls +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) LIBARCHIVE_DEPENDENCIES += nettle LIBARCHIVE_CONF_OPTS += --with-nettle @@ -119,6 +125,13 @@ else LIBARCHIVE_CONF_OPTS += --without-lzma endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +LIBARCHIVE_DEPENDENCIES += zstd +LIBARCHIVE_CONF_OPTS += --with-zstd +else +LIBARCHIVE_CONF_OPTS += --without-zstd +endif + # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib HOST_LIBARCHIVE_CONF_OPTS = \ diff --git a/buildroot/package/libargon2/libargon2.hash b/buildroot/package/libargon2/libargon2.hash index c524b4271..331eea99f 100644 --- a/buildroot/package/libargon2/libargon2.hash +++ b/buildroot/package/libargon2/libargon2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8 libargon2-20171227.tar.gz -sha256 220f8736a89ff51c92ef3d497f413b48e6cf1df3d6278bc909c6308c78e1718e LICENSE +sha256 daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c libargon2-20190702.tar.gz +sha256 220f8736a89ff51c92ef3d497f413b48e6cf1df3d6278bc909c6308c78e1718e LICENSE diff --git a/buildroot/package/libargon2/libargon2.mk b/buildroot/package/libargon2/libargon2.mk index e10343a15..b3f6e1b21 100644 --- a/buildroot/package/libargon2/libargon2.mk +++ b/buildroot/package/libargon2/libargon2.mk @@ -4,18 +4,19 @@ # ################################################################################ -# 20190702 is not recognized by php7.3 -LIBARGON2_VERSION = 20171227 +LIBARGON2_VERSION = 20190702 LIBARGON2_SITE = $(call github,P-H-C,phc-winner-argon2,$(LIBARGON2_VERSION)) LIBARGON2_LICENSE = CC0-1.0 or Apache-2.0 LIBARGON2_LICENSE_FILES = LICENSE LIBARGON2_INSTALL_STAGING = YES +LIBARGON2_OPTS = LIBRARY_REL=lib + # GCC_TARGET_ARCH is not defined for all architectures, but libargon2 # only uses it to detect if some x86 optimizations can be used, and # GCC_TARGET_ARCH is defined on x86. ifneq ($(GCC_TARGET_ARCH),) -LIBARGON2_OPTS = OPTTARGET=$(GCC_TARGET_ARCH) +LIBARGON2_OPTS += OPTTARGET=$(GCC_TARGET_ARCH) endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) @@ -29,12 +30,12 @@ endef define LIBARGON2_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(STAGING_DIR) install + $(LIBARGON2_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBARGON2_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install + $(LIBARGON2_OPTS) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) diff --git a/buildroot/package/libass/Config.in b/buildroot/package/libass/Config.in index c654d8212..803f6b443 100644 --- a/buildroot/package/libass/Config.in +++ b/buildroot/package/libass/Config.in @@ -1,9 +1,18 @@ config BR2_PACKAGE_LIBASS bool "libass" + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_LIBFRIBIDI help libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format https://github.com/libass/libass + +comment "libass needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/libass/libass.hash b/buildroot/package/libass/libass.hash index 74ea5f921..cd3c3af61 100644 --- a/buildroot/package/libass/libass.hash +++ b/buildroot/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2 libass-0.14.0.tar.xz -sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING +sha256 9f09230c9a0aa68ef7aa6a9e2ab709ca957020f842e52c5b2e52b801a7d9e833 libass-0.15.0.tar.xz +sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/buildroot/package/libass/libass.mk b/buildroot/package/libass/libass.mk index 50600963e..818bff234 100644 --- a/buildroot/package/libass/libass.mk +++ b/buildroot/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.14.0 +LIBASS_VERSION = 0.15.0 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. @@ -15,6 +15,7 @@ LIBASS_LICENSE_FILES = COPYING LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ + harfbuzz \ libfribidi \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -31,11 +32,4 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif -ifeq ($(BR2_PACKAGE_HARFBUZZ),y) -LIBASS_DEPENDENCIES += harfbuzz -LIBASS_CONF_OPTS += --enable-harfbuzz -else -LIBASS_CONF_OPTS += --disable-harfbuzz -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/libbacktrace/Config.in b/buildroot/package/libbacktrace/Config.in new file mode 100644 index 000000000..0f940dd58 --- /dev/null +++ b/buildroot/package/libbacktrace/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBBACKTRACE + bool "libbacktrace" + help + A C library that may be linked into a C/C++ program to + produce symbolic backtraces + + https://github.com/ianlancetaylor/libbacktrace diff --git a/buildroot/package/libbacktrace/libbacktrace.hash b/buildroot/package/libbacktrace/libbacktrace.hash new file mode 100644 index 000000000..ecd530a33 --- /dev/null +++ b/buildroot/package/libbacktrace/libbacktrace.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 13072c499c76866c188beaf3d50f3dddbf2c27ed9fd72b33d1b857acd33b1cb5 libbacktrace-9b7f216e867916594d81e8b6118f092ac3fcf704.tar.gz +sha256 ef8a9b3247488f8901ca60de9b17b745d7bd67e5ec1e622f80d62364572200d8 LICENSE diff --git a/buildroot/package/libbacktrace/libbacktrace.mk b/buildroot/package/libbacktrace/libbacktrace.mk new file mode 100644 index 000000000..8f812228e --- /dev/null +++ b/buildroot/package/libbacktrace/libbacktrace.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libbacktrace +# +################################################################################ + +LIBBACKTRACE_VERSION = 9b7f216e867916594d81e8b6118f092ac3fcf704 +LIBBACKTRACE_SITE = $(call github,ianlancetaylor,libbacktrace,$(LIBBACKTRACE_VERSION)) +LIBBACKTRACE_LICENSE = BSD-3C-like +LIBBACKTRACE_LICENSE_FILES = LICENSE +LIBBACKTRACE_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/buildroot/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch new file mode 100644 index 000000000..018e4c448 --- /dev/null +++ b/buildroot/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -0,0 +1,69 @@ +From ccf93148aa3587dd98a02e253cdc42a7af14df1e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 29 Aug 2020 16:04:15 +0200 +Subject: [PATCH] Provide replacement function for strerror_l() + +strerror_l() is not implemented in some C libraries, such as uClibc, +so let's provide a simple replacement function that falls back on +strerror(). + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 ++ + src/plugins/crypto.c | 7 +++++++ + src/utils/module.c | 8 ++++++++ + 3 files changed, 17 insertions(+) + +diff --git a/configure.ac b/configure.ac +index c2d22c2..36aeb51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,6 +137,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random + [LIBBLOCKDEV_SOFT_FAILURE([Header file $ac_header not found.])], + []) + ++AC_CHECK_FUNCS([strerror_l]) ++ + AC_ARG_WITH([bcache], + AS_HELP_STRING([--with-bcache], [support bcache @<:@default=yes@:>@]), + [], +diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c +index f4a2e8f..c1bd7b5 100644 +--- a/src/plugins/crypto.c ++++ b/src/plugins/crypto.c +@@ -52,6 +52,13 @@ + + #define UNUSED __attribute__((unused)) + ++#if !defined(HAVE_STRERROR_L) ++static char *strerror_l(int errnum, locale_t locale UNUSED) ++{ ++ return strerror(errnum); ++} ++#endif ++ + /** + * SECTION: crypto + * @short_description: plugin for operations with encrypted devices +diff --git a/src/utils/module.c b/src/utils/module.c +index 9750e24..086bec0 100644 +--- a/src/utils/module.c ++++ b/src/utils/module.c +@@ -27,6 +27,14 @@ + + #include "module.h" + ++#define UNUSED __attribute__((unused)) ++ ++#if !defined(HAVE_STRERROR_L) ++static char *strerror_l(int errnum, locale_t locale UNUSED) ++{ ++ return strerror(errnum); ++} ++#endif + + /** + * bd_utils_module_error_quark: (skip) +-- +2.26.2 + diff --git a/buildroot/package/libblockdev/Config.in b/buildroot/package/libblockdev/Config.in new file mode 100644 index 000000000..4389fd794 --- /dev/null +++ b/buildroot/package/libblockdev/Config.in @@ -0,0 +1,72 @@ +config BR2_PACKAGE_LIBBLOCKDEV + bool "libblockdev" + depends on !BR2_STATIC_LIBS # kmod + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_LIBGLIB2 + help + libblockdev is a C library supporting GObject introspection + for manipulation of block devices. It has a plugin-based + architecture where each technology (like LVM, Btrfs, MD RAID, + Swap,...) is implemented in a separate plugin, possibly with + multiple implementations. + + https://github.com/storaged-project/libblockdev/ + +if BR2_PACKAGE_LIBBLOCKDEV + +comment "plugins" + +config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO + bool "crypto" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + select BR2_PACKAGE_CRYPTSETUP + +config BR2_PACKAGE_LIBBLOCKDEV_FS + bool "filesystem" + depends on BR2_ENABLE_LOCALE # parted + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_PARTED + +comment "filesystem plugin needs a toolchain w/ locale" + depends on !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_LIBBLOCKDEV_LOOP + bool "loop" + +config BR2_PACKAGE_LIBBLOCKDEV_LVM2 + bool "lvm2" + depends on BR2_ENABLE_LOCALE # parted + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_LVM2 + +comment "lvm2 support needs a toolchain w/ locale" + depends on !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_LIBBLOCKDEV_MDRAID + bool "mdraid" + select BR2_PACKAGE_LIBBYTESIZE + +config BR2_PACKAGE_LIBBLOCKDEV_PART + bool "part" + depends on BR2_ENABLE_LOCALE # parted + select BR2_PACKAGE_PARTED + +comment "part plugin needs a toolchain w/ locale" + depends on !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_LIBBLOCKDEV_SWAP + bool "swap" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + +endif + +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libblockdev/libblockdev.hash b/buildroot/package/libblockdev/libblockdev.hash new file mode 100644 index 000000000..1c4b1ec7b --- /dev/null +++ b/buildroot/package/libblockdev/libblockdev.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 dc207c70dbef52c818a8abbcb6b8e298a6b63c0b78a5e1f2773b5f7b89300773 libblockdev-2.24.tar.gz +sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/buildroot/package/libblockdev/libblockdev.mk b/buildroot/package/libblockdev/libblockdev.mk new file mode 100644 index 000000000..a38912514 --- /dev/null +++ b/buildroot/package/libblockdev/libblockdev.mk @@ -0,0 +1,82 @@ +################################################################################ +# +# libblockdev +# +################################################################################ + +LIBBLOCKDEV_VERSION = 2.24 +LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 +LIBBLOCKDEV_LICENSE = LGPL-2.1 +LIBBLOCKDEV_LICENSE_FILES = LICENSE +LIBBLOCKDEV_INSTALL_STAGING = YES +LIBBLOCKDEV_DEPENDENCIES = host-pkgconf libglib2 kmod udev +# 0001-Provide-replacement-function-for-strerror_l.patch +LIBBLOCKDEV_AUTORECONF = YES + +LIBBLOCKDEV_CONF_OPTS = \ + --disable-introspection \ + --with-loop \ + --without-bcache \ + --without-btrfs \ + --without-dm \ + --without-dmraid \ + --without-escrow \ + --without-kbd \ + --without-lvm_dbus \ + --without-mpath \ + --without-nvdimm \ + --without-python2 \ + --without-python3 \ + --without-s390 \ + --without-tools \ + --without-vdo + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_CRYPTO),y) +LIBBLOCKDEV_DEPENDENCIES += cryptsetup +LIBBLOCKDEV_CONF_OPTS += --with-crypto +else +LIBBLOCKDEV_CONF_OPTS += --without-crypto +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_FS),y) +LIBBLOCKDEV_DEPENDENCIES += parted util-linux +LIBBLOCKDEV_CONF_OPTS += --with-fs +else +LIBBLOCKDEV_CONF_OPTS += --without-fs +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_LOOP),y) +LIBBLOCKDEV_CONF_OPTS += --with-loop +else +LIBBLOCKDEV_CONF_OPTS += --without-loop +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_LVM2),y) +LIBBLOCKDEV_DEPENDENCIES += lvm2 parted +LIBBLOCKDEV_CONF_OPTS += --with-lvm +else +LIBBLOCKDEV_CONF_OPTS += --without-lvm +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_MDRAID),y) +LIBBLOCKDEV_DEPENDENCIES += libbytesize +LIBBLOCKDEV_CONF_OPTS += --with-mdraid +else +LIBBLOCKDEV_CONF_OPTS += --without-mdraid +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_PART),y) +LIBBLOCKDEV_DEPENDENCIES += parted +LIBBLOCKDEV_CONF_OPTS += --with-part +else +LIBBLOCKDEV_CONF_OPTS += --without-part +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SWAP),y) +LIBBLOCKDEV_DEPENDENCIES += util-linux +LIBBLOCKDEV_CONF_OPTS += --with-swap +else +LIBBLOCKDEV_CONF_OPTS += --without-swap +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/libbluray/libbluray.hash b/buildroot/package/libbluray/libbluray.hash index 1757192b0..c92d9f954 100644 --- a/buildroot/package/libbluray/libbluray.hash +++ b/buildroot/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://get.videolan.org/libbluray/1.1.2/libbluray-1.1.2.tar.bz2.sha512 -sha512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.2.0/libbluray-1.2.0.tar.bz2.sha512 +sha512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/buildroot/package/libbluray/libbluray.mk b/buildroot/package/libbluray/libbluray.mk index 49ee933d0..67ea139d5 100644 --- a/buildroot/package/libbluray/libbluray.mk +++ b/buildroot/package/libbluray/libbluray.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.1.2 -LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION) +LIBBLURAY_VERSION = 1.2.0 +LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES LIBBLURAY_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch b/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch new file mode 100644 index 000000000..4c9b96020 --- /dev/null +++ b/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch @@ -0,0 +1,36 @@ +From ac16b1a905dbdb06ac7bba6ac105686aa7958093 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Fri, 24 Jul 2020 11:49:14 -0700 +Subject: [PATCH] remove msgcat dependency + +Gettext-tiny does not include the msgcat utility, which causes issues when +building libbytesize for embedded systems, as many embedded systems do not +build the full gettext, but instead use the gettext-tiny library. + +Because msgcat is not needed to build libbytesize, it's safe to remove the +dependency. + +Upstream-status: pending +https://github.com/storaged-project/libbytesize/pull/76 +Signed-off-by: Adam Duskett +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2ec4062..7d7f218 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,8 +13,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_PATH_PROG([XGETTEXT], [xgettext]) + AC_PATH_PROG([MSGFMT], [msgfmt]) + AC_PATH_PROG([MSGMERGE], [msgmerge]) +-AC_PATH_PROG([MSGCAT], [msgcat]) +-AS_IF([test -z "$XGETTEXT" -o -z "$MSGFMT" -o -z "$MSGMERGE" -o -z "$MSGCAT"], ++AS_IF([test -z "$XGETTEXT" -o -z "$MSGFMT" -o -z "$MSGMERGE"], + [AC_MSG_FAILURE([gettext not found])]) + + # Define this so gettext.h works without requiring the whole gettext macro +-- +2.26.2 + diff --git a/buildroot/package/libbytesize/Config.in b/buildroot/package/libbytesize/Config.in new file mode 100644 index 000000000..6cc550e48 --- /dev/null +++ b/buildroot/package/libbytesize/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBBYTESIZE + bool "libbytesize" + select BR2_PACKAGE_GMP + select BR2_PACKAGE_MPFR + select BR2_PACKAGE_PCRE2 + help + A tiny library that facilitates the common operations with + sizes in bytes + + https://github.com/storaged-project/libbytesize/ diff --git a/buildroot/package/libbytesize/libbytesize.hash b/buildroot/package/libbytesize/libbytesize.hash new file mode 100644 index 000000000..34cb3b210 --- /dev/null +++ b/buildroot/package/libbytesize/libbytesize.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3c74113fc8cd1a2fbd8870fa0ed7cef2ef24d60ef91e7145fbc041f9aa144479 libbytesize-2.3.tar.gz +sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/buildroot/package/libbytesize/libbytesize.mk b/buildroot/package/libbytesize/libbytesize.mk new file mode 100644 index 000000000..b1309c173 --- /dev/null +++ b/buildroot/package/libbytesize/libbytesize.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libbytesize +# +################################################################################ + +LIBBYTESIZE_VERSION = 2.3 +LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) +LIBBYTESIZE_LICENSE = LGPL-2.1+ +LIBBYTESIZE_LICENSE_FILES = LICENSE +LIBBYTESIZE_INSTALL_STAGING = YES + +# 0001-remove-msgcat-dependency.patch +LIBBYTESIZE_AUTORECONF = YES + +LIBBYTESIZE_DEPENDENCIES = \ + host-pkgconf \ + host-gettext \ + gmp \ + mpfr \ + pcre2 + +LIBBYTESIZE_CONF_OPTS += \ + --without-python3 \ + --without-tools + +$(eval $(autotools-package)) diff --git a/buildroot/package/libcamera/Config.in b/buildroot/package/libcamera/Config.in index 0b3540a65..aadea56d1 100644 --- a/buildroot/package/libcamera/Config.in +++ b/buildroot/package/libcamera/Config.in @@ -1,10 +1,19 @@ -config BR2_PACKAGE_LIBCAMERA +config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS + bool + default y + # Invalid packing size of ControlValue struct on m68k + depends on BR2_m68k + +menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # C++11 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on !BR2_STATIC_LIBS # gnutls + depends on BR2_USE_WCHAR # gnutls + select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO if !BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help libcamera provides a software stack to support complex devices that need heavy hardware image @@ -12,6 +21,56 @@ config BR2_PACKAGE_LIBCAMERA http://www.libcamera.org/ -comment "libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5" +if BR2_PACKAGE_LIBCAMERA + +config BR2_PACKAGE_LIBCAMERA_V4L2 + bool "libcamera v4l2 compatibility layer" + help + libcamera v4l2 compatibility layer + +config BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + bool + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 + bool "ipu3 pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Intel IPU3. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI + bool "raspberrypi pipeline" + depends on BR2_USE_WCHAR # boost (already enforced for gnutls) + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Raspberry Pi devices. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 + bool "rkisp1 pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Rockchip ISP1. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE + bool "simple pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for simple pipelines. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO + bool "uvcvideo pipeline" + help + Pipeline for uvcvideo devices. + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC + bool "vimc pipeline" + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for the vimc device. + +endif # BR2_PACKAGE_LIBCAMERA + +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" + depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_PACKAGE_HAS_UDEV + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/buildroot/package/libcamera/libcamera.hash b/buildroot/package/libcamera/libcamera.hash index 6f721d87e..41416da71 100644 --- a/buildroot/package/libcamera/libcamera.hash +++ b/buildroot/package/libcamera/libcamera.hash @@ -1,3 +1,12 @@ -sha256 cbaa7e06059717f71b57f9c20135c86d5f121d9aab10bfc20513ba5d04478756 libcamera-448393f77ec9e37cb807e8e8d35c1a4877d253d4.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/gnu-gpl-2.0.txt -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c licenses/gnu-lgpl-2.1.txt +sha256 a7800b54584dee321874610ef70b1b7690c79d8340c5b134ea35176657681e29 libcamera-e59713c68678f3eb6b6ebe97cabdc88c7042567f.tar.gz + +# license files +sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt +sha256 e11af671c491efac2f94c1d752bea92f4308ca2450c7d11e582e4b48c40e4de1 LICENSES/BSD-3-Clause.txt +sha256 6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f LICENSES/CC0-1.0.txt +sha256 ec3732087acf8c52429a020d6bba362ff578705bdb53365a21744485ec15b0e6 LICENSES/CC-BY-SA-4.0.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 1ccf09bf2f598308df4bed9cd8e9657dc5cd0973d2800318f2e241486e2edf3f LICENSES/LGPL-2.1-or-later.txt +sha256 3f9e477523febab58de8b716ccfbcf02e6ef1c8e7728953905e8558637abe2a9 LICENSES/Linux-syscall-note.txt +sha256 8f25018489d6fe0dec34a352314c38dc146247b7de65735790f4398a92afa84b LICENSES/MIT.txt diff --git a/buildroot/package/libcamera/libcamera.mk b/buildroot/package/libcamera/libcamera.mk index 2be344899..e6cd71420 100644 --- a/buildroot/package/libcamera/libcamera.mk +++ b/buildroot/package/libcamera/libcamera.mk @@ -5,14 +5,82 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4 +LIBCAMERA_VERSION = e59713c68678f3eb6b6ebe97cabdc88c7042567f LIBCAMERA_SITE_METHOD = git -LIBCAMERA_DEPENDENCIES = udev -LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false +LIBCAMERA_DEPENDENCIES = \ + host-openssl \ + host-pkgconf \ + host-python3-pyyaml \ + gnutls +LIBCAMERA_CONF_OPTS = \ + -Dandroid=false \ + -Ddocumentation=false \ + -Dtest=false \ + -Dwerror=false LIBCAMERA_INSTALL_STAGING = YES -LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils) +LIBCAMERA_LICENSE = \ + LGPL-2.1+ (library), \ + GPL-2.0+ (utils), \ + MIT (qcam/assets/feathericons), \ + BSD-2-Clause (raspberrypi), \ + GPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \ + CC0-1.0 (meson build system), \ + CC-BY-SA-4.0 (doc) LIBCAMERA_LICENSE_FILES = \ - licenses/gnu-gpl-2.0.txt \ - licenses/gnu-lgpl-2.1.txt + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/MIT.txt \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/Linux-syscall-note.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/CC0-1.0.txt \ + LICENSES/CC-BY-SA-4.0.txt + +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y) +LIBCAMERA_CXXFLAGS = -faligned-new +endif + +ifeq ($(BR2_PACKAGE_LIBCAMERA_V4L2),y) +LIBCAMERA_CONF_OPTS += -Dv4l2=true +else +LIBCAMERA_CONF_OPTS += -Dv4l2=false +endif + +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 +ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y) +LIBCAMERA_PIPELINES-y += raspberrypi +LIBCAMERA_DEPENDENCIES += boost +endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc + +LIBCAMERA_CONF_OPTS += -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELINES-y)) + +# gstreamer-video-1.0, gstreamer-allocators-1.0 +ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) +LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled +LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +LIBCAMERA_CONF_OPTS += -Dqcam=enabled +LIBCAMERA_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y) +LIBCAMERA_DEPENDENCIES += qt5tools +endif +else +LIBCAMERA_CONF_OPTS += -Dqcam=disabled +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +LIBCAMERA_DEPENDENCIES += tiff +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +LIBCAMERA_DEPENDENCIES += udev +endif $(eval $(meson-package)) diff --git a/buildroot/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch b/buildroot/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch deleted file mode 100644 index eb91d4063..000000000 --- a/buildroot/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1d28cf070933568db8006ce45411723c5369e145 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 10 Apr 2018 19:54:50 +0200 -Subject: [PATCH] Fix compilation without pthread.h - -Commit 7759e6f8469eb33aef1a1d5eba5d300c3a8fcb63 broke compilation on -systems without pthread.h. So add a call to AC_CHECK_HEADERS in -configure.ac and put include under HAVE_PTHREAD_H define - -Fixes: - - http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872 - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - src/cap-ng.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7a99c72..4d6afee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,6 +56,7 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [ - AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)]) - ]) - AC_CHECK_HEADERS(linux/securebits.h, [], []) -+AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)]) - - AC_C_CONST - AC_C_INLINE -diff --git a/src/cap-ng.c b/src/cap-ng.c -index db647fd..240d2ba 100644 ---- a/src/cap-ng.c -+++ b/src/cap-ng.c -@@ -34,7 +34,9 @@ - #include - #include - #include -+#ifdef HAVE_PTHREAD_H - #include // For pthread_atfork -+#endif - #ifdef HAVE_SYSCALL_H - #include - #endif --- -2.14.1 - diff --git a/buildroot/package/libcap-ng/libcap-ng.hash b/buildroot/package/libcap-ng/libcap-ng.hash index f8342ea92..d52f46608 100644 --- a/buildroot/package/libcap-ng/libcap-ng.hash +++ b/buildroot/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328 libcap-ng-0.7.9.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 f14d23b60ae1465b032e4e8cbd4112006572c69a6017d55d5d3c6aad622a9e21 libcap-ng-0.8.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/buildroot/package/libcap-ng/libcap-ng.mk b/buildroot/package/libcap-ng/libcap-ng.mk index 0f29ef097..03949d740 100644 --- a/buildroot/package/libcap-ng/libcap-ng.mk +++ b/buildroot/package/libcap-ng/libcap-ng.mk @@ -4,15 +4,17 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.7.9 +LIBCAP_NG_VERSION = 0.8 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB LIBCAP_NG_INSTALL_STAGING = YES -# 0001-Fix-compilation-without-pthread.h.patch -LIBCAP_NG_AUTORECONF = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no LIBCAP_NG_CONF_OPTS = --without-python +HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no +HOST_LIBCAP_NG_CONF_OPTS = --without-python + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libcap/0001-build-system-fixes-for-cross-compilation.patch b/buildroot/package/libcap/0001-build-system-fixes-for-cross-compilation.patch deleted file mode 100644 index de2409085..000000000 --- a/buildroot/package/libcap/0001-build-system-fixes-for-cross-compilation.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 6 Mar 2016 22:52:02 +0100 -Subject: [PATCH] build-system: fixes for cross-compilation - -Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB - -Signed-off-by: Gustavo Zacarias -[yann.morin.1998@free.fr: dont chmod +x the shared lib] -Signed-off-by: "Yann E. MORIN" - -diff --git a/Make.Rules b/Make.Rules -index 8347b26..8a07a3f 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -48,26 +48,26 @@ MINOR=25 - KERNEL_HEADERS := $(topdir)/libcap/include/uapi - IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - --CC := gcc --CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib -+CC ?= gcc -+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+BUILD_CC ?= $(CC) -+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH) -+AR ?= ar -+RANLIB ?= ranlib - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g -+LDFLAGS ?= #-g - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - - SYSTEM_HEADERS = /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap - CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) --PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) -+PAM_CAP = no - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) - --- -1.9.1 - diff --git a/buildroot/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/buildroot/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch deleted file mode 100644 index a8579b766..000000000 --- a/buildroot/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch +++ /dev/null @@ -1,48 +0,0 @@ -From af21635665ab568f3333ff9fe8b474f4950e5acb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 6 Mar 2016 22:53:24 +0100 -Subject: [PATCH] libcap: split install into install-shared/install-static - -In order to support static only builds, split the install target into -install-shared and install-static targets. - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: install the .pc file in the common rule] -Signed-off-by: "Yann E. MORIN" - -diff --git a/libcap/Makefile b/libcap/Makefile -index d189777..44ddb27 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS) - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) - $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - --install: all -+install: install-shared install-static -+ -+install-common: - mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys - install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys -+ mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) -+ install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc -+ -+install-static: $(STALIBNAME) install-common - mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR) - install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME) -+ -+install-shared: $(MINLIBNAME) install-common - install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME) - ifeq ($(FAKEROOT),) - -/sbin/ldconfig - endif -- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) -- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc - - clean: - $(LOCALCLEAN) --- -1.9.1 - diff --git a/buildroot/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch b/buildroot/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch deleted file mode 100644 index 02cc228b1..000000000 --- a/buildroot/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ace694e9574eb38e07cfe0db235434eb40003f47 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 14 Mar 2016 22:39:15 +0100 -Subject: [PATCH] libcap/cap_file.c: fix build with old kernel headers - -Signed-off-by: Thomas Petazzoni ---- - libcap/cap_file.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/libcap/cap_file.c b/libcap/cap_file.c -index 40756ea..e3d54dd 100644 ---- a/libcap/cap_file.c -+++ b/libcap/cap_file.c -@@ -23,6 +23,33 @@ extern int fsetxattr(int, const char *, const void *, size_t, int); - extern int removexattr(const char *, const char *); - extern int fremovexattr(int, const char *); - -+ -+/* -+ * Old kernels (before 2.6.36) were defining XATTR_NAME_CAPS in -+ * , but using XATTR_SECURITY_PREFIX and -+ * XATTR_CAPS_SUFFIX which were defined in the kernel-only part of -+ * . -+ * -+ * In kernel 2.6.36 (commit af4f136056c984b0aa67feed7d3170b958370b2f), -+ * the XATTR_NAME_CAPS definition was moved to the kernel-only part of -+ * . It's only in kernel 3.0 (commit -+ * 1dbe39424a43e56a6c9aed12661192af51dcdb9f) that was -+ * fixed to expose XATTR_NAME_CAPS and the related definitions to -+ * userspace. -+ * -+ * In order to cope with kernels < 3.0, we define here the appropriate -+ * values, which we assume haven't changed over history. -+ */ -+#ifndef XATTR_CAPS_SUFFIX -+#define XATTR_CAPS_SUFFIX "capability" -+#endif -+#ifndef XATTR_SECURITY_PREFIX -+#define XATTR_SECURITY_PREFIX "security." -+#endif -+#ifndef XATTR_NAME_CAPS -+#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX -+#endif -+ - #include "libcap.h" - - #ifdef VFS_CAP_U32 --- -2.6.4 - diff --git a/buildroot/package/libcap/Config.in b/buildroot/package/libcap/Config.in index 5b0c82719..1fb2e7cae 100644 --- a/buildroot/package/libcap/Config.in +++ b/buildroot/package/libcap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBCAP bool "libcap" + depends on BR2_USE_MMU # fork() help This library implements the user-space interfaces to the POSIX 1003.1e capabilities available in Linux kernels. These @@ -12,7 +13,6 @@ if BR2_PACKAGE_LIBCAP config BR2_PACKAGE_LIBCAP_TOOLS bool "install tools" - depends on BR2_USE_MMU help Install setcap, getcap, getpcaps and capsh tools. diff --git a/buildroot/package/libcap/libcap.hash b/buildroot/package/libcap/libcap.hash index cbef0dc86..32986a41d 100644 --- a/buildroot/package/libcap/libcap.hash +++ b/buildroot/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a libcap-2.27.tar.xz +sha256 d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286 libcap-2.45.tar.xz # Hash for license file: -sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License +sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License diff --git a/buildroot/package/libcap/libcap.mk b/buildroot/package/libcap/libcap.mk index 4919a4adc..2b80a3cb7 100644 --- a/buildroot/package/libcap/libcap.mk +++ b/buildroot/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.27 +LIBCAP_VERSION = 2.45 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause @@ -15,59 +15,50 @@ LIBCAP_INSTALL_STAGING = YES HOST_LIBCAP_DEPENDENCIES = host-gperf -ifeq ($(BR2_STATIC_LIBS),y) -LIBCAP_MAKE_TARGET = libcap.a libcap.pc -LIBCAP_MAKE_INSTALL_TARGET = install-static -else ifeq ($(BR2_SHARED_LIBS),y) -LIBCAP_MAKE_TARGET = all -LIBCAP_MAKE_INSTALL_TARGET = install-shared -else -LIBCAP_MAKE_TARGET = all -LIBCAP_MAKE_INSTALL_TARGET = install -endif - LIBCAP_MAKE_FLAGS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_CC="$(HOSTCC)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" + BUILD_CFLAGS="$(HOST_CFLAGS)" \ + SHARED=$(if $(BR2_STATIC_LIBS),,yes) \ + PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,) + +LIBCAP_MAKE_DIRS = libcap ifeq ($(BR2_PACKAGE_LIBCAP_TOOLS),y) -define LIBCAP_BUILD_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - $(LIBCAP_MAKE_FLAGS) -endef - -define LIBCAP_INSTALL_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - RAISE_SETFCAP=no prefix=/usr \ - DESTDIR=$(TARGET_DIR) $(LIBCAP_MAKE_FLAGS) install -endef +LIBCAP_MAKE_DIRS += progs endif define LIBCAP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \ - $(LIBCAP_MAKE_FLAGS) $(LIBCAP_MAKE_TARGET) - $(LIBCAP_BUILD_TOOLS_CMDS) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d) \ + $(LIBCAP_MAKE_FLAGS) all + ) endef define LIBCAP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ + DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install + ) endef define LIBCAP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) - $(LIBCAP_INSTALL_TOOLS_CMDS) + $(foreach d,$(LIBCAP_MAKE_DIRS), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ + DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install + ) endef define HOST_LIBCAP_BUILD_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - RAISE_SETFCAP=no + DYNAMIC=yes \ + RAISE_SETFCAP=no GOLANG=no endef define HOST_LIBCAP_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \ - RAISE_SETFCAP=no lib=lib install + DYNAMIC=yes \ + RAISE_SETFCAP=no GOLANG=no lib=lib install endef $(eval $(generic-package)) diff --git a/buildroot/package/libcec/libcec.hash b/buildroot/package/libcec/libcec.hash index 6790b417f..36b6bad86 100644 --- a/buildroot/package/libcec/libcec.hash +++ b/buildroot/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4382a964bf8c511c22c03cdab5ba2d81c241536e6479072a61516966804f400a libcec-4.0.4.tar.gz -sha256 3618005b3db4eb8ede7292d233e6c41605cb8dcbd33e8790eff6e29c1e4f3789 COPYING +sha256 bcd92c376993a5721d346edcc09eb17289451f9156b1d1d113c9663c2046315a libcec-4.0.7.tar.gz +sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a COPYING diff --git a/buildroot/package/libcec/libcec.mk b/buildroot/package/libcec/libcec.mk index fe519d47b..7c37d05c7 100644 --- a/buildroot/package/libcec/libcec.mk +++ b/buildroot/package/libcec/libcec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCEC_VERSION = 4.0.4 +LIBCEC_VERSION = 4.0.7 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ LIBCEC_LICENSE_FILES = COPYING diff --git a/buildroot/package/libclc/libclc.mk b/buildroot/package/libclc/libclc.mk index 52249a708..630616905 100644 --- a/buildroot/package/libclc/libclc.mk +++ b/buildroot/package/libclc/libclc.mk @@ -25,7 +25,7 @@ LIBCLC_CONF_OPTS = \ --prefix=/usr \ --includedir=/usr/share \ --pkgconfigdir=/usr/lib/pkgconfig \ - --with-cxx-compiler=$(HOSTCXX) + --with-cxx-compiler=$(HOSTCXX_NOCCACHE) define LIBCLC_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) diff --git a/buildroot/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch b/buildroot/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch deleted file mode 100644 index de900178d..000000000 --- a/buildroot/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 12 Feb 2018 07:49:34 -0500 -Subject: [PATCH] libcpprestsdk: fix building as a static library - -Use pkg-config to find OpenSSL. This will automatically find any -dependent libraries and put them in the correct order for linking. - -Upstream status: submitted -https://github.com/Microsoft/cpprestsdk/pull/688 - -Signed-off-by: Adam Duskett ---- - Release/cmake/cpprest_find_openssl.cmake | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake -index 0b49a7e..2be8afb 100644 ---- a/Release/cmake/cpprest_find_openssl.cmake -+++ b/Release/cmake/cpprest_find_openssl.cmake -@@ -41,8 +41,12 @@ function(cpprest_find_openssl) - # This should prevent linking against the system provided 0.9.8y - set(_OPENSSL_VERSION "") - endif() -- find_package(OpenSSL 1.0.0 REQUIRED) -- -+ if(UNIX) -+ find_package(PkgConfig REQUIRED) -+ pkg_search_module(OPENSSL openssl REQUIRED) -+ else() -+ find_package(OpenSSL 1.0.0 REQUIRED) -+ endif() - INCLUDE(CheckCXXSourceCompiles) - set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}") --- -2.14.3 - diff --git a/buildroot/package/libcpprestsdk/Config.in b/buildroot/package/libcpprestsdk/Config.in index a07159b12..af97509d1 100644 --- a/buildroot/package/libcpprestsdk/Config.in +++ b/buildroot/package/libcpprestsdk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK bool "libcpprestsdk" + depends on BR2_ENABLE_LOCALE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # boost depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr @@ -13,7 +14,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB help The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern @@ -22,10 +22,10 @@ config BR2_PACKAGE_LIBCPPRESTSDK https://github.com/Microsoft/cpprestsdk -comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar" +comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE comment "libcpprestsdk needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.hash b/buildroot/package/libcpprestsdk/libcpprestsdk.hash index e226a581b..e76522f6e 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.hash +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 libcpprestsdk-2.10.14.tar.gz -sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt +sha256 3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681 libcpprestsdk-2.10.16.tar.gz +sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.mk b/buildroot/package/libcpprestsdk/libcpprestsdk.mk index 8b9c7d4da..d8525cfe1 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.mk +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBCPPRESTSDK_VERSION = 2.10.14 +LIBCPPRESTSDK_VERSION = 2.10.16 LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION)) LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release LIBCPPRESTSDK_INSTALL_STAGING = YES -LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib +LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF ifeq ($(BR2_STATIC_LIBS),y) @@ -25,12 +25,19 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBCPPRESTSDK_CXXFLAGS += -latomic endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBCPPRESTSDK_DEPENDENCIES += zlib +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF +# brotli needs compression ifeq ($(BR2_PACKAGE_BROTLI),y) LIBCPPRESTSDK_DEPENDENCIES += brotli LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=OFF else LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=ON endif +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=ON +endif ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y) LIBCPPRESTSDK_DEPENDENCIES += websocketpp diff --git a/buildroot/package/libcroco/Config.in b/buildroot/package/libcroco/Config.in deleted file mode 100644 index ad78a147e..000000000 --- a/buildroot/package/libcroco/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBCROCO - bool "libcroco" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBGLIB2 - help - Libcroco is a standalone css2 parsing and manipulation - library. The parser provides a low level event driven SAC - like api and a css object model like api. - - Libcroco provides a CSS2 selection engine and an - experimental xml/css rendering engine. - - https://github.com/GNOME/libcroco - -comment "libcroco needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libcroco/libcroco.hash b/buildroot/package/libcroco/libcroco.hash deleted file mode 100644 index b99820642..000000000 --- a/buildroot/package/libcroco/libcroco.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.13.sha256sum -sha256 767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4 libcroco-0.6.13.tar.xz - -# Hash for license file: -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB diff --git a/buildroot/package/libcroco/libcroco.mk b/buildroot/package/libcroco/libcroco.mk deleted file mode 100644 index c717c9a21..000000000 --- a/buildroot/package/libcroco/libcroco.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libcroco -# -################################################################################ - -LIBCROCO_VERSION_MAJOR = 0.6 -LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).13 -LIBCROCO_SITE = http://ftp.gnome.org/pub/gnome/sources/libcroco/$(LIBCROCO_VERSION_MAJOR) -LIBCROCO_SOURCE = libcroco-$(LIBCROCO_VERSION).tar.xz -LIBCROCO_INSTALL_STAGING = YES -LIBCROCO_DEPENDENCIES = host-pkgconf libglib2 libxml2 -HOST_LIBCROCO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2 -LIBCROCO_CONFIG_SCRIPTS = croco-$(LIBCROCO_VERSION_MAJOR)-config -# NEWS states that it's only LGPL -# Source code says v2.1+ even though COPYING.LIB is v2 -LIBCROCO_LICENSE = LGPL-2.1+ -LIBCROCO_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch b/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch new file mode 100644 index 000000000..180f24358 --- /dev/null +++ b/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch @@ -0,0 +1,46 @@ +From 75d2b1787b3253784a94c66016829acf1f442526 Mon Sep 17 00:00:00 2001 +Message-Id: <75d2b1787b3253784a94c66016829acf1f442526.1603688719.git.baruch@tkos.co.il> +From: Baruch Siach +Date: Mon, 26 Oct 2020 06:56:49 +0200 +Subject: [PATCH] libssh2: fix build with disabled proxy support + +Build breaks because the http_proxy field is missing: + +vssh/libssh2.c: In function 'ssh_connect': +vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named 'http_proxy' + if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) { + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/curl/curl/pull/6125 + + lib/vssh/libssh2.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c +index 6c6db049bf5a..74cd5d887549 100644 +--- a/lib/vssh/libssh2.c ++++ b/lib/vssh/libssh2.c +@@ -3094,6 +3094,7 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) + return CURLE_FAILED_INIT; + } + ++#ifndef CURL_DISABLE_PROXY + if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) { + /* + * This crazy union dance is here to avoid assigning a void pointer a +@@ -3132,7 +3133,9 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) + libssh2_session_callback_set(ssh->ssh_session, + LIBSSH2_CALLBACK_SEND, sshsend.sendp); + } +- else if(conn->handler->protocol & CURLPROTO_SCP) { ++ else ++#endif /* CURL_DISABLE_PROXY */ ++ if(conn->handler->protocol & CURLPROTO_SCP) { + conn->recv[FIRSTSOCKET] = scp_recv; + conn->send[FIRSTSOCKET] = scp_send; + } +-- +2.28.0 + diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in index d05cbedf7..b89c46f5e 100644 --- a/buildroot/package/libcurl/Config.in +++ b/buildroot/package/libcurl/Config.in @@ -52,6 +52,10 @@ config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL +config BR2_PACKAGE_LIBCURL_BEARSSL + bool "BearSSL" + depends on BR2_PACKAGE_BEARSSL + config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 2bd1890ca..332614d82 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.72.0.tar.xz.asc +# https://curl.haxx.se/download/curl-7.73.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713 curl-7.72.0.tar.xz +sha256 7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a curl-7.73.0.tar.xz sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index e233926cb..74ce3be65 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.72.0 +LIBCURL_VERSION = 7.73.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -51,6 +51,13 @@ else LIBCURL_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_LIBCURL_BEARSSL),y) +LIBCURL_CONF_OPTS += --with-bearssl=$(STAGING_DIR)/usr +LIBCURL_DEPENDENCIES += bearssl +else +LIBCURL_CONF_OPTS += --without-bearssl +endif + ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y) LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr \ --with-ca-fallback diff --git a/buildroot/package/libcutl/libcutl.hash b/buildroot/package/libcutl/libcutl.hash new file mode 100644 index 000000000..1e0baa7f6 --- /dev/null +++ b/buildroot/package/libcutl/libcutl.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/download/libcutl/1.10/libcutl-1.10.0.tar.bz2.sha1 +sha1 2885b79529f8caeb13687d722f5c114186f56956 libcutl-1.10.0.tar.bz2 + +# Locally Computed +sha256 125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c libcutl-1.10.0.tar.bz2 +sha256 c7aa98c5af3b67174f16b12a1fed4332a51cd524b82c69e85baa4c2c412da239 LICENSE diff --git a/buildroot/package/libcutl/libcutl.mk b/buildroot/package/libcutl/libcutl.mk new file mode 100644 index 000000000..49c05e601 --- /dev/null +++ b/buildroot/package/libcutl/libcutl.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libcutl +# +################################################################################ + +LIBCUTL_VERSION_MAJOR = 1.10 +LIBCUTL_VERSION = $(LIBCUTL_VERSION_MAJOR).0 +LIBCUTL_SOURCE = libcutl-$(LIBCUTL_VERSION).tar.bz2 +LIBCUTL_SITE = https://www.codesynthesis.com/download/libcutl/$(LIBCUTL_VERSION_MAJOR) +LIBCUTL_INSTALL_STAGING = YES +LIBCUTL_LICENSE = MIT +LIBCUTL_LICENSE_FILES = LICENSE + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch b/buildroot/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch deleted file mode 100644 index 3c00e9c73..000000000 --- a/buildroot/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2e3dd0040e676530f7e735fab335ff449b9b3f4d Mon Sep 17 00:00:00 2001 -From: Lauren Post -Date: Tue, 22 Mar 2016 22:08:25 +0100 -Subject: [PATCH] Add ARM support into xf86drm.h - -This provides support for Xorg interface. Without this the vivante -samples will hang during close requiring a reboot - -[Adapted from yocto project] -Upstream-Status: Pending -Signed-off-by: Lauren Post -Signed-off-by: Evan Kotara -[Thomas: change CAS code to only be used on ARMv6/ARMv7, and not -ARMv4/ARMv5, which don't support ldrex/strex. If no CAS implementation -is provided libdrm falls back to a system call for locking/unlocking.] -Signed-off-by: Thomas Petazzoni ---- - xf86drm.h | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/xf86drm.h b/xf86drm.h -index 481d882..72341f6 100644 ---- a/xf86drm.h -+++ b/xf86drm.h -@@ -469,6 +469,28 @@ do { register unsigned int __old __asm("o0"); \ - : "cr0", "memory"); \ - } while (0) - -+# elif defined (__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ -+ || defined (__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ -+ || defined (__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \ -+ || defined (__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ -+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ -+ || defined(__ARM_ARCH_7EM__) -+ #undef DRM_DEV_MODE -+ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) -+ -+ #define DRM_CAS(lock,old,new,__ret) \ -+ do { \ -+ __asm__ __volatile__ ( \ -+ "1: ldrex %0, [%1]\n" \ -+ " teq %0, %2\n" \ -+ " ite eq\n" \ -+ " strexeq %0, %3, [%1]\n" \ -+ " movne %0, #1\n" \ -+ : "=&r" (__ret) \ -+ : "r" (lock), "r" (old), "r" (new) \ -+ : "cc","memory"); \ -+ } while (0) -+ - #endif /* architecture */ - #endif /* __GNUC__ >= 2 */ - --- -2.6.4 - diff --git a/buildroot/package/libdrm/0004-meson.build-enable-static-build.patch b/buildroot/package/libdrm/0001-meson.build-enable-static-build.patch similarity index 100% rename from buildroot/package/libdrm/0004-meson.build-enable-static-build.patch rename to buildroot/package/libdrm/0001-meson.build-enable-static-build.patch diff --git a/buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch b/buildroot/package/libdrm/0002-tests-meson.build-disable-nouveau-tests-for-static-b.patch similarity index 100% rename from buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch rename to buildroot/package/libdrm/0002-tests-meson.build-disable-nouveau-tests-for-static-b.patch diff --git a/buildroot/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch b/buildroot/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch deleted file mode 100644 index ff920fb5a..000000000 --- a/buildroot/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7384f79f69fdb7b691cc5b0c28c301b3fe8b633e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 May 2016 10:46:57 +0200 -Subject: [PATCH] xf86atomic: require CAS support in libatomic_ops - -Since AO_compare_and_swap_full() is used by libdrm, AO_REQUIRE_CAS -must be defined before including so that we are sure -that CAS support will be provided. This is necessary to make sure that -the AO_compare_and_swap_full() function will be provided on all -architectures, including the ones that don't have built-in CAS support -such as SPARCv8. - -Signed-off-by: Thomas Petazzoni ---- - xf86atomic.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xf86atomic.h b/xf86atomic.h -index 922b37d..d7017a5 100644 ---- a/xf86atomic.h -+++ b/xf86atomic.h -@@ -58,6 +58,7 @@ typedef struct { - #endif - - #if HAVE_LIB_ATOMIC_OPS -+#define AO_REQUIRE_CAS - #include - - #define HAS_ATOMIC_OPS 1 --- -2.7.4 - diff --git a/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch b/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch deleted file mode 100644 index 5d7cd5e4d..000000000 --- a/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 00f6ac3c24f36fa07fa93f4a89ee873edf125098 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 16 Jul 2018 23:01:40 +0200 -Subject: [PATCH] meson.build: fix intel atomics detection - -Use the stronger compiler.link() test (instead of the weaker -compiler.compile()) to fix the intel atomics detection. - -Fixes false positive in case of sparc compile (buildroot toolchain). - -Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183885.html -Signed-off-by: Peter Seiderer ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9b443a5..3c8afb6 100644 ---- a/meson.build -+++ b/meson.build -@@ -49,9 +49,10 @@ intel_atomics = false - lib_atomics = false - - dep_atomic_ops = dependency('atomic_ops', required : false) --if cc.compiles(''' -+if cc.links(''' - int atomic_add(int *i) { return __sync_add_and_fetch (i, 1); } - int atomic_cmpxchg(int *i, int j, int k) { return __sync_val_compare_and_swap (i, j, k); } -+ int main() { } - ''', - name : 'Intel Atomics') - intel_atomics = true --- -2.18.0 - diff --git a/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch b/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch new file mode 100644 index 000000000..ba84114f1 --- /dev/null +++ b/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch @@ -0,0 +1,84 @@ +From c7d89412884de2dbfa543720d185027377e62f21 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 5 Jun 2020 23:46:52 +0200 +Subject: [PATCH] xf86drm.c: fix build failure + +./xf86drm.c: In function 'drmNodeIsDRM': +../xf86drm.c:2825:7: error: "__FreeBSD__" is not defined [-Werror=undef] + #elif __FreeBSD__ + ^ +../xf86drm.c: In function 'drmGetMinorNameForFD': +../xf86drm.c:2938:7: error: "__FreeBSD__" is not defined [-Werror=undef] + #elif __FreeBSD__ + ^ +../xf86drm.c: In function 'drmParsePciBusInfo': +../xf86drm.c:3258:7: error: "__FreeBSD__" is not defined [-Werror=undef] + #elif __FreeBSD__ + ^ +../xf86drm.c: In function 'drmParsePciDeviceInfo': +../xf86drm.c:3427:7: error: "__FreeBSD__" is not defined [-Werror=undef] + #elif __FreeBSD__ + ^ +../xf86drm.c: In function 'drmGetDeviceNameFromFd2': +../xf86drm.c:4305:7: error: "__FreeBSD__" is not defined [-Werror=undef] + #elif __FreeBSD__ + ^ + +Signed-off-by: Heiko Thiery +[A merge-request with this fix is opened at https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/75] +--- + xf86drm.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xf86drm.c b/xf86drm.c +index 07a18c44..50a6f092 100644 +--- a/xf86drm.c ++++ b/xf86drm.c +@@ -2822,7 +2822,7 @@ static bool drmNodeIsDRM(int maj, int min) + snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm", + maj, min); + return stat(path, &sbuf) == 0; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) + char name[SPECNAMELEN]; + + if (!devname_r(makedev(maj, min), S_IFCHR, name, sizeof(name))) +@@ -2935,7 +2935,7 @@ static char *drmGetMinorNameForFD(int fd, int type) + + closedir(sysdir); + return NULL; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) + struct stat sbuf; + char dname[SPECNAMELEN]; + const char *mname; +@@ -3255,7 +3255,7 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) + info->func = pinfo.func; + + return 0; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) + return get_sysctl_pci_bus_info(maj, min, info); + #else + #warning "Missing implementation of drmParsePciBusInfo" +@@ -3424,7 +3424,7 @@ static int drmParsePciDeviceInfo(int maj, int min, + device->subdevice_id = pinfo.subdevice_id; + + return 0; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) + drmPciBusInfo info; + struct pci_conf_io pc; + struct pci_match_conf patterns[1]; +@@ -4302,7 +4302,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd) + free(value); + + return strdup(path); +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) + return drmGetDeviceNameFromFd(fd); + #else + struct stat sbuf; +-- +2.20.1 + diff --git a/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch b/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch deleted file mode 100644 index 80845709d..000000000 --- a/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6c7b305869b941e52cb846cbed5e4a5c85d035d9 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 18 Jun 2018 15:07:03 +0100 -Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature - -POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to -use (int, unsigned long int, ...) instead. - -Use a #ifdef to adapt the replacement function as appropriate. - -Signed-off-by: Ross Burton - -[Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch] -Signed-off-by: Peter Seiderer ---- - tests/nouveau/threaded.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c -index 3669bcd..e1c27c0 100644 ---- a/tests/nouveau/threaded.c -+++ b/tests/nouveau/threaded.c -@@ -36,7 +36,11 @@ static int failed; - - static int import_fd; - -+#ifdef __GLIBC__ - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - va_list va; - int ret; --- -2.24.0 - diff --git a/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch b/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch deleted file mode 100644 index 9c06675da..000000000 --- a/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f0adb08424e624aeee340291343281256b7a98e8 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 7 Mar 2020 12:23:09 +0100 -Subject: [PATCH] tests/amdgpu: needs atomic_ops - -[Upstream: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/50] -Signed-off-by: Peter Seiderer ---- - tests/amdgpu/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build -index 1726cb43..4dfa5c83 100644 ---- a/tests/amdgpu/meson.build -+++ b/tests/amdgpu/meson.build -@@ -26,7 +26,7 @@ if dep_cunit.found() - 'vce_tests.c', 'uvd_enc_tests.c', 'vcn_tests.c', 'deadlock_tests.c', - 'vm_tests.c', 'ras_tests.c', 'syncobj_tests.c', - ), -- dependencies : [dep_cunit, dep_threads], -+ dependencies : [dep_cunit, dep_threads, dep_atomic_ops], - include_directories : [inc_root, inc_drm, include_directories('../../amdgpu')], - link_with : [libdrm, libdrm_amdgpu], - install : with_install_tests, --- -2.25.1 - diff --git a/buildroot/package/libdrm/libdrm.hash b/buildroot/package/libdrm/libdrm.hash index 7b50e66a9..72330165d 100644 --- a/buildroot/package/libdrm/libdrm.hash +++ b/buildroot/package/libdrm/libdrm.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2019-October/240455.html -md5 f47bc87e28198ba527e6b44ffdd62f65 libdrm-2.4.100.tar.bz2 -sha1 9f526909aba08b5658cfba3f7fde9385cad6f3b5 libdrm-2.4.100.tar.bz2 -sha256 c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d libdrm-2.4.100.tar.bz2 -sha512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html +sha256 8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b libdrm-2.4.102.tar.xz +sha512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz diff --git a/buildroot/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk index f7c920574..9348b8329 100644 --- a/buildroot/package/libdrm/libdrm.mk +++ b/buildroot/package/libdrm/libdrm.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.100 -LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 +LIBDRM_VERSION = 2.4.102 +LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT LIBDRM_INSTALL_STAGING = YES diff --git a/buildroot/package/libdvdnav/libdvdnav.hash b/buildroot/package/libdvdnav/libdvdnav.hash index 8de6debfe..04706b0bb 100644 --- a/buildroot/package/libdvdnav/libdvdnav.hash +++ b/buildroot/package/libdvdnav/libdvdnav.hash @@ -1,9 +1,9 @@ -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.md5 -md5 3a28d2cc7e25c1cbcb06443f3114f0b1 libdvdnav-6.0.1.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha1 -sha1 258b82156e13803f2b0dbaec74e15475b4341d2f libdvdnav-6.0.1.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha256 -sha256 e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733 libdvdnav-6.0.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.md5 +md5 8817ac12c13644df6ba2091c2dcaeed3 libdvdnav-6.1.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.sha1 +sha1 b0597e9d11393e17b57f784c0dcba33a499e80b0 libdvdnav-6.1.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.sha256 +sha256 f697b15ea9f75e9f36bdf6ec3726308169f154e2b1e99865d0bbe823720cee5b libdvdnav-6.1.0.tar.bz2 # Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/libdvdnav/libdvdnav.mk b/buildroot/package/libdvdnav/libdvdnav.mk index 450f8f687..c5bebd492 100644 --- a/buildroot/package/libdvdnav/libdvdnav.mk +++ b/buildroot/package/libdvdnav/libdvdnav.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBDVDNAV_VERSION = 6.0.1 +LIBDVDNAV_VERSION = 6.1.0 LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) LIBDVDNAV_INSTALL_STAGING = YES +LIBDVDNAV_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf LIBDVDNAV_LICENSE = GPL-2.0+ LIBDVDNAV_LICENSE_FILES = COPYING diff --git a/buildroot/package/libdvdread/libdvdread.hash b/buildroot/package/libdvdread/libdvdread.hash index c6b5807af..00066619c 100644 --- a/buildroot/package/libdvdread/libdvdread.hash +++ b/buildroot/package/libdvdread/libdvdread.hash @@ -1,9 +1,9 @@ -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.md5 -md5 49990935174bf6b2fa501e789c578135 libdvdread-6.0.2.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha1 -sha1 a3d4b85cbe52b11cff7587ed010fa38ce512fd95 libdvdread-6.0.2.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha256 -sha256 f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0 libdvdread-6.0.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.1.1/libdvdread-6.1.1.tar.bz2.md5 +md5 09c7423568fb679279fd2a2bc6b10b6e libdvdread-6.1.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.1.1/libdvdread-6.1.1.tar.bz2.sha1 +sha1 d2e5056de89fb5fed478c0af5a72e8b781d0c396 libdvdread-6.1.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.1.1/libdvdread-6.1.1.tar.bz2.sha256 +sha256 3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796 libdvdread-6.1.1.tar.bz2 # Hash for license file: sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING diff --git a/buildroot/package/libdvdread/libdvdread.mk b/buildroot/package/libdvdread/libdvdread.mk index 7744fc42a..aa91d3162 100644 --- a/buildroot/package/libdvdread/libdvdread.mk +++ b/buildroot/package/libdvdread/libdvdread.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBDVDREAD_VERSION = 6.0.2 +LIBDVDREAD_VERSION = 6.1.1 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) LIBDVDREAD_INSTALL_STAGING = YES LIBDVDREAD_LICENSE = GPL-2.0+ LIBDVDREAD_LICENSE_FILES = COPYING +LIBDVDREAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LIBDVDREAD_CONF_OPTS = --with-libdvdcss LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf diff --git a/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch b/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch new file mode 100644 index 000000000..b69455bd7 --- /dev/null +++ b/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch @@ -0,0 +1,44 @@ +From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001 +From: Aymeric Moizard +Date: Fri, 13 Mar 2020 16:34:41 +0100 +Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll + implementation + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f] +--- + src/eXconf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/eXconf.c b/src/eXconf.c +index baf90be..6165eb3 100644 +--- a/src/eXconf.c ++++ b/src/eXconf.c +@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext) + } + + if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) { ++#ifndef OSIP_MONOTHREAD + struct epoll_event ev; ++#endif + excontext->epfdctl = epoll_create (1); + if (excontext->epfdctl < 0) { + return OSIP_UNDEFINED_ERROR; + } + ++#ifndef OSIP_MONOTHREAD + memset(&ev, 0, sizeof(struct epoll_event)); + ev.events = EPOLLIN; + ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event); +@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext) + _eXosip_closesocket (excontext->epfdctl); + return OSIP_UNDEFINED_ERROR; + } ++#endif + } + #endif + +-- +cgit v1.2.1 + diff --git a/buildroot/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch b/buildroot/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch deleted file mode 100644 index 69e349f20..000000000 --- a/buildroot/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch +++ /dev/null @@ -1,62 +0,0 @@ -configure: use pkg-config to find openssl - -The current check is broken for static linking, since the openssl -libs need to be linked against libz, which is missing in the link -command when doing a static build: - http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log - -Instead of trying convoluted tests to decide what additional libs -are required, just delegate this job to pkg-config. - -At the same time, fix a few legacy, deprecated constructs in favour -of their new counterparts. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: submitted, but no public mailing list (sent to the -mail documented in: http://www.antisip.com/doc/exosip2/index.html ) - -diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in ---- libeXosip2-3.6.0.orig/configure.in 2014-06-22 23:58:26.549487427 +0200 -+++ libeXosip2-3.6.0/configure.in 2014-06-22 23:59:12.822008499 +0200 -@@ -44,7 +44,7 @@ - AC_CONFIG_AUX_DIR(scripts) - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE($PACKAGE, $VERSION) --AM_ACLOCAL_INCLUDE(scripts) -+AC_CONFIG_MACRO_DIR([scripts]) - - AC_CANONICAL_HOST - -@@ -371,13 +371,15 @@ - - AC_ARG_ENABLE(openssl, - [ --enable-openssl enable support for openssl], -- enable_openssl=$enableval,enable_openssl="yes") -+ enable_openssl=$enableval,enable_openssl="auto") - --if test "$enable_openssl" = "yes" ; then -- AC_CHECK_HEADERS(openssl/ssl.h) -- AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"]) -- AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"]) --fi -+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"], -+ [PKG_CHECK_MODULES([SSL], [openssl], -+ [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"], -+ [AS_IF([test "$enable_openssl" = "yes"], -+ [AC_MSG_ERROR([can not find openssl])]) -+ ]) -+ ]) - - AC_ARG_ENABLE(srvrec, - [ --enable-srvrec enable support for SRV records DNS queries (yes) ], -diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am ---- libeXosip2-3.6.0.orig/Makefile.am 2014-06-23 00:14:25.328226745 +0200 -+++ libeXosip2-3.6.0/Makefile.am 2014-06-23 00:14:38.296371236 +0200 -@@ -1,4 +1,4 @@ -- -+ACLOCAL_AMFLAGS = -I scripts - EXTRA_DIST = README autogen.sh - - SUBDIRS = scripts platform src include tools help diff --git a/buildroot/package/libeXosip2/libeXosip2.hash b/buildroot/package/libeXosip2/libeXosip2.hash index 86335a3c4..a7d3c56d0 100644 --- a/buildroot/package/libeXosip2/libeXosip2.hash +++ b/buildroot/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz +sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/libeXosip2/libeXosip2.mk b/buildroot/package/libeXosip2/libeXosip2.mk index 04f8672c4..4bd8922b4 100644 --- a/buildroot/package/libeXosip2/libeXosip2.mk +++ b/buildroot/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,9 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 3.6.0 +LIBEXOSIP2_VERSION = 5.1.1 +# Since version 5.0, letter 'X' in library's name is in lower case +LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip LIBEXOSIP2_INSTALL_STAGING = YES LIBEXOSIP2_LICENSE = GPL-2.0+ @@ -12,9 +14,6 @@ LIBEXOSIP2_LICENSE_FILES = COPYING LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2 -# We are touching configure.in and Makefile.am with one of our patches -LIBEXOSIP2_AUTORECONF = YES - ifeq ($(BR2_arc),y) # toolchain __arc__ define conflicts with libeXosip2 source LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" diff --git a/buildroot/package/libebml/libebml.hash b/buildroot/package/libebml/libebml.hash index 88511f7b9..f06924076 100644 --- a/buildroot/package/libebml/libebml.hash +++ b/buildroot/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c6a792f4127b8059bc446fb32391e6633811f45748d7d7ba873d7028362f5e3e libebml-1.3.10.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL +sha256 80abc9a82549615018798ee704997270a39b43de9a6e7e0d23b62f8ce682c4b3 libebml-1.4.0.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/buildroot/package/libebml/libebml.mk b/buildroot/package/libebml/libebml.mk index 549d2f8e6..911093f5c 100644 --- a/buildroot/package/libebml/libebml.mk +++ b/buildroot/package/libebml/libebml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBML_VERSION = 1.3.10 +LIBEBML_VERSION = 1.4.0 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES diff --git a/buildroot/package/liberation/liberation.hash b/buildroot/package/liberation/liberation.hash index a15dc2351..f8b0bdac5 100644 --- a/buildroot/package/liberation/liberation.hash +++ b/buildroot/package/liberation/liberation.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f14ff0a0be87b5aeb672e669363b5a699db76feb1144b06798261c0fdcd2b24d liberation-fonts-ttf-2.00.5.tar.gz -sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE +sha256 8ee2c16fe0f055e60dd8375449aff72d25dd623b9cc6f24790ce9d2e91446fca liberation-fonts-ttf-2.1.1.tar.gz +sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE diff --git a/buildroot/package/liberation/liberation.mk b/buildroot/package/liberation/liberation.mk index 495a1ffa6..061830a92 100644 --- a/buildroot/package/liberation/liberation.mk +++ b/buildroot/package/liberation/liberation.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBERATION_VERSION = 2.00.5 -LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/2926169 +LIBERATION_VERSION = 2.1.1 +LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/4743886 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation LIBERATION_LICENSE = OFL-1.1 diff --git a/buildroot/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch b/buildroot/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch deleted file mode 100644 index 745903178..000000000 --- a/buildroot/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 93f6bc2b97a2b76a5e725d63d4b6c2dfe7baf63b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 11 Oct 2015 13:33:19 +0200 -Subject: [PATCH] configure: add '--disable-runtime-tests' option - -Signed-off-by: Peter Seiderer -[Rebased libevdev-1.6.0] -Signed-off-by: Peter Seiderer ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5161d93..2b3bb26 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,14 @@ else - AC_MSG_WARN([check not found - skipping building unit tests]) - fi - AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) --AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"]) -+ -+AC_ARG_ENABLE([runtime-tests], -+ AS_HELP_STRING([--disable-runtime-tests], [Disable runtime tests])) -+AS_IF([test "x$enable_runtime_tests" != "xno"], -+ [enable_runtime_tests=yes], -+ [enable_runtime_tests=no]) -+ -+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"]) - AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"]) - - with_cflags="" -@@ -162,7 +169,7 @@ AC_MSG_RESULT([ - Libdir ${libdir} - - Build documentation ${have_doxygen} -- Enable unit-tests ${HAVE_CHECK} -+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests}) - Enable profiling ${enable_gcov} - Static library symbol check ${static_symbol_leaks_test} - ]) --- -2.19.1 - diff --git a/buildroot/package/libevdev/libevdev.hash b/buildroot/package/libevdev/libevdev.hash index 0d2c99922..3003dc33f 100644 --- a/buildroot/package/libevdev/libevdev.hash +++ b/buildroot/package/libevdev/libevdev.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/input-tools/2019-August/001521.html -md5 879631080be18526737e33b63d848039 libevdev-1.8.0.tar.xz -sha1 4392d28fb91a5f6eb404aab531526f5fa0bbe73d libevdev-1.8.0.tar.xz -sha256 20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211 libevdev-1.8.0.tar.xz -sha512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2020-October/001545.html +md5 c6239ef0d61c4f4911f25bb8426a0b82 libevdev-1.10.0.tar.xz +sha1 3eedd43652a238f687595ffd722fd3bb94359216 libevdev-1.10.0.tar.xz +sha256 3522c26e2c148be0ad68ce26fbced408a4185dea90bfe8079dc82b8ace962d4a libevdev-1.10.0.tar.xz +sha512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f libevdev-1.10.0.tar.xz # Hash for license files: -sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING +sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING diff --git a/buildroot/package/libevdev/libevdev.mk b/buildroot/package/libevdev/libevdev.mk index 8b243be74..0453028f2 100644 --- a/buildroot/package/libevdev/libevdev.mk +++ b/buildroot/package/libevdev/libevdev.mk @@ -4,20 +4,19 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.8.0 +LIBEVDEV_VERSION = 1.10.0 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 LIBEVDEV_LICENSE_FILES = COPYING -# patch touches configure.ac -LIBEVDEV_AUTORECONF = YES - -# Uses PKG_CHECK_MODULES() in configure.ac -LIBEVDEV_DEPENDENCIES = host-pkgconf host-python +LIBEVDEV_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) LIBEVDEV_INSTALL_STAGING = YES -LIBEVDEV_CONF_OPTS += --disable-runtime-tests +LIBEVDEV_CONF_OPTS += \ + -Dtests=disabled \ + -Ddocumentation=disabled \ + -Dcoverity=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/libevent/libevent.hash b/buildroot/package/libevent/libevent.hash index 7bcb381dd..77574e784 100644 --- a/buildroot/package/libevent/libevent.hash +++ b/buildroot/package/libevent/libevent.hash @@ -1,4 +1,4 @@ # locally computed -md5 7f35cfe69b82d879111ec0d7b7b1c531 libevent-2.1.11-stable.tar.gz -sha1 a76bba0a281da9384d4be5b40f3907c07e21428c libevent-2.1.11-stable.tar.gz -sha256 ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670 LICENSE +sha1 cd55656a9b5bed630b08f05495230affb7996b21 libevent-2.1.12-stable.tar.gz +sha256 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb libevent-2.1.12-stable.tar.gz +sha256 ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670 LICENSE diff --git a/buildroot/package/libevent/libevent.mk b/buildroot/package/libevent/libevent.mk index d60455931..5d02191a5 100644 --- a/buildroot/package/libevent/libevent.mk +++ b/buildroot/package/libevent/libevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVENT_VERSION = 2.1.11 +LIBEVENT_VERSION = 2.1.12 LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES diff --git a/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch b/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch deleted file mode 100644 index b78f9b211..000000000 --- a/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 -From: Dov Grobgeld -Date: Thu, 24 Oct 2019 09:37:29 +0300 -Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL - -CVE-2019-18397 - -Signed-off-by: Peter Korsgaard ---- - lib/fribidi-bidi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c -index 6c84392..d384878 100644 ---- a/lib/fribidi-bidi.c -+++ b/lib/fribidi-bidi.c -@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( - } - - RL_LEVEL (pp) = level; -- RL_ISOLATE_LEVEL (pp) = isolate_level++; -+ RL_ISOLATE_LEVEL (pp) = isolate_level; -+ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) -+ isolate_level++; - base_level_per_iso_level[isolate_level] = new_level; - - if (!FRIBIDI_IS_NEUTRAL (override)) --- -2.20.1 - diff --git a/buildroot/package/libfribidi/libfribidi.hash b/buildroot/package/libfribidi/libfribidi.hash index eba767668..8e7eb49bc 100644 --- a/buildroot/package/libfribidi/libfribidi.hash +++ b/buildroot/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d fribidi-1.0.7.tar.bz2 -sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING +sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/buildroot/package/libfribidi/libfribidi.mk b/buildroot/package/libfribidi/libfribidi.mk index 0e17be6db..055620ae0 100644 --- a/buildroot/package/libfribidi/libfribidi.mk +++ b/buildroot/package/libfribidi/libfribidi.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.7 -LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2 +LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ LIBFRIBIDI_LICENSE_FILES = COPYING diff --git a/buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch index 487fc2821..8c45b8811 100644 --- a/buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ b/buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch @@ -1,67 +1,64 @@ From 7e57ff280b55b45e74329b9988279e8831d32eab Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 25 Jan 2015 09:45:04 +0100 -Subject: [PATCH 1/2] cmake: use the standard CMake flag to drive the shared +Subject: [PATCH] cmake: use the standard CMake flag to drive the shared object build Remove the STATICLIBS CMake option (and the code handling it) and let the standard CMake flags drive the shared object build. Signed-off-by: Samuel Martin +[Fabrice: update for 1.5] +Signed-off-by: Fabrice Fontaine --- - CMakeLists.txt | 2 -- - ftdipp/CMakeLists.txt | 15 +-------------- + CMakeOptions.txt | 1 - + ftdipp/CMakeLists.txt | 14 +------------- src/CMakeLists.txt | 13 +------------ - 3 files changed, 2 insertions(+), 28 deletions(-) + 3 files changed, 2 insertions(+), 26 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74f80f4..0ba0b08 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,8 +46,6 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") - set(CPACK_COMPONENT_STATICLIBS_GROUP "Development") - set(CPACK_COMPONENT_HEADERS_GROUP "Development") - +diff --git a/CMakeOptions.txt b/CMakeOptions.txt +index 07b5887..b780ffd 100644 +--- a/CMakeOptions.txt ++++ b/CMakeOptions.txt +@@ -1,4 +1,3 @@ -option ( STATICLIBS "Build static libraries" ON ) -- - # guess LIB_SUFFIX, don't take debian multiarch into account - if ( NOT DEFINED LIB_SUFFIX ) - if( CMAKE_SYSTEM_NAME MATCHES "Linux" + option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" OFF ) + option ( DOCUMENTATION "Generate API documentation with Doxygen" OFF ) + option ( EXAMPLES "Build example programs" ON ) diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 7500211..27e7884 100644 +index fac5bcc..a06edf1 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt -@@ -23,8 +23,7 @@ if (FTDIPP) - set(FTDI_BUILD_CPP True PARENT_SCOPE) - message(STATUS "Building libftdi1++") +@@ -12,7 +12,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} + include_directories(${Boost_INCLUDE_DIRS}) -- # Shared library -- add_library(ftdipp1 SHARED ${cpp_sources}) -+ add_library(ftdipp1 ${cpp_sources}) + # Shared library +-add_library(ftdipp1 SHARED ${cpp_sources}) ++add_library(ftdipp1 ${cpp_sources}) - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases - set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) -@@ -41,18 +40,6 @@ if (FTDIPP) - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) -- -- # Static library -- if ( STATICLIBS ) -- add_library(ftdipp1-static STATIC ${cpp_sources}) -- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") -- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases + set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 3) +@@ -29,18 +29,6 @@ install ( TARGETS ftdipp1 + ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + +-# Static library +-if ( STATICLIBS ) +- add_library(ftdipp1-static STATIC ${cpp_sources}) +- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") +- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - -- install ( TARGETS ftdipp1-static -- ARCHIVE DESTINATION lib${LIB_SUFFIX} -- COMPONENT staticlibs -- ) -- endif () - - install ( FILES ${cpp_headers} - DESTINATION include/${PROJECT_NAME} +- install ( TARGETS ftdipp1-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) +-endif () +- + install ( FILES ${cpp_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9fd86a6..501d4a8 100644 +index 17b3617..ae4fc61 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h @@ -71,7 +68,7 @@ index 9fd86a6..501d4a8 100644 -add_library(ftdi1 SHARED ${c_sources}) +add_library(ftdi1 ${c_sources}) - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases + math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) @@ -38,17 +38,6 @@ install ( TARGETS ftdi1 ARCHIVE DESTINATION lib${LIB_SUFFIX} @@ -92,5 +89,5 @@ index 9fd86a6..501d4a8 100644 DESTINATION include/${PROJECT_NAME} COMPONENT headers -- -2.2.2 +2.27.0 diff --git a/buildroot/package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch b/buildroot/package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch new file mode 100644 index 000000000..14c248bb9 --- /dev/null +++ b/buildroot/package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch @@ -0,0 +1,46 @@ +From 3e68fd7da98a755403cf5719c3d7a3c2f4dcbb58 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 17 Jul 2020 21:04:45 +0200 +Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set + +Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP +is enabled as suggested by Aurelien Jarno in +http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html + +Without this change, the libftdi1.pc config file defines the include +path as /usr/local/include/libftdipp1 while the ftdi.h file is actually +installed in /usr/local/include/libftdi1 + +This is an issue for example for libsigrok which will fail on: + +In file included from src/hardware/asix-sigma/protocol.c:27: +src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory + 28 | #include + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe + +Signed-off-by: Fabrice Fontaine +[Upstream status: +http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00045.html] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aecafc..3b0b87c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ endif () + + add_subdirectory(src) + if ( FTDIPP ) +- project(libftdipp1 C CXX) ++ project(libftdi1 C CXX) + add_subdirectory(ftdipp) + endif () + if ( PYTHON_BINDINGS ) +-- +2.27.0 + diff --git a/buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch b/buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch deleted file mode 100644 index be0913de4..000000000 --- a/buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c215d5ecd985b57700e817920d0e99112b4a571b Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 25 Jan 2015 13:35:24 +0100 -Subject: [PATCH] cmake: do not check for g++ when FTDIPP is disabled - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 6 ++++-- - ftdipp/CMakeLists.txt | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ba0b08..e880211 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Project --project(libftdi1) -+project(libftdi1 C) - set(MAJOR_VERSION 1) - set(MINOR_VERSION 2) - set(PACKAGE libftdi1) -@@ -145,7 +145,9 @@ else(DOCUMENTATION AND DOXYGEN_FOUND) - endif(DOCUMENTATION AND DOXYGEN_FOUND) - - add_subdirectory(src) --add_subdirectory(ftdipp) -+if(FTDIPP) -+ add_subdirectory(ftdipp) -+endif() - add_subdirectory(python) - add_subdirectory(ftdi_eeprom) - add_subdirectory(examples) -diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 27e7884..2d080f4 100644 ---- a/ftdipp/CMakeLists.txt -+++ b/ftdipp/CMakeLists.txt -@@ -1,4 +1,5 @@ - # Check -+project(libftdipp1 C CXX) - set(FTDI_BUILD_CPP False PARENT_SCOPE) - - option ( FTDIPP "Build C++ binding library libftdi1++" ON ) --- -2.2.2 - diff --git a/buildroot/package/libftdi1/0003-cmake-find-swig.patch b/buildroot/package/libftdi1/0003-cmake-find-swig.patch deleted file mode 100644 index cf787a680..000000000 --- a/buildroot/package/libftdi1/0003-cmake-find-swig.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Tue, 31 Jul 2018 17:44:57 -0300 -Subject: [PATCH] CMake: use find_package (SWIG) for cmake >= 3.0.0 - -There's a workaround for a bug (fixed in cmake 3.0.0) that does not -work in CMake 3.12. Only use the workaround with cmake < 3.0.0. - -Signed-off-by: Eneas U de Queiroz -[Mark: patch retrieved and updated from -http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17] -Signed-off-by: Mark Corbin -[Update patch to make it work with cmake < 3.7: -http://developer.intra2net.com/mailarchive/html/libftdi/2019/msg00009.html] -Signed-off-by: Fabrice Fontaine ---- -diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index 31ef1c6..eefc344 100644 ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -3,7 +3,7 @@ option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) - - if ( PYTHON_BINDINGS ) - # workaround for cmake bug #0013449 -- if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) -+ if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR NOT CMAKE_VERSION VERSION_LESS 3.0.0 ) - find_package ( SWIG ) - else () - find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig ) diff --git a/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch b/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch deleted file mode 100644 index c6c2b28c4..000000000 --- a/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 640c2b3c0c72d5194d422ff7dda086c4533fba00 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Mon, 13 Jan 2020 14:08:44 +0100 -Subject: [PATCH] CMake: reorder Python detection - -PythonInterp should be detected before PythonLibs otherwise -CMake exits with the following message: - -Could NOT find PythonLibs (missing: PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS) - -Signed-off-by: Yegor Yefremov ---- - python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index 90811ca..368bb7e 100644 ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -12,8 +12,8 @@ if ( PYTHON_BINDINGS ) - set ( SWIG_FOUND TRUE ) - endif () - endif () -- find_package ( PythonLibs ) - find_package ( PythonInterp ) -+ find_package ( PythonLibs ) - endif () - - if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) --- -2.17.0 - diff --git a/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch b/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch deleted file mode 100644 index bd13d24d2..000000000 --- a/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e12e592e982fe71b2761da0de7b19e93f67ed22c Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Tue, 6 Aug 2019 13:42:06 +0200 -Subject: [PATCH] swig: python: fix unresolved symbol issue - -GCC later than 5.x produce _fdti1.so file with an undefined -symbol str2charp_size due to C99 inline semantics change. So -remove this keyword. - -Signed-off-by: Yegor Yefremov -[Backport from upstream 3eca5150db07262c1c6eb737e12149201f631d47] ---- - python/ftdi1.i | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/ftdi1.i b/python/ftdi1.i -index 93793f8..0d150cb 100644 ---- a/python/ftdi1.i -+++ b/python/ftdi1.i -@@ -19,7 +19,7 @@ inline PyObject* charp2str(const char *v_, long len) - #endif - } - --inline char * str2charp_size(PyObject* pyObj, int * size) -+char * str2charp_size(PyObject* pyObj, int * size) - { - char * v_ = 0; - #if PY_MAJOR_VERSION >= 3 --- -2.17.0 - diff --git a/buildroot/package/libftdi1/libftdi1.hash b/buildroot/package/libftdi1/libftdi1.hash index f17543fa0..6b825e8d8 100644 --- a/buildroot/package/libftdi1/libftdi1.hash +++ b/buildroot/package/libftdi1/libftdi1.hash @@ -1,6 +1,6 @@ # Locally computed after checking the signature -# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2.sig -sha256 ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74 libftdi1-1.4.tar.bz2 +# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2.sig +sha256 7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049 libftdi1-1.5.tar.bz2 # Hash for license files: sha256 524f46428bf72bb8c6acfeca4909551fd2e0bdbb5305406d38382f4056095c56 LICENSE diff --git a/buildroot/package/libftdi1/libftdi1.mk b/buildroot/package/libftdi1/libftdi1.mk index 9c3bafdbc..6688694b4 100644 --- a/buildroot/package/libftdi1/libftdi1.mk +++ b/buildroot/package/libftdi1/libftdi1.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFTDI1_VERSION = 1.4 +LIBFTDI1_VERSION = 1.5 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_INSTALL_STAGING = YES diff --git a/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch b/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch new file mode 100644 index 000000000..79b2f8c65 --- /dev/null +++ b/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch @@ -0,0 +1,34 @@ +From 4ebb018e78b53a8afe0368e7cd7a17a67c52e3df Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Wed, 28 Oct 2020 19:20:35 -0700 +Subject: [PATCH] remove old uclibc hack + +This actually prevents sshfs linking to it as fuse_new becomes +unavailable. + +According to the git history, this seems to predate 2006. + +Signed-off-by: Rosen Penev +[Retrieved from: +https://github.com/libfuse/libfuse/commit/4ebb018e78b53a8afe0368e7cd7a17a67c52e3df] +Signed-off-by: Fabrice Fontaine +--- + lib/fuse_misc.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h +index a8b59617..f384aeab 100644 +--- a/lib/fuse_misc.h ++++ b/lib/fuse_misc.h +@@ -10,10 +10,9 @@ + + /* + Versioned symbols cannot be used in some cases because it +- - confuse the dynamic linker in uClibc + - not supported on MacOSX (in MachO binary format) + */ +-#if (!defined(__UCLIBC__) && !defined(__APPLE__)) ++#ifndef __APPLE__ + # if HAVE_SYMVER_ATTRIBUTE + # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2))) + # else diff --git a/buildroot/package/libfuse3/Config.in b/buildroot/package/libfuse3/Config.in new file mode 100644 index 000000000..584d3bf13 --- /dev/null +++ b/buildroot/package/libfuse3/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_LIBFUSE3 + bool "libfuse3" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + help + The reference implementation of the Linux FUSE + (Filesystem in Userspace) interface. + + https://github.com/libfuse/libfuse + +comment "libfuse3 needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/libfuse3/libfuse3.hash b/buildroot/package/libfuse3/libfuse3.hash new file mode 100644 index 000000000..4e03ba4a8 --- /dev/null +++ b/buildroot/package/libfuse3/libfuse3.hash @@ -0,0 +1,3 @@ +# Locally calculated sha256 checksums +sha256 52bbb52035f7eeaa54d139e21805d357f848f6e02ac956831d04988165a92c7b libfuse3-3.10.0.tar.gz +sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/buildroot/package/libfuse3/libfuse3.mk b/buildroot/package/libfuse3/libfuse3.mk new file mode 100644 index 000000000..f6d8dd0ab --- /dev/null +++ b/buildroot/package/libfuse3/libfuse3.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# libfuse3 +# +################################################################################ + +LIBFUSE3_VERSION = 3.10.0 +LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) +LIBFUSE3_LICENSE = LGPL-2.1 +LIBFUSE3_LICENSE_FILES = LICENSE +LIBFUSE3_INSTALL_STAGING = YES +LIBFUSE3_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBFUSE3_CONF_OPTS = \ + -Dexamples=false \ + -Dudevrulesdir=/lib/udev/rules.d \ + -Duseroot=false + +define LIBFUSE3_DEVICES + /dev/fuse c 666 0 0 10 229 0 0 - +endef + +define LIBFUSE3_PERMISSIONS + /usr/bin/fusermount3 f 4755 0 0 - - - - - +endef + +$(eval $(meson-package)) diff --git a/buildroot/package/libgcrypt/libgcrypt.hash b/buildroot/package/libgcrypt/libgcrypt.hash index 580bdf331..c8aae17c1 100644 --- a/buildroot/package/libgcrypt/libgcrypt.hash +++ b/buildroot/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000440.html -sha1 2d8781e92f88706707a1e76fb628b499ad538a30 libgcrypt-1.8.5.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2020q3/000445.html +sha1 406b02873833427898d16bcc8483bc5c91c73d4a libgcrypt-1.8.6.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 libgcrypt-1.8.5.tar.bz2 +sha256 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975 libgcrypt-1.8.6.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/buildroot/package/libgcrypt/libgcrypt.mk b/buildroot/package/libgcrypt/libgcrypt.mk index d21513bd3..b2c1ea3cb 100644 --- a/buildroot/package/libgcrypt/libgcrypt.mk +++ b/buildroot/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.8.5 +LIBGCRYPT_VERSION = 1.8.6 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB diff --git a/buildroot/package/libgee/libgee.hash b/buildroot/package/libgee/libgee.hash index e1861d514..c82651c68 100644 --- a/buildroot/package/libgee/libgee.hash +++ b/buildroot/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.2.sha256sum -sha256 9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c libgee-0.20.2.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.3.sha256sum +sha256 d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de libgee-0.20.3.tar.xz # Hash for license file: -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libgee/libgee.mk b/buildroot/package/libgee/libgee.mk index fa4c46e73..4b2581e17 100644 --- a/buildroot/package/libgee/libgee.mk +++ b/buildroot/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).2 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).3 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 @@ -13,4 +13,11 @@ LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBGEE_CONF_OPTS += --enable-introspection +LIBGEE_DEPENDENCIES += gobject-introspection +else +LIBGEE_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch b/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch deleted file mode 100644 index e2ce26e97..000000000 --- a/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2fbae8298d7cc976d7c0f329fc26dafe57fb0fc4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 1 Apr 2019 08:04:39 +0200 -Subject: [PATCH] Use pkg-config for libtiff detection - -Using pkg-config allows proper behavior in static-only contexts: the -libtiff library might depend on libz and libjpeg. - -Signed-off-by: Thomas Petazzoni -[Patch retrieved (and slightly updated) from: -https://git.buildroot.net/buildroot/tree/package/libgeotiff/0001-use-pkg-config.patch] -Signed-off-by: Fabrice Fontaine -[Retrieved (and slightly updated) from: -https://github.com/OSGeo/libgeotiff/commit/2fbae8298d7cc976d7c0f329fc26dafe57fb0fc4] ---- - libgeotiff/configure.ac | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa38af4..c3395d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -211,16 +211,18 @@ if test "$with_libtiff" != "" ; then - libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) - LIBS="$LIBS_SAVED" - else -- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([You will need to substantially rewrite libxtiff to -+ PKG_CHECK_MODULES(LIBTIFF, libtiff-4, -+ [TIFF_INC="$LIBTIFF_CFLAGS" LIBS="$LIBS $LIBTIFF_LIBS" TIFF_CONFIG="yes"], -+ [AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -+ AC_MSG_ERROR([You will need to substantially rewrite libxtiff to - build libgeotiff without libtiff]),-lm) -- LIBS_SAVED="$LIBS" -- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of -+ LIBS_SAVED="$LIBS" -+ AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -+ AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of - libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) -- LIBS="$LIBS -ltiff" -- TIFF_INC= -- TIFF_CONFIG="yes" -+ LIBS="$LIBS -ltiff" -+ TIFF_INC= -+ TIFF_CONFIG="yes"]) - fi - - diff --git a/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch b/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch deleted file mode 100644 index faf409cd5..000000000 --- a/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 33937e2861fda87dc314378bf87db2c766c37a6b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 9 Oct 2019 15:11:34 +0200 -Subject: [PATCH] configure.ac: use pkg-config to find proj dependency - -Use pkg-config to retrieve proj and its static dependencies such as --lstdc++ - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OSGeo/libgeotiff/pull/24] ---- - libgeotiff/configure.ac | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/libgeotiff/configure.ac -index c3395d5..f7a8f28 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -246,9 +246,12 @@ if test "x$with_proj" = "xno" ; then - else - - if test "x$with_proj" = "xyes" -o "x$with_proj" = "x"; then -- ORIG_LIBS="$LIBS" -- LIBS="-lproj $ORIG_LIBS" -- AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) -+ PKG_CHECK_MODULES(PROJ, proj, [LIBS="$LIBS $PROJ_LIBS" PROJ_FOUND=yes], [PROJ_FOUND=no]) -+ if test "$PROJ_FOUND" = "no"; then -+ ORIG_LIBS="$LIBS" -+ LIBS="-lproj $ORIG_LIBS" -+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) -+ fi - if test "$PROJ_FOUND" = "no"; then - AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) - if test "$PROJ_FOUND" = "yes"; then --- -2.23.0 - diff --git a/buildroot/package/libgeotiff/libgeotiff.hash b/buildroot/package/libgeotiff/libgeotiff.hash index 12d3b2a16..51adcc284 100644 --- a/buildroot/package/libgeotiff/libgeotiff.hash +++ b/buildroot/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c libgeotiff-1.5.1.tar.gz -sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE +sha256 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca libgeotiff-1.6.0.tar.gz +sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/buildroot/package/libgeotiff/libgeotiff.mk b/buildroot/package/libgeotiff/libgeotiff.mk index c196b804a..c6fb61b4a 100644 --- a/buildroot/package/libgeotiff/libgeotiff.mk +++ b/buildroot/package/libgeotiff/libgeotiff.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.5.1 +LIBGEOTIFF_VERSION = 1.6.0 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf LIBGEOTIFF_INSTALL_STAGING = YES -# We're patching configure.ac -LIBGEOTIFF_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ZLIB),y) LIBGEOTIFF_DEPENDENCIES += zlib diff --git a/buildroot/package/libgit2/Config.in b/buildroot/package/libgit2/Config.in index 53ba4d424..a6a9728ff 100644 --- a/buildroot/package/libgit2/Config.in +++ b/buildroot/package/libgit2/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBGIT2 bool "libgit2" + depends on !BR2_STATIC_LIBS # libhttpparser + select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_ZLIB help libgit2 is a portable, pure C implementation of the Git core @@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBGIT2 allowing to build Git functionality into your application. https://github.com/libgit2/libgit2 + +comment "libgit2 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libgit2/libgit2.hash b/buildroot/package/libgit2/libgit2.hash index d4912c032..367ade3af 100644 --- a/buildroot/package/libgit2/libgit2.hash +++ b/buildroot/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 libgit2-0.28.4.tar.gz -sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING +sha256 ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba libgit2-1.1.0.tar.gz +sha256 afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42 COPYING diff --git a/buildroot/package/libgit2/libgit2.mk b/buildroot/package/libgit2/libgit2.mk index 909fcb83f..30e6f2488 100644 --- a/buildroot/package/libgit2/libgit2.mk +++ b/buildroot/package/libgit2/libgit2.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGIT2_VERSION = 0.28.4 -LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception +LIBGIT2_VERSION = 1.1.0 +LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_INSTALL_STAGING = YES @@ -14,9 +14,11 @@ LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ + -DREGEX_BACKEND=regcomp \ + -DUSE_HTTP_PARSER=system \ -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) -LIBGIT2_DEPENDENCIES = zlib +LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use # it for iconv support. Note that USE_ICONV=ON is still correct even diff --git a/buildroot/package/libglew/libglew.mk b/buildroot/package/libglew/libglew.mk index 8a07170e9..fa2629256 100644 --- a/buildroot/package/libglew/libglew.mk +++ b/buildroot/package/libglew/libglew.mk @@ -15,6 +15,7 @@ LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu # using $TARGET_CONFIGURE_OPTS breaks compilation define LIBGLEW_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="/usr" LIBDIR="/usr/lib" \ AR="$(TARGET_AR)" CC="$(TARGET_CC)" \ LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \ @@ -23,12 +24,14 @@ endef define LIBGLEW_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \ $(TARGET_CONFIGURE_OPTS) install endef define LIBGLEW_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_NO_GLU="-DGLEW_NO_GLU" \ GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \ $(TARGET_CONFIGURE_OPTS) install endef diff --git a/buildroot/package/libglfw/Config.in b/buildroot/package/libglfw/Config.in index 045bd269e..06f437645 100644 --- a/buildroot/package/libglfw/Config.in +++ b/buildroot/package/libglfw/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBGLFW depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXRANDR help diff --git a/buildroot/package/libglfw/libglfw.hash b/buildroot/package/libglfw/libglfw.hash index 6796b8136..c21a595bb 100644 --- a/buildroot/package/libglfw/libglfw.hash +++ b/buildroot/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 81bf5fde487676a8af55cb317830703086bb534c53968d71936e7b48ee5a0f3e libglfw-3.3.tar.gz -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 LICENSE.md +sha256 98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537 libglfw-3.3.2.tar.gz +sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/buildroot/package/libglfw/libglfw.mk b/buildroot/package/libglfw/libglfw.mk index aac5b1799..63d2a88bf 100644 --- a/buildroot/package/libglfw/libglfw.mk +++ b/buildroot/package/libglfw/libglfw.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3 +LIBGLFW_VERSION = 3.3.2 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ - xlib_libXinerama xlib_libXrandr + xlib_libXi xlib_libXinerama xlib_libXrandr LIBGLFW_LICENSE = Zlib LIBGLFW_LICENSE_FILES = LICENSE.md @@ -17,10 +17,6 @@ LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_DOCS=OFF -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -LIBGLFW_DEPENDENCIES += xlib_libXi -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) LIBGLFW_DEPENDENCIES += xlib_libXxf86vm endif diff --git a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch index a47127524..9d2381bb3 100644 --- a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch @@ -18,7 +18,7 @@ diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7b..d09d029 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c -@@ -68,7 +68,7 @@ +@@ -73,7 +73,7 @@ #endif /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ diff --git a/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch b/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch index d6c62499c..c865c04e0 100644 --- a/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch +++ b/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch @@ -23,7 +23,7 @@ diff --git a/meson.build b/meson.build index 99806d0..3206603 100644 --- a/meson.build +++ b/meson.build -@@ -77,7 +77,7 @@ installed_tests_template = files('template.test.in') +@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in') installed_tests_template_tap = files('template-tap.test.in') # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) diff --git a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch index 77589e690..7e447a9ef 100644 --- a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch +++ b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.62.5', + version : '2.64.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1484,20 +1483,6 @@ if g_have_iso_c_varargs +@@ -1548,20 +1547,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2095,7 +2080,6 @@ subdir('gobject') +@@ -2167,7 +2152,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') @@ -79,7 +79,7 @@ diff --git a/tests/meson.build b/tests/meson.build index e4ea226..7fd974c 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -56,11 +56,6 @@ tests = { +@@ -55,11 +55,6 @@ tests = { 'source': 'module-test.c', 'c_args': ['-DMODULE_TYPE="plugin"'], }, diff --git a/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch index b76dd76f2..f792ceba3 100644 --- a/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -15,7 +15,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -366,6 +366,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -372,6 +372,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' '-Wno-cast-function-type', + '-Wno-format-nonliteral', # Due to function casts through (void*) we cannot support -Wpedantic: diff --git a/buildroot/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash index 0a60b75f8..55f0bb167 100644 --- a/buildroot/package/libglib2/libglib2.hash +++ b/buildroot/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.62/glib-2.62.5.sha256sum -sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e glib-2.62.5.tar.xz +# https://download.gnome.org/sources/glib/2.64/glib-2.64.4.sha256sum +sha256 f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50 glib-2.64.4.tar.xz # License files, locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk index 42b608fd7..6e9dbd7b2 100644 --- a/buildroot/package/libglib2/libglib2.mk +++ b/buildroot/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.62 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).5 +LIBGLIB2_VERSION_MAJOR = 2.64 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -85,10 +85,14 @@ endef endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) -LIBGLIB2_CONF_OPTS += -Dlibmount=true -LIBGLIB2_DEPENDENCIES += util-linux +LIBGLIB2_CONF_OPTS += -Dlibmount=enabled +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y) +LIBGLIB2_DEPENDENCIES += util-linux-libs else -LIBGLIB2_CONF_OPTS += -Dlibmount=false +LIBGLIB2_DEPENDENCIES += util-linux +endif +else +LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif # Purge useless binaries from target diff --git a/buildroot/package/libgpiod/Config.in b/buildroot/package/libgpiod/Config.in index 63a7cb6e7..293eef6c8 100644 --- a/buildroot/package/libgpiod/Config.in +++ b/buildroot/package/libgpiod/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGPIOD This is a C library that abstracts the GPIO character device operations on linux. - https://github.com/brgl/libgpiod + https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/ if BR2_PACKAGE_LIBGPIOD diff --git a/buildroot/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash index f0009a751..0ea15869b 100644 --- a/buildroot/package/libgpiod/libgpiod.hash +++ b/buildroot/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c libgpiod-1.4.1.tar.xz +sha256 a041b06907c956dd1c77836cccf4d392af29b9fe09c8ad18449a6da707b5ba2d libgpiod-1.4.5.tar.xz # Hash for license file -sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/buildroot/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk index 2474ab90a..83d5abb00 100644 --- a/buildroot/package/libgpiod/libgpiod.mk +++ b/buildroot/package/libgpiod/libgpiod.mk @@ -4,7 +4,9 @@ # ################################################################################ -LIBGPIOD_VERSION = 1.4.1 +# be careful when bumping versions, newer branches (e.g. >= 1.6) +# depend on pretty recent kernel headers +LIBGPIOD_VERSION = 1.4.5 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libgsasl/libgsasl.hash b/buildroot/package/libgsasl/libgsasl.hash index 82bfe339c..57fd98fc9 100644 --- a/buildroot/package/libgsasl/libgsasl.hash +++ b/buildroot/package/libgsasl/libgsasl.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -sha256 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 libgsasl-1.8.0.tar.gz +sha256 19e2f90525c531010918c50bb1febef0d7115d620150cc66153b9ce73ff814e6 libgsasl-1.8.1.tar.gz # Hash for license files: -sha256 4eb54155afd4684d7e9423f6037e5cc887ae4d8818e83d3af93350ebd4a8e6eb README -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 185b5b29a3febbfe1ab0b1ec6b1a26df630be97a17a99b5d305fdfff3344c117 README +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libgsasl/libgsasl.mk b/buildroot/package/libgsasl/libgsasl.mk index 9a625433e..40e7c4c91 100644 --- a/buildroot/package/libgsasl/libgsasl.mk +++ b/buildroot/package/libgsasl/libgsasl.mk @@ -4,13 +4,18 @@ # ################################################################################ -LIBGSASL_VERSION = 1.8.0 +LIBGSASL_VERSION = 1.8.1 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs) LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING LIBGSASL_INSTALL_STAGING = YES -# It doesn't seem to build with our libgcrypt so better be safe + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBGSASL_DEPENDENCIES += libgcrypt +else LIBGSASL_CONF_OPTS = --without-libgcrypt +endif ifeq ($(BR2_PACKAGE_LIBIDN),y) LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr diff --git a/buildroot/package/libgtk2/libgtk2.mk b/buildroot/package/libgtk2/libgtk2.mk index 710e6e47d..9b7d39a53 100644 --- a/buildroot/package/libgtk2/libgtk2.mk +++ b/buildroot/package/libgtk2/libgtk2.mk @@ -35,6 +35,13 @@ LIBGTK2_CONF_OPTS += \ LIBGTK2_DEPENDENCIES += \ fontconfig xlib_libX11 xlib_libXext xlib_libXrender +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBGTK2_CONF_OPTS += --enable-introspection +LIBGTK2_DEPENDENCIES += gobject-introspection +else +LIBGTK2_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) LIBGTK2_CONF_OPTS += --enable-xinerama LIBGTK2_DEPENDENCIES += xlib_libXinerama diff --git a/buildroot/package/libgtk3/Config.in b/buildroot/package/libgtk3/Config.in index 6b8f5abff..8a59fc31e 100644 --- a/buildroot/package/libgtk3/Config.in +++ b/buildroot/package/libgtk3/Config.in @@ -1,4 +1,5 @@ comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ @@ -13,6 +14,7 @@ comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" config BR2_PACKAGE_LIBGTK3 bool "libgtk3" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-libgtk3 -> host-librsvg depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 diff --git a/buildroot/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk index fc131132f..dbb975dbf 100644 --- a/buildroot/package/libgtk3/libgtk3.mk +++ b/buildroot/package/libgtk3/libgtk3.mk @@ -21,6 +21,7 @@ LIBGTK3_CONF_ENV = \ LIBGTK3_CONF_OPTS = \ --disable-glibtest \ --enable-explicit-deps=no +HOST_LIBGTK3_CONF_OPTS = --disable-introspection # Override pkg-config pkgdatadir variable, it needs the prefix LIBGTK3_MAKE_OPTS = \ @@ -41,6 +42,13 @@ else LIBGTK3_CONF_OPTS += --disable-x11-backend endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_DEPENDENCIES += gobject-introspection +else +LIBGTK3_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon LIBGTK3_CONF_OPTS += --enable-wayland-backend diff --git a/buildroot/package/libhdhomerun/libhdhomerun.hash b/buildroot/package/libhdhomerun/libhdhomerun.hash index 8b45486a1..adbe04137 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.hash +++ b/buildroot/package/libhdhomerun/libhdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9a60f663b00de5f820bdb85806662e25f22da248b14942e33a8b43a0331f855a libhdhomerun_20190621.tgz -sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE +sha256 a61038f0a78c5dcab3508927ba47ac6ec47840f3d42a2df2b02034cfd7400668 libhdhomerun_20200521.tgz +sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/buildroot/package/libhdhomerun/libhdhomerun.mk b/buildroot/package/libhdhomerun/libhdhomerun.mk index 8281b2462..7b3a232d1 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.mk +++ b/buildroot/package/libhdhomerun/libhdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHDHOMERUN_VERSION = 20190621 +LIBHDHOMERUN_VERSION = 20200521 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun LIBHDHOMERUN_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libhttpparser/libhttpparser.hash b/buildroot/package/libhttpparser/libhttpparser.hash index 4634b0662..6ab63e820 100644 --- a/buildroot/package/libhttpparser/libhttpparser.hash +++ b/buildroot/package/libhttpparser/libhttpparser.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8fa0ab8770fd8425a9b431fdbf91623c4d7a9cdb842b9339289bd2b0b01b0d3d libhttpparser-2.9.3.tar.gz -sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0 LICENSE-MIT +sha256 467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f libhttpparser-2.9.4.tar.gz +sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0 LICENSE-MIT diff --git a/buildroot/package/libhttpparser/libhttpparser.mk b/buildroot/package/libhttpparser/libhttpparser.mk index d7b690749..5cf7f7739 100644 --- a/buildroot/package/libhttpparser/libhttpparser.mk +++ b/buildroot/package/libhttpparser/libhttpparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = 2.9.3 +LIBHTTPPARSER_VERSION = 2.9.4 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,v$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT diff --git a/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch b/buildroot/package/libhttpserver/0001-Compatibility-with-libmicrohttpd-0.9.71.patch similarity index 69% rename from buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch rename to buildroot/package/libhttpserver/0001-Compatibility-with-libmicrohttpd-0.9.71.patch index 118b3df39..f982ee7a8 100644 --- a/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch +++ b/buildroot/package/libhttpserver/0001-Compatibility-with-libmicrohttpd-0.9.71.patch @@ -1,32 +1,33 @@ -From 056df008ecb8ab354191b7515199267eb6b84124 Mon Sep 17 00:00:00 2001 -From: bkuhls -Date: Mon, 6 Jul 2020 04:23:21 +0200 -Subject: [PATCH] Compatibility with libmicrohttpd 0.9.71 (#199) +From cfcd8a8f73aa337e8f45d287a79cd9b8e5c51dcd Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 5 Jul 2020 11:42:23 +0200 +Subject: [PATCH] Compatibility with libmicrohttpd 0.9.71 From the libmicrohttpd 0.9.71 release notes: -The release introduces an 'enum MHD_Result' instead of +Furthermore, the release introduces an 'enum MHD_Result' instead of +defines for MHD_YES/MHD_NO. This is intended to make it easier to check for certain API misuse bugs by providing better types (not everything is an 'int'). While this does NOT change the binary API, this change _will_ cause compiler warnings for all legacy code -- until 'int' is -replaced with 'enum MHD_Result'. +replaced with 'enum MHD_Result' -(cherry picked from commit 51b343c6b05dd13cbde0db04984fbf392e9f6df6) -[Peter: backported to 0.17.5] -Signed-off-by: Peter Korsgaard +Patch sent upstream: https://github.com/etr/libhttpserver/pull/199 + +Signed-off-by: Bernd Kuhls --- src/http_request.cpp | 6 +++--- src/httpserver/http_request.hpp | 6 +++--- src/httpserver/http_utils.hpp | 4 ++++ - src/httpserver/webserver.hpp | 16 ++++++++-------- - src/webserver.cpp | 24 ++++++++++++++---------- - 5 files changed, 32 insertions(+), 24 deletions(-) + src/httpserver/webserver.hpp | 14 +++++++------- + src/webserver.cpp | 22 +++++++++++++--------- + 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/http_request.cpp b/src/http_request.cpp -index 973ab33..37035b2 100644 +index 5703663..be342c7 100644 --- a/src/http_request.cpp +++ b/src/http_request.cpp -@@ -86,7 +86,7 @@ const std::string http_request::get_connection_value(const std::string& key, enu +@@ -88,7 +88,7 @@ const std::string http_request::get_connection_value(const std::string& key, enu return header_c; } @@ -35,7 +36,7 @@ index 973ab33..37035b2 100644 void *cls, enum MHD_ValueKind kind, const char *key, -@@ -187,7 +187,7 @@ const std::string http_request::get_querystring() const +@@ -189,7 +189,7 @@ const std::string http_request::get_querystring() const return querystring; } @@ -44,7 +45,7 @@ index 973ab33..37035b2 100644 void *cls, enum MHD_ValueKind kind, const char *key, -@@ -202,7 +202,7 @@ int http_request::build_request_args( +@@ -204,7 +204,7 @@ int http_request::build_request_args( return MHD_YES; } @@ -54,12 +55,12 @@ index 973ab33..37035b2 100644 enum MHD_ValueKind kind, const char *key, diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp -index 21f2176..6bd371c 100644 +index 139272b..62e5275 100644 --- a/src/httpserver/http_request.hpp +++ b/src/httpserver/http_request.hpp -@@ -304,15 +304,15 @@ class http_request +@@ -247,15 +247,15 @@ class http_request - unescaper_ptr unescaper; + unescaper_ptr unescaper = 0x0; - static int build_request_header(void *cls, enum MHD_ValueKind kind, + static MHD_Result build_request_header(void *cls, enum MHD_ValueKind kind, @@ -77,10 +78,10 @@ index 21f2176..6bd371c 100644 ); diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp -index bd3df17..cf18360 100644 +index 9ad89b4..a812197 100644 --- a/src/httpserver/http_utils.hpp +++ b/src/httpserver/http_utils.hpp -@@ -39,6 +39,10 @@ +@@ -53,6 +53,10 @@ #define DEFAULT_MASK_VALUE 0xFFFF @@ -92,10 +93,10 @@ index bd3df17..cf18360 100644 typedef void(*unescaper_ptr)(std::string&); diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp -index 2660c70..3c915a1 100644 +index 1ff472b..661b6ee 100644 --- a/src/httpserver/webserver.hpp +++ b/src/httpserver/webserver.hpp -@@ -201,14 +201,14 @@ class webserver +@@ -195,14 +195,14 @@ class webserver enum MHD_RequestTerminationCode toe ); @@ -112,23 +113,17 @@ index 2660c70..3c915a1 100644 ( void *cls, enum MHD_ValueKind kind, -@@ -225,30 +225,30 @@ class webserver +@@ -219,25 +219,25 @@ class webserver void **con_cls, int upgrade_socket ); -- int bodyless_requests_answer(MHD_Connection* connection, -+ MHD_Result bodyless_requests_answer(MHD_Connection* connection, - const char* method, const char* version, - struct details::modded_request* mr - ); - -- int bodyfull_requests_answer_first_step(MHD_Connection* connection, -+ MHD_Result bodyfull_requests_answer_first_step(MHD_Connection* connection, +- int requests_answer_first_step(MHD_Connection* connection, ++ MHD_Result requests_answer_first_step(MHD_Connection* connection, struct details::modded_request* mr ); -- int bodyfull_requests_answer_second_step(MHD_Connection* connection, -+ MHD_Result bodyfull_requests_answer_second_step(MHD_Connection* connection, +- int requests_answer_second_step(MHD_Connection* connection, ++ MHD_Result requests_answer_second_step(MHD_Connection* connection, const char* method, const char* version, const char* upload_data, size_t* upload_data_size, struct details::modded_request* mr ); @@ -150,10 +145,10 @@ index 2660c70..3c915a1 100644 ); friend void error_log(void* cls, const char* fmt, va_list ap); diff --git a/src/webserver.cpp b/src/webserver.cpp -index e71c364..ab6b530 100644 +index a3104e9..3340eb0 100644 --- a/src/webserver.cpp +++ b/src/webserver.cpp -@@ -61,6 +61,10 @@ +@@ -75,6 +75,10 @@ #define SOCK_CLOEXEC 02000000 #endif @@ -164,7 +159,7 @@ index e71c364..ab6b530 100644 using namespace std; namespace httpserver -@@ -68,7 +72,7 @@ namespace httpserver +@@ -82,7 +86,7 @@ namespace httpserver using namespace http; @@ -173,8 +168,8 @@ index e71c364..ab6b530 100644 void error_log(void*, const char*, va_list); void* uri_log(void*, const char*); void access_log(webserver*, string); -@@ -408,7 +412,7 @@ void webserver::disallow_ip(const string& ip) - this->allowances.erase(ip); +@@ -421,7 +425,7 @@ void webserver::disallow_ip(const string& ip) + allowances.erase(ip); } -int policy_callback (void *cls, const struct sockaddr* addr, socklen_t addrlen) @@ -182,7 +177,7 @@ index e71c364..ab6b530 100644 { if(!(static_cast(cls))->ban_system_enabled) return MHD_YES; -@@ -455,7 +459,7 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s) +@@ -468,7 +472,7 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s) return std::string(s).size(); } @@ -191,34 +186,25 @@ index e71c364..ab6b530 100644 const char *key, const char *filename, const char *content_type, -@@ -509,7 +513,7 @@ const std::shared_ptr webserver::internal_error_page(details::mod +@@ -522,7 +526,7 @@ const std::shared_ptr webserver::internal_error_page(details::mod } } --int webserver::bodyless_requests_answer( -+MHD_Result webserver::bodyless_requests_answer( - MHD_Connection* connection, const char* method, - const char* version, struct details::modded_request* mr - ) -@@ -519,7 +523,7 @@ int webserver::bodyless_requests_answer( - return complete_request(connection, mr, version, method); - } - --int webserver::bodyfull_requests_answer_first_step( -+MHD_Result webserver::bodyfull_requests_answer_first_step( +-int webserver::requests_answer_first_step( ++MHD_Result webserver::requests_answer_first_step( MHD_Connection* connection, struct details::modded_request* mr ) -@@ -565,7 +569,7 @@ int webserver::bodyfull_requests_answer_first_step( +@@ -574,7 +578,7 @@ int webserver::requests_answer_first_step( return MHD_YES; } --int webserver::bodyfull_requests_answer_second_step( -+MHD_Result webserver::bodyfull_requests_answer_second_step( +-int webserver::requests_answer_second_step( ++MHD_Result webserver::requests_answer_second_step( MHD_Connection* connection, const char* method, const char* version, const char* upload_data, size_t* upload_data_size, struct details::modded_request* mr -@@ -583,7 +587,7 @@ int webserver::bodyfull_requests_answer_second_step( +@@ -597,7 +601,7 @@ int webserver::requests_answer_second_step( return MHD_YES; } @@ -227,7 +213,7 @@ index e71c364..ab6b530 100644 MHD_Connection* connection, struct details::modded_request* mr, const char* method -@@ -717,10 +721,10 @@ int webserver::finalize_answer( +@@ -731,10 +735,10 @@ int webserver::finalize_answer( mr->dhrs->decorate_response(raw_response); to_ret = mr->dhrs->enqueue_response(connection, raw_response); MHD_destroy_response(raw_response); @@ -240,7 +226,7 @@ index e71c364..ab6b530 100644 MHD_Connection* connection, struct details::modded_request* mr, const char* version, -@@ -736,7 +740,7 @@ int webserver::complete_request( +@@ -750,7 +754,7 @@ int webserver::complete_request( return finalize_answer(connection, mr, method); } @@ -250,5 +236,5 @@ index e71c364..ab6b530 100644 const char* version, const char* upload_data, size_t* upload_data_size, void** con_cls -- -2.20.1 +2.26.2 diff --git a/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch b/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch deleted file mode 100644 index 74ca58bb3..000000000 --- a/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2bc7cf0beb6b8a124c1c7360c4fb5279e8763f07 Mon Sep 17 00:00:00 2001 -From: Sebastiano Merlino -Date: Sat, 8 Jun 2019 15:36:06 -0700 -Subject: [PATCH] Fix lib expectations in libhttpserver.pc.in - -Signed-off-by: Stephan Hoffmann ---- -Patch status: upstream commit 458d16b922304006fe418897044e14 - - libhttpserver.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libhttpserver.pc.in b/libhttpserver.pc.in -index 36355ee..55f7c0e 100644 ---- a/libhttpserver.pc.in -+++ b/libhttpserver.pc.in -@@ -8,6 +8,6 @@ Description: A C++ library for creating an embedded Rest HTTP server - Version: @VERSION@ - Requires: libmicrohttpd >= 0.9.37 - Conflicts: --Libs: -L${libdir} -lmicrohttpd -+Libs: -L${libdir} -lhttpserver - Libs.private: @LHT_LIBDEPS@ - Cflags: -I${includedir} -I${includedir}/httpserver --- -2.17.1 - diff --git a/buildroot/package/libhttpserver/Config.in b/buildroot/package/libhttpserver/Config.in index 03715d056..dcdf30566 100644 --- a/buildroot/package/libhttpserver/Config.in +++ b/buildroot/package/libhttpserver/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBHTTPSERVER bool "libhttpserver" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 PR59526 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD @@ -11,5 +12,6 @@ config BR2_PACKAGE_LIBHTTPSERVER https://github.com/etr/libhttpserver -comment "libhttpserver needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/buildroot/package/libhttpserver/libhttpserver.hash b/buildroot/package/libhttpserver/libhttpserver.hash index 0333aabba..038e9f6b7 100644 --- a/buildroot/package/libhttpserver/libhttpserver.hash +++ b/buildroot/package/libhttpserver/libhttpserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER +sha256 c830cb40b448a44cfc9000713aefff15d4ab1f6ebd6b47280a3cb64cb020f326 libhttpserver-0.18.1.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/buildroot/package/libhttpserver/libhttpserver.mk b/buildroot/package/libhttpserver/libhttpserver.mk index 2c536cf01..37943bc49 100644 --- a/buildroot/package/libhttpserver/libhttpserver.mk +++ b/buildroot/package/libhttpserver/libhttpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPSERVER_VERSION = 0.17.5 +LIBHTTPSERVER_VERSION = 0.18.1 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) LIBHTTPSERVER_LICENSE = LGPL-2.1+ LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER diff --git a/buildroot/package/libiberty/libiberty.hash b/buildroot/package/libiberty/libiberty.hash new file mode 100644 index 000000000..0dafcea52 --- /dev/null +++ b/buildroot/package/libiberty/libiberty.hash @@ -0,0 +1,5 @@ +# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum +sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz + +# Locally computed, same as binutils.hash +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/buildroot/package/libiberty/libiberty.mk b/buildroot/package/libiberty/libiberty.mk new file mode 100644 index 000000000..6235a8b95 --- /dev/null +++ b/buildroot/package/libiberty/libiberty.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# libiberty +# +################################################################################ + +LIBIBERTY_VERSION = 2.32 +LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz +LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils +HOST_LIBIBERTY_DL_SUBDIR = binutils + +# We're only building libiberty here, not the full binutils suite +LIBIBERTY_LICENSE = LGPL-2.1+ +LIBIBERTY_LICENSE_FILES = COPYING.LIB + +LIBIBERTY_SUBDIR = libiberty + +# We explicitly disable multilib, as we do in binutils. +# By default, libiberty installs nothing, so we must force it. +HOST_LIBIBERTY_CONF_OPTS = \ + --disable-multilib \ + --enable-install-libiberty + +# Some packages (e.g. host-gdb) will pick this library and build shared +# objects with it. But libiberty does not honour the --enable-shared and +# --disable-static flags; it only ever builds a static library no matter +# what. So we must force -fPIC in build flags. +HOST_LIBIBERTY_CONF_ENV = \ + CFLAGS="$(HOST_CFLAGS) -fPIC" \ + LDFLAGS="$(HOST_LDFLAGS) -fPIC" + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libidn/libidn.hash b/buildroot/package/libidn/libidn.hash index f5ba311e9..0255a6395 100644 --- a/buildroot/package/libidn/libidn.hash +++ b/buildroot/package/libidn/libidn.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e libidn-1.35.tar.gz +sha256 14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038 libidn-1.36.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 diff --git a/buildroot/package/libidn/libidn.mk b/buildroot/package/libidn/libidn.mk index 601edcb57..2df343702 100644 --- a/buildroot/package/libidn/libidn.mk +++ b/buildroot/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN_VERSION = 1.35 +LIBIDN_VERSION = 1.36 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true diff --git a/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch b/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch deleted file mode 100644 index a02bb6055..000000000 --- a/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5090603d01779bb1717fb0c50953330e8770550f Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier -Date: Sun, 23 Jun 2019 14:11:37 +0200 -Subject: [PATCH] fix install of binaries with a static only library - -Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the -following issue occured: - -CMake Error at iiod/cmake_install.cmake:45 (file): - file RPATH_CHANGE could not write new RPATH: - - /usr/lib - - to the file: - - /home/pjtexier//usr/sbin/iiod - - No valid ELF RPATH or RUNPATH entry exists in the file; File does not have - a valid ELF identification. -Call Stack (most recent call first): - cmake_install.cmake:50 (include) - -Signed-off-by: Pierre-Jean Texier -[Upstream status: https://github.com/analogdevicesinc/libiio/pull/283] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9b7ea1..634e553 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,7 +15,7 @@ endif() - - set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)") - include(GNUInstallDirs) --if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - endif() --- -2.7.4 - diff --git a/buildroot/package/libiio/libiio.hash b/buildroot/package/libiio/libiio.hash index 34c314427..dd85ffa69 100644 --- a/buildroot/package/libiio/libiio.hash +++ b/buildroot/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc2c5299974b65cfe9aa4a06d8c74d7651594e026bce416db48a2c5aa7ba2554 libiio-0.18.tar.gz +sha256 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d libiio-0.19.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/buildroot/package/libiio/libiio.mk b/buildroot/package/libiio/libiio.mk index 8c8f79bd7..af5b27ba5 100644 --- a/buildroot/package/libiio/libiio.mk +++ b/buildroot/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.18 +LIBIIO_VERSION = 0.19 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ @@ -72,7 +72,6 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP),y) define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET - rm $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll.mdb $(HOST_DIR)/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \ $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll endef diff --git a/buildroot/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash index 0edbca508..79bfc5d98 100644 --- a/buildroot/package/libinput/libinput.hash +++ b/buildroot/package/libinput/libinput.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-April/041400.html -md5 c9a1b15bb932eaf22f840efe4c3f84eb libinput-1.15.5.tar.xz -sha1 644b1c6936cfff8a4547da71fbcd7ebd28618426 libinput-1.15.5.tar.xz -sha256 a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97 libinput-1.15.5.tar.xz -sha512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a libinput-1.15.5.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-November/041644.html +md5 562614e91c10c75ab1c2b71e5d27f076 libinput-1.16.3.tar.xz +sha1 ee1e93ee647bdd4598a5910eb654592563657d66 libinput-1.16.3.tar.xz +sha256 dc5e1ae51ec1cc635ca96f61118b0f07dfea783cab0747a60f3555068bb077e4 libinput-1.16.3.tar.xz +sha512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39 libinput-1.16.3.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/buildroot/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk index bf58e7082..e5578a392 100644 --- a/buildroot/package/libinput/libinput.mk +++ b/buildroot/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.15.5 +LIBINPUT_VERSION = 1.16.3 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/buildroot/package/libite/libite.hash b/buildroot/package/libite/libite.hash index db3f6232b..1a553d2bc 100644 --- a/buildroot/package/libite/libite.hash +++ b/buildroot/package/libite/libite.hash @@ -1,7 +1,8 @@ -# From https://github.com/troglobit/libite/releases/download/v2.1.0/libite-2.1.0.tar.xz.md5 -md5 701aa509f27ee35156bc53601e69fa74 libite-2.1.0.tar.xz +# From https://github.com/troglobit/libite/releases/download/v2.2.0/libite-2.2.0.tar.xz.md5 +md5 8533ab27d0d4a7c745f11925907795a9 libite-2.2.0.tar.xz + # Locally calculated -sha256 cf56e720146243749e0af5763d4a84eef738e20f2bef2d867497fefc39dee991 libite-2.1.0.tar.xz -sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE -sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 src/chomp.c -sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c +sha256 3fdeb48ea3d9220f91111ed7a68e1e68edfc70346d0108a49bab73a47a7dd761 libite-2.2.0.tar.xz +sha256 a8a7506c64ce46a58c17838b0f678f8c2567d71869402f97d19460ddec4882f5 LICENSE +sha256 89053891d46d04a21d4a492f68038703e179986baffa458201810f4222b57427 src/chomp.c +sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c diff --git a/buildroot/package/libite/libite.mk b/buildroot/package/libite/libite.mk index c598da1b4..69a90d718 100644 --- a/buildroot/package/libite/libite.mk +++ b/buildroot/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = 2.1.0 +LIBITE_VERSION = 2.2.0 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause diff --git a/buildroot/package/libkrb5/libkrb5.hash b/buildroot/package/libkrb5/libkrb5.hash index aa7c3a377..658c4539f 100644 --- a/buildroot/package/libkrb5/libkrb5.hash +++ b/buildroot/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5 krb5-1.17.tar.gz +sha256 02a4e700f10936f937cd1a4c303cab8687a11abecc6107bd4b706b9329cd5400 krb5-1.18.1.tar.gz # Hash for license file: -sha256 5149ea464bde245388d313309539e142156d371788ae57bbd4feb223757f6da1 NOTICE +sha256 b7a5f14a8719bce5e49a761998aa55438fc890fb40f71228d6a49546f6d5690d NOTICE diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk index 44a20b370..f7cd677de 100644 --- a/buildroot/package/libkrb5/libkrb5.mk +++ b/buildroot/package/libkrb5/libkrb5.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.17 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR) +LIBKRB5_VERSION_MAJOR = 1.18 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src diff --git a/buildroot/package/liblo/liblo.hash b/buildroot/package/liblo/liblo.hash index 049ab8074..a3d34d796 100644 --- a/buildroot/package/liblo/liblo.hash +++ b/buildroot/package/liblo/liblo.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.30/ -sha1 152a3260d186f111a71508dc0ed709984960f130 liblo-0.30.tar.gz -md5 fa1a9d45f86fc18fb54019f670ff2262 liblo-0.30.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.31/ +sha1 d188a62df51e29fa98861daec1db0fdae400410d liblo-0.31.tar.gz +md5 14378c1e74c58e777fbb4fcf33ac5315 liblo-0.31.tar.gz # Locally computed -sha256 30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b liblo-0.30.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750 liblo-0.31.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/liblo/liblo.mk b/buildroot/package/liblo/liblo.mk index 69918186d..27dba1f99 100644 --- a/buildroot/package/liblo/liblo.mk +++ b/buildroot/package/liblo/liblo.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLO_VERSION = 0.30 +LIBLO_VERSION = 0.31 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libmatroska/libmatroska.hash b/buildroot/package/libmatroska/libmatroska.hash index 827f08921..4c3d754f8 100644 --- a/buildroot/package/libmatroska/libmatroska.hash +++ b/buildroot/package/libmatroska/libmatroska.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0ac6debfbf781d47f001b830aaf9be9dfbcefd13bcfb80ca5efc1c04b4a3c962 libmatroska-1.5.2.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL +sha256 bc4479aa8422ab07643df6a1fa5a19e4bed4badfd41ca77e081628620d1e1990 libmatroska-1.6.2.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/buildroot/package/libmatroska/libmatroska.mk b/buildroot/package/libmatroska/libmatroska.mk index 7b7c5f03e..61222c2bf 100644 --- a/buildroot/package/libmatroska/libmatroska.mk +++ b/buildroot/package/libmatroska/libmatroska.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMATROSKA_VERSION = 1.5.2 +LIBMATROSKA_VERSION = 1.6.2 LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.xz LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska LIBMATROSKA_INSTALL_STAGING = YES diff --git a/buildroot/package/libmaxminddb/libmaxminddb.hash b/buildroot/package/libmaxminddb/libmaxminddb.hash index a3ca682c2..b83a8d133 100644 --- a/buildroot/package/libmaxminddb/libmaxminddb.hash +++ b/buildroot/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dd582aa971be23dee960ec33c67fb5fd38affba508e6f00ea75959dbd5aad156 libmaxminddb-1.4.2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 a5fdf6c7b4880fdc7620f8ace5bd5cbe9f65650c9493034b5b9fc7d83551a439 libmaxminddb-1.4.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/libmaxminddb/libmaxminddb.mk b/buildroot/package/libmaxminddb/libmaxminddb.mk index 18e2eaee7..eb28c99a4 100644 --- a/buildroot/package/libmaxminddb/libmaxminddb.mk +++ b/buildroot/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.4.2 +LIBMAXMINDDB_VERSION = 1.4.3 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES diff --git a/buildroot/package/libmbim/libmbim.hash b/buildroot/package/libmbim/libmbim.hash index bbf2c63af..7ce1a2e7a 100644 --- a/buildroot/package/libmbim/libmbim.hash +++ b/buildroot/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8 libmbim-1.20.4.tar.xz +sha256 dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285 libmbim-1.24.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/libmbim/libmbim.mk b/buildroot/package/libmbim/libmbim.mk index dc5c9a59d..05345623b 100644 --- a/buildroot/package/libmbim/libmbim.mk +++ b/buildroot/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.20.4 +LIBMBIM_VERSION = 1.24.4 LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) diff --git a/buildroot/package/libmediaart/libmediaart.mk b/buildroot/package/libmediaart/libmediaart.mk index a81542ac6..0d110a43e 100644 --- a/buildroot/package/libmediaart/libmediaart.mk +++ b/buildroot/package/libmediaart/libmediaart.mk @@ -22,9 +22,7 @@ LIBMEDIAART_CONF_OPTS += \ --disable-qt else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y) # qt5 needs c++11 (since qt-5.7) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif LIBMEDIAART_DEPENDENCIES += qt5base LIBMEDIAART_CONF_OPTS += \ --disable-gdkpixbuf \ @@ -35,4 +33,11 @@ LIBMEDIAART_CONF_OPTS += \ --disable-qt endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBMEDIAART_CONF_OPTS += --enable-introspection +LIBMEDIAART_DEPENDENCIES += gobject-introspection +else +LIBMEDIAART_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/libmicrohttpd/Config.in b/buildroot/package/libmicrohttpd/Config.in index 7f3c9bb8f..8477ef666 100644 --- a/buildroot/package/libmicrohttpd/Config.in +++ b/buildroot/package/libmicrohttpd/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBMICROHTTPD bool "libmicrohttpd" - depends on BR2_TOOLCHAIN_HAS_THREADS help GNU libmicrohttpd is a small C library that makes it easy to run an HTTP server as part of another application. @@ -21,6 +20,3 @@ comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS endif - -comment "libmicrohttpd needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index 4d4b1ae1a..4cb9dbcbf 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -22,4 +22,10 @@ LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos LIBMICROHTTPD_CONF_OPTS += --disable-https endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBMICROHTTPD_CONF_OPTS += --with-threads=auto +else +LIBMICROHTTPD_CONF_OPTS += --with-threads=none +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/libminiupnpc/libminiupnpc.hash b/buildroot/package/libminiupnpc/libminiupnpc.hash index 556d8cc45..758ea29f5 100644 --- a/buildroot/package/libminiupnpc/libminiupnpc.hash +++ b/buildroot/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e19fb5e01ea5a707e2a8cb96f537fbd9f3a913d53d804a3265e3aeab3d2064c6 miniupnpc-2.1.tar.gz -sha256 e2df21b3d4b1a84a0ac31d808a3ff330fdf3602e0839a526d3df2fcfba287ac4 LICENSE +sha256 69f72fe355f911b807915f78dcfc0af772c0f22bc7ab1157e70f334e37db7d39 miniupnpc-2.1.20201016.tar.gz +sha256 0b476c395af6dd21eeb54c40a21d22e1c11a751fbd2dd17a41ce26e370be88d5 LICENSE diff --git a/buildroot/package/libminiupnpc/libminiupnpc.mk b/buildroot/package/libminiupnpc/libminiupnpc.mk index 5a4c8fc69..50b3c6604 100644 --- a/buildroot/package/libminiupnpc/libminiupnpc.mk +++ b/buildroot/package/libminiupnpc/libminiupnpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.1 +LIBMINIUPNPC_VERSION = 2.1.20201016 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES diff --git a/buildroot/package/libmpdclient/libmpdclient.hash b/buildroot/package/libmpdclient/libmpdclient.hash index e4456f125..882a588a8 100644 --- a/buildroot/package/libmpdclient/libmpdclient.hash +++ b/buildroot/package/libmpdclient/libmpdclient.hash @@ -1,3 +1,3 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.18.tar.xz.sig, sha256 locally computed -sha256 4cb01e1f567e0169aca94875fb6e1200e7f5ce35b63a4df768ec1591fb1081fa libmpdclient-2.18.tar.xz +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz.sig, sha256 locally computed +sha256 158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189 libmpdclient-2.19.tar.xz sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING diff --git a/buildroot/package/libmpdclient/libmpdclient.mk b/buildroot/package/libmpdclient/libmpdclient.mk index 6e7c5a45a..a880980a3 100644 --- a/buildroot/package/libmpdclient/libmpdclient.mk +++ b/buildroot/package/libmpdclient/libmpdclient.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).18 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).19 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) LIBMPDCLIENT_INSTALL_STAGING = YES diff --git a/buildroot/package/libnetconf2/libnetconf2.hash b/buildroot/package/libnetconf2/libnetconf2.hash index 5cd9b9906..489188daf 100644 --- a/buildroot/package/libnetconf2/libnetconf2.hash +++ b/buildroot/package/libnetconf2/libnetconf2.hash @@ -1,2 +1,3 @@ -sha256 38e780cdd0135e9c7fe44b5190a1acc8c33cb28aa395c329893b019a57b1f783 libnetconf2-1.1.3.tar.gz -sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE +# Locally calculated +sha256 2ce2b819f3544fd46a3a4c8ba6dd0a3798cab2a63aa347bc1eb5275a2c89b7bd libnetconf2-1.1.26.tar.gz +sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/buildroot/package/libnetconf2/libnetconf2.mk b/buildroot/package/libnetconf2/libnetconf2.mk index bd25c69e0..1b692550d 100644 --- a/buildroot/package/libnetconf2/libnetconf2.mk +++ b/buildroot/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 1.1.3 +LIBNETCONF2_VERSION = 1.1.26 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index dd236cd3d..19520aa3f 100644 --- a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.tar.bz2.sha256sum -sha256 33685351e29dff93cc21f5344b6e628e41e32b9f9e567f4bec0478eb41f989b6 libnetfilter_conntrack-1.0.7.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum +sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 40b74fe92..8beefefb5 100644 --- a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.7 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES diff --git a/buildroot/package/libnetfilter_queue/libnetfilter_queue.hash b/buildroot/package/libnetfilter_queue/libnetfilter_queue.hash index 1425d41b3..098205c9d 100644 --- a/buildroot/package/libnetfilter_queue/libnetfilter_queue.hash +++ b/buildroot/package/libnetfilter_queue/libnetfilter_queue.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.3.tar.bz2.{md5sum,sha1sum} -md5 700ce0ae4784257ab5abe6fd1802f366 libnetfilter_queue-1.0.3.tar.bz2 -sha1 3d182e3211b633d0a0f8a2b12ef80dc2621f53cb libnetfilter_queue-1.0.2.tar.bz2 +# From http://netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.5.tar.bz2.sha256sum +sha256 f9ff3c11305d6e03d81405957bdc11aea18e0d315c3e3f48da53a24ba251b9f5 libnetfilter_queue-1.0.5.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk b/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk index 302f9a257..2bb4dd376 100644 --- a/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk +++ b/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_QUEUE_VERSION = 1.0.3 +LIBNETFILTER_QUEUE_VERSION = 1.0.5 LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2 LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files LIBNETFILTER_QUEUE_INSTALL_STAGING = YES diff --git a/buildroot/package/libnfc/0001-autotools-make-example-build-optional.patch b/buildroot/package/libnfc/0001-autotools-make-example-build-optional.patch new file mode 100644 index 000000000..ce01de74a --- /dev/null +++ b/buildroot/package/libnfc/0001-autotools-make-example-build-optional.patch @@ -0,0 +1,69 @@ +From 874d9605aa9cd028aed149c2dd1bb410856477fb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jun 2020 23:28:37 +0200 +Subject: [PATCH] autotools: make example build optional + +This patch makes example build optional for autotools build system. + +In order to keep the former behavior, example build is enabled by default. + +Signed-off-by: Samuel Martin +[Retrieved (and slightly updated to remove CMakeLists.txt) from: +https://git.buildroot.net/buildroot/tree/package/libnfc/0001-build-systems-make-example-build-optional.patch] +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/nfc-tools/libnfc/commit/874d9605aa9cd028aed149c2dd1bb410856477fb] +--- + Makefile.am | 8 +++++++- + configure.ac | 11 +++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d2f6fc8e..516ebee2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4 + + AM_CFLAGS = $(LIBNFC_CFLAGS) + +-SUBDIRS = libnfc utils examples include contrib cmake test ++SUBDIRS = libnfc utils ++ ++if EXAMPLE_ENABLED ++SUBDIRS += examples ++endif ++ ++SUBDIRS += include contrib cmake test + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnfc.pc +diff --git a/configure.ac b/configure.ac +index 280a6d08..46b65d33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,6 +157,14 @@ then + fi + AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes]) + ++# Example build (default: yes) ++AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"]) ++ ++AC_MSG_CHECKING(for example build) ++AC_MSG_RESULT($enable_example) ++ ++AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes]) ++ + # Dependencies + PKG_CONFIG_REQUIRES="" + +@@ -175,7 +183,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then + fi + AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"]) + ++if test x"$enable_example" = "xyes" ++then + AC_CHECK_READLINE ++fi + + # Help us to write great code ;-) + CFLAGS="$CFLAGS -Wall -pedantic -Wextra" diff --git a/buildroot/package/libnfc/0001-build-systems-make-example-build-optional.patch b/buildroot/package/libnfc/0001-build-systems-make-example-build-optional.patch deleted file mode 100644 index 06577c58e..000000000 --- a/buildroot/package/libnfc/0001-build-systems-make-example-build-optional.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 40a4871b171293d98acb40cf54be9ee9b78a3244 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Wed, 6 Jun 2012 00:49:25 +0200 -Subject: [PATCH 1/1] build systems: make example build optional - -This patch makes example build optional for both cmake and autotools build -systems. - -In order to keep the former behavior, example build is enabled by default. - -Signed-off-by: Samuel Martin - -diff -Nurp a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-12-08 18:51:01.000000000 +0000 -+++ b/CMakeLists.txt 2014-01-08 12:51:42.435096403 +0000 -@@ -39,6 +39,7 @@ IF(LIBNFC_ENVVARS) - ADD_DEFINITIONS(-DENVVARS) - ENDIF(LIBNFC_ENVVARS) - -+SET(BUILD_EXAMPLES ON CACHE BOOL "Build examples") - SET(LIBNFC_DEBUG_MODE OFF CACHE BOOL "Debug mode") - IF(LIBNFC_DEBUG_MODE) - ADD_DEFINITIONS(-DDEBUG) -@@ -155,7 +156,10 @@ ENDIF(WIN32) - ADD_SUBDIRECTORY(libnfc) - ADD_SUBDIRECTORY(include) - ADD_SUBDIRECTORY(utils) --ADD_SUBDIRECTORY(examples) -+ -+IF(BUILD_EXAMPLES) -+ ADD_SUBDIRECTORY(examples) -+ENDIF(BUILD_EXAMPLES) - - # Binary Package - IF(WIN32) -diff -Nurp a/Makefile.am b/Makefile.am ---- a/Makefile.am 2013-12-08 18:51:01.000000000 +0000 -+++ b/Makefile.am 2014-01-08 12:52:12.807018593 +0000 -@@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4 - - AM_CFLAGS = $(LIBNFC_CFLAGS) - --SUBDIRS = libnfc utils examples include contrib cmake test -+SUBDIRS = libnfc utils -+ -+if EXAMPLE_ENABLED -+SUBDIRS += examples -+endif -+ -+SUBDIRS += include contrib cmake test - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libnfc.pc -diff -Nurp a/configure.ac b/configure.ac ---- a/configure.ac 2013-12-08 18:51:01.000000000 +0000 -+++ b/configure.ac 2014-01-08 12:53:02.054872564 +0000 -@@ -142,6 +142,14 @@ then - fi - AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes]) - -+# Example build (default: yes) -+AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"]) -+ -+AC_MSG_CHECKING(for example build) -+AC_MSG_RESULT($enable_example) -+ -+AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes]) -+ - # Dependencies - PKG_CONFIG_REQUIRES="" - -@@ -160,7 +168,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ - fi - AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"]) - -+if test x"$enable_example" = "xyes" -+then - AC_CHECK_READLINE -+fi - - # Help us to write great code ;-) - CFLAGS="$CFLAGS -Wall -pedantic -Wextra" diff --git a/buildroot/package/libnfc/libnfc.hash b/buildroot/package/libnfc/libnfc.hash index 32decf2d0..8a346cbfc 100644 --- a/buildroot/package/libnfc/libnfc.hash +++ b/buildroot/package/libnfc/libnfc.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 libnfc-1.7.1.tar.bz2 -sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING +sha256 6d9ad31c86408711f0a60f05b1933101c7497683c2e0d8917d1611a3feba3dd5 libnfc-1.8.0.tar.bz2 +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING diff --git a/buildroot/package/libnfc/libnfc.mk b/buildroot/package/libnfc/libnfc.mk index ca8700484..197156333 100644 --- a/buildroot/package/libnfc/libnfc.mk +++ b/buildroot/package/libnfc/libnfc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFC_VERSION = 1.7.1 +LIBNFC_VERSION = 1.8.0 LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2 LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION) LIBNFC_LICENSE = LGPL-3.0+ diff --git a/buildroot/package/libnftnl/libnftnl.hash b/buildroot/package/libnftnl/libnftnl.hash index 4d2eb0ef0..f22b02af0 100644 --- a/buildroot/package/libnftnl/libnftnl.hash +++ b/buildroot/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3 libnftnl-1.1.5.tar.bz2 -sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING +sha256 20dbc13f11004aea2c9e479cfb90359cb11fe3446c3140811c18e4ec1648ed8f libnftnl-1.1.7.tar.bz2 +sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/buildroot/package/libnftnl/libnftnl.mk b/buildroot/package/libnftnl/libnftnl.mk index ac780bd8d..f4487bdeb 100644 --- a/buildroot/package/libnftnl/libnftnl.mk +++ b/buildroot/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.1.5 +LIBNFTNL_VERSION = 1.1.7 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ diff --git a/buildroot/package/libnids/0001-libpcap-use-pkg-config.patch b/buildroot/package/libnids/0001-libpcap-use-pkg-config.patch new file mode 100644 index 000000000..8f8df478d --- /dev/null +++ b/buildroot/package/libnids/0001-libpcap-use-pkg-config.patch @@ -0,0 +1,48 @@ +configure.in: use pkg-config for libpcap detection + +The detection of libpcap was based in ${prefix}, which doesn't make +sense in a cross-compilation context and can cause host leakage into +the target build. + +So instead, let's use pkg-config to detect libpcap, since it is anyway +already use in this configure.in to detect libglib. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -75,25 +75,13 @@ + fi + ;; + esac ], +-[ if test -f ${prefix}/include/pcap.h; then +- PCAP_CFLAGS="-I${prefix}/include" +- PCAPLIB="-L${exec_prefix}/lib -lpcap" +- elif test -f /usr/include/pcap/pcap.h; then +- PCAP_CFLAGS="-I/usr/include/pcap" +- PCAPLIB="-lpcap" +- else +- TMP=$LIBS +- LIBS="-lpcap $LIBS" +- AC_TRY_LINK([#include ], pcap_open_offline("",""), +- LIBPCAP_FOUND=1,LIBPCAP_FOUND=0) +- LIBS=$TMP +- if test $LIBPCAP_FOUND = 1 ; then +- PCAPLIB="-lpcap" +- else +- AC_ERROR(libpcap not found) +- fi +- fi +- AC_MSG_RESULT(yes) ] ++[ ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(LIBPCAP, libpcap) ++ AC_MSG_RESULT(yes) ++ PCAP_CFLAGS=${LIBPCAP_CFLAGS} ++ PCAPLIB=${LIBPCAP_LIBS} ++] + ) + AC_SUBST(PCAP_CFLAGS) + AC_SUBST(PCAPLIB) diff --git a/buildroot/package/libnids/Config.in b/buildroot/package/libnids/Config.in new file mode 100644 index 000000000..30528f4d0 --- /dev/null +++ b/buildroot/package/libnids/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_LIBNIDS + bool "libnids" + select BR2_PACKAGE_LIBPCAP + help + Libnids is an implementation of an E-component of Network + Intrusion Detection System. + + libnids watches all local network traffic, and provides + convenient information on them to perform further analysis. + + Libnids offers IP defragmentation, TCP stream assembly, TCP + port scan detection. + + http://libnids.sourceforge.net/ diff --git a/buildroot/package/libnids/libnids.hash b/buildroot/package/libnids/libnids.hash new file mode 100644 index 000000000..4a2949c39 --- /dev/null +++ b/buildroot/package/libnids/libnids.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/libnids/libnids.mk b/buildroot/package/libnids/libnids.mk new file mode 100644 index 000000000..fb3df318b --- /dev/null +++ b/buildroot/package/libnids/libnids.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# libnids +# +################################################################################ + +LIBNIDS_VERSION = 1.24 +LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_LICENSE = GPL-2.0 +LIBNIDS_LICENSE_FILES = COPYING +LIBNIDS_INSTALL_STAGING = YES +LIBNIDS_DEPENDENCIES = host-pkgconf libpcap +LIBNIDS_AUTORECONF = YES + +# CVE-2010-0751 was fixed in libnids v1.24 but the NVD database is not +# aware of the fix, ignore it until this is updated +LIBNIDS_IGNORE_CVES += CVE-2010-0751 + +# disable libnet if not available +# Tests in configure.in expect --with-libnet=$build_dir +# not an installation patch like in our context. +# We use with-libnet=yes to skip the unusual paths tests. +# But 'LNETLIB' gets left out, so we need to define it ourselves. +ifeq ($(BR2_PACKAGE_LIBNET),y) +LIBNIDS_DEPENDENCIES += libnet +LIBNIDS_CONF_OPTS += --enable-libnet --with-libnet=yes LNETLIB=-lnet +else +LIBNIDS_CONF_OPTS += --disable-libnet +endif + +# disable libglib2 if not available +# The test in configure.in is flawed: passing --enable-libglib would also +# disable it. Only when neither is passed will the autodetection test be +# executed. +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +LIBNIDS_DEPENDENCIES += libglib2 +else +LIBNIDS_CONF_OPTS += --disable-libglib +endif + +# hand-written Makefile.in, not using automake, needs a custom +# variable for the installation path. +LIBNIDS_INSTALL_STAGING_OPTS = install_prefix=$(STAGING_DIR) install +LIBNIDS_INSTALL_TARGET_OPTS = install_prefix=$(TARGET_DIR) install + +$(eval $(autotools-package)) diff --git a/buildroot/package/libnpupnp/Config.in b/buildroot/package/libnpupnp/Config.in new file mode 100644 index 000000000..cea5bd5c0 --- /dev/null +++ b/buildroot/package/libnpupnp/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_LIBNPUPNP + bool "libnpupnp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBMICROHTTPD + help + npupnp (new pupnp or not pupnp ?) is an UPnP library derived + from the venerable pupnp (https://github.com/pupnp/pupnp), + based on its 1.6.x branch (around 1.6.25). + + https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html + +comment "libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libnpupnp/libnpupnp.hash b/buildroot/package/libnpupnp/libnpupnp.hash new file mode 100644 index 000000000..53a0c16fd --- /dev/null +++ b/buildroot/package/libnpupnp/libnpupnp.hash @@ -0,0 +1,5 @@ +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.11.tar.gz.sha256 +sha256 15b73a5197e649afe44dd15002be131b4b0e20a2b2e9b7ea4a2000b9644fefae libnpupnp-4.0.11.tar.gz + +# Hash for license file: +sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libnpupnp/libnpupnp.mk b/buildroot/package/libnpupnp/libnpupnp.mk new file mode 100644 index 000000000..23cc52c16 --- /dev/null +++ b/buildroot/package/libnpupnp/libnpupnp.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libnpupnp +# +################################################################################ + +LIBNPUPNP_VERSION = 4.0.11 +LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads +LIBNPUPNP_LICENSE = BSD-3-Clause +LIBNPUPNP_LICENSE_FILES = COPYING +LIBNPUPNP_INSTALL_STAGING = YES +LIBNPUPNP_DEPENDENCIES = expat libcurl libmicrohttpd + +$(eval $(autotools-package)) diff --git a/buildroot/package/libnspr/libnspr.hash b/buildroot/package/libnspr/libnspr.hash index cdbf6ce69..f8f8fa76b 100644 --- a/buildroot/package/libnspr/libnspr.hash +++ b/buildroot/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.25/src/SHA256SUMS -sha256 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 nspr-4.25.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.29/src/SHA256SUMS +sha256 22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582 nspr-4.29.tar.gz # Locally calculated -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/buildroot/package/libnspr/libnspr.mk b/buildroot/package/libnspr/libnspr.mk index 857052d8c..6f072cb6d 100644 --- a/buildroot/package/libnspr/libnspr.mk +++ b/buildroot/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.25 +LIBNSPR_VERSION = 4.29 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch b/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch deleted file mode 100644 index 132538776..000000000 --- a/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d9c7cbb3660d8a2da9ce42e4d1b58642a256a91a Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sun, 9 Feb 2020 10:15:16 +0100 -Subject: [PATCH] Bug 1614183 - Check if PPC __has_include() - -Some build environment doesn't provide and this causes -build failure, so let's check if that header exists by using -__has_include() helper. - -Signed-off-by: Giulio Benetti ---- - nss/lib/freebl/blinit.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c -index 7e8adfc64..d4921aaee 100644 ---- a/nss/lib/freebl/blinit.c -+++ b/nss/lib/freebl/blinit.c -@@ -431,8 +431,14 @@ ppc_crypto_support() - - #if defined(__powerpc__) - -+#ifndef __has_include -+#define __has_include(x) 0 -+#endif -+ - #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD__ >= 12) -+#if __has_include() - #include -+#endif - #elif (defined(__FreeBSD__) && __FreeBSD__ < 12) - #include - #endif -@@ -449,10 +455,14 @@ CheckPPCSupport() - - unsigned long hwcaps = 0; - #if defined(__linux__) -+#if __has_include() - hwcaps = getauxval(AT_HWCAP2); -+#endif - #elif defined(__FreeBSD__) - #if __FreeBSD__ >= 12 -+#if __has_include() - elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps)); -+#endif - #else - size_t len = sizeof(hwcaps); - sysctlbyname("hw.cpu_features2", &hwcaps, &len, NULL, 0); --- -2.20.1 - diff --git a/buildroot/package/libnss/0001-fix-old-abi-ppc.patch b/buildroot/package/libnss/0001-fix-old-abi-ppc.patch new file mode 100644 index 000000000..202b4ad27 --- /dev/null +++ b/buildroot/package/libnss/0001-fix-old-abi-ppc.patch @@ -0,0 +1,40 @@ +From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 +From: Lauri Kasanen +Date: Mon, 1 Jun 2020 12:11:45 +0300 +Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: + ABI version 2 is not compatible with ABI version 1 output + +Don't try to build the SHA-2 accelerated asm on old-ABI ppc. + +Currently make only, I don't have enough gyp-fu to do that side. +However, the reporters of 1642174 and 1635625 both used make, not gyp. + +Signed-off-by: Lauri Kasanen +[Fetch-from: https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 + Manually modified paths to apply to nss subdirectory in release tarball.] +Signed-off-by: Joseph Kogut +--- + lib/freebl/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 5f7384429..e0461c7d3 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) + endif + ifeq ($(CPU_ARCH),ppc) + EXTRA_SRCS += gcm-ppc.c +- ASFILES += sha512-p8.s + ifdef USE_64 + DEFINES += -DNSS_NO_INIT_SUPPORT ++ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') ++ ifeq ($(PPC_ABI),2) ++ ASFILES += sha512-p8.s ++ endif + endif # USE_64 + endif # ppc + endif # Linux +-- +2.19.1 + diff --git a/buildroot/package/libnss/libnss.hash b/buildroot/package/libnss/libnss.hash index f4a6d74ee..02593c7dd 100644 --- a/buildroot/package/libnss/libnss.hash +++ b/buildroot/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_50_RTM/src/SHA256SUMS -sha256 185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7 nss-3.50.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_58_RTM/src/SHA256SUMS +sha256 9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0 nss-3.58.tar.gz # Locally calculated -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/buildroot/package/libnss/libnss.mk b/buildroot/package/libnss/libnss.mk index e439150ec..8e6a77d2c 100644 --- a/buildroot/package/libnss/libnss.mk +++ b/buildroot/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.50 +LIBNSS_VERSION = 3.58 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist @@ -55,6 +55,11 @@ ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),) LIBNSS_BUILD_VARS += NSS_DISABLE_ALTIVEC=1 endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),) +# Disable arm32-neon if neon is not supported +LIBNSS_BUILD_VARS += NSS_DISABLE_ARM32_NEON=1 +endif + ifeq ($(BR2_ARCH_IS_64),y) # MIPS64 n32 is treated as a 32-bit architecture by libnss. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1010730 @@ -100,6 +105,8 @@ define LIBNSS_INSTALL_TARGET_CMDS $(@D)/$(LIBNSS_DISTDIR)/lib/*.a $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc + $(INSTALL) -D -m 755 $(@D)/$(LIBNSS_DISTDIR)/bin/certutil \ + $(TARGET_DIR)/usr/bin/certutil $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc endef diff --git a/buildroot/package/libodb-boost/Config.in b/buildroot/package/libodb-boost/Config.in new file mode 100644 index 000000000..ada87738d --- /dev/null +++ b/buildroot/package/libodb-boost/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBODB_BOOST + bool "libodb-boost" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_BOOST + select BR2_PACKAGE_LIBODB + help + This package contains the common ODB runtime library. Every + application that includes code generated by the ODB compiler + will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb-boost needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_BOOST diff --git a/buildroot/package/libodb-boost/libodb-boost.hash b/buildroot/package/libodb-boost/libodb-boost.hash new file mode 100644 index 000000000..622067c36 --- /dev/null +++ b/buildroot/package/libodb-boost/libodb-boost.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/projects/libcutl/ +sha1 f813702b2856732e199ae34e3393b8cecff878ef libodb-boost-2.4.0.tar.bz2 + +# Locally computed +sha256 b41bd4aaa3f3c9563cfa41bae19bda1bbcc3652e4430b4ebb1819eef2ffcadf4 libodb-boost-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/buildroot/package/libodb-boost/libodb-boost.mk b/buildroot/package/libodb-boost/libodb-boost.mk new file mode 100644 index 000000000..679c9d7a3 --- /dev/null +++ b/buildroot/package/libodb-boost/libodb-boost.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libodb-boost +# +################################################################################ + +LIBODB_BOOST_VERSION_MAJOR = 2.4 +LIBODB_BOOST_VERSION = $(LIBODB_BOOST_VERSION_MAJOR).0 +LIBODB_BOOST_SOURCE = libodb-boost-$(LIBODB_BOOST_VERSION).tar.bz2 +LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VERSION_MAJOR) +LIBODB_BOOST_INSTALL_STAGING = YES +LIBODB_BOOST_LICENSE = GPL-2.0 +LIBODB_BOOST_LICENSE_FILES = LICENSE +LIBODB_BOOST_DEPENDENCIES = boost libodb + +$(eval $(autotools-package)) diff --git a/buildroot/package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch b/buildroot/package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch new file mode 100644 index 000000000..a4ef3cc1c --- /dev/null +++ b/buildroot/package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch @@ -0,0 +1,35 @@ +From 3af12d8d0f749751e487955c24260049e7a8eec6 Mon Sep 17 00:00:00 2001 +From: Kamel Bouhara +Date: Wed, 13 May 2020 16:58:22 +0200 +Subject: [PATCH] fix syntax issue while checking ldflags + +Signed-off-by: Kamel Bouhara +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index def5883..2d783f6 100755 +--- a/configure ++++ b/configure +@@ -17574,7 +17574,7 @@ libmysqlclient_paths="none /usr/lib/mysql /usr/lib64/mysql" + + for path in $libmysqlclient_paths; do + +-if test x"path" != xnone; then ++if test x"$path" != xnone; then + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$path" + fi +@@ -17753,7 +17753,7 @@ if test x"$libmysqlclient_found" = xyes; then + break; + fi + +-if test x"path" != xnone; then ++if test x"$path" != xnone; then + LDFLAGS="$save_LDFLAGS" + fi + +-- +2.26.2 + diff --git a/buildroot/package/libodb-mysql/0002-mariadb-FTBFS-fix.patch b/buildroot/package/libodb-mysql/0002-mariadb-FTBFS-fix.patch new file mode 100644 index 000000000..01caaafd6 --- /dev/null +++ b/buildroot/package/libodb-mysql/0002-mariadb-FTBFS-fix.patch @@ -0,0 +1,51 @@ +From 552474a477989d0d3514f126b8e314dccc27878c Mon Sep 17 00:00:00 2001 +From: Kamel Bouhara +Date: Wed, 1 Jul 2020 08:58:24 +0200 +Subject: [PATCH] mariadb FTBFS fix + +From: https://sources.debian.org/patches/libodb-mysql/2.4.0-4/mariadb_FTBFS_fix.patch/ + +Description: fix FTBFS with recent MariaDB versions +Don't include internal an header, only the main one. +Bug-Debian: https://bugs.debian.org/919374 +Forwarded: no +Author: Laszlo Boszormenyi (GCS) + +Signed-off-by: Kamel Bouhara +--- + odb/mysql/mysql-types.hxx | 4 ++-- + odb/mysql/version.hxx | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx +index 1254ccd..0e8f9a8 100644 +--- a/odb/mysql/mysql-types.hxx ++++ b/odb/mysql/mysql-types.hxx +@@ -11,9 +11,9 @@ typedef char my_bool; + typedef struct st_mysql_bind MYSQL_BIND; + + #ifdef LIBODB_MYSQL_INCLUDE_SHORT +-# include ++# include + #else +-# include ++# include + #endif + + #endif // ODB_MYSQL_MYSQL_TYPES_HXX +diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx +index 05b4ba5..e711c2e 100644 +--- a/odb/mysql/version.hxx ++++ b/odb/mysql/version.hxx +@@ -12,7 +12,7 @@ + #ifdef LIBODB_MYSQL_INCLUDE_SHORT + # include + #else +-# include ++# include + #endif + + #include +-- +2.26.2 + diff --git a/buildroot/package/libodb-mysql/Config.in b/buildroot/package/libodb-mysql/Config.in new file mode 100644 index 000000000..d606165f9 --- /dev/null +++ b/buildroot/package/libodb-mysql/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBODB_MYSQL + bool "libodb-mysql" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_MYSQL + select BR2_PACKAGE_LIBODB + help + This package contains the MySQL ODB runtime library. Every + application that includes code generated for the MySQL + database will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb-mysql needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_MYSQL diff --git a/buildroot/package/libodb-mysql/libodb-mysql.hash b/buildroot/package/libodb-mysql/libodb-mysql.hash new file mode 100644 index 000000000..1c35041af --- /dev/null +++ b/buildroot/package/libodb-mysql/libodb-mysql.hash @@ -0,0 +1,4 @@ +sha1 2021a67577354f1d6bed50c0b257c1920760eda7 libodb-mysql-2.4.0.tar.bz2 + +sha256 ce2fcdb6ab4a02fc0aff263a891c56949fa41b89e65d7a40d8b656d3ebf0d9bc libodb-mysql-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/buildroot/package/libodb-mysql/libodb-mysql.mk b/buildroot/package/libodb-mysql/libodb-mysql.mk new file mode 100644 index 000000000..835e5bc6b --- /dev/null +++ b/buildroot/package/libodb-mysql/libodb-mysql.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# libodb-mysql +# +################################################################################ + +LIBODB_MYSQL_VERSION_MAJOR = 2.4 +LIBODB_MYSQL_VERSION = $(LIBODB_MYSQL_VERSION_MAJOR).0 +LIBODB_MYSQL_SOURCE = libodb-mysql-$(LIBODB_MYSQL_VERSION).tar.bz2 +LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VERSION_MAJOR) +LIBODB_MYSQL_INSTALL_STAGING = YES +LIBODB_MYSQL_LICENSE = GPL-2.0 +LIBODB_MYSQL_LICENSE_FILES = LICENSE +LIBODB_MYSQL_DEPENDENCIES = libodb mysql +LIBODB_MYSQL_CONF_ENV = LIBS="$(shell $(STAGING_DIR)/usr/bin/mysql_config --libs)" + +$(eval $(autotools-package)) diff --git a/buildroot/package/libodb-pgsql/Config.in b/buildroot/package/libodb-pgsql/Config.in new file mode 100644 index 000000000..2ff63d88e --- /dev/null +++ b/buildroot/package/libodb-pgsql/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBODB_PGSQL + bool "libodb-pgsql" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_POSTGRESQL + select BR2_PACKAGE_LIBODB + help + This package contains the PostgreSQL ODB runtime library. + Every application that includes code generated for the + PostgreSQL database will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb-pgsql needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_POSTGRESQL diff --git a/buildroot/package/libodb-pgsql/libodb-pgsql.hash b/buildroot/package/libodb-pgsql/libodb-pgsql.hash new file mode 100644 index 000000000..5799f0923 --- /dev/null +++ b/buildroot/package/libodb-pgsql/libodb-pgsql.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.bz2.sha1 +sha1 4628d5e296da01dbaf8658fd402b4f709f30ea2d libodb-pgsql-2.4.0.tar.bz2 + +# Locally Computed +sha256 778a4d38bd1161e1f0b368815514c3335da20c7584e3d07613526dcce53523bc libodb-pgsql-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/buildroot/package/libodb-pgsql/libodb-pgsql.mk b/buildroot/package/libodb-pgsql/libodb-pgsql.mk new file mode 100644 index 000000000..038f7878c --- /dev/null +++ b/buildroot/package/libodb-pgsql/libodb-pgsql.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libodb-pgsql +# +################################################################################ + +LIBODB_PGSQL_VERSION_MAJOR = 2.4 +LIBODB_PGSQL_VERSION = $(LIBODB_PGSQL_VERSION_MAJOR).0 +LIBODB_PGSQL_SOURCE = libodb-pgsql-$(LIBODB_PGSQL_VERSION).tar.bz2 +LIBODB_PGSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_PGSQL_VERSION_MAJOR) +LIBODB_PGSQL_LICENSE = GPL-2.0 +LIBODB_PGSQL_LICENSE_FILES = LICENSE +LIBODB_PGSQL_INSTALL_STAGING = YES +LIBODB_PGSQL_DEPENDENCIES = postgresql libodb + +$(eval $(autotools-package)) diff --git a/buildroot/package/libodb/Config.in b/buildroot/package/libodb/Config.in new file mode 100644 index 000000000..8312f4735 --- /dev/null +++ b/buildroot/package/libodb/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBODB + bool "libodb" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + help + This package contains the common ODB runtime library. Every + application that includes code generated by the ODB compiler + will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libodb/libodb.hash b/buildroot/package/libodb/libodb.hash new file mode 100644 index 000000000..cea5b9eda --- /dev/null +++ b/buildroot/package/libodb/libodb.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/projects/libcutl/ +sha1 42bd2a8023e338e004711e755eb30bd122b844a6 libodb-2.4.0.tar.bz2 + +# Locally Computed +sha256 66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007 libodb-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/buildroot/package/libodb/libodb.mk b/buildroot/package/libodb/libodb.mk new file mode 100644 index 000000000..f36d8957c --- /dev/null +++ b/buildroot/package/libodb/libodb.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libodb +# +################################################################################ + +LIBODB_VERSION_MAJOR = 2.4 +LIBODB_VERSION = $(LIBODB_VERSION_MAJOR).0 +LIBODB_SOURCE = libodb-$(LIBODB_VERSION).tar.bz2 +LIBODB_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_VERSION_MAJOR) +LIBODB_INSTALL_STAGING = YES +LIBODB_LICENSE = GPL-2.0 +LIBODB_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) diff --git a/buildroot/package/libolm/libolm.hash b/buildroot/package/libolm/libolm.hash index 613dda354..f521d30c0 100644 --- a/buildroot/package/libolm/libolm.hash +++ b/buildroot/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1ca9926ce71d778fb7352d1ee77513194db8c7f49c0d69d38ac49ec3bafcea38 olm-3.1.4.tar.gz -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE +sha256 92ac1eccacbff620a1bc1a168ba204893d83bcb72646e456990ebe2480638696 olm-3.1.5.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/libolm/libolm.mk b/buildroot/package/libolm/libolm.mk index 78ee05b3c..48cb31fb2 100644 --- a/buildroot/package/libolm/libolm.mk +++ b/buildroot/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.1.4 +LIBOLM_VERSION = 3.1.5 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 diff --git a/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch b/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch deleted file mode 100644 index 895a97e93..000000000 --- a/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch +++ /dev/null @@ -1,385 +0,0 @@ -From 576b64d6a4253f900d4846503df55dba051063ab Mon Sep 17 00:00:00 2001 -From: gxw -Date: Tue, 22 Oct 2019 19:20:19 +0800 -Subject: [PATCH] Adjust the mmi/msa detection mode for mips platform. - -Using mips-simd-check.sh to test the current compiler support mmi/msa -or not before make. If supported, enable mmi/msa. -According to the model name in /proc/cpuinfo to test the current -cpu support mmi/msa or not for runtime detection. -Now We can use the following make instructions on mips platform: -1. make (automatic detection mmi/msa) -2. make ENABLE_MMI=No (disable mmi) -3. make ENABLE_MSA=No (disable msa) -4. make ENABLE_MMI=No ENABLE_MSA=No (disable mmi and msa) - -Change-Id: Ibd348ebc11912d7fca1b548c76838675d69b7c40 - -Downloaded from upstream PR: -https://github.com/cisco/openh264/pull/3175 - -Signed-off-by: gxw -[Bernd: rebased on top of patch 0001] -Signed-off-by: Bernd Kuhls ---- - Makefile | 2 ++ - build/arch.mk | 18 ++++++++++++---- - build/mips-simd-check.sh | 32 +++++++++++++++++++++++++++ - build/mktargets.py | 43 ++++++++++++++++++++++++++----------- - codec/common/inc/cpu_core.h | 1 + - codec/common/src/cpu.cpp | 37 +++++++++++++++++++++++++------ - codec/common/targets.mk | 18 ++++++++++++---- - codec/decoder/targets.mk | 18 ++++++++++++---- - codec/encoder/targets.mk | 18 ++++++++++++---- - codec/processing/targets.mk | 18 ++++++++++++---- - 10 files changed, 166 insertions(+), 39 deletions(-) - create mode 100755 build/mips-simd-check.sh - -diff --git a/Makefile b/Makefile -index 74ff029d9..65d13630b 100644 ---- a/Makefile -+++ b/Makefile -@@ -35,6 +35,8 @@ GTEST_VER=release-1.8.1 - STATIC_LDFLAGS=-lstdc++ - STRIP ?= strip - USE_STACK_PROTECTOR = Yes -+ENABLE_MMI=Yes -+ENABLE_MSA=Yes - - SHAREDLIB_MAJORVERSION=5 - FULL_VERSION := 2.0.0 -diff --git a/build/arch.mk b/build/arch.mk -index 8ac3e70a5..555e4afec 100644 ---- a/build/arch.mk -+++ b/build/arch.mk -@@ -30,14 +30,24 @@ CFLAGS += -DHAVE_NEON_AARCH64 - endif - endif - --#for loongson -+#for mips - ifneq ($(filter mips mips64, $(ARCH)),) - ifeq ($(USE_ASM), Yes) - ASM_ARCH = mips - ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ --LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ") --ifeq ($(LOONGSON3A), "loongson3a") --CFLAGS += -DHAVE_MMI -+#mmi -+ifeq ($(ENABLE_MMI), Yes) -+ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) -+ifeq ($(ENABLE_MMI), Yes) -+CFLAGS += -march=loongson3a -DHAVE_MMI -+endif -+endif -+#msa -+ifeq ($(ENABLE_MSA), Yes) -+ENABLE_MSA = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) msa) -+ifeq ($(ENABLE_MSA), Yes) -+CFLAGS += -mmsa -DHAVE_MSA -+endif - endif - endif - endif -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh -new file mode 100755 -index 000000000..cbc29e3d3 ---- /dev/null -+++ b/build/mips-simd-check.sh -@@ -0,0 +1,32 @@ -+#!/bin/bash -+#********************************************************************************** -+# This script is using in build/arch.mk for mips to detect the simd instructions: -+# mmi, msa (maybe more in the future). -+# -+# --usage: -+# ./mips-simd-check.sh $(CC) mmi -+# or ./mips-simd-check.sh $(CC) msa -+# -+# date: 10/17/2019 Created -+#********************************************************************************** -+ -+TMPC=$(mktemp test.XXXXXX.c) -+TMPO=$(mktemp test.XXXXXX.o) -+if [ $2 == "mmi" ] -+then -+ echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null -+ if test -s $TMPO -+ then -+ echo "Yes" -+ fi -+elif [ $2 == "msa" ] -+then -+ echo "void main(void){ __asm__ volatile(\"addvi.b \$w0, \$w1, 1\"); }" > $TMPC -+ $1 -mmsa $TMPC -o $TMPO &> /dev/null -+ if test -s $TMPO -+ then -+ echo "Yes" -+ fi -+fi -+rm -f $TMPC $TMPO -diff --git a/build/mktargets.py b/build/mktargets.py -index 593280c09..518909d3d 100755 ---- a/build/mktargets.py -+++ b/build/mktargets.py -@@ -119,9 +119,9 @@ def find_sources(): - armfiles.append(file) - mipsfiles = [] - for file in cfiles: -- c = file.split('/') -- if 'mips' in c: -- mipsfiles.append(file) -+ c = file.split('/') -+ if 'mips' in c: -+ mipsfiles.append(file) - cfiles = [x for x in cfiles if x not in mipsfiles] - - -@@ -181,15 +181,34 @@ def find_sources(): - f.write("OBJS += $(%s_OBJSARM64)\n\n"%(PREFIX)) - - if len(mipsfiles) > 0: -- f.write("%s_ASM_MIPS_SRCS=\\\n"%(PREFIX)) -- for c in mipsfiles: -- f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) -- f.write("\n") -- f.write("%s_OBJSMIPS += $(%s_ASM_MIPS_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) -- f.write("ifeq ($(ASM_ARCH), mips)\n") -- f.write("%s_OBJS += $(%s_OBJSMIPS)\n"%(PREFIX,PREFIX)) -- f.write("endif\n") -- f.write("OBJS += $(%s_OBJSMIPS)\n\n"%(PREFIX)) -+ mmifiles = [] -+ for file in mipsfiles: -+ if '_mmi' in file: -+ mmifiles.append(file) -+ f.write("%s_ASM_MIPS_MMI_SRCS=\\\n"%(PREFIX)) -+ for c in mmifiles: -+ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) -+ f.write("\n") -+ f.write("%s_OBJSMIPS_MMI += $(%s_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))\n\n"%(PREFIX, PREFIX)) -+ msafiles = [] -+ for file in mipsfiles: -+ if '_msa' in file: -+ msafiles.append(file) -+ f.write("%s_ASM_MIPS_MSA_SRCS=\\\n"%(PREFIX)) -+ for c in msafiles: -+ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) -+ f.write("\n") -+ f.write("%s_OBJSMIPS_MSA += $(%s_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) -+ f.write("ifeq ($(ASM_ARCH), mips)\n") -+ f.write("ifeq ($(ENABLE_MMI), Yes)\n") -+ f.write("%s_OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX,PREFIX)) -+ f.write("endif\n") -+ f.write("ifeq ($(ENABLE_MSA), Yes)\n") -+ f.write("%s_OBJS += $(%s_OBJSMIPS_MSA)\n"%(PREFIX,PREFIX)) -+ f.write("endif\n") -+ f.write("endif\n") -+ f.write("OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX)) -+ f.write("OBJS += $(%s_OBJSMIPS_MSA)\n\n"%(PREFIX)) - - f.write("OBJS += $(%s_OBJS)\n\n"%(PREFIX)) - write_cpp_rule_pattern(f) -diff --git a/codec/common/inc/cpu_core.h b/codec/common/inc/cpu_core.h -index e5906c62b..f25787b04 100644 ---- a/codec/common/inc/cpu_core.h -+++ b/codec/common/inc/cpu_core.h -@@ -86,6 +86,7 @@ - - /* For loongson */ - #define WELS_CPU_MMI 0x00000001 /* mmi */ -+#define WELS_CPU_MSA 0x00000002 /* msa */ - - /* - * Interfaces for CPU core feature detection as below -diff --git a/codec/common/src/cpu.cpp b/codec/common/src/cpu.cpp -index a39fd0645..94bb2d5d3 100644 ---- a/codec/common/src/cpu.cpp -+++ b/codec/common/src/cpu.cpp -@@ -309,12 +309,37 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { - - #elif defined(mips) - /* for loongson */ -+static uint32_t get_cpu_flags_from_cpuinfo(void) -+{ -+ uint32_t flags = 0; -+ -+# ifdef __linux__ -+ FILE* fp = fopen("/proc/cpuinfo", "r"); -+ if (!fp) -+ return flags; -+ -+ char buf[200]; -+ memset(buf, 0, sizeof(buf)); -+ while (fgets(buf, sizeof(buf), fp)) { -+ if (!strncmp(buf, "model name", strlen("model name"))) { -+ if (strstr(buf, "3A4000")) { -+ flags |= WELS_CPU_MSA | WELS_CPU_MMI; -+ } else if (strstr(buf, "2K1000")) { -+ flags |= WELS_CPU_MSA | WELS_CPU_MMI; -+ } else if (strstr(buf, "Loongson-3A") || strstr(buf, "Loongson-3B")) { -+ flags |= WELS_CPU_MMI; -+ } -+ break; -+ } -+ } -+ fclose(fp); -+# endif -+ -+ return flags; -+} -+ - uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { --#if defined(HAVE_MMI) -- return WELS_CPU_MMI; --#else -- return 0; --#endif -+ return get_cpu_flags_from_cpuinfo(); - } - - #else /* Neither X86_ASM, HAVE_NEON, HAVE_NEON_AARCH64 nor mips */ -@@ -324,5 +349,3 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { - } - - #endif -- -- -diff --git a/codec/common/targets.mk b/codec/common/targets.mk -index 96843cd9d..f2cd192fd 100644 ---- a/codec/common/targets.mk -+++ b/codec/common/targets.mk -@@ -66,18 +66,28 @@ COMMON_OBJS += $(COMMON_OBJSARM64) - endif - OBJS += $(COMMON_OBJSARM64) - --COMMON_ASM_MIPS_SRCS=\ -+COMMON_ASM_MIPS_MMI_SRCS=\ - $(COMMON_SRCDIR)/mips/copy_mb_mmi.c\ - $(COMMON_SRCDIR)/mips/deblock_mmi.c\ - $(COMMON_SRCDIR)/mips/expand_picture_mmi.c\ - $(COMMON_SRCDIR)/mips/intra_pred_com_mmi.c\ - $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ - --COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) -+COMMON_OBJSMIPS_MMI += $(COMMON_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) -+ -+COMMON_ASM_MIPS_MSA_SRCS=\ -+ -+COMMON_OBJSMIPS_MSA += $(COMMON_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) - ifeq ($(ASM_ARCH), mips) --COMMON_OBJS += $(COMMON_OBJSMIPS) -+ifeq ($(ENABLE_MMI), Yes) -+COMMON_OBJS += $(COMMON_OBJSMIPS_MMI) -+endif -+ifeq ($(ENABLE_MSA), Yes) -+COMMON_OBJS += $(COMMON_OBJSMIPS_MSA) -+endif - endif --OBJS += $(COMMON_OBJSMIPS) -+OBJS += $(COMMON_OBJSMIPS_MMI) -+OBJS += $(COMMON_OBJSMIPS_MSA) - - OBJS += $(COMMON_OBJS) - -diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk -index c01618411..88dc5afb1 100644 ---- a/codec/decoder/targets.mk -+++ b/codec/decoder/targets.mk -@@ -57,14 +57,24 @@ DECODER_OBJS += $(DECODER_OBJSARM64) - endif - OBJS += $(DECODER_OBJSARM64) - --DECODER_ASM_MIPS_SRCS=\ -+DECODER_ASM_MIPS_MMI_SRCS=\ - $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ - --DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) -+DECODER_OBJSMIPS_MMI += $(DECODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) -+ -+DECODER_ASM_MIPS_MSA_SRCS=\ -+ -+DECODER_OBJSMIPS_MSA += $(DECODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) - ifeq ($(ASM_ARCH), mips) --DECODER_OBJS += $(DECODER_OBJSMIPS) -+ifeq ($(ENABLE_MMI), Yes) -+DECODER_OBJS += $(DECODER_OBJSMIPS_MMI) -+endif -+ifeq ($(ENABLE_MSA), Yes) -+DECODER_OBJS += $(DECODER_OBJSMIPS_MSA) -+endif - endif --OBJS += $(DECODER_OBJSMIPS) -+OBJS += $(DECODER_OBJSMIPS_MMI) -+OBJS += $(DECODER_OBJSMIPS_MSA) - - OBJS += $(DECODER_OBJS) - -diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk -index 1f053280e..4fb2e690e 100644 ---- a/codec/encoder/targets.mk -+++ b/codec/encoder/targets.mk -@@ -82,16 +82,26 @@ ENCODER_OBJS += $(ENCODER_OBJSARM64) - endif - OBJS += $(ENCODER_OBJSARM64) - --ENCODER_ASM_MIPS_SRCS=\ -+ENCODER_ASM_MIPS_MMI_SRCS=\ - $(ENCODER_SRCDIR)/core/mips/dct_mmi.c\ - $(ENCODER_SRCDIR)/core/mips/quant_mmi.c\ - $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ - --ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) -+ENCODER_OBJSMIPS_MMI += $(ENCODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) -+ -+ENCODER_ASM_MIPS_MSA_SRCS=\ -+ -+ENCODER_OBJSMIPS_MSA += $(ENCODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) - ifeq ($(ASM_ARCH), mips) --ENCODER_OBJS += $(ENCODER_OBJSMIPS) -+ifeq ($(ENABLE_MMI), Yes) -+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MMI) -+endif -+ifeq ($(ENABLE_MSA), Yes) -+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MSA) -+endif - endif --OBJS += $(ENCODER_OBJSMIPS) -+OBJS += $(ENCODER_OBJSMIPS_MMI) -+OBJS += $(ENCODER_OBJSMIPS_MSA) - - OBJS += $(ENCODER_OBJS) - -diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk -index 300de2d80..0f8873335 100644 ---- a/codec/processing/targets.mk -+++ b/codec/processing/targets.mk -@@ -58,14 +58,24 @@ PROCESSING_OBJS += $(PROCESSING_OBJSARM64) - endif - OBJS += $(PROCESSING_OBJSARM64) - --PROCESSING_ASM_MIPS_SRCS=\ -+PROCESSING_ASM_MIPS_MMI_SRCS=\ - $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ - --PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) -+PROCESSING_OBJSMIPS_MMI += $(PROCESSING_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) -+ -+PROCESSING_ASM_MIPS_MSA_SRCS=\ -+ -+PROCESSING_OBJSMIPS_MSA += $(PROCESSING_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) - ifeq ($(ASM_ARCH), mips) --PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) -+ifeq ($(ENABLE_MMI), Yes) -+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MMI) -+endif -+ifeq ($(ENABLE_MSA), Yes) -+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MSA) -+endif - endif --OBJS += $(PROCESSING_OBJSMIPS) -+OBJS += $(PROCESSING_OBJSMIPS_MMI) -+OBJS += $(PROCESSING_OBJSMIPS_MSA) - - OBJS += $(PROCESSING_OBJS) - diff --git a/buildroot/package/libopenh264/0002-fix-mips-build.patch b/buildroot/package/libopenh264/0002-fix-mips-build.patch new file mode 100644 index 000000000..c4927d567 --- /dev/null +++ b/buildroot/package/libopenh264/0002-fix-mips-build.patch @@ -0,0 +1,73 @@ +From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 13 Apr 2020 12:03:01 +0200 +Subject: [PATCH] fix mips build + +In total three PR were sent upstream to fix mips builds: +https://github.com/cisco/openh264/pull/3185 +https://github.com/cisco/openh264/pull/3217 +https://github.com/cisco/openh264/pull/3225 + +Buildroot used the first version +https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f +downloaded from https://github.com/cisco/openh264/pull/3185 + +During discussion the gcc option '-march=loongson3a' was changed to +'-Wa,-mloongson-mmi,-mloongson-ext': +https://github.com/cisco/openh264/pull/3185#discussion_r337818960 + +This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) + +tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' +/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' +/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' + +This patch partly reverts the change to fix mips build. + +$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v + +Using built-in specs. +COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real +COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper +Target: mips64el-buildroot-linux-gnu +Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp +Thread model: posix +gcc version 8.3.0 (Buildroot 2020.02) + +Patch sent upstream: https://github.com/cisco/openh264/pull/3267 + +Signed-off-by: Bernd Kuhls +--- + build/arch.mk | 2 +- + build/mips-simd-check.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/arch.mk b/build/arch.mk +index 1bf318ab..c6570ed4 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ + ifeq ($(ENABLE_MMI), Yes) + ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) + ifeq ($(ENABLE_MMI), Yes) +-CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext ++CFLAGS += -DHAVE_MMI -march=loongson3a + endif + endif + #msa +diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh +index 5efffbef..d0d72f9e 100755 +--- a/build/mips-simd-check.sh ++++ b/build/mips-simd-check.sh +@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) + if [ $2 == "mmi" ] + then + echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC +- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null ++ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null + if test -s $TMPO + then + echo "Yes" +-- +2.25.0 + diff --git a/buildroot/package/libopenh264/libopenh264.hash b/buildroot/package/libopenh264/libopenh264.hash index fdb03d2f7..0689ab961 100644 --- a/buildroot/package/libopenh264/libopenh264.hash +++ b/buildroot/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 73c35f80cc487560d11ecabb6d31ad828bd2f59d412f9cd726cc26bfaf4561fd libopenh264-2.0.0.tar.gz -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE +sha256 af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678 libopenh264-2.1.1.tar.gz +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/buildroot/package/libopenh264/libopenh264.mk b/buildroot/package/libopenh264/libopenh264.mk index 307dbc589..5a1000a6d 100644 --- a/buildroot/package/libopenh264/libopenh264.mk +++ b/buildroot/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.0.0 +LIBOPENH264_VERSION = 2.1.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch new file mode 100644 index 000000000..3d6eaf49d --- /dev/null +++ b/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -0,0 +1,35 @@ +From b57cc2e4ee21babacbffc243626de72c248068ea Mon Sep 17 00:00:00 2001 +From: Andy Polyakov +Date: Sun, 5 May 2019 18:30:55 +0200 +Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems + +If _CALL_ELF is defined to be 2, it's an ELFv2 system. +Conditionally switch to the v2 perlasm scheme. + +Reviewed-by: Paul Dale +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/8883) +[vfazio: fixup for 1.1.1d] +Signed-off-by: Vincent Fazio +--- + Configure | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Configure b/Configure +index 5a699836f3..f9152b1702 100755 +--- a/Configure ++++ b/Configure +@@ -1413,6 +1413,10 @@ my %predefined_CXX = $config{CXX} + ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) + : (); + ++if ($target eq "linux-ppc64" && !$disabled{asm}) { ++ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2); ++} ++ + # Check for makedepend capabilities. + if (!$disabled{makedepend}) { + if ($config{target} =~ /^(VC|vms)-/) { +-- +2.25.0 + diff --git a/buildroot/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch b/buildroot/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch new file mode 100644 index 000000000..30bddc23d --- /dev/null +++ b/buildroot/package/libopenssl/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch @@ -0,0 +1,64 @@ +From 07a0bbdd179a52907485fd793f0df31c097447af Mon Sep 17 00:00:00 2001 +From: Andy Polyakov +Date: Sun, 5 May 2019 18:25:50 +0200 +Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a big endian ELFv2 configuration. ELFv2 was already being +used for little endian, and big endian was traditionally ELFv1 +but there are practical configurations that use ELFv2 with big +endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.) + +Reviewed-by: Paul Dale +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/8883) +Signed-off-by: Vincent Fazio +--- + crypto/perlasm/ppc-xlate.pl | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl +index d220c6245b..eec82b8d48 100755 +--- a/crypto/perlasm/ppc-xlate.pl ++++ b/crypto/perlasm/ppc-xlate.pl +@@ -49,7 +49,7 @@ my $globl = sub { + /osx/ && do { $name = "_$name"; + last; + }; +- /linux.*(32|64le)/ ++ /linux.*(32|64(le|v2))/ + && do { $ret .= ".globl $name"; + if (!$$type) { + $ret .= "\n.type $name,\@function"; +@@ -80,7 +80,7 @@ my $globl = sub { + }; + my $text = sub { + my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text"; +- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/); ++ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/); + $ret; + }; + my $machine = sub { +@@ -186,7 +186,7 @@ my $vmr = sub { + + # Some ABIs specify vrsave, special-purpose register #256, as reserved + # for system use. +-my $no_vrsave = ($flavour =~ /aix|linux64le/); ++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/); + my $mtspr = sub { + my ($f,$idx,$ra) = @_; + if ($idx == 256 && $no_vrsave) { +@@ -318,7 +318,7 @@ while($line=<>) { + if ($label) { + my $xlated = ($GLOBALS{$label} or $label); + print "$xlated:"; +- if ($flavour =~ /linux.*64le/) { ++ if ($flavour =~ /linux.*64(le|v2)/) { + if ($TYPES{$label} =~ /function/) { + printf "\n.localentry %s,0\n",$xlated; + } +-- +2.25.0 + diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index 121e10c41..dcfe7d5c0 100644 --- a/buildroot/package/libopenssl/libopenssl.hash +++ b/buildroot/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1g.tar.gz.sha256 -sha256 ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1h.tar.gz.sha256 +sha256 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 openssl-1.1.1h.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index a300458f8..fe5a444cc 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1g +LIBOPENSSL_VERSION = 1.1.1h LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/buildroot/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch b/buildroot/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch deleted file mode 100644 index 7f2c2d46d..000000000 --- a/buildroot/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001 -From: Aymeric Moizard -Date: Mon, 5 Sep 2016 15:01:53 +0200 -Subject: [PATCH] * fix bug report: sr #109133: Heap buffer overflow in - utility function *osip_clrncpy* https://savannah.gnu.org/support/?109133 - -Signed-off-by: Peter Korsgaard ---- - src/osipparser2/osip_port.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c -index 0e64147..d8941b0 100644 ---- a/src/osipparser2/osip_port.c -+++ b/src/osipparser2/osip_port.c -@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len) - char *p; - size_t spaceless_length; - -- if (src == NULL) -+ if (src == NULL || len == 0) { -+ *dst = '\0'; - return NULL; -+ } - - /* find the start of relevant text */ - pbeg = src; --- -2.11.0 - diff --git a/buildroot/package/libosip2/libosip2.hash b/buildroot/package/libosip2/libosip2.hash index c6df5f236..76bc29d5f 100644 --- a/buildroot/package/libosip2/libosip2.hash +++ b/buildroot/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd libosip2-3.6.0.tar.gz +sha256 61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d libosip2-5.1.1.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/buildroot/package/libosip2/libosip2.mk b/buildroot/package/libosip2/libosip2.mk index 9302b9912..e608f671c 100644 --- a/buildroot/package/libosip2/libosip2.mk +++ b/buildroot/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 3.6.0 +LIBOSIP2_VERSION = 5.1.1 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libostree/libostree.hash b/buildroot/package/libostree/libostree.hash index 374f278f4..e5483a539 100644 --- a/buildroot/package/libostree/libostree.hash +++ b/buildroot/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5482b8fc179c6d2861acb176a1c379e4d02f709bffa92e63f5360f65e57219ae libostree-2019.6.tar.xz -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING +sha256 865d4818820d128a2e505380358275bb964984348b3d0685b6455099e4736972 libostree-2020.6.tar.xz +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/libostree/libostree.mk b/buildroot/package/libostree/libostree.mk index bdbe6b5ab..e387f9985 100644 --- a/buildroot/package/libostree/libostree.mk +++ b/buildroot/package/libostree/libostree.mk @@ -4,10 +4,9 @@ # ################################################################################ -LIBOSTREE_VERSION_MAJOR = 2019.6 -LIBOSTREE_VERSION= $(LIBOSTREE_VERSION_MAJOR) +LIBOSTREE_VERSION = 2020.6 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz -LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION_MAJOR) +LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING @@ -23,6 +22,14 @@ LIBOSTREE_CONF_OPTS += \ --disable-gtk-doc-pdf \ --disable-man +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBOSTREE_DEPENDENCIES += gobject-introspection +LIBOSTREE_CONF_OPTS += --enable-introspection +LIBOSTREE_MAKE_OPTS = INTROSPECTION_SCANNER_ENV= +else +LIBOSTREE_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBOSTREE_CONF_OPTS += --with-openssl LIBOSTREE_DEPENDENCIES += openssl diff --git a/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch b/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch deleted file mode 100644 index 8cdbba450..000000000 --- a/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b2af0aca53d696e6dad17d8a0351d233d1dd1200 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Jan 2020 20:51:59 +0100 -Subject: [PATCH] libtac/lib/magic.c: fix build on uclibc - -Commit 7e990f9db6d8805d369876f45964df87efad9e08 replaced _GNU_SOURCE by -AC_SYSTEM_EXTENSIONS. This is fine but then config.h must be included -before system includes otherwise build fails with uclibc on: - -libtac/lib/magic.c: In function 'magic': -libtac/lib/magic.c:70:11: error: implicit declaration of function 'getrandom' [-Werror=implicit-function-declaration] - ret = getrandom(&num, sizeof(num), GRND_NONBLOCK); - ^ - -Fixes: - - http://autobuild.buildroot.org/results/05c67484136f3bb433ce7fc47b2ce01167048cc2 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/kravietz/pam_tacplus/pull/137] ---- - libtac/lib/magic.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c -index 9df5e3f..e13a483 100644 ---- a/libtac/lib/magic.c -+++ b/libtac/lib/magic.c -@@ -18,6 +18,10 @@ - * See `CHANGES' file for revision history. - */ - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - #include - #include - #include -@@ -27,10 +31,6 @@ - #include - #include - --#ifdef HAVE_CONFIG_H -- #include "config.h" --#endif -- - #include "magic.h" - - #ifdef _MSC_VER --- -2.24.1 - diff --git a/buildroot/package/libpam-tacplus/libpam-tacplus.hash b/buildroot/package/libpam-tacplus/libpam-tacplus.hash index b1cd053f1..084a3e54a 100644 --- a/buildroot/package/libpam-tacplus/libpam-tacplus.hash +++ b/buildroot/package/libpam-tacplus/libpam-tacplus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 82f204b949b2a55d0711b314c6e3b213bd1c0c1ee0d9ba15680570db22bff2d8 libpam-tacplus-1.5.1.tar.gz -sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING +sha256 73961800dc0d5e422751ad4c9f09b1863ab33e381e0bdb2a1d0343dcfc30e44e libpam-tacplus-1.6.1.tar.gz +sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/buildroot/package/libpam-tacplus/libpam-tacplus.mk b/buildroot/package/libpam-tacplus/libpam-tacplus.mk index fd2b4f9a3..4e1f8bd17 100644 --- a/buildroot/package/libpam-tacplus/libpam-tacplus.mk +++ b/buildroot/package/libpam-tacplus/libpam-tacplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPAM_TACPLUS_VERSION = 1.5.1 +LIBPAM_TACPLUS_VERSION = 1.6.1 LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,v$(LIBPAM_TACPLUS_VERSION)) LIBPAM_TACPLUS_LICENSE = GPL-2.0+ LIBPAM_TACPLUS_LICENSE_FILES = COPYING diff --git a/buildroot/package/libpfm4/libpfm4.hash b/buildroot/package/libpfm4/libpfm4.hash index 2c1442dd1..bdc7806a7 100644 --- a/buildroot/package/libpfm4/libpfm4.hash +++ b/buildroot/package/libpfm4/libpfm4.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 78599e1668142f48c24afb1f79ca00a89df51b65 libpfm-4.10.1.tar.gz -md5 d8f66cb9bfa7e1434434e0de6409db5b libpfm-4.10.1.tar.gz +sha1 112bced9a67d565ff0ce6c2bb90452516d1183e5 libpfm-4.11.0.tar.gz +md5 4811c1d99b95752b4ba53b89a9389ec3 libpfm-4.11.0.tar.gz # Locally calculated -sha256 c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49 libpfm-4.10.1.tar.gz +sha256 5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc libpfm-4.11.0.tar.gz sha256 beef323d68fc5db9c67b20e8e9de7ccde371d20cdbcdd686804055b18b926d90 COPYING diff --git a/buildroot/package/libpfm4/libpfm4.mk b/buildroot/package/libpfm4/libpfm4.mk index cc89d4422..2144766d9 100644 --- a/buildroot/package/libpfm4/libpfm4.mk +++ b/buildroot/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.10.1 +LIBPFM4_VERSION = 4.11.0 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license @@ -14,7 +14,8 @@ LIBPFM4_INSTALL_STAGING = YES LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) \ CC="$(TARGET_CC)" LDCONFIG=true \ CONFIG_PFMLIB_SHARED=$(if $(BR2_STATIC_LIBS),n,y) \ - DBG= + DBG= \ + EXAMPLE_DIRS= define LIBPFM4_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) diff --git a/buildroot/package/libpjsip/libpjsip.hash b/buildroot/package/libpjsip/libpjsip.hash index bcf46ea5f..68c220888 100644 --- a/buildroot/package/libpjsip/libpjsip.hash +++ b/buildroot/package/libpjsip/libpjsip.hash @@ -1,6 +1,3 @@ -# From https://www.pjsip.org/release/2.9/MD5SUM.TXT -md5 66757078e7bd7cf316acb0425c2fdd6f pjproject-2.9.tar.bz2 - # Locally computed -sha256 d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 pjproject-2.9.tar.bz2 +sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/libpjsip/libpjsip.mk b/buildroot/package/libpjsip/libpjsip.mk index 447f76be7..f0956d11a 100644 --- a/buildroot/package/libpjsip/libpjsip.mk +++ b/buildroot/package/libpjsip/libpjsip.mk @@ -4,9 +4,11 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.9 -LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 -LIBPJSIP_SITE = https://www.pjsip.org/release/$(LIBPJSIP_VERSION) +LIBPJSIP_VERSION = 2.10 +LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz +LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) +# https://github.com/pjsip/pjproject/archive/2.10.tar.gz + LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING diff --git a/buildroot/package/libplatform/libplatform.hash b/buildroot/package/libplatform/libplatform.hash index 09f9dadb1..f08435da1 100644 --- a/buildroot/package/libplatform/libplatform.hash +++ b/buildroot/package/libplatform/libplatform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94dba139066a332d048486f817736e4cf4962393c9f892d2c7dd40d9d69ca788 libplatform-1eb12b1b1efa6747c1e190964854e9e267e3a1e2.tar.gz -sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h +sha256 209daeb87af4ca92199887eb151b2a459bb81566cdaa092644e0889afb64bf6a libplatform-1c9d14fa996af33760a2c700caebd2bd9ae527c9.tar.gz +sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h diff --git a/buildroot/package/libplatform/libplatform.mk b/buildroot/package/libplatform/libplatform.mk index 0a4c49296..ca57a07d1 100644 --- a/buildroot/package/libplatform/libplatform.mk +++ b/buildroot/package/libplatform/libplatform.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLATFORM_VERSION = 1eb12b1b1efa6747c1e190964854e9e267e3a1e2 +LIBPLATFORM_VERSION = 1c9d14fa996af33760a2c700caebd2bd9ae527c9 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPL-2.0+ LIBPLATFORM_LICENSE_FILES = src/os.h diff --git a/buildroot/package/libpng/libpng.mk b/buildroot/package/libpng/libpng.mk index 5c30a4f9a..1a83c7e71 100644 --- a/buildroot/package/libpng/libpng.mk +++ b/buildroot/package/libpng/libpng.mk @@ -15,7 +15,7 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon diff --git a/buildroot/package/libpwquality/libpwquality.hash b/buildroot/package/libpwquality/libpwquality.hash index b63501fa1..07c50ed24 100644 --- a/buildroot/package/libpwquality/libpwquality.hash +++ b/buildroot/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46 libpwquality-1.4.1.tar.bz2 -sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING +sha256 5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e libpwquality-1.4.2.tar.bz2 +sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/buildroot/package/libpwquality/libpwquality.mk b/buildroot/package/libpwquality/libpwquality.mk index bddafd59c..a2fb00415 100644 --- a/buildroot/package/libpwquality/libpwquality.mk +++ b/buildroot/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.1 +LIBPWQUALITY_VERSION = 1.4.2 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ diff --git a/buildroot/package/libqmi/libqmi.hash b/buildroot/package/libqmi/libqmi.hash index ce9672115..1304a072e 100644 --- a/buildroot/package/libqmi/libqmi.hash +++ b/buildroot/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a libqmi-1.24.4.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 a71963bb1097a42665287e40a9a36f95b8f9d6d6a4b7a5de22d660328af97cb9 libqmi-1.26.6.tar.xz diff --git a/buildroot/package/libqmi/libqmi.mk b/buildroot/package/libqmi/libqmi.mk index 7e89d4a1a..6b5ccfcde 100644 --- a/buildroot/package/libqmi/libqmi.mk +++ b/buildroot/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.24.4 +LIBQMI_VERSION = 1.26.6 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) diff --git a/buildroot/package/libqrencode/libqrencode.hash b/buildroot/package/libqrencode/libqrencode.hash index d8584c8ac..ffcc53737 100644 --- a/buildroot/package/libqrencode/libqrencode.hash +++ b/buildroot/package/libqrencode/libqrencode.hash @@ -1,5 +1,5 @@ -# From http://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.gz.sha -sha512 c3e3834574ec059a4b571427b29d6f5f26bd806fd7498b9bba778f4eceab6ebe5733eef0f3c4f6af91eb3f2e9310f93f6d7b337c28e85c72db7e59bd79be77a9 qrencode-4.0.2.tar.gz +# From http://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz.sha +sha512 209bb656ae3f391b03c7b3ceb03e34f7320b0105babf48b619e7a299528b8828449e0e7696f0b5db0d99170a81709d0518e34835229a748701e7df784e58a9ce qrencode-4.1.1.tar.gz # Hash for license file: -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/libqrencode/libqrencode.mk b/buildroot/package/libqrencode/libqrencode.mk index 669c4193b..0062a96a3 100644 --- a/buildroot/package/libqrencode/libqrencode.mk +++ b/buildroot/package/libqrencode/libqrencode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQRENCODE_VERSION = 4.0.2 +LIBQRENCODE_VERSION = 4.1.1 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode LIBQRENCODE_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/libraw/libraw.hash b/buildroot/package/libraw/libraw.hash index e8117cd1f..f2a01c277 100644 --- a/buildroot/package/libraw/libraw.hash +++ b/buildroot/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3 LibRaw-0.20.0.tar.gz +sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md diff --git a/buildroot/package/libraw/libraw.mk b/buildroot/package/libraw/libraw.mk index e33674e6f..7f79000fd 100644 --- a/buildroot/package/libraw/libraw.mk +++ b/buildroot/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.20.0 +LIBRAW_VERSION = 0.20.2 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -14,6 +14,8 @@ LIBRAW_CONF_OPTS += \ LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md LIBRAW_DEPENDENCIES = host-pkgconf +# https://github.com/LibRaw/LibRaw/issues/353 +LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" diff --git a/buildroot/package/librelp/Config.in b/buildroot/package/librelp/Config.in new file mode 100644 index 000000000..c0ae5fbe8 --- /dev/null +++ b/buildroot/package/librelp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBRELP + bool "librelp" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Reliable Event Logging Protocol library + + https://www.rsyslog.com/librelp/ + +comment "librelp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/librelp/librelp.hash b/buildroot/package/librelp/librelp.hash new file mode 100644 index 000000000..bd66ad7db --- /dev/null +++ b/buildroot/package/librelp/librelp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 cdbf49115fa530247358489864c5971c9f5a6442d19490e38f4c4ef844f1c264 librelp-1.8.0.tar.gz +sha256 1ed76f935566e93e3c3c0d9f8fad22eb6d8bbe406e2eb8470a4a2764d9fd9685 COPYING diff --git a/buildroot/package/librelp/librelp.mk b/buildroot/package/librelp/librelp.mk new file mode 100644 index 000000000..e9e879d1f --- /dev/null +++ b/buildroot/package/librelp/librelp.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# librelp +# +################################################################################ + +LIBRELP_VERSION = 1.8.0 +LIBRELP_SITE = http://download.rsyslog.com/librelp +LIBRELP_LICENSE = GPL-3.0+ +LIBRELP_LICENSE_FILES = COPYING +LIBRELP_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBRELP_DEPENDENCIES += gnutls host-pkgconf +LIBRELP_CONF_OPTS += --enable-tls +else +LIBRELP_CONF_OPTS += --disable-tls +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) +LIBRELP_DEPENDENCIES += openssl host-pkgconf +LIBRELP_CONF_OPTS += --enable-tls-openssl +else +LIBRELP_CONF_OPTS += --disable-tls-openssl +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash index fcecc2b43..9dfb74ff0 100644 --- a/buildroot/package/libressl/libressl.hash +++ b/buildroot/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e libressl-3.0.2.tar.gz +sha256 a9d1e1d030b8bcc67bf6428b8c0fff14a5602e2236257b9e3d77acaf12e2a7a1 libressl-3.2.2.tar.gz # Locally computed -sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING +sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk index c2491bb3a..41484f5a9 100644 --- a/buildroot/package/libressl/libressl.mk +++ b/buildroot/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.0.2 +LIBRESSL_VERSION = 3.2.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING diff --git a/buildroot/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch b/buildroot/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch new file mode 100644 index 000000000..6f63d7b54 --- /dev/null +++ b/buildroot/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch @@ -0,0 +1,37 @@ +From b16f6813011519ce247b0af9a4b78486daefad54 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 26 Aug 2020 22:54:50 +0200 +Subject: [PATCH] src/roxml_mem.h: add missing extern + +Add missing extern to head_cell otherwise the build with gcc 10 (with +-fno-common being default) will fail on: + +/bin/bash ./libtool --tag=CC --mode=link /home/peko/autobuild/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -DIGNORE_EMPTY_TEXT_NODES -DCONFIG_XML_CONTENT -DCONFIG_XML_NAV -DCONFIG_XML_BUFF -DCONFIG_XML_COMMIT -DCONFIG_XML_EDIT -DCONFIG_XML_FILE -DCONFIG_XML_XPATH -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -pthread -version-info 0:0:0 -o libroxml.la -rpath /usr/lib src/libroxml_la-roxml_core.lo src/libroxml_la-roxml_parser.lo src/libroxml_la-roxml_buff.lo src/libroxml_la-roxml_nav.lo src/libroxml_la-roxml_content.lo src/libroxml_la-roxml_mem.lo src/libroxml_la-roxml_stub.lo src/libroxml_la-roxml_commit.lo src/libroxml_la-roxml_edit.lo src/libroxml_la-roxml_file.lo src/libroxml_la-roxml_xpath.lo -pthread +libtool: link: /home/peko/autobuild/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -shared -fPIC -DPIC src/.libs/libroxml_la-roxml_core.o src/.libs/libroxml_la-roxml_parser.o src/.libs/libroxml_la-roxml_buff.o src/.libs/libroxml_la-roxml_nav.o src/.libs/libroxml_la-roxml_content.o src/.libs/libroxml_la-roxml_mem.o src/.libs/libroxml_la-roxml_stub.o src/.libs/libroxml_la-roxml_commit.o src/.libs/libroxml_la-roxml_edit.o src/.libs/libroxml_la-roxml_file.o src/.libs/libroxml_la-roxml_xpath.o -O2 -pthread -pthread -pthread -Wl,-soname -Wl,libroxml.so.0 -o .libs/libroxml.so.0.0.0 +/home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: src/.libs/libroxml_la-roxml_mem.o:(.data+0x0): multiple definition of `head_cell'; src/.libs/libroxml_la-roxml_content.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/b6ac3664d61ad826515b57c4d057b6f001b5167d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/blunderer/libroxml/pull/79] +--- + src/roxml_mem.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/roxml_mem.h b/src/roxml_mem.h +index aff6137..34a5070 100644 +--- a/src/roxml_mem.h ++++ b/src/roxml_mem.h +@@ -14,7 +14,7 @@ + + #include "roxml_internal.h" + +-memory_cell_t head_cell; ++extern memory_cell_t head_cell; + + /** \brief alloc memory function + * +-- +2.28.0 + diff --git a/buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch b/buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch deleted file mode 100644 index 0eea5b995..000000000 --- a/buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 322b415f92d4dcd36824eef83bd617bac6e5c8c7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 24 Dec 2019 16:38:35 +0100 -Subject: [PATCH] librsvg.pc.in: add libcroco to Requires.private - -libcroco is a mandatory dependency since version 2.35.0 so add it to -Requires.Private to fix a static build failure with imagemagick - -This patch is not upstreamable as librsvg no longer depends on libcroco -since version 2.47.1. It now does all CSS processing using Rust crates -from Mozilla Servo. - -Fixes: - - http://autobuild.buildroot.org/results/42f4b4881569779162d3efe4628b934f965913b9 - -Signed-off-by: Fabrice Fontaine ---- - librsvg.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librsvg.pc.in b/librsvg.pc.in -index a451de05..4b09984a 100644 ---- a/librsvg.pc.in -+++ b/librsvg.pc.in -@@ -10,6 +10,6 @@ Name: librsvg - Description: library that renders svg files - Version: @VERSION@ - Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo --Requires.private: -+Requires.private: libcroco-0.6 - Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm - Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ --- -2.24.0 - diff --git a/buildroot/package/librsvg/Config.in b/buildroot/package/librsvg/Config.in index 735bf6125..3272ecd77 100644 --- a/buildroot/package/librsvg/Config.in +++ b/buildroot/package/librsvg/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBRSVG bool "librsvg" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -8,8 +9,9 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_SCRIPT select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_LIBCROCO + select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PANGO @@ -20,6 +22,7 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/buildroot/package/librsvg/librsvg.hash b/buildroot/package/librsvg/librsvg.hash index 366d9b0db..da9f758f4 100644 --- a/buildroot/package/librsvg/librsvg.hash +++ b/buildroot/package/librsvg/librsvg.hash @@ -1,4 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum -sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.0.sha256sum +sha256 b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4 librsvg-2.50.0.tar.xz + # Locally computed -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/librsvg/librsvg.mk b/buildroot/package/librsvg/librsvg.mk index 470910d94..120f71c79 100644 --- a/buildroot/package/librsvg/librsvg.mk +++ b/buildroot/package/librsvg/librsvg.mk @@ -4,20 +4,28 @@ # ################################################################################ -LIBRSVG_VERSION_MAJOR = 2.40 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20 +LIBRSVG_VERSION_MAJOR = 2.50 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).0 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES -LIBRSVG_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no +LIBRSVG_CONF_ENV = \ + LIBS=$(TARGET_NLS_LIBS) \ + RUST_TARGET=$(RUSTC_TARGET_NAME) +LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no -LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ - $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) \ +LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf host-rustc libglib2 libxml2 pango \ $(TARGET_NLS_DEPENDENCIES) -HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango -LIBRSVG_LICENSE = LGPL-2.0+ +HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml2 host-pango host-rustc +LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBRSVG_CONF_OPTS += --enable-introspection +LIBRSVG_DEPENDENCIES += gobject-introspection +else +LIBRSVG_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch b/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch deleted file mode 100644 index 76598c21f..000000000 --- a/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 77b78e01f83b65f3c38941f54f71beaaddcb6fc1 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier -Date: Sat, 23 Nov 2019 16:51:46 +0100 -Subject: [PATCH] CMakeLists: fix build with old compilers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The librsync code uses some C99 constructs, but old compilers such -as gcc 4.7 don't default to -std=c99. This commit makes sure librsync -is built with -std=gnu99. - -Fixes: - -src/rabinkarp.h:82:5: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode - for (size_t i = len; i; i--) { - ^ -src/rabinkarp.h:82:5: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code - -Signed-off-by: Pierre-Jean Texier -[Upstream status: https://github.com/librsync/librsync/pull/181] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f810061..794d9c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,7 +149,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "(Clang|Gnu|GNU)") - # TODO: Set for MSVC and other compilers. - # TODO: Set -Werror when the build is clean. - -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99") - endif() - - site_name(BUILD_HOSTNAME) diff --git a/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch b/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch deleted file mode 100644 index 1c8a332ab..000000000 --- a/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f5a131ab66fec23d0c79b55fc3907603b094deb9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 31 Dec 2019 18:13:29 +0100 -Subject: [PATCH] cmake/FindPOPT.cmake: Add PkgConfig support - -Add PkgConfig support to retrieve popt dependencies otherwise static -build can fail if popt has been linked with iconv: - -[100%] Linking C executable rdiff -/home/buildroot/autobuild/instance-2/output-1/per-package/librsync/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/8.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/per-package/librsync/host/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': -poptint.c:(.text+0x34c): undefined reference to `libiconv_open - -Fixes: - - http://autobuild.buildroot.org/results/896e8e3efbedad90d66ae8c4e1e50f16206cab49 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/librsync/librsync/pull/186] ---- - cmake/FindPOPT.cmake | 29 ++++++++++++++++++----------- - 1 file changed, 18 insertions(+), 11 deletions(-) - -diff --git a/cmake/FindPOPT.cmake b/cmake/FindPOPT.cmake -index 1ca452a..87b3e95 100644 ---- a/cmake/FindPOPT.cmake -+++ b/cmake/FindPOPT.cmake -@@ -42,20 +42,27 @@ if (NOT POPT_FOUND) - endif (NOT POPT_ROOT_DIR) - - ##_____________________________________________________________________________ -- ## Check for the header files -+ ## Check with PkgConfig (to retrieve static dependencies such as iconv) -+ find_package(PkgConfig QUIET) -+ pkg_search_module (POPT QUIET popt) -+ if (NOT POPT_FOUND) - -- find_path (POPT_INCLUDE_DIRS popt.h -- HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 -- PATH_SUFFIXES include -- ) -+ ##_____________________________________________________________________________ -+ ## Check for the header files - -- ##_____________________________________________________________________________ -- ## Check for the library -+ find_path (POPT_INCLUDE_DIRS popt.h -+ HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 -+ PATH_SUFFIXES include -+ ) - -- find_library (POPT_LIBRARIES popt -- HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 -- PATH_SUFFIXES lib -- ) -+ ##_____________________________________________________________________________ -+ ## Check for the library -+ -+ find_library (POPT_LIBRARIES popt -+ HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 -+ PATH_SUFFIXES lib -+ ) -+ endif (POPT_FOUND) - - ##_____________________________________________________________________________ - ## Actions taken when all components have been found --- -2.24.0 - diff --git a/buildroot/package/librsync/librsync.hash b/buildroot/package/librsync/librsync.hash index d00e5cd33..1b2130b1a 100644 --- a/buildroot/package/librsync/librsync.hash +++ b/buildroot/package/librsync/librsync.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b5ab8e2092b82b7d7bb9c1dd52e6a77083a89f8ad9b9309da611f490d0b49a71 librsync-2.2.1.tar.gz -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569 librsync-2.3.1.tar.gz +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/buildroot/package/librsync/librsync.mk b/buildroot/package/librsync/librsync.mk index bf0785b42..fbe56d4a2 100644 --- a/buildroot/package/librsync/librsync.mk +++ b/buildroot/package/librsync/librsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRSYNC_VERSION = 2.2.1 +LIBRSYNC_VERSION = 2.3.1 LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING diff --git a/buildroot/package/librtas/librtas.hash b/buildroot/package/librtas/librtas.hash index 086d0d7cb..de0c0a476 100644 --- a/buildroot/package/librtas/librtas.hash +++ b/buildroot/package/librtas/librtas.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 librtas-2.0.1.tar.gz -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER +sha256 b47b2a6f140347ac265e2c66ddf68293f6cdcc7c0c9a78c6e21ff52846465415 librtas-2.0.2.tar.gz +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER diff --git a/buildroot/package/librtas/librtas.mk b/buildroot/package/librtas/librtas.mk index 48c8d0143..c92a9e2fa 100644 --- a/buildroot/package/librtas/librtas.mk +++ b/buildroot/package/librtas/librtas.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTAS_VERSION = 2.0.1 +LIBRTAS_VERSION = 2.0.2 LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,v$(LIBRTAS_VERSION)) LIBRTAS_LICENSE = LGPL-2.1+ LIBRTAS_LICENSE_FILES = COPYING.LESSER diff --git a/buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch index b9f53d239..2fb63465d 100644 --- a/buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ b/buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch @@ -1,44 +1,47 @@ -From d47e3aed12414be59bf77177c93853ec4b24d705 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 2 Jun 2018 16:53:36 +0200 +From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Fri, 15 May 2020 16:14:48 +0200 Subject: [PATCH] disable shared library target in build Disable shared library target if BUILD_SHARED_LIBS if OFF. Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2018.05 +https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x -Patch has been updated to work with 0.5.4 and to be able to keep current +Patch has been updated to work with master and to be able to keep current behavior of building shared and static version of library if BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library will be install. -[Upstream status: https://github.com/steve-m/librtlsdr/pull/46] +[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] Signed-off-by: Yuvaraj Patil Signed-off-by: Fabrice Fontaine +Signed-off-by: Gwenhael Goavec-Merou +Signed-off-by: Titouan Christophe --- - src/CMakeLists.txt | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) + src/CMakeLists.txt | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 07d64ab..2b7cbae 100644 +index de93044..13b7b1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -47,16 +47,22 @@ ENDIF(MSVC) +@@ -18,6 +18,8 @@ ######################################################################## # Setup shared library variant ######################################################################## +option(BUILD_SHARED_LIBS "Build shared library" ON) +if(BUILD_SHARED_LIBS) - add_library(rtlsdr_shared SHARED ${rtlsdr_srcs}) - target_link_libraries(rtlsdr_shared ${LIBUSB_LIBRARIES}) - set_target_properties(rtlsdr_shared PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS") - set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) -+list(APPEND rtlsdr_lib rtlsdr_shared) + add_library(rtlsdr SHARED librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) + target_link_libraries(rtlsdr PkgConfig::LIBUSB) +@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) + set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) + set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) + generate_export_header(rtlsdr) ++list(APPEND rtlsdr_lib rtlsdr) +endif() ######################################################################## @@ -46,60 +49,82 @@ index 07d64ab..2b7cbae 100644 ######################################################################## +option(BUILD_STATIC_LIBS "Build static library" ON) +if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC ${rtlsdr_srcs}) - target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) - set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) -@@ -64,6 +70,8 @@ if(NOT WIN32) - # Force same library filename for static and shared variants of the library + add_library(rtlsdr_static STATIC librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) + target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) +@@ -47,6 +53,8 @@ if(NOT WIN32) set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) endif() + generate_export_header(rtlsdr_static) +list(APPEND rtlsdr_lib rtlsdr_static) +endif() ######################################################################## - # Setup libraries used in executables -@@ -91,33 +99,33 @@ add_executable(rtl_fm rtl_fm.c) - add_executable(rtl_eeprom rtl_eeprom.c) + # Set up Windows DLL resource files +@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) add_executable(rtl_adsb rtl_adsb.c) add_executable(rtl_power rtl_power.c) --set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) + add_executable(rtl_biast rtl_biast.c) +-set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) ++set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) --target_link_libraries(rtl_sdr rtlsdr_shared convenience_static +-target_link_libraries(rtl_sdr rtlsdr convenience_static +target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_tcp rtlsdr_shared convenience_static +-target_link_libraries(rtl_tcp rtlsdr convenience_static +target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_test rtlsdr_shared convenience_static +-target_link_libraries(rtl_test rtlsdr convenience_static +target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_fm rtlsdr_shared convenience_static +-target_link_libraries(rtl_fm rtlsdr convenience_static +target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static +-target_link_libraries(rtl_eeprom rtlsdr convenience_static +target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_adsb rtlsdr_shared convenience_static +-target_link_libraries(rtl_adsb rtlsdr convenience_static +target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) --target_link_libraries(rtl_power rtlsdr_shared convenience_static +-target_link_libraries(rtl_power rtlsdr convenience_static +target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) +-target_link_libraries(rtl_biast rtlsdr convenience_static ++target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +@@ -156,12 +164,16 @@ endif() + ######################################################################## + # Install built library files & utilities + ######################################################################## ++if(BUILD_SHARED_LIBS) + install(TARGETS rtlsdr EXPORT RTLSDR-export + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file + ) ++endif() ++if(BUILD_STATIC_LIBS) + install(TARGETS rtlsdr_static EXPORT RTLSDR-export + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file + ) ++endif() + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) -- -2.14.1 +2.25.3 diff --git a/buildroot/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/buildroot/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch new file mode 100644 index 000000000..9c808edd4 --- /dev/null +++ b/buildroot/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch @@ -0,0 +1,47 @@ +From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 11 Aug 2020 23:07:08 +0200 +Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in + a Git repo + +If the librtlsdr code comes from a tarball, it doesn't have any .git/ +metadata, and therefore even if Git (as a tool) is found, the logic in +cmake/Modules/Version.cmake fails finding a version through Git: + +-- Extracting version information from git describe... +fatal: Not a git repository (or any of the parent directories): .git + +As a consequence, the VERSION variable is empty, which later causes +cmake to bail out with: + +CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): + No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() +Call Stack (most recent call first): + /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) + CMakeLists.txt:173 (write_basic_package_version_file) + +To avoid this, we only use Git to determine the version if the cmake +project top-level source directory has a .git/ folder. + +Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 +Signed-off-by: Thomas Petazzoni +--- + cmake/Modules/Version.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake +index 2d4e76d..6f67fa4 100644 +--- a/cmake/Modules/Version.cmake ++++ b/cmake/Modules/Version.cmake +@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) + ######################################################################## + find_package(Git QUIET) + +-if(GIT_FOUND) ++if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) + message(STATUS "Extracting version information from git describe...") + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long +-- +2.26.2 + diff --git a/buildroot/package/librtlsdr/Config.in b/buildroot/package/librtlsdr/Config.in index c2bf1a9fb..238659a78 100644 --- a/buildroot/package/librtlsdr/Config.in +++ b/buildroot/package/librtlsdr/Config.in @@ -18,6 +18,14 @@ config BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER automatically detach any kernel driver associated to the RTL2832U USB device on startup if one is loaded. +config BR2_PACKAGE_LIBRTLSDR_ZEROCOPY + bool "Enable usbfs zero-copy support" + default y + help + This option allows to use kernel usbfs mmap instead + of buffers in userspace. If you experiment crash with + kernel < 5.6, disable this option. + endif comment "librtlsdr needs a toolchain w/ threads" diff --git a/buildroot/package/librtlsdr/librtlsdr.hash b/buildroot/package/librtlsdr/librtlsdr.hash index e7b0e84f4..e4b0871db 100644 --- a/buildroot/package/librtlsdr/librtlsdr.hash +++ b/buildroot/package/librtlsdr/librtlsdr.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 80a5155f3505bca8f1b808f8414d7dcd7c459b662a1cde84d3a2629a6e72ae55 librtlsdr-0.6.0.tar.gz +sha256 f09ff5ba2fa1780071321ba22885b9d1a16ac9d4b944a97e39b6921960439301 librtlsdr-ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz # License file, locally calculated -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/librtlsdr/librtlsdr.mk b/buildroot/package/librtlsdr/librtlsdr.mk index 500ccc5d1..47586bdfb 100644 --- a/buildroot/package/librtlsdr/librtlsdr.mk +++ b/buildroot/package/librtlsdr/librtlsdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTLSDR_VERSION = 0.6.0 +LIBRTLSDR_VERSION = ed0317e6a58c098874ac58b769cf2e609c18d9a5 LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING @@ -28,6 +28,12 @@ ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 endif +ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) +LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +else +LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +endif + # In case of static-lib-only builds, CMake's FindThreads.cmake code tries to # get the right flags, checking first for -lpthreads, then -lpthread, and lastly # for -pthread. diff --git a/buildroot/package/libseccomp/0001-remove-static.patch b/buildroot/package/libseccomp/0001-remove-static.patch deleted file mode 100644 index 60a1ff00b..000000000 --- a/buildroot/package/libseccomp/0001-remove-static.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5d010fb06eae43b284e5ccc322f6de47eb42b751 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 2 Jun 2018 13:45:22 +0200 -Subject: [PATCH] remove static - -Do not force static link of tools, it breaks build with: -BR2_SHARED_LIBS=y - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/libseccomp/0001-remove-static.patch -and slighly updated to work with 2.3.3 - -[Upstream status: https://github.com/seccomp/libseccomp/pull/121] - -Signed-off-by: Bernd Kuhls -Signed-off-by: Fabrice Fontaine -[Peter: updated for v2.4.0 which adds scmp_api_level] -Signed-off-by: Peter Korsgaard ---- - tools/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index f768365..5f9d571 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -37,10 +37,7 @@ scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h - scmp_api_level_SOURCES = scmp_api_level.c - - scmp_sys_resolver_LDADD = ../src/libseccomp.la --scmp_sys_resolver_LDFLAGS = -static - scmp_arch_detect_LDADD = ../src/libseccomp.la --scmp_arch_detect_LDFLAGS = -static - scmp_bpf_disasm_LDADD = util.la - scmp_bpf_sim_LDADD = util.la - scmp_api_level_LDADD = ../src/libseccomp.la --scmp_api_level_LDFLAGS = -static --- -2.11.0 - diff --git a/buildroot/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch b/buildroot/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch deleted file mode 100644 index 6ac9b08a7..000000000 --- a/buildroot/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 613e601bb4b50dc359b41f162a5b629449e4bbea Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Fri, 18 Oct 2019 22:02:49 -0300 -Subject: [PATCH] Circumvent bug in uClibc-ng syscall() on x86_64 systems - -On uClibc at least up to v1.0.32, syscall() for x86_64 is defined in -libc/sysdeps/linux/x86_64/syscall.S as - -syscall: - movq %rdi, %rax /* Syscall number -> rax. */ - movq %rsi, %rdi /* shift arg1 - arg5. */ - movq %rdx, %rsi - movq %rcx, %rdx - movq %r8, %r10 - movq %r9, %r8 - movq 8(%rsp),%r9 /* arg6 is on the stack. */ - syscall /* Do the system call. */ - cmpq $-4095, %rax /* Check %rax for error. */ - jae __syscall_error /* Branch forward if it failed. */ - ret /* Return to caller. */ - -And __syscall_error is defined in -libc/sysdeps/linux/x86_64/__syscall_error.c as - -int __syscall_error(void) attribute_hidden; -int __syscall_error(void) -{ - register int err_no __asm__ ("%rcx"); - __asm__ ("mov %rax, %rcx\n\t" - "neg %rcx"); - __set_errno(err_no); - return -1; -} - -Notice that __syscall_error returns -1 as a 32-bit int in %rax, a 64-bit -register i.e. 0x00000000ffffffff (decimal 4294967295). When this value -is compared to -1 in _sys_chk_seccomp_flag_kernel() the result is false, -leading the function to always return 0. - -Prevent the error by coercing the return value of syscall() to int in a -temporary variable before comparing it to -1. We could use just an (int) -cast but the variable makes the code more readable and the machine code -generated by the compiler is the same in both cases. - -All other syscall() invocations were inspected and they either already -coerce the result to int or do not compare it to -1. - -The same problem probably occurs on other 64-bit systems but so far only -x86_64 was tested. - -A bug report is being submitted to uClibc. - -Signed-off-by: Carlos Santos ---- - src/system.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/system.c b/src/system.c -index 8e5aafc..811b401 100644 ---- a/src/system.c -+++ b/src/system.c -@@ -215,10 +215,12 @@ static int _sys_chk_seccomp_flag_kernel(int flag) - /* this is an invalid seccomp(2) call because the last argument - * is NULL, but depending on the errno value of EFAULT we can - * guess if the filter flag is supported or not */ -- if (sys_chk_seccomp_syscall() == 1 && -- syscall(_nr_seccomp, SECCOMP_SET_MODE_FILTER, flag, NULL) == -1 && -- errno == EFAULT) -+ int rc; -+ if (sys_chk_seccomp_syscall() == 1) { -+ rc = syscall(_nr_seccomp, SECCOMP_SET_MODE_FILTER, flag, NULL); -+ if (rc == -1 && errno == EFAULT) - return 1; -+ } - - return 0; - } --- -2.18.1 - diff --git a/buildroot/package/libseccomp/libseccomp.hash b/buildroot/package/libseccomp/libseccomp.hash index 39c5f8aa3..2d07c1c1f 100644 --- a/buildroot/package/libseccomp/libseccomp.hash +++ b/buildroot/package/libseccomp/libseccomp.hash @@ -1,3 +1,4 @@ +# From https://github.com/seccomp/libseccomp/releases/tag/v2.4.4 +sha256 4e79738d1ef3c9b7ca9769f1f8b8d84fc17143c2c1c432e53b9c64787e0ff3eb libseccomp-2.4.4.tar.gz # Locally calculated -sha256 36aa502c0461ae9efc6c93ec2430d6badd9bf91ecbe73806baf7b7c6f687ab4f libseccomp-2.4.1.tar.gz -sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE +sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/buildroot/package/libseccomp/libseccomp.mk b/buildroot/package/libseccomp/libseccomp.mk index 491e51b37..cea3d2860 100644 --- a/buildroot/package/libseccomp/libseccomp.mk +++ b/buildroot/package/libseccomp/libseccomp.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBSECCOMP_VERSION = 2.4.1 -LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,v$(LIBSECCOMP_VERSION)) +LIBSECCOMP_VERSION = 2.4.4 +LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE LIBSECCOMP_INSTALL_STAGING = YES -LIBSECCOMP_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch b/buildroot/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch deleted file mode 100644 index 62bc84c87..000000000 --- a/buildroot/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 754897490d9478025d174c2b1c1849305f728324 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Dec 2015 12:13:07 +0100 -Subject: [PATCH] libsecret.pc: add Libs.private field for libgcrypt - -When libgcrypt is available, libsecret links with it. When dynamic -linking is used, there is no problem: libsecret.so has a NEEDED -pointing to libgcrypt, so linking an application with -lsecret works -fine. However, when doing static linking, you must specify the entire -chain of libraries, otherwise you get unresolved symbols errors, such -as: - -host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libsecret-1.a(libsecret_1_la-secret-session.o): In function `request_open_session_aes': -build/libsecret-0.18.3/libsecret/secret-session.c:99: undefined reference to `gcry_mpi_release' -build/libsecret-0.18.3/libsecret/secret-session.c:101: undefined reference to `gcry_mpi_aprint' -build/libsecret-0.18.3/libsecret/secret-session.c:107: undefined reference to `gcry_free' - -In order to solve this, we simply need to indicate in the Libs.private -field of the .pc file that we depend on libgcrypt. - -Signed-off-by: Thomas Petazzoni ---- - libsecret/libsecret.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsecret/libsecret.pc.in b/libsecret/libsecret.pc.in -index 0c342ef..d99cf44 100644 ---- a/libsecret/libsecret.pc.in -+++ b/libsecret/libsecret.pc.in -@@ -11,4 +11,5 @@ Description: GObject bindings for Secret Service API - Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 gio-2.0 - Libs: -L${libdir} -lsecret-@SECRET_MAJOR@ -+Libs.private: @LIBGCRYPT_LIBS@ - Cflags: -I${includedir}/libsecret-@SECRET_MAJOR@ --- -2.6.4 - diff --git a/buildroot/package/libsecret/libsecret.hash b/buildroot/package/libsecret/libsecret.hash index 00fdfd06f..a53cddefa 100644 --- a/buildroot/package/libsecret/libsecret.hash +++ b/buildroot/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.8.sha256sum -sha256 3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15 libsecret-0.18.8.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.3.sha256sum +sha256 4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4 libsecret-0.20.3.tar.xz # Hash for license file: -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/buildroot/package/libsecret/libsecret.mk b/buildroot/package/libsecret/libsecret.mk index c699e16d9..7526c49c3 100644 --- a/buildroot/package/libsecret/libsecret.mk +++ b/buildroot/package/libsecret/libsecret.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSECRET_VERSION_MAJOR = 0.18 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).8 +LIBSECRET_VERSION_MAJOR = 0.20 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).3 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES @@ -15,11 +15,17 @@ LIBSECRET_CONF_OPTS = \ --disable-manpages \ --disable-strict \ --disable-coverage \ - --enable-introspection=no \ --enable-vala=no LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_DEPENDENCIES += gobject-introspection +else +LIBSECRET_CONF_OPTS += --enable-introspection=no +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt LIBSECRET_CONF_OPTS += --enable-gcrypt \ diff --git a/buildroot/package/libselinux/0001-fix-musl-build.patch b/buildroot/package/libselinux/0001-fix-musl-build.patch index 7af3a3c36..44189e640 100644 --- a/buildroot/package/libselinux/0001-fix-musl-build.patch +++ b/buildroot/package/libselinux/0001-fix-musl-build.patch @@ -1,4 +1,7 @@ -fix undefined macros in musl +From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001 +From: Yann E. MORIN" +Date: Sat, 7 Dec 2019 17:24:50 -0800 +Subject: [PATCH] fix undefined macros in musl musl does not define glibc-specific macros, so use a simple version of the macro when it is not defined. @@ -9,11 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is completely written from scratch, and non-optimal. Signed-off-by: "Yann E. MORIN" - -diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.c ---- libselinux-2.1.13.orig/src/booleans.c 2013-02-06 02:43:22.000000000 +0100 -+++ libselinux-2.1.13/src/booleans.c 2015-07-26 20:40:41.311801914 +0200 -@@ -62,6 +62,14 @@ +[Updated for 3.0] +Signed-off-by: Adam Duskett +diff --git a/src/booleans.c b/src/booleans.c +index ffa8d26..8569002 100644 +--- a/src/booleans.c ++++ b/src/booleans.c +@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len) goto bad; } @@ -26,5 +31,8 @@ diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans. +#endif + for (i = 0; i < *len; i++) { - n[i] = (char *)malloc(_D_ALLOC_NAMLEN(namelist[i])); + n[i] = strdup(namelist[i]->d_name); if (!n[i]) { +-- +2.23.0 + diff --git a/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/buildroot/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch similarity index 81% rename from buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch rename to buildroot/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index c960e1db7..cbd98a61a 100644 --- a/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/buildroot/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -1,4 +1,4 @@ -From 0d4da8093bc2ef92b7c6f7fd1f4804f6ebc6cb56 Mon Sep 17 00:00:00 2001 +From c26495025ab1a2597e5433b67a3bf793d3ce1e08 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Oct 2019 13:37:14 +0200 Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name @@ -15,27 +15,30 @@ To address this and keep things simple, this patch just changes the ln invocation to rely on the name of the _selinux*.so Python module that was installed. -[Upstream: https://github.com/SELinuxProject/selinux/pull/184] +Signed-off-by: Antoine Tenart +[Refreshed for 3.1] Signed-off-by: Thomas Petazzoni +[Refreshed for 3.0] +Signed-off-by: Adam Duskett --- src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 799df2b0..95684ed7 100644 +index 190016e2af34..7ee22fd35da3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") --PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])') +-PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -175,7 +174,7 @@ install: all +@@ -176,7 +175,7 @@ install: all install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ @@ -43,5 +46,5 @@ index 799df2b0..95684ed7 100644 install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -- -2.21.0 +2.26.2 diff --git a/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch deleted file mode 100644 index b1727af45..000000000 --- a/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 89c296e7e9219f54c74f8c3f42940100cbcac962 Mon Sep 17 00:00:00 2001 -From: Petr Lautrbach -Date: Fri, 7 Jun 2019 17:35:44 +0200 -Subject: [PATCH] libselinux: Use Python distutils to install SELinux python - bindings - -Follow officially documented way how to build C extension modules using -distutils - https://docs.python.org/3.8/extending/building.html#building - -Fixes: - -- selinux python module fails to load when it's built using SWIG-4.0: - ->>> import selinux -Traceback (most recent call last): - File "", line 1, in - File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in - from . import _selinux -ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py) - -SWIG-4.0 changed (again?) its behavior so that it uses: from . import _selinux -which looks for _selinux module in the same directory as where __init__.py is - -$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into -$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location -of _selinux.so"). - -- audit2why python module fails to build with Python 3.8 - -cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -DOVERRIDE_GETTID=0 -I../include -D_GNU_SOURCE -DDISABLE_RPM -DNO_ANDROID_BACKEND -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L. -shared -o python-3.8audit2why.so python-3.8audit2why.lo -lselinux -l:libsepol.a -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs -/usr/bin/ld: python-3.8audit2why.lo: in function `finish': -/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:166: undefined reference to `PyArg_ParseTuple' -/usr/bin/ld: python-3.8audit2why.lo: in function `_Py_INCREF': -/usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' -/usr/bin/ld: /usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' -/usr/bin/ld: python-3.8audit2why.lo: in function `check_booleans': -/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:84: undefined reference to `PyExc_RuntimeError' -... - -It's related to the following Python change -https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build - -Python distutils adds correct link options automatically. - -- selinux python module doesn't provide any Python metadata - -When selinux python module was built manually, it didn't provide any metadata. -distutils takes care about that so that selinux Python module is visible for -pip: - -$ pip3 list | grep selinux -selinux 2.9 - -Signed-off-by: Petr Lautrbach -[Upstream: commit 2efa06857575e4118e91ca250b6b92da68b130d5] -Signed-off-by: Thomas Petazzoni ---- - src/.gitignore | 2 +- - src/Makefile | 36 ++++++++---------------------------- - src/setup.py | 24 ++++++++++++++++++++++++ - 3 files changed, 33 insertions(+), 29 deletions(-) - create mode 100644 libselinux/src/setup.py - -diff --git a/src/.gitignore b/src/.gitignore -index 4dcc3b3b..428afe5a 100644 ---- a/src/.gitignore -+++ b/src/.gitignore -@@ -1,4 +1,4 @@ - selinux.py --selinuxswig_wrap.c -+selinuxswig_python_wrap.c - selinuxswig_python_exception.i - selinuxswig_ruby_wrap.c -diff --git a/src/Makefile b/src/Makefile -index e9ed0383..2b1696a0 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -36,7 +36,7 @@ TARGET=libselinux.so - LIBPC=libselinux.pc - SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i - SWIGRUBYIF= selinuxswig_ruby.i --SWIGCOUT= selinuxswig_wrap.c -+SWIGCOUT= selinuxswig_python_wrap.c - SWIGPYOUT= selinux.py - SWIGRUBYCOUT= selinuxswig_ruby_wrap.c - SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT)) -@@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),) - LDLIBS_LIBSEPOLA := -l:libsepol.a - endif - --GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i -+GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i - SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) - - MAX_STACK_SIZE=32768 -@@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND - SRCS:= $(filter-out label_backends_android.c, $(SRCS)) - endif - --SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) -- - SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) - - all: $(LIBA) $(LIBSO) $(LIBPC) - --pywrap: all $(SWIGFILES) $(AUDIT2WHYSO) -+pywrap: all selinuxswig_python_exception.i -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) - - rubywrap: all $(SWIGRUBYSO) - --$(SWIGLOBJ): $(SWIGCOUT) -- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $< -- - $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - --$(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS) -- - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS) - -@@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION - selinuxswig_python_exception.i: ../include/selinux/selinux.h - bash -e exception.sh > $@ || (rm -f $@ ; false) - --$(AUDIT2WHYLOBJ): audit2why.c -- $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< -- --$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA) -- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs -- - %.o: %.c policy.h - $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< - - %.lo: %.c policy.h - $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< - --$(SWIGCOUT): $(SWIGIF) -- $(SWIG) $< -- --$(SWIGPYOUT): $(SWIGCOUT) -- - $(SWIGRUBYCOUT): $(SWIGRUBYIF) - $(SWIGRUBY) $< - --swigify: $(SWIGIF) -- $(SWIG) $< -- - install: all - test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR) - install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR) -@@ -194,10 +173,9 @@ install: all - ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) - - install-pywrap: pywrap -- test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux -- install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) -- install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT) -+ $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) - - install-rubywrap: rubywrap - test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -@@ -208,6 +186,8 @@ relabel: - - clean-pywrap: - -rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO) -+ $(PYTHON) setup.py clean -+ -rm -rf build *~ \#* *pyc .#* - - clean-rubywrap: - -rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO) -diff --git a/src/setup.py b/src/setup.py -new file mode 100644 -index 00000000..4dc03f55 ---- /dev/null -+++ b/src/setup.py -@@ -0,0 +1,24 @@ -+#!/usr/bin/python3 -+ -+from distutils.core import Extension, setup -+ -+setup( -+ name="selinux", -+ version="2.9", -+ description="SELinux python 3 bindings", -+ author="SELinux Project", -+ author_email="selinux@vger.kernel.org", -+ ext_modules=[ -+ Extension('selinux._selinux', -+ sources=['selinuxswig_python.i'], -+ include_dirs=['../include'], -+ library_dirs=['.'], -+ libraries=['selinux']), -+ Extension('selinux.audit2why', -+ sources=['audit2why.c'], -+ include_dirs=['../include'], -+ library_dirs=['.'], -+ libraries=['selinux'], -+ extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map']) -+ ], -+) --- -2.21.0 - diff --git a/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch b/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch deleted file mode 100644 index 4c568d338..000000000 --- a/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4b1568bce5bbdc7bf76a4bbf1066ba7e7b84649f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 25 Oct 2019 11:45:04 +0200 -Subject: [PATCH] src/Makefile: don't pass bogus -I and -L to python setup.py - build_ext - -Using $(DESTDIR) during the build does not follow the normal/standard -semantic of DESTDIR: it is normally only needed during the -installation. Therefore, a lot of build systems/environments don't -pass any DESTDIR at build time, which causes setup.py to be called -with -I /usr/include -L /usr/lib, which breaks cross-compilation. - -[Upstream: https://github.com/SELinuxProject/selinux/pull/183] -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 2b1696a0..3b8bad81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -130,7 +130,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) - all: $(LIBA) $(LIBSO) $(LIBPC) - - pywrap: all selinuxswig_python_exception.i -- CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext - - rubywrap: all $(SWIGRUBYSO) - --- -2.21.0 - diff --git a/buildroot/package/libselinux/libselinux.hash b/buildroot/package/libselinux/libselinux.hash index ed61ea8bd..1101b4050 100644 --- a/buildroot/package/libselinux/libselinux.hash +++ b/buildroot/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693 libselinux-2.9.tar.gz +sha256 ea5dcbb4d859e3f999c26a13c630da2f16dff9462e3cc8cb7b458ac157d112e7 libselinux-3.1.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/buildroot/package/libselinux/libselinux.mk b/buildroot/package/libselinux/libselinux.mk index 1461e3453..8087af539 100644 --- a/buildroot/package/libselinux/libselinux.mk +++ b/buildroot/package/libselinux/libselinux.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 2.9 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSELINUX_VERSION = 3.1 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE @@ -27,18 +27,12 @@ LIBSELINUX_DEPENDENCIES += musl-fts LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig -LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSELINUX_DEPENDENCIES += python host-swig -LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif LIBSELINUX_MAKE_OPTS += \ $(PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -49,14 +43,15 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) swigify pywrap endef -endif # python || python3 +endif # python3 -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc -# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) +# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We +# set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the +# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) # when the python binding is enabled. LIBSELINUX_MAKE_OPTS += \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ + CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \ LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" define LIBSELINUX_BUILD_CMDS @@ -75,22 +70,12 @@ define LIBSELINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \ $(LIBSELINUX_MAKE_INSTALL_TARGETS) - # Create the selinuxfs mount point - if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ - echo "none /selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi + echo "none /sys/fs/selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-libsepol host-pcre host-swig - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif + host-libsepol host-pcre host-swig host-python3 HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ @@ -98,7 +83,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ SHLIBDIR=$(HOST_DIR)/lib \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(HOST_LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ @@ -116,5 +101,36 @@ define HOST_LIBSELINUX_INSTALL_CMDS $(HOST_LIBSELINUX_MAKE_OPTS) install-pywrap endef +define LIBSELINUX_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX) + $(call KCONFIG_SET_OPT,CONFIG_LSM,"selinux") + $(if $(BR2_TARGET_ROOTFS_EROFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_EROFS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_EROFS_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT2_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT2_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2_3), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT3_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_EXT2_4), + $(call KCONFIG_ENABLE_OPT,CONFIG_EXT4_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_F2FS), + $(call KCONFIG_ENABLE_OPT,CONFIG_F2FS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_F2FS_FS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_JFFS2), + $(call KCONFIG_ENABLE_OPT,CONFIG_JFS_SECURITY)) + $(if $(BR2_TARGET_ROOTFS_SQUASHFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_SQUASHFS_XATTR)) + $(if $(BR2_TARGET_ROOTFS_UBIFS), + $(call KCONFIG_ENABLE_OPT,CONFIG_UBIFS_FS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_UBIFS_FS_SECURITY)) +endef + $(eval $(generic-package)) $(eval $(host-generic-package)) diff --git a/buildroot/package/libsemanage/libsemanage.hash b/buildroot/package/libsemanage/libsemanage.hash index 871ed192c..a977ddabc 100644 --- a/buildroot/package/libsemanage/libsemanage.hash +++ b/buildroot/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2576349d344492e73b468059767268dec1dabd8c35f3c7222c3ec2448737bc1c libsemanage-2.9.tar.gz +sha256 22d6c75526e40d1781c30bcf29abf97171bdfe6780923f11c8e1c76a75a21ff8 libsemanage-3.1.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libsemanage/libsemanage.mk b/buildroot/package/libsemanage/libsemanage.mk index fd9034604..3ea0603f5 100644 --- a/buildroot/package/libsemanage/libsemanage.mk +++ b/buildroot/package/libsemanage/libsemanage.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.9 -LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEMANAGE_VERSION = 3.1 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 @@ -31,27 +31,17 @@ HOST_LIBSEMANAGE_DEPENDENCIES = \ host-libsepol \ host-libselinux \ host-bzip2 \ - host-swig + host-swig \ + host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \ - DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 -HOST_LIBSEMANAGE_MAKE_OPTS += \ + DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf \ PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/" \ PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_LIBSEMANAGE_DEPENDENCIES += host-python -HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/" \ - PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif define HOST_LIBSEMANAGE_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) all diff --git a/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch b/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch deleted file mode 100644 index af1303688..000000000 --- a/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch +++ /dev/null @@ -1,525 +0,0 @@ -From 6a30b31d31fb175f808ccedec1564943b9e91e78 Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -Date: Thu, 23 Jan 2020 13:57:13 +0100 -Subject: [PATCH] libsepol: fix CIL_KEY_* build errors with -fno-common - -GCC 10 comes with -fno-common enabled by default - fix the CIL_KEY_* -global variables to be defined only once in cil.c and declared in the -header file correctly with the 'extern' keyword, so that other units -including the file don't generate duplicate definitions. - -Upstream: https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c - -Signed-off-by: Ondrej Mosnacek -Signed-off-by: Matt Weber ---- - cil/src/cil.c | 161 +++++++++++++++++++++ - cil/src/cil_internal.h | 320 ++++++++++++++++++++--------------------- - 2 files changed, 321 insertions(+), 160 deletions(-) - -diff --git a/cil/src/cil.c b/cil/src/cil.c -index 2a7ec06..14bd443 100644 ---- a/cil/src/cil.c -+++ b/cil/src/cil.c -@@ -77,6 +77,167 @@ int cil_sym_sizes[CIL_SYM_ARRAY_NUM][CIL_SYM_NUM] = { - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1} - }; - -+char *CIL_KEY_CONS_T1; -+char *CIL_KEY_CONS_T2; -+char *CIL_KEY_CONS_T3; -+char *CIL_KEY_CONS_R1; -+char *CIL_KEY_CONS_R2; -+char *CIL_KEY_CONS_R3; -+char *CIL_KEY_CONS_U1; -+char *CIL_KEY_CONS_U2; -+char *CIL_KEY_CONS_U3; -+char *CIL_KEY_CONS_L1; -+char *CIL_KEY_CONS_L2; -+char *CIL_KEY_CONS_H1; -+char *CIL_KEY_CONS_H2; -+char *CIL_KEY_AND; -+char *CIL_KEY_OR; -+char *CIL_KEY_NOT; -+char *CIL_KEY_EQ; -+char *CIL_KEY_NEQ; -+char *CIL_KEY_CONS_DOM; -+char *CIL_KEY_CONS_DOMBY; -+char *CIL_KEY_CONS_INCOMP; -+char *CIL_KEY_CONDTRUE; -+char *CIL_KEY_CONDFALSE; -+char *CIL_KEY_SELF; -+char *CIL_KEY_OBJECT_R; -+char *CIL_KEY_STAR; -+char *CIL_KEY_TCP; -+char *CIL_KEY_UDP; -+char *CIL_KEY_DCCP; -+char *CIL_KEY_SCTP; -+char *CIL_KEY_AUDITALLOW; -+char *CIL_KEY_TUNABLEIF; -+char *CIL_KEY_ALLOW; -+char *CIL_KEY_DONTAUDIT; -+char *CIL_KEY_TYPETRANSITION; -+char *CIL_KEY_TYPECHANGE; -+char *CIL_KEY_CALL; -+char *CIL_KEY_TUNABLE; -+char *CIL_KEY_XOR; -+char *CIL_KEY_ALL; -+char *CIL_KEY_RANGE; -+char *CIL_KEY_GLOB; -+char *CIL_KEY_FILE; -+char *CIL_KEY_DIR; -+char *CIL_KEY_CHAR; -+char *CIL_KEY_BLOCK; -+char *CIL_KEY_SOCKET; -+char *CIL_KEY_PIPE; -+char *CIL_KEY_SYMLINK; -+char *CIL_KEY_ANY; -+char *CIL_KEY_XATTR; -+char *CIL_KEY_TASK; -+char *CIL_KEY_TRANS; -+char *CIL_KEY_TYPE; -+char *CIL_KEY_ROLE; -+char *CIL_KEY_USER; -+char *CIL_KEY_USERATTRIBUTE; -+char *CIL_KEY_USERATTRIBUTESET; -+char *CIL_KEY_SENSITIVITY; -+char *CIL_KEY_CATEGORY; -+char *CIL_KEY_CATSET; -+char *CIL_KEY_LEVEL; -+char *CIL_KEY_LEVELRANGE; -+char *CIL_KEY_CLASS; -+char *CIL_KEY_IPADDR; -+char *CIL_KEY_MAP_CLASS; -+char *CIL_KEY_CLASSPERMISSION; -+char *CIL_KEY_BOOL; -+char *CIL_KEY_STRING; -+char *CIL_KEY_NAME; -+char *CIL_KEY_SOURCE; -+char *CIL_KEY_TARGET; -+char *CIL_KEY_LOW; -+char *CIL_KEY_HIGH; -+char *CIL_KEY_LOW_HIGH; -+char *CIL_KEY_HANDLEUNKNOWN; -+char *CIL_KEY_HANDLEUNKNOWN_ALLOW; -+char *CIL_KEY_HANDLEUNKNOWN_DENY; -+char *CIL_KEY_HANDLEUNKNOWN_REJECT; -+char *CIL_KEY_MACRO; -+char *CIL_KEY_IN; -+char *CIL_KEY_MLS; -+char *CIL_KEY_DEFAULTRANGE; -+char *CIL_KEY_BLOCKINHERIT; -+char *CIL_KEY_BLOCKABSTRACT; -+char *CIL_KEY_CLASSORDER; -+char *CIL_KEY_CLASSMAPPING; -+char *CIL_KEY_CLASSPERMISSIONSET; -+char *CIL_KEY_COMMON; -+char *CIL_KEY_CLASSCOMMON; -+char *CIL_KEY_SID; -+char *CIL_KEY_SIDCONTEXT; -+char *CIL_KEY_SIDORDER; -+char *CIL_KEY_USERLEVEL; -+char *CIL_KEY_USERRANGE; -+char *CIL_KEY_USERBOUNDS; -+char *CIL_KEY_USERPREFIX; -+char *CIL_KEY_SELINUXUSER; -+char *CIL_KEY_SELINUXUSERDEFAULT; -+char *CIL_KEY_TYPEATTRIBUTE; -+char *CIL_KEY_TYPEATTRIBUTESET; -+char *CIL_KEY_EXPANDTYPEATTRIBUTE; -+char *CIL_KEY_TYPEALIAS; -+char *CIL_KEY_TYPEALIASACTUAL; -+char *CIL_KEY_TYPEBOUNDS; -+char *CIL_KEY_TYPEPERMISSIVE; -+char *CIL_KEY_RANGETRANSITION; -+char *CIL_KEY_USERROLE; -+char *CIL_KEY_ROLETYPE; -+char *CIL_KEY_ROLETRANSITION; -+char *CIL_KEY_ROLEALLOW; -+char *CIL_KEY_ROLEATTRIBUTE; -+char *CIL_KEY_ROLEATTRIBUTESET; -+char *CIL_KEY_ROLEBOUNDS; -+char *CIL_KEY_BOOLEANIF; -+char *CIL_KEY_NEVERALLOW; -+char *CIL_KEY_TYPEMEMBER; -+char *CIL_KEY_SENSALIAS; -+char *CIL_KEY_SENSALIASACTUAL; -+char *CIL_KEY_CATALIAS; -+char *CIL_KEY_CATALIASACTUAL; -+char *CIL_KEY_CATORDER; -+char *CIL_KEY_SENSITIVITYORDER; -+char *CIL_KEY_SENSCAT; -+char *CIL_KEY_CONSTRAIN; -+char *CIL_KEY_MLSCONSTRAIN; -+char *CIL_KEY_VALIDATETRANS; -+char *CIL_KEY_MLSVALIDATETRANS; -+char *CIL_KEY_CONTEXT; -+char *CIL_KEY_FILECON; -+char *CIL_KEY_IBPKEYCON; -+char *CIL_KEY_IBENDPORTCON; -+char *CIL_KEY_PORTCON; -+char *CIL_KEY_NODECON; -+char *CIL_KEY_GENFSCON; -+char *CIL_KEY_NETIFCON; -+char *CIL_KEY_PIRQCON; -+char *CIL_KEY_IOMEMCON; -+char *CIL_KEY_IOPORTCON; -+char *CIL_KEY_PCIDEVICECON; -+char *CIL_KEY_DEVICETREECON; -+char *CIL_KEY_FSUSE; -+char *CIL_KEY_POLICYCAP; -+char *CIL_KEY_OPTIONAL; -+char *CIL_KEY_DEFAULTUSER; -+char *CIL_KEY_DEFAULTROLE; -+char *CIL_KEY_DEFAULTTYPE; -+char *CIL_KEY_ROOT; -+char *CIL_KEY_NODE; -+char *CIL_KEY_PERM; -+char *CIL_KEY_ALLOWX; -+char *CIL_KEY_AUDITALLOWX; -+char *CIL_KEY_DONTAUDITX; -+char *CIL_KEY_NEVERALLOWX; -+char *CIL_KEY_PERMISSIONX; -+char *CIL_KEY_IOCTL; -+char *CIL_KEY_UNORDERED; -+char *CIL_KEY_SRC_INFO; -+char *CIL_KEY_SRC_CIL; -+char *CIL_KEY_SRC_HLL; -+ - static void cil_init_keys(void) - { - /* Initialize CIL Keys into strpool */ -diff --git a/cil/src/cil_internal.h b/cil/src/cil_internal.h -index 6ff3228..b07c068 100644 ---- a/cil/src/cil_internal.h -+++ b/cil/src/cil_internal.h -@@ -74,166 +74,166 @@ enum cil_pass { - /* - Keywords - */ --char *CIL_KEY_CONS_T1; --char *CIL_KEY_CONS_T2; --char *CIL_KEY_CONS_T3; --char *CIL_KEY_CONS_R1; --char *CIL_KEY_CONS_R2; --char *CIL_KEY_CONS_R3; --char *CIL_KEY_CONS_U1; --char *CIL_KEY_CONS_U2; --char *CIL_KEY_CONS_U3; --char *CIL_KEY_CONS_L1; --char *CIL_KEY_CONS_L2; --char *CIL_KEY_CONS_H1; --char *CIL_KEY_CONS_H2; --char *CIL_KEY_AND; --char *CIL_KEY_OR; --char *CIL_KEY_NOT; --char *CIL_KEY_EQ; --char *CIL_KEY_NEQ; --char *CIL_KEY_CONS_DOM; --char *CIL_KEY_CONS_DOMBY; --char *CIL_KEY_CONS_INCOMP; --char *CIL_KEY_CONDTRUE; --char *CIL_KEY_CONDFALSE; --char *CIL_KEY_SELF; --char *CIL_KEY_OBJECT_R; --char *CIL_KEY_STAR; --char *CIL_KEY_TCP; --char *CIL_KEY_UDP; --char *CIL_KEY_DCCP; --char *CIL_KEY_SCTP; --char *CIL_KEY_AUDITALLOW; --char *CIL_KEY_TUNABLEIF; --char *CIL_KEY_ALLOW; --char *CIL_KEY_DONTAUDIT; --char *CIL_KEY_TYPETRANSITION; --char *CIL_KEY_TYPECHANGE; --char *CIL_KEY_CALL; --char *CIL_KEY_TUNABLE; --char *CIL_KEY_XOR; --char *CIL_KEY_ALL; --char *CIL_KEY_RANGE; --char *CIL_KEY_GLOB; --char *CIL_KEY_FILE; --char *CIL_KEY_DIR; --char *CIL_KEY_CHAR; --char *CIL_KEY_BLOCK; --char *CIL_KEY_SOCKET; --char *CIL_KEY_PIPE; --char *CIL_KEY_SYMLINK; --char *CIL_KEY_ANY; --char *CIL_KEY_XATTR; --char *CIL_KEY_TASK; --char *CIL_KEY_TRANS; --char *CIL_KEY_TYPE; --char *CIL_KEY_ROLE; --char *CIL_KEY_USER; --char *CIL_KEY_USERATTRIBUTE; --char *CIL_KEY_USERATTRIBUTESET; --char *CIL_KEY_SENSITIVITY; --char *CIL_KEY_CATEGORY; --char *CIL_KEY_CATSET; --char *CIL_KEY_LEVEL; --char *CIL_KEY_LEVELRANGE; --char *CIL_KEY_CLASS; --char *CIL_KEY_IPADDR; --char *CIL_KEY_MAP_CLASS; --char *CIL_KEY_CLASSPERMISSION; --char *CIL_KEY_BOOL; --char *CIL_KEY_STRING; --char *CIL_KEY_NAME; --char *CIL_KEY_SOURCE; --char *CIL_KEY_TARGET; --char *CIL_KEY_LOW; --char *CIL_KEY_HIGH; --char *CIL_KEY_LOW_HIGH; --char *CIL_KEY_HANDLEUNKNOWN; --char *CIL_KEY_HANDLEUNKNOWN_ALLOW; --char *CIL_KEY_HANDLEUNKNOWN_DENY; --char *CIL_KEY_HANDLEUNKNOWN_REJECT; --char *CIL_KEY_MACRO; --char *CIL_KEY_IN; --char *CIL_KEY_MLS; --char *CIL_KEY_DEFAULTRANGE; --char *CIL_KEY_BLOCKINHERIT; --char *CIL_KEY_BLOCKABSTRACT; --char *CIL_KEY_CLASSORDER; --char *CIL_KEY_CLASSMAPPING; --char *CIL_KEY_CLASSPERMISSIONSET; --char *CIL_KEY_COMMON; --char *CIL_KEY_CLASSCOMMON; --char *CIL_KEY_SID; --char *CIL_KEY_SIDCONTEXT; --char *CIL_KEY_SIDORDER; --char *CIL_KEY_USERLEVEL; --char *CIL_KEY_USERRANGE; --char *CIL_KEY_USERBOUNDS; --char *CIL_KEY_USERPREFIX; --char *CIL_KEY_SELINUXUSER; --char *CIL_KEY_SELINUXUSERDEFAULT; --char *CIL_KEY_TYPEATTRIBUTE; --char *CIL_KEY_TYPEATTRIBUTESET; --char *CIL_KEY_EXPANDTYPEATTRIBUTE; --char *CIL_KEY_TYPEALIAS; --char *CIL_KEY_TYPEALIASACTUAL; --char *CIL_KEY_TYPEBOUNDS; --char *CIL_KEY_TYPEPERMISSIVE; --char *CIL_KEY_RANGETRANSITION; --char *CIL_KEY_USERROLE; --char *CIL_KEY_ROLETYPE; --char *CIL_KEY_ROLETRANSITION; --char *CIL_KEY_ROLEALLOW; --char *CIL_KEY_ROLEATTRIBUTE; --char *CIL_KEY_ROLEATTRIBUTESET; --char *CIL_KEY_ROLEBOUNDS; --char *CIL_KEY_BOOLEANIF; --char *CIL_KEY_NEVERALLOW; --char *CIL_KEY_TYPEMEMBER; --char *CIL_KEY_SENSALIAS; --char *CIL_KEY_SENSALIASACTUAL; --char *CIL_KEY_CATALIAS; --char *CIL_KEY_CATALIASACTUAL; --char *CIL_KEY_CATORDER; --char *CIL_KEY_SENSITIVITYORDER; --char *CIL_KEY_SENSCAT; --char *CIL_KEY_CONSTRAIN; --char *CIL_KEY_MLSCONSTRAIN; --char *CIL_KEY_VALIDATETRANS; --char *CIL_KEY_MLSVALIDATETRANS; --char *CIL_KEY_CONTEXT; --char *CIL_KEY_FILECON; --char *CIL_KEY_IBPKEYCON; --char *CIL_KEY_IBENDPORTCON; --char *CIL_KEY_PORTCON; --char *CIL_KEY_NODECON; --char *CIL_KEY_GENFSCON; --char *CIL_KEY_NETIFCON; --char *CIL_KEY_PIRQCON; --char *CIL_KEY_IOMEMCON; --char *CIL_KEY_IOPORTCON; --char *CIL_KEY_PCIDEVICECON; --char *CIL_KEY_DEVICETREECON; --char *CIL_KEY_FSUSE; --char *CIL_KEY_POLICYCAP; --char *CIL_KEY_OPTIONAL; --char *CIL_KEY_DEFAULTUSER; --char *CIL_KEY_DEFAULTROLE; --char *CIL_KEY_DEFAULTTYPE; --char *CIL_KEY_ROOT; --char *CIL_KEY_NODE; --char *CIL_KEY_PERM; --char *CIL_KEY_ALLOWX; --char *CIL_KEY_AUDITALLOWX; --char *CIL_KEY_DONTAUDITX; --char *CIL_KEY_NEVERALLOWX; --char *CIL_KEY_PERMISSIONX; --char *CIL_KEY_IOCTL; --char *CIL_KEY_UNORDERED; --char *CIL_KEY_SRC_INFO; --char *CIL_KEY_SRC_CIL; --char *CIL_KEY_SRC_HLL; -+extern char *CIL_KEY_CONS_T1; -+extern char *CIL_KEY_CONS_T2; -+extern char *CIL_KEY_CONS_T3; -+extern char *CIL_KEY_CONS_R1; -+extern char *CIL_KEY_CONS_R2; -+extern char *CIL_KEY_CONS_R3; -+extern char *CIL_KEY_CONS_U1; -+extern char *CIL_KEY_CONS_U2; -+extern char *CIL_KEY_CONS_U3; -+extern char *CIL_KEY_CONS_L1; -+extern char *CIL_KEY_CONS_L2; -+extern char *CIL_KEY_CONS_H1; -+extern char *CIL_KEY_CONS_H2; -+extern char *CIL_KEY_AND; -+extern char *CIL_KEY_OR; -+extern char *CIL_KEY_NOT; -+extern char *CIL_KEY_EQ; -+extern char *CIL_KEY_NEQ; -+extern char *CIL_KEY_CONS_DOM; -+extern char *CIL_KEY_CONS_DOMBY; -+extern char *CIL_KEY_CONS_INCOMP; -+extern char *CIL_KEY_CONDTRUE; -+extern char *CIL_KEY_CONDFALSE; -+extern char *CIL_KEY_SELF; -+extern char *CIL_KEY_OBJECT_R; -+extern char *CIL_KEY_STAR; -+extern char *CIL_KEY_TCP; -+extern char *CIL_KEY_UDP; -+extern char *CIL_KEY_DCCP; -+extern char *CIL_KEY_SCTP; -+extern char *CIL_KEY_AUDITALLOW; -+extern char *CIL_KEY_TUNABLEIF; -+extern char *CIL_KEY_ALLOW; -+extern char *CIL_KEY_DONTAUDIT; -+extern char *CIL_KEY_TYPETRANSITION; -+extern char *CIL_KEY_TYPECHANGE; -+extern char *CIL_KEY_CALL; -+extern char *CIL_KEY_TUNABLE; -+extern char *CIL_KEY_XOR; -+extern char *CIL_KEY_ALL; -+extern char *CIL_KEY_RANGE; -+extern char *CIL_KEY_GLOB; -+extern char *CIL_KEY_FILE; -+extern char *CIL_KEY_DIR; -+extern char *CIL_KEY_CHAR; -+extern char *CIL_KEY_BLOCK; -+extern char *CIL_KEY_SOCKET; -+extern char *CIL_KEY_PIPE; -+extern char *CIL_KEY_SYMLINK; -+extern char *CIL_KEY_ANY; -+extern char *CIL_KEY_XATTR; -+extern char *CIL_KEY_TASK; -+extern char *CIL_KEY_TRANS; -+extern char *CIL_KEY_TYPE; -+extern char *CIL_KEY_ROLE; -+extern char *CIL_KEY_USER; -+extern char *CIL_KEY_USERATTRIBUTE; -+extern char *CIL_KEY_USERATTRIBUTESET; -+extern char *CIL_KEY_SENSITIVITY; -+extern char *CIL_KEY_CATEGORY; -+extern char *CIL_KEY_CATSET; -+extern char *CIL_KEY_LEVEL; -+extern char *CIL_KEY_LEVELRANGE; -+extern char *CIL_KEY_CLASS; -+extern char *CIL_KEY_IPADDR; -+extern char *CIL_KEY_MAP_CLASS; -+extern char *CIL_KEY_CLASSPERMISSION; -+extern char *CIL_KEY_BOOL; -+extern char *CIL_KEY_STRING; -+extern char *CIL_KEY_NAME; -+extern char *CIL_KEY_SOURCE; -+extern char *CIL_KEY_TARGET; -+extern char *CIL_KEY_LOW; -+extern char *CIL_KEY_HIGH; -+extern char *CIL_KEY_LOW_HIGH; -+extern char *CIL_KEY_HANDLEUNKNOWN; -+extern char *CIL_KEY_HANDLEUNKNOWN_ALLOW; -+extern char *CIL_KEY_HANDLEUNKNOWN_DENY; -+extern char *CIL_KEY_HANDLEUNKNOWN_REJECT; -+extern char *CIL_KEY_MACRO; -+extern char *CIL_KEY_IN; -+extern char *CIL_KEY_MLS; -+extern char *CIL_KEY_DEFAULTRANGE; -+extern char *CIL_KEY_BLOCKINHERIT; -+extern char *CIL_KEY_BLOCKABSTRACT; -+extern char *CIL_KEY_CLASSORDER; -+extern char *CIL_KEY_CLASSMAPPING; -+extern char *CIL_KEY_CLASSPERMISSIONSET; -+extern char *CIL_KEY_COMMON; -+extern char *CIL_KEY_CLASSCOMMON; -+extern char *CIL_KEY_SID; -+extern char *CIL_KEY_SIDCONTEXT; -+extern char *CIL_KEY_SIDORDER; -+extern char *CIL_KEY_USERLEVEL; -+extern char *CIL_KEY_USERRANGE; -+extern char *CIL_KEY_USERBOUNDS; -+extern char *CIL_KEY_USERPREFIX; -+extern char *CIL_KEY_SELINUXUSER; -+extern char *CIL_KEY_SELINUXUSERDEFAULT; -+extern char *CIL_KEY_TYPEATTRIBUTE; -+extern char *CIL_KEY_TYPEATTRIBUTESET; -+extern char *CIL_KEY_EXPANDTYPEATTRIBUTE; -+extern char *CIL_KEY_TYPEALIAS; -+extern char *CIL_KEY_TYPEALIASACTUAL; -+extern char *CIL_KEY_TYPEBOUNDS; -+extern char *CIL_KEY_TYPEPERMISSIVE; -+extern char *CIL_KEY_RANGETRANSITION; -+extern char *CIL_KEY_USERROLE; -+extern char *CIL_KEY_ROLETYPE; -+extern char *CIL_KEY_ROLETRANSITION; -+extern char *CIL_KEY_ROLEALLOW; -+extern char *CIL_KEY_ROLEATTRIBUTE; -+extern char *CIL_KEY_ROLEATTRIBUTESET; -+extern char *CIL_KEY_ROLEBOUNDS; -+extern char *CIL_KEY_BOOLEANIF; -+extern char *CIL_KEY_NEVERALLOW; -+extern char *CIL_KEY_TYPEMEMBER; -+extern char *CIL_KEY_SENSALIAS; -+extern char *CIL_KEY_SENSALIASACTUAL; -+extern char *CIL_KEY_CATALIAS; -+extern char *CIL_KEY_CATALIASACTUAL; -+extern char *CIL_KEY_CATORDER; -+extern char *CIL_KEY_SENSITIVITYORDER; -+extern char *CIL_KEY_SENSCAT; -+extern char *CIL_KEY_CONSTRAIN; -+extern char *CIL_KEY_MLSCONSTRAIN; -+extern char *CIL_KEY_VALIDATETRANS; -+extern char *CIL_KEY_MLSVALIDATETRANS; -+extern char *CIL_KEY_CONTEXT; -+extern char *CIL_KEY_FILECON; -+extern char *CIL_KEY_IBPKEYCON; -+extern char *CIL_KEY_IBENDPORTCON; -+extern char *CIL_KEY_PORTCON; -+extern char *CIL_KEY_NODECON; -+extern char *CIL_KEY_GENFSCON; -+extern char *CIL_KEY_NETIFCON; -+extern char *CIL_KEY_PIRQCON; -+extern char *CIL_KEY_IOMEMCON; -+extern char *CIL_KEY_IOPORTCON; -+extern char *CIL_KEY_PCIDEVICECON; -+extern char *CIL_KEY_DEVICETREECON; -+extern char *CIL_KEY_FSUSE; -+extern char *CIL_KEY_POLICYCAP; -+extern char *CIL_KEY_OPTIONAL; -+extern char *CIL_KEY_DEFAULTUSER; -+extern char *CIL_KEY_DEFAULTROLE; -+extern char *CIL_KEY_DEFAULTTYPE; -+extern char *CIL_KEY_ROOT; -+extern char *CIL_KEY_NODE; -+extern char *CIL_KEY_PERM; -+extern char *CIL_KEY_ALLOWX; -+extern char *CIL_KEY_AUDITALLOWX; -+extern char *CIL_KEY_DONTAUDITX; -+extern char *CIL_KEY_NEVERALLOWX; -+extern char *CIL_KEY_PERMISSIONX; -+extern char *CIL_KEY_IOCTL; -+extern char *CIL_KEY_UNORDERED; -+extern char *CIL_KEY_SRC_INFO; -+extern char *CIL_KEY_SRC_CIL; -+extern char *CIL_KEY_SRC_HLL; - - /* - Symbol Table Array Indices --- -2.17.1 - diff --git a/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch b/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch deleted file mode 100644 index 57ead4d7b..000000000 --- a/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5f5f0dce25d46af57ddabd8713e548480f2460ab Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -Date: Thu, 23 Jan 2020 13:57:14 +0100 -Subject: [PATCH] libsepol: remove leftovers of cil_mem_error_handler - -Commit 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function -pointer") replaced cil_mem_error_handler usage with inline contents of -the default handler. However, it left over the header declaration and -two callers. Convert these as well and remove the header declaration. - -This also fixes a build failure with -fno-common. - -Upstream: https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0 - -Fixes: 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function pointer") -Signed-off-by: Ondrej Mosnacek -Signed-off-by: Matt Weber ---- - cil/src/cil_mem.h | 1 - - cil/src/cil_strpool.c | 8 ++++---- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/cil/src/cil_mem.h b/cil/src/cil_mem.h -index 902ce13..794f02a 100644 ---- a/cil/src/cil_mem.h -+++ b/cil/src/cil_mem.h -@@ -36,7 +36,6 @@ void *cil_calloc(size_t num_elements, size_t element_size); - void *cil_realloc(void *ptr, size_t size); - char *cil_strdup(const char *str); - int cil_asprintf(char **strp, const char *fmt, ...); --void (*cil_mem_error_handler)(void); - - #endif /* CIL_MEM_H_ */ - -diff --git a/cil/src/cil_strpool.c b/cil/src/cil_strpool.c -index 97d4c4b..2598bbf 100644 ---- a/cil/src/cil_strpool.c -+++ b/cil/src/cil_strpool.c -@@ -80,8 +80,8 @@ char *cil_strpool_add(const char *str) - int rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref); - if (rc != SEPOL_OK) { - pthread_mutex_unlock(&cil_strpool_mutex); -- (*cil_mem_error_handler)(); -- pthread_mutex_lock(&cil_strpool_mutex); -+ cil_log(CIL_ERR, "Failed to allocate memory\n"); -+ exit(1); - } - } - -@@ -104,8 +104,8 @@ void cil_strpool_init(void) - cil_strpool_tab = hashtab_create(cil_strpool_hash, cil_strpool_compare, CIL_STRPOOL_TABLE_SIZE); - if (cil_strpool_tab == NULL) { - pthread_mutex_unlock(&cil_strpool_mutex); -- (*cil_mem_error_handler)(); -- return; -+ cil_log(CIL_ERR, "Failed to allocate memory\n"); -+ exit(1); - } - } - cil_strpool_readers++; --- -2.17.1 - diff --git a/buildroot/package/libsepol/Config.in b/buildroot/package/libsepol/Config.in index 21d9e9617..6c66809c9 100644 --- a/buildroot/package/libsepol/Config.in +++ b/buildroot/package/libsepol/Config.in @@ -11,6 +11,7 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 @@ -27,7 +28,8 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION >= 3.5 < 3.14 28 (27 and 28 were added at the same time) >= 3.14 < 4.3 29 >= 4.3 < 4.13 30 - >= 4.13 31 + >= 4.13 < 5.5 31 + >= 5.5 32 endif diff --git a/buildroot/package/libsepol/libsepol.hash b/buildroot/package/libsepol/libsepol.hash index 83eb63213..1759d3ba0 100644 --- a/buildroot/package/libsepol/libsepol.hash +++ b/buildroot/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d libsepol-2.9.tar.gz +sha256 ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc libsepol-3.1.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libsepol/libsepol.mk b/buildroot/package/libsepol/libsepol.mk index 62b0744aa..7d8b7b206 100644 --- a/buildroot/package/libsepol/libsepol.mk +++ b/buildroot/package/libsepol/libsepol.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.9 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEPOL_VERSION = 3.1 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING diff --git a/buildroot/package/libsoundtouch/libsoundtouch.hash b/buildroot/package/libsoundtouch/libsoundtouch.hash index a79e62f03..aa33bb8a7 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.hash +++ b/buildroot/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c805e7a72b7758a8986b71e73d2f94a8c79c66c1246fa2af1743c4282702e096 libsoundtouch-010a91a59071c7fefd316fca62c0d980ec85b4b1.tar.gz -sha256 9c6a15d7433078e4c0d3cb9820f172bbf0bf829e7648d719dc85c1429815519b COPYING.TXT +sha256 3a431facf019f37cc2da112156226d686e941b15d6327f3a41d7ca21dfaf8e94 libsoundtouch-2.1.2.tar.gz +sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT diff --git a/buildroot/package/libsoundtouch/libsoundtouch.mk b/buildroot/package/libsoundtouch/libsoundtouch.mk index fcc2332fa..9b040e391 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.mk +++ b/buildroot/package/libsoundtouch/libsoundtouch.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1 -LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git -LIBSOUNDTOUCH_SITE_METHOD = git +LIBSOUNDTOUCH_VERSION = 2.1.2 +LIBSOUNDTOUCH_SITE = https://gitlab.com/soundtouch/soundtouch/-/archive/$(LIBSOUNDTOUCH_VERSION) LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES diff --git a/buildroot/package/libsoup/libsoup.mk b/buildroot/package/libsoup/libsoup.mk index 95bd68201..07c9d787b 100644 --- a/buildroot/package/libsoup/libsoup.mk +++ b/buildroot/package/libsoup/libsoup.mk @@ -16,6 +16,13 @@ LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ libglib2 libxml2 sqlite host-intltool +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBSOUP_CONF_OPTS += --with-introspection +LIBSOUP_DEPENDENCIES += gobject-introspection +else +LIBSOUP_CONF_OPTS += --without-introspection +endif + ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) LIBSOUP_CONF_OPTS += --with-gnome else diff --git a/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch deleted file mode 100644 index 3316a3825..000000000 --- a/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2333cd804e33e67567b656b847094cd9a8c8fbbf Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 22 Sep 2019 20:58:19 +0200 -Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library - -Building a shared library doesn't work on all platforms, so instead, -let CMake rely on the standard BUILD_SHARED_LIBS variable to decide -whether a static or shared library should be built. - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/libspatialindex/libspatialindex/pull/158] ---- - src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e6b733b..f8a4980 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -194,9 +194,9 @@ if (NOT WITH_STATIC_LASZIP) - endif() - endif() - --add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES}) -+add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES}) - --add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP}) -+add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP}) - - target_link_libraries(${SIDX_C_LIB_NAME} - ${SIDX_LIB_NAME} --- -2.23.0 - diff --git a/buildroot/package/libspatialindex/0001-allow-building-static-libs.patch b/buildroot/package/libspatialindex/0001-allow-building-static-libs.patch new file mode 100644 index 000000000..09435cc1f --- /dev/null +++ b/buildroot/package/libspatialindex/0001-allow-building-static-libs.patch @@ -0,0 +1,32 @@ +From caee28d84685071da3ff3a4ea57ff0b6ae64fc87 Mon Sep 17 00:00:00 2001 +From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> +Date: Sat, 28 Mar 2020 19:08:40 +0100 +Subject: [PATCH] allow building static libs (#183) + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/libspatialindex/libspatialindex/commit/caee28d84685071da3ff3a4ea57ff0b6ae64fc87] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c34ee8d..3bfac51 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,7 +43,6 @@ SET(SIDX_VERSION_MINOR "9") + SET(SIDX_VERSION_PATCH "3") + SET(SIDX_LIB_VERSION "6.1.1") + SET(SIDX_LIB_SOVERSION "6") +-SET(BUILD_SHARED_LIBS ON) + + + set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}") +@@ -52,6 +51,7 @@ set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERS + # libspatialindex general cmake options + #------------------------------------------------------------------------------ + ++option(BUILD_SHARED_LIBS "Build shared libraries" ON) + option(SIDX_BUILD_TESTS "Enables integrated test suites" OFF) + + diff --git a/buildroot/package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch b/buildroot/package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch new file mode 100644 index 000000000..fe94020fd --- /dev/null +++ b/buildroot/package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch @@ -0,0 +1,30 @@ +From 26d417b9f981cf9a6df42d89fd297539b96180cb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Apr 2020 18:03:31 +0200 +Subject: [PATCH] CMakeLists.txt: fix CMAKE_BUILD_TYPE (#188) + +The user is unable to override CMAKE_BUILD_TYPE since version 1.9.1 and +https://github.com/libspatialindex/libspatialindex/commit/e3bcccf38d9f100b59ccf29f7e1cfa174969decd + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/libspatialindex/libspatialindex/commit/26d417b9f981cf9a6df42d89fd297539b96180cb] +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 191ac72..84676a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,8 +93,10 @@ INCLUDE (CheckIncludeFiles) + + # note we default to RelWithDebInfo mode + if(NOT MSVC_IDE) ++ if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE) ++ endif() + message(STATUS "Setting libspatialindex build type - ${CMAKE_BUILD_TYPE}") + endif() + diff --git a/buildroot/package/libspatialindex/libspatialindex.hash b/buildroot/package/libspatialindex/libspatialindex.hash index 4eda28237..ca679db96 100644 --- a/buildroot/package/libspatialindex/libspatialindex.hash +++ b/buildroot/package/libspatialindex/libspatialindex.hash @@ -1,5 +1,5 @@ -# From https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.bz2.sha512sum -sha512 dbf9601c878f245899d7336347674e96e8eeb715ec33a36ade44f3cc821c1dca7995cb09197a382bfd97da75c38f37b04f4d8f81ffbf38fef65fff82c5d1d2f3 spatialindex-src-1.9.0.tar.bz2 +# From https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2.sha512sum +sha512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066 spatialindex-src-1.9.3.tar.bz2 # Hash for license file -sha256 b63ebfaca9d7ce582580f3e11acabc9d2e37c46ce234533f7fa8a6c7278898a0 COPYING +sha256 b63ebfaca9d7ce582580f3e11acabc9d2e37c46ce234533f7fa8a6c7278898a0 COPYING diff --git a/buildroot/package/libspatialindex/libspatialindex.mk b/buildroot/package/libspatialindex/libspatialindex.mk index 57088a2e1..0ff313d81 100644 --- a/buildroot/package/libspatialindex/libspatialindex.mk +++ b/buildroot/package/libspatialindex/libspatialindex.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPATIALINDEX_VERSION = 1.9.0 +LIBSPATIALINDEX_VERSION = 1.9.3 LIBSPATIALINDEX_SITE = \ https://github.com/libspatialindex/libspatialindex/releases/download/$(LIBSPATIALINDEX_VERSION) LIBSPATIALINDEX_SOURCE = spatialindex-src-$(LIBSPATIALINDEX_VERSION).tar.bz2 diff --git a/buildroot/package/libstrophe/libstrophe.hash b/buildroot/package/libstrophe/libstrophe.hash index 1e46a82bc..5f3b098c8 100644 --- a/buildroot/package/libstrophe/libstrophe.hash +++ b/buildroot/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8a3b79f62177ed59c01d4d4108357ff20bd933d53b845ee4e350d304c051a4fe libstrophe-0.9.3.tar.gz +sha256 8d804e4c74cea1133203cc95a59a88f700fbdaead076e7959b495d734dd7936d libstrophe-0.10.0.tar.gz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/buildroot/package/libstrophe/libstrophe.mk b/buildroot/package/libstrophe/libstrophe.mk index d5434f503..81fc1b9f9 100644 --- a/buildroot/package/libstrophe/libstrophe.mk +++ b/buildroot/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.9.3 +LIBSTROPHE_VERSION = 0.10.0 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf # Doesn't ship configure diff --git a/buildroot/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch b/buildroot/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch new file mode 100644 index 000000000..1f1abc7d9 --- /dev/null +++ b/buildroot/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch @@ -0,0 +1,35 @@ +From cf1b20f3d881a1cfbf8cae1f615f45a5a4fbb3b4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Apr 2020 18:35:55 +0200 +Subject: [PATCH] fuzz/Makefile.am: do not force static + +Don't force static when linking corpus2arry to libtasn1 otherwise the +build will fail if libtasn1 has been built only as a shared library: + + CCLD corpus2array +/home/fabrice/buildroot/output/host/lib/gcc/arm-buildroot-linux-musleabihf/8.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: attempted static link of dynamic object `../lib/.libs/libtasn1.so' +collect2: error: ld returned 1 exit status + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/gnutls/libtasn1/-/merge_requests/61] +--- + fuzz/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am +index c6310d1..1fb7152 100644 +--- a/fuzz/Makefile.am ++++ b/fuzz/Makefile.am +@@ -26,7 +26,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS) + AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes -I$(srcdir) \ + -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl -DSRCDIR=\"$(abs_srcdir)\" \ + $(CODE_COVERAGE_CPPFLAGS) +-AM_LDFLAGS = -no-install -static ++AM_LDFLAGS = -no-install + + LDADD = ../lib/gl/libgnu.la ../lib/libtasn1.la $(FUZZ_LIBS) $(CODE_COVERAGE_LIBS) + +-- +2.25.1 + diff --git a/buildroot/package/libtasn1/libtasn1.hash b/buildroot/package/libtasn1/libtasn1.hash index e25e18abf..93cfa1a68 100644 --- a/buildroot/package/libtasn1/libtasn1.hash +++ b/buildroot/package/libtasn1/libtasn1.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.14.tar.gz.sig -sha256 9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08 libtasn1-4.14.tar.gz +# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.16.0.tar.gz.sig +sha256 0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d libtasn1-4.16.0.tar.gz # Locally calculated -sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER +sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/buildroot/package/libtasn1/libtasn1.mk b/buildroot/package/libtasn1/libtasn1.mk index 50afc4cdf..d5a6c6996 100644 --- a/buildroot/package/libtasn1/libtasn1.mk +++ b/buildroot/package/libtasn1/libtasn1.mk @@ -4,13 +4,19 @@ # ################################################################################ -LIBTASN1_VERSION = 4.14 +LIBTASN1_VERSION = 4.16.0 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 -LIBTASN1_DEPENDENCIES = host-bison +LIBTASN1_DEPENDENCIES = host-bison host-pkgconf LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) LIBTASN1_LICENSE_FILES = LICENSE doc/COPYING doc/COPYING.LESSER LIBTASN1_INSTALL_STAGING = YES + +# We're patching fuzz/Makefile.am +LIBTASN1_AUTORECONF = YES + # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" +LIBTASN1_CONF_OPTS = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + $(eval $(autotools-package)) diff --git a/buildroot/package/libtextstyle/libtextstyle.hash b/buildroot/package/libtextstyle/libtextstyle.hash new file mode 100644 index 000000000..5c5aee85b --- /dev/null +++ b/buildroot/package/libtextstyle/libtextstyle.hash @@ -0,0 +1,6 @@ +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/buildroot/package/libtextstyle/libtextstyle.mk b/buildroot/package/libtextstyle/libtextstyle.mk new file mode 100644 index 000000000..a5afad04b --- /dev/null +++ b/buildroot/package/libtextstyle/libtextstyle.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libtextstyle +# +################################################################################ + +# Please keep in sync with package/gettext-gnu/gettext-gnu.mk +LIBTEXTSTYLE_VERSION = 0.20.1 +LIBTEXTSTYLE_SITE = $(BR2_GNU_MIRROR)/gettext +LIBTEXTSTYLE_SOURCE = gettext-$(LIBTEXTSTYLE_VERSION).tar.xz +LIBTEXTSTYLE_INSTALL_STAGING = YES +LIBTEXTSTYLE_LICENSE = GPL-3.0+ +LIBTEXTSTYLE_LICENSE_FILES = COPYING +HOST_LIBTEXTSTYLE_DL_SUBDIR = gettext-gnu +HOST_LIBTEXTSTYLE_SUBDIR = libtextstyle + +# gettext-tools require libtextstyle.m4 +define HOST_LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 \ + $(ACLOCAL_HOST_DIR)/libtextstyle.m4 +endef +HOST_LIBTEXTSTYLE_POST_INSTALL_HOOKS += HOST_LIBTEXTSTYLE_INSTALL_M4 + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash index a7907dc7b..e43755428 100644 --- a/buildroot/package/libtirpc/libtirpc.hash +++ b/buildroot/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 ab80619b214d93e5cfbf22a0d01e1ee06d434326 libtirpc-1.2.5.tar.bz2 +sha1 f182235e32942fc0ac6b9b5b6fe7e32f69362659 libtirpc-1.2.6.tar.bz2 # Locally computed -sha256 f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca libtirpc-1.2.5.tar.bz2 +sha256 4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc libtirpc-1.2.6.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk index 879b21e66..f1bdc32eb 100644 --- a/buildroot/package/libtirpc/libtirpc.mk +++ b/buildroot/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.2.5 +LIBTIRPC_VERSION = 1.2.6 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch b/buildroot/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch new file mode 100644 index 000000000..c25002ba7 --- /dev/null +++ b/buildroot/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch @@ -0,0 +1,44 @@ +From 4e90f3185aea9160c28f3eaec5625b67fc0f67db Mon Sep 17 00:00:00 2001 +From: Daniel Green +Date: Sun, 9 Feb 2020 11:06:53 -0500 +Subject: [PATCH] Build+test bn_mp_set_double.c on more platforms + +Not all platforms/environments/architectures that support enough of +IEEE 754 for the purposes of mp_set_double() actually support enough +to legitimately define __STDC_IEC_559__, so only relying on that is +too strict. Fixes https://github.com/libtom/libtommath/issues/159 + +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from: +https://github.com/libtom/libtommath/commit/4e90f3185aea9160c28f3eaec5625b67fc0f67db] +--- + demo/test.c | 2 +- + bn_mp_set_double.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/demo/test.c b/demo/test.c +index 998f14b3..f719709d 100644 +--- a/demo/test.c ++++ b/demo/test.c +@@ -522,7 +522,7 @@ static int test_mp_invmod(void) + + } + +-#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) ++#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) || defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(_M_X86) || defined(__aarch64__) || defined(__arm__) + static int test_mp_set_double(void) + { + int i; +diff --git a/mp_set_double.c b/mp_set_double.c +index 78550c8f..cdc644d9 100644 +--- a/bn_mp_set_double.c ++++ b/bn_mp_set_double.c +@@ -3,7 +3,7 @@ + /* LibTomMath, multiple-precision integer library -- Tom St Denis */ + /* SPDX-License-Identifier: Unlicense */ + +-#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) ++#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) || defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(_M_X86) || defined(__aarch64__) || defined(__arm__) + mp_err mp_set_double(mp_int *a, double b) + { + uint64_t frac; diff --git a/buildroot/package/libtommath/libtommath.hash b/buildroot/package/libtommath/libtommath.hash index 75aa7c7f1..fa1af5ec2 100644 --- a/buildroot/package/libtommath/libtommath.hash +++ b/buildroot/package/libtommath/libtommath.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 90466c88783d1fe9f5c2364a69f5479f10d73ed616011be6196f35f7f1537ead ltm-1.1.0.tar.xz +sha256 b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1 ltm-1.2.0.tar.xz # Hashes for license files: sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE diff --git a/buildroot/package/libtommath/libtommath.mk b/buildroot/package/libtommath/libtommath.mk index 36e7a89e6..bd3957d6c 100644 --- a/buildroot/package/libtommath/libtommath.mk +++ b/buildroot/package/libtommath/libtommath.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTOMMATH_VERSION = 1.1.0 +LIBTOMMATH_VERSION = 1.2.0 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_LICENSE = Unlicense diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 78dbdf8ae..2246d8994 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8759bddb589006ee164438588adaf007325b3bcaf6ae4c64d87a2b914409c680 libtorrent-rasterbar-1.2.4.tar.gz +sha256 bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00 libtorrent-rasterbar-1.2.7.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 5b80e9923..1d23f00b3 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.4 -LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) +LIBTORRENT_RASTERBAR_VERSION = 1.2.7 +LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent_$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl diff --git a/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch index c1196d615..2a234af78 100644 --- a/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch +++ b/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch @@ -22,25 +22,33 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON" Signed-off-by: Pierre-Jean Texier [Upstream status: http://patchwork.ozlabs.org/patch/1103437/] --- - src/CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 051732b..c5f6dcb 100644 +index a04dd11..3a2115d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -10,10 +10,9 @@ SET(include_HEADERS - libuboot.h - ) +@@ -12,17 +12,15 @@ SET(include_HEADERS + + include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable -add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS}) +add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS}) - SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION}) + SET_TARGET_PROPERTIES(ubootenv PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION}) -ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS}) +-SET_TARGET_PROPERTIES(ubootenv_static PROPERTIES OUTPUT_NAME ubootenv) add_executable(fw_printenv fw_printenv.c) add_executable(fw_setenv fw_setenv.c) target_link_libraries(fw_printenv ubootenv z) + target_link_libraries(fw_setenv ubootenv z) + +-install (TARGETS ubootenv ubootenv_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install (FILES libuboot.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install (TARGETS fw_printenv DESTINATION ${CMAKE_INSTALL_BINDIR}) + install (TARGETS fw_setenv DESTINATION ${CMAKE_INSTALL_BINDIR}) -- -2.7.4 +2.25.1 diff --git a/buildroot/package/libubootenv/libubootenv.hash b/buildroot/package/libubootenv/libubootenv.hash index bde2ac30e..a655ed234 100644 --- a/buildroot/package/libubootenv/libubootenv.hash +++ b/buildroot/package/libubootenv/libubootenv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 332c45d46401f1859f0781fd0fd316bb1c251264674677c26a4d9b9e1c592719 libubootenv-879c0731fa0725785b9fa4499bbf6aacd04ee4c2.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt +sha256 4c52dd908b69f18cdd5721b3f24573fb276e61115f66edb74906d766ca60399f libubootenv-0.3.1.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/buildroot/package/libubootenv/libubootenv.mk b/buildroot/package/libubootenv/libubootenv.mk index 99cbd0da2..61516710a 100644 --- a/buildroot/package/libubootenv/libubootenv.mk +++ b/buildroot/package/libubootenv/libubootenv.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOOTENV_VERSION = 879c0731fa0725785b9fa4499bbf6aacd04ee4c2 -LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_VERSION = 0.3.1 +LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1 LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt LIBUBOOTENV_INSTALL_STAGING = YES diff --git a/buildroot/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch b/buildroot/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch new file mode 100644 index 000000000..09128db9e --- /dev/null +++ b/buildroot/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch @@ -0,0 +1,47 @@ +From eb7eb6393d47a918c420f5b287946dbd6c0d5f57 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Petr=20=C5=A0tetiar?= +Date: Wed, 25 Dec 2019 10:27:59 +0100 +Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Fixes following warning reported by GCC 10.0.0 20191203: + + blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds] + 234 | strcpy((char *) hdr->name, (const char *)name); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + In file included from blobmsg.c:16: + blobmsg.h:42:10: note: subobject 'name' declared here + 42 | uint8_t name[]; + | ^~~~ + +Reported-by: Khem Raj +Signed-off-by: Petr Å tetiar +[Retrieved from: +https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57] +Signed-off-by: Fabrice Fontaine +--- + blobmsg.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/blobmsg.c b/blobmsg.c +index 48dba81..37821c3 100644 +--- a/blobmsg.c ++++ b/blobmsg.c +@@ -240,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v + attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED); + hdr = blob_data(attr); + hdr->namelen = cpu_to_be16(namelen); +- strcpy((char *) hdr->name, (const char *)name); ++ ++ memcpy(hdr->name, name, namelen); ++ hdr->name[namelen] = '\0'; ++ + pad_end = *data = blobmsg_data(attr); + pad_start = (char *) &hdr->name[namelen]; + if (pad_start < pad_end) +-- +2.20.1 + diff --git a/buildroot/package/libudfread/Config.in b/buildroot/package/libudfread/Config.in new file mode 100644 index 000000000..8d4257050 --- /dev/null +++ b/buildroot/package/libudfread/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBUDFREAD + bool "libudfread" + help + UDF reader + + https://code.videolan.org/videolan/libudfread diff --git a/buildroot/package/libudfread/libudfread.hash b/buildroot/package/libudfread/libudfread.hash new file mode 100644 index 000000000..71ee60b39 --- /dev/null +++ b/buildroot/package/libudfread/libudfread.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 93231b5b2158548481e6a129d27d3fb75518cc44a49ad27a2a229340a49e8c08 libudfread-1.1.0.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libudfread/libudfread.mk b/buildroot/package/libudfread/libudfread.mk new file mode 100644 index 000000000..1861a1556 --- /dev/null +++ b/buildroot/package/libudfread/libudfread.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libudfread +# +################################################################################ + +LIBUDFREAD_VERSION = 1.1.0 +LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.bz2 +LIBUDFREAD_SITE = https://code.videolan.org/videolan/libudfread/-/archive/$(LIBUDFREAD_VERSION) +LIBUDFREAD_AUTORECONF = YES +LIBUDFREAD_INSTALL_STAGING = YES +LIBUDFREAD_LICENSE = LGPL-2.1+ +LIBUDFREAD_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/buildroot/package/libuev/Config.in b/buildroot/package/libuev/Config.in new file mode 100644 index 000000000..bb50099ce --- /dev/null +++ b/buildroot/package/libuev/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBUEV + bool "libuev" + help + Simple event loop for Linux. + + https://github.com/troglobit/libuev diff --git a/buildroot/package/libuev/libuev.hash b/buildroot/package/libuev/libuev.hash new file mode 100644 index 000000000..fece0e9b6 --- /dev/null +++ b/buildroot/package/libuev/libuev.hash @@ -0,0 +1,4 @@ +# From https://github.com/troglobit/libuev/releases/download/v2.3.1/libuev-2.3.1.tar.xz.md5 +md5 ec601f69f69477858fa023a75da23793 libuev-2.3.1.tar.xz +# License files +sha256 3c2bf3fdd85687242ba6f2b02b6ce5176aba15b5e1a2ccb8b608439197ec4641 LICENSE diff --git a/buildroot/package/libuev/libuev.mk b/buildroot/package/libuev/libuev.mk new file mode 100644 index 000000000..c7b73b422 --- /dev/null +++ b/buildroot/package/libuev/libuev.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libuev +# +################################################################################ + +LIBUEV_VERSION = 2.3.1 +LIBUEV_SOURCE = libuev-$(LIBUEV_VERSION).tar.xz +LIBUEV_SITE = https://github.com/troglobit/libuev/releases/download/v$(LIBUEV_VERSION) +LIBUEV_LICENSE = MIT +LIBUEV_LICENSE_FILES = LICENSE +LIBUEV_INSTALL_STAGING = YES +LIBUEV_CONF_OPTS = --disable-examples + +$(eval $(autotools-package)) diff --git a/buildroot/package/libuhttpd/Config.in b/buildroot/package/libuhttpd/Config.in new file mode 100644 index 000000000..1ab39c587 --- /dev/null +++ b/buildroot/package/libuhttpd/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBUHTTPD + bool "libuhttpd" + select BR2_PACKAGE_LIBEV + help + A lightweight and fully asynchronous HTTP server + library based on libev + + https://github.com/zhaojh329/libuhttpd diff --git a/buildroot/package/libuhttpd/libuhttpd.hash b/buildroot/package/libuhttpd/libuhttpd.hash new file mode 100644 index 000000000..0e2d125fe --- /dev/null +++ b/buildroot/package/libuhttpd/libuhttpd.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a7650915f4444c84ad7ea813fcff44ae03eaf0c4cddfd2de4dcbf5ce9083874f libuhttpd-3.4.2.tar.gz +sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/buildroot/package/libuhttpd/libuhttpd.mk b/buildroot/package/libuhttpd/libuhttpd.mk new file mode 100644 index 000000000..fe8621c80 --- /dev/null +++ b/buildroot/package/libuhttpd/libuhttpd.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# libuhttpd +# +################################################################################ + +LIBUHTTPD_VERSION = 3.4.2 +LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) +LIBUHTTPD_LICENSE = MIT +LIBUHTTPD_LICENSE_FILES = LICENSE +LIBUHTTPD_INSTALL_STAGING = YES +LIBUHTTPD_DEPENDENCIES = libev +LIBUHTTPD_CONF_OPTS = -DBUILD_TEST_PLUGIN=OFF + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBUHTTPD_DEPENDENCIES += openssl +LIBUHTTPD_CONF_OPTS += \ + -DUHTTPD_SSL_SUPPORT=ON \ + -DUHTTPD_USE_MBEDTLS=OFF \ + -DUHTTPD_USE_OPENSSL=ON \ + -DUHTTPD_USE_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +LIBUHTTPD_DEPENDENCIES += wolfssl +LIBUHTTPD_CONF_OPTS += \ + -DUHTTPD_SSL_SUPPORT=ON \ + -DUHTTPD_USE_MBEDTLS=OFF \ + -DUHTTPD_USE_OPENSSL=OFF \ + -DUHTTPD_USE_WOLFSSL=ON +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBUHTTPD_DEPENDENCIES += mbedtls +LIBUHTTPD_CONF_OPTS += \ + -DUHTTPD_SSL_SUPPORT=ON \ + -DUHTTPD_USE_MBEDTLS=ON \ + -DUHTTPD_USE_OPENSSL=OFF \ + -DUHTTPD_USE_WOLFSSL=OFF +else +LIBUHTTPD_CONF_OPTS += -DUHTTPD_SSL_SUPPORT=OFF +endif + +# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch b/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch new file mode 100644 index 000000000..035bdae80 --- /dev/null +++ b/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch @@ -0,0 +1,46 @@ +From b9627ed74ab1f58be0de075be68d5cd2e96b8750 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 3 May 2020 23:08:54 +0200 +Subject: [PATCH] Use sigset_t instead of __sigset_t on AArch64 + +This fixes the build with the musl C library. sigset_t is the +documented type exposed by . + +This fix comes from Alpine Linux: + + https://git.alpinelinux.org/aports/plain/main/libunwind/fix-aarch64-sigset_t.patch + +It was authored by Leo . + +The issue has been reported upstream at +https://github.com/libunwind/libunwind/issues/176. + +Signed-off-by: Thomas Petazzoni +--- + include/libunwind-aarch64.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h +index 778b4362..926fbbc0 100644 +--- a/include/libunwind-aarch64.h ++++ b/include/libunwind-aarch64.h +@@ -34,6 +34,7 @@ extern "C" { + #include + #include + #include ++#include + + #define UNW_TARGET aarch64 + #define UNW_TARGET_AARCH64 1 +@@ -192,7 +193,7 @@ typedef struct + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; +- __sigset_t uc_sigmask; ++ sigset_t uc_sigmask; + struct unw_sigcontext uc_mcontext; + } unw_tdep_context_t; + +-- +2.26.2 + diff --git a/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch b/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch new file mode 100644 index 000000000..5ef2aeb32 --- /dev/null +++ b/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch @@ -0,0 +1,445 @@ +From 29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e Mon Sep 17 00:00:00 2001 +From: Yichao Yu +Date: Tue, 31 Mar 2020 00:43:32 -0400 +Subject: [PATCH] Fix compilation with -fno-common. + +Making all other archs consistent with IA64 which should not have this problem. +Also move the FIXME to the correct place. + +Also add some minimum comments about this... +[Retrieved from: +https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e] +Signed-off-by: Fabrice Fontaine +--- + src/aarch64/Ginit.c | 15 +++++++-------- + src/arm/Ginit.c | 15 +++++++-------- + src/coredump/_UPT_get_dyn_info_list_addr.c | 5 +++++ + src/hppa/Ginit.c | 15 +++++++-------- + src/ia64/Ginit.c | 1 + + src/mi/Gfind_dynamic_proc_info.c | 1 + + src/mips/Ginit.c | 15 +++++++-------- + src/ppc32/Ginit.c | 11 +++++++---- + src/ppc64/Ginit.c | 11 +++++++---- + src/ptrace/_UPT_get_dyn_info_list_addr.c | 5 +++++ + src/s390x/Ginit.c | 15 +++++++-------- + src/sh/Ginit.c | 15 +++++++-------- + src/tilegx/Ginit.c | 15 +++++++-------- + src/x86/Ginit.c | 15 +++++++-------- + src/x86_64/Ginit.c | 15 +++++++-------- + 15 files changed, 89 insertions(+), 80 deletions(-) + +diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c +index dec235c82..35389762f 100644 +--- a/src/aarch64/Ginit.c ++++ b/src/aarch64/Ginit.c +@@ -61,13 +61,6 @@ tdep_uc_addr (unw_tdep_context_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -78,7 +71,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/arm/Ginit.c b/src/arm/Ginit.c +index 2720d063a..0bac0d72d 100644 +--- a/src/arm/Ginit.c ++++ b/src/arm/Ginit.c +@@ -57,18 +57,17 @@ tdep_uc_addr (unw_tdep_context_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/coredump/_UPT_get_dyn_info_list_addr.c b/src/coredump/_UPT_get_dyn_info_list_addr.c +index 0d1190556..739ed0569 100644 +--- a/src/coredump/_UPT_get_dyn_info_list_addr.c ++++ b/src/coredump/_UPT_get_dyn_info_list_addr.c +@@ -74,6 +74,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + + #else + ++/* XXX fix me: there is currently no way to locate the dyn-info list ++ by a remote unwinder. On ia64, this is done via a special ++ unwind-table entry. Perhaps something similar can be done with ++ DWARF2 unwind info. */ ++ + static inline int + get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + int *countp) +diff --git a/src/hppa/Ginit.c b/src/hppa/Ginit.c +index 461e4b93d..265455a68 100644 +--- a/src/hppa/Ginit.c ++++ b/src/hppa/Ginit.c +@@ -64,13 +64,6 @@ _Uhppa_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -81,7 +74,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ia64/Ginit.c b/src/ia64/Ginit.c +index b09a2ad57..8601bb3ca 100644 +--- a/src/ia64/Ginit.c ++++ b/src/ia64/Ginit.c +@@ -68,6 +68,7 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + if (!_U_dyn_info_list_addr) + return -UNW_ENOINFO; + #endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. + *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } +diff --git a/src/mi/Gfind_dynamic_proc_info.c b/src/mi/Gfind_dynamic_proc_info.c +index 98d350128..2e7c62e5e 100644 +--- a/src/mi/Gfind_dynamic_proc_info.c ++++ b/src/mi/Gfind_dynamic_proc_info.c +@@ -49,6 +49,7 @@ local_find_proc_info (unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, + return -UNW_ENOINFO; + #endif + ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. + list = (unw_dyn_info_list_t *) (uintptr_t) _U_dyn_info_list_addr (); + for (di = list->first; di; di = di->next) + if (ip >= di->start_ip && ip < di->end_ip) +diff --git a/src/mips/Ginit.c b/src/mips/Ginit.c +index 3df170c75..bf7a8f5a8 100644 +--- a/src/mips/Ginit.c ++++ b/src/mips/Ginit.c +@@ -69,13 +69,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -86,7 +79,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c +index ba302448a..7b4545580 100644 +--- a/src/ppc32/Ginit.c ++++ b/src/ppc32/Ginit.c +@@ -91,9 +91,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -104,7 +101,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ppc64/Ginit.c b/src/ppc64/Ginit.c +index 4c88cd6e7..7bfb395a7 100644 +--- a/src/ppc64/Ginit.c ++++ b/src/ppc64/Ginit.c +@@ -95,9 +95,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -108,7 +105,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ptrace/_UPT_get_dyn_info_list_addr.c b/src/ptrace/_UPT_get_dyn_info_list_addr.c +index cc5ed0441..16671d453 100644 +--- a/src/ptrace/_UPT_get_dyn_info_list_addr.c ++++ b/src/ptrace/_UPT_get_dyn_info_list_addr.c +@@ -71,6 +71,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + + #else + ++/* XXX fix me: there is currently no way to locate the dyn-info list ++ by a remote unwinder. On ia64, this is done via a special ++ unwind-table entry. Perhaps something similar can be done with ++ DWARF2 unwind info. */ ++ + static inline int + get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + int *countp) +diff --git a/src/s390x/Ginit.c b/src/s390x/Ginit.c +index f0886ac93..db01743c0 100644 +--- a/src/s390x/Ginit.c ++++ b/src/s390x/Ginit.c +@@ -50,8 +50,6 @@ static struct unw_addr_space local_addr_space; + + unw_addr_space_t unw_local_addr_space = &local_addr_space; + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- + static inline void * + uc_addr (ucontext_t *uc, int reg) + { +@@ -75,11 +73,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -90,7 +83,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/sh/Ginit.c b/src/sh/Ginit.c +index 52988a721..9fe96d2bd 100644 +--- a/src/sh/Ginit.c ++++ b/src/sh/Ginit.c +@@ -58,13 +58,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -75,7 +68,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/tilegx/Ginit.c b/src/tilegx/Ginit.c +index 7564a558b..925e64132 100644 +--- a/src/tilegx/Ginit.c ++++ b/src/tilegx/Ginit.c +@@ -64,13 +64,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -81,7 +74,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c +index f6b8dc27d..3cec74a21 100644 +--- a/src/x86/Ginit.c ++++ b/src/x86/Ginit.c +@@ -54,13 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -71,7 +64,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/x86_64/Ginit.c b/src/x86_64/Ginit.c +index a865d3385..fd8d418b1 100644 +--- a/src/x86_64/Ginit.c ++++ b/src/x86_64/Ginit.c +@@ -49,13 +49,6 @@ static struct unw_addr_space local_addr_space; + + unw_addr_space_t unw_local_addr_space = &local_addr_space; + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -66,7 +59,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + diff --git a/buildroot/package/libunwind/Config.in b/buildroot/package/libunwind/Config.in index be576d13c..5284b5864 100644 --- a/buildroot/package/libunwind/Config.in +++ b/buildroot/package/libunwind/Config.in @@ -10,13 +10,14 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS bool default y if BR2_TOOLCHAIN_USES_GLIBC && \ - (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_sh || \ + BR2_i386 || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_MUSL && \ - (BR2_ARM_CPU_HAS_ARM || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_x86_64) config BR2_PACKAGE_LIBUNWIND bool "libunwind" diff --git a/buildroot/package/libunwind/libunwind.hash b/buildroot/package/libunwind/libunwind.hash index c8d44b44a..e3709b1b1 100644 --- a/buildroot/package/libunwind/libunwind.hash +++ b/buildroot/package/libunwind/libunwind.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8 libunwind-1.3.1.tar.gz +sha256 df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435 libunwind-1.4.0.tar.gz # Hash for license file -sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING +sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/buildroot/package/libunwind/libunwind.mk b/buildroot/package/libunwind/libunwind.mk index 26deaa5f0..a5bcec6be 100644 --- a/buildroot/package/libunwind/libunwind.mk +++ b/buildroot/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNWIND_VERSION = 1.3.1 +LIBUNWIND_VERSION = 1.4.0 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING diff --git a/buildroot/package/libupnp18/libupnp18.hash b/buildroot/package/libupnp18/libupnp18.hash index 68aee9ba6..ba9ce1bcd 100644 --- a/buildroot/package/libupnp18/libupnp18.hash +++ b/buildroot/package/libupnp18/libupnp18.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.6/libupnp-1.8.6.tar.bz2.sha1 -sha1 6132a949d7536dac835172609d1def1e7f2bd232 libupnp-1.8.6.tar.bz2 +# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.7/libupnp-1.8.7.tar.bz2.sha1 +sha1 2ea3011180c58b0584f0cb73cc8e685a0a1c4ec8 libupnp-1.8.7.tar.bz2 # Locally computed: -sha256 65faf240f8ccee50cc0e7fe7fb21dcd79f743fc227a9b652b091f50f6956c2c7 libupnp-1.8.6.tar.bz2 -sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING +sha256 e38c69b2b67322e67cd53680db9b02c7c1f720a47a3cd626fd89d57d2dca93b8 libupnp-1.8.7.tar.bz2 +sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libupnp18/libupnp18.mk b/buildroot/package/libupnp18/libupnp18.mk index f73c65683..f17a1a720 100644 --- a/buildroot/package/libupnp18/libupnp18.mk +++ b/buildroot/package/libupnp18/libupnp18.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP18_VERSION = 1.8.6 +LIBUPNP18_VERSION = 1.8.7 LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2 LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libupnp-$(LIBUPNP18_VERSION) LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no diff --git a/buildroot/package/libupnpp/Config.in b/buildroot/package/libupnpp/Config.in index a71eff542..41afa9300 100644 --- a/buildroot/package/libupnpp/Config.in +++ b/buildroot/package/libupnpp/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_LIBUPNPP bool "libupnpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp + depends on BR2_TOOLCHAIN_HAS_THREADS # libnpupnp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBNPUPNP help The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay. diff --git a/buildroot/package/libupnpp/libupnpp.hash b/buildroot/package/libupnpp/libupnpp.hash index 993dbc89a..029e33151 100644 --- a/buildroot/package/libupnpp/libupnpp.hash +++ b/buildroot/package/libupnpp/libupnpp.hash @@ -1,5 +1,5 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.2.tar.gz.sha256 -sha256 5abaaf353a1e9c3482d61ef2627b650285d59f27c1ee60d35b8951952261374f libupnpp-0.17.2.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.19.4.tar.gz.sha256 +sha256 29d1d07d44c8f79573e64e093ad8f0f883b11ef9eb3642a67aa703c1dde60576 libupnpp-0.19.4.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/buildroot/package/libupnpp/libupnpp.mk b/buildroot/package/libupnpp/libupnpp.mk index c9c103d9b..fc4599ebc 100644 --- a/buildroot/package/libupnpp/libupnpp.mk +++ b/buildroot/package/libupnpp/libupnpp.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.17.2 +LIBUPNPP_VERSION = 0.19.4 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES -LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl \ - $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) +LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl libnpupnp $(eval $(autotools-package)) diff --git a/buildroot/package/liburcu/Config.in b/buildroot/package/liburcu/Config.in index 7d2964208..5dc852897 100644 --- a/buildroot/package/liburcu/Config.in +++ b/buildroot/package/liburcu/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be || \ BR2_i386 || BR2_mips || BR2_mips64 || BR2_mipsel || \ BR2_mips64el || BR2_nios2 || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_x86_64 + BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_s390x || BR2_x86_64 depends on BR2_USE_MMU # fork() in test config BR2_PACKAGE_LIBURCU diff --git a/buildroot/package/liburcu/liburcu.hash b/buildroot/package/liburcu/liburcu.hash index 5c2f7e52a..da7d12a76 100644 --- a/buildroot/package/liburcu/liburcu.hash +++ b/buildroot/package/liburcu/liburcu.hash @@ -1,8 +1,8 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2.sha256 -sha256 92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350 userspace-rcu-0.11.1.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.12.1.tar.bz2.sha256 +sha256 bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e userspace-rcu-0.12.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e lgpl-relicensing.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7 LICENSE +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt +sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e lgpl-relicensing.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7 LICENSE diff --git a/buildroot/package/liburcu/liburcu.mk b/buildroot/package/liburcu/liburcu.mk index 217e90a1b..fa2ad0de8 100644 --- a/buildroot/package/liburcu/liburcu.mk +++ b/buildroot/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.11.1 +LIBURCU_VERSION = 0.12.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) diff --git a/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch deleted file mode 100644 index 9f5e88989..000000000 --- a/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0e385a6b747e967b6724ef3ded944c7da3b16f79 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 1 May 2019 11:18:29 +0200 -Subject: [PATCH] CMakeLists.txt: fix build without C++ - -Specify that uriparser is a C project (C++ is needed only for the test -runner) otherwise build will fail if no C++ compiler is found by cmake - -Fixes: - - http://autobuild.buildroot.org/results/1e191676f28905a81de6282e07978aa5d4f02039 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/uriparser/uriparser/pull/69] ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ceb79e0..40d3b20 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,8 @@ cmake_minimum_required(VERSION 3.3) - project(uriparser - VERSION - 0.9.3 -+ LANGUAGES -+ C - ) - - # See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html --- -2.20.1 - diff --git a/buildroot/package/liburiparser/liburiparser.hash b/buildroot/package/liburiparser/liburiparser.hash index 4216f1f17..feb594584 100644 --- a/buildroot/package/liburiparser/liburiparser.hash +++ b/buildroot/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28af4adb05e811192ab5f04566bebc5ebf1c30d9ec19138f944963d52419e28f uriparser-0.9.3.tar.bz2 -sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING +sha256 b7cdabe5611408fc2c3a10f8beecb881a0c7e93ff669c578cd9e3e6d64b8f87b uriparser-0.9.4.tar.bz2 +sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/buildroot/package/liburiparser/liburiparser.mk b/buildroot/package/liburiparser/liburiparser.mk index 4a68814e0..e333354ec 100644 --- a/buildroot/package/liburiparser/liburiparser.mk +++ b/buildroot/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.3 +LIBURIPARSER_VERSION = 0.9.4 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch b/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch deleted file mode 100644 index 35872a971..000000000 --- a/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch +++ /dev/null @@ -1,237 +0,0 @@ -From 87adda6abc3467ede45a6d2a87df2b9efdf5bb33 Mon Sep 17 00:00:00 2001 -From: Nathan Hjelm -Date: Fri, 9 Oct 2015 15:03:10 -0600 -Subject: [PATCH] Use C99 standard fixed width integer types in usb.h - -This patch modifies the integer types in usb.h of the form u_int* to the -C99 standard uint* types. - -Based on patch from Gwenhael Goavec-Merou. - -Backported from upstream commit -https://github.com/libusb/libusb-compat-0.1/commit/2e9b6bbebb7cf1ef0095516ec6d5203deb3822e8. - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Nathan Hjelm -Signed-off-by: Bartosz Golaszewski ---- - libusb/usb.h | 130 ++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 70 insertions(+), 60 deletions(-) - -diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..d2c30aa 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -2,6 +2,7 @@ - * Prototypes, structure definitions and macros. - * - * Copyright (c) 2000-2003 Johannes Erdfelt -+ * Copyright (c) 2015 Nathan Hjelm - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -22,8 +23,8 @@ - * distribution for details. - */ - --#ifndef __USB_H__ --#define __USB_H__ -+#ifndef USB_H -+#define USB_H - - #include - #include -@@ -31,6 +32,15 @@ - - #include - -+/* stdint.h is not available on older MSVC */ -+#if defined(_MSC_VER) && (_MSC_VER < 1600) && (!defined(_STDINT)) && (!defined(_STDINT_H)) -+typedef unsigned __int8 uint8_t; -+typedef unsigned __int16 uint16_t; -+typedef unsigned __int32 uint32_t; -+#else -+#include -+#endif -+ - /* - * USB spec information - * -@@ -78,40 +88,40 @@ - - /* All standard descriptors have these 2 fields in common */ - struct usb_descriptor_header { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -+ uint8_t bLength; -+ uint8_t bDescriptorType; - }; - - /* String descriptor */ - struct usb_string_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wData[1]; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wData[1]; - }; - - /* HID descriptor */ - struct usb_hid_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdHID; -- u_int8_t bCountryCode; -- u_int8_t bNumDescriptors; -- /* u_int8_t bReportDescriptorType; */ -- /* u_int16_t wDescriptorLength; */ -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdHID; -+ uint8_t bCountryCode; -+ uint8_t bNumDescriptors; -+ /* uint8_t bReportDescriptorType; */ -+ /* uint16_t wDescriptorLength; */ - /* ... */ - }; - - /* Endpoint descriptor */ - #define USB_MAXENDPOINTS 32 - struct usb_endpoint_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bEndpointAddress; -- u_int8_t bmAttributes; -- u_int16_t wMaxPacketSize; -- u_int8_t bInterval; -- u_int8_t bRefresh; -- u_int8_t bSynchAddress; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bEndpointAddress; -+ uint8_t bmAttributes; -+ uint16_t wMaxPacketSize; -+ uint8_t bInterval; -+ uint8_t bRefresh; -+ uint8_t bSynchAddress; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -@@ -129,15 +139,15 @@ struct usb_endpoint_descriptor { - /* Interface descriptor */ - #define USB_MAXINTERFACES 32 - struct usb_interface_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bInterfaceNumber; -- u_int8_t bAlternateSetting; -- u_int8_t bNumEndpoints; -- u_int8_t bInterfaceClass; -- u_int8_t bInterfaceSubClass; -- u_int8_t bInterfaceProtocol; -- u_int8_t iInterface; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bInterfaceNumber; -+ uint8_t bAlternateSetting; -+ uint8_t bNumEndpoints; -+ uint8_t bInterfaceClass; -+ uint8_t bInterfaceSubClass; -+ uint8_t bInterfaceProtocol; -+ uint8_t iInterface; - - struct usb_endpoint_descriptor *endpoint; - -@@ -155,14 +165,14 @@ struct usb_interface { - /* Configuration descriptor information.. */ - #define USB_MAXCONFIG 8 - struct usb_config_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wTotalLength; -- u_int8_t bNumInterfaces; -- u_int8_t bConfigurationValue; -- u_int8_t iConfiguration; -- u_int8_t bmAttributes; -- u_int8_t MaxPower; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wTotalLength; -+ uint8_t bNumInterfaces; -+ uint8_t bConfigurationValue; -+ uint8_t iConfiguration; -+ uint8_t bmAttributes; -+ uint8_t MaxPower; - - struct usb_interface *interface; - -@@ -172,28 +182,28 @@ struct usb_config_descriptor { - - /* Device descriptor */ - struct usb_device_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdUSB; -- u_int8_t bDeviceClass; -- u_int8_t bDeviceSubClass; -- u_int8_t bDeviceProtocol; -- u_int8_t bMaxPacketSize0; -- u_int16_t idVendor; -- u_int16_t idProduct; -- u_int16_t bcdDevice; -- u_int8_t iManufacturer; -- u_int8_t iProduct; -- u_int8_t iSerialNumber; -- u_int8_t bNumConfigurations; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdUSB; -+ uint8_t bDeviceClass; -+ uint8_t bDeviceSubClass; -+ uint8_t bDeviceProtocol; -+ uint8_t bMaxPacketSize0; -+ uint16_t idVendor; -+ uint16_t idProduct; -+ uint16_t bcdDevice; -+ uint8_t iManufacturer; -+ uint8_t iProduct; -+ uint8_t iSerialNumber; -+ uint8_t bNumConfigurations; - }; - - struct usb_ctrl_setup { -- u_int8_t bRequestType; -- u_int8_t bRequest; -- u_int16_t wValue; -- u_int16_t wIndex; -- u_int16_t wLength; -+ uint8_t bRequestType; -+ uint8_t bRequest; -+ uint16_t wValue; -+ uint16_t wIndex; -+ uint16_t wLength; - }; - - /* -@@ -254,7 +264,7 @@ struct usb_device { - - void *dev; /* Darwin support */ - -- u_int8_t devnum; -+ uint8_t devnum; - - unsigned char num_children; - struct usb_device **children; -@@ -266,7 +276,7 @@ struct usb_bus { - char dirname[PATH_MAX + 1]; - - struct usb_device *devices; -- u_int32_t location; -+ uint32_t location; - - struct usb_device *root_dev; - }; --- -2.9.3 - diff --git a/buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch b/buildroot/package/libusb-compat/0001-fix-a-build-issue-on-linux.patch similarity index 100% rename from buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch rename to buildroot/package/libusb-compat/0001-fix-a-build-issue-on-linux.patch diff --git a/buildroot/package/libusb-compat/libusb-compat.hash b/buildroot/package/libusb-compat/libusb-compat.hash index 26c3a80eb..3acf3c340 100644 --- a/buildroot/package/libusb-compat/libusb-compat.hash +++ b/buildroot/package/libusb-compat/libusb-compat.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a libusb-compat-0.1.5.tar.bz2 +sha256 8259f8d5b084fe43c47823a939e955e0ba21942b8d112266c39d228cc14764d6 libusb-compat-0.1.7.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libusb-compat/libusb-compat.mk b/buildroot/package/libusb-compat/libusb-compat.mk index 0ad6c6cbd..7c87b3c9d 100644 --- a/buildroot/package/libusb-compat/libusb-compat.mk +++ b/buildroot/package/libusb-compat/libusb-compat.mk @@ -5,9 +5,9 @@ ################################################################################ LIBUSB_COMPAT_VERSION_MAJOR = 0.1 -LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).5 +LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).7 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 -LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-$(LIBUSB_COMPAT_VERSION_MAJOR)/libusb-compat-$(LIBUSB_COMPAT_VERSION) +LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb LIBUSB_COMPAT_INSTALL_STAGING = YES diff --git a/buildroot/package/libuv/libuv.hash b/buildroot/package/libuv/libuv.hash index 923cd1cb3..2aba18490 100644 --- a/buildroot/package/libuv/libuv.hash +++ b/buildroot/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e3e0105c9b26e181e0547607cb6893462beb0c652674c3795766b2e5555288b3 libuv-1.34.1.tar.gz +sha256 2cd9a757fe6c512440933e2bdcab21143d4aa6249b2541399908ce038b756c9d libuv-1.38.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/buildroot/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk index d7160d1e0..493168cd9 100644 --- a/buildroot/package/libuv/libuv.mk +++ b/buildroot/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.34.1 +LIBUV_VERSION = 1.38.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/buildroot/package/libuwsc/Config.in b/buildroot/package/libuwsc/Config.in new file mode 100644 index 000000000..ae99b6d2d --- /dev/null +++ b/buildroot/package/libuwsc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBUWSC + bool "libuwsc" + select BR2_PACKAGE_LIBEV + help + A Lightweight and fully asynchronous WebSocket client + library based on libev. + + https://github.com/zhaojh329/libuwsc diff --git a/buildroot/package/libuwsc/libuwsc.hash b/buildroot/package/libuwsc/libuwsc.hash new file mode 100644 index 000000000..f99dfb4c5 --- /dev/null +++ b/buildroot/package/libuwsc/libuwsc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a06b7324671e181ffe3165e93e6f94c7ac1380f69e32a52e80c8da7016acd60d libuwsc-3.3.5.tar.gz +sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/buildroot/package/libuwsc/libuwsc.mk b/buildroot/package/libuwsc/libuwsc.mk new file mode 100644 index 000000000..cad351529 --- /dev/null +++ b/buildroot/package/libuwsc/libuwsc.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# libuwsc +# +################################################################################ + +LIBUWSC_VERSION = 3.3.5 +LIBUWSC_SITE = https://github.com/zhaojh329/libuwsc/releases/download/v$(LIBUWSC_VERSION) +LIBUWSC_LICENSE = MIT +LIBUWSC_LICENSE_FILES = LICENSE +LIBUWSC_INSTALL_STAGING = YES +LIBUWSC_DEPENDENCIES = libev + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBUWSC_DEPENDENCIES += openssl +LIBUWSC_CONF_OPTS += \ + -DUWSC_SSL_SUPPORT=ON \ + -DUWSC_USE_MBEDTLS=OFF \ + -DUWSC_USE_OPENSSL=ON \ + -DUWSC_USE_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +LIBUWSC_DEPENDENCIES += wolfssl +LIBUWSC_CONF_OPTS += \ + -DUWSC_SSL_SUPPORT=ON \ + -DUWSC_USE_MBEDTLS=OFF \ + -DUWSC_USE_OPENSSL=OFF \ + -DUWSC_USE_WOLFSSL=ON +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBUWSC_DEPENDENCIES += mbedtls +LIBUWSC_CONF_OPTS += \ + -DUWSC_SSL_SUPPORT=ON \ + -DUWSC_USE_MBEDTLS=ON \ + -DUWSC_USE_OPENSSL=OFF \ + -DUWSC_USE_WOLFSSL=OFF +else +LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:) +LIBUWSC_DEPENDENCIES += lua +LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON +else +LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF +endif + +# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch b/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch deleted file mode 100644 index 624bf082b..000000000 --- a/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a84fc5d02ffd7119b3e38b72339f5760991d14da Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 30 Mar 2020 14:24:34 -0700 -Subject: [PATCH] keytable: use input_event properly - -It does not use time_t under musl when time_t is 64-bit. The struct has -compatibility defines. Instead of using time_t directly, use those -defines. - -Fixes compilation under musl 1.2.0 under 32-bit OSes. - -Signed-off-by: Rosen Penev -Signed-off-by: Sean Young - -[Upstream: https://git.linuxtv.org/v4l-utils.git/patch/?id=38f4ce74275ae4625463f7eec78764715a0b6246] -Signed-off-by: Peter Seiderer ---- - utils/keytable/keytable.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 6cb0217..318c064 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -1533,7 +1533,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) { --- -2.26.2 - diff --git a/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch b/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch deleted file mode 100644 index 65126789a..000000000 --- a/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 986345e5673b1e68db513a4f72e6e79c74512a3b Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 7 Apr 2020 18:13:44 -0700 -Subject: [PATCH] keytable: add compatibility for input_event_sec - -Linux 4.16 added support for this macro. When it is not available, -define it back to the previous value. - -Signed-off-by: Rosen Penev -Signed-off-by: Sean Young - -[Upstream: https://git.linuxtv.org/v4l-utils.git/patch/?id=8b7e6ce9367fe09ca9398b5f3cc75bba2598b162] -Signed-off-by: Peter Seiderer ---- - utils/keytable/keytable.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 318c064..705867c 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -62,6 +62,10 @@ struct input_keymap_entry_v2 { - u_int8_t scancode[32]; - }; - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - #define IR_PROTOCOLS_USER_DIR IR_KEYTABLE_USER_DIR "/protocols" - #define IR_PROTOCOLS_SYSTEM_DIR IR_KEYTABLE_SYSTEM_DIR "/protocols" --- -2.26.2 - diff --git a/buildroot/package/libv4l/libv4l.hash b/buildroot/package/libv4l/libv4l.hash index 5b29d7d65..e45dd576b 100644 --- a/buildroot/package/libv4l/libv4l.hash +++ b/buildroot/package/libv4l/libv4l.hash @@ -1,9 +1,9 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2.asc +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d v4l-utils-1.18.0.tar.bz2 +sha256 956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7 v4l-utils-1.20.0.tar.bz2 # Locally calculated -sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l -sha256 34229b5aadfb768d0d083987cba54203a920904a3ec8320823c6125b9831acd1 lib/libv4l1/libv4l1-kernelcode-license.txt +sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l +sha256 34229b5aadfb768d0d083987cba54203a920904a3ec8320823c6125b9831acd1 lib/libv4l1/libv4l1-kernelcode-license.txt diff --git a/buildroot/package/libv4l/libv4l.mk b/buildroot/package/libv4l/libv4l.mk index a3bf09922..7b61823ce 100644 --- a/buildroot/package/libv4l/libv4l.mk +++ b/buildroot/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.18.0 +LIBV4L_VERSION = 1.20.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES @@ -70,9 +70,7 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic # qt5 needs c++11 (since qt-5.7) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif else LIBV4L_CONF_OPTS += --disable-qv4l2 endif diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.hash b/buildroot/package/libva-intel-driver/libva-intel-driver.hash index 555aa9473..4bf827748 100644 --- a/buildroot/package/libva-intel-driver/libva-intel-driver.hash +++ b/buildroot/package/libva-intel-driver/libva-intel-driver.hash @@ -1,5 +1,5 @@ # From https://github.com/intel/intel-vaapi-driver/releases -sha1 5f805f6a040f5beab6693d11765618cc92d2076b intel-vaapi-driver-2.4.0.tar.bz2 +sha1 c998e06f13238c6419bb38ede9a13e453312737b intel-vaapi-driver-2.4.1.tar.bz2 # Locally computed -sha256 71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089 intel-vaapi-driver-2.4.0.tar.bz2 -sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING +sha256 0081fce08eb3a83f7d99c3b853c8fdfa0af437b8f5b0fb7c66faeb83bcbe0c19 intel-vaapi-driver-2.4.1.tar.bz2 +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.mk b/buildroot/package/libva-intel-driver/libva-intel-driver.mk index 1cf113c40..ad801dc95 100644 --- a/buildroot/package/libva-intel-driver/libva-intel-driver.mk +++ b/buildroot/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 2.4.0 +LIBVA_INTEL_DRIVER_VERSION = 2.4.1 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) diff --git a/buildroot/package/libva-utils/0001-fix-build-without-x11.patch b/buildroot/package/libva-utils/0001-fix-build-without-x11.patch deleted file mode 100644 index 0cb5030d7..000000000 --- a/buildroot/package/libva-utils/0001-fix-build-without-x11.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0d033c074b63ab0ef0798128b94b364ce33da93a Mon Sep 17 00:00:00 2001 -From: Ed Baker -Date: Wed, 8 Jan 2020 13:43:38 -0700 -Subject: [PATCH] Ifdef va_x11 in VP sample for usrptr - -When updating libva-utils from 2.4.0 to 2.6.0 in Chrome OS I bumped into -the following error: -portage/media-video/libva-utils-2.6.0-r1/work/libva-utils-2.6.0/videoprocess/vppscaling_n_out_usrptr.cpp:41:10: fatal error: - 'va/va_x11.h' file not found - -Downloaded from upstream PR: -https://github.com/intel/libva-utils/pull/185 - -Signed-off-by: Bernd Kuhls -Signed-off-by: Edward Baker ---- - videoprocess/vppscaling_n_out_usrptr.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/videoprocess/vppscaling_n_out_usrptr.cpp b/videoprocess/vppscaling_n_out_usrptr.cpp -index 4a3a222..a853442 100644 ---- a/videoprocess/vppscaling_n_out_usrptr.cpp -+++ b/videoprocess/vppscaling_n_out_usrptr.cpp -@@ -38,7 +38,9 @@ - #include - #include - #include "va_display.h" -+#if 0 - #include -+#endif - - #define MAX_LEN 1024 - diff --git a/buildroot/package/libva-utils/libva-utils.hash b/buildroot/package/libva-utils/libva-utils.hash index 881b56fca..a83e28389 100644 --- a/buildroot/package/libva-utils/libva-utils.hash +++ b/buildroot/package/libva-utils/libva-utils.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva-utils/releases/download/2.6.0/libva-utils-2.6.0.tar.bz2.sha1sum -sha1 ef6f9abe8954ec94bae0ea3bc82ffd1fa4fc5735 libva-utils-2.6.0.tar.bz2 +# From https://github.com/intel/libva-utils/releases/download/2.8.0/libva-utils-2.8.0.tar.bz2.sha1sum +sha1 10351adf67aa03f5eeb54cb0aab3e2631ba4d102 libva-utils-2.8.0.tar.bz2 # Locally computed -sha256 2249b5d08bffc3862bbdcc9a6a4827afd504330b8d101564d39fe1a1e7adc426 libva-utils-2.6.0.tar.bz2 -sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING +sha256 8acad2c16bfef408643cf4de56c324345449f202e4a3a5b012a62a1d3af400ef libva-utils-2.8.0.tar.bz2 +sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/buildroot/package/libva-utils/libva-utils.mk b/buildroot/package/libva-utils/libva-utils.mk index ad9acb229..5d3fb95c4 100644 --- a/buildroot/package/libva-utils/libva-utils.mk +++ b/buildroot/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.6.0 +LIBVA_UTILS_VERSION = 2.8.0 LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) LIBVA_UTILS_LICENSE = MIT diff --git a/buildroot/package/libva/libva.hash b/buildroot/package/libva/libva.hash index 8edacf128..f40599c71 100644 --- a/buildroot/package/libva/libva.hash +++ b/buildroot/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.6.1/libva-2.6.1.tar.bz2.sha1sum -sha1 6b218e5622174a37fd0cfd8777b10717c95bd20e libva-2.6.1.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.9.0/libva-2.9.0.tar.bz2.sha1sum +sha1 3e20605243096b4e935e1ef6ac7797efbacc44f6 libva-2.9.0.tar.bz2 # Locally computed -sha256 6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5 libva-2.6.1.tar.bz2 -sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING +sha256 e344c1392dde92696c9ffd9cb3c7277d0a3b912236eb4e0fdedf7f375434584b libva-2.9.0.tar.bz2 +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/buildroot/package/libva/libva.mk b/buildroot/package/libva/libva.mk index 5e9bedbbd..75d26fa7f 100644 --- a/buildroot/package/libva/libva.mk +++ b/buildroot/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.6.1 +LIBVA_VERSION = 2.9.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT diff --git a/buildroot/package/libvips/libvips.mk b/buildroot/package/libvips/libvips.mk index 001a148a7..169fda9b1 100644 --- a/buildroot/package/libvips/libvips.mk +++ b/buildroot/package/libvips/libvips.mk @@ -21,7 +21,6 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) LIBVIPS_CONF_OPTS = \ - --disable-introspection \ --without-dmalloc \ --without-gsf \ --without-magick \ @@ -41,6 +40,13 @@ LIBVIPS_DEPENDENCIES = \ host-pkgconf expat libglib2 \ $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBVIPS_CONF_OPTS += --enable-introspection +LIBVIPS_DEPENDENCIES += gobject-introspection +else +LIBVIPS_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_JPEG),y) LIBVIPS_CONF_OPTS += --with-jpeg LIBVIPS_DEPENDENCIES += jpeg diff --git a/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch b/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch deleted file mode 100644 index 94dc4c614..000000000 --- a/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Thomas Daede -Date: Wed, 9 May 2018 21:56:59 +0000 (-0700) -Subject: CVE-2017-14160: fix bounds check on very low sample rates. -X-Git-Url: https://git.xiph.org/?p=vorbis.git;a=commitdiff_plain;h=018ca26dece618457dd13585cad52941193c4a25 - -CVE-2017-14160: fix bounds check on very low sample rates. -CVE-2018-10393: Out-of-bounds Read - -Downloaded from upstream commit -https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=018ca26dece618457dd13585cad52941193c4a25 - -Signed-off-by: Bernd Kuhls -[yann.morin.1998@free.fr: also fixes CVE-2018-10393] -Signed-off-by: Yann E. MORIN ---- - -diff --git a/lib/psy.c b/lib/psy.c -index 422c6f1..1310123 100644 ---- a/lib/psy.c -+++ b/lib/psy.c -@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b, - for (i = 0, x = 0.f;; i++, x += 1.f) { - - lo = b[i] >> 16; -- if( lo>=0 ) break; - hi = b[i] & 0xffff; -+ if( lo>=0 ) break; -+ if( hi>=n ) break; - - tN = N[hi] + N[-lo]; - tX = X[hi] - X[-lo]; diff --git a/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch b/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch deleted file mode 100644 index 1208839a2..000000000 --- a/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001 -From: Thomas Daede -Date: Thu, 17 May 2018 16:19:19 -0700 -Subject: [PATCH] Sanity check number of channels in setup. - -Fixes #2335. -[Retrieved from: -https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b] -Signed-off-by: Fabrice Fontaine ---- - lib/vorbisenc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c -index 4fc7b62..64a51b5 100644 ---- a/lib/vorbisenc.c -+++ b/lib/vorbisenc.c -@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ - highlevel_encode_setup *hi=&ci->hi; - - if(ci==NULL)return(OV_EINVAL); -+ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); - if(!hi->impulse_block_p)i0=1; - - /* too low/high an ATH floater is nonsensical, but doesn't break anything */ --- -2.24.1 - diff --git a/buildroot/package/libvorbis/libvorbis.hash b/buildroot/package/libvorbis/libvorbis.hash index 15bd01f22..2e44ba33a 100644 --- a/buildroot/package/libvorbis/libvorbis.hash +++ b/buildroot/package/libvorbis/libvorbis.hash @@ -1,4 +1,4 @@ # From http://www.xiph.org/downloads/ -sha256 af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 libvorbis-1.3.6.tar.xz +sha256 b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b libvorbis-1.3.7.tar.xz # License files, locally calculated -sha256 29e9914e6173b7061b7d48c25e6159fc1438326738bc047cc7248abc01b271f6 COPYING +sha256 ec1815db59fcd302846df949d7424876cb2e2dc5ed1606c5fb0b36787b1cf43a COPYING diff --git a/buildroot/package/libvorbis/libvorbis.mk b/buildroot/package/libvorbis/libvorbis.mk index 708f3364e..95c43d959 100644 --- a/buildroot/package/libvorbis/libvorbis.mk +++ b/buildroot/package/libvorbis/libvorbis.mk @@ -4,19 +4,13 @@ # ################################################################################ -LIBVORBIS_VERSION = 1.3.6 +LIBVORBIS_VERSION = 1.3.7 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz -LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis +LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis LIBVORBIS_INSTALL_STAGING = YES LIBVORBIS_CONF_OPTS = --disable-oggtest LIBVORBIS_DEPENDENCIES = host-pkgconf libogg LIBVORBIS_LICENSE = BSD-3-Clause LIBVORBIS_LICENSE_FILES = COPYING -# 0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch -LIBVORBIS_IGNORE_CVES += CVE-2018-10393 - -# 0002-Sanity-check-number-of-channels-in-setup.patch -LIBVORBIS_IGNORE_CVES += CVE-2018-10392 - $(eval $(autotools-package)) diff --git a/buildroot/package/libvpx/libvpx.hash b/buildroot/package/libvpx/libvpx.hash index b75cd8d47..57ee7179b 100644 --- a/buildroot/package/libvpx/libvpx.hash +++ b/buildroot/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac libvpx-1.8.2.tar.gz -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE -sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS +sha256 d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a libvpx-1.9.0.tar.gz +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE +sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/buildroot/package/libvpx/libvpx.mk b/buildroot/package/libvpx/libvpx.mk index 689ad6f05..26d211cf8 100644 --- a/buildroot/package/libvpx/libvpx.mk +++ b/buildroot/package/libvpx/libvpx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPX_VERSION = 1.8.2 +LIBVPX_VERSION = 1.9.0 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS @@ -20,6 +20,13 @@ LIBVPX_CONF_OPTS = \ --disable-docs \ --disable-unit-tests +# vp9/ratectrl_rtc.cc +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +LIBVPX_CONF_OPTS += --enable-vp9-encoder +else +LIBVPX_CONF_OPTS += --disable-vp9-encoder +endif + # This is not a true autotools package. It is based on the ffmpeg build system define LIBVPX_CONFIGURE_CMDS (cd $(LIBVPX_SRCDIR) && rm -rf config.cache && \ diff --git a/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch b/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch deleted file mode 100644 index 868685d39..000000000 --- a/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 16 Oct 2019 20:09:13 +0200 -Subject: [PATCH] CMakeLists.txt: fix static build with openssl - -openssl can depends on -latomic so use pkg-config (if available) to -retrieve these static dependencies otherwise build will fail because -HMAC_CTX_new test will return a wrong result - -Fixes: - - http://autobuild.buildroot.org/results/65d0528b208c0a470264f7e2433be89425971dd7 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from: -https://github.com/warmcat/libwebsockets/commit/5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3] ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2693ac56a..888f65e83 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1803,7 +1803,10 @@ if (LWS_WITH_SSL) - if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL) - # TODO: Add support for STATIC also. - if (NOT LWS_WITH_ESP32) -+ find_package(PkgConfig QUIET) -+ pkg_check_modules(PC_OPENSSL openssl QUIET) - find_package(OpenSSL REQUIRED) -+ list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) - endif() - set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") - endif() diff --git a/buildroot/package/libwebsockets/libwebsockets.hash b/buildroot/package/libwebsockets/libwebsockets.hash index ca0c1db2d..396337071 100644 --- a/buildroot/package/libwebsockets/libwebsockets.hash +++ b/buildroot/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c libwebsockets-3.2.2.tar.gz -sha256 4d092cd5e062c5ab0cf6408963d74619b5baf1571344410be6aa5bcef512eb70 LICENSE +sha256 a26d243f2642a9b810e7d91f1e66b149d1da978decdca58ce1c9218c454f397e libwebsockets-4.0.20.tar.gz +sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE diff --git a/buildroot/package/libwebsockets/libwebsockets.mk b/buildroot/package/libwebsockets/libwebsockets.mk index dedd03347..8e6d02205 100644 --- a/buildroot/package/libwebsockets/libwebsockets.mk +++ b/buildroot/package/libwebsockets/libwebsockets.mk @@ -4,13 +4,17 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 3.2.2 +LIBWEBSOCKETS_VERSION = 4.0.20 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) -LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions +LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib LIBWEBSOCKETS_INSTALL_STAGING = YES -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON +LIBWEBSOCKETS_CONF_OPTS = \ + -DLWS_WITHOUT_TESTAPPS=ON \ + -DLWS_IPV6=ON \ + -DLWS_UNIX_SOCK=ON \ + -DLWS_WITHOUT_EXTENSIONS=OFF # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small @@ -44,6 +48,20 @@ LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_LIBEVENT=OFF endif +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +LIBWEBSOCKETS_DEPENDENCIES += libglib2 +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_GLIB=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_GLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) +LIBWEBSOCKETS_DEPENDENCIES += util-linux +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_FSMOUNT=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_FSMOUNT=OFF +endif + ifeq ($(BR2_PACKAGE_LIBUV),y) LIBWEBSOCKETS_DEPENDENCIES += libuv LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=ON diff --git a/buildroot/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch b/buildroot/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch new file mode 100644 index 000000000..e74ebe125 --- /dev/null +++ b/buildroot/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch @@ -0,0 +1,45 @@ +From 81bfedfa02fd864f3e4b295091d49c3eb20bb372 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Wed, 16 Sep 2020 00:01:37 +0300 +Subject: [PATCH] meson: Use a partial dependency to pass EGL module flags + +Make Meson try to always find an "egl" dependency, if found extract +the include directories and compiler flags from ir using a partial +dependency, otherwise check that at least EGL/eglplatform.h is +available when the pkg-config module is not found. + +Fixes #70 + +Signed-off-by: Adrian Perez de Castro +[Upstrem status: https://github.com/WebPlatformForEmbedded/libwpe/pull/71] + +--- + meson.build | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 5c88aed..a05f4ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -57,8 +57,16 @@ dependencies = [ + ] + + cc = meson.get_compiler('c') +-if not cc.has_header('EGL/eglplatform.h') +- dependencies += dependency('egl') ++egl_dep = dependency('egl', required: false) ++if egl_dep.found() ++ dependencies += egl_dep.partial_dependency( ++ compile_args: true, ++ includes: true, ++ ) ++else ++ assert(cc.has_header('EGL/eglplatform.h'), ++ 'Required heaer not found' ++ ) + endif + + if not cc.has_function('dlopen') +-- +2.28.0 + diff --git a/buildroot/package/libwpe/libwpe.hash b/buildroot/package/libwpe/libwpe.hash index e138c06f2..36cdf5666 100644 --- a/buildroot/package/libwpe/libwpe.hash +++ b/buildroot/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.6.0.tar.xz.sums -md5 6e8a2c279dcc3617db5ec7ac4c03d628 libwpe-1.6.0.tar.xz -sha1 e8424d5e29f35861d85acdc5962d8b59b53bb1ad libwpe-1.6.0.tar.xz -sha256 3587c6b8a807f4bb76b268ba74ca82c6b395b90235db41ad8252224456193c90 libwpe-1.6.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.8.0.tar.xz.sums +md5 328ea59dd8dee9107a49353536d00844 libwpe-1.8.0.tar.xz +sha1 3c893b1e8118a06f082d98373e279a8f8e33750d libwpe-1.8.0.tar.xz +sha256 a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2 libwpe-1.8.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/buildroot/package/libwpe/libwpe.mk b/buildroot/package/libwpe/libwpe.mk index fd4f3d0cb..5843e84d3 100644 --- a/buildroot/package/libwpe/libwpe.mk +++ b/buildroot/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.6.0 +LIBWPE_VERSION = 1.8.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES @@ -12,11 +12,13 @@ LIBWPE_LICENSE = BSD-2-Clause LIBWPE_LICENSE_FILES = COPYING LIBWPE_DEPENDENCIES = libegl libxkbcommon +LIBWPE_CFLAGS = $(TARGET_CFLAGS) +LIBWPE_CXXFLAGS = $(TARGET_CXXFLAGS) + # Workaround for https://github.com/raspberrypi/userland/issues/316 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -LIBWPE_CONF_OPTS += \ - -DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \ - -DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' +LIBWPE_CFLAGS += -D_GNU_SOURCE +LIBWPE_CXXFLAGS += -D_GNU_SOURCE endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/libxkbcommon/libxkbcommon.hash b/buildroot/package/libxkbcommon/libxkbcommon.hash index c734f3ad9..c643f1c4a 100644 --- a/buildroot/package/libxkbcommon/libxkbcommon.hash +++ b/buildroot/package/libxkbcommon/libxkbcommon.hash @@ -1,7 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-February/040102.html -md5 3c4409058dfd203f641a563358e0187d libxkbcommon-0.8.4.tar.xz -sha1 0ce9df42239d451f61b2112c6ba8d0a1a0879009 libxkbcommon-0.8.4.tar.xz -sha256 60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b libxkbcommon-0.8.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041609.html +sha256 ab68b25341c99f2218d7cf3dad459c1827f411219901ade05bbccbdb856b6c8d libxkbcommon-1.0.1.tar.xz # License file: -sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE +sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/buildroot/package/libxkbcommon/libxkbcommon.mk b/buildroot/package/libxkbcommon/libxkbcommon.mk index 1f54de426..bf1bd058c 100644 --- a/buildroot/package/libxkbcommon/libxkbcommon.mk +++ b/buildroot/package/libxkbcommon/libxkbcommon.mk @@ -4,22 +4,23 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 0.8.4 +LIBXKBCOMMON_VERSION = 1.0.1 LIBXKBCOMMON_SITE = http://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex -LIBXKBCOMMON_CONF_OPTS = --disable-wayland -# uses C99 features -LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +LIBXKBCOMMON_CONF_OPTS = \ + -Denable-docs=false \ + -Denable-wayland=false \ + -Denable-xkbregistry=false ifeq ($(BR2_PACKAGE_XORG7),y) -LIBXKBCOMMON_CONF_OPTS += --enable-x11 +LIBXKBCOMMON_CONF_OPTS += -Denable-x11=true LIBXKBCOMMON_DEPENDENCIES += libxcb else -LIBXKBCOMMON_CONF_OPTS += --disable-x11 +LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/libxmlrpc/libxmlrpc.hash b/buildroot/package/libxmlrpc/libxmlrpc.hash index 093da67bb..13e3b0b53 100644 --- a/buildroot/package/libxmlrpc/libxmlrpc.hash +++ b/buildroot/package/libxmlrpc/libxmlrpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c9f5b584a42493877ae0f09ed680d94e035ab389e8fa1873b1ec42118d5cfca3 xmlrpc-c-1.43.08.tgz -sha256 db7a6d3f187b218c3534010a83424c6bcdef88e6a0b6b1aa3a8762238bd642e6 doc/COPYING +sha256 06dcd87d9c88374559369ffbe83b3139cf41418c1a2d03f20e08808085f89fd0 xmlrpc-c-1.51.06.tgz +sha256 db7a6d3f187b218c3534010a83424c6bcdef88e6a0b6b1aa3a8762238bd642e6 doc/COPYING diff --git a/buildroot/package/libxmlrpc/libxmlrpc.mk b/buildroot/package/libxmlrpc/libxmlrpc.mk index 4b30ecd38..c74d8a854 100644 --- a/buildroot/package/libxmlrpc/libxmlrpc.mk +++ b/buildroot/package/libxmlrpc/libxmlrpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXMLRPC_VERSION = 1.43.08 +LIBXMLRPC_VERSION = 1.51.06 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION) LIBXMLRPC_LICENSE = BSD-3-Clause (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c) diff --git a/buildroot/package/libyaml/libyaml.hash b/buildroot/package/libyaml/libyaml.hash index 49693b507..0de9e527a 100644 --- a/buildroot/package/libyaml/libyaml.hash +++ b/buildroot/package/libyaml/libyaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4a9100ab61047fd9bd395bcef3ce5403365cafd55c1e0d0299cde14958e47be9 yaml-0.2.2.tar.gz -sha256 a2adb9c959b797494a0ef80bdf60e22db2749ee3e0c0908556e3eb548f967c56 LICENSE +sha256 c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4 yaml-0.2.5.tar.gz +sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 License diff --git a/buildroot/package/libyaml/libyaml.mk b/buildroot/package/libyaml/libyaml.mk index 1ba069a1b..f65317aab 100644 --- a/buildroot/package/libyaml/libyaml.mk +++ b/buildroot/package/libyaml/libyaml.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBYAML_VERSION = 0.2.2 +LIBYAML_VERSION = 0.2.5 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz LIBYAML_SITE = http://pyyaml.org/download/libyaml LIBYAML_INSTALL_STAGING = YES LIBYAML_LICENSE = MIT -LIBYAML_LICENSE_FILES = LICENSE +LIBYAML_LICENSE_FILES = License $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/libyang/libyang.hash b/buildroot/package/libyang/libyang.hash index c5426042b..d318ecb9d 100644 --- a/buildroot/package/libyang/libyang.hash +++ b/buildroot/package/libyang/libyang.hash @@ -1,2 +1,3 @@ -sha256 1686a381a8cce775102e60c8eb93f7ba64c6d4ae10591fc05d9f969a07815f60 libyang-1.0.109.tar.gz -sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE +# Locally calculated +sha256 1a5637451b73c4c5683837eb4c51371bb084795f653bc1a5fc20fed5541b58bc libyang-1.0.184.tar.gz +sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/buildroot/package/libyang/libyang.mk b/buildroot/package/libyang/libyang.mk index 648ffeb6a..779c440e2 100644 --- a/buildroot/package/libyang/libyang.mk +++ b/buildroot/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.109 +LIBYANG_VERSION = 1.0.184 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE @@ -15,7 +15,8 @@ HOST_LIBYANG_DEPENDENCIES = host-pcre LIBYANG_CONF_OPTS = \ -DENABLE_VALGRIND_TESTS=OFF \ - -DGEN_PYTHON_BINDINGS=OFF + -DGEN_PYTHON_BINDINGS=OFF \ + -DENABLE_LYD_PRIV=ON HOST_LIBYANG_CONF_OPTS = \ -DENABLE_VALGRIND_TESTS=OFF \ diff --git a/buildroot/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/buildroot/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch new file mode 100644 index 000000000..30bc20104 --- /dev/null +++ b/buildroot/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch @@ -0,0 +1,103 @@ +From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Sat, 25 Jul 2020 12:03:29 +0200 +Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. + +Addresses #199 + +[Retrieved from: +https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] +Signed-off-by: Fabrice Fontaine +--- + cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 cmake-compat/FindGnuTLS.cmake + +diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake +new file mode 100644 +index 00000000..819f0001 +--- /dev/null ++++ b/cmake-compat/FindGnuTLS.cmake +@@ -0,0 +1,82 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++#[=======================================================================[.rst: ++FindGnuTLS ++---------- ++ ++Find the GNU Transport Layer Security library (gnutls) ++ ++IMPORTED Targets ++^^^^^^^^^^^^^^^^ ++ ++This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if ++gnutls has been found. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++``GNUTLS_FOUND`` ++ System has gnutls ++``GNUTLS_INCLUDE_DIR`` ++ The gnutls include directory ++``GNUTLS_LIBRARIES`` ++ The libraries needed to use gnutls ++``GNUTLS_DEFINITIONS`` ++ Compiler switches required for using gnutls ++``GNUTLS_VERSION`` ++ version of gnutls. ++#]=======================================================================] ++ ++# Note that this doesn't try to find the gnutls-extra package. ++ ++ ++if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) ++ # in cache already ++ set(gnutls_FIND_QUIETLY TRUE) ++endif () ++ ++if (NOT WIN32) ++ # try using pkg-config to get the directories and then use these values ++ # in the find_path() and find_library() calls ++ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful ++ find_package(PkgConfig QUIET) ++ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) ++ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) ++ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) ++ # keep for backward compatibility ++ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) ++endif () ++ ++find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h ++ HINTS ++ ${PC_GNUTLS_INCLUDEDIR} ++ ${PC_GNUTLS_INCLUDE_DIRS} ++ ) ++ ++find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls ++ HINTS ++ ${PC_GNUTLS_LIBDIR} ++ ${PC_GNUTLS_LIBRARY_DIRS} ++ ) ++ ++mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) ++ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS ++ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR ++ VERSION_VAR GNUTLS_VERSION_STRING) ++ ++if(GNUTLS_FOUND) ++ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) ++ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) ++ ++ if(NOT TARGET GnuTLS::GnuTLS) ++ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) ++ set_target_properties(GnuTLS::GnuTLS PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" ++ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" ++ IMPORTED_LINK_INTERFACE_LANGUAGES "C" ++ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") ++ endif() ++endif() diff --git a/buildroot/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/buildroot/package/libzip/0002-Include-limits.h-for-INT_MAX.patch new file mode 100644 index 000000000..c488f0528 --- /dev/null +++ b/buildroot/package/libzip/0002-Include-limits.h-for-INT_MAX.patch @@ -0,0 +1,27 @@ +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98rjan=20Malde?= +Date: Wed, 15 Jul 2020 12:16:16 +0200 +Subject: [PATCH] Include limits.h for INT_MAX + +[Retrieved from: +https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] +Signed-off-by: Paul Cercueil +--- + lib/zip_crypto_openssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c +index 1cb00479..60f92758 100644 +--- a/lib/zip_crypto_openssl.c ++++ b/lib/zip_crypto_openssl.c +@@ -38,6 +38,7 @@ + #include "zip_crypto.h" + + #include ++#include + + #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_0_API +-- +2.28.0 + diff --git a/buildroot/package/libzip/Config.in b/buildroot/package/libzip/Config.in index c6ddabe6b..a603d9abf 100644 --- a/buildroot/package/libzip/Config.in +++ b/buildroot/package/libzip/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBZIP This package also contains zipcmp, ziptorrent and zipmerge utilities. - http://www.nih.at/libzip/ + https://libzip.org/ comment "libzip needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libzip/libzip.hash b/buildroot/package/libzip/libzip.hash index eb11b526f..a298b9aba 100644 --- a/buildroot/package/libzip/libzip.hash +++ b/buildroot/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4 libzip-1.5.2.tar.xz -sha256 04464e729973cf58189051e7a3e8bca2acce9a1058c735e9e2eb1fdbe0fbbf50 LICENSE +sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz +sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE diff --git a/buildroot/package/libzip/libzip.mk b/buildroot/package/libzip/libzip.mk index a312dd90d..9d64db32f 100644 --- a/buildroot/package/libzip/libzip.mk +++ b/buildroot/package/libzip/libzip.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBZIP_VERSION = 1.5.2 -LIBZIP_SITE = http://www.nih.at/libzip +LIBZIP_VERSION = 1.7.3 +LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause LIBZIP_LICENSE_FILES = LICENSE @@ -15,8 +15,9 @@ HOST_LIBZIP_DEPENDENCIES = host-zlib ifeq ($(BR2_PACKAGE_BZIP2),y) LIBZIP_DEPENDENCIES += bzip2 +LIBZIP_CONF_OPTS += -DENABLE_BZIP2=ON else -LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE +LIBZIP_CONF_OPTS += -DENABLE_BZIP2=OFF endif ifeq ($(BR2_PACKAGE_GNUTLS),y) @@ -26,6 +27,13 @@ else LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBZIP_DEPENDENCIES += mbedtls +LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=ON +else +LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBZIP_DEPENDENCIES += openssl LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON @@ -38,5 +46,12 @@ LIBZIP_DEPENDENCIES += musl-fts LIBZIP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts endif +ifeq ($(BR2_PACKAGE_XZ),y) +LIBZIP_DEPENDENCIES += xz +LIBZIP_CONF_OPTS += -DENABLE_LZMA=ON +else +LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch b/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch deleted file mode 100644 index 81b1fb792..000000000 --- a/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 87373f6c2b48619bb11e566e5eb16ea49d47beb7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 19 Apr 2019 17:07:10 +0200 -Subject: [PATCH] Link with libiconv if needed - -Commit 2cc3a93dcf2703b3b418e0a99975f556354fb1b1 added an include to -iconv which can be provided by libiconv so search and link for it if -needed - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/linknx/linknx/pull/41] ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 22f242c..779fd6f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,7 @@ AC_CHECK_HEADER(argp.h,,[AC_MSG_ERROR([argp_parse not found])]) - AC_SEARCH_LIBS(argp_parse,argp,,[AC_MSG_ERROR([argp_parse not found])]) - - # Checks for libraries. -+AC_SEARCH_LIBS(libiconv_open,iconv) - LIBCURL_CHECK_CONFIG([yes], [7.14.0]) - - # Checks for header files. --- -2.20.1 - diff --git a/buildroot/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch b/buildroot/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch new file mode 100644 index 000000000..733e2927d --- /dev/null +++ b/buildroot/package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch @@ -0,0 +1,47 @@ +From 8e7da14647dada5eee8f583b0814bffb31d1b91e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Apr 2019 23:17:34 +0200 +Subject: [PATCH] configure.ac: tweak CPPUNIT conditional + +Following review of buildroot's patch +(http://patchwork.ozlabs.org/patch/1088520), tweak CPPUNIT to move call +to AM_CONDITIONAL outside condition + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/linknx/linknx/commit/8e7da14647dada5eee8f583b0814bffb31d1b91e] +--- + configure.ac | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 51d8ae66..4d9d8efa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -135,22 +135,20 @@ if test x"$WITH_CPPUNIT" != xno; then + AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) + AC_SUBST(CPPUNIT_CFLAGS) + AC_SUBST(CPPUNIT_LIBS) +- AM_CONDITIONAL(CPPUNIT, true) ++ found_cppunit=yes + ],[ + AC_MSG_RESULT([no]) +- AM_CONDITIONAL(CPPUNIT, false) + ]) + else + PKG_CHECK_MODULES(CPPUNIT, $CPPUNITPC >= 1.9.6, [ + AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) + AC_SUBST(CPPUNIT_CFLAGS) + AC_SUBST(CPPUNIT_LIBS) +- AM_CONDITIONAL([CPPUNIT], true) +- ],[AM_CONDITIONAL([CPPUNIT], false)]) ++ found_cppunit=yes ++ ]) + fi +-else +- AM_CONDITIONAL([CPPUNIT], false) + fi ++AM_CONDITIONAL([CPPUNIT], [test x"$found_cppunit" = xyes]) + + dnl ######################################################################### + dnl Check if using log4cpp diff --git a/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch b/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch deleted file mode 100644 index 158bad9e9..000000000 --- a/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b4a770af42f7d33ad174524b94ea4d2fc7133da Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Apr 2019 19:31:50 +0200 -Subject: [PATCH] configure.ac: always define CPPUNIT - -Fixes: - - http://autobuild.buildroot.org/results/4b042b7e18425690ec26b4977865516bedcb9edb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/linknx/linknx/pull/42] ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 779fd6f..51d8ae6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,8 +145,11 @@ if test x"$WITH_CPPUNIT" != xno; then - AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) -- ]) -+ AM_CONDITIONAL([CPPUNIT], true) -+ ],[AM_CONDITIONAL([CPPUNIT], false)]) - fi -+else -+ AM_CONDITIONAL([CPPUNIT], false) - fi - - dnl ######################################################################### --- -2.20.1 - diff --git a/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch b/buildroot/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch similarity index 85% rename from buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch rename to buildroot/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch index 253c1f6f2..4f1a8e435 100644 --- a/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch +++ b/buildroot/package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch @@ -1,6 +1,6 @@ -From b4595154e84e21abdc0c89f937c410cf8280991c Mon Sep 17 00:00:00 2001 +From 048b9ae8f3c07be217f1738c35ab995ab6394453 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine -Date: Mon, 13 May 2019 22:14:43 +0200 +Date: Sun, 8 Mar 2020 10:02:07 +0100 Subject: [PATCH] src/Makefile.am: fix linking with log4cpp linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which @@ -16,13 +16,14 @@ Fixes: - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Retrieved from: +https://github.com/linknx/linknx/commit/048b9ae8f3c07be217f1738c35ab995ab6394453] --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 6a4f493..92d147c 100644 +index 6e0dc03b..5065c248 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ else @@ -32,8 +33,5 @@ index 6a4f493..92d147c 100644 -AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) +AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) +AM_CXXFLAGS=$(LOG4CPP_CFLAGS) - linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm + linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(LIBICONV) $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h --- -2.20.1 - diff --git a/buildroot/package/linknx/linknx.hash b/buildroot/package/linknx/linknx.hash index 79113e6e7..86ec52280 100644 --- a/buildroot/package/linknx/linknx.hash +++ b/buildroot/package/linknx/linknx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3c3aaf8c409538153b15f5fb975a4485e58c4820cfea289a3f20777ba69782ab linknx-0.0.1.37.tar.gz -sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE +sha256 00c53776c2e871295459ede922402d8ad0208367d2364781fdb92ddafad94d3d linknx-0.0.1.38.tar.gz +sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE diff --git a/buildroot/package/linknx/linknx.mk b/buildroot/package/linknx/linknx.mk index c75f0655d..dbee0742f 100644 --- a/buildroot/package/linknx/linknx.mk +++ b/buildroot/package/linknx/linknx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKNX_VERSION = 0.0.1.37 +LINKNX_VERSION = 0.0.1.38 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ LINKNX_LICENSE_FILES = LICENSE @@ -17,7 +17,9 @@ LINKNX_CONF_OPTS = \ --with-pth=$(STAGING_DIR)/usr \ --disable-smtp +# add host-gettext for AM_ICONV macro LINKNX_DEPENDENCIES = \ + host-gettext \ host-pkgconf \ libpthsem \ $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \ diff --git a/buildroot/package/links/links.hash b/buildroot/package/links/links.hash index a23adc087..f941c2cd1 100644 --- a/buildroot/package/links/links.hash +++ b/buildroot/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424 links-2.20.2.tar.bz2 -sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING +sha256 285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63 links-2.21.tar.bz2 +sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/buildroot/package/links/links.mk b/buildroot/package/links/links.mk index 228a8ed0e..815b4dd73 100644 --- a/buildroot/package/links/links.mk +++ b/buildroot/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.20.2 +LINKS_VERSION = 2.21 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch b/buildroot/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch new file mode 100644 index 000000000..1655fa59a --- /dev/null +++ b/buildroot/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch @@ -0,0 +1,35 @@ +From d5d528e7562f358b9564e64cea0678020c51479a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Mar 2020 18:56:19 +0100 +Subject: [PATCH] src/core/paths/paths.cpp: fix powerpc build + +Fix the following build failure on powerpc: + +/home/test/autobuild/run/instance-2/output-1/build/linphone-4.3.1/src/core/paths/paths.cpp:32:3: error: #error "Unsupported system." + #error "Unsupported system." + ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/d90bca02c2771df8dfbf39892d529fb5f9069656 + +Signed-off-by: Fabrice Fontaine +--- + src/core/paths/paths.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/paths/paths.cpp b/src/core/paths/paths.cpp +index 0442282fe..2c6508a51 100644 +--- a/src/core/paths/paths.cpp ++++ b/src/core/paths/paths.cpp +@@ -26,7 +26,7 @@ + #include "paths-android.h" + #elif defined(_WIN32) + #include "paths-windows.h" +-#elif defined(__linux) ++#elif defined(__linux) || defined(__linux__) + #include "paths-linux.h" + #else + #error "Unsupported system." +-- +2.25.1 + diff --git a/buildroot/package/linphone/Config.in b/buildroot/package/linphone/Config.in index 06eb059cf..c7683b829 100644 --- a/buildroot/package/linphone/Config.in +++ b/buildroot/package/linphone/Config.in @@ -1,11 +1,17 @@ config BR2_PACKAGE_LINPHONE bool "linphone" - depends on BR2_INSTALL_LIBSTDCPP # mediastreamer (bundled) - depends on BR2_TOOLCHAIN_HAS_THREADS # ortp (bundled) - depends on BR2_USE_MMU # libeXosip2 - select BR2_PACKAGE_LIBEXOSIP2 - select BR2_PACKAGE_SPEEX - select BR2_PACKAGE_SPEEXDSP + depends on BR2_USE_MMU + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # belle-sip, mediastreamer + depends on BR2_TOOLCHAIN_HAS_THREADS # belr, belle-sip, mediastreamer + # belr, belle-sip, mediastreamer + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_USE_WCHAR # belle-sip + select BR2_PACKAGE_BELLE_SIP + select BR2_PACKAGE_BELR + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_MEDIASTREAMER + select BR2_PACKAGE_SQLITE help Linphone is an internet phone or Voice Over IP phone (VoIP). @@ -24,6 +30,10 @@ config BR2_PACKAGE_LINPHONE http://www.linphone.org/ -comment "linphone needs a toolchain w/ threads, C++" +comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "linphone needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/linphone/linphone.hash b/buildroot/package/linphone/linphone.hash index e5b9015ae..9aa03078d 100644 --- a/buildroot/package/linphone/linphone.hash +++ b/buildroot/package/linphone/linphone.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 linphone-3.6.1.tar.gz +sha256 bfb195845ae23311667d5631c470310a63818fe46029cea2f1b77a5ed84e6e21 linphone-4.3.1.tar.gz # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/linphone/linphone.mk b/buildroot/package/linphone/linphone.mk index 4129c2a9e..9fd69670e 100644 --- a/buildroot/package/linphone/linphone.mk +++ b/buildroot/package/linphone/linphone.mk @@ -4,52 +4,38 @@ # ################################################################################ -LINPHONE_VERSION_MAJOR = 3.6 -LINPHONE_VERSION = $(LINPHONE_VERSION_MAJOR).1 -LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/$(LINPHONE_VERSION_MAJOR).x/sources +LINPHONE_VERSION = 4.3.1 +LINPHONE_SITE = \ + https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$(LINPHONE_VERSION) LINPHONE_CONF_OPTS = \ - --disable-strict --disable-video -# configure is out of sync causing deplibs linking issues -LINPHONE_AUTORECONF = YES + -DENABLE_ADVANCED_IM=OFF \ + -DENABLE_CXX_WRAPPER=OFF \ + -DENABLE_DB_STORAGE=OFF \ + -DENABLE_LIME=OFF \ + -DENABLE_LIME_X3DH=OFF \ + -DENABLE_STRICT=OFF \ + -DENABLE_TOOLS=OFF \ + -DENABLE_TUTORIALS=OFF \ + -DENABLE_UNIT_TESTS=OFF \ + -DENABLE_VCARD=OFF \ + -DENABLE_VIDEO=OFF LINPHONE_INSTALL_STAGING = YES -LINPHONE_DEPENDENCIES = host-pkgconf libeXosip2 speex -LINPHONE_LICENSE = GPL-2.0+ -LINPHONE_LICENSE_FILES = COPYING +LINPHONE_DEPENDENCIES = \ + belle-sip \ + belr \ + libxml2 \ + mediastreamer \ + sqlite \ + $(if $(BR2_PACKAGE_ZLIB),zlib) +LINPHONE_LICENSE = GPL-3.0+ +LINPHONE_LICENSE_FILES = LICENSE.txt -ifeq ($(BR2_arc),y) -# toolchain __arc__ define conflicts with libosip2 source -LINPHONE_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" +ifeq ($(BR2_STATIC_LIBS),y) +LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LINPHONE_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON endif -ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy) -LINPHONE_CONF_OPTS += --enable-gtk_ui -LINPHONE_DEPENDENCIES += libgtk2 -else -LINPHONE_CONF_OPTS += --disable-gtk_ui -endif - -# needed for bundled mediastreamer2 -LINPHONE_DEPENDENCIES += host-intltool host-gettext - -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) -LINPHONE_CONF_OPTS += --enable-alsa -LINPHONE_DEPENDENCIES += alsa-lib -else -LINPHONE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -LINPHONE_CONF_OPTS += --enable-libv4l1 --enable-libv4l2 -LINPHONE_DEPENDENCIES += libv4l -else -LINPHONE_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 -endif - -ifeq ($(BR2_PACKAGE_LIBUPNP),y) -LINPHONE_DEPENDENCIES += libupnp -LINPHONE_CONF_OPTS += --enable-upnp -else -LINPHONE_CONF_OPTS += --disable-upnp -endif - -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in index 54c617c9a..d3b7a2b79 100644 --- a/buildroot/package/linux-firmware/Config.in +++ b/buildroot/package/linux-firmware/Config.in @@ -124,11 +124,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X help Firmware files for the Atheros QCA988X module -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 - bool "Atheros 10k (QCA6174)" - help - Firmware files for the Atheros QCA6174 module - config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" help @@ -139,6 +134,22 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366B1 + bool "Broadcom 4366b1" + help + Firmware file for the Broadcom 4366b1 FullMAC chip. + +config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 + bool "Broadcom 4366c0" + help + Firmware file for the Broadcom 4366c0 FullMAC chip. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 + bool "Intel iwlwifi 22260" + help + Firmware files for the Intel Wifi 22260 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 bool "Intel iwlwifi 3160" help @@ -284,6 +295,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U help MediaTek MT7601U +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7610E + bool "MediaTek MT7610E" + help + MediaTek MT7610E + config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E bool "MediaTek MT76x2e" help @@ -324,6 +340,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX help Realtek rtl8821ae +config BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88 + bool "Realtek rtw88" + help + Firmware images supported by Realtek's wireless + driver rtw88. + config BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113 bool "Redpine rs9113" help @@ -345,6 +367,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX help Firmware files for WLAN and Bluetooth modules wl18xx +config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210 + bool "Qualcomm Atheros wil6210" + help + Firmware files for Qualcomm Atheros 11ad family of chips + endmenu menu "Ethernet firmware" @@ -373,6 +400,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100 Firmware files for Intel 825xx handled by driver e100 (e100) +config BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY + bool "Microchip VSC85xx PHYs" + help + Firmware files for Microchip/Microsemi VSC85xx networking + PHYs (VSC8504, VSC8552, VSC8572, VSC8574, VSC856X, VSC8575, + VSC8582 and VSC8584) + config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X bool "QLogic FastLinQ 4xxxx" help diff --git a/buildroot/package/linux-firmware/linux-firmware.hash b/buildroot/package/linux-firmware/linux-firmware.hash index b7c975395..2ebd11365 100644 --- a/buildroot/package/linux-firmware/linux-firmware.hash +++ b/buildroot/package/linux-firmware/linux-firmware.hash @@ -1,10 +1,11 @@ # Locally calculated -sha256 270f4b2dd89feb6ed7d9e166bb1677f27d8f93da9d95312e6d188b0e1efaba73 linux-firmware-20190717.tar.gz +sha256 83646c58fc4e3ee9a73f4fa74213c849109f48c719322346393f3e5b0fa55044 linux-firmware-20200122.tar.gz sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 ac7c42c8331ef69221039f770193a2120bc67c7bba357e51a5b3f557bca0037c LICENSE.amdgpu +sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt +sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware @@ -12,6 +13,7 @@ sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE. sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware +sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt @@ -28,6 +30,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE. sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 440c2ed4fba90edb52847f1550ff33fbfb36f61688eecced84c22dfc247f31e9 WHENCE +sha256 74d203d2fd433b73b63e8e31d8928e3817f6eaf3407c9e607802c20a5c02e6c4 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/buildroot/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk index 82776cc28..5474377a3 100644 --- a/buildroot/package/linux-firmware/linux-firmware.mk +++ b/buildroot/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20190717 +LINUX_FIRMWARE_VERSION = 20200122 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git @@ -77,9 +77,7 @@ endif # rt2xx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX),y) -# rt3090.bin is a symlink to rt2860.bin -# rt3070.bin is a symlink to rt2870.bin -LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin +LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3071.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt endif @@ -120,6 +118,15 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif +# rtw88 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88),y) +LINUX_FIRMWARE_FILES += \ + rtw88/rtw8723d_fw.bin \ + rtw88/rtw8822b_fw.bin \ + rtw88/rtw8822c_fw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt +endif + # ar3011 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AR3011),y) LINUX_FIRMWARE_FILES += ath3k-1.fw @@ -195,17 +202,6 @@ LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif -# ath10k-qca6174 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174),y) -LINUX_FIRMWARE_FILES += ath10k/QCA6174/hw3.0/board.bin \ - ath10k/QCA6174/hw3.0/board-2.bin \ - ath10k/QCA6174/hw3.0/firmware-4.bin \ - ath10k/QCA6174/hw3.0/firmware-6.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware \ - ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt \ - ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt -endif - # sd8686 v8 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8),y) LINUX_FIRMWARE_FILES += libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin @@ -220,8 +216,6 @@ endif # sd8688 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688),y) -LINUX_FIRMWARE_FILES += libertas/sd8688.bin libertas/sd8688_helper.bin -# The two files above are but symlinks to those two ones: LINUX_FIRMWARE_FILES += mrvl/sd8688.bin mrvl/sd8688_helper.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif @@ -298,6 +292,12 @@ LINUX_FIRMWARE_FILES += mt7601u.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif +# MT7610 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7610E),y) +LINUX_FIRMWARE_FILES += mediatek/mt7610e.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware +endif + # MT7650 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650),y) LINUX_FIRMWARE_FILES += mt7650.bin @@ -313,7 +313,11 @@ endif # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k +LINUX_FIRMWARE_ALL_LICENSE_FILES += \ + LICENSE.QualcommAtheros_ath10k \ + ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt endif # CC2560(A) @@ -326,12 +330,10 @@ endif # wl127x ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y) -# wl1271-nvs.bin is a symlink to wl127x-nvs.bin LINUX_FIRMWARE_FILES += \ ti-connectivity/wl1271-fw-2.bin \ ti-connectivity/wl1271-fw-ap.bin \ ti-connectivity/wl1271-fw.bin \ - ti-connectivity/wl1271-nvs.bin \ ti-connectivity/wl127x-fw-3.bin \ ti-connectivity/wl127x-fw-plt-3.bin \ ti-connectivity/wl127x-nvs.bin \ @@ -347,15 +349,12 @@ endif # wl128x ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y) -# wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin LINUX_FIRMWARE_FILES += \ ti-connectivity/wl128x-fw-3.bin \ ti-connectivity/wl128x-fw-ap.bin \ ti-connectivity/wl128x-fw-plt-3.bin \ ti-connectivity/wl128x-fw.bin \ - ti-connectivity/wl1271-nvs.bin \ ti-connectivity/wl128x-nvs.bin \ - ti-connectivity/wl12xx-nvs.bin \ ti-connectivity/wl127x-nvs.bin \ ti-connectivity/wl128x-fw-4-mr.bin \ ti-connectivity/wl128x-fw-4-plt.bin \ @@ -369,18 +368,26 @@ endif # wl18xx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX),y) -# wl1271-nvs.bin is a symlink to wl127x-nvs.bin LINUX_FIRMWARE_FILES += \ ti-connectivity/wl18xx-fw.bin \ ti-connectivity/wl18xx-fw-2.bin \ ti-connectivity/wl18xx-fw-3.bin \ ti-connectivity/wl18xx-fw-4.bin \ - ti-connectivity/wl1271-nvs.bin \ ti-connectivity/wl127x-nvs.bin \ ti-connectivity/TIInit_7.2.31.bts LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210),y) +LINUX_FIRMWARE_FILES += wil6210.* +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) +LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware @@ -461,6 +468,11 @@ LINUX_FIRMWARE_FILES += e100/*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.e100 endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY),y) +LINUX_FIRMWARE_FILES += microchip/mscc_vsc85*.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.microchip +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X),y) LINUX_FIRMWARE_FILES += \ qed/qed_init_values_zipped-*.bin @@ -473,6 +485,9 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8105e-1.fw \ rtl_nic/rtl8106e-1.fw \ rtl_nic/rtl8106e-2.fw \ + rtl_nic/rtl8107e-1.fw \ + rtl_nic/rtl8107e-2.fw \ + rtl_nic/rtl8125a-3.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ @@ -480,6 +495,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8168e-3.fw \ rtl_nic/rtl8168f-1.fw \ rtl_nic/rtl8168f-2.fw \ + rtl_nic/rtl8168fp-3.fw \ rtl_nic/rtl8168g-2.fw \ rtl_nic/rtl8168g-3.fw \ rtl_nic/rtl8168h-1.fw \ @@ -543,7 +559,24 @@ LINUX_FIRMWARE_FILES += \ brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43430-sdio.bin \ brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.bin \ brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \ - brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin + brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \ + brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ + brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ + brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx +endif + +# brcm4366b1 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366B1),y) +LINUX_FIRMWARE_FILES += \ + brcm/brcmfmac4366b-pcie.bin brcm/brcmfmac4366b-pcie.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx +endif + +# brcm4366c0 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0),y) +LINUX_FIRMWARE_FILES += \ + brcm/brcmfmac4366c-pcie.bin brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif @@ -565,8 +598,7 @@ LINUX_FIRMWARE_FILES += \ endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC),y) -# qat_mmp.bin is a symlink to qat_895xcc_mmp.bin -LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin qat_mmp.bin +LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif @@ -617,10 +649,33 @@ LINUX_FIRMWARE_LICENSE_FILES = $(sort $(LINUX_FIRMWARE_ALL_LICENSE_FILES)) endif +# Some firmware are distributed as a symlink, for drivers to load them using a +# defined name other than the real one. Since 9cfefbd7fbda ("Remove duplicate +# symlinks") those symlink aren't distributed in linux-firmware but are created +# automatically by its copy-firmware.sh script during the installation, which +# parses the WHENCE file where symlinks are described. We follow the same logic +# here, adding symlink only for firmwares installed in the target directory. +# +# For testing the presence of firmwares in the target directory we first make +# sure we canonicalize the pointed-to file, to cover the symlinks of the form +# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does +# not yet exist. +define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \ + sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ + while read f d; do \ + if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ + mkdir -p $$(dirname $$f) || exit 1; \ + ln -sf $$d $$f || exit 1; \ + fi ; \ + done +endef + define LINUX_FIRMWARE_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware $(LINUX_FIRMWARE_INSTALL_FILES) $(LINUX_FIRMWARE_INSTALL_DIRS) + $(LINUX_FIRMWARE_CREATE_SYMLINKS) endef $(eval $(generic-package)) diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 87a72af6e..16af0449a 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_4 + default BR2_KERNEL_HEADERS_5_9 help Select the kernel version to get headers from. @@ -53,6 +53,14 @@ config BR2_KERNEL_HEADERS_4_19 config BR2_KERNEL_HEADERS_5_4 bool "Linux 5.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + +config BR2_KERNEL_HEADERS_5_8 + bool "Linux 5.8.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_KERNEL_HEADERS_5_9 + bool "Linux 5.9.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -127,8 +135,28 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 + bool "5.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 + bool "5.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 + bool "5.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6 + bool "5.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 + bool "5.5.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 - bool "5.4.x or later" + bool "5.4.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3 @@ -323,6 +351,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.200" if BR2_KERNEL_HEADERS_4_14 default "4.19.150" if BR2_KERNEL_HEADERS_4_19 default "5.4.70" if BR2_KERNEL_HEADERS_5_4 + default "5.8.14" if BR2_KERNEL_HEADERS_5_8 + default "5.9" if BR2_KERNEL_HEADERS_5_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch b/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch new file mode 100644 index 000000000..ebcb81aa9 --- /dev/null +++ b/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch @@ -0,0 +1,37 @@ +From aef363c7e8e942224e6cffc4398366c6e5d31749 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jun 2020 00:04:32 +0200 +Subject: [PATCH] configure.ac: fix build failure when crypt() does not require + libcrypt + +Since commit 522246d20e4cd92fadc2d760228cb7e78cbeb4c5, the build fails +if "none required" is returned by AC_SEARCH_LIBS for libcrypt. + +Resolves: https://github.com/linux-pam/linux-pam/pull/235 +Fixes: http://autobuild.buildroot.org/results/92b3dd7c984d2b843ac9aacacd69eec99f28743e +Fixes: v1.4.0~228 ("Use cached 'crypt' library result correctly") + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/aef363c7e8e942224e6cffc4398366c6e5d31749] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ea08a7a3..c1862ea7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -428,7 +428,11 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], + [crypt_libs="crypt"]) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_cv_search_crypt}", LIBCRYPT="") ++AC_SEARCH_LIBS([crypt],[$crypt_libs]) ++case "$ac_cv_search_crypt" in ++ -l*) LIBCRYPT="$ac_cv_search_crypt" ;; ++ *) LIBCRYPT="" ;; ++esac + AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) diff --git a/buildroot/package/linux-pam/0001-doc-makefile-am.patch b/buildroot/package/linux-pam/0001-doc-makefile-am.patch deleted file mode 100644 index ac3ff2b22..000000000 --- a/buildroot/package/linux-pam/0001-doc-makefile-am.patch +++ /dev/null @@ -1,34 +0,0 @@ -Disable generation of documentation - -Generation of documentation is not necessary in Buildroot, disable it completely. - -Signed-off-by: Dmitry Golubovsky -Signed-off-by: Brendan Heading - -Upstream-status: inappropriate - -diff -urN a/doc/Makefile.am b/doc/Makefile.am ---- a/doc/Makefile.am 2012-08-15 06:08:43.000000000 -0500 -+++ b/doc/Makefile.am 2013-07-17 09:54:53.000000000 -0500 -@@ -2,8 +2,6 @@ - # Copyright (c) 2005, 2006 Thorsten Kukuk - # - --SUBDIRS = man specs sag adg mwg -- - CLEANFILES = *~ - - dist_html_DATA = index.html -@@ -11,11 +9,4 @@ - ####################################################### - - releasedocs: all -- $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs -- cp -av specs/draft-morgan-pam-current.txt \ -- $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ -- cp -av $(srcdir)/specs/rfc86.0.txt \ -- $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ -- make -C sag releasedocs -- make -C adg releasedocs -- make -C mwg releasedocs -+ /bin/true diff --git a/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch b/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch deleted file mode 100644 index 8e9710c79..000000000 --- a/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1d1d3b59af50c40efcc74f9c3f37b446a921e83e Mon Sep 17 00:00:00 2001 -From: Yousong Zhou -Date: Wed, 17 Jun 2015 18:19:23 +0800 -Subject: [PATCH] build: ignore pam_rhosts if neither ruserok nor ruserok_af is - available. - -* configure.ac: check for ruserok and ruserok_af -* modules/Makefile.am: ignore pam_rhosts/ if it's disabled -* modules/pam_rhosts/pam_rhosts.c: include stdlib.h for malloc and free - -Signed-off-by: Yousong Zhou -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/1d1d3b59af50c40efcc74f9c3f37b446a921e83e] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 5 ++++- - modules/Makefile.am | 11 ++++++++--- - modules/pam_rhosts/pam_rhosts.c | 1 + - 3 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3012ceb5..69748614 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -532,7 +532,10 @@ AC_CHECK_FUNCS(fseeko getdomainname gethostname gettimeofday lckpwdf mkdir selec - AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) - AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) - AC_CHECK_FUNCS(getgrouplist getline getdelim) --AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af) -+AC_CHECK_FUNCS(inet_ntop inet_pton innetgr) -+AC_CHECK_FUNCS([ruserok_af ruserok], [break]) -+ -+AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) - - AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) - AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) -diff --git a/modules/Makefile.am b/modules/Makefile.am -index 0c80cea9..9ad26a9b 100644 ---- a/modules/Makefile.am -+++ b/modules/Makefile.am -@@ -2,16 +2,21 @@ - # Copyright (c) 2005, 2006, 2008 Thorsten Kukuk - # - --SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \ -+if COND_BUILD_PAM_RHOSTS -+ MAYBE_PAM_RHOSTS = pam_rhosts -+endif -+ -+SUBDIRS := pam_access pam_cracklib pam_debug pam_deny pam_echo \ - pam_env pam_exec pam_faildelay pam_filter pam_ftp \ - pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ - pam_listfile pam_localuser pam_loginuid pam_mail \ - pam_mkhomedir pam_motd pam_namespace pam_nologin \ -- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ -+ pam_permit pam_pwhistory pam_rootok pam_securetty \ - pam_selinux pam_sepermit pam_shells pam_stress \ - pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ - pam_tty_audit pam_umask \ -- pam_unix pam_userdb pam_warn pam_wheel pam_xauth -+ pam_unix pam_userdb pam_warn pam_wheel pam_xauth \ -+ $(MAYBE_PAM_RHOSTS) - - CLEANFILES = *~ - -diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c -index ed98d630..60c9e854 100644 ---- a/modules/pam_rhosts/pam_rhosts.c -+++ b/modules/pam_rhosts/pam_rhosts.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - - #define PAM_SM_AUTH /* only defines this management group */ diff --git a/buildroot/package/linux-pam/0002-fix-build-on-musl.patch b/buildroot/package/linux-pam/0002-fix-build-on-musl.patch new file mode 100644 index 000000000..44fceccc8 --- /dev/null +++ b/buildroot/package/linux-pam/0002-fix-build-on-musl.patch @@ -0,0 +1,320 @@ +From 295bf7403364b23ab03287ecdd95ea266d6f4d89 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jun 2020 17:39:03 +0200 +Subject: [PATCH] fix build on musl + +Rename check_user_in_passwd from pam_localuser.c to +pam_modutil_check_user_in_passwd and use it in pam_faillock.c instead of +fgetpwent_r which is not available on musl + +Fix #236 + +Fixes: + - http://autobuild.buildroot.org/results/0432736ffee376dd84757469434a4bbcfdcdaf4b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/linux-pam/linux-pam/pull/237] +--- + libpam/Makefile.am | 1 + + libpam/include/security/pam_modutil.h | 5 ++ + libpam/libpam.map | 5 ++ + libpam/pam_modutil_check_user_in_passwd.c | 89 +++++++++++++++++++++++ + modules/pam_faillock/pam_faillock.c | 37 +--------- + modules/pam_localuser/pam_localuser.c | 86 +--------------------- + 6 files changed, 103 insertions(+), 120 deletions(-) + create mode 100644 libpam/pam_modutil_check_user_in_passwd.c + +diff --git a/libpam/Makefile.am b/libpam/Makefile.am +index 9252a837..a8fc428d 100644 +--- a/libpam/Makefile.am ++++ b/libpam/Makefile.am +@@ -35,6 +35,7 @@ libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \ + pam_misc.c pam_password.c pam_prelude.c \ + pam_session.c pam_start.c pam_strerror.c \ + pam_vprompt.c pam_syslog.c pam_dynamic.c pam_audit.c \ ++ pam_modutil_check_user_in_passwd.c \ + pam_modutil_cleanup.c pam_modutil_getpwnam.c pam_modutil_ioloop.c \ + pam_modutil_getgrgid.c pam_modutil_getpwuid.c pam_modutil_getgrnam.c \ + pam_modutil_getspnam.c pam_modutil_getlogin.c pam_modutil_ingroup.c \ +diff --git a/libpam/include/security/pam_modutil.h b/libpam/include/security/pam_modutil.h +index 3a6aec6a..33f87b90 100644 +--- a/libpam/include/security/pam_modutil.h ++++ b/libpam/include/security/pam_modutil.h +@@ -58,6 +58,11 @@ extern "C" { + + #include + ++extern int PAM_NONNULL((1,2)) ++pam_modutil_check_user_in_passwd(pam_handle_t *pamh, ++ const char *user_name, ++ const char *file_name); ++ + extern struct passwd * PAM_NONNULL((1,2)) + pam_modutil_getpwnam(pam_handle_t *pamh, const char *user); + +diff --git a/libpam/libpam.map b/libpam/libpam.map +index c9690a91..3cc7ef35 100644 +--- a/libpam/libpam.map ++++ b/libpam/libpam.map +@@ -82,3 +82,8 @@ LIBPAM_1.4 { + global: + pam_start_confdir; + } LIBPAM_1.0; ++ ++LIBPAM_MODUTIL_1.4.1 { ++ global: ++ pam_modutil_check_user_in_passwd; ++} LIBPAM_MODUTIL_1.3.2; +diff --git a/libpam/pam_modutil_check_user_in_passwd.c b/libpam/pam_modutil_check_user_in_passwd.c +new file mode 100644 +index 00000000..b998aa25 +--- /dev/null ++++ b/libpam/pam_modutil_check_user_in_passwd.c +@@ -0,0 +1,89 @@ ++#include "pam_modutil_private.h" ++#include ++ ++#include ++#include ++ ++int ++pam_modutil_check_user_in_passwd(pam_handle_t *pamh, ++ const char *user_name, ++ const char *file_name) ++{ ++ int rc; ++ size_t user_len; ++ FILE *fp; ++ char line[BUFSIZ]; ++ ++ /* Validate the user name. */ ++ if ((user_len = strlen(user_name)) == 0) { ++ pam_syslog(pamh, LOG_NOTICE, "user name is not valid"); ++ return PAM_SERVICE_ERR; ++ } ++ ++ if (user_len > sizeof(line) - sizeof(":")) { ++ pam_syslog(pamh, LOG_NOTICE, "user name is too long"); ++ return PAM_SERVICE_ERR; ++ } ++ ++ if (strchr(user_name, ':') != NULL) { ++ /* ++ * "root:x" is not a local user name even if the passwd file ++ * contains a line starting with "root:x:". ++ */ ++ return PAM_PERM_DENIED; ++ } ++ ++ /* Open the passwd file. */ ++ if (file_name == NULL) { ++ file_name = "/etc/passwd"; ++ } ++ if ((fp = fopen(file_name, "r")) == NULL) { ++ pam_syslog(pamh, LOG_ERR, "error opening %s: %m", file_name); ++ return PAM_SERVICE_ERR; ++ } ++ ++ /* ++ * Scan the file using fgets() instead of fgetpwent_r() because ++ * the latter is not flexible enough in handling long lines ++ * in passwd files. ++ */ ++ rc = PAM_PERM_DENIED; ++ while (fgets(line, sizeof(line), fp) != NULL) { ++ size_t line_len; ++ const char *str; ++ ++ /* ++ * Does this line start with the user name ++ * followed by a colon? ++ */ ++ if (strncmp(user_name, line, user_len) == 0 && ++ line[user_len] == ':') { ++ rc = PAM_SUCCESS; ++ break; ++ } ++ /* Has a newline been read? */ ++ line_len = strlen(line); ++ if (line_len < sizeof(line) - 1 || ++ line[line_len - 1] == '\n') { ++ /* Yes, continue with the next line. */ ++ continue; ++ } ++ ++ /* No, read till the end of this line first. */ ++ while ((str = fgets(line, sizeof(line), fp)) != NULL) { ++ line_len = strlen(line); ++ if (line_len == 0 || ++ line[line_len - 1] == '\n') { ++ break; ++ } ++ } ++ if (str == NULL) { ++ /* fgets returned NULL, we are done. */ ++ break; ++ } ++ /* Continue with the next line. */ ++ } ++ ++ fclose(fp); ++ return rc; ++} +diff --git a/modules/pam_faillock/pam_faillock.c b/modules/pam_faillock/pam_faillock.c +index f592d0a2..8bca46ca 100644 +--- a/modules/pam_faillock/pam_faillock.c ++++ b/modules/pam_faillock/pam_faillock.c +@@ -348,42 +348,7 @@ set_conf_opt(pam_handle_t *pamh, struct options *opts, const char *name, const c + static int + check_local_user (pam_handle_t *pamh, const char *user) + { +- struct passwd pw, *pwp; +- char buf[16384]; +- int found = 0; +- FILE *fp; +- int errn; +- +- fp = fopen(PATH_PASSWD, "r"); +- if (fp == NULL) { +- pam_syslog(pamh, LOG_ERR, "unable to open %s: %m", +- PATH_PASSWD); +- return -1; +- } +- +- for (;;) { +- errn = fgetpwent_r(fp, &pw, buf, sizeof (buf), &pwp); +- if (errn == ERANGE) { +- pam_syslog(pamh, LOG_WARNING, "%s contains very long lines; corrupted?", +- PATH_PASSWD); +- break; +- } +- if (errn != 0) +- break; +- if (strcmp(pwp->pw_name, user) == 0) { +- found = 1; +- break; +- } +- } +- +- fclose (fp); +- +- if (errn != 0 && errn != ENOENT) { +- pam_syslog(pamh, LOG_ERR, "unable to enumerate local accounts: %m"); +- return -1; +- } else { +- return found; +- } ++ return pam_modutil_check_user_in_passwd(pamh, user, NULL); + } + + static int +diff --git a/modules/pam_localuser/pam_localuser.c b/modules/pam_localuser/pam_localuser.c +index cb507524..a9f2233c 100644 +--- a/modules/pam_localuser/pam_localuser.c ++++ b/modules/pam_localuser/pam_localuser.c +@@ -45,92 +45,10 @@ + #include + + #include ++#include + #include + #include "pam_inline.h" + +-static int +-check_user_in_passwd(pam_handle_t *pamh, const char *user_name, +- const char *file_name) +-{ +- int rc; +- size_t user_len; +- FILE *fp; +- char line[BUFSIZ]; +- +- /* Validate the user name. */ +- if ((user_len = strlen(user_name)) == 0) { +- pam_syslog(pamh, LOG_NOTICE, "user name is not valid"); +- return PAM_SERVICE_ERR; +- } +- +- if (user_len > sizeof(line) - sizeof(":")) { +- pam_syslog(pamh, LOG_NOTICE, "user name is too long"); +- return PAM_SERVICE_ERR; +- } +- +- if (strchr(user_name, ':') != NULL) { +- /* +- * "root:x" is not a local user name even if the passwd file +- * contains a line starting with "root:x:". +- */ +- return PAM_PERM_DENIED; +- } +- +- /* Open the passwd file. */ +- if (file_name == NULL) { +- file_name = "/etc/passwd"; +- } +- if ((fp = fopen(file_name, "r")) == NULL) { +- pam_syslog(pamh, LOG_ERR, "error opening %s: %m", file_name); +- return PAM_SERVICE_ERR; +- } +- +- /* +- * Scan the file using fgets() instead of fgetpwent_r() because +- * the latter is not flexible enough in handling long lines +- * in passwd files. +- */ +- rc = PAM_PERM_DENIED; +- while (fgets(line, sizeof(line), fp) != NULL) { +- size_t line_len; +- const char *str; +- +- /* +- * Does this line start with the user name +- * followed by a colon? +- */ +- if (strncmp(user_name, line, user_len) == 0 && +- line[user_len] == ':') { +- rc = PAM_SUCCESS; +- break; +- } +- /* Has a newline been read? */ +- line_len = strlen(line); +- if (line_len < sizeof(line) - 1 || +- line[line_len - 1] == '\n') { +- /* Yes, continue with the next line. */ +- continue; +- } +- +- /* No, read till the end of this line first. */ +- while ((str = fgets(line, sizeof(line), fp)) != NULL) { +- line_len = strlen(line); +- if (line_len == 0 || +- line[line_len - 1] == '\n') { +- break; +- } +- } +- if (str == NULL) { +- /* fgets returned NULL, we are done. */ +- break; +- } +- /* Continue with the next line. */ +- } +- +- fclose(fp); +- return rc; +-} +- + int + pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, + int argc, const char **argv) +@@ -173,7 +91,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, + return rc == PAM_CONV_AGAIN ? PAM_INCOMPLETE : rc; + } + +- return check_user_in_passwd(pamh, user_name, file_name); ++ return pam_modutil_check_user_in_passwd(pamh, user_name, file_name); + } + + int +-- +2.26.2 + diff --git a/buildroot/package/linux-pam/Config.in b/buildroot/package/linux-pam/Config.in index 139654936..84aee5cdd 100644 --- a/buildroot/package/linux-pam/Config.in +++ b/buildroot/package/linux-pam/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX help @@ -11,6 +10,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org -comment "linux-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS diff --git a/buildroot/package/linux-pam/linux-pam.hash b/buildroot/package/linux-pam/linux-pam.hash index cfe58ce28..608908cb0 100644 --- a/buildroot/package/linux-pam/linux-pam.hash +++ b/buildroot/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.4.0/Linux-PAM-1.4.0.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db Linux-PAM-1.3.1.tar.xz +sha256 cd6d928c51e64139be3bdb38692c68183a509b83d4f2c221024ccd4bcddfd034 Linux-PAM-1.4.0.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/buildroot/package/linux-pam/linux-pam.mk b/buildroot/package/linux-pam/linux-pam.mk index 63610fcc5..57fb2c9cf 100644 --- a/buildroot/package/linux-pam/linux-pam.mk +++ b/buildroot/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.3.1 +LINUX_PAM_VERSION = 1.4.0 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES @@ -18,9 +18,10 @@ LINUX_PAM_CONF_OPTS = \ --libdir=/lib LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) -LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright +# We're patching configure.ac +LINUX_PAM_AUTORECONF = YES LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBSELINUX),y) diff --git a/buildroot/package/linux-tools/linux-tool-perf.mk.in b/buildroot/package/linux-tools/linux-tool-perf.mk.in index 7106b622c..53b7c5b9c 100644 --- a/buildroot/package/linux-tools/linux-tool-perf.mk.in +++ b/buildroot/package/linux-tools/linux-tool-perf.mk.in @@ -158,3 +158,7 @@ define PERF_INSTALL_TARGET_CMDS $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +define PERF_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) +endef diff --git a/buildroot/package/linux-tools/linux-tools.mk b/buildroot/package/linux-tools/linux-tools.mk index 65d9e850e..81b1fbc17 100644 --- a/buildroot/package/linux-tools/linux-tools.mk +++ b/buildroot/package/linux-tools/linux-tools.mk @@ -42,6 +42,13 @@ LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) +define LINUX_TOOLS_LINUX_CONFIG_FIXUPS + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS)) + ) +endef + define LINUX_TOOLS_INSTALL_INIT_SYSTEMD $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ diff --git a/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch b/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch deleted file mode 100644 index 332e5491f..000000000 --- a/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d663a483c40939bad58301c256d86da1f3da6cc0 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Tue, 13 Nov 2018 13:16:08 +0100 -Subject: [PATCH] Fix building with new kernel headers. - -net_tstamp.h in recent kernel versions requires time.h for clockid_t. - -Signed-off-by: Miroslav Lichvar ---- - clock.c | 2 +- - sk.c | 1 + - timemaster.c | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/clock.c b/clock.c -index 9c493c3..8533b39 100644 ---- a/clock.c -+++ b/clock.c -@@ -17,11 +17,11 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include -+#include - #include - #include - #include - #include --#include - #include - - #include "address.h" -diff --git a/sk.c b/sk.c -index e2b1f28..30162eb 100644 ---- a/sk.c -+++ b/sk.c -@@ -18,6 +18,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include -+#include - #include - #include - #include -diff --git a/timemaster.c b/timemaster.c -index 058678f..00db59f 100644 ---- a/timemaster.c -+++ b/timemaster.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/buildroot/package/linuxptp/Config.in b/buildroot/package/linuxptp/Config.in index 3e18a0cb1..c88b7a061 100644 --- a/buildroot/package/linuxptp/Config.in +++ b/buildroot/package/linuxptp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LINUXPTP bool "linuxptp" + depends on BR2_TOOLCHAIN_HAS_THREADS help The Linux PTP Project is the Precision Time Protocol implementation according to IEEE standard 1588 for Linux. @@ -11,3 +12,6 @@ config BR2_PACKAGE_LINUXPTP not a goal. http://linuxptp.sourceforge.net/ + +comment "linuxptp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/linuxptp/S65linuxptp b/buildroot/package/linuxptp/S65linuxptp deleted file mode 100644 index 46b8921fd..000000000 --- a/buildroot/package/linuxptp/S65linuxptp +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# Start linuxptp -# - -start() { - printf "Starting linuxptp daemon: " - start-stop-daemon -S -b -q -p /var/run/linuxptp-ptp4l.pid \ - -x /usr/sbin/ptp4l -- -f /etc/linuxptp.cfg - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Starting linuxptp system clock synchronization: " - start-stop-daemon -S -b -q -p /var/run/linuxptp-phc2sys.pid \ - -x /usr/sbin/phc2sys -- -s eth0 -c CLOCK_REALTIME -w -S 1.0 - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping linuxptp system clock synchronization: " - start-stop-daemon -K -q -p /var/run/linuxptp-phc2sys.pid \ - -x /usr/sbin/phc2sys - echo "OK" - - printf "Stopping linuxptp daemon: " - start-stop-daemon -K -q -p /var/run/linuxptp-ptp4l.pid \ - -x /usr/sbin/ptp4l - echo "OK" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/buildroot/package/linuxptp/S65ptp4l b/buildroot/package/linuxptp/S65ptp4l new file mode 100644 index 000000000..1b9e3c930 --- /dev/null +++ b/buildroot/package/linuxptp/S65ptp4l @@ -0,0 +1,57 @@ +#!/bin/sh +# +# Start linuxptp +# + +DAEMON="ptp4l" + +PIDFILE="/var/run/$DAEMON.pid" + +PTP4L_ARGS="-f /etc/linuxptp.cfg" + +# shellcheck source=/dev/null +[ -r "/etc/default/ptp4l" ] && . "/etc/default/ptp4l" + +start() { + printf "Starting linuxptp daemon: " + start-stop-daemon -S -b -q -m -p $PIDFILE \ + -x /usr/sbin/$DAEMON -- $PTP4L_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return $status +} + +stop() { + printf "Stopping linuxptp daemon: " + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return $status +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/buildroot/package/linuxptp/S66phc2sys b/buildroot/package/linuxptp/S66phc2sys new file mode 100644 index 000000000..fd1ec59bb --- /dev/null +++ b/buildroot/package/linuxptp/S66phc2sys @@ -0,0 +1,57 @@ +#!/bin/sh +# +# Start linuxptp +# + +DAEMON="phc2sys" + +PIDFILE="/var/run/$DAEMON.pid" + +PHC2SYS_ARGS="-a -r -S 1.0" + +# shellcheck source=/dev/null +[ -r "/etc/default/phc2sys" ] && . "/etc/default/phc2sys" + +start() { + printf "Starting linuxptp system clock synchronization: " + start-stop-daemon -S -b -q -m -p $PIDFILE \ + -x /usr/sbin/$DAEMON -- $PHC2SYS_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return $status +} + +stop() { + printf "Stopping linuxptp system clock synchronization: " + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return $status +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/buildroot/package/linuxptp/linuxptp.hash b/buildroot/package/linuxptp/linuxptp.hash index 5e6c7741c..4f8a1f89f 100644 --- a/buildroot/package/linuxptp/linuxptp.hash +++ b/buildroot/package/linuxptp/linuxptp.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/linuxptp/files/v2.0/ -sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6 linuxptp-2.0.tgz -md5 d8bb7374943bb747db7786ac26f17f11 linuxptp-2.0.tgz +# From https://sourceforge.net/projects/linuxptp/files/v3.0/ +sha1 9a3869dbd322252c9a6bc0dbdfe8941586810a7f linuxptp-3.1.tgz +md5 2264cb69c9af947028835c12c89a7572 linuxptp-3.1.tgz # Locally computed: -sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d linuxptp-2.0.tgz +sha256 f58f5b11cf14dc7c4f7c9efdfb27190e43d02cf20c3525f6639edac10528ce7d linuxptp-3.1.tgz # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/linuxptp/linuxptp.mk b/buildroot/package/linuxptp/linuxptp.mk index 97e4af7be..f91be921a 100644 --- a/buildroot/package/linuxptp/linuxptp.mk +++ b/buildroot/package/linuxptp/linuxptp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUXPTP_VERSION = 2.0 +LINUXPTP_VERSION = 3.1 LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ @@ -33,15 +33,17 @@ define LINUXPTP_INSTALL_TARGET_CMDS endef define LINUXPTP_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S65linuxptp \ - $(TARGET_DIR)/etc/init.d/S65linuxptp + $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S65ptp4l \ + $(TARGET_DIR)/etc/init.d/S65ptp4l + $(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S66phc2sys \ + $(TARGET_DIR)/etc/init.d/S66phc2sys endef define LINUXPTP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp.service \ - $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service - $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ - $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service + $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/ptp4l.service \ + $(TARGET_DIR)/usr/lib/systemd/system/ptp4l.service + $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/phc2sys.service \ + $(TARGET_DIR)/usr/lib/systemd/system/phc2sys.service endef $(eval $(generic-package)) diff --git a/buildroot/package/linuxptp/linuxptp-system-clock.service b/buildroot/package/linuxptp/phc2sys.service similarity index 89% rename from buildroot/package/linuxptp/linuxptp-system-clock.service rename to buildroot/package/linuxptp/phc2sys.service index 57beec457..63b0ca23c 100644 --- a/buildroot/package/linuxptp/linuxptp-system-clock.service +++ b/buildroot/package/linuxptp/phc2sys.service @@ -1,6 +1,6 @@ [Unit] Description=Precision Time Protocol system clock synchronization -After=linuxptp.service +After=ptp4l.service [Service] ExecStart=/usr/sbin/phc2sys -s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0 diff --git a/buildroot/package/linuxptp/linuxptp.service b/buildroot/package/linuxptp/ptp4l.service similarity index 87% rename from buildroot/package/linuxptp/linuxptp.service rename to buildroot/package/linuxptp/ptp4l.service index 14e9814b0..07f0b68fa 100644 --- a/buildroot/package/linuxptp/linuxptp.service +++ b/buildroot/package/linuxptp/ptp4l.service @@ -3,7 +3,7 @@ Description=Precision Time Protocol daemon After=syslog.target network.target Before=time-sync.target Wants=time-sync.target -Wants=linuxptp-system-clock.service +Wants=phc2sys.service [Service] ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp.cfg diff --git a/buildroot/package/lirc-tools/0004-plugins-devinput.c-fix-build-with-musl-1.2.0.patch b/buildroot/package/lirc-tools/0004-plugins-devinput.c-fix-build-with-musl-1.2.0.patch new file mode 100644 index 000000000..e4c02cf45 --- /dev/null +++ b/buildroot/package/lirc-tools/0004-plugins-devinput.c-fix-build-with-musl-1.2.0.patch @@ -0,0 +1,42 @@ +From 74909db0342c7aff29e15972c9928f3bef56d5a6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Apr 2020 12:14:13 +0200 +Subject: [PATCH] plugins/devinput.c: fix build with musl 1.2.0 + +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 + +Signed-off-by: Fabrice Fontaine +--- + plugins/devinput.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/plugins/devinput.c b/plugins/devinput.c +index 77828b44..e5a52e42 100644 +--- a/plugins/devinput.c ++++ b/plugins/devinput.c +@@ -51,6 +51,10 @@ + #define LONG(x) ((x) / BITS_PER_LONG) + #define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif + + static const logchannel_t logchannel = LOG_DRIVER; + +@@ -458,7 +462,7 @@ char* devinput_rec(struct ir_remote* remotes) + return 0; + } + +- log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type, ++ log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type, + event.code, event.value); + + value = (unsigned)event.value; +-- +2.25.1 + diff --git a/buildroot/package/live555/live555.hash b/buildroot/package/live555/live555.hash index 2072b0ddf..5e65cacd7 100644 --- a/buildroot/package/live555/live555.hash +++ b/buildroot/package/live555/live555.hash @@ -1,5 +1,5 @@ # From http://www.live555.com/liveMedia/public/live555-latest-md5.txt -md5 12e105c8fef9d34658d68367dc26a3d9 live.2019.09.30.tar.gz +md5 4645d2a0c865505c85b48af5317bcb4a live.2020.08.19.tar.gz # Locally generated -sha256 ef44f48a84324525cebc2081dd2d0f1e908f2d0a79d9d30dd41967e142dfb06b live.2019.09.30.tar.gz +sha256 af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537 live.2020.08.19.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/buildroot/package/live555/live555.mk b/buildroot/package/live555/live555.mk index 81c8b3de8..621812695 100644 --- a/buildroot/package/live555/live555.mk +++ b/buildroot/package/live555/live555.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIVE555_VERSION = 2019.09.30 +LIVE555_VERSION = 2020.08.19 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz LIVE555_SITE = http://www.live555.com/liveMedia/public # There is a COPYING file with the GPL-3.0 license text, but none of @@ -26,6 +26,17 @@ LIVE555_LIBRARY_LINK = $(TARGET_CC) -o LIVE555_CFLAGS += -fPIC endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIVE555_DEPENDENCIES += host-pkgconf openssl +LIVE555_CONSOLE_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl` +# passed to ar for static linking, which gets confused by -L +ifneq ($(BR2_STATIC_LIBS),y) +LIVE555_LIVEMEDIA_LIBS = $(LIVE555_CONSOLE_LIBS) +endif +else +LIVE555_CFLAGS += -DNO_OPENSSL +endif + ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif @@ -41,6 +52,8 @@ define LIVE555_CONFIGURE_CMDS # Must have a whitespace at the end of LIBRARY_LINK, otherwise static link # fails echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_CONSOLE_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIVEMEDIA_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) (cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET)) endef diff --git a/buildroot/package/lld/lld.mk b/buildroot/package/lld/lld.mk index ea09c5d34..cd1a03c1d 100644 --- a/buildroot/package/lld/lld.mk +++ b/buildroot/package/lld/lld.mk @@ -19,6 +19,9 @@ HOST_LLD_DEPENDENCIES = host-llvm # https://reviews.llvm.org/D57264 HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +# build as static libs as is done in llvm & clang +HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + # GCC looks for tools in a different path from LLD's default installation path define HOST_LLD_CREATE_SYMLINKS mkdir -p $(HOST_DIR)/$(GNU_TARGET_NAME)/bin diff --git a/buildroot/package/lldpd/lldpd.hash b/buildroot/package/lldpd/lldpd.hash index c12e00478..4283b4aec 100644 --- a/buildroot/package/lldpd/lldpd.hash +++ b/buildroot/package/lldpd/lldpd.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f lldpd-1.0.4.tar.gz -sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE +# Locally computed after checking gpg key +# https://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz.gpg +# using key AEF2348766F371C689A7360095A42FE8353525F9 +sha256 2dd3b212f4dbabfcbb2794c0010b245f9f8e74b387984e757be6243a74c6cb99 lldpd-1.0.5.tar.gz +sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/buildroot/package/lldpd/lldpd.mk b/buildroot/package/lldpd/lldpd.mk index 264323a87..585d1ed7b 100644 --- a/buildroot/package/lldpd/lldpd.mk +++ b/buildroot/package/lldpd/lldpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLDPD_VERSION = 1.0.4 -LLDPD_SITE = http://media.luffy.cx/files/lldpd +LLDPD_VERSION = 1.0.5 +LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ host-pkgconf \ diff --git a/buildroot/package/llvm/llvm.mk b/buildroot/package/llvm/llvm.mk index f1034f036..24d033d12 100644 --- a/buildroot/package/llvm/llvm.mk +++ b/buildroot/package/llvm/llvm.mk @@ -189,11 +189,8 @@ LLVM_CONF_OPTS += -DLLVM_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) # This solves "No available targets are compatible for this triple" with llvmpipe LLVM_CONF_OPTS += -DLLVM_HOST_TRIPLE=$(GNU_TARGET_NAME) -# The Go bindings have no CMake rules at the moment, but better remove the -# check preventively. Building the Go and OCaml bindings is yet unsupported. +# Building the Go and OCaml bindings is yet unsupported. HOST_LLVM_CONF_OPTS += \ - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND \ - -DOCAMLFIND=OCAMLFIND-NOTFOUND \ -DLLVM_ENABLE_BINDINGS=OFF # Builds a release host tablegen that gets used during the LLVM build. diff --git a/buildroot/package/lm-sensors/lm-sensors.hash b/buildroot/package/lm-sensors/lm-sensors.hash index d41af2745..0ca07b7e6 100644 --- a/buildroot/package/lm-sensors/lm-sensors.hash +++ b/buildroot/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0 lm-sensors-3-5-0.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/buildroot/package/lm-sensors/lm-sensors.mk b/buildroot/package/lm-sensors/lm-sensors.mk index f8059be47..8975efaff 100644 --- a/buildroot/package/lm-sensors/lm-sensors.mk +++ b/buildroot/package/lm-sensors/lm-sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -LM_SENSORS_VERSION = 3-5-0 +LM_SENSORS_VERSION = 3-6-0 LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex @@ -20,7 +20,7 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect LM_SENSORS_MAKE_OPTS = \ - MACHINE=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) \ PREFIX=/usr ifeq ($(BR2_STATIC_LIBS),y) @@ -36,7 +36,7 @@ LM_SENSORS_MAKE_OPTS += BUILD_STATIC_LIB=1 endif define LM_SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(LM_SENSORS_MAKE_OPTS) -C $(@D) endef define LM_SENSORS_INSTALL_STAGING_CMDS diff --git a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch deleted file mode 100644 index 93547e08f..000000000 --- a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6fea0a8e33760258c4baa5d0a6f3a145897427fe Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 3 Sep 2019 14:01:39 +0200 -Subject: [PATCH] localedef: Use initializer for flexible array member [BZ - #24950] - -struct charseq used a zero-length array instead of a flexible array -member. This required a strange construct to initialize struct -charseq objects, and GCC 10 warns about that: - -cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] -In file included from programs/repertoire.h:24, - from programs/localedef.h:32, - from programs/ld-ctype.c:35: -programs/charmap.h:63:17: note: destination object declared here - 63 | unsigned char bytes[0]; - | ^~~~~ -cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] -programs/charmap.h:63:17: note: destination object declared here -cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] -programs/charmap.h:63:17: note: destination object declared here -cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] -programs/charmap.h:63:17: note: destination object declared here - -The change makes the object physically const, but it is not expected -to be modified. - -[Upstream: https://sourceware.org/git/?p=glibc.git;a=patch;h=1471fa556afb428c4a4c46cf5543a4101d5bcf91] -[Dropped confliciting ChangeLog part] -Signed-off-by: Peter Seiderer ---- - locale/programs/charmap.h | 2 +- - locale/programs/ld-ctype.c | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h -index 870a9e95..70db330d 100644 ---- a/locale/programs/charmap.h -+++ b/locale/programs/charmap.h -@@ -60,7 +60,7 @@ struct charseq - const char *name; - uint32_t ucs4; - int nbytes; -- unsigned char bytes[0]; -+ unsigned char bytes[]; - }; - - -diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c -index cfc9c43f..9123f64a 100644 ---- a/locale/programs/ld-ctype.c -+++ b/locale/programs/ld-ctype.c -@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); - for (cnt = 0; cnt < 10; ++cnt) - if (ctype->mboutdigits[cnt] == NULL) - { -- static struct charseq replace[2]; -- - if (!warned) - { - record_error (0, 0, _("\ -@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); - warned = 1; - } - -- replace[0].nbytes = 1; -- replace[0].bytes[0] = '?'; -- replace[0].bytes[1] = '\0'; -- ctype->mboutdigits[cnt] = &replace[0]; -+ static const struct charseq replace = -+ { -+ .nbytes = 1, -+ .bytes = "?", -+ }; -+ ctype->mboutdigits[cnt] = (struct charseq *) &replace; - } - - warned = 0; --- -2.26.0 - diff --git a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch rename to buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch diff --git a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash b/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash similarity index 52% rename from buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash rename to buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash index 6677d32db..a1b2ae12f 100644 --- a/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash +++ b/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) -sha256 4462f56696332efbc5b0c2f86d7aa75a2a02c3d44bc4345fa42b5bab1225de5c glibc-2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427.tar.gz +sha256 e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176 glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/buildroot/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk index d6f1625e3..413e3acb6 100644 --- a/buildroot/package/localedef/localedef.mk +++ b/buildroot/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427 +LOCALEDEF_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/buildroot/package/log4cxx/0001-charset-fixes.patch b/buildroot/package/log4cxx/0001-charset-fixes.patch deleted file mode 100644 index 75567fdad..000000000 --- a/buildroot/package/log4cxx/0001-charset-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix build when iconv support is not available - -When iconv support is not available, the apr-util library does not -provide character set conversion features, and therefore APR_HAS_XLATE -is false. - -However, on Linux !defined(_WIN32) is always true, but the part of the -code that defines the APRCharsetDecoder and APRCharsetEncoder are only -enclosed in a #if APR_HAS_XLATE, without the "|| defined(_WIN32)" -which leads to build failures: the APRCharsetEncoder and -APRCharsetDecoder classes are used without being defined. - -This patch removes the || !defined(_WIN32) so that when iconv support -is not here, we fall back to raising an exception at runtime. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/main/cpp/charsetdecoder.cpp -=================================================================== ---- a/src/main/cpp/charsetdecoder.cpp -+++ b/src/main/cpp/charsetdecoder.cpp -@@ -476,7 +476,7 @@ - StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) { - return new ISOLatinCharsetDecoder(); - } --#if APR_HAS_XLATE || !defined(_WIN32) -+#if APR_HAS_XLATE - return new APRCharsetDecoder(charset); - #else - throw IllegalArgumentException(charset); -Index: b/src/main/cpp/charsetencoder.cpp -=================================================================== ---- a/src/main/cpp/charsetencoder.cpp -+++ b/src/main/cpp/charsetencoder.cpp -@@ -484,7 +484,7 @@ - } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) { - return new UTF16LECharsetEncoder(); - } --#if APR_HAS_XLATE || !defined(_WIN32) -+#if APR_HAS_XLATE - return new APRCharsetEncoder(charset); - #else - throw IllegalArgumentException(charset); diff --git a/buildroot/package/log4cxx/0001-fix-build-without-wchar.patch b/buildroot/package/log4cxx/0001-fix-build-without-wchar.patch new file mode 100644 index 000000000..fc0e7be5c --- /dev/null +++ b/buildroot/package/log4cxx/0001-fix-build-without-wchar.patch @@ -0,0 +1,55 @@ +From 1fa70eaf24d75e84625f22779ec347fd29bf1ae6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 08:47:37 +0200 +Subject: [PATCH] fix build without wchar + +Disable wencode without wchar or the build will fail on: + +odbcappender.cpp: In static member function 'static void log4cxx::db::ODBCAppender::encode(wchar_t**, const LogString&, log4cxx::helpers::Pool&)': +odbcappender.cpp:362:22: error: 'wencode' is not a member of 'log4cxx::helpers::Transcoder' + *dest = Transcoder::wencode(src, p); + ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/apache/logging-log4cxx/commit/f171f818c798d48631d5b45851e4593953f31d9c] +--- + src/main/cpp/odbcappender.cpp | 2 ++ + src/main/include/log4cxx/db/odbcappender.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp +index 6bfa519e..218df132 100644 +--- a/src/main/cpp/odbcappender.cpp ++++ b/src/main/cpp/odbcappender.cpp +@@ -357,10 +357,12 @@ void ODBCAppender::setSql(const LogString& s) + } + } + ++#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32) + void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p) + { + *dest = Transcoder::wencode(src, p); + } ++#endif + + void ODBCAppender::encode(unsigned short** dest, + const LogString& src, Pool& p) +diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h +index a26bc35b..fdc144ff 100644 +--- a/src/main/include/log4cxx/db/odbcappender.h ++++ b/src/main/include/log4cxx/db/odbcappender.h +@@ -300,8 +300,10 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton + private: + ODBCAppender(const ODBCAppender&); + ODBCAppender& operator=(const ODBCAppender&); ++#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32) + static void encode(wchar_t** dest, const LogString& src, + log4cxx::helpers::Pool& p); ++#endif + static void encode(unsigned short** dest, const LogString& src, + log4cxx::helpers::Pool& p); + }; // class ODBCAppender diff --git a/buildroot/package/log4cxx/0002-missing-includes.patch b/buildroot/package/log4cxx/0002-missing-includes.patch deleted file mode 100644 index dd4da1161..000000000 --- a/buildroot/package/log4cxx/0002-missing-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit bcaf1f8a682d641cee325142099c371464fd5946 -Author: Curtis William Arnold -Date: Tue May 20 16:05:37 2008 +0000 - - LOGCXX-286: gcc 4.3 requires #include - - git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@658304 13f79535-47bb-0310-9956-ffa450edef68 - -diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp -index 6a01d8a..a673a10 100755 ---- a/src/examples/cpp/console.cpp -+++ b/src/examples/cpp/console.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; -diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp -index 52b1c0a..cb45181 100644 ---- a/src/main/cpp/inputstreamreader.cpp -+++ b/src/main/cpp/inputstreamreader.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; -diff --git a/src/main/cpp/socketoutputstream.cpp b/src/main/cpp/socketoutputstream.cpp -index 185f835..c61eb11 100644 ---- a/src/main/cpp/socketoutputstream.cpp -+++ b/src/main/cpp/socketoutputstream.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; diff --git a/buildroot/package/log4cxx/0003-missing-includes.patch b/buildroot/package/log4cxx/0003-missing-includes.patch deleted file mode 100644 index cd21bbab3..000000000 --- a/buildroot/package/log4cxx/0003-missing-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ce62c00ea5f9bf2f0740ecde5b245c9b7edc80ff -Author: Curtis William Arnold -Date: Mon Apr 27 03:53:50 2009 +0000 - - LOGCXX-332: fails to build with gcc 4.4 - - git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@768863 13f79535-47bb-0310-9956-ffa450edef68 - -diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp -index a673a10..f44c944 100755 ---- a/src/examples/cpp/console.cpp -+++ b/src/examples/cpp/console.cpp -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; diff --git a/buildroot/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch b/buildroot/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch deleted file mode 100644 index a0c9b3f5b..000000000 --- a/buildroot/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 5b75dfa78b2c5e95296cee0201bc045ef7264ed0 Mon Sep 17 00:00:00 2001 -From: Christian Grobmeier -Date: Tue, 27 Nov 2012 09:39:18 +0000 -Subject: [PATCH] Applied patch for LOGCXX-400 LOGCXX-404 LOGCXX-402 LOGCXX-403 - LOGCXX-401 thanks to Andrew Lazarus - -git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@1414037 13f79535-47bb-0310-9956-ffa450edef68 -Signed-off-by: Peter Korsgaard ---- - pom.xml | 2 ++ - src/main/cpp/locationinfo.cpp | 4 ++-- - src/main/cpp/loggingevent.cpp | 2 +- - src/main/cpp/ndc.cpp | 4 ++-- - src/main/cpp/objectoutputstream.cpp | 4 ++-- - src/main/cpp/transcoder.cpp | 2 +- - src/main/include/log4cxx/helpers/object.h | 6 +++--- - src/main/include/log4cxx/helpers/simpledateformat.h | 4 +++- - src/main/include/log4cxx/logstring.h | 2 +- - 9 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3504c8a3..255907bd 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -55,6 +55,7 @@ - - - -+ - - maven-assembly-plugin - -diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp -index e76ea29c..1daa3a5f 100644 ---- a/src/main/cpp/locationinfo.cpp -+++ b/src/main/cpp/locationinfo.cpp -@@ -153,8 +153,8 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const { - 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, - 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, - 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, -- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, -- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, -+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast(0xED), static_cast(0x99), static_cast(0xBB), -+ static_cast(0xE1), 0x4A, static_cast(0x91), static_cast(0xA5), 0x7C, 0x02, 0x00, 0x01, - 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, - 0x6E, 0x66, 0x6F, - 0x74, 0x00, 0x12, 0x4C, 0x6A, -diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp -index 1c0d4be7..edbf40b6 100644 ---- a/src/main/cpp/loggingevent.cpp -+++ b/src/main/cpp/loggingevent.cpp -@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { - 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, - 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, - 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, -- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, -+ 0x74, static_cast(0xF3), static_cast(0xF2), static_cast(0xB9), 0x23, 0x74, 0x0B, static_cast(0xB5), - 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, - 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, - 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, -diff --git a/src/main/cpp/ndc.cpp b/src/main/cpp/ndc.cpp -index 4ab612dd..89788c16 100644 ---- a/src/main/cpp/ndc.cpp -+++ b/src/main/cpp/ndc.cpp -@@ -309,7 +309,7 @@ bool NDC::pop(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - stack.pop(); - data->recycle(); - return true; -@@ -326,7 +326,7 @@ bool NDC::peek(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - return true; - } - data->recycle(); -diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp -index 7cd696b8..9567a856 100644 ---- a/src/main/cpp/objectoutputstream.cpp -+++ b/src/main/cpp/objectoutputstream.cpp -@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p) - objectHandle(0x7E0000), - classDescriptions(new ClassDescriptionMap()) - { -- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; -+ char start[] = { static_cast(0xAC), static_cast(0xED), 0x00, 0x05 }; - ByteBuffer buf(start, sizeof(start)); - os->write(buf, p); - } -@@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) { - 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, - 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, - 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, -- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, -+ static_cast(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast(0xE4), static_cast(0xB8), 0x03, - 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, - 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, - 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, -diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp -index d572ffce..32bed844 100644 ---- a/src/main/cpp/transcoder.cpp -+++ b/src/main/cpp/transcoder.cpp -@@ -356,7 +356,7 @@ static void encodeUTF16(unsigned int sv, String& dst) { - unsigned char u = (unsigned char) (sv >> 16); - unsigned char w = (unsigned char) (u - 1); - unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10)); -- unsigned short ls = (0xDC00 + (sv && 0x3FF)); -+ unsigned short ls = (0xDC00 + (sv & 0x3FF)); - dst.append(1, hs); - dst.append(1, ls); - } -diff --git a/src/main/include/log4cxx/helpers/object.h b/src/main/include/log4cxx/helpers/object.h -index 92d44c55..b9386c47 100644 ---- a/src/main/include/log4cxx/helpers/object.h -+++ b/src/main/include/log4cxx/helpers/object.h -@@ -61,8 +61,8 @@ static const helpers::Class& getStaticClass();\ - static const log4cxx::helpers::ClassRegistration& registerClass(); - - #define IMPLEMENT_LOG4CXX_OBJECT(object)\ --const log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ --const log4cxx::helpers::Class& object::getStaticClass() { \ -+const ::log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ -+const ::log4cxx::helpers::Class& object::getStaticClass() { \ - static Clazz##object theClass; \ - return theClass; \ - } \ -@@ -71,7 +71,7 @@ const log4cxx::helpers::ClassRegistration& object::registerClass() { \ - return classReg; \ - }\ - namespace log4cxx { namespace classes { \ --const log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ -+const ::log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ - } } - - -diff --git a/src/main/include/log4cxx/helpers/simpledateformat.h b/src/main/include/log4cxx/helpers/simpledateformat.h -index 9c27f685..76fb784c 100644 ---- a/src/main/include/log4cxx/helpers/simpledateformat.h -+++ b/src/main/include/log4cxx/helpers/simpledateformat.h -@@ -29,7 +29,9 @@ - #include - #include - --namespace std { class locale; } -+#include -+ -+using std::locale; - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h -index 3bbcdf2d..19e8aec7 100644 ---- a/src/main/include/log4cxx/logstring.h -+++ b/src/main/include/log4cxx/logstring.h -@@ -27,7 +27,7 @@ - #include - #include - --#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8 && LOG4CXX_LOGCHAR_IS_UNICHAR -+#if (LOG4CXX_LOGCHAR_IS_WCHAR + LOG4CXX_LOGCHAR_IS_UTF8 + LOG4CXX_LOGCHAR_IS_UNICHAR)>1 - #error only one of LOG4CXX_LOGCHAR_IS_WCHAR, LOG4CXX_LOGCHAR_IS_UTF8 or LOG4CXX_LOGCHAR_IS_UNICHAR may be true - #endif - --- -2.11.0 - diff --git a/buildroot/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch b/buildroot/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch deleted file mode 100644 index b3f43bfd7..000000000 --- a/buildroot/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch +++ /dev/null @@ -1,36 +0,0 @@ -From afc191aec355619d6ebabb2cad660a5a8ad4569b Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 30 Jan 2017 23:13:43 +0100 -Subject: [PATCH] domtestcase.cpp: fix narrowing conversion compile error with - gcc 6+ / signed char - -Signed-off-by: Peter Korsgaard ---- - src/test/cpp/xml/domtestcase.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp -index ad276d1a..2a1e6e2e 100644 ---- a/src/test/cpp/xml/domtestcase.cpp -+++ b/src/test/cpp/xml/domtestcase.cpp -@@ -190,7 +190,7 @@ public: - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3") - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xC2), static_cast(0xB3), 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; - #endif -@@ -209,7 +209,7 @@ public: - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4") - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xE3), static_cast(0x86), static_cast(0x95), 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; - #endif --- -2.11.0 - diff --git a/buildroot/package/log4cxx/log4cxx.hash b/buildroot/package/log4cxx/log4cxx.hash index 90fa2e73d..535a0c4aa 100644 --- a/buildroot/package/log4cxx/log4cxx.hash +++ b/buildroot/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c apache-log4cxx-0.10.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz.sha512 +sha512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd apache-log4cxx-0.11.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/log4cxx/log4cxx.mk b/buildroot/package/log4cxx/log4cxx.mk index 7d7e2e9bb..0ddea9466 100644 --- a/buildroot/package/log4cxx/log4cxx.mk +++ b/buildroot/package/log4cxx/log4cxx.mk @@ -4,12 +4,14 @@ # ################################################################################ -LOG4CXX_VERSION = 0.10.0 +LOG4CXX_VERSION = 0.11.0 LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE +# error: required file './compile' not found +LOG4CXX_AUTORECONF = YES LOG4CXX_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ diff --git a/buildroot/package/logrotate/logrotate.hash b/buildroot/package/logrotate/logrotate.hash index 6da14797f..704cbcabd 100644 --- a/buildroot/package/logrotate/logrotate.hash +++ b/buildroot/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7b20f5184c9598c36546f9200d3bd616d561478a0423ab8074e97a1cd7b1c25 logrotate-3.15.1.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 c25ea219018b024988b791e91e9f6070c34d2056efa6ffed878067866c0ed765 logrotate-3.17.0.tar.gz diff --git a/buildroot/package/logrotate/logrotate.mk b/buildroot/package/logrotate/logrotate.mk index 831e23935..fe674ee6a 100644 --- a/buildroot/package/logrotate/logrotate.mk +++ b/buildroot/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.15.1 +LOGROTATE_VERSION = 3.17.0 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING diff --git a/buildroot/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch b/buildroot/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch new file mode 100644 index 000000000..0917260d4 --- /dev/null +++ b/buildroot/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch @@ -0,0 +1,101 @@ +From 6bc5abf99ef01e5aeea4f5bce5f5bff7f1b8ddd9 Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Sat, 4 Jul 2020 20:02:53 -0300 +Subject: [PATCH] Fix musl build: basename() is in libgen.h. + +Also, its argument is not const, so add const_cast. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Signed-off-by: Sergio Prado +--- + src/core/sysfs.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc +index 32d65642f157..c2fa84fe8d0f 100644 +--- a/src/core/sysfs.cc ++++ b/src/core/sysfs.cc +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + + __ID("@(#) $Id$"); +@@ -100,7 +101,7 @@ static string sysfs_getbustype(const string & path) + { + devname = + string(fs.path + "/bus/") + string(namelist[i]->d_name) + +- "/devices/" + basename(path.c_str()); ++ "/devices/" + basename(const_cast(path.c_str())); + + if (samefile(devname, path)) + return string(namelist[i]->d_name); +@@ -140,7 +141,7 @@ static string sysfstobusinfo(const string & path) + + if (bustype == "usb") + { +- string name = basename(path.c_str()); ++ string name = basename(const_cast(path.c_str())); + if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$")) + { + size_t colon = name.rfind(":"); +@@ -151,7 +152,7 @@ static string sysfstobusinfo(const string & path) + + if (bustype == "virtio") + { +- string name = basename(path.c_str()); ++ string name = basename(const_cast(path.c_str())); + if (name.compare(0, 6, "virtio") == 0) + return "virtio@" + name.substr(6); + else +@@ -159,10 +160,10 @@ static string sysfstobusinfo(const string & path) + } + + if (bustype == "vio") +- return string("vio@") + basename(path.c_str()); ++ return string("vio@") + basename(const_cast(path.c_str())); + + if (bustype == "ccw") +- return string("ccw@") + basename(path.c_str()); ++ return string("ccw@") + basename(const_cast(path.c_str())); + + if (bustype == "ccwgroup") + { +@@ -240,7 +241,7 @@ string entry::driver() const + string driverlink = This->devpath + "/driver"; + if (!exists(driverlink)) + return ""; +- return basename(readlink(driverlink).c_str()); ++ return basename(const_cast(readlink(driverlink).c_str())); + } + + +@@ -328,7 +329,7 @@ string entry::name_in_class(const string & classname) const + + string entry::name() const + { +- return basename(This->devpath.c_str()); ++ return basename(const_cast(This->devpath.c_str())); + } + + +@@ -340,12 +341,12 @@ entry entry::parent() const + + string entry::classname() const + { +- return basename(dirname(This->devpath).c_str()); ++ return basename(const_cast(dirname(This->devpath).c_str())); + } + + bool entry::isvirtual() const + { +- return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual"; ++ return string(basename(const_cast(dirname(dirname(This->devpath)).c_str()))) == "virtual"; + } + + string entry::string_attr(const string & name, const string & def) const +-- +2.17.1 + diff --git a/buildroot/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch b/buildroot/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch deleted file mode 100644 index 772012436..000000000 --- a/buildroot/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5af98ca8135ac411364b16720d795224a9b4a178 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 30 Jul 2016 15:15:14 +0200 -Subject: [PATCH] Makefile: allow to pass additional LIBS - -We need to be able to pass extra LIBS when our toolchain lacks NLS -support, this way we can build libintl and link to it. A good example -is uClibc with locale support disabled. - -Signed-off-by: Gustavo Zacarias ---- - src/Makefile | 2 +- - src/gui/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index b50586b..acbdbfa 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -30,7 +30,7 @@ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed - endif - LDSTATIC=-static --LIBS=-llshw -lresolv -+LIBS+=-llshw -lresolv - ifeq ($(SQLITE), 1) - LIBS+= $(shell pkg-config --libs sqlite3) - endif -diff --git a/src/gui/Makefile b/src/gui/Makefile -index 332ce57..7f72e3f 100644 ---- a/src/gui/Makefile -+++ b/src/gui/Makefile -@@ -11,7 +11,7 @@ INCLUDES=-I../core $(GTKINCLUDES) - CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) - CFLAGS=$(CXXFLAGS) $(DEFINES) - GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) --LIBS=-L../core -llshw -lresolv $(GTKLIBS) -+LIBS+=-L../core -llshw -lresolv $(GTKLIBS) - LDFLAGS= - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed --- -2.7.4 - diff --git a/buildroot/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch b/buildroot/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch deleted file mode 100644 index d80c62a12..000000000 --- a/buildroot/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 016bdb133a44bdf42c268ff72ee7aa04af19cfd3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sat, 27 Aug 2016 01:11:56 +0200 -Subject: [PATCH] Fix musl build: basename() is in libgen.h. - -Also, its argument is not const, so add const_cast. This is risky -because in fact basename() will modify the argument if it ends with / -but that's not the case here. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - src/core/dasd.cc | 1 + - src/core/sysfs.cc | 9 +++++---- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/core/dasd.cc b/src/core/dasd.cc -index 626b8a8..6276101 100644 ---- a/src/core/dasd.cc -+++ b/src/core/dasd.cc -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - using namespace std; - -diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc -index acc9d00..bdd69e3 100644 ---- a/src/core/sysfs.cc -+++ b/src/core/sysfs.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - __ID("@(#) $Id$"); - -@@ -99,7 +100,7 @@ static string sysfs_getbustype(const string & path) - { - devname = - string(fs.path + "/bus/") + string(namelist[i]->d_name) + -- "/devices/" + basename(path.c_str()); -+ "/devices/" + basename(const_cast(path.c_str())); - - if (samefile(devname, path)) - return string(namelist[i]->d_name); -@@ -139,7 +140,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "virtio") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (name.compare(0, 6, "virtio") == 0) - return "virtio@" + name.substr(6); - else -@@ -207,7 +208,7 @@ string entry::driver() const - string driverlink = This->devpath + "/driver"; - if (!exists(driverlink)) - return ""; -- return basename(readlink(driverlink).c_str()); -+ return basename(const_cast(readlink(driverlink).c_str())); - } - - -@@ -288,7 +289,7 @@ string entry::name_in_class(const string & classname) const - - string entry::name() const - { -- return basename(This->devpath.c_str()); -+ return basename(const_cast(This->devpath.c_str())); - } - - --- -2.9.3 - diff --git a/buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch b/buildroot/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch similarity index 53% rename from buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch rename to buildroot/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch index 7d8d73945..dd8bdb5be 100644 --- a/buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch +++ b/buildroot/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch @@ -1,7 +1,7 @@ -From 50284ac4400ac3d7562f4765726492caee8ff547 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sat, 27 Aug 2016 01:15:13 +0200 -Subject: [PATCH] Fix use of LONG_BIT +From 246b9e07f22d551fae0718315273760c087b79ca Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Sat, 4 Jul 2020 20:28:26 -0300 +Subject: [PATCH] Fix musl build: wrong usage of LONG_BIT LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as a sysconf value will give weird results. @@ -12,25 +12,27 @@ equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime lookup doesn't make sense. For this reason, musl has removed the definition of _SC_LONG_BIT. +Signed-off-by: Sergio Prado Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- - src/core/abi.cc | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/core/abi.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/abi.cc b/src/core/abi.cc -index 76e5082..a13daaa 100644 +index adff7b55acfa..76c664c03ce7 100644 --- a/src/core/abi.cc +++ b/src/core/abi.cc -@@ -19,8 +19,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - +@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); bool scan_abi(hwNode & system) { -- // are we compiled as 32- or 64-bit process ? -- system.setWidth(sysconf(LONG_BIT)); + // are we compiled as 32- or 64-bit process ? +- long sc = sysconf(LONG_BIT); +- if(sc==-1) sc = sysconf(_SC_LONG_BIT); +- if(sc!=-1) system.setWidth(sc); + system.setWidth(LONG_BIT); pushd(PROC_SYS); -- -2.9.3 +2.17.1 diff --git a/buildroot/package/lshw/lshw.hash b/buildroot/package/lshw/lshw.hash index a8352d428..0b60b3b57 100644 --- a/buildroot/package/lshw/lshw.hash +++ b/buildroot/package/lshw/lshw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz +sha256 9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80 lshw-B.02.19.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lshw/lshw.mk b/buildroot/package/lshw/lshw.mk index 3e8cee2e2..9f1ff8938 100644 --- a/buildroot/package/lshw/lshw.mk +++ b/buildroot/package/lshw/lshw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSHW_VERSION = 02.18 +LSHW_VERSION = 02.19.2 LSHW_SITE = http://ezix.org/software/files LSHW_SOURCE = lshw-B.$(LSHW_VERSION).tar.gz LSHW_LICENSE = GPL-2.0 diff --git a/buildroot/package/lsscsi/lsscsi.hash b/buildroot/package/lsscsi/lsscsi.hash index fe1bc5d8b..d444c7e05 100644 --- a/buildroot/package/lsscsi/lsscsi.hash +++ b/buildroot/package/lsscsi/lsscsi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15 lsscsi-0.30.tgz -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 12bf1973014803c6fd6d547e7594a4c049f0eef3bf5d22190d4be29d7c09f3ca lsscsi-0.31.tgz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/lsscsi/lsscsi.mk b/buildroot/package/lsscsi/lsscsi.mk index 70c5226d9..e9a525539 100644 --- a/buildroot/package/lsscsi/lsscsi.mk +++ b/buildroot/package/lsscsi/lsscsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSSCSI_VERSION = 0.30 +LSSCSI_VERSION = 0.31 LSSCSI_SOURCE = lsscsi-$(LSSCSI_VERSION).tgz LSSCSI_SITE = http://sg.danny.cz/scsi LSSCSI_LICENSE = GPL-2.0+ diff --git a/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch b/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch new file mode 100644 index 000000000..f9815624b --- /dev/null +++ b/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch @@ -0,0 +1,225 @@ +From 48edd768850825a4d01e5e5e737122333fc55cdf Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Fri, 2 Oct 2020 21:29:58 +0200 +Subject: [PATCH] cacheflush01: Rewrite into new API + +This syscall is currently (v5.9) supported on these architectures: +arc, csky, mips, m68k, nds32, sh + +constants are missing for m68k, not sure if the testcase is valid for it. +Untested. + +Test for __LTP__NR_INVALID_SYSCALL saves adding autotools check for +. + +Signed-off-by: Petr Vorel +--- +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201002202416.28972-1-petr.vorel@gmail.com/ ] + .../kernel/syscalls/cacheflush/cacheflush01.c | 173 ++++-------------- + 1 file changed, 40 insertions(+), 133 deletions(-) + +diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c +index 29cf2014a..6ad8b953a 100644 +--- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c ++++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c +@@ -1,157 +1,64 @@ +-/******************************************************************************/ +-/* Copyright (c) Maxin John , 2009 */ +-/* LKML Reference: http://lkml.org/lkml/2009/4/9/203 */ +-/* 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 */ +-/* */ +-/******************************************************************************/ +-/******************************************************************************/ +-/* */ +-/* File: cacheflush01.c */ +-/* */ +-/* Description: The cacheflush_check() syscall */ +-/* Tests EINVAL error of cacheflush system call. */ +-/* Its expected behaviour is cacheflush() should return -EINVAL */ +-/* when cache parameter is not one of ICACHE, DCACHE, or BCACHE. */ +-/* */ +-/* Usage: */ +-/* cacheflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ +-/* where, -c n : Run n copies concurrently. */ +-/* -e : Turn on errno logging. */ +-/* -i n : Execute test n times. */ +-/* -I x : Execute test for x seconds. */ +-/* -P x : Pause for x seconds between iterations. */ +-/* -t : Turn on syscall timing. */ +-/* */ +-/* Total Tests: 1 */ +-/* */ +-/* Test Name: cacheflush01 */ +-/******************************************************************************/ ++// SPDX-License-Identifier: GPL-2.0-or-later + +-#include +-#include +-#include +-#include +- +-#include "test.h" ++#include "tst_test.h" + #include "lapi/syscalls.h" + + #if __NR_cacheflush != __LTP__NR_INVALID_SYSCALL ++ + #include +-#else ++ ++/* ++ * m68k does not have these constants ++ */ ++ + #ifndef ICACHE +-#define ICACHE (1<<0) /* flush instruction cache */ ++# define ICACHE (1<<0) + #endif ++ + #ifndef DCACHE +-#define DCACHE (1<<1) /* writeback and flush data cache */ ++# define DCACHE (1<<1) + #endif ++ + #ifndef BCACHE +-#define BCACHE (ICACHE|DCACHE) /* flush both caches */ +-#endif ++# define BCACHE (ICACHE|DCACHE) + #endif + +-char *TCID = "cacheflush01"; +-int TST_TOTAL = 1; ++#define CACHE_DESC(x) .cache = x, .desc = #x + +-/* Extern Global Functions */ +-/******************************************************************************/ +-/* */ +-/* Function: cleanup */ +-/* */ +-/* Description: Performs all one time clean up for this test on successful */ +-/* completion, premature exit or failure. Closes all temporary */ +-/* files, removes all temporary directories exits the test with */ +-/* appropriate return code by calling tst_exit() function. */ +-/* */ +-/* Input: None. */ +-/* */ +-/* Output: None. */ +-/* */ +-/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ +-/* On success - Exits calling tst_exit(). With '0' return code. */ +-/* */ +-/******************************************************************************/ +-void cleanup(void) +-{ ++static struct test_case_t { ++ int cache; ++ const char *desc; ++} test_cases[] = { ++ { CACHE_DESC(ICACHE) }, ++ { CACHE_DESC(DCACHE) }, ++ { CACHE_DESC(BCACHE) }, ++}; + +- tst_rmdir(); +-} ++static char *addr; + +-/* Local Functions */ +-/******************************************************************************/ +-/* */ +-/* Function: setup */ +-/* */ +-/* Description: Performs all one time setup for this test. This function is */ +-/* typically used to capture signals, create temporary dirs */ +-/* and temporary files that may be used in the course of this */ +-/* test. */ +-/* */ +-/* Input: None. */ +-/* */ +-/* Output: None. */ +-/* */ +-/* Return: On failure - Exits by calling cleanup(). */ +-/* On success - returns 0. */ +-/* */ +-/******************************************************************************/ +-void setup(void) ++static void setup(void) + { +- /* Capture signals if any */ +- /* Create temporary directories */ +- TEST_PAUSE; +- tst_tmpdir(); ++ addr = SAFE_MALLOC(getpagesize()); + } + +-int main(int ac, char **av) ++static void test_cacheflush(unsigned int i) + { ++ struct test_case_t *tc = &test_cases[i]; + +- char *addr = NULL; +- +- tst_parse_opts(ac, av, NULL, NULL); +- +- setup(); +- +- tst_count = 0; +- /* Create some user address range */ +- addr = malloc(getpagesize()); +- if (addr == NULL) { +- tst_brkm(TFAIL | TTERRNO, cleanup, "malloc failed"); +- } +- +- /* Invokes cacheflush() with proper parameters */ +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), ICACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); +- } else { +- tst_resm(TFAIL, "failed with unexpected errno"); +- } +- +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), DCACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); ++ TEST(tst_syscall(__NR_cacheflush, addr, getpagesize(), tc->cache)); ++ if (TST_RET == 0) { ++ tst_res(TPASS, "%s passed", tc->desc); + } else { +- tst_resm(TFAIL, "failed with unexpected errno"); ++ tst_res(TFAIL | TTERRNO, "%s failed", tc->desc); + } ++} + +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), BCACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); +- } else { +- tst_resm(TFAIL, "failed with unexpected errno"); +- } ++static struct tst_test test = { ++ .setup = setup, ++ .test = test_cacheflush, ++ .tcnt = ARRAY_SIZE(test_cases), ++}; + +- cleanup(); +- tst_exit(); +-} ++#else ++ TST_TEST_TCONF("system doesn't support cacheflush()"); ++#endif +-- +2.28.0 + diff --git a/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch new file mode 100644 index 000000000..f1b6743f2 --- /dev/null +++ b/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -0,0 +1,203 @@ +From ac3e262cba81889c0bb04ce87a50a1709f2726e7 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Thu, 1 Oct 2020 23:28:39 +0200 +Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The reason is to avoid indirect include when using +some network headers: or others -> +-> + +This indirect include causes on MUSL redefinition of struct sysinfo when +included both and some of UAPI headers: + +In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, + from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, + from ../include/tst_netlink.h:14, + from tst_crypto.c:13: +x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sysinfo’ + struct sysinfo { + ^~~~~~~ +In file included from ../include/tst_safe_macros.h:15, + from ../include/tst_test.h:93, + from tst_crypto.c:11: +x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + +Signed-off-by: Petr Vorel +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/ ] +--- + include/lapi/sysinfo.h | 22 +++++++++++++++++++ + include/tst_safe_macros.h | 2 +- + lib/safe_macros.c | 2 +- + lib/tst_memutils.c | 2 +- + testcases/kernel/mem/mtest01/mtest01.c | 2 +- + testcases/kernel/syscalls/madvise/madvise06.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo01.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo02.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo03.c | 2 +- + 9 files changed, 30 insertions(+), 8 deletions(-) + create mode 100644 include/lapi/sysinfo.h + +diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h +new file mode 100644 +index 000000000..d0e0e93d7 +--- /dev/null ++++ b/include/lapi/sysinfo.h +@@ -0,0 +1,22 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++/* ++ * Copyright (c) 2020 Petr Vorel ++ */ ++ ++#ifndef SYSINFO_H__ ++ ++/* ++ * Don't use as it breaks build MUSL toolchain. ++ * Use instead. ++ * ++ * Some kernel UAPI headers do indirect include: ++ * or others -> -> ++ * ++ * This indirect include causes on MUSL redefinition of struct sysinfo when ++ * included both and some of UAPI headers: ++ */ ++#include ++ ++#define SYSINFO_H__ ++ ++#endif /* SYSINFO_H__ */ +diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h +index 053c3bcf9..61ea2076d 100644 +--- a/include/tst_safe_macros.h ++++ b/include/tst_safe_macros.h +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/lib/safe_macros.c b/lib/safe_macros.c +index 4f48d7529..d8ee03dae 100644 +--- a/lib/safe_macros.c ++++ b/lib/safe_macros.c +@@ -11,7 +11,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -23,6 +22,7 @@ + #include + #include "test.h" + #include "safe_macros.h" ++#include "lapi/sysinfo.h" + + char *safe_basename(const char *file, const int lineno, + void (*cleanup_fn) (void), char *path) +diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c +index f134d90c9..647db951e 100644 +--- a/lib/tst_memutils.c ++++ b/lib/tst_memutils.c +@@ -5,11 +5,11 @@ + + #include + #include +-#include + #include + + #define TST_NO_DEFAULT_MAIN + #include "tst_test.h" ++#include "lapi/sysinfo.h" + + #define BLOCKSIZE (16 * 1024 * 1024) + +diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c +index f08d3943f..9b4d856f8 100644 +--- a/testcases/kernel/mem/mtest01/mtest01.c ++++ b/testcases/kernel/mem/mtest01/mtest01.c +@@ -20,7 +20,6 @@ + */ + + #include +-#include + #include + #include + #include +@@ -29,6 +28,7 @@ + #include + + #include "lapi/abisize.h" ++#include "lapi/sysinfo.h" + #include "tst_test.h" + + #define FIVE_HUNDRED_MB (500ULL*1024*1024) +diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c +index f76f3f6aa..b2613670b 100644 +--- a/testcases/kernel/syscalls/madvise/madvise06.c ++++ b/testcases/kernel/syscalls/madvise/madvise06.c +@@ -24,8 +24,8 @@ + #include + #include + #include +-#include + #include "tst_test.h" ++#include "lapi/sysinfo.h" + + #define CHUNK_SZ (400*1024*1024L) + #define CHUNK_PAGES (CHUNK_SZ / pg_sz) +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c +index 2ea44a2be..a95066bf5 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c +@@ -69,9 +69,9 @@ + #include + #include + #include +-#include + + #include "test.h" ++#include "lapi/sysinfo.h" + + void setup(); + void cleanup(); +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c +index 678b8f1d3..5ce65d20e 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c +@@ -65,10 +65,10 @@ + #include + #include + #include +-#include + #include + + #include "test.h" ++#include "lapi/sysinfo.h" + + #define INVALID_ADDRESS ((uintptr_t)-1) + +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c +index af7cb6421..3b61a05b1 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c +@@ -13,9 +13,9 @@ + + */ + +-#include + #include "lapi/namespaces_constants.h" + #include "lapi/posix_clocks.h" ++#include "lapi/sysinfo.h" + #include "tst_test.h" + + static int offsets[] = { +-- +2.28.0 + diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.hash b/buildroot/package/ltp-testsuite/ltp-testsuite.hash index 4f373c0ce..9dce0405d 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.hash +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200120/ltp-full-20200120.tar.xz.sha1 -sha1 8f622383907e2e64e60b69fd305fecb34311d6b6 ltp-full-20200120.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20200930/ltp-full-20200930.tar.xz.sha1 +sha1 f380c7afe71e03eabb1de668c0399267042cb0f7 ltp-full-20200930.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.mk b/buildroot/package/ltp-testsuite/ltp-testsuite.mk index 88b2e8829..a9a3173c4 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.mk +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200120 +LTP_TESTSUITE_VERSION = 20200930 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ @@ -69,23 +69,15 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ testcases/misc/math/float/float_bessel.c else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ - testcases/kernel/pty/pty01.c \ - testcases/kernel/pty/pty02.c \ - testcases/kernel/pty/ptem01.c \ testcases/kernel/sched/process_stress/process.c \ - testcases/kernel/syscalls/accept4/accept4_01.c \ testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ testcases/kernel/syscalls/getdents/getdents01.c \ testcases/kernel/syscalls/getdents/getdents02.c \ - testcases/kernel/syscalls/ioctl/ioctl01.c \ - testcases/kernel/syscalls/ioctl/ioctl02.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ - testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ testcases/kernel/syscalls/timer_create/timer_create03.c \ - testcases/misc/crash/crash01.c \ utils/benchmark/ebizzy-0.3 endif diff --git a/buildroot/package/ltrace/Config.in b/buildroot/package/ltrace/Config.in index 667338a26..ce5a85edc 100644 --- a/buildroot/package/ltrace/Config.in +++ b/buildroot/package/ltrace/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LTRACE bool "ltrace" depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS select BR2_PACKAGE_ELFUTILS @@ -25,7 +26,8 @@ config BR2_PACKAGE_LTRACE http://ltrace.org -comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/buildroot/package/ltrace/ltrace.hash b/buildroot/package/ltrace/ltrace.hash index f795f53bf..a677ed351 100644 --- a/buildroot/package/ltrace/ltrace.hash +++ b/buildroot/package/ltrace/ltrace.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 894333bb7d347066c4e398d9f4a202af5f2faf80754905dd0e6a2259695baba0 ltrace-c22d359433b333937ee3d803450dc41998115685.tar.gz +sha256 4aecf69e4a33331aed1e50ce4907e73a98cbccc4835febc3473863474304d547 ltrace-82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/ltrace/ltrace.mk b/buildroot/package/ltrace/ltrace.mk index 2eb60fe45..b3bd90daa 100644 --- a/buildroot/package/ltrace/ltrace.mk +++ b/buildroot/package/ltrace/ltrace.mk @@ -4,15 +4,11 @@ # ################################################################################ -LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685 -#LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git - -# Upstream is dead: the git reporistory for ltrace did not follow during the -# migration from alioth to gitlab, and there is no longer any official -# upstream repository with the expected sha1, except for the tarball cached on -# s.b.o., so we go fetch it there. -LTRACE_SITE = http://sources.buildroot.org/ltrace - +# This github version has some extra fixes on top of https://ltrace.org/ +# in particular the following commit to avoid a crash: +# 192e0a6 void struct members are now ignored +LTRACE_VERSION = 82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4 +LTRACE_SITE = $(call github,dkogan,ltrace,$(LTRACE_VERSION)) LTRACE_DEPENDENCIES = elfutils LTRACE_CONF_OPTS = --disable-werror LTRACE_LICENSE = GPL-2.0 diff --git a/buildroot/package/ltris/0001-fix-build-with-gcc-4.8.patch b/buildroot/package/ltris/0001-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..d6bbf6a94 --- /dev/null +++ b/buildroot/package/ltris/0001-fix-build-with-gcc-4.8.patch @@ -0,0 +1,20 @@ +Fix build with gcc 4.8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/lgames/patches/28] +Index: ltris/src/bowl.c +=================================================================== +--- ltris/src/bowl.c (révision 421) ++++ ltris/src/bowl.c (copie de travail) +@@ -828,9 +828,10 @@ + */ + void bowl_init_block_masks() + { ++ int i; + int masksize = sizeof(block_masks[0].mask); // same for all + +- for (int i = 0; i < 7; i++) { ++ for (i = 0; i < 7; i++) { + block_masks[i].rx = 2; + block_masks[i].ry = 2; + memset(block_masks[i].mask, 0, masksize ); diff --git a/buildroot/package/ltris/0001-fix-gcc5-build.patch b/buildroot/package/ltris/0001-fix-gcc5-build.patch deleted file mode 100644 index 66d0fa3df..000000000 --- a/buildroot/package/ltris/0001-fix-gcc5-build.patch +++ /dev/null @@ -1,308 +0,0 @@ -Upstream patch to fix build with GCC 5 - -Obtained from the LGames Subversion repository with the following command: -svn diff -c164 svn://svn.code.sf.net/p/lgames/code/trunk/ltris - -Signed-off-by: Rodrigo Rebello - -Revision log message: ------------------------------------------------------------------------- -r164 | kulkanie | 2015-05-16 05:48:02 -0300 (Sat, 16 May 2015) | 1 line - -removed all inline keywords ------------------------------------------------------------------------- - -Line added to LTris ChangeLog concerning the change: -- removed all inline keywords to work with GCC 5 (2015/05/16 MS) - -Author: Michael Speck - -Index: src/sdl.c -=================================================================== ---- a/src/sdl.c (revision 163) -+++ b/src/sdl.c (revision 164) -@@ -244,7 +244,7 @@ - #endif - - /* return full path of bitmap */ --inline void get_full_bmp_path( char *full_path, char *file_name ) -+void get_full_bmp_path( char *full_path, char *file_name ) - { - sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); - } -@@ -330,7 +330,7 @@ - /* - lock surface - */ --inline void lock_surf(SDL_Surface *sur) -+void lock_surf(SDL_Surface *sur) - { - if (SDL_MUSTLOCK(sur)) - SDL_LockSurface(sur); -@@ -339,7 +339,7 @@ - /* - unlock surface - */ --inline void unlock_surf(SDL_Surface *sur) -+void unlock_surf(SDL_Surface *sur) - { - if (SDL_MUSTLOCK(sur)) - SDL_UnlockSurface(sur); -@@ -666,7 +666,7 @@ - /* - lock font surface - */ --inline void lock_font(Font *fnt) -+void lock_font(Font *fnt) - { - if (SDL_MUSTLOCK(fnt->pic)) - SDL_LockSurface(fnt->pic); -@@ -675,7 +675,7 @@ - /* - unlock font surface - */ --inline void unlock_font(Font *fnt) -+void unlock_font(Font *fnt) - { - if (SDL_MUSTLOCK(fnt->pic)) - SDL_UnlockSurface(fnt->pic); -@@ -905,7 +905,7 @@ - /* - update rectangle (0,0,0,0)->fullscreen - */ --inline void refresh_screen(int x, int y, int w, int h) -+void refresh_screen(int x, int y, int w, int h) - { - SDL_UpdateRect(sdl.screen, x, y, w, h); - } -@@ -1055,7 +1055,7 @@ - /* - lock surface - */ --inline void lock_screen() -+void lock_screen() - { - if (SDL_MUSTLOCK(sdl.screen)) - SDL_LockSurface(sdl.screen); -@@ -1064,7 +1064,7 @@ - /* - unlock surface - */ --inline void unlock_screen() -+void unlock_screen() - { - if (SDL_MUSTLOCK(sdl.screen)) - SDL_UnlockSurface(sdl.screen); -@@ -1073,7 +1073,7 @@ - /* - flip hardware screens (double buffer) - */ --inline void flip_screen() -+void flip_screen() - { - SDL_Flip(sdl.screen); - } -@@ -1132,7 +1132,7 @@ - /* - get milliseconds since last call - */ --inline int get_time() -+int get_time() - { - int ms; - cur_time = SDL_GetTicks(); -@@ -1148,7 +1148,7 @@ - /* - reset timer - */ --inline void reset_timer() -+void reset_timer() - { - last_time = SDL_GetTicks(); - } -Index: src/sdl.h -=================================================================== ---- a/src/sdl.h (revision 163) -+++ b/src/sdl.h (revision 164) -@@ -41,8 +41,8 @@ - SDL_Surface* load_surf(char *fname, int f); - SDL_Surface* create_surf(int w, int h, int f); - void free_surf( SDL_Surface **surf ); --inline void lock_surf(SDL_Surface *sur); --inline void unlock_surf(SDL_Surface *sur); -+void lock_surf(SDL_Surface *sur); -+void unlock_surf(SDL_Surface *sur); - void blit_surf(void); - void alpha_blit_surf(int alpha); - void fill_surf(int c); -@@ -86,8 +86,8 @@ - Font* load_fixed_font(char *fname, int off, int len, int w); - void free_font(Font **sfnt); - int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); --inline void lock_font(Font *sfnt); --inline void unlock_font(Font *sfnt); -+void lock_font(Font *sfnt); -+void unlock_font(Font *sfnt); - SDL_Rect last_write_rect(Font *fnt); - int text_width(Font *fnt, char *str); - -@@ -132,14 +132,14 @@ - char** get_mode_names( int *count ); - int set_video_mode( Video_Mode mode ); - void hardware_cap(); --inline void refresh_screen( int x, int y, int w, int h ); -+void refresh_screen( int x, int y, int w, int h ); - void refresh_rects(); - void add_refresh_rect(int x, int y, int w, int h); - int wait_for_key(); - void wait_for_click(); --inline void lock_screen(); --inline void unlock_screen(); --inline void flip_screen(); -+void lock_screen(); -+void unlock_screen(); -+void flip_screen(); - void fade_screen( int type, int ms ); - void take_screenshot( int i ); - -@@ -148,8 +148,8 @@ - SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source ); - - /* timer */ --inline int get_time(); --inline void reset_timer(); -+int get_time(); -+void reset_timer(); - - #ifdef __cplusplus - }; -Index: src/tools.c -=================================================================== ---- a/src/tools.c (revision 163) -+++ b/src/tools.c (revision 164) -@@ -23,7 +23,7 @@ - #include "ltris.h" - - /* compares to strings and returns true if their first strlen(str1) chars are equal */ --inline int strequal( char *str1, char *str2 ) -+int strequal( char *str1, char *str2 ) - { - if ( strlen( str1 ) != strlen( str2 ) ) return 0; - return ( !strncmp( str1, str2, strlen( str1 ) ) ); -@@ -30,7 +30,7 @@ - } - - /* set delay to ms milliseconds */ --inline void delay_set( Delay *delay, int ms ) -+void delay_set( Delay *delay, int ms ) - { - delay->limit = ms; - delay->cur = 0; -@@ -37,13 +37,13 @@ - } - - /* reset delay ( cur = 0 )*/ --inline void delay_reset( Delay *delay ) -+void delay_reset( Delay *delay ) - { - delay->cur = 0; - } - - /* check if times out and reset */ --inline int delay_timed_out( Delay *delay, int ms ) -+int delay_timed_out( Delay *delay, int ms ) - { - delay->cur += ms; - if ( delay->cur >= delay->limit ) { -@@ -56,12 +56,12 @@ - } - - /* set timer so that we have a time out next call of delay_timed_out() */ --inline void delay_force_time_out( Delay *delay ) -+void delay_force_time_out( Delay *delay ) - { - delay->cur = delay->limit; - } - --inline void goto_tile( int *x, int *y, int d ) -+void goto_tile( int *x, int *y, int d ) - { - /* 0 -up, clockwise, 5 - left up */ - switch ( d ) { -@@ -326,24 +326,24 @@ - the target value until reached when counter_update() is called. - ==================================================================== - */ --inline void counter_set( Counter *counter, double value ) -+void counter_set( Counter *counter, double value ) - { - counter->value = value; - counter->approach = value; - } --inline void counter_add( Counter *counter, double add ) -+void counter_add( Counter *counter, double add ) - { - counter->value += add; - } --inline double counter_get_approach( Counter counter ) -+double counter_get_approach( Counter counter ) - { - return counter.approach; - } --inline double counter_get( Counter counter ) -+double counter_get( Counter counter ) - { - return counter.value; - } --inline void counter_update( Counter *counter, int ms ) -+void counter_update( Counter *counter, int ms ) - { - double change; - if ( counter->approach == counter->value ) return; -Index: src/bowl.c -=================================================================== ---- a/src/bowl.c (revision 163) -+++ b/src/bowl.c (revision 164) -@@ -333,7 +333,7 @@ - Set a tile contents and pixel contents. - ==================================================================== - */ --inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) -+void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) - { - int i, j = y * bowl->block_size; - bowl->contents[x][y] = tile_id; -Index: src/tools.h -=================================================================== ---- a/src/tools.h (revision 163) -+++ b/src/tools.h (revision 164) -@@ -33,7 +33,7 @@ - #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) ) - - /* compares to strings and returns true if their first strlen(str1) chars are equal */ --inline int strequal( char *str1, char *str2 ); -+int strequal( char *str1, char *str2 ); - - /* delete lines */ - void delete_lines( char **lines, int line_number ); -@@ -45,16 +45,16 @@ - } Delay; - - /* set delay to ms milliseconds */ --inline void delay_set( Delay *delay, int ms ); -+void delay_set( Delay *delay, int ms ); - - /* reset delay ( cur = 0 )*/ --inline void delay_reset( Delay *delay ); -+void delay_reset( Delay *delay ); - - /* check if time's out ( add ms milliseconds )and reset */ --inline int delay_timed_out( Delay *delay, int ms ); -+int delay_timed_out( Delay *delay, int ms ); - - /* set timer so that we have a time out next call of delay_timed_out() */ --inline void delay_force_time_out( Delay *delay ); -+void delay_force_time_out( Delay *delay ); - - /* return distance betwteen to map positions */ - int get_dist( int x1, int y1, int x2, int y2 ); diff --git a/buildroot/package/ltris/ltris.hash b/buildroot/package/ltris/ltris.hash index 25fc04c6c..f696e3af1 100644 --- a/buildroot/package/ltris/ltris.hash +++ b/buildroot/package/ltris/ltris.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 ltris-1.0.19.tar.gz +sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/ltris/ltris.mk b/buildroot/package/ltris/ltris.mk index fb0d4c34d..9b5961341 100644 --- a/buildroot/package/ltris/ltris.mk +++ b/buildroot/package/ltris/ltris.mk @@ -5,7 +5,7 @@ ################################################################################ LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.0.19 +LTRIS_VERSION = 1.2 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING diff --git a/buildroot/package/lttng-libust/lttng-libust.hash b/buildroot/package/lttng-libust/lttng-libust.hash index 85e1acc26..62a65897f 100644 --- a/buildroot/package/lttng-libust/lttng-libust.hash +++ b/buildroot/package/lttng-libust/lttng-libust.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2.sha256 -sha256 683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.0.tar.bz2.sha256 +sha256 1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528 lttng-ust-2.12.0.tar.bz2 # Hash for license file -sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING +sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING diff --git a/buildroot/package/lttng-libust/lttng-libust.mk b/buildroot/package/lttng-libust/lttng-libust.mk index 0c2fdb57e..f3c660c56 100644 --- a/buildroot/package/lttng-libust/lttng-libust.mk +++ b/buildroot/package/lttng-libust/lttng-libust.mk @@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.11.0 +LTTNG_LIBUST_VERSION = 2.12.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING @@ -13,6 +13,10 @@ LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples +ifeq ($(BR2_INIT_SYSTEMD),y) +LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng +endif + ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python LTTNG_LIBUST_CONF_OPTS += --enable-python-agent diff --git a/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch b/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch new file mode 100644 index 000000000..e3e0f3a77 --- /dev/null +++ b/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch @@ -0,0 +1,46 @@ +From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait +Date: Mon, 18 May 2020 16:39:26 +0300 +Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following build error with musl libc: +In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14, + from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10: +../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? + 17 | TP_ARGS(ino_t, ns_ino), + | ^~~~~ +../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? + 17 | TP_ARGS(ino_t, ns_ino), + | ^~~~~ +../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? + 17 | TP_ARGS(ino_t, ns_ino), + | ^~~~~~~ +../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? + 17 | TP_ARGS(ino_t, ns_ino), + | ^~~~~~~ + +Signed-off-by: Ovidiu Panait +Signed-off-by: Jérémie Galarneau +Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba +[Retrieved from: +https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94] +Signed-off-by: Fabrice Fontaine +--- + tests/utils/testapp/gen-ust-events-ns/tp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h +index 4dbfed51a..e0ddb29a6 100644 +--- a/tests/utils/testapp/gen-ust-events-ns/tp.h ++++ b/tests/utils/testapp/gen-ust-events-ns/tp.h +@@ -11,6 +11,7 @@ + #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) + #define _TRACEPOINT_TP_H + ++#include + #include + + TRACEPOINT_EVENT(tp, tptest, diff --git a/buildroot/package/lttng-tools/lttng-tools.hash b/buildroot/package/lttng-tools/lttng-tools.hash index f5f9fdbbd..a27b419e7 100644 --- a/buildroot/package/lttng-tools/lttng-tools.hash +++ b/buildroot/package/lttng-tools/lttng-tools.hash @@ -1,6 +1,10 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2.sha256 -sha256 dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc lttng-tools-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.1.tar.bz2.sha256 +sha256 0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8 lttng-tools-2.12.1.tar.bz2 + # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt -sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt -sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7 LICENSE +sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/BSD-2-Clause +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/BSD-3-Clause +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT diff --git a/buildroot/package/lttng-tools/lttng-tools.mk b/buildroot/package/lttng-tools/lttng-tools.mk index f85f6bcbc..e0e99e327 100644 --- a/buildroot/package/lttng-tools/lttng-tools.mk +++ b/buildroot/package/lttng-tools/lttng-tools.mk @@ -4,15 +4,19 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.11.0 +LTTNG_TOOLS_VERSION = 2.12.1 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES -LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*) -LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE +LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*) +LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT) LTTNG_TOOLS_CONF_OPTS += --disable-man-pages LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux +ifeq ($(BR2_INIT_SYSTEMD),y) +LTTNG_TOOLS_CONF_OPTS += --with-lttng-system-rundir=/run/lttng +endif + ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust LTTNG_TOOLS_DEPENDENCIES += lttng-libust diff --git a/buildroot/package/lua-bit32/lua-bit32.hash b/buildroot/package/lua-bit32/lua-bit32.hash index 22d5b01be..ea9aca19a 100644 --- a/buildroot/package/lua-bit32/lua-bit32.hash +++ b/buildroot/package/lua-bit32/lua-bit32.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6 bit32-5.3.0-1.src.rock -sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 lua-compat-5.2/LICENSE +sha256 5d820979918637c2b86e1b0a55002bcfc2fa649469bc50e47aa954ea9fde499d bit32-5.3.5-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.9/LICENSE diff --git a/buildroot/package/lua-bit32/lua-bit32.mk b/buildroot/package/lua-bit32/lua-bit32.mk index 14851a513..c254cffd8 100644 --- a/buildroot/package/lua-bit32/lua-bit32.mk +++ b/buildroot/package/lua-bit32/lua-bit32.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_BIT32_VERSION = 5.3.0-1 +LUA_BIT32_VERSION = 5.3.5-1 LUA_BIT32_NAME_UPSTREAM = bit32 -LUA_BIT32_SUBDIR = lua-compat-5.2 +LUA_BIT32_SUBDIR = lua-compat-5.3-0.9 LUA_BIT32_LICENSE = MIT LUA_BIT32_LICENSE_FILES = $(LUA_BIT32_SUBDIR)/LICENSE diff --git a/buildroot/package/lua-compat53/Config.in b/buildroot/package/lua-compat53/Config.in index 76c5b3fd7..de468fcf6 100644 --- a/buildroot/package/lua-compat53/Config.in +++ b/buildroot/package/lua-compat53/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LUA_COMPAT53 bool "lua-compat53" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 help Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1. diff --git a/buildroot/package/lua-compat53/lua-compat53.hash b/buildroot/package/lua-compat53/lua-compat53.hash index b40596f86..07783820c 100644 --- a/buildroot/package/lua-compat53/lua-compat53.hash +++ b/buildroot/package/lua-compat53/lua-compat53.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 cb5fdca362780a30405c4134310ea78627a092b0ee8445a52456f2fceeeaea4e compat53-0.7-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.7/LICENSE +sha256 e513e75ba0ef4923a1ec0d4f0beb5972a11cc9bd7ac1b0953b5e4f037b259c92 compat53-0.8-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.8/LICENSE diff --git a/buildroot/package/lua-compat53/lua-compat53.mk b/buildroot/package/lua-compat53/lua-compat53.mk index 13e24391b..0e8f1c360 100644 --- a/buildroot/package/lua-compat53/lua-compat53.mk +++ b/buildroot/package/lua-compat53/lua-compat53.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_COMPAT53_VERSION_UPSTREAM = 0.7 +LUA_COMPAT53_VERSION_UPSTREAM = 0.8 LUA_COMPAT53_VERSION = $(LUA_COMPAT53_VERSION_UPSTREAM)-1 LUA_COMPAT53_NAME_UPSTREAM = compat53 LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM) diff --git a/buildroot/package/lua-cqueues/lua-cqueues.hash b/buildroot/package/lua-cqueues/lua-cqueues.hash index 69d8ec1c1..5803a60d5 100644 --- a/buildroot/package/lua-cqueues/lua-cqueues.hash +++ b/buildroot/package/lua-cqueues/lua-cqueues.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 24f1aa69b539e6796445c2228f921744ad64f9336498c7537bee97719d914804 lua-cqueues-20190813.tar.gz -sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219 LICENSE +sha256 9e112edd246da5cfca264314b70325a0b63665cb87a00e45ee3ae4f194000d52 lua-cqueues-20200726.tar.gz +sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219 LICENSE diff --git a/buildroot/package/lua-cqueues/lua-cqueues.mk b/buildroot/package/lua-cqueues/lua-cqueues.mk index fc2c85c11..6d842eca9 100644 --- a/buildroot/package/lua-cqueues/lua-cqueues.mk +++ b/buildroot/package/lua-cqueues/lua-cqueues.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CQUEUES_VERSION = 20190813 +LUA_CQUEUES_VERSION = 20200726 LUA_CQUEUES_SITE = $(call github,wahern,cqueues,rel-$(LUA_CQUEUES_VERSION)) LUA_CQUEUES_LICENSE = MIT LUA_CQUEUES_LICENSE_FILES = LICENSE diff --git a/buildroot/package/lua-flu/Config.in b/buildroot/package/lua-flu/Config.in index 526dc9008..9b55ce5ab 100644 --- a/buildroot/package/lua-flu/Config.in +++ b/buildroot/package/lua-flu/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_FLU depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse depends on BR2_USE_MMU # libfuse + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_ATTR select BR2_PACKAGE_LIBFUSE help @@ -13,6 +14,6 @@ config BR2_PACKAGE_LUA_FLU http://piratery.net/flu/ -comment "lua-flu needs a toolchain w/ threads, dynamic library" +comment "lua-flu needs a toolchain w/ threads, dynamic library, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 diff --git a/buildroot/package/lua-gd/lua-gd.hash b/buildroot/package/lua-gd/lua-gd.hash index d1bab37bc..512573b47 100644 --- a/buildroot/package/lua-gd/lua-gd.hash +++ b/buildroot/package/lua-gd/lua-gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 114f273a64da6ccbf6e0555757b952f84ab8c134416dd7aae1aeb666ca0e964d lua-gd-e60b13b7977bb3424d7044976ccba5d42c256934.tar.gz +sha256 928fa036b37595d773db1999c9ff43195c4290f0722298fa5b0c3e619c678525 lua-gd-2ce8e478a8591afd71e607506bc8c64b161bbd30.tar.gz sha256 b0ca41d88ddb0ca785436d37b08b8f413055755eb6bfd3ea0a6ff3214303aa43 COPYING diff --git a/buildroot/package/lua-gd/lua-gd.mk b/buildroot/package/lua-gd/lua-gd.mk index e9a51a167..099df31f7 100644 --- a/buildroot/package/lua-gd/lua-gd.mk +++ b/buildroot/package/lua-gd/lua-gd.mk @@ -4,17 +4,37 @@ # ################################################################################ -LUA_GD_VERSION = e60b13b7977bb3424d7044976ccba5d42c256934 +LUA_GD_VERSION = 2ce8e478a8591afd71e607506bc8c64b161bbd30 LUA_GD_SITE = $(call github,ittner,lua-gd,$(LUA_GD_VERSION)) LUA_GD_LICENSE = MIT LUA_GD_LICENSE_FILES = COPYING LUA_GD_DEPENDENCIES = luainterpreter gd +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +LUA_GD_FEATURES += -DGD_FONTCONFIG +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +LUA_GD_FEATURES += -DGD_FREETYPE +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LUA_GD_FEATURES += -DGD_JPEG +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LUA_GD_FEATURES += -DGD_PNG +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +LUA_GD_FEATURES += -DGD_XPM +endif + # VERSION follows the scheme described on https://ittner.github.io/lua-gd/manual.html#intro, # the current version of the binding is 3. define LUA_GD_BUILD_CMDS $(MAKE) -C $(@D) gd.so \ - GDLIBCONFIG="$(STAGING_DIR)/usr/bin/gdlib-config" \ + GDFEATURES="$(LUA_GD_FEATURES)" \ CC=$(TARGET_CC) \ CFLAGS="$(TARGET_CFLAGS) -fPIC -DVERSION=\\\"$(GD_VERSION)r3\\\"" \ LFLAGS="-shared -lgd" diff --git a/buildroot/package/lua-http/Config.in b/buildroot/package/lua-http/Config.in index cbf71563b..8eefd481b 100644 --- a/buildroot/package/lua-http/Config.in +++ b/buildroot/package/lua-http/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUA_HTTP select BR2_PACKAGE_LPEG # runtime select BR2_PACKAGE_LUA_BASEXX # runtime select BR2_PACKAGE_LUA_BINARYHEAP # runtime - select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime select BR2_PACKAGE_LUA_CQUEUES # runtime select BR2_PACKAGE_LUA_FIFO # runtime select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime diff --git a/buildroot/package/lua-lyaml/Config.in b/buildroot/package/lua-lyaml/Config.in new file mode 100644 index 000000000..ef2d3823d --- /dev/null +++ b/buildroot/package/lua-lyaml/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUA_LYAML + bool "lua-lyaml" + select BR2_PACKAGE_LIBYAML + help + This is a Lua binding for the fast libYAML C library for + converting between `%YAML 1.1` and Lua tables, with a + flexible Lua language API to load and save YAML documents. + + http://github.com/gvvaughan/lyaml diff --git a/buildroot/package/lua-lyaml/lua-lyaml.hash b/buildroot/package/lua-lyaml/lua-lyaml.hash new file mode 100644 index 000000000..07184e9e4 --- /dev/null +++ b/buildroot/package/lua-lyaml/lua-lyaml.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 2c52104e75331e4729e5895168fb8f24769db0b84c68696159e6b6a8908b62d2 lua-lyaml-6.2.6.tar.gz +sha256 81e4ea1d897e259b31111adc2d3c185fe23e435942ff3e9de8c8c9c5d01247d0 LICENSE diff --git a/buildroot/package/lua-lyaml/lua-lyaml.mk b/buildroot/package/lua-lyaml/lua-lyaml.mk new file mode 100644 index 000000000..a818ce716 --- /dev/null +++ b/buildroot/package/lua-lyaml/lua-lyaml.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# lua-lyaml +# +################################################################################ + +LUA_LYAML_VERSION = 6.2.6 +LUA_LYAML_NAME_UPSTREAM = lyaml +LUA_LYAML_SITE = $(call github,gvvaughan,$(LUA_LYAML_NAME_UPSTREAM),v$(LUA_LYAML_VERSION)) +LUA_LYAML_LICENSE = MIT +LUA_LYAML_LICENSE_FILES = LICENSE +LUA_LYAML_DEPENDENCIES = libyaml luainterpreter host-lua + +define LUA_LYAML_BUILD_CMDS + (cd $(@D); \ + $(LUA_RUN) build-aux/luke \ + version="'$(LUA_LYAML_VERSION)'" \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LUA_INCDIR=$(STAGING_DIR)/usr/include \ + YAML_DIR=$(STAGING_DIR)/usr \ + ) +endef + +define LUA_LYAML_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(LUA_RUN) build-aux/luke install \ + INST_LIBDIR="$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ + INST_LUADIR="$(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)" \ + ) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/lua-messagepack/lua-messagepack.mk b/buildroot/package/lua-messagepack/lua-messagepack.mk index f393a8d02..33d460b4f 100644 --- a/buildroot/package/lua-messagepack/lua-messagepack.mk +++ b/buildroot/package/lua-messagepack/lua-messagepack.mk @@ -6,7 +6,7 @@ LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 else LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack diff --git a/buildroot/package/lua-sdl2/Config.in b/buildroot/package/lua-sdl2/Config.in index 65f9e7ff4..d0c1b91eb 100644 --- a/buildroot/package/lua-sdl2/Config.in +++ b/buildroot/package/lua-sdl2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_SDL2 bool "lua-sdl2" depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_SDL2 help Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2, @@ -8,5 +9,5 @@ config BR2_PACKAGE_LUA_SDL2 https://github.com/Tangent128/luasdl2 -comment "lua-sdl2 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "lua-sdl2 needs a toolchain w/ dynamic library, Lua <= 5.3" + depends on BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 diff --git a/buildroot/package/lua-std-normalize/lua-std-normalize.hash b/buildroot/package/lua-std-normalize/lua-std-normalize.hash index 7c11f4914..84cdfca42 100644 --- a/buildroot/package/lua-std-normalize/lua-std-normalize.hash +++ b/buildroot/package/lua-std-normalize/lua-std-normalize.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 50baac6fbcbc6bbe72b63ce0871ec36176d75c04dccc6e368590ba6ef107c67a std.normalize-2.0.2-1.src.rock -sha256 a6a0a0ddc04f7437806a52cbd637c819144df7626a2e8a496cd3a2e20c8effb3 normalize-2.0.2/LICENSE.md +# computed by luarocks/buildroot +sha256 3a040b6ca43297367c527e12c1aab37acab86289f9415ffb130544c48b17f802 std.normalize-2.0.3-1.src.rock +sha256 9c9094f0cea86c2c62b893e59a78d5eaed69df0d7da24e122ef9753baeef0f04 normalize-2.0.3/LICENSE.md diff --git a/buildroot/package/lua-std-normalize/lua-std-normalize.mk b/buildroot/package/lua-std-normalize/lua-std-normalize.mk index d3a58aa0d..0eb215bf8 100644 --- a/buildroot/package/lua-std-normalize/lua-std-normalize.mk +++ b/buildroot/package/lua-std-normalize/lua-std-normalize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_STD_NORMALIZE_VERSION_UPSTREAM = 2.0.2 +LUA_STD_NORMALIZE_VERSION_UPSTREAM = 2.0.3 LUA_STD_NORMALIZE_VERSION = $(LUA_STD_NORMALIZE_VERSION_UPSTREAM)-1 LUA_STD_NORMALIZE_NAME_UPSTREAM = std.normalize LUA_STD_NORMALIZE_SUBDIR = normalize-$(LUA_STD_NORMALIZE_VERSION_UPSTREAM) diff --git a/buildroot/package/lua-testmore/lua-testmore.hash b/buildroot/package/lua-testmore/lua-testmore.hash index 673e1cf60..752fc17f7 100644 --- a/buildroot/package/lua-testmore/lua-testmore.hash +++ b/buildroot/package/lua-testmore/lua-testmore.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2 lua-testmore-0.3.3-1.src.rock -sha256 0fa63370a149eda33e25987dd63bd096a616a3e47d2cfc45ca2fd66e8d2bfb35 lua-TestMore-0.3.3/COPYRIGHT +sha256 4875103611683b13fdd0bc3658c0cbe302b4db491043a03ea002726810d371c5 lua-testmore-0.3.5-2.src.rock +sha256 0fa63370a149eda33e25987dd63bd096a616a3e47d2cfc45ca2fd66e8d2bfb35 lua-TestMore-0.3.5/COPYRIGHT diff --git a/buildroot/package/lua-testmore/lua-testmore.mk b/buildroot/package/lua-testmore/lua-testmore.mk index 790477611..5d6dc053a 100644 --- a/buildroot/package/lua-testmore/lua-testmore.mk +++ b/buildroot/package/lua-testmore/lua-testmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_TESTMORE_VERSION = 0.3.3-1 +LUA_TESTMORE_VERSION = 0.3.5-2 LUA_TESTMORE_NAME_UPSTREAM = lua-TestMore LUA_TESTMORE_LICENSE = MIT LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT diff --git a/buildroot/package/lua-utf8/lua-utf8.hash b/buildroot/package/lua-utf8/lua-utf8.hash index e119f9435..135574f36 100644 --- a/buildroot/package/lua-utf8/lua-utf8.hash +++ b/buildroot/package/lua-utf8/lua-utf8.hash @@ -1,2 +1,3 @@ # computed by luarocks/buildroot -sha256 c9ceb3a9f327b3215cdf959eebf616970b5b0427ca3fde05b19f8236defa4b91 utf8-1.2-0.src.rock +sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE diff --git a/buildroot/package/lua-utf8/lua-utf8.mk b/buildroot/package/lua-utf8/lua-utf8.mk index 7ed4f3fbe..52aaf5c71 100644 --- a/buildroot/package/lua-utf8/lua-utf8.mk +++ b/buildroot/package/lua-utf8/lua-utf8.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_UTF8_VERSION = 1.2-0 -LUA_UTF8_NAME_UPSTREAM = utf8 -LUA_UTF8_SUBDIR = luautf8 +LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT +LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE $(eval $(luarocks-package)) diff --git a/buildroot/package/lua/5.4.1/0001-root-path.patch b/buildroot/package/lua/5.4.1/0001-root-path.patch new file mode 100644 index 000000000..588fecb12 --- /dev/null +++ b/buildroot/package/lua/5.4.1/0001-root-path.patch @@ -0,0 +1,17 @@ +Adjust installation location to /usr. + +Signed-off-by: Francois Perrad + +Index: b/src/luaconf.h +=================================================================== +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + diff --git a/buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch b/buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch new file mode 100644 index 000000000..4ff204429 --- /dev/null +++ b/buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch @@ -0,0 +1,78 @@ +Add the compilation of a shared library. +Compile the lua binary with the shared library. +And install the shared library. +The variable BUILDMODE allows to switch between static and dynamic mode. + +Signed-off-by: Francois Perrad + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -42,6 +42,7 @@ + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp + TO_LIB= liblua.a ++TO_SOLIB = liblua.so.$(R) + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -57,6 +58,8 @@ + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) ++ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || : ++ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || : + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) +Index: b/src/Makefile +=================================================================== +--- a/src/Makefile ++++ b/src/Makefile +@@ -33,6 +33,7 @@ + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,8 +45,13 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) ++ifneq (dynamic,$(BUILDMODE)) + ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++else ++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) ++endif + ALL_A= $(LUA_A) ++ALL_SO= $(LUA_SO) + + # Targets start here. + default: $(PLAT) +@@ -56,12 +62,23 @@ + + a: $(ALL_A) + ++so: $(ALL_SO) ++ + $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? ++ ln -fs $@.$(PKG_VERSION) $@ ++ ++ifneq (dynamic,$(BUILDMODE)) + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++else ++$(LUA_T): $(LUA_O) $(LUA_SO) ++ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS) ++endif + + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/buildroot/package/lua/5.4.1/0011-linenoise.patch b/buildroot/package/lua/5.4.1/0011-linenoise.patch new file mode 100644 index 000000000..e842e5b1e --- /dev/null +++ b/buildroot/package/lua/5.4.1/0011-linenoise.patch @@ -0,0 +1,25 @@ +Add support of linenoise (replace readline) + +see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html + +Signed-off-by: Francois Perrad + +Index: b/src/lua.c +=================================================================== +--- a/src/lua.c ++++ b/src/lua.c +@@ -401,6 +401,14 @@ + #define lua_saveline(L,line) ((void)L, add_history(line)) + #define lua_freeline(L,b) ((void)L, free(b)) + ++#elif defined(LUA_USE_LINENOISE) ++ ++#include ++#define lua_initreadline(L) ((void)L) ++#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) ++#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line)) ++#define lua_freeline(L,b) ((void)L, free(b)) ++ + #else /* }{ */ + + #define lua_initreadline(L) ((void)L) diff --git a/buildroot/package/lua/5.4.1/lua.hash b/buildroot/package/lua/5.4.1/lua.hash new file mode 100644 index 000000000..82347ef99 --- /dev/null +++ b/buildroot/package/lua/5.4.1/lua.hash @@ -0,0 +1,6 @@ +# Hashes from: http://www.lua.org/ftp/ +md5 1d575faef1c907292edd79e7a2784d30 lua-5.4.1.tar.gz +sha1 88961e7d4fda58ca2c6163938fd48db8880e803d lua-5.4.1.tar.gz + +# Locally computed +sha256 c202c5ff3b0c7a0ff2b215fff534c4b4018554843d23ac6eca3d97533b3ad97f doc/readme.html diff --git a/buildroot/package/lua/Config.in b/buildroot/package/lua/Config.in index ce2e439f6..5d4cee5d5 100644 --- a/buildroot/package/lua/Config.in +++ b/buildroot/package/lua/Config.in @@ -20,17 +20,19 @@ choice config BR2_PACKAGE_LUA_5_1 bool "Lua 5.1.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 config BR2_PACKAGE_LUA_5_3 bool "Lua 5.3.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + +config BR2_PACKAGE_LUA_5_4 + bool "Lua 5.4.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 endchoice -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" if BR2_PACKAGE_LUA_5_1 - default "5.3" if BR2_PACKAGE_LUA_5_3 - -if BR2_PACKAGE_LUA_5_3 +if BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 config BR2_PACKAGE_LUA_32BITS bool "Use 32 bit numbers" default y if !BR2_ARCH_IS_64 diff --git a/buildroot/package/lua/lua.mk b/buildroot/package/lua/lua.mk index 83637caf0..287c3b2ad 100644 --- a/buildroot/package/lua/lua.mk +++ b/buildroot/package/lua/lua.mk @@ -4,7 +4,9 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_VERSION = 5.4.1 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else LUA_VERSION = 5.1.5 @@ -12,7 +14,7 @@ endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_LICENSE_FILES = doc/readme.html else LUA_LICENSE_FILES = COPYRIGHT @@ -22,7 +24,9 @@ LUA_PROVIDES = luainterpreter LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_CFLAGS += -DLUA_COMPAT_5_3 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_CFLAGS += -DLUA_COMPAT_5_2 endif @@ -54,7 +58,15 @@ endef LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF endif +define HOST_LUA_LUACONF + $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h +endef +HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF + HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX +ifeq ($(BR2_PACKAGE_LUA_5_3),y) +HOST_LUA_CFLAGS += -DLUA_COMPAT_5_2 +endif HOST_LUA_MYLIBS = -ldl define LUA_BUILD_CMDS @@ -74,7 +86,7 @@ define HOST_LUA_BUILD_CMDS CFLAGS="$(HOST_LUA_CFLAGS)" \ MYLDFLAGS="$(HOST_LDFLAGS)" \ MYLIBS="$(HOST_LUA_MYLIBS)" \ - BUILDMODE=static \ + BUILDMODE=dynamic \ PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \ package/lua/lua.pc.in > $(@D)/lua.pc diff --git a/buildroot/package/luabitop/Config.in b/buildroot/package/luabitop/Config.in index a819fe8ae..656b1c739 100644 --- a/buildroot/package/luabitop/Config.in +++ b/buildroot/package/luabitop/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_LUABITOP bool "luabitop" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUA_5_1 help Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise operations on numbers. http://bitop.luajit.org -comment "luabitop needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 +comment "luabitop needs Lua 5.1" + depends on !BR2_PACKAGE_LUA_5_1 diff --git a/buildroot/package/luafilesystem/luafilesystem.hash b/buildroot/package/luafilesystem/luafilesystem.hash index 9afc05c25..747b98480 100644 --- a/buildroot/package/luafilesystem/luafilesystem.hash +++ b/buildroot/package/luafilesystem/luafilesystem.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 65e6d437e577a1d6cd509b6cd224d2cb9501d58d32a72cafbd4fd3f911681576 luafilesystem-1.7.0-2.src.rock +sha256 576270a55752894254c2cba0d49d73595d37ec4ea8a75e557fdae7aff80e19cf luafilesystem-1.8.0-1.src.rock sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842 luafilesystem/LICENSE diff --git a/buildroot/package/luafilesystem/luafilesystem.mk b/buildroot/package/luafilesystem/luafilesystem.mk index 37f265e2b..b8b07176c 100644 --- a/buildroot/package/luafilesystem/luafilesystem.mk +++ b/buildroot/package/luafilesystem/luafilesystem.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAFILESYSTEM_VERSION = 1.7.0-2 +LUAFILESYSTEM_VERSION = 1.8.0-1 LUAFILESYSTEM_SUBDIR = luafilesystem LUAFILESYSTEM_LICENSE = MIT LUAFILESYSTEM_LICENSE_FILES = $(LUAFILESYSTEM_SUBDIR)/LICENSE diff --git a/buildroot/package/luainterpreter/Config.in b/buildroot/package/luainterpreter/Config.in index 7bc54d862..873fb345b 100644 --- a/buildroot/package/luainterpreter/Config.in +++ b/buildroot/package/luainterpreter/Config.in @@ -7,6 +7,18 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string + default "5.1" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + default "5.3" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + default "5.4" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + bool + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + bool + +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + bool config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER string diff --git a/buildroot/package/luainterpreter/luainterpreter.mk b/buildroot/package/luainterpreter/luainterpreter.mk index 58d421b18..9d9f85a57 100644 --- a/buildroot/package/luainterpreter/luainterpreter.mk +++ b/buildroot/package/luainterpreter/luainterpreter.mk @@ -7,15 +7,11 @@ LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) # Lua packages often install documentation, clean that up globally -# Since luainterpreter is a virtual package, we can't use -# LUAINTERPRETER_TARGET_FINALIZE_HOOKS -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) define LUAINTERPRETER_REMOVE_DOC rm -rf $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/doc endef -TARGET_FINALIZE_HOOKS += LUAINTERPRETER_REMOVE_DOC -endif +LUAINTERPRETER_TARGET_FINALIZE_HOOKS += LUAINTERPRETER_REMOVE_DOC $(eval $(virtual-package)) $(eval $(host-virtual-package)) diff --git a/buildroot/package/luajit/Config.in b/buildroot/package/luajit/Config.in index f4d600158..eb3eb0199 100644 --- a/buildroot/package/luajit/Config.in +++ b/buildroot/package/luajit/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_LUAJIT # binaries, so check if that option is supported. See # luajit.mk for details. select BR2_PACKAGE_HAS_LUAINTERPRETER + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 help LuaJIT implements the full set of language features defined @@ -33,9 +34,6 @@ if BR2_PACKAGE_LUAJIT config BR2_PACKAGE_PROVIDES_LUAINTERPRETER default "luajit" -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" - config BR2_PACKAGE_LUAJIT_COMPAT52 bool "Lua 5.2 compatibility" help diff --git a/buildroot/package/lualogging/Config.in b/buildroot/package/lualogging/Config.in index a1ed775fb..79e352a75 100644 --- a/buildroot/package/lualogging/Config.in +++ b/buildroot/package/lualogging/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUALOGGING supports, through the use of appenders, console, file, rolling file, email, socket and SQL outputs. - https://github.com/Neopallium/lualogging + https://github.com/keplerproject/lualogging diff --git a/buildroot/package/lualogging/lualogging.hash b/buildroot/package/lualogging/lualogging.hash index e2ba5df3a..6cd82ab2e 100644 --- a/buildroot/package/lualogging/lualogging.hash +++ b/buildroot/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d lualogging-1.3.0-1.src.rock -sha256 4e86086c032a006ce1289565cc9d9afff26b5117891cd26ffa15aa866bd28ee5 lualogging/COPYRIGHT +sha256 54501b7b84c28fa0c0d310ebfceb6e30be3396bd8aa9caaef7ddfbb0ac0976bc lualogging-1.4.0-1.src.rock +sha256 895d1a80efc5fc60236b70c4bf60bdec409c56c75b4ebe4c2da9cb20a1a11908 lualogging/COPYRIGHT diff --git a/buildroot/package/lualogging/lualogging.mk b/buildroot/package/lualogging/lualogging.mk index 3444a2988..26df9e331 100644 --- a/buildroot/package/lualogging/lualogging.mk +++ b/buildroot/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.3.0-1 +LUALOGGING_VERSION = 1.4.0-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT diff --git a/buildroot/package/luaossl/luaossl.hash b/buildroot/package/luaossl/luaossl.hash index 9b959f6fc..c8fa7942e 100644 --- a/buildroot/package/luaossl/luaossl.hash +++ b/buildroot/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b558790c0d1c965bd98b98a91a44eef9f72a0b784dbb4978810a1e52206d593d luaossl-20190731-0.src.rock -sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20190731/LICENSE +sha256 ea6d624e557939e30b93355dd1dc11465e81aa38a5542ab3c04b48608ac3cd78 luaossl-20200709-0.src.rock +sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20200709/LICENSE diff --git a/buildroot/package/luaossl/luaossl.mk b/buildroot/package/luaossl/luaossl.mk index 128c320d1..d241bce85 100644 --- a/buildroot/package/luaossl/luaossl.mk +++ b/buildroot/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20190731 +LUAOSSL_VERSION_UPSTREAM = 20200709 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) LUAOSSL_LICENSE = MIT diff --git a/buildroot/package/luaposix/Config.in b/buildroot/package/luaposix/Config.in index 1e2291b3f..85943f991 100644 --- a/buildroot/package/luaposix/Config.in +++ b/buildroot/package/luaposix/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_LUAPOSIX # "bit32" is included in Lua 5.2+. luajit has an equivalent # "bit" module, but since it has a different name, luaposix # doesn't find it. - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime help - This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3; + This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4; like most libraries it simply binds to C APIs on the underlying system, so it won't work on non-POSIX systems. However, it does try to detect the level of POSIX conformance diff --git a/buildroot/package/luaposix/luaposix.hash b/buildroot/package/luaposix/luaposix.hash index ee72bfe32..54617853a 100644 --- a/buildroot/package/luaposix/luaposix.hash +++ b/buildroot/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7948f4ac8b953172e928753632e37ad97cc3014df74b524fe7839f71216a7e90 luaposix-34.1.1.tar.gz -sha256 a868e95dd14f832eb63c4580c5fed42d78a6bd11785e3605211f446b05904a18 LICENSE +sha256 a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809 luaposix-35.0.tar.gz +sha256 e5d496c903dc3989bb2f6f175cda52d26e3494ad1fdd67ae1c3b3e5f76ffb86f LICENSE diff --git a/buildroot/package/luaposix/luaposix.mk b/buildroot/package/luaposix/luaposix.mk index ab6b030fc..d04881dfd 100644 --- a/buildroot/package/luaposix/luaposix.mk +++ b/buildroot/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 34.1.1 +LUAPOSIX_VERSION = 35.0 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/luarocks/luarocks-br-config.lua b/buildroot/package/luarocks/luarocks-br-config.lua deleted file mode 100644 index 32d71e1e2..000000000 --- a/buildroot/package/luarocks/luarocks-br-config.lua +++ /dev/null @@ -1,13 +0,0 @@ --- BR cross-compilation -local function getenv (name) return os_getenv(name) or '' end -variables.LUA_INCDIR = getenv('STAGING_DIR') .. [[/usr/include]] -variables.LUA_LIBDIR = getenv('STAGING_DIR') .. [[/usr/lib]] -variables.CC = getenv('TARGET_CC') -variables.LD = getenv('TARGET_CC') -variables.CFLAGS = getenv('TARGET_CFLAGS') -variables.LIBFLAG = [[-shared ]] .. getenv('TARGET_LDFLAGS') -external_deps_dirs = { getenv('STAGING_DIR') .. [[/usr]] } -gcc_rpath = false -rocks_trees = { getenv('TARGET_DIR') .. [[/usr]] } -wrap_bin_scripts = false -deps_mode = [[none]] diff --git a/buildroot/package/luarocks/luarocks.hash b/buildroot/package/luarocks/luarocks.hash index 069d181d6..565b1cccf 100644 --- a/buildroot/package/luarocks/luarocks.hash +++ b/buildroot/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb20cd9814df05535d9aae98da532217c590fc07d48d90ca237e2a7cdcf284fe luarocks-3.3.1.tar.gz -sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING +sha256 62ce5826f0eeeb760d884ea8330cd1552b5d432138b8bade0fa72f35badd02d0 luarocks-3.4.0.tar.gz +sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/buildroot/package/luarocks/luarocks.mk b/buildroot/package/luarocks/luarocks.mk index 123f8c073..670e7487a 100644 --- a/buildroot/package/luarocks/luarocks.mk +++ b/buildroot/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.3.1 +LUAROCKS_VERSION = 3.4.0 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING @@ -12,11 +12,9 @@ LUAROCKS_LICENSE_FILES = COPYING HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc -LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua -LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 -endif +LUAROCKS_CONFIG_FILE_DEFAULT = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua +LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config.lua +HOST_LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/host-config.lua define LUAROCKS_ADDON_EXTRACT mkdir $(@D)/src/luarocks/cmd/external @@ -33,28 +31,19 @@ define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef -ifeq ($(BR2_PACKAGE_LUAJIT),y) -define LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT - echo "lua_interpreter = [[luajit]]" >> $(LUAROCKS_CONFIG_FILE) -endef -endif - define HOST_LUAROCKS_INSTALL_CMDS - rm -f $(LUAROCKS_CONFIG_FILE) + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) $(MAKE1) -C $(@D) install - cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE) - $(LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT) + cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(LUAROCKS_CONFIG_FILE) + echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE) + echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE) + echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE) + cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_CONFIG_FILE) + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) endef $(eval $(host-generic-package)) -LUAROCKS_RUN_ENV = \ - LUA_PATH="$(HOST_DIR)/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CFLAGS="$(LUAROCKS_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" -LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/bin/luarocks - define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks endef diff --git a/buildroot/package/lugaru/Config.in b/buildroot/package/lugaru/Config.in index 521c89aeb..4454ebcd0 100644 --- a/buildroot/package/lugaru/Config.in +++ b/buildroot/package/lugaru/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUGARU depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_USE_MMU # SDL2 OpenGL (GLX) depends on !BR2_STATIC_LIBS # SDL2 @@ -29,10 +29,10 @@ config BR2_PACKAGE_LUGARU https://osslugaru.gitlab.io/ -comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library" +comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.9, NPTL, dynamic library" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS diff --git a/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch b/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 7f7c480ca..000000000 --- a/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d05134115ec8fcfc87188899cec336a8b4df7e62 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 22 Feb 2020 22:17:19 +0100 -Subject: [PATCH] src/lreq.c: fix build with gcc 4.8 - -Since commit 3e34390cc15101d7fc46ea26f5adf9ac022c2029, build fails with -gcc 4.8.3 on: - -In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/luv.c:27:0: -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/lreq.c: In function 'luv_cleanup_req': -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/lreq.c:70:5: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { - ^ - -Fixes: - - http://autobuild.buildroot.org/results/83b34e606b128546da8a70836d039090e334a1ec - -Signed-off-by: Fabrice Fontaine -[Accepted status: https://github.com/luvit/luv/pull/456] ---- - src/lreq.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lreq.c b/src/lreq.c -index c8e07eb..b12ec4f 100644 ---- a/src/lreq.c -+++ b/src/lreq.c -@@ -64,10 +64,11 @@ static void luv_fulfill_req(lua_State* L, luv_req_t* data, int nargs) { - } - - static void luv_cleanup_req(lua_State* L, luv_req_t* data) { -+ int i; - luaL_unref(L, LUA_REGISTRYINDEX, data->req_ref); - luaL_unref(L, LUA_REGISTRYINDEX, data->callback_ref); - if (data->data_ref == LUV_REQ_MULTIREF) { -- for (int i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { -+ for (i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { - luaL_unref(L, LUA_REGISTRYINDEX, ((int*)(data->data))[i]); - } - } --- -2.25.0 - diff --git a/buildroot/package/luv/Config.in b/buildroot/package/luv/Config.in index 434cb3b45..3be204cab 100644 --- a/buildroot/package/luv/Config.in +++ b/buildroot/package/luv/Config.in @@ -4,13 +4,14 @@ config BR2_PACKAGE_LUV depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_LIBUV help libuv bindings for LuaJIT and Lua. https://github.com/luvit/luv -comment "luv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luv needs a toolchain w/ NPTL, dynamic library, Lua <= 5.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/buildroot/package/luv/luv.hash b/buildroot/package/luv/luv.hash index 388bba9eb..7e902bd08 100644 --- a/buildroot/package/luv/luv.hash +++ b/buildroot/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8267a65149a16ea279bc767c554b1441f8b52ec5ee48fe7d60b3f4106592aba luv-1.34.1-1.tar.gz +sha256 f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445 luv-1.36.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/luv/luv.mk b/buildroot/package/luv/luv.mk index c1af50856..a63baf322 100644 --- a/buildroot/package/luv/luv.mk +++ b/buildroot/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.34.1-1 +LUV_VERSION = 1.36.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/luvi/luvi.hash b/buildroot/package/luvi/luvi.hash index 4627db5c5..f08883c06 100644 --- a/buildroot/package/luvi/luvi.hash +++ b/buildroot/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a38e440d3f82d75f428bafc3f3cd51cb64f8a03c9e0eb297b0ff27c5209edebb luvi-src-v2.9.3.tar.gz +sha256 ec4eff7aaf2f36879a5fc8eb86706818a75faf07a18451a6fb44e05bbe00817f luvi-src-v2.11.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/luvi/luvi.mk b/buildroot/package/luvi/luvi.mk index e311504e9..d6384cb48 100644 --- a/buildroot/package/luvi/luvi.mk +++ b/buildroot/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.9.3 +LUVI_VERSION = 2.11.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 diff --git a/buildroot/package/lvm2/Config.in b/buildroot/package/lvm2/Config.in index de5b972e9..a9c5c453f 100644 --- a/buildroot/package/lvm2/Config.in +++ b/buildroot/package/lvm2/Config.in @@ -47,6 +47,23 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY comment "lvm2 application library needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL +config BR2_PACKAGE_LVM2_LVMETAD + bool "install lvmetad" + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2-app-library + select BR2_PACKAGE_LVM2_APP_LIBRARY + help + Install lvmetad + + The lvmetad daemon caches LVM metadata so that LVM commands + can read metadata from the cache rather than scanning disks. + This can be an advantage because scanning disks is time + consuming and may interfere with the normal work of the + system. lvmetad can be a disadvantage when disk event + notifications from the system are unreliable. + +comment "lvmetad daemon needs a glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL + endif comment "lvm2 needs a toolchain w/ threads, dynamic library" diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk index 02c758ea0..76f800a15 100644 --- a/buildroot/package/lvm2/lvm2.mk +++ b/buildroot/package/lvm2/lvm2.mk @@ -60,6 +60,12 @@ else LVM2_CONF_OPTS += --disable-applib endif +ifeq ($(BR2_PACKAGE_LVM2_LVMETAD),y) +LVM2_CONF_OPTS += --enable-lvmetad +else +LVM2_CONF_OPTS += --disable-lvmetad +endif + ifeq ($(BR2_INIT_SYSTEMD),y) LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators endif diff --git a/buildroot/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch b/buildroot/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch deleted file mode 100644 index 6210591c0..000000000 --- a/buildroot/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2b23a1313f501423aecbe4ad4a988a9f6f832f1f Mon Sep 17 00:00:00 2001 -From: Patrick Havelange -Date: Tue, 22 Oct 2019 12:29:54 +0200 -Subject: [PATCH 1/1] syscall_wrappers: rename internal memfd_create to - memfd_create_lxc - -In case the internal memfd_create has to be used, make sure we don't -clash with the already existing memfd_create function from glibc. - -This can happen if this glibc function is a stub. In this case, at -./configure time, the test for this function will return false, however -the declaration of that function is still available. This leads to -compilation errors. - -Signed-off-by: Patrick Havelange ---- - src/lxc/syscall_wrappers.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h -index 42d94db..bddf01b 100644 ---- a/src/lxc/syscall_wrappers.h -+++ b/src/lxc/syscall_wrappers.h -@@ -59,7 +59,7 @@ static inline long __keyctl(int cmd, unsigned long arg2, unsigned long arg3, - #endif - - #ifndef HAVE_MEMFD_CREATE --static inline int memfd_create(const char *name, unsigned int flags) { -+static inline int memfd_create_lxc(const char *name, unsigned int flags) { - #ifndef __NR_memfd_create - #if defined __i386__ - #define __NR_memfd_create 356 -@@ -98,6 +98,7 @@ static inline int memfd_create(const char *name, unsigned int flags) { - return -1; - #endif - } -+#define memfd_create memfd_create_lxc - #else - extern int memfd_create(const char *name, unsigned int flags); - #endif --- -2.20.1 - diff --git a/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch b/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch deleted file mode 100644 index aa35e9382..000000000 --- a/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 226205f0c5e3ef6f5757ffdfddd5b815b217e4ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 11 Nov 2019 22:55:36 +0100 -Subject: [PATCH] configure.ac: fix build on toolchain without SSP - -Commit 3b5a0eebd4d2efdaa03c6fb11950abfcf081fab8 reverted -3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a resulting in lxc being unable -to be built on toolchain without SSP support - -Fixes: - - http://autobuild.buildroot.org/results/57945f54ffbc5c8764b6891a4516c4907e56ab97 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/lxc/lxc/pull/3184] ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 645a2166d..4c1a10b3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -713,8 +713,8 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror] - AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror]) --AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror]) --AX_CHECK_COMPILE_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror]) -+AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror]) -+AX_CHECK_LINK_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror]) --- -2.23.0 - diff --git a/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch b/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch deleted file mode 100644 index 4de07ddad..000000000 --- a/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5f7dd076fe203ebe6992698b63a1856a98bc0bba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 28 Feb 2020 17:35:42 +0100 -Subject: [PATCH] src/lxc/raw_syscalls.c: fix sparc assembly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Build of lxc 3.2.1 fails with ultrasparc on: - -raw_syscalls.c: In function ‘lxc_raw_clone’: -raw_syscalls.c:66:3: error: invalid 'asm': invalid operand output code - asm volatile( - ^~~ - -Issue has been added with commit -b52e8e68a61866da2af86e85905ec850f8a8b7fc which added %g1 instead of %%g1 - -Fixes: - - http://autobuild.buildroot.org/results/17c2319850f02f24da6fbef9656c07f86fdc5a3a - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/lxc/lxc/commit/5f7dd076fe203ebe6992698b63a1856a98bc0bba] ---- - src/lxc/raw_syscalls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lxc/raw_syscalls.c b/src/lxc/raw_syscalls.c -index 7ffb2584b8..bfa48c0348 100644 ---- a/src/lxc/raw_syscalls.c -+++ b/src/lxc/raw_syscalls.c -@@ -76,7 +76,7 @@ __returns_twice pid_t lxc_raw_clone(unsigned long flags, int *pidfd) - * processor status register (psr) is used instead of a - * full register. - */ -- "addx %%g0, 0, %g1" -+ "addx %%g0, 0, %%g1" - : "=r"(g1), "=r"(o0), "=r"(o1), "=r"(o2) /* outputs */ - : "r"(g1), "r"(o0), "r"(o1), "r"(o2) /* inputs */ - : "%cc"); /* clobbers */ diff --git a/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch b/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch deleted file mode 100644 index 86aa708d5..000000000 --- a/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6a8a510211515824ff20699d45f6d07a84f3c02e Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Sun, 28 Jul 2019 23:13:26 +0200 -Subject: [PATCH] cgroups: initialize cpuset properly - -Closes #3108. -Signed-off-by: Christian Brauner -(cherry picked from commit b31d62b847a3ee013613795094cce4acc12345ef) -Signed-off-by: Romain Naour ---- - src/lxc/cgroups/cgfsng.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 87e12d2dd..7e691d7cc 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized) - } - - if (!flipped_bit) { -- DEBUG("No isolated or offline cpus present in cpuset"); -- return true; -+ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); -+ TRACE("No isolated or offline cpus present in cpuset"); -+ } else { -+ cpulist = move_ptr(posscpus); -+ TRACE("Removed isolated or offline cpus from cpuset"); - } -- DEBUG("Removed isolated or offline cpus from cpuset"); -- -- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); - if (!cpulist) { - ERROR("Failed to create cpu list"); - return false; --- -2.24.1 - diff --git a/buildroot/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash index d5ea79977..4cecf6b0f 100644 --- a/buildroot/package/lxc/lxc.hash +++ b/buildroot/package/lxc/lxc.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 5f903986a4b17d607eea28c0aa56bf1e76e8707747b1aa07d31680338b1cc3d4 lxc-3.2.1.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4 lxc-4.0.5.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index 7994dffcf..b067f145e 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -4,14 +4,12 @@ # ################################################################################ -LXC_VERSION = 3.2.1 +LXC_VERSION = 4.0.5 LXC_SITE = https://linuxcontainers.org/downloads/lxc -LXC_LICENSE = LGPL-2.1+ -LXC_LICENSE_FILES = COPYING +LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ +LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES -# We're patching configure.ac -LXC_AUTORECONF = YES LXC_CONF_OPTS = \ --disable-apparmor \ diff --git a/buildroot/package/lz4/Config.in b/buildroot/package/lz4/Config.in index 9f12299ce..06a4e93dc 100644 --- a/buildroot/package/lz4/Config.in +++ b/buildroot/package/lz4/Config.in @@ -8,3 +8,12 @@ config BR2_PACKAGE_LZ4 speed limits on multi-core systems. http://www.lz4.org/ + +if BR2_PACKAGE_LZ4 + +config BR2_PACKAGE_LZ4_PROGS + bool "install programs" + help + lz4, lz4c, unlz4 and lz4cat binaries + +endif diff --git a/buildroot/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk index 2a658fbba..fa309e8db 100644 --- a/buildroot/package/lz4/lz4.mk +++ b/buildroot/package/lz4/lz4.mk @@ -10,6 +10,12 @@ LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING +# CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version +# 1.9.2, while in fact this issue has been fixed since lz4-r130: +# https://github.com/lz4/lz4/commit/140e6e72ddb6fc5f7cd28ce0c8ec3812ef4a9c08 +# See https://github.com/lz4/lz4/issues/818 +LZ4_IGNORE_CVES += CVE-2014-4715 + ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no else ifeq ($(BR2_SHARED_LIBS),y) @@ -26,21 +32,31 @@ define HOST_LZ4_INSTALL_CMDS install -C $(@D) endef +LZ4_DIRS = lib + +ifeq ($(BR2_PACKAGE_LZ4_PROGS),y) +LZ4_DIRS += programs +endif + define LZ4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ - -C $(@D) lib - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ - -C $(@D) lz4 + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ + -C $(@D)/$(dir) + ) endef define LZ4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef define LZ4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef $(eval $(generic-package)) diff --git a/buildroot/package/lzip/lzip.hash b/buildroot/package/lzip/lzip.hash index 9945f9cfe..35ff7a44a 100644 --- a/buildroot/package/lzip/lzip.hash +++ b/buildroot/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From http://lists.nongnu.org/archive/html/lzip-bug/2018-02/msg00006.html -sha256 c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c lzip-1.20.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2019-01/msg00010.html +sha256 e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b lzip-1.21.tar.gz # Locally calculated -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/buildroot/package/lzip/lzip.mk b/buildroot/package/lzip/lzip.mk index 72742240a..2a9a079cd 100644 --- a/buildroot/package/lzip/lzip.mk +++ b/buildroot/package/lzip/lzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZIP_VERSION = 1.20 +LZIP_VERSION = 1.21 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING diff --git a/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file mode 100644 index 000000000..aab4f70f0 --- /dev/null +++ b/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch @@ -0,0 +1,104 @@ +From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Wed, 29 Jan 2020 13:37:13 +0800 +Subject: [PATCH] Remove duplicated variable definitions + +When building on Fedora 32 (with GCC 10), following error is observed: + +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of + `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of + `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of + `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of + `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here +... +collect2: error: ld returned 1 exit status +make: *** [Makefile:97: makedumpfile] Error 1 + +These variables are wrongly defined multiple times. So remove the +duplicated definitions. + +Signed-off-by: Kairui Song +Signed-off-by: Kazuhito Hagio +Signed-off-by: Alexander Egorenkov +--- + makedumpfile.c | 8 ++++---- + makedumpfile.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/makedumpfile.c b/makedumpfile.c +index e290fbd..ae7336a 100644 +--- a/makedumpfile.c ++++ b/makedumpfile.c +@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) + return FALSE; + + if ((info->splitting_info +- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) ++ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) + == NULL) { + MSG("Can't allocate memory for splitting_info.\n"); + return FALSE; +@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) + return FALSE; + } + if ((info->splitting_info +- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) ++ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) + == NULL) { + MSG("Can't allocate memory for splitting_info.\n"); + return FALSE; +@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) + + if (info->num_threads) { + if ((info->parallel_info = +- malloc(sizeof(parallel_info_t) * info->num_threads)) ++ malloc(sizeof(struct parallel_info) * info->num_threads)) + == NULL) { + MSG("Can't allocate memory for parallel_info.\n"); + return FALSE; + } + +- memset(info->parallel_info, 0, sizeof(parallel_info_t) ++ memset(info->parallel_info, 0, sizeof(struct parallel_info) + * info->num_threads); + } + +diff --git a/makedumpfile.h b/makedumpfile.h +index 68d9691..7217407 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -1262,7 +1262,7 @@ struct splitting_info { + mdf_pfn_t end_pfn; + off_t offset_eraseinfo; + unsigned long size_eraseinfo; +-} splitting_info_t; ++}; + + struct parallel_info { + int fd_memory; +@@ -1275,7 +1275,7 @@ struct parallel_info { + #ifdef USELZO + lzo_bytep wrkmem; + #endif +-} parallel_info_t; ++}; + + struct ppc64_vmemmap { + unsigned long phys; +@@ -2006,8 +2006,8 @@ struct memory_range { + }; + + #define CRASH_RESERVED_MEM_NR 8 +-struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; +-int crash_reserved_mem_nr; ++extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; ++extern int crash_reserved_mem_nr; + + unsigned long read_vmcoreinfo_symbol(char *str_symbol); + int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); +-- +2.28.0 + diff --git a/buildroot/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch b/buildroot/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch new file mode 100644 index 000000000..162e893cb --- /dev/null +++ b/buildroot/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch @@ -0,0 +1,25 @@ +From: Petr Tesarik +Subject: [PATCH] Define PN_XNUM if missing +Upstream: never, build fix for old distros + +Older elfutils did not define this constant. + +Signed-off-by: Petr Tesarik +Signed-off-by: Alexander Egorenkov +--- + elf_info.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/elf_info.h ++++ b/elf_info.h +@@ -19,6 +19,10 @@ + #include + #include + ++#ifndef PN_XNUM ++#define PN_XNUM 0xffff ++#endif ++ + #define KEXEC_CORE_NOTE_NAME "CORE" + #define KEXEC_CORE_NOTE_NAME_BYTES sizeof(KEXEC_CORE_NOTE_NAME) + diff --git a/buildroot/package/makedumpfile/Config.in b/buildroot/package/makedumpfile/Config.in new file mode 100644 index 000000000..d5af38b59 --- /dev/null +++ b/buildroot/package/makedumpfile/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc64 + +comment "makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + +config BR2_PACKAGE_MAKEDUMPFILE + bool "makedumpfile" + depends on BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # dlopen + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_XZ + select BR2_PACKAGE_ZLIB + help + Makes a small dumpfile of kdump. + + https://github.com/makedumpfile/makedumpfile diff --git a/buildroot/package/makedumpfile/makedumpfile.hash b/buildroot/package/makedumpfile/makedumpfile.hash new file mode 100644 index 000000000..2ecfc5b1c --- /dev/null +++ b/buildroot/package/makedumpfile/makedumpfile.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 cd3642dfe780d446f2dc328736bb2070007032718f5628262d5f59baf03619a4 makedumpfile-1.6.7.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/makedumpfile/makedumpfile.mk b/buildroot/package/makedumpfile/makedumpfile.mk new file mode 100644 index 000000000..ad63e280e --- /dev/null +++ b/buildroot/package/makedumpfile/makedumpfile.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# makedumpfile +# +################################################################################ + +MAKEDUMPFILE_VERSION = 1.6.7 +MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,Released-$(subst .,-,$(MAKEDUMPFILE_VERSION))) +MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib +MAKEDUMPFILE_LICENSE = GPL-2.0 +MAKEDUMPFILE_LICENSE_FILES = COPYING + +ifeq ($(BR2_powerpc),y) +MAKEDUMPFILE_TARGET = powerpc32 +else +MAKEDUMPFILE_TARGET = $(BR2_ARCH) +endif + +MAKEDUMPFILE_MAKE_OPTS = \ + TARGET=$(MAKEDUMPFILE_TARGET) \ + LINKTYPE=dynamic + +ifeq ($(BR2_PACKAGE_LZO),y) +MAKEDUMPFILE_DEPENDENCIES += lzo +MAKEDUMPFILE_MAKE_OPTS += USELZO=on +endif + +ifeq ($(BR2_PACKAGE_SNAPPY),y) +MAKEDUMPFILE_DEPENDENCIES += snappy +MAKEDUMPFILE_MAKE_OPTS += USESNAPPY=on +endif + +define MAKEDUMPFILE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(MAKEDUMPFILE_MAKE_OPTS) +endef + +define MAKEDUMPFILE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \ + DESTDIR="$(TARGET_DIR)" +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/mali-t76x/egl.pc b/buildroot/package/mali-t76x/egl.pc index 614b700d6..3de3c3ffd 100644 --- a/buildroot/package/mali-t76x/egl.pc +++ b/buildroot/package/mali-t76x/egl.pc @@ -8,4 +8,4 @@ Description: ARM Mali implementation of EGL Version: 1.5 Requires: Libs: -L${libdir} -lEGL -lGLESv2 -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS +Cflags: -I${includedir} -DEGL_NO_X11 diff --git a/buildroot/package/mali-t76x/glesv2.pc b/buildroot/package/mali-t76x/glesv2.pc index 5997eac63..6521a3862 100644 --- a/buildroot/package/mali-t76x/glesv2.pc +++ b/buildroot/package/mali-t76x/glesv2.pc @@ -8,4 +8,4 @@ Description: ARM Mali implementation of OpenGL ESv2 Version: 2.0 Requires: Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS +Cflags: -I${includedir} -DEGL_NO_X11 diff --git a/buildroot/package/matchbox/0002-src-Fix-build-with-gcc-10.patch b/buildroot/package/matchbox/0002-src-Fix-build-with-gcc-10.patch new file mode 100644 index 000000000..1556c6be2 --- /dev/null +++ b/buildroot/package/matchbox/0002-src-Fix-build-with-gcc-10.patch @@ -0,0 +1,47 @@ +From 844f61069896fe3f549ab425d731c061028f697c Mon Sep 17 00:00:00 2001 +From: Adrian Bunk +Date: Tue, 12 May 2020 09:44:05 +0300 +Subject: src: Fix build with gcc 10 + +gcc 10 enables -fno-common by default which fails without these typedefs + +Signed-off-by: Adrian Bunk +Signed-off-by: Richard Purdie + +[Retrieved from: +http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager/commit/?id=844f61069896fe3f549ab425d731c061028f697c] +Signed-off-by: Fabrice Fontaine +--- + src/mbtheme.h | 2 +- + src/structs.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mbtheme.h b/src/mbtheme.h +index aa9a7c5..ad03bde 100644 +--- a/src/mbtheme.h ++++ b/src/mbtheme.h +@@ -46,7 +46,7 @@ typedef struct _mb_theme_param + + } MBThemeParam; + +-enum { ++typedef enum { + LAYER_GRADIENT_HORIZ = 1, + LAYER_GRADIENT_VERT, + LAYER_LABEL, +diff --git a/src/structs.h b/src/structs.h +index 24985e7..8f53e72 100644 +--- a/src/structs.h ++++ b/src/structs.h +@@ -148,7 +148,7 @@ + + /* Atoms, if you change these check ewmh_init() first */ + +-enum { ++typedef enum { + WM_STATE = 0, + WM_CHANGE_STATE, + WM_PROTOCOLS, +-- +cgit v1.2.2-1-g5e49 + diff --git a/buildroot/package/matio/Config.in b/buildroot/package/matio/Config.in new file mode 100644 index 000000000..9e2ea6800 --- /dev/null +++ b/buildroot/package/matio/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_MATIO + bool "matio" + select BR2_PACKAGE_ZLIB + help + matio is an C library for reading and writing MATLAB MAT + files. + + https://sourceforge.net/projects/matio diff --git a/buildroot/package/matio/matio.hash b/buildroot/package/matio/matio.hash new file mode 100644 index 000000000..55e57338c --- /dev/null +++ b/buildroot/package/matio/matio.hash @@ -0,0 +1,4 @@ +# From https://sourceforge.net/projects/matio/files/matio/1.5.18/ +sha512 c43e562a101348d64139a056f28bce37c59c6667d701200255ccf9d8b6adf7a92ae9c11c8d921ec8a652cdc81c5de9ab247907279c54c52905adfd65bc3fb90f matio-1.5.18.tar.gz +# Locally computed +sha256 19494e9c9154a5e3f834e99d65fab0653b84280df7c98d1886a98d2bd28369c1 COPYING diff --git a/buildroot/package/matio/matio.mk b/buildroot/package/matio/matio.mk new file mode 100644 index 000000000..230dbf237 --- /dev/null +++ b/buildroot/package/matio/matio.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# matio +# +################################################################################ + +MATIO_VERSION = 1.5.18 +MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) +MATIO_LICENSE = BSD-2-Clause +MATIO_LICENSE_FILES = COPYING +MATIO_DEPENDENCIES = zlib +MATIO_INSTALL_STAGING = YES + +# va_copy() +MATIO_CONF_ENV = ac_cv_va_copy=yes + +# mat73 require hdf5 (not available), extented-sparse take 2KB +MATIO_CONF_OPTS = --disable-mat73 --enable-extended-sparse + +$(eval $(autotools-package)) diff --git a/buildroot/package/mbpfan/Config.in b/buildroot/package/mbpfan/Config.in new file mode 100644 index 000000000..231faa2b1 --- /dev/null +++ b/buildroot/package/mbpfan/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MBPFAN + bool "mbpfan" + depends on BR2_USE_MMU + help + Mbpfan is a daemon for MacBook laptops which monitors the + CPU temperature with the coretemp module, and sets the fan + speeds with the applesmc module. + + https://github.com/linux-on-mac/mbpfan diff --git a/buildroot/package/mbpfan/mbpfan.hash b/buildroot/package/mbpfan/mbpfan.hash new file mode 100644 index 000000000..eafd313b4 --- /dev/null +++ b/buildroot/package/mbpfan/mbpfan.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 52a3a79d99f775fe90917a0958e527ea14ff5b83d010164bd91f7cc3ce046b6a mbpfan-2.2.1.tar.gz +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 COPYING diff --git a/buildroot/package/mbpfan/mbpfan.mk b/buildroot/package/mbpfan/mbpfan.mk new file mode 100644 index 000000000..2455b0a4c --- /dev/null +++ b/buildroot/package/mbpfan/mbpfan.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# mbpfan +# +################################################################################ + +MBPFAN_VERSION = 2.2.1 +MBPFAN_SITE = $(call github,linux-on-mac,mbpfan,v$(MBPFAN_VERSION)) +MBPFAN_LICENSE = GPL-3.0+ +MBPFAN_LICENSE_FILES = COPYING + +define MBPFAN_BUILD_CMDS + $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + $(MAKE) CC="$(TARGET_CC)" -C $(@D) +endef + +define MBPFAN_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/mbpfan.conf \ + $(TARGET_DIR)/etc/mbpfan.conf + $(INSTALL) -m 0755 $(@D)/bin/mbpfan $(TARGET_DIR)/usr/sbin/mbpfan +endef + +define MBPFAN_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/mbpfan.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mbpfan.service +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/mbuffer/Config.in b/buildroot/package/mbuffer/Config.in new file mode 100644 index 000000000..2c0b24d15 --- /dev/null +++ b/buildroot/package/mbuffer/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MBUFFER + bool "mbuffer" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + help + mbuffer is a tool for buffering data streams with a large set + of unique features. + + http://www.maier-komor.de/mbuffer.html + +comment "mbuffer needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/mbuffer/mbuffer.hash b/buildroot/package/mbuffer/mbuffer.hash new file mode 100644 index 000000000..688ada690 --- /dev/null +++ b/buildroot/package/mbuffer/mbuffer.hash @@ -0,0 +1,8 @@ +# From http://www.maier-komor.de/mbuffer.html +md5 df39047654456f260665d66711cabcc5 mbuffer-20200505.tgz + +# Locally computed after checking signature upstream +sha256 cc046183149e51814c23b9f83fd748cc1625a88ee128651ea500aa7bd5f01f0b mbuffer-20200505.tgz + +# Hash for license file +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/mbuffer/mbuffer.mk b/buildroot/package/mbuffer/mbuffer.mk new file mode 100644 index 000000000..6aaf29c9c --- /dev/null +++ b/buildroot/package/mbuffer/mbuffer.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# mbuffer +# +################################################################################ + +MBUFFER_VERSION = 20200505 +MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz +MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer +MBUFFER_LICENSE = GPL-3.0+ +MBUFFER_LICENSE_FILES = LICENSE +MBUFFER_CONF_OPTS = --disable-debug + +# we don't need tests & co. so we specify a target +# so that the others don't get built, e.g idev.so +MBUFFER_MAKE_OPTS += mbuffer + +$(eval $(autotools-package)) diff --git a/buildroot/package/mc/mc.hash b/buildroot/package/mc/mc.hash index 963b2ad2f..208d0beda 100644 --- a/buildroot/package/mc/mc.hash +++ b/buildroot/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.23.sha256: -sha256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c mc-4.8.23.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.25.sha256 +sha256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/buildroot/package/mc/mc.mk b/buildroot/package/mc/mc.mk index 47091be2a..00f34f81c 100644 --- a/buildroot/package/mc/mc.mk +++ b/buildroot/package/mc/mc.mk @@ -4,12 +4,13 @@ # ################################################################################ -MC_VERSION = 4.8.23 +MC_VERSION = 4.8.25 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING -MC_DEPENDENCIES = libglib2 host-pkgconf +MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) +MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GPM),y) MC_CONF_OPTS += --with-gpm-mouse diff --git a/buildroot/package/mcelog/mcelog.hash b/buildroot/package/mcelog/mcelog.hash index c323d681c..49f29e244 100644 --- a/buildroot/package/mcelog/mcelog.hash +++ b/buildroot/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a18fdef9cfe2dfaefa09087c616c376a301dc87b1fa14a37476d97370962c668 mcelog-165.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 d21dfddaaa8e6f4ebd59ce353165c8d8079d0d5ed563492a0415af2248d8b3a5 mcelog-172.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/mcelog/mcelog.mk b/buildroot/package/mcelog/mcelog.mk index cedf474ac..c24366546 100644 --- a/buildroot/package/mcelog/mcelog.mk +++ b/buildroot/package/mcelog/mcelog.mk @@ -4,7 +4,7 @@ # ################################################################################ -MCELOG_VERSION = 165 +MCELOG_VERSION = 172 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE @@ -17,4 +17,9 @@ define MCELOG_INSTALL_TARGET_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install endef +define MCELOG_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/mcelog.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mcelog.service +endef + $(eval $(generic-package)) diff --git a/buildroot/package/mdevd/mdevd.hash b/buildroot/package/mdevd/mdevd.hash index 2b36740fb..6852e55f8 100644 --- a/buildroot/package/mdevd/mdevd.hash +++ b/buildroot/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ad93048afbd8394d709da35934a62ef5826143b6baa13d37115a3b265f9038b7 mdevd-0.1.1.1.tar.gz -sha256 2e59eb9754eaece119072a4379d8b320900cc8c4a1a488d2d7788768b95e89ae COPYING +sha256 c926b6f9f9f48a73733397f08b6c299a8a2f0eff3d729de7f9d0a763757dab2a mdevd-0.1.1.2.tar.gz +sha256 6e32cf6ae38bb82bb8462915ae72d55de59741c8227ae0a637b4012687d9a739 COPYING diff --git a/buildroot/package/mdevd/mdevd.mk b/buildroot/package/mdevd/mdevd.mk index 48de72492..728c76664 100644 --- a/buildroot/package/mdevd/mdevd.mk +++ b/buildroot/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.1.1 +MDEVD_VERSION = 0.1.1.2 MDEVD_SITE = http://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING diff --git a/buildroot/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch b/buildroot/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch deleted file mode 100644 index 7bc9733c8..000000000 --- a/buildroot/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 26f884bf977977041fe6f98a0af186be1580bf22 Mon Sep 17 00:00:00 2001 -From: Simon Morlat -Date: Thu, 29 Sep 2016 15:26:18 +0200 -Subject: [PATCH] fix compilation issue with latest bctoobox - -[Upstream commit https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - src/crypto/dtls_srtp.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7ab20a08f..244d87275 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1116,7 +1116,7 @@ fi - - - dnl check bctoolbox library --PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.0.0, found_bctoolbox=true, found_bctoolbox=false) -+PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.4.0, found_bctoolbox=true, found_bctoolbox=false) - if test "$found_bctoolbox" = "true" ; then - LIBS="$LIBS $BCTOOLBOX_LIBS" - CFLAGS="$CFLAGS $BCTOOLBOX_CFLAGS" -diff --git a/src/crypto/dtls_srtp.c b/src/crypto/dtls_srtp.c -index e2c8e1c44..fd37eb5cb 100644 ---- a/src/crypto/dtls_srtp.c -+++ b/src/crypto/dtls_srtp.c -@@ -705,7 +705,7 @@ static int ms_dtls_srtp_initialise_bctbx_dtls_context(DtlsBcToolBoxContext *dtls - bctbx_ssl_config_set_authmode(dtlsContext->ssl_config, BCTBX_SSL_VERIFY_OPTIONAL); - bctbx_ssl_config_set_own_cert( dtlsContext->ssl_config, dtlsContext->crt, dtlsContext->pkey ); - /* This is useless as peer would certainly be a self signed certificate and we won't verify it but avoid runtime warnings */ -- bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt, NULL); -+ bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt); - - /* we are not ready yet to actually start the ssl context, this will be done by calling bctbx_ssl_setup when stream starts */ - return 0; diff --git a/buildroot/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch b/buildroot/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch new file mode 100644 index 000000000..8e7812c38 --- /dev/null +++ b/buildroot/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch @@ -0,0 +1,55 @@ +From 342f59f1603f759b6dd90754f8dba14d08947f55 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 27 Feb 2020 16:18:35 +0100 +Subject: [PATCH] src/videofilters/nowebcam.c: fix build without ffmpeg or jpeg + +jpeg2yuv is only defined if ffmpeg or turbojpeg is available + +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 3 +++ + src/videofilters/nowebcam.c | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0efc1a5f..6668db2b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -336,7 +336,10 @@ if(ENABLE_JPEG) + if(NOT TURBOJPEG_FOUND) + message(WARNING "Could not find libturbo-jpeg, mediastreamer2 will be compiled without LibJpeg-Turbo") + set(ENABLE_JPEG OFF CACHE BOOL "Enable JPEG support" FORCE) ++ add_definitions(-DNO_JPEG) + endif() ++else() ++ add_definitions(-DNO_JPEG) + endif() + if(ENABLE_QRCODE) + find_package(Zxing) +diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c +index a2344dcd..afb0d7b1 100644 +--- a/src/videofilters/nowebcam.c ++++ b/src/videofilters/nowebcam.c +@@ -107,7 +107,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) { + if (err != st_sizel) { + ms_error("Could not read as much as wanted !"); + } ++#if !(defined(NO_FFMPEG) && defined(NO_JPEG)) + m = jpeg2yuv(jpgbuf, st_sizel, reqsize); ++#endif + ms_free(jpgbuf); + if (m == NULL) { + CloseHandle(fd); +@@ -140,7 +142,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) { + if (err != statbuf.st_size) { + ms_error("Could not read as much as wanted: %i<>%li !", err, (long)statbuf.st_size); + } ++#if !(defined(NO_FFMPEG) && defined(NO_JPEG)) + m = jpeg2yuv(jpgbuf,statbuf.st_size,reqsize); ++#endif + ms_free(jpgbuf); + if (m == NULL) { + close(fd); +-- +2.25.0 + diff --git a/buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch index 792c3eeb4..fc66e9a9f 100644 --- a/buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +++ b/buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch @@ -17,6 +17,8 @@ Downloaded from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 Signed-off-by: Bernd Kuhls +[Fabrice: updated for 4.3.1] +Signed-off-by: Fabrice Fontaine --- src/utils/ffmpeg-priv.h | 4 ++++ src/videofilters/nowebcam.c | 4 ++-- @@ -37,28 +39,6 @@ index c0745a9a..d59ea0e1 100644 #ifndef HAVE_FUN_avcodec_encode_video2 int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr); #endif -diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c -index bd2ca838..4783de05 100644 ---- a/src/videofilters/nowebcam.c -+++ b/src/videofilters/nowebcam.c -@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #ifndef NO_FFMPEG - #include "ffmpeg-priv.h" - #else --#define FF_INPUT_BUFFER_PADDING_SIZE 32 -+#define AV_INPUT_BUFFER_PADDING_SIZE 32 - #endif - - #if TARGET_OS_IPHONE -@@ -248,7 +248,7 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){ - ms_error("Cannot load %s",jpgpath); - return NULL; - } -- jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (jpgbuf==NULL) - { - close(fd); -- 2.18.0 diff --git a/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch b/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch deleted file mode 100644 index cdaa0fab2..000000000 --- a/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d12e74a559602b3dff9a6bf38fcbb139535c9c9c Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 3 Sep 2018 20:27:00 +0200 -Subject: [PATCH] m4: fix local ffmpeg and avcodec function conflict - -Autotools miss avcodec function check. -This is due to linker library list order, -ldrm is appended too early -respect to -lavutil. This results in missing drm library functions for -avcodec functions: -- drmGetVersion() -- drmFreeVersion() -So these functions: -- avcodec_get_context_defaults3 -- avcodec_open2 -- avcodec_encode_video2 -can't link correctly during check and they seem not to be present. -Then macros HAVE_FUN_avcodec_* are not defined in mediastreamer-config.h -So local avcodec functions conflict with real avcodec library functions. - -In acinclude.m4 file, swap $FFMPEG_LIBS and -lavutil if avcodec is found. - -Signed-off-by: Giulio Benetti ---- - acinclude.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 6c31ed82..89ff6643 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -110,7 +110,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[ - if test x$avcodec_found = xno ; then - AC_MSG_WARN([Could not find libavcodec (from ffmpeg) headers and library.]) - else -- FFMPEG_LIBS="$FFMPEG_LIBS -lavutil" -+ FFMPEG_LIBS="-lavutil $FFMPEG_LIBS" - fi - - --- -2.17.1 - diff --git a/buildroot/package/mediastreamer/Config.in b/buildroot/package/mediastreamer/Config.in index b18c83c5e..b12535e82 100644 --- a/buildroot/package/mediastreamer/Config.in +++ b/buildroot/package/mediastreamer/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_MEDIASTREAMER bool "mediastreamer" - depends on BR2_INSTALL_LIBSTDCPP # ortp + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # ortp + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp + select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_ORTP help Mediastreamer is a powerful and lightweighted streaming @@ -13,5 +16,9 @@ config BR2_PACKAGE_MEDIASTREAMER http://www.linphone.org/technical-corner/mediastreamer2 -comment "mediastreamer needs a toolchain w/ threads, C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "mediastreamer needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/mediastreamer/mediastreamer.hash b/buildroot/package/mediastreamer/mediastreamer.hash index 8ebf64af0..5b7242678 100644 --- a/buildroot/package/mediastreamer/mediastreamer.hash +++ b/buildroot/package/mediastreamer/mediastreamer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a mediastreamer-2.14.0.tar.gz -sha256 ba9ed2269151ad63b922598f3c5c19ddf781b2bbb6cb843ed9f085ecd1679c5d COPYING +sha256 b7251495c0bf2c71508b7cdf29999326af0bd215ec4c647b3ebb60796ee72503 mediastreamer-4.3.1.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/mediastreamer/mediastreamer.mk b/buildroot/package/mediastreamer/mediastreamer.mk index 3c9756936..982eadf09 100644 --- a/buildroot/package/mediastreamer/mediastreamer.mk +++ b/buildroot/package/mediastreamer/mediastreamer.mk @@ -4,110 +4,176 @@ # ################################################################################ -MEDIASTREAMER_VERSION = 2.14.0 -MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer +MEDIASTREAMER_VERSION = 4.3.1 +MEDIASTREAMER_SITE = \ + https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/$(MEDIASTREAMER_VERSION) +MEDIASTREAMER_LICENSE = GPL-3.0+ +MEDIASTREAMER_LICENSE_FILES = LICENSE.txt MEDIASTREAMER_INSTALL_STAGING = YES -# host-vim needed for the xxd utility -MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext host-vim -# tests fail linking on some architectures, so disable them -MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict -MEDIASTREAMER_LICENSE = GPL-2.0+ -MEDIASTREAMER_LICENSE_FILES = COPYING - -# patching configure.ac -MEDIASTREAMER_AUTORECONF = YES +MEDIASTREAMER_DEPENDENCIES = ortp +MEDIASTREAMER_CONF_OPTS = \ + -DENABLE_DOC=OFF \ + -DENABLE_GL=OFF \ + -DENABLE_GLX=OFF \ + -DENABLE_MKV=OFF \ + -DENABLE_SOUND=OFF \ + -DENABLE_STRICT=OFF \ + -DENABLE_TOOLS=OFF \ + -DENABLE_UNIT_TESTS=OFF \ + -DENABLE_ZRTP=OFF ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) -MEDIASTREAMER_CONF_OPTS += --enable-alsa +MEDIASTREAMER_CONF_OPTS += \ + -DENABLE_ALSA=ON \ + -DENABLE_SOUND=ON MEDIASTREAMER_DEPENDENCIES += alsa-lib else -MEDIASTREAMER_CONF_OPTS += --disable-alsa +MEDIASTREAMER_CONF_OPTS += -DENABLE_ALSA=OFF endif -ifeq ($(BR2_PACKAGE_LIBUPNP),y) -MEDIASTREAMER_CONF_OPTS += --enable-upnp -MEDIASTREAMER_DEPENDENCIES += libupnp +ifeq ($(BR2_PACKAGE_BCG729),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_G729=ON +MEDIASTREAMER_DEPENDENCIES += bcg729 else -MEDIASTREAMER_CONF_OPTS += --disable-upnp +MEDIASTREAMER_CONF_OPTS += -DENABLE_G729=OFF +endif + +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_JPEG=ON +MEDIASTREAMER_DEPENDENCIES += jpeg +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_JPEG=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGSM),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_GSM=ON +MEDIASTREAMER_DEPENDENCIES += libgsm +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_GSM=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_PCAP=ON +MEDIASTREAMER_DEPENDENCIES += libpcap +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_PCAP=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBSRTP),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SRTP=ON +MEDIASTREAMER_DEPENDENCIES += libsrtp +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_SRTP=OFF endif ifeq ($(BR2_PACKAGE_LIBVPX),y) -MEDIASTREAMER_CONF_OPTS += --enable-vp8 +MEDIASTREAMER_CONF_OPTS += -DENABLE_VPX=ON MEDIASTREAMER_DEPENDENCIES += libvpx else -MEDIASTREAMER_CONF_OPTS += --disable-vp8 +MEDIASTREAMER_CONF_OPTS += -DENABLE_VPX=OFF endif ifeq ($(BR2_PACKAGE_OPUS),y) -MEDIASTREAMER_CONF_OPTS += --enable-opus +MEDIASTREAMER_CONF_OPTS += -DENABLE_OPUS=ON MEDIASTREAMER_DEPENDENCIES += opus else -MEDIASTREAMER_CONF_OPTS += --disable-opus +MEDIASTREAMER_CONF_OPTS += -DENABLE_OPUS=OFF endif -# portaudio backend needs speex as well -ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yyy) -MEDIASTREAMER_CONF_OPTS += --enable-portaudio -MEDIASTREAMER_DEPENDENCIES += portaudio speex +# portaudio backend needs speexdsp as well +ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEXDSP),yy) +MEDIASTREAMER_CONF_OPTS += \ + -DENABLE_PORTAUDIO=ON \ + -DENABLE_SOUND=ON +MEDIASTREAMER_DEPENDENCIES += portaudio else -MEDIASTREAMER_CONF_OPTS += --disable-portaudio +MEDIASTREAMER_CONF_OPTS += -DENABLE_PORTAUDIO=OFF endif ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -MEDIASTREAMER_CONF_OPTS += --enable-pulseaudio +MEDIASTREAMER_CONF_OPTS += \ + -DENABLE_PULSEAUDIO=ON \ + -DENABLE_SOUND=ON MEDIASTREAMER_DEPENDENCIES += pulseaudio else -MEDIASTREAMER_CONF_OPTS += --disable-pulseaudio +MEDIASTREAMER_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF +endif + +ifeq ($(BR2_PACKAGE_SPEEX),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_CODEC=ON +MEDIASTREAMER_DEPENDENCIES += speex +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_CODEC=OFF +endif + +ifeq ($(BR2_PACKAGE_SPEEXDSP),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_DSP=ON +MEDIASTREAMER_DEPENDENCIES += speexdsp +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_DSP=OFF endif ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) -MEDIASTREAMER_CONF_OPTS += --enable-speex -MEDIASTREAMER_DEPENDENCIES += speex +MEDIASTREAMER_CONF_OPTS += -DENABLE_RESAMPLE=ON else -MEDIASTREAMER_CONF_OPTS += --disable-speex +MEDIASTREAMER_CONF_OPTS += -DENABLE_RESAMPLE=OFF endif ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) -MEDIASTREAMER_CONF_OPTS += --enable-ffmpeg +MEDIASTREAMER_CONF_OPTS += -DENABLE_FFMPEG=ON MEDIASTREAMER_DEPENDENCIES += ffmpeg else -MEDIASTREAMER_CONF_OPTS += --disable-ffmpeg +MEDIASTREAMER_CONF_OPTS += -DENABLE_FFMPEG=OFF endif ifeq ($(BR2_PACKAGE_SDL),y) -MEDIASTREAMER_CONF_OPTS += --enable-sdl +MEDIASTREAMER_CONF_OPTS += -DENABLE_SDL=ON MEDIASTREAMER_DEPENDENCIES += sdl else -MEDIASTREAMER_CONF_OPTS += --disable-sdl +MEDIASTREAMER_CONF_OPTS += -DENABLE_SDL=OFF endif -# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support -# is only used for SDL output) -ifeq ($(BR2_PACKAGE_SDL_X11),y) -MEDIASTREAMER_CONF_OPTS += --enable-x11 +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_X11=ON +MEDIASTREAMER_DEPENDENCIES += xlib_libX11 else -MEDIASTREAMER_CONF_OPTS += --disable-x11 +MEDIASTREAMER_CONF_OPTS += -DENABLE_X11=OFF endif ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -MEDIASTREAMER_CONF_OPTS += --enable-xv +MEDIASTREAMER_CONF_OPTS += -DENABLE_XV=ON MEDIASTREAMER_DEPENDENCIES += xlib_libXv else -MEDIASTREAMER_CONF_OPTS += --disable-xv +MEDIASTREAMER_CONF_OPTS += -DENABLE_XV=OFF endif ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -MEDIASTREAMER_CONF_OPTS += --enable-theora +MEDIASTREAMER_CONF_OPTS += -DENABLE_THEORA=ON MEDIASTREAMER_DEPENDENCIES += libtheora else -MEDIASTREAMER_CONF_OPTS += --disable-theora +MEDIASTREAMER_CONF_OPTS += -DENABLE_THEORA=OFF endif ifeq ($(BR2_PACKAGE_LIBV4L),y) -MEDIASTREAMER_CONF_OPTS += --enable-libv4l1 --enable-libv4l2 +MEDIASTREAMER_CONF_OPTS += -DENABLE_V4L=ON MEDIASTREAMER_DEPENDENCIES += libv4l else -MEDIASTREAMER_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 +MEDIASTREAMER_CONF_OPTS += -DENABLE_V4L=OFF endif -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_ZXING_CPP),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_QRCODE=ON +MEDIASTREAMER_DEPENDENCIES += zxing-cpp +else +MEDIASTREAMER_CONF_OPTS += -DENABLE_QRCODE=OFF +endif + +ifeq ($(BR2_STATIC_LIBS),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/memcached/memcached.hash b/buildroot/package/memcached/memcached.hash index e599cd2fa..1330f6521 100644 --- a/buildroot/package/memcached/memcached.hash +++ b/buildroot/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.5.22.tar.gz.sha1 -sha1 3fe5d3929130e860efcfde18d4d396a29db006b7 memcached-1.5.22.tar.gz +# From http://www.memcached.org/files/memcached-1.6.8.tar.gz.sha1 +sha1 8f3efd851efc5b822bd991b93d06a271b2fac052 memcached-1.6.8.tar.gz # Locally computed -sha256 c2b47e9d20575a2367087c229636ffc3fb699a6c3a7f3a22f44402f25f5f1f93 memcached-1.5.22.tar.gz +sha256 e23b3a11f6ff52ac04ae5ea2e287052ce58fd1eadd394622eb65c3598fcd7939 memcached-1.6.8.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/buildroot/package/memcached/memcached.mk b/buildroot/package/memcached/memcached.mk index 8a980677c..378f57a27 100644 --- a/buildroot/package/memcached/memcached.mk +++ b/buildroot/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.5.22 +MEMCACHED_VERSION = 1.6.8 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/buildroot/package/memtester/0001-makefile-fix.patch b/buildroot/package/memtester/0001-makefile-fix.patch deleted file mode 100644 index 6f1481bec..000000000 --- a/buildroot/package/memtester/0001-makefile-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -The a/{b,c} construct doesn't work within make, so let's split the -creation of the installation directories in two commands. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: memtester-4.2.1/Makefile -=================================================================== ---- memtester-4.2.1.orig/Makefile -+++ memtester-4.2.1/Makefile -@@ -25,8 +25,9 @@ - all: memtester - - install: all -- mkdir -m 755 -p $(INSTALLPATH)/{bin,man/man8} -+ mkdir -m 755 -p $(INSTALLPATH)/bin - install -m 755 memtester $(INSTALLPATH)/bin/ -+ mkdir -m 755 -p $(INSTALLPATH)/man/man8 - gzip -c memtester.8 >memtester.8.gz ; install -m 644 memtester.8.gz $(INSTALLPATH)/man/man8/ - - auto-ccld.sh: \ diff --git a/buildroot/package/memtester/memtester.hash b/buildroot/package/memtester/memtester.hash index da8c1c02c..7d7820e74 100644 --- a/buildroot/package/memtester/memtester.hash +++ b/buildroot/package/memtester/memtester.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88 memtester-4.3.0.tar.gz +sha256 8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37 memtester-4.5.0.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/memtester/memtester.mk b/buildroot/package/memtester/memtester.mk index 0e64d8cde..1a319462a 100644 --- a/buildroot/package/memtester/memtester.mk +++ b/buildroot/package/memtester/memtester.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMTESTER_VERSION = 4.3.0 +MEMTESTER_VERSION = 4.5.0 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions MEMTESTER_LICENSE = GPL-2.0 MEMTESTER_LICENSE_FILES = COPYING diff --git a/buildroot/package/mender-artifact/mender-artifact.hash b/buildroot/package/mender-artifact/mender-artifact.hash index 74ea5686c..a9fba2971 100644 --- a/buildroot/package/mender-artifact/mender-artifact.hash +++ b/buildroot/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 62233e415399a32f4397cf9e2dfc1447db58b7ebd71379ee779b360140d5ab08 3.2.1.tar.gz -sha256 68d145b900b4845834d49efe470d7e9ec7a3d9f175e72cb974f38c54b9172801 LIC_FILES_CHKSUM.sha256 +sha256 c085479a6e2ae598687a15b646bfaaa68e5d76d08382bdcc4a27a9b4021d6540 mender-artifact-3.4.0.tar.gz +sha256 08b0209abb7e87bb1d21aca8a40693b7d29406d1edffd443f17c59d5d68f6467 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -8,22 +8,29 @@ sha256 68d145b900b4845834d49efe470d7e9ec7a3d9f175e72cb974f38c54b9172801 LIC_FILE # sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache 2.0 licenses. -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/gopkg.in/yaml.v2/LICENSE # # BSD 2 Clause licenses. -sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE # # BSD 3 Clause licenses. -sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE +sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735 vendor/github.com/russross/blackfriday/v2/LICENSE.txt # # ISC licenses. -sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE +sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT licenses. -sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE -sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE -sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE +sha256 dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d vendor/github.com/stretchr/testify/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE +sha256 7709cc030f078b17809884f92f33a2016944e1180312dc3f1371b02313d313ed vendor/github.com/klauspost/pgzip/LICENSE +sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md +sha256 c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE diff --git a/buildroot/package/mender-artifact/mender-artifact.mk b/buildroot/package/mender-artifact/mender-artifact.mk index f4a606653..b2310d5bc 100644 --- a/buildroot/package/mender-artifact/mender-artifact.mk +++ b/buildroot/package/mender-artifact/mender-artifact.mk @@ -4,25 +4,40 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.2.1 -HOST_MENDER_ARTIFACT_SITE = https://github.com/mendersoftware/mender-artifact/archive -HOST_MENDER_ARTIFACT_SOURCE = $(HOST_MENDER_ARTIFACT_VERSION).tar.gz +HOST_MENDER_ARTIFACT_VERSION = 3.4.0 +HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/minio/sha256-simd/LICENSE \ + vendor/gopkg.in/yaml.v2/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/golang.org/x/crypto/LICENSE \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/github.com/klauspost/compress/LICENSE \ + vendor/github.com/russross/blackfriday/v2/LICENSE.txt \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ - vendor/github.com/sirupsen/logrus/LICENSE + vendor/github.com/sirupsen/logrus/LICENSE \ + vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md \ + vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE + HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz +# By default, go will attempt to download needed modules before building, which +# is not desirable. This behavior also causes permission issues when cleaning, +# as go downloads modules as read-only by default. Because mender-artifact +# includes the modules in the vendor directory, mod=vendor prevents the package +# from downloading the go modules during the build process and prevents +# permission issues when cleaning. +HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" + HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION) HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact diff --git a/buildroot/package/mender/mender.service b/buildroot/package/mender/mender-client.service similarity index 100% rename from buildroot/package/mender/mender.service rename to buildroot/package/mender/mender-client.service diff --git a/buildroot/package/mender/mender.hash b/buildroot/package/mender/mender.hash index 6d0a64da9..f1eef656f 100644 --- a/buildroot/package/mender/mender.hash +++ b/buildroot/package/mender/mender.hash @@ -1,17 +1,13 @@ # Locally computed: -sha256 eb288eaee8be4d58edeef7c8d1c3caa8fea94740a2002520ed43bc717c01dca6 2.1.2.tar.gz - -# Apache-2.0 license, locally computed -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE +sha256 d7c885a34f7b7f9969970132411225895c136e22be0caaa6dd3e08ca4bb71ff9 2.3.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE -sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/log/LICENSE -sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/scopestack/LICENSE -sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE # # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -34,10 +30,10 @@ sha256 dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d vendor sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE # # OpenLDAP Public License sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 af7578d06eb10566dd12e9fb57113d035abd69b274eb2b8c70e83f9da3b7c9d7 LIC_FILES_CHKSUM.sha256 +sha256 39f8e574fa6d082b650a5d6159045cdec7c4662da6ccbd67271079904353b8d5 LIC_FILES_CHKSUM.sha256 diff --git a/buildroot/package/mender/mender.mk b/buildroot/package/mender/mender.mk index 87fdc4526..ca24b853b 100644 --- a/buildroot/package/mender/mender.mk +++ b/buildroot/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 2.1.2 +MENDER_VERSION = 2.3.0 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -15,8 +15,6 @@ MENDER_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/mendersoftware/mendertesting/LICENSE \ - vendor/github.com/mendersoftware/log/LICENSE \ - vendor/github.com/mendersoftware/scopestack/LICENSE \ vendor/github.com/mendersoftware/mender-artifact/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ @@ -32,16 +30,23 @@ MENDER_LICENSE_FILES = \ vendor/github.com/stretchr/testify/LICENCE.txt \ vendor/github.com/stretchr/objx/LICENSE.md \ vendor/github.com/ungerik/go-sysfs/LICENSE \ - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ + vendor/github.com/urfave/cli/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md MENDER_DEPENDENCIES = xz MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) +MENDER_UPDATE_MODULES_FILES = \ + directory \ + script \ + single-file \ + $(if $(BR2_PACKAGE_DOCKER_CLI),docker) \ + $(if $(BR2_PACKAGE_RPM),rpm) + define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts - echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version + echo -n "3" > $(TARGET_DIR)/etc/mender/scripts/version $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.conf \ $(TARGET_DIR)/etc/mender/mender.conf @@ -63,13 +68,17 @@ define MENDER_INSTALL_CONFIG_FILES mkdir -p $(TARGET_DIR)/var/lib ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender + $(foreach f,$(MENDER_UPDATE_MODULES_FILES), \ + $(INSTALL) -D -m 0755 $(@D)/support/modules/$(notdir $(f)) \ + $(TARGET_DIR)/usr/share/mender/modules/v3/$(notdir $(f)) + ) endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES define MENDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mender.service + $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mender-client.service endef define MENDER_INSTALL_INIT_SYSV diff --git a/buildroot/package/menu-cache/0001-Support-gcc10-compilation.patch b/buildroot/package/menu-cache/0001-Support-gcc10-compilation.patch new file mode 100644 index 000000000..5ef5d1774 --- /dev/null +++ b/buildroot/package/menu-cache/0001-Support-gcc10-compilation.patch @@ -0,0 +1,109 @@ +From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 24 Jan 2020 13:33:00 +0900 +Subject: [PATCH] Support gcc10 compilation + +gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like + +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here +.... + +This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files. + +[Retrieved from: +https://github.com/lxde/menu-cache/pull/19/commits/1ce739649b4d66339a03fc0ec9ee7a2f7c141780] +Signed-off-by: Fabrice Fontaine +--- + menu-cache-gen/menu-tags.h | 55 ++++++++++++-------------------------- + 1 file changed, 17 insertions(+), 38 deletions(-) + +diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h +index f3fd7d3..f71c0bc 100644 +--- a/menu-cache-gen/menu-tags.h ++++ b/menu-cache-gen/menu-tags.h +@@ -22,38 +22,17 @@ + #include + #include + +-FmXmlFileTag menuTag_Menu; +-FmXmlFileTag menuTag_AppDir; +-FmXmlFileTag menuTag_DefaultAppDirs; +-FmXmlFileTag menuTag_DirectoryDir; +-FmXmlFileTag menuTag_DefaultDirectoryDirs; +-FmXmlFileTag menuTag_Include; +-FmXmlFileTag menuTag_Exclude; +-FmXmlFileTag menuTag_Filename; +-FmXmlFileTag menuTag_Or; +-FmXmlFileTag menuTag_And; +-FmXmlFileTag menuTag_Not; +-FmXmlFileTag menuTag_Category; +-FmXmlFileTag menuTag_MergeFile; +-FmXmlFileTag menuTag_MergeDir; +-FmXmlFileTag menuTag_DefaultMergeDirs; +-FmXmlFileTag menuTag_Directory; +-FmXmlFileTag menuTag_Name; +-FmXmlFileTag menuTag_Deleted; +-FmXmlFileTag menuTag_NotDeleted; +-FmXmlFileTag menuTag_OnlyUnallocated; +-FmXmlFileTag menuTag_NotOnlyUnallocated; +-FmXmlFileTag menuTag_All; +-FmXmlFileTag menuTag_LegacyDir; +-FmXmlFileTag menuTag_KDELegacyDirs; +-FmXmlFileTag menuTag_Move; +-FmXmlFileTag menuTag_Old; +-FmXmlFileTag menuTag_New; +-FmXmlFileTag menuTag_Layout; +-FmXmlFileTag menuTag_DefaultLayout; +-FmXmlFileTag menuTag_Menuname; +-FmXmlFileTag menuTag_Separator; +-FmXmlFileTag menuTag_Merge; ++extern FmXmlFileTag menuTag_AppDir; ++extern FmXmlFileTag menuTag_DirectoryDir; ++extern FmXmlFileTag menuTag_Include; ++extern FmXmlFileTag menuTag_Exclude; ++extern FmXmlFileTag menuTag_Filename; ++extern FmXmlFileTag menuTag_Or; ++extern FmXmlFileTag menuTag_And; ++extern FmXmlFileTag menuTag_Not; ++extern FmXmlFileTag menuTag_Category; ++extern FmXmlFileTag menuTag_All; ++extern FmXmlFileTag menuTag_LegacyDir; + + typedef enum { + MERGE_NONE, /* starting value */ +@@ -152,19 +131,19 @@ typedef struct { + } MenuRule; + + /* requested language(s) */ +-char **languages; ++extern char **languages; + + /* list of menu files to monitor */ +-GSList *MenuFiles; ++extern GSList *MenuFiles; + + /* list of menu dirs to monitor */ +-GSList *MenuDirs; ++extern GSList *MenuDirs; + + /* list of available app dirs */ +-GSList *AppDirs; ++extern GSList *AppDirs; + + /* list of available dir dirs */ +-GSList *DirDirs; ++extern GSList *DirDirs; + + /* parse and merge menu files */ + MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error); +@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil + void _free_layout_items(GList *data); + + /* verbosity level */ +-gint verbose; ++extern gint verbose; + + #define DBG if (verbose) g_debug + #define VDBG if (verbose > 1) g_debug diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 6af6e8843..afb2e799c 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk @@ -12,12 +12,12 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 19.3.4 +MESA3D_HEADERS_VERSION = 20.2.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos -MESA3D_HEADERS_LICENSE_FILES = docs/license.html +MESA3D_HEADERS_LICENSE_FILES = docs/license.rst # Only installs header files MESA3D_HEADERS_INSTALL_STAGING = YES diff --git a/buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch b/buildroot/package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch similarity index 100% rename from buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch rename to buildroot/package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch diff --git a/buildroot/package/mesa3d/0001-musl.patch b/buildroot/package/mesa3d/0001-musl.patch deleted file mode 100644 index 44c7f5b96..000000000 --- a/buildroot/package/mesa3d/0001-musl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 25e20c2e288e1d482f479eca863bc4aaa374b782 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 22 Apr 2018 15:58:38 +0200 -Subject: [PATCH] Fix musl build - -Fix musl build when svga gallium driver is enabled. - -In file included from vmw_fence.c:34:0: -vmw_screen.h:100:4: error: unknown type name ‘dev_t’ - dev_t device; - ^~~~~ - -Downloaded from -http://git.alpinelinux.org/cgit/aports/plain/main/mesa/musl-fixes.patch - -Signed-off-by: Bernd Kuhls -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour ---- - src/gallium/winsys/svga/drm/vmw_screen.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h -index f21cabb51f..20d03f8b53 100644 ---- a/src/gallium/winsys/svga/drm/vmw_screen.h -+++ b/src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - --- -2.14.3 - diff --git a/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch similarity index 74% rename from buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch rename to buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch index 072d79a21..b1bb2678b 100644 --- a/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +++ b/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -17,18 +17,20 @@ that they are not removed by Buildroot target-finalize logic. Based on the patch for autotools provided by Valentin Korenblit. Signed-off-by: Romain Naour +Signed-off-by: Bernd Kuhls +[rebased for 20.02.0] --- - src/gallium/state_trackers/clover/meson.build | 2 +- + src/gallium/frontends/clover/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build index 62ac5f5278d..ecdeb39669c 100644 ---- a/src/gallium/state_trackers/clover/meson.build -+++ b/src/gallium/state_trackers/clover/meson.build -@@ -49,7 +49,7 @@ libclllvm = static_library( - include_directories : clover_incs, - cpp_args : [ - cpp_vis_args, +--- a/src/gallium/frontends/clover/meson.build ++++ b/src/gallium/frontends/clover/meson.build +@@ -63,7 +63,7 @@ + clover_cpp_args, + clover_opencl_cpp_args, + clover_spirv_cpp_args, - '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), + '-DLIBCLC_INCLUDEDIR="/usr/share"', '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), diff --git a/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch deleted file mode 100644 index 784b27c4a..000000000 --- a/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 17 Apr 2019 22:47:05 +0200 -Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -First try by using the path provided by wayland-scanner-path, -and if that fails fall back into pkg-config. - -Based on the patch for autotools provided by Gustavo Zacarias. - -Signed-off-by: Romain Naour ---- - meson.build | 5 ++++- - meson_options.txt | 6 ++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6c4f1508855..ef0532b2cfb 100644 ---- a/meson.build -+++ b/meson.build -@@ -1319,7 +1319,10 @@ endif - - if with_platform_wayland - dep_wl_scanner = dependency('wayland-scanner', native: true) -- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) -+ prog_wl_scanner = get_option('wayland-scanner-path') -+ if prog_wl_scanner == '' -+ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) -+ endif - if dep_wl_scanner.version().version_compare('>= 1.15') - wl_scanner_arg = 'private-code' - else -diff --git a/meson_options.txt b/meson_options.txt -index ccf70659ff7..59ff8df8337 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -324,3 +324,9 @@ option( - value : true, - description : 'Enable direct rendering in GLX and EGL for DRI', - ) -+option( -+ 'wayland-scanner-path', -+ type : 'string', -+ value : '', -+ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config' -+) --- -2.20.1 - diff --git a/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch similarity index 92% rename from buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch rename to buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index 138f145af..4b9878fb9 100644 --- a/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -9,6 +9,8 @@ to force disabling it at compile time. [Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114] Signed-off-by: Peter Seiderer +Signed-off-by: Bernd Kuhls +[rebased for 20.2.0] --- meson_options.txt | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- @@ -19,9 +21,9 @@ diff --git a/meson_options.txt b/meson_options.txt index a39596a6f19..0f6b6c62b55 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -117,6 +117,13 @@ option( - choices : ['auto', 'true', 'false'], - description : 'enable gallium va state tracker.', +@@ -124,6 +124,13 @@ option( + choices : ['auto', 'true', 'false', 'enabled', 'disabled'], + description : 'enable gallium va frontend.', ) +option( + 'gallium-vc4-neon', diff --git a/buildroot/package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/buildroot/package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch new file mode 100644 index 000000000..538aa74e0 --- /dev/null +++ b/buildroot/package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch @@ -0,0 +1,40 @@ +From fdc8b5a205e2116408aeb9fd305e57f656e2e89d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 9 Aug 2020 17:06:26 +0200 +Subject: [PATCH] src/util/rand_xor: Include stddef.h to fix build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes + +In file included from ../src/util/rand_xor.c:29: +output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: + error: unknown type name ‘size_t’ + extern int getrandom(void *__buf, size_t count, unsigned int flags) + +seen with gcc version 8.3.0 (Buildroot 2020.02) and uClibc. + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6248 + +Signed-off-by: Bernd Kuhls +--- + src/util/rand_xor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c +index 81b64f1ea71..fcb481487fa 100644 +--- a/src/util/rand_xor.c ++++ b/src/util/rand_xor.c +@@ -25,6 +25,7 @@ + #include "detect_os.h" + + #if !DETECT_OS_WINDOWS ++#include + #if defined(HAVE_GETRANDOM) + #include + #endif +-- +2.27.0 + diff --git a/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch b/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch deleted file mode 100644 index 27ae021e0..000000000 --- a/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 63ad4535df6a0a938e7391d73adcada05e730c89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= -Date: Tue, 18 Feb 2020 16:12:23 -0500 -Subject: [PATCH] util: remove the dependency on kcmp.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: f76cbc7901f7 "util: Add os_same_file_description helper" - -Acked-by: Eric Engestrom -Reviewed-by: Michel Dänzer -Tested-by: Marge Bot -Part-of: - -[ Upstream: https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7bfb10c69dfe48a91e35523cb5ee641bdbf6988 ] -Signed-off-by: Peter Seiderer ---- - src/util/os_file.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index b502ff4..128fe87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -34,11 +34,12 @@ os_file_create_unique(const char *filename, int filemode) - #if defined(__linux__) - - #include --#include - #include - #include - #include - -+/* copied from */ -+#define KCMP_FILE 0 - - static ssize_t - readN(int fd, char *buf, size_t len) --- -2.25.1 - diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in index f65ccbb1f..ebfc422bf 100644 --- a/buildroot/package/mesa3d/Config.in +++ b/buildroot/package/mesa3d/Config.in @@ -106,7 +106,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO - select BR2_PACKAGE_MESA3D_OPENGL_EGL help Mesa driver for Vivante GPUs. @@ -119,6 +118,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO # the toolchain having sync4 primitives, which is always a given # for arm/aarch64. select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_FREEDRENO select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help Mesa driver for Freedreno GPUs. diff --git a/buildroot/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash index 3237135b1..287ddc1c0 100644 --- a/buildroot/package/mesa3d/mesa3d.hash +++ b/buildroot/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-February/000570.html -sha256 1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4 mesa-19.3.4.tar.xz -sha512 2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2020-October/000602.html +sha256 d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a mesa-20.2.1.tar.xz +sha512 5d609359754db3e3679bffd5306c1f1d1cf46a2ea98428a9451fe0d99bbf73da863c5d94e6561712cd2012ad13615666cf3d712e54f379b34c091fead39d4795 mesa-20.2.1.tar.xz # License -sha256 d8d662974fc86e2e640362015e42de3fcc161d435a9f2111ecd8561412feca73 docs/license.html +sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index 330c7b461..620a6eece 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -5,11 +5,11 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 19.3.4 +MESA3D_VERSION = 20.2.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos -MESA3D_LICENSE_FILES = docs/license.html +MESA3D_LICENSE_FILES = docs/license.rst MESA3D_INSTALL_STAGING = YES @@ -25,8 +25,7 @@ MESA3D_DEPENDENCIES = \ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ - -Dpower8=false \ - -Dvalgrind=false + -Dpower8=disabled # Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker # flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). @@ -37,10 +36,10 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' -MESA3D_CONF_OPTS += -Dllvm=true +MESA3D_CONF_OPTS += -Dllvm=enabled else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += -Dllvm=false +MESA3D_CONF_OPTS += -Dllvm=disabled endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of @@ -65,9 +64,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += -Dgallium-xa=true +MESA3D_CONF_OPTS += -Dgallium-xa=enabled else -MESA3D_CONF_OPTS += -Dgallium-xa=false +MESA3D_CONF_OPTS += -Dgallium-xa=disabled endif else MESA3D_CONF_OPTS += \ @@ -116,23 +115,23 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - -Ddri-drivers= -Ddri3=false + -Ddri-drivers= -Ddri3=disabled else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += -Ddri3=true +MESA3D_CONF_OPTS += -Ddri3=enabled else -MESA3D_CONF_OPTS += -Ddri3=false +MESA3D_CONF_OPTS += -Ddri3=disabled endif MESA3D_CONF_OPTS += \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dglx-direct=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif @@ -143,7 +142,7 @@ MESA3D_CONF_OPTS += \ else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - -Ddri3=true \ + -Ddri3=enabled \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif @@ -161,7 +160,7 @@ MESA3D_CONF_OPTS += -Dopengl=true # libva and mesa3d have a circular dependency # we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += -Dgallium-va=false +MESA3D_CONF_OPTS += -Dgallium-va=disabled # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) @@ -189,84 +188,75 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland -MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner endif -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) -MESA3D_PLATFORMS += drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) -MESA3D_PLATFORMS += drm -endif -MESA3D_PLATFORMS += surfaceless MESA3D_CONF_OPTS += \ -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) MESA3D_CONF_OPTS += \ - -Dgbm=true + -Dgbm=enabled else MESA3D_CONF_OPTS += \ - -Dgbm=false + -Dgbm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - -Degl=true + -Degl=enabled else MESA3D_CONF_OPTS += \ - -Degl=false + -Degl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true +MESA3D_CONF_OPTS += -Dgles1=enabled -Dgles2=enabled else -MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false +MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC -MESA3D_CONF_OPTS += -Dgallium-xvmc=true +MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled else -MESA3D_CONF_OPTS += -Dgallium-xvmc=false +MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled +endif + +ifeq ($(BR2_PACKAGE_VALGRIND),y) +MESA3D_CONF_OPTS += -Dvalgrind=enabled +MESA3D_DEPENDENCIES += valgrind +else +MESA3D_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += -Dlibunwind=true +MESA3D_CONF_OPTS += -Dlibunwind=enabled MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += -Dlibunwind=false +MESA3D_CONF_OPTS += -Dlibunwind=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += -Dgallium-vdpau=true +MESA3D_CONF_OPTS += -Dgallium-vdpau=enabled else -MESA3D_CONF_OPTS += -Dgallium-vdpau=false +MESA3D_CONF_OPTS += -Dgallium-vdpau=disabled endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += -Dlmsensors=true +MESA3D_CONF_OPTS += -Dlmsensors=enabled MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += -Dlmsensors=false +MESA3D_CONF_OPTS += -Dlmsensors=disabled +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +MESA3D_CONF_OPTS += -Dzstd=enabled +MESA3D_DEPENDENCIES += zstd +else +MESA3D_CONF_OPTS += -Dzstd=disabled endif $(eval $(meson-package)) diff --git a/buildroot/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch b/buildroot/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch new file mode 100644 index 000000000..243c59b5c --- /dev/null +++ b/buildroot/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch @@ -0,0 +1,50 @@ +From 7c5475187d1bdf861360ffd8bc1aaea84a341db3 Mon Sep 17 00:00:00 2001 +From: Dagg Stompler +Date: Fri, 11 Sep 2020 12:28:52 +0300 +Subject: [PATCH] amlbootenc-gxl: remove non std C convention in for + +not all compilers have c99 or gnu99 enabled, so try not to use a +non std C convention in for call loops + +Signed-off-by: Dagg Stompler +--- + amlbootenc-gxl.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/amlbootenc-gxl.c b/amlbootenc-gxl.c +index 3695e13..233563d 100644 +--- a/amlbootenc-gxl.c ++++ b/amlbootenc-gxl.c +@@ -51,6 +51,7 @@ static int boot_enc(const char *input, const char *output) + ._unknown3 = 0x02000000, + .sig2 = AMLOGIC_C_SIGNATURE, + }; ++ int i; + + assert(sizeof(hdr) == 0x100); + +@@ -130,10 +131,10 @@ static int boot_enc(const char *input, const char *output) + memcpy(hdr.iv, (uint8_t[]){ 0x14, 0x82, 0x5b, 0x1b, 0x10, 0xc1, 0x49, 0x0d, 0x8f, 0x13, 0x0a, 0x99, 0x15, 0x50, 0x1d, 0x37 }, 16); + } + #else +- for (int i = 0; i < sizeof(hdr.key); i++) { ++ for (i = 0; i < sizeof(hdr.key); i++) { + hdr.key[i] = rand(); + } +- for (int i = 0; i < sizeof(hdr.iv); i++) { ++ for (i = 0; i < sizeof(hdr.iv); i++) { + hdr.iv[i] = rand(); + } + #endif +@@ -151,7 +152,7 @@ static int boot_enc(const char *input, const char *output) + AES_cbc_encrypt(src_buf, buf + hdr.first_offset, hdr.block_size, &aes_key, iv, AES_ENCRYPT); + SHA256_Update(&sha256_ctx, buf + hdr.first_offset, hdr.block_size); + +- for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { ++ for (i = 1; i < hdr.payload_size / hdr.block_size; i++) { + memset(src_buf, 0, hdr.block_size); + fread(src_buf, 1, hdr.block_size, fin); + AES_cbc_encrypt(src_buf, buf + hdr.data_offset + (i - 1) * hdr.block_size, hdr.block_size, &aes_key, iv, AES_ENCRYPT); +-- +2.28.0 + diff --git a/buildroot/package/meson-tools/Config.in.host b/buildroot/package/meson-tools/Config.in.host new file mode 100644 index 000000000..677b206b6 --- /dev/null +++ b/buildroot/package/meson-tools/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_MESON_TOOLS + bool "host meson-tools" + help + meson-tools is a collection of tools for use with the + Amlogic Meson family of ARM based SoCs. It allows management + of signatures which are required for booting amlogic based + boards with u-boot. + + https://github.com/afaerber/meson-tools diff --git a/buildroot/package/meson-tools/meson-tools.hash b/buildroot/package/meson-tools/meson-tools.hash new file mode 100644 index 000000000..7b2c0d2f7 --- /dev/null +++ b/buildroot/package/meson-tools/meson-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 10d707b2f741df03ff5000f2a82c6f577036ce1cd34d9278b22b92cb616b6fce meson-tools-0a02e2d34413f4bf9b15946352bc8c8ee13a5843.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/meson-tools/meson-tools.mk b/buildroot/package/meson-tools/meson-tools.mk new file mode 100644 index 000000000..037faf3e6 --- /dev/null +++ b/buildroot/package/meson-tools/meson-tools.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# meson-tools +# +################################################################################ + +HOST_MESON_TOOLS_VERSION = 0a02e2d34413f4bf9b15946352bc8c8ee13a5843 +HOST_MESON_TOOLS_SITE = $(call github,afaerber,meson-tools,$(HOST_MESON_TOOLS_VERSION)) +HOST_MESON_TOOLS_LICENSE = GPL-2.0+ +HOST_MESON_TOOLS_LICENSE_FILES = COPYING +HOST_MESON_TOOLS_DEPENDENCIES = host-openssl + +HOST_MESON_TOOLS_PROGS = amlbootsig unamlbootsig amlinfo + +define HOST_MESON_TOOLS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS) -lssl -lcrypto" +endef + +define HOST_MESON_TOOLS_INSTALL_CMDS + $(foreach f,$(HOST_MESON_TOOLS_PROGS), \ + $(INSTALL) -D -m 0755 $(@D)/$(f) $(HOST_DIR)/bin/$(f) + ) +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch deleted file mode 100644 index a7b66c106..000000000 --- a/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sat, 14 Jul 2018 11:18:45 +0200 -Subject: [PATCH] Only fix RPATH if install_rpath is not empty - -Signed-off-by: Eric Le Bihan -[Fix: remove leftover from original/unconditional code] -Signed-off-by: Peter Seiderer ---- - mesonbuild/minstall.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -478,8 +478,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): - try: -- depfixer.fix_rpath(outname, install_rpath, final_path, -- install_name_mappings, verbose=False) -+ # Buildroot check-host-rpath script expects RPATH -+ # But if install_rpath is empty, it will stripped. -+ # So, preserve it in this case -+ if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, -+ install_name_mappings, verbose=False) -+ else: -+ print("Skipping RPATH fixing") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass --- -2.20.1 - diff --git a/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch b/buildroot/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch similarity index 91% rename from buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch rename to buildroot/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index 798cd6529..263991589 100644 --- a/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +++ b/buildroot/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static @@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -858,6 +858,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes @@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1 diff --git a/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/buildroot/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch similarity index 95% rename from buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch rename to buildroot/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 4196545a9..eda17cadc 100644 --- a/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/buildroot/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -23,10 +23,10 @@ Signed-off-by: Romain Naour 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs'] @@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1 diff --git a/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch b/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch deleted file mode 100644 index ae40ab8b1..000000000 --- a/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 3af920cb4a9c272b9b75a4f3eea9da9000520949 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= -Date: Tue, 14 Jan 2020 11:11:52 +0100 -Subject: [PATCH] envconfig: add pkg_config_libdir property - -In order to unify the use of sysroot in the cross-file, -the pkg_config_libdir can now be passed directly in the file. - -Upstream: 958df63dac810246e84c2b8eaa32d22d19ace0ef -[Arnout: remove documentation changes: we don't extract docs/] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - mesonbuild/dependencies/base.py | 6 ++++++ - mesonbuild/envconfig.py | 6 ++++++ - run_unittests.py | 30 +++++++++++++++++++++++++++++- - 3 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 40e304c7..282c314b 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -697,6 +697,12 @@ class PkgConfigDependency(ExternalDependency): - mlog.debug('PKG_CONFIG_PATH: ' + new_pkg_config_path) - env['PKG_CONFIG_PATH'] = new_pkg_config_path - -+ pkg_config_libdir_prop = self.env.properties[self.for_machine].get_pkg_config_libdir() -+ if pkg_config_libdir_prop: -+ new_pkg_config_libdir = ':'.join([p for p in pkg_config_libdir_prop]) -+ env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir -+ mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) -+ - fenv = frozenset(env.items()) - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c8a37f4c..3e5e44b8 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -143,6 +143,12 @@ class Properties(HasEnvVarFallback): - def get_sys_root(self) -> T.Optional[T.Union[str, T.List[str]]]: - return self.properties.get('sys_root', None) - -+ def get_pkg_config_libdir(self) -> T.Optional[T.List[str]]: -+ p = self.properties.get('pkg_config_libdir', None) -+ if p is None: -+ return p -+ return mesonlib.listify(p) -+ - def __eq__(self, other: T.Any) -> 'T.Union[bool, NotImplemented]': - if isinstance(other, type(self)): - return self.properties == other.properties -diff --git a/run_unittests.py b/run_unittests.py -index 676604f4..382c0964 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -3621,6 +3621,34 @@ recommended as it is not supported on some platforms''') - self.wipe() - self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) - -+ @skipIfNoPkgconfig -+ @unittest.skipIf(is_windows(), 'Help needed with fixing this test on windows') -+ def test_pkg_config_libdir(self): -+ testdir = os.path.join(self.unit_test_dir, -+ '46 native dep pkgconfig var') -+ with tempfile.NamedTemporaryFile(mode='w', delete=False) as crossfile: -+ crossfile.write(textwrap.dedent( -+ '''[binaries] -+ pkgconfig = 'pkg-config' -+ -+ [properties] -+ pkg_config_libdir = [r'{0}'] -+ -+ [host_machine] -+ system = 'linux' -+ cpu_family = 'arm' -+ cpu = 'armv7' -+ endian = 'little' -+ '''.format(os.path.join(testdir, 'cross_pkgconfig')))) -+ crossfile.flush() -+ self.meson_cross_file = crossfile.name -+ -+ env = {'PKG_CONFIG_LIBDIR': os.path.join(testdir, -+ 'native_pkgconfig')} -+ self.init(testdir, extra_args=['-Dstart_native=false'], override_envvars=env) -+ self.wipe() -+ self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) -+ - def __reconfigure(self, change_minor=False): - # Set an older version to force a reconfigure from scratch - filename = os.path.join(self.privatedir, 'coredata.dat') -@@ -6847,7 +6875,7 @@ class NativeFileTests(BasePlatformTests): - - class CrossFileTests(BasePlatformTests): - -- """Tests for cross file functioality not directly related to -+ """Tests for cross file functionality not directly related to - cross compiling. - - This is mainly aimed to testing overrides from cross files. --- -2.24.1 - diff --git a/buildroot/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in index d80c472de..188005131 100644 --- a/buildroot/package/meson/cross-compilation.conf.in +++ b/buildroot/package/meson/cross-compilation.conf.in @@ -9,6 +9,8 @@ cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' pkgconfig = '@HOST_DIR@/bin/pkgconf' +g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' +g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true @@ -22,6 +24,6 @@ pkg_config_static = '@STATIC@' [host_machine] system = 'linux' -cpu_family ='@TARGET_ARCH@' +cpu_family = '@TARGET_ARCH@' cpu = '@TARGET_CPU@' endian = '@TARGET_ENDIAN@' diff --git a/buildroot/package/meson/meson.hash b/buildroot/package/meson/meson.hash index 881d4211c..9d278ef90 100644 --- a/buildroot/package/meson/meson.hash +++ b/buildroot/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.53.1/meson-0.53.1.tar.gz.asc -sha256 ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 meson-0.53.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +# https://github.com/mesonbuild/meson/releases/download/0.55.3/meson-0.55.3.tar.gz.asc +sha256 6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 meson-0.55.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/meson/meson.mk b/buildroot/package/meson/meson.mk index aa4ef5cd0..d39e66cf0 100644 --- a/buildroot/package/meson/meson.mk +++ b/buildroot/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.53.1 +MESON_VERSION = 0.55.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/buildroot/package/mg/0001-src-def.h-fix-build-with-gcc-10.patch b/buildroot/package/mg/0001-src-def.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..d88e2f44f --- /dev/null +++ b/buildroot/package/mg/0001-src-def.h-fix-build-with-gcc-10.patch @@ -0,0 +1,38 @@ +From 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Sep 2020 14:50:20 +0200 +Subject: [PATCH] src/def.h: fix build with gcc 10 + +Define hlp as extern to avoid the following build failure with gcc 10 +(which defaults to -fno-common): + + CCLD mg +/home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: mg-bell.o:(.bss+0x0): multiple definition of `hlp'; mg-basic.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/aacc02abf41e120e0d0b22faa38642e6d149d73f + +[backport of upstream 29c83c917bd4f5d0c37ff0ab5da1a85762bd5530] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: backport actual patch after MR was accepted] +Signed-off-by: Yann E. MORIN +--- + src/def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/def.h b/src/def.h +index e4c049c..cd59725 100644 +--- a/src/def.h ++++ b/src/def.h +@@ -650,7 +650,7 @@ int excline(char *); + char *skipwhite(char *); + + /* help.c X */ +-const char *hlp; ++extern const char *hlp; + int desckey(int, int); + int wallchart(int, int); + int help_help(int, int); +-- +2.28.0 + diff --git a/buildroot/package/mg/Config.in b/buildroot/package/mg/Config.in new file mode 100644 index 000000000..11e5bdb27 --- /dev/null +++ b/buildroot/package/mg/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_MG + bool "mg" + depends on BR2_USE_MMU # fork() + help + Emacs-like text editor (130 kiB) + + Mg is a MicroEMACS clone with the goal of being compatible + with GNU Emacs, because there should never be any reason to + learn more than one Emacs flavor. + + Unlike many other editors it does not require ncurses, only a + standard C library, making it suitable for really small and + embedded systems. + + This version is based on mg2a from OpenBSD, with more features + and, in particular, no requirement on ncurses or termcap. + + https://github.com/troglobit/mg/ diff --git a/buildroot/package/mg/mg.hash b/buildroot/package/mg/mg.hash new file mode 100644 index 000000000..758a5232d --- /dev/null +++ b/buildroot/package/mg/mg.hash @@ -0,0 +1,5 @@ +# From https://github.com/troglobit/mg/releases/tag/v3.4 +md5 6b79855d54770bcb23e5457ebde8296c mg-3.4.tar.gz +# Locally computed: +sha256 1a620cf5b2dd4b00006d6c929ac8e2a70eeab5f807a0d6e5334b878aa182b713 mg-3.4.tar.gz +sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE diff --git a/buildroot/package/mg/mg.mk b/buildroot/package/mg/mg.mk new file mode 100644 index 000000000..e3b79da00 --- /dev/null +++ b/buildroot/package/mg/mg.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# mg +# +################################################################################ + +MG_VERSION = 3.4 +MG_SITE = https://github.com/troglobit/mg/releases/download/v$(MG_VERSION) +MG_LICENSE = Public Domain +MG_LICENSE_FILES = UNLICENSE + +ifeq ($(BR2_PACKAGE_NCURSES),y) +MG_DEPENDENCIES += ncurses +MG_CONF_OPTS += --with-curses +else +MG_CONF_OPTS += --without-curses +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/micropython/micropython.hash b/buildroot/package/micropython/micropython.hash index 49fd903fa..5dfbb7452 100644 --- a/buildroot/package/micropython/micropython.hash +++ b/buildroot/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 330cd32c7b67cb6b531d158eabcf68af3a7d7ad7b5a4b0ce3c73da3d241da6a2 micropython-1.12.tar.gz -sha256 afde3432122205e8e08d615fcb920aca58631c52b6c0c01813854287a457b298 LICENSE +sha256 31466dacebeb3af60dc80a071a07c3e15b657219a826e0b6ac741f9f22472f23 micropython-1.13.tar.gz +sha256 4b8a8884a60cd72749f9ef40328b85b40d13c22594c01352e0a55392141e0f89 LICENSE diff --git a/buildroot/package/micropython/micropython.mk b/buildroot/package/micropython/micropython.mk index 832899209..a126b3eea 100644 --- a/buildroot/package/micropython/micropython.mk +++ b/buildroot/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.12 +MICROPYTHON_VERSION = 1.13 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE @@ -23,24 +23,24 @@ endif # When building from a tarball we don't have some of the dependencies that are in # the git repository as submodules -MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 -MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 +MICROPYTHON_MAKE_OPTS += \ + MICROPY_PY_BTREE=0 \ + MICROPY_PY_USSL=0 \ + CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + CWARN= define MICROPYTHON_BUILD_CMDS $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ - $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) + $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ DESTDIR=$(TARGET_DIR) \ - PREFIX=$(TARGET_DIR)/usr \ + PREFIX=/usr \ install endef diff --git a/buildroot/package/midori/Config.in b/buildroot/package/midori/Config.in index 089f36ced..e2cc2ac61 100644 --- a/buildroot/package/midori/Config.in +++ b/buildroot/package/midori/Config.in @@ -1,13 +1,17 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI bool "midori" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # webkitgtk depends on BR2_INSTALL_LIBSTDCPP # webkitgtk depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk diff --git a/buildroot/package/minetest-game/minetest-game.hash b/buildroot/package/minetest-game/minetest-game.hash index a618f32d1..5bf65bc51 100644 --- a/buildroot/package/minetest-game/minetest-game.hash +++ b/buildroot/package/minetest-game/minetest-game.hash @@ -1,35 +1,35 @@ # Locally calculated -sha256 f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b minetest-game-5.1.0.tar.gz +sha256 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94 minetest-game-5.2.0.tar.gz -sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt -sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt -sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt -sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt -sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt -sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt -sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt -sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt -sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt -sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt -sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt -sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt -sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt -sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt -sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt -sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt -sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt -sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt -sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt -sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt -sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt -sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt -sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt -sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt -sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt -sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt -sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt +sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 65133ccf7fb7bf8ffe5e9bc148b193af7362bba925b15ab507da28494156297a mods/player_api/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt +sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt diff --git a/buildroot/package/minetest-game/minetest-game.mk b/buildroot/package/minetest-game/minetest-game.mk index 1e6bb4d0c..38f46a398 100644 --- a/buildroot/package/minetest-game/minetest-game.mk +++ b/buildroot/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.1.0 +MINETEST_GAME_VERSION = 5.2.0 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/buildroot/package/minetest/Config.in b/buildroot/package/minetest/Config.in index 085525534..b8ee175d5 100644 --- a/buildroot/package/minetest/Config.in +++ b/buildroot/package/minetest/Config.in @@ -5,11 +5,10 @@ config BR2_PACKAGE_MINETEST depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_XORG7 # irrlicht depends on BR2_PACKAGE_HAS_LIBGL # irrlicht - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAJIT select BR2_PACKAGE_IRRLICHT select BR2_PACKAGE_GMP select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB # At least one option must be enabled @@ -59,7 +58,6 @@ comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads" || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on (BR2_INSTALL_LIBSTDCPP \ && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/buildroot/package/minetest/minetest.hash b/buildroot/package/minetest/minetest.hash index bedc7633c..626f56a31 100644 --- a/buildroot/package/minetest/minetest.hash +++ b/buildroot/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 minetest-5.1.0.tar.gz +sha256 4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d minetest-5.2.0.tar.gz -sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt +sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt diff --git a/buildroot/package/minetest/minetest.mk b/buildroot/package/minetest/minetest.mk index 326479213..e8fe5b45c 100644 --- a/buildroot/package/minetest/minetest.mk +++ b/buildroot/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.1.0 +MINETEST_VERSION = 5.2.0 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) MINETEST_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch b/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch deleted file mode 100644 index 36ddee422..000000000 --- a/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 949ae648bf7c654b8fae607a0988bfa672607156 Mon Sep 17 00:00:00 2001 -From: Patrick Rauscher -Date: Fri, 18 Aug 2017 17:31:23 +0200 -Subject: [PATCH] Prepend zero-byte before unsigned integers - -fixes #8 - -Signed-off-by: Alexander Sverdlin ---- - mib.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mib.c b/mib.c -index 7d2e513..a9ffbe2 100644 ---- a/mib.c -+++ b/mib.c -@@ -207,6 +207,11 @@ static int encode_unsigned(data_t *data, int type, unsigned int ticks_value) - else - length = 1; - -+ /* check if the integer could be interpreted negative during a signed decode and prepend a zero-byte if necessary */ -+ if ((ticks_value >> (8 * (length - 1))) & 0x80) { -+ length++; -+ } -+ - *buffer++ = type; - *buffer++ = length; - while (length--) --- -2.13.2 - diff --git a/buildroot/package/mini-snmpd/0001-linux.c-fix-musl-build.patch b/buildroot/package/mini-snmpd/0001-linux.c-fix-musl-build.patch new file mode 100644 index 000000000..8e8bb090f --- /dev/null +++ b/buildroot/package/mini-snmpd/0001-linux.c-fix-musl-build.patch @@ -0,0 +1,46 @@ +From 73fa408f51ec25121075aaccac9c9db1c68567cd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 12 Mar 2020 10:02:18 +0100 +Subject: [PATCH] linux.c: fix musl build + +Remove include on linux/if_link.h to avoid the following build failure +with musl: + +In file included from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, + from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:4, + from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/if_link.h:5, + from linux.c:21: +/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' + struct sysinfo { + ^~~~~~~ +In file included from linux.c:19: +/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + struct sysinfo { + ^~~~~~~ + CC mini_snmpd-globals.o + +Fixes: + - http://autobuild.buildroot.org/results/6903a0f685076b4a2c2824de6158da40e9e712d8 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/troglobit/mini-snmpd/commit/73fa408f51ec25121075aaccac9c9db1c68567cd] +--- + linux.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux.c b/linux.c +index a657912..86a7085 100644 +--- a/linux.c ++++ b/linux.c +@@ -18,7 +18,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.25.1 + diff --git a/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch b/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch deleted file mode 100644 index 045d29691..000000000 --- a/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 556c8a406c9e08dd9444222e072f7eb9c82a81e8 Mon Sep 17 00:00:00 2001 -From: Patrick Rauscher -Date: Fri, 18 Aug 2017 17:44:32 +0200 -Subject: [PATCH] mib.c: allow unsigned integers to have an extra byte - -The extra byte can be needed when encoding huge unsigned numbers (i.e. 0x80000000 or higher). In this case, during encoding we need an extra byte to make sure clients decoding as signed int do not get negative numbers. For further details, see commit 949ae648 - -Signed-off-by: Alexander Sverdlin ---- - mib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mib.c b/mib.c -index a9ffbe2..83cc20d 100644 ---- a/mib.c -+++ b/mib.c -@@ -372,7 +372,7 @@ static int data_alloc(data_t *data, int type) - case BER_TYPE_COUNTER: - case BER_TYPE_GAUGE: - case BER_TYPE_TIME_TICKS: -- data->max_length = sizeof(unsigned int) + 2; -+ data->max_length = sizeof(unsigned int) + 3; - data->encoded_length = 0; - data->buffer = allocate(data->max_length); - break; --- -2.13.2 - diff --git a/buildroot/package/mini-snmpd/mini-snmpd b/buildroot/package/mini-snmpd/mini-snmpd new file mode 100644 index 000000000..0ca9901d5 --- /dev/null +++ b/buildroot/package/mini-snmpd/mini-snmpd @@ -0,0 +1,2 @@ +# Require client authentication, thus SNMP version 2c +EXTRA_PARAMS=-a diff --git a/buildroot/package/mini-snmpd/mini-snmpd.hash b/buildroot/package/mini-snmpd/mini-snmpd.hash index de72bb59e..2d6680929 100644 --- a/buildroot/package/mini-snmpd/mini-snmpd.hash +++ b/buildroot/package/mini-snmpd/mini-snmpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 59f84e94ef7c9ff36d243c7974a100903a4a9a0bb529b67cf6f0d3352138a86b mini-snmpd-1.4.tar.gz +sha256 de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3 mini-snmpd-1.6.tar.gz sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING diff --git a/buildroot/package/mini-snmpd/mini-snmpd.mk b/buildroot/package/mini-snmpd/mini-snmpd.mk index 698402bc5..570241c25 100644 --- a/buildroot/package/mini-snmpd/mini-snmpd.mk +++ b/buildroot/package/mini-snmpd/mini-snmpd.mk @@ -4,15 +4,18 @@ # ################################################################################ -MINI_SNMPD_VERSION = 1.4 +MINI_SNMPD_VERSION = 1.6 MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION)) MINI_SNMPD_LICENSE = GPL-2.0 MINI_SNMPD_LICENSE_FILES = COPYING MINI_SNMPD_AUTORECONF = YES +MINI_SNMPD_DEPENDENCIES = host-pkgconf -define MINI_SNMPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service +define MINI_SNMPD_INSTALL_ETC_DEFAULT + $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd \ + $(TARGET_DIR)/etc/default/mini-snmpd endef +MINI_SNMPD_POST_INSTALL_TARGET_HOOKS += MINI_SNMPD_INSTALL_ETC_DEFAULT + $(eval $(autotools-package)) diff --git a/buildroot/package/mini-snmpd/mini-snmpd.service b/buildroot/package/mini-snmpd/mini-snmpd.service deleted file mode 100644 index 8a15585e6..000000000 --- a/buildroot/package/mini-snmpd/mini-snmpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Mini SNMP Daemon -StartLimitIntervalSec=0 - -[Service] -Environment='COMMUNITY=public' -ExecStart=/sbin/mini_snmpd -a -n -c ${COMMUNITY} $EXTRA_PARAMS -Restart=always -RestartSec=1 - -[Install] -WantedBy=multi-user.target diff --git a/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch b/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch deleted file mode 100644 index 56c442e85..000000000 --- a/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch +++ /dev/null @@ -1,745 +0,0 @@ -From c13180cb2bead49addb00f33f4999200cbbd801f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 26 Feb 2020 10:16:14 +0100 -Subject: [PATCH] fix static linking with ncurses - -Prefix LINES and COLS with MINICOM_ to avoid the following build failure -when building statically with ncurses: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/bin/arm-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -W -Wall -Wextra -std=gnu99 -fno-common -Wno-format-truncation -static -o minicom minicom.o vt100.o config.o help.o updown.o util.o dial.o window.o wkeys.o ipc.o windiv.o sysdep1.o sysdep1_s.o sysdep2.o rwconf.o main.o file.o getsdir.o wildmat.o common.o ../lib/libport.a -lncurses -/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libncurses.a(lib_setup.o):(.bss+0x100): multiple definition of `COLS'; window.o:(.bss+0x38): first defined here -/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libncurses.a(lib_setup.o):(.bss+0x104): multiple definition of `LINES'; window.o:(.bss+0x3c): first defined here -collect2: error: ld returned 1 exit status -Makefile:448: recipe for target 'minicom' failed - -Fixes: - - http://autobuild.buildroot.org/results/d3edbab1f2cd0f7b790e2559dc8d489497ae02f3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to minicom-devel@lists.alioth.debian.org] ---- - src/config.c | 8 ++-- - src/dial.c | 10 ++--- - src/file.c | 8 ++-- - src/help.c | 4 +- - src/main.c | 68 ++++++++++++++++----------------- - src/minicom.c | 2 +- - src/vt100.c | 2 +- - src/windiv.c | 8 ++-- - src/window.c | 102 +++++++++++++++++++++++++------------------------- - src/window.h | 2 +- - 10 files changed, 107 insertions(+), 107 deletions(-) - -diff --git a/src/config.c b/src/config.c -index 87901f0..3c26f9f 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -1078,7 +1078,7 @@ static void doscrkeyb(void) - } else { - psets(P_STATLINE, N_("enabled")); - /* See if it fits on screen */ -- if (LINES > 24) -+ if (MINICOM_LINES > 24) - tempst = 0; - } - mc_wlocate(w, mbswidth(status_line) + 1, 2); -@@ -1140,7 +1140,7 @@ static void doscrkeyb(void) - - if (st) { - mc_wclose(st,0); -- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, BNONE, -+ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, BNONE, - XA_NORMAL, sfcolor, sbcolor, 1, 0, 1); - show_status(); - } -@@ -1159,7 +1159,7 @@ static void doscrkeyb(void) - - if (st) { - mc_wclose(st,0); -- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, BNONE, -+ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, BNONE, - XA_NORMAL, sfcolor, sbcolor, 1, 0, 0); - show_status(); - } -@@ -1326,7 +1326,7 @@ int dotermmenu(void) - } else { - psets(P_STATLINE, N_("enabled")); - /* See if it fits on screen */ -- if (LINES > 24 || use_status) -+ if (MINICOM_LINES > 24 || use_status) - tempst = 0; - } - mc_wlocate(w, mbswidth(status_line) + 1, 3); -diff --git a/src/dial.c b/src/dial.c -index 5076b32..5ef7ac3 100644 ---- a/src/dial.c -+++ b/src/dial.c -@@ -1575,7 +1575,7 @@ void dialdir(void) - *move_exit = N_(" Move entry up/down, Escape to exit"); - unsigned int tagmvlen = 0; - size_t i; -- int position_dialing_directory = ((COLS / 2) + 32 - DIALOPTS * DIAL_WIDTH) / 2; -+ int position_dialing_directory = ((MINICOM_COLS / 2) + 32 - DIALOPTS * DIAL_WIDTH) / 2; - - dprev = -1; - dname[0] = 0; -@@ -1586,11 +1586,11 @@ void dialdir(void) - /* Alright, draw the dialing directory! */ - - dirflush = 0; -- x1 = (COLS / 2) - 37; -- x2 = (COLS / 2) + 37; -- dsub = mc_wopen(x1 - 1, LINES - 3, x2 + 1, LINES - 3, BNONE, -+ x1 = (MINICOM_COLS / 2) - 37; -+ x2 = (MINICOM_COLS / 2) + 37; -+ dsub = mc_wopen(x1 - 1, MINICOM_LINES - 3, x2 + 1, MINICOM_LINES - 3, BNONE, - XA_REVERSE | stdattr, mfcolor, mbcolor, 0, 0, 1); -- w = mc_wopen(x1, 2, x2, LINES - 6, BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); -+ w = mc_wopen(x1, 2, x2, MINICOM_LINES - 6, BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); - mc_wcursor(w, CNONE); - mc_wtitle(w, TMID, _("Dialing Directory")); - mc_wputs(w, -diff --git a/src/file.c b/src/file.c -index be26afd..7c208a7 100644 ---- a/src/file.c -+++ b/src/file.c -@@ -491,11 +491,11 @@ static void init_filedir(void) - int x1, x2; - - dirflush = 0; -- x1 = (COLS / 2) - 37; -- x2 = (COLS / 2) + 37; -- dsub = mc_wopen(x1 - 1, LINES - 3, x2 + 1, LINES - 3, BNONE, -+ x1 = (MINICOM_COLS / 2) - 37; -+ x2 = (MINICOM_COLS / 2) + 37; -+ dsub = mc_wopen(x1 - 1, MINICOM_LINES - 3, x2 + 1, MINICOM_LINES - 3, BNONE, - stdattr, mfcolor, mbcolor, 0, 0, 1); -- main_w = mc_wopen(x1, 2, x2, LINES - 6, BSINGLE, stdattr, mfcolor, -+ main_w = mc_wopen(x1, 2, x2, MINICOM_LINES - 6, BSINGLE, stdattr, mfcolor, - mbcolor, 0, 0, 1); - - if (ret_buf == NULL) { -diff --git a/src/help.c b/src/help.c -index 70cf8c6..3036d0a 100644 ---- a/src/help.c -+++ b/src/help.c -@@ -34,8 +34,8 @@ int help(void) - const char *s; - char buf[40]; - -- x1 = (COLS / 2) - 34; -- x2 = (COLS / 2) + 32; -+ x1 = (MINICOM_COLS / 2) - 34; -+ x2 = (MINICOM_COLS / 2) + 32; - w = mc_wopen(x1, 2, x2, 18, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1); - - s = _("Minicom Command Summary"); -diff --git a/src/main.c b/src/main.c -index 85bd4a5..8f8e8f7 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -485,17 +485,17 @@ void init_emul(int type, int do_init) - } - - /* See if we have space for a fixed status line */ -- maxy = LINES - 1; -- if ((use_status || LINES > 24) && -+ maxy = MINICOM_LINES - 1; -+ if ((use_status || MINICOM_LINES > 24) && - P_STATLINE[0] == 'e') { - if (use_status) { -- ypos = LINES; -- maxy = LINES - 1; -+ ypos = MINICOM_LINES; -+ maxy = MINICOM_LINES - 1; - } else { -- ypos = LINES - 1; -- maxy = LINES - 2; -+ ypos = MINICOM_LINES - 1; -+ maxy = MINICOM_LINES - 2; - } -- st = mc_wopen(0, ypos, COLS - 1, ypos, BNONE, -+ st = mc_wopen(0, ypos, MINICOM_COLS - 1, ypos, BNONE, - st_attr, sfcolor, sbcolor, 1, 0, 1); - mc_wredraw(st, 1); - } -@@ -508,7 +508,7 @@ void init_emul(int type, int do_init) - num_hist_lines = 5000; - - /* Open a new main window, and define the configured history buffer size. */ -- us = mc_wopen(0, 0, COLS - 1, maxy, -+ us = mc_wopen(0, 0, MINICOM_COLS - 1, maxy, - BNONE, XA_NORMAL, tfcolor, tbcolor, 1, num_hist_lines, 0); - - if (x >= 0) { -@@ -520,8 +520,8 @@ void init_emul(int type, int do_init) - us->wrap = wrapln; - - terminal = type; -- lines = LINES - (st != NULL); -- cols = COLS; -+ lines = MINICOM_LINES - (st != NULL); -+ cols = MINICOM_COLS; - - /* Install and reset the terminal emulator. */ - if (do_init) { -@@ -583,10 +583,10 @@ static void show_status_fmt(const char *fmt) - if (!st) - return; - -- char buf[COLS]; -+ char buf[MINICOM_COLS]; - int bufi = 0; - int l = strlen(fmt); -- for (int i = 0; i < l && bufi < COLS; ++i) -+ for (int i = 0; i < l && bufi < MINICOM_COLS; ++i) - { - if (fmt[i] == '%' && i + 1 < l) - { -@@ -596,70 +596,70 @@ static void show_status_fmt(const char *fmt) - switch (func) - { - case '%': -- bufi += snprintf(buf + bufi, COLS - bufi, "%%"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%%"); - break; - case 'H': -- bufi += snprintf(buf + bufi, COLS - bufi, "%sZ", esc_key()); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%sZ", esc_key()); - break; - case 'V': -- bufi += snprintf(buf + bufi, COLS - bufi, "%s", VERSION); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", VERSION); - break; - case 'b': - #ifdef USE_SOCKET - if (portfd_is_socket == Socket_type_unix) -- bufi += snprintf(buf + bufi, COLS - bufi, "unix-socket"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "unix-socket"); - else if (portfd_is_socket == Socket_type_tcp) -- bufi += snprintf(buf + bufi, COLS - bufi, "TCP"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "TCP"); - else - #endif /* USE_SOCKET */ - { - if (P_SHOWSPD[0] == 'l') -- bufi += snprintf(buf + bufi, COLS - bufi, "%6ld", linespd); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%6ld", linespd); - else -- bufi += snprintf(buf + bufi, COLS - bufi, "%s", P_BAUDRATE); -- bufi += snprintf(buf + bufi, COLS - bufi, " %s%s%s", P_BITS, P_PARITY, P_STOPB); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", P_BAUDRATE); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, " %s%s%s", P_BITS, P_PARITY, P_STOPB); - } - break; - case 'T': - switch (terminal) - { - case VT100: -- bufi += snprintf(buf + bufi, COLS - bufi, "VT102"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "VT102"); - break; - case ANSI: -- bufi += snprintf(buf + bufi, COLS - bufi, "ANSI"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "ANSI"); - break; - } - - break; - case 'C': -- bufi += snprintf(buf + bufi, COLS - bufi, cursormode == NORMAL ? "NOR" : "APP"); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, cursormode == NORMAL ? "NOR" : "APP"); - break; - - case 't': - if (online < 0) -- bufi += snprintf(buf + bufi, COLS - bufi, "%s", -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", - P_HASDCD[0] == 'Y' ? _("Offline") : _("OFFLINE")); - else -- bufi += snprintf(buf + bufi, COLS - bufi, "%s %ld:%ld", -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s %ld:%ld", - P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), - online / 3600, (online / 60) % 60); - break; - - case 'D': - { -- char b[COLS - bufi]; -- bufi += snprintf(buf + bufi, COLS - bufi, "%s", -+ char b[MINICOM_COLS - bufi]; -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", - shortened_devpath(b, sizeof(b), dial_tty)); - } - break; - - case '$': -- bufi += snprintf(buf + bufi, COLS - bufi, "%s", status_message); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", status_message); - break; - - default: -- bufi += snprintf(buf + bufi, COLS - bufi, "?%c", func); -+ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "?%c", func); - break; - } - } -@@ -670,9 +670,9 @@ static void show_status_fmt(const char *fmt) - } - } - -- if (bufi < COLS - 1) -- memset(buf + bufi, ' ', COLS - bufi); -- buf[COLS - 1] = 0; -+ if (bufi < MINICOM_COLS - 1) -+ memset(buf + bufi, ' ', MINICOM_COLS - bufi); -+ buf[MINICOM_COLS - 1] = 0; - - if (size_changed || !current_status_line || strcmp(buf, current_status_line)) - { -@@ -681,7 +681,7 @@ static void show_status_fmt(const char *fmt) - mc_wprintf(st, "%s", buf); - mc_wredraw(st, 1); - ret_csr(); -- current_status_line = realloc(current_status_line, COLS); -+ current_status_line = realloc(current_status_line, MINICOM_COLS); - assert(current_status_line); - strcpy(current_status_line, buf); - } -@@ -814,7 +814,7 @@ static void showtemp(void) - if (st) - return; - -- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, -+ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, - BNONE, st_attr, sfcolor, sbcolor, 1, 0, 1); - show_status(); - tempst = 1; -diff --git a/src/minicom.c b/src/minicom.c -index cfdb763..d876cb2 100644 ---- a/src/minicom.c -+++ b/src/minicom.c -@@ -1502,7 +1502,7 @@ int main(int argc, char **argv) - if (win_init(tfcolor, tbcolor, XA_NORMAL) < 0) - leave(""); - -- if (COLS < 40 || LINES < 10) -+ if (MINICOM_COLS < 40 || MINICOM_LINES < 10) - leave(_("Sorry. Your screen is too small.\n")); - - if (dosetup) { -diff --git a/src/vt100.c b/src/vt100.c -index 82e395e..2f03549 100644 ---- a/src/vt100.c -+++ b/src/vt100.c -@@ -739,7 +739,7 @@ static void dec_mode(int on_off) - - if (on_off) - { -- us_alternate = mc_wopen(0, 0, COLS - 1, us->y2, BNONE, XA_NORMAL, -+ us_alternate = mc_wopen(0, 0, MINICOM_COLS - 1, us->y2, BNONE, XA_NORMAL, - tfcolor, tbcolor, 1, 0, 0); - vt_win = us_alternate; - } -diff --git a/src/windiv.c b/src/windiv.c -index 2644dff..fb4d73c 100644 ---- a/src/windiv.c -+++ b/src/windiv.c -@@ -48,8 +48,8 @@ static WIN *vmc_tell(const char *fmt, va_list va) - - vsnprintf(buf, sizeof(buf), fmt, va); - -- w = mc_wopen((COLS / 2) - 2 - mbswidth(buf) / 2, 8, -- (COLS / 2) + 2 + mbswidth(buf) / 2, 10, -+ w = mc_wopen((MINICOM_COLS / 2) - 2 - mbswidth(buf) / 2, 8, -+ (MINICOM_COLS / 2) + 2 + mbswidth(buf) / 2, 10, - BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1); - mc_wcursor(w, CNONE); - mc_wlocate(w, 2, 1); -@@ -104,7 +104,7 @@ int ask(const char *what, const char **s) - size = mbswidth(what) / 2 + 2; - offs = size - 5*num; - } -- w = mc_wopen((COLS / 2) - size , 8, (COLS / 2) + 1 + size, 9, -+ w = mc_wopen((MINICOM_COLS / 2) - size , 8, (MINICOM_COLS / 2) + 1 + size, 9, - BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); - - dirflush = 0; -@@ -167,7 +167,7 @@ char *input(char *s, char *buf, size_t bufsize) - { - WIN *w; - -- w = mc_wopen((COLS / 2) - 20, 11, (COLS / 2) + 20, 12, -+ w = mc_wopen((MINICOM_COLS / 2) - 20, 11, (MINICOM_COLS / 2) + 20, 12, - BDOUBLE, stdattr, mfcolor, mbcolor, 1, 0, 1); - mc_wputs(w, s); - mc_wlocate(w, 0, 1); -diff --git a/src/window.c b/src/window.c -index c6cf0f1..66f2978 100644 ---- a/src/window.c -+++ b/src/window.c -@@ -104,7 +104,7 @@ static int sflag = 0; - - int useattr = 1; - int dirflush = 1; --int LINES, COLS; -+int MINICOM_LINES, MINICOM_COLS; - int usecolor = 0; - WIN *stdwin; - /* -@@ -266,12 +266,12 @@ static void _gotoxy(int x, int y) - int tmp; - - /* Sanity check. */ -- if (x >= COLS || y > LINES || (x == curx && y == cury)) -+ if (x >= MINICOM_COLS || y > MINICOM_LINES || (x == curx && y == cury)) - return; - - if (use_status) { - /* Leaving status line? */ -- if (cury == LINES && y < cury) { -+ if (cury == MINICOM_LINES && y < cury) { - outstr(FS); - /* Re-set attributes. */ - tmp = curattr; -@@ -282,7 +282,7 @@ static void _gotoxy(int x, int y) - return; - } - /* Writing on status line? */ -- else if (y == LINES) { -+ else if (y == MINICOM_LINES) { - /* From normal screen? */ - if (cury < y) { - outstr(tgoto(TS, x, x)); -@@ -298,11 +298,11 @@ static void _gotoxy(int x, int y) - } - #else - /* Sanity check. */ -- if (x >= COLS || y >= LINES || (x == curx && y == cury)) { -+ if (x >= MINICOM_COLS || y >= MINICOM_LINES || (x == curx && y == cury)) { - # if 0 -- if (x >= COLS || y >= LINES) -+ if (x >= MINICOM_COLS || y >= MINICOM_LINES) - fprintf(stderr, "OOPS: (x, y) == (%d, %d)\n", -- COLS, LINES); -+ MINICOM_COLS, MINICOM_LINES); - # endif - return; - } -@@ -345,7 +345,7 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) - * last line, last character. After scrolling, this "invisible" - * character is automatically restored. - */ -- if (_has_am && y >= LINES - 1 && x >= COLS - 1) { -+ if (_has_am && y >= MINICOM_LINES - 1 && x >= MINICOM_COLS - 1) { - doit = 0; - sflag = 1; - oldc.value = c; -@@ -353,9 +353,9 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) - oldc.color = color; - } - #ifdef ST_LINE -- if (x < COLS && y <= LINES) -+ if (x < MINICOM_COLS && y <= MINICOM_LINES) - #else -- if (x < COLS && y < LINES) -+ if (x < MINICOM_COLS && y < MINICOM_LINES) - #endif - { - if (doit != 0) { -@@ -380,7 +380,7 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) - curx++; - } - if (doit >= 0) { -- e = &gmap[x + y * COLS]; -+ e = &gmap[x + y * MINICOM_COLS]; - e->value = c; - e->attr = attr; - e->color = color; -@@ -428,7 +428,7 @@ void mc_wresize(WIN *win, int lines, int cols) - for (x = 0; x < cols; x++) { - n = &newmap[y + x * cols]; - if (x < win->xs && y < win->ys) { -- e = &oldmap[y + x * COLS]; -+ e = &oldmap[y + x * MINICOM_COLS]; - n->value = e->value; - n->color = e->color; - n->attr = e->attr; -@@ -446,8 +446,8 @@ void mc_wresize(WIN *win, int lines, int cols) - free(oldmap); - if (win == stdwin) { - gmap = newmap; -- LINES = lines; -- COLS = cols; -+ MINICOM_LINES = lines; -+ MINICOM_COLS = cols; - } else - win->map = newmap; - } -@@ -485,10 +485,10 @@ WIN *mc_wopen(int x1, int y1, int x2, int y2, int border, int attr, - if (y1 < offs) - y1 = offs; - #if 0 -- if (x2 >= COLS - offs) -- x2 = COLS - offs - 1; -- if (y2 >= LINES - offs) -- y2 = LINES - offs - 1; -+ if (x2 >= MINICOM_COLS - offs) -+ x2 = MINICOM_COLS - offs - 1; -+ if (y2 >= MINICOM_LINES - offs) -+ y2 = MINICOM_LINES - offs - 1; - #endif - - w->xs = x2 - x1 + 1; -@@ -531,7 +531,7 @@ WIN *mc_wopen(int x1, int y1, int x2, int y2, int border, int attr, - bytes = (x2 - x1 + 1) * sizeof(ELM); - /* Loop */ - for (y = y1; y <= y2; y++) { -- memcpy(e, gmap + COLS * y + x1, bytes); -+ memcpy(e, gmap + MINICOM_COLS * y + x1, bytes); - e += (x2 - x1 + 1); - } - -@@ -649,7 +649,7 @@ void mc_wleave(void) - ocursor = _curstype; - - setcbreak(0); /* Normal */ -- _gotoxy(0, LINES - 1); -+ _gotoxy(0, MINICOM_LINES - 1); - _setattr(XA_NORMAL, COLATTR(WHITE, BLACK)); - _cursor(CNORMAL); - if (CL != NULL) -@@ -688,8 +688,8 @@ void mc_wreturn(void) - _cursor(ocursor); - - e = gmap; -- for (y = 0; y value, -1, x, y, e->attr, e->color); - e++; - } -@@ -750,7 +750,7 @@ static int _wclreol(WIN *w) - - y = w->cury + w->y1; - -- if (w->direct && (w->x2 == COLS - 1) && CE) { -+ if (w->direct && (w->x2 == MINICOM_COLS - 1) && CE) { - _gotoxy(w->curx + w->x1, y); - _setattr(w->attr, w->color); - outstr(CE); -@@ -779,12 +779,12 @@ void mc_wscroll(WIN *win, int dir) - * This improves performance on slow screens (eg ATARI ST) dramatically. - */ - if (win->direct && SF != NULL && -- (dir == S_UP || SR != NULL) && (LINES == win->sy2 - win->sy1 + 1)) { -+ (dir == S_UP || SR != NULL) && (MINICOM_LINES == win->sy2 - win->sy1 + 1)) { - doit = 0; - phys_scr = 1; - _setattr(win->attr, win->color); - if (dir == S_UP) { -- _gotoxy(0, LINES - 1); -+ _gotoxy(0, MINICOM_LINES - 1); - outstr(SF); - } else { - _gotoxy(0, 0); -@@ -795,7 +795,7 @@ void mc_wscroll(WIN *win, int dir) - * If the window is as wide as the physical screen, we can - * scroll it with insert/delete line (or set scroll region - vt100!) - */ -- else if (win->direct && win->xs == COLS && -+ else if (win->direct && win->xs == MINICOM_COLS && - ((CS != NULL && SF != NULL && SR != NULL) - || (Dl != NULL && Al != NULL))) { - doit = 0; -@@ -806,7 +806,7 @@ void mc_wscroll(WIN *win, int dir) - * big as the physical screen, we don't _have_ to - * initialize it. - */ -- if (win->sy2 == LINES - 1 && win->sy1 == 0) -+ if (win->sy2 == MINICOM_LINES - 1 && win->sy1 == 0) - fs = 1; - if (!fs) { - outstr(tgoto(CS, win->sy2, win->sy1)); -@@ -820,7 +820,7 @@ void mc_wscroll(WIN *win, int dir) - outstr(SR); - } - if (!fs) { -- outstr(tgoto(CS, LINES - 1, 0)); -+ outstr(tgoto(CS, MINICOM_LINES - 1, 0)); - cury = 0; - } - _gotoxy(0, win->sy2); -@@ -843,9 +843,9 @@ void mc_wscroll(WIN *win, int dir) - * to the lower right. After scrolling we have to restore - * the non-visible character that is now visible. - */ -- if (sflag && win->sy2 == (LINES - 1) && win->sy1 != win->sy2) { -+ if (sflag && win->sy2 == (MINICOM_LINES - 1) && win->sy1 != win->sy2) { - if (dir == S_UP) { -- _write(oldc.value, 1, COLS - 1, LINES - 2, -+ _write(oldc.value, 1, MINICOM_COLS - 1, MINICOM_LINES - 2, - oldc.attr, oldc.color); - } - sflag = 0; -@@ -858,7 +858,7 @@ void mc_wscroll(WIN *win, int dir) - win->sy2 == win->y2 && win->sy1 == win->y1) { - - /* Calculate screen buffer */ -- e = gmap + win->y1 * COLS + win->x1; -+ e = gmap + win->y1 * MINICOM_COLS + win->x1; - - /* Calculate history buffer */ - f = win->histbuf + (win->xs * win->histline); -@@ -903,7 +903,7 @@ void mc_wscroll(WIN *win, int dir) - /* Now scroll the memory image. */ - if (dir == S_UP) { - for (y = win->sy1 + 1; y <= win->sy2; y++) { -- e = gmap + y * COLS + win->x1; -+ e = gmap + y * MINICOM_COLS + win->x1; - for (x = win->x1; x <= win->x2; x++) { - _write(e->value, win->direct && doit, x, y - 1, e->attr, e->color); - e++; -@@ -915,7 +915,7 @@ void mc_wscroll(WIN *win, int dir) - _wclreol(win); - } else { - for (y = win->sy2 - 1; y >= win->sy1; y--) { -- e = gmap + y * COLS + win->x1; -+ e = gmap + y * MINICOM_COLS + win->x1; - for (x = win->x1; x <= win->x2; x++) { - _write(e->value, win->direct && doit, x, y + 1, e->attr, e->color); - e++; -@@ -1195,7 +1195,7 @@ void mc_wcurbar(WIN *w, int y, int attr) - - y += w->y1; - -- e = gmap + y * COLS + w->x1; -+ e = gmap + y * MINICOM_COLS + w->x1; - - /* If we can't do reverse, just put a '>' in front of - * the line. We only support XA_NORMAL & XA_REVERSE. -@@ -1447,7 +1447,7 @@ void mc_winclr(WIN *w) - /* contains them for cosmetic purposes or as separators. */ - for (m = w->y2; m >= w->y1; m--) { - /* Start of this line in the global map. */ -- e = gmap + m * COLS + w->x1; -+ e = gmap + m * MINICOM_COLS + w->x1; - - /* Quick check to see if line is empty. */ - for (i = 0; i < w->xs; i++) -@@ -1461,7 +1461,7 @@ void mc_winclr(WIN *w) - /* Copy window into history buffer line-by-line. */ - for (y = w->y1; y <= m; y++) { - /* Start of this line in the global map. */ -- e = gmap + y * COLS + w->x1; -+ e = gmap + y * MINICOM_COLS + w->x1; - - /* Now copy this line. */ - f = w->histbuf + (w->xs * w->histline); /* History buffer */ -@@ -1475,7 +1475,7 @@ void mc_winclr(WIN *w) - _setattr(w->attr, w->color); - w->curx = 0; - -- if (CL && w->y1 == 0 && w->y2 == LINES-1 && w->x1 == 0 && w->x2 == COLS-1) { -+ if (CL && w->y1 == 0 && w->y2 == MINICOM_LINES-1 && w->x1 == 0 && w->x2 == MINICOM_COLS-1) { - w->direct = 0; - curx = 0; - cury = 0; -@@ -1567,7 +1567,7 @@ void mc_winschar2(WIN *w, wchar_t c, int move) - } - - odir = w->direct; -- if (w->xs == COLS && IC != NULL) { -+ if (w->xs == MINICOM_COLS && IC != NULL) { - /* We can use the insert character capability. */ - if (w->direct) - outstr(IC); -@@ -1589,7 +1589,7 @@ void mc_winschar2(WIN *w, wchar_t c, int move) - buf = malloc(sizeof(ELM) * len); - if (!buf) - return; /* Umm... */ -- memcpy(buf, gmap + COLS * y + x, sizeof(ELM) * len); -+ memcpy(buf, gmap + MINICOM_COLS * y + x, sizeof(ELM) * len); - - /* Now, put the new character on screen. */ - mc_wputc(w, c); -@@ -1625,14 +1625,14 @@ void mc_wdelchar(WIN *w) - x = w->x1 + w->curx; - y = w->y1 + w->cury; - -- if (w->direct && w->xs == COLS && DC != NULL) { -+ if (w->direct && w->xs == MINICOM_COLS && DC != NULL) { - /*_gotoxy(x - 1, y);*/ - _gotoxy(x, y); - outstr(DC); - doit = 0; - } - -- e = gmap + y * COLS + x + 1; -+ e = gmap + y * MINICOM_COLS + x + 1; - - for (; x < w->x2; x++) { - _write(e->value, doit && w->direct, x, y, e->attr, e->color); -@@ -1906,16 +1906,16 @@ int win_init(int fg, int bg, int attr) - fprintf(stderr, _("No cursor motion capability (cm)\n")); - return -1; - } -- LINES = COLS = 0; -- getrowcols(&LINES, &COLS); -+ MINICOM_LINES = MINICOM_COLS = 0; -+ getrowcols(&MINICOM_LINES, &MINICOM_COLS); - #ifdef BBS -- LINES = lines; -+ MINICOM_LINES = lines; - #endif -- if (LINES == 0 && (LINES = tgetnum("li")) <= 0) { -+ if (MINICOM_LINES == 0 && (MINICOM_LINES = tgetnum("li")) <= 0) { - fprintf(stderr, _("Number of terminal lines unknown\n")); - return -1; - } -- if (COLS == 0 && (COLS = tgetnum("co")) <= 0) { -+ if (MINICOM_COLS == 0 && (MINICOM_COLS = tgetnum("co")) <= 0) { - fprintf(stderr, _("Number of terminal columns unknown\n")); - return -1; - } -@@ -2053,7 +2053,7 @@ int win_init(int fg, int bg, int attr) - - - /* Memory for global map */ -- if ((gmap = malloc(sizeof(ELM) * (LINES + 1) * COLS)) == NULL) { -+ if ((gmap = malloc(sizeof(ELM) * (MINICOM_LINES + 1) * MINICOM_COLS)) == NULL) { - fprintf(stderr, _("Not enough memory\n")); - return -1; - }; -@@ -2068,10 +2068,10 @@ int win_init(int fg, int bg, int attr) - stdwin->doscroll = 1; - stdwin->x1 = 0; - stdwin->sy1 = stdwin->y1 = 0; -- stdwin->x2 = COLS - 1; -- stdwin->sy2 = stdwin->y2 = LINES - 1; -- stdwin->xs = COLS; -- stdwin->ys = LINES; -+ stdwin->x2 = MINICOM_COLS - 1; -+ stdwin->sy2 = stdwin->y2 = MINICOM_LINES - 1; -+ stdwin->xs = MINICOM_COLS; -+ stdwin->ys = MINICOM_LINES; - stdwin->attr = attr; - stdwin->color = COLATTR(fg, bg); - stdwin->direct = 1; -diff --git a/src/window.h b/src/window.h -index 1b8eb12..97f3bdd 100644 ---- a/src/window.h -+++ b/src/window.h -@@ -62,7 +62,7 @@ typedef struct _win { - * Stdwin is the whole screen - */ - extern WIN *stdwin; /* Whole screen */ --extern int LINES, COLS; /* Size of screen */ -+extern int MINICOM_LINES, MINICOM_COLS; /* Size of screen */ - extern int usecolor; /* Use ansi color escape sequences */ - extern int useattr; /* Use attributes (reverse, bold etc. ) */ - extern int dirflush; /* Direct flush after write */ --- -2.25.0 - diff --git a/buildroot/package/minicom/minicom.hash b/buildroot/package/minicom/minicom.hash index 7622ec004..dafc9da4f 100644 --- a/buildroot/package/minicom/minicom.hash +++ b/buildroot/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2b69b874b93f7bb68ad84e09d4d4c7a79160fcdd0117e8c0c1465fe71e64f28 minicom-52b626b15a883b0300682a03aa8e048e317f1e56.tar.gz +sha256 66af38ae98cdf965b9a591013df4256773f18338613ec22bbb83440968289a8a minicom-23292150e07ec264827fb6cf237ddb0ac9fc043b.tar.gz sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/buildroot/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk index 77bc6f533..bdbeb5377 100644 --- a/buildroot/package/minicom/minicom.mk +++ b/buildroot/package/minicom/minicom.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINICOM_VERSION = 52b626b15a883b0300682a03aa8e048e317f1e56 +MINICOM_VERSION = 23292150e07ec264827fb6cf237ddb0ac9fc043b MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git MINICOM_SITE_METHOD = git MINICOM_LICENSE = GPL-2.0+ diff --git a/buildroot/package/minissdpd/minissdpd.hash b/buildroot/package/minissdpd/minissdpd.hash index 695f652b3..385a5a0c2 100644 --- a/buildroot/package/minissdpd/minissdpd.hash +++ b/buildroot/package/minissdpd/minissdpd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 07feea19dfa7d79d144e0f4a19a859a21cdb58445b77dc2d6222f2434e0ac92c minissdpd-1.5.20190824.tar.gz -sha256 00c8368dd1574b025df65f24f61c32d1297ff9b6dc695fda964b1b1efc7a53d3 LICENSE +sha256 177ab1907cc0fd20c8cafd13ca8674c7ec1828aa6101da9bb066408ccada7350 minissdpd-1.5.20200928.tar.gz +sha256 00c8368dd1574b025df65f24f61c32d1297ff9b6dc695fda964b1b1efc7a53d3 LICENSE diff --git a/buildroot/package/minissdpd/minissdpd.mk b/buildroot/package/minissdpd/minissdpd.mk index 55973752c..4560919ba 100644 --- a/buildroot/package/minissdpd/minissdpd.mk +++ b/buildroot/package/minissdpd/minissdpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINISSDPD_VERSION = 1.5.20190824 +MINISSDPD_VERSION = 1.5.20200928 MINISSDPD_SITE = http://miniupnp.free.fr/files MINISSDPD_LICENSE = BSD-3-Clause MINISSDPD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch b/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch new file mode 100644 index 000000000..586609963 --- /dev/null +++ b/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch @@ -0,0 +1,30 @@ +From 69afd09aee3727f2804e1b063ef50800b22c6bb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= +Date: Wed, 1 Jul 2020 11:18:08 +0200 +Subject: [PATCH] Use pkg-config to find ZSTD + +[Retrieved from: https://github.com/nmoinvaz/minizip/pull/509] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6deb4ce..987e7947 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,13 @@ endif() + # Check if zstd installation is present + if(MZ_ZSTD) + if(NOT ZSTD_FORCE_FETCH) +- find_package(ZSTD QUIET) ++ find_package(PkgConfig) ++ if(PKGCONFIG_FOUND) ++ pkg_check_modules(ZSTD libzstd) ++ endif() ++ if(NOT ZSTD_FOUND) ++ find_package(ZSTD QUIET) ++ endif() + endif() + if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH) + message(STATUS "Using ZSTD") diff --git a/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch b/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..f9d28a3c7 --- /dev/null +++ b/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From d38254c2cfdfa2baceef9e4fa553b74ed2e0247e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Jul 2020 14:36:11 +0200 +Subject: [PATCH] mz.h: fix build with gcc 4.8 + +gcc 4.8 does not support __has_include directive as a result the build +will fail on: + +/home/naourr/work/instance-1/output-1/build/minizip-2.10.0/mz.h:162:44: error: missing binary operator before token "(" + (defined(__has_include) && __has_include()) + ^ + +Fix it by appling: +https://gcc.gnu.org/onlinedocs/gcc-10.1.0/cpp/_005f_005fhas_005finclude.html + +Fix #510 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nmoinvaz/minizip/pull/515] +--- + mz.h | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/mz.h b/mz.h +index 4d3732b..83662e0 100644 +--- a/mz.h ++++ b/mz.h +@@ -158,9 +158,12 @@ + #include /* memset, strncpy, strlen */ + #include + +-#if defined(HAVE_STDINT_H) || \ +- (defined(__has_include) && __has_include()) ++#if defined(HAVE_STDINT_H) + # include ++#elif defined(__has_include) ++# if __has_include() ++# include ++# endif + #endif + + #ifndef __INT8_TYPE__ +@@ -188,9 +191,12 @@ typedef unsigned int uint32_t; + typedef unsigned long long uint64_t; + #endif + +-#if defined(HAVE_INTTYPES_H) || \ +- (defined(__has_include) && __has_include()) ++#if defined(HAVE_INTTYPES_H) + # include ++#elif defined(__has_include) ++# if __has_include() ++# include ++# endif + #endif + + #ifndef PRId8 +-- +2.27.0 + diff --git a/buildroot/package/minizip/minizip.hash b/buildroot/package/minizip/minizip.hash index e27eb03d9..74799b9d5 100644 --- a/buildroot/package/minizip/minizip.hash +++ b/buildroot/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 90481093302ccda81b2d129fea1800ea53be3f826ab0ec6176ad6807869ec4d9 minizip-2.9.1.tar.gz -sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE +sha256 4c7f236268fef57ce5dcbd9645235a22890d62480a592e1b0515ecff93f9989b minizip-2.10.0.tar.gz +sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/buildroot/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk index 40e6bcf9a..3fafab5f9 100644 --- a/buildroot/package/minizip/minizip.mk +++ b/buildroot/package/minizip/minizip.mk @@ -4,11 +4,10 @@ # ################################################################################ -MINIZIP_VERSION = 2.9.1 +MINIZIP_VERSION = 2.10.0 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) MINIZIP_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_LIBBSD),libbsd) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ @@ -24,6 +23,13 @@ else MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF endif +ifeq ($(BR2_PACKAGE_LIBBSD),y) +MINIZIP_DEPENDENCIES += libbsd +MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON +else +MINIZIP_CONF_OPTS += -DMZ_LIBBSD=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MINIZIP_DEPENDENCIES += openssl MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON @@ -38,4 +44,11 @@ else MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +MINIZIP_DEPENDENCIES += zstd +MINIZIP_CONF_OPTS += -DMZ_ZSTD=ON +else +MINIZIP_CONF_OPTS += -DMZ_ZSTD=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/mjpg-streamer/mjpg-streamer.hash b/buildroot/package/mjpg-streamer/mjpg-streamer.hash index 0a08151a4..63dcdb9fb 100644 --- a/buildroot/package/mjpg-streamer/mjpg-streamer.hash +++ b/buildroot/package/mjpg-streamer/mjpg-streamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bd934363b5cb6ef3665aa2dfa15d08b72bbfe84ca60f7c342fe8ae1f94e19201 mjpg-streamer-501f6362c5afddcfb41055f97ae484252c85c912.tar.gz +sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/buildroot/package/mjpg-streamer/mjpg-streamer.mk b/buildroot/package/mjpg-streamer/mjpg-streamer.mk index d5980dbf1..46f3f5010 100644 --- a/buildroot/package/mjpg-streamer/mjpg-streamer.mk +++ b/buildroot/package/mjpg-streamer/mjpg-streamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MJPG_STREAMER_VERSION = 501f6362c5afddcfb41055f97ae484252c85c912 +MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION)) MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental MJPG_STREAMER_LICENSE = GPL-2.0+ @@ -23,7 +23,10 @@ MJPG_STREAMER_DEPENDENCIES += libv4l endif ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_VIDEOIO),yyy) -MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=ON +MJPG_STREAMER_CONF_OPTS += \ + -DPLUGIN_INPUT_OPENCV=ON \ + -DPLUGIN_CVFILTER_CPP=OFF \ + -DPLUGIN_CVFILTER_PY=OFF MJPG_STREAMER_DEPENDENCIES += host-pkgconf opencv3 else MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF diff --git a/buildroot/package/mksh/mksh.hash b/buildroot/package/mksh/mksh.hash index 4e71a4263..7fc34fa3e 100644 --- a/buildroot/package/mksh/mksh.hash +++ b/buildroot/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -sha256 3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75 mksh-R57.tgz +sha256 907ed1a9586e7f18bdefdd4a763aaa8397b755e15034aa54f4d753bfb272e0e6 mksh-R59b.tgz # Locally computed -sha256 4655d87a53a703ead36a52f166f065c23cf58dd02d7b14abd2474f9f49383a16 mksh.1 +sha256 fb1e64c95ded58058c7f0cf5269236bc83c3cbda089cbb025b03e08f189bf47e mksh.1 diff --git a/buildroot/package/mksh/mksh.mk b/buildroot/package/mksh/mksh.mk index 2aa8f70ff..05ddc3f4c 100644 --- a/buildroot/package/mksh/mksh.mk +++ b/buildroot/package/mksh/mksh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MKSH_VERSION = 57 +MKSH_VERSION = 59b MKSH_SOURCE = mksh-R$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt diff --git a/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch b/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch deleted file mode 100644 index 326423679..000000000 --- a/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a83f1fd053aadd2e849df80f67b69ba7298341f3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 25 Dec 2019 20:37:57 +0100 -Subject: [PATCH] dynload/dynload_unix.c: don't use RTLD_DI_LINKMAP with uclibc - -RTLD_DI_LINKMAP is not defined on uclibc so check that __UCLIBC__ is not -defined before using it otherwise build fails on: - -dynload_unix.c:93:19: error: 'RTLD_DI_LINKMAP' undeclared (first use in this function); did you mean 'RTLD_BINDING_MASK'? - if(dlinfo(pLib, RTLD_DI_LINKMAP, &p) == 0) { - ^~~~~~~~~~~~~~~ - RTLD_BINDING_MASK - -Fixes: - - http://autobuild.buildroot.org/results/b88e55dde1acab967023ae49bb1722eadb9cc6ab - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MoarVM/dyncall/pull/6] ---- - dynload/dynload_unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/3rdparty/dyncall/dynload/dynload_unix.c b/3rdparty/dyncall/dynload/dynload_unix.c -index adfd351..129a1e5 100644 ---- a/3rdparty/dyncall/dynload/dynload_unix.c -+++ b/3rdparty/dyncall/dynload/dynload_unix.c -@@ -82,7 +82,7 @@ void dlFreeLibrary(DLLib* pLib) - /* that: check for RTLD_DI_LINKMAP (#define for dlinfo()), or if GNU C Lib */ - /* is used (where RTLD_DI_LINKMAP is an enum), or by OS (dlinfo comes from */ - /* Solaris), etc. */ --#if defined(RTLD_DI_LINKMAP) || defined(OS_SunOS) || defined(__GLIBC__) /* @@@ dlinfo() was introduced in glibc 2.3.3 (in 2003), somehow check for that, also */ -+#if defined(RTLD_DI_LINKMAP) || defined(OS_SunOS) || (defined(__GLIBC__) && !defined(__UCLIBC__)) /* @@@ dlinfo() was introduced in glibc 2.3.3 (in 2003), somehow check for that, also */ - - #include - --- -2.24.0 - diff --git a/buildroot/package/moarvm/moarvm.hash b/buildroot/package/moarvm/moarvm.hash index 908885f68..36f0a81f3 100644 --- a/buildroot/package/moarvm/moarvm.hash +++ b/buildroot/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dcb61e44a098e8375c385eb9d52bd6394255a388697b2f6a52d88e6cf4a53587 MoarVM-2020.01.1.tar.gz -sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt +sha256 637883083f16c4398ffd3685ea6411daa605dd0862e1f59cce632bb2b994f2c4 MoarVM-2020.10.tar.gz +sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/buildroot/package/moarvm/moarvm.mk b/buildroot/package/moarvm/moarvm.mk index e554ddb6d..9fe5f4c07 100644 --- a/buildroot/package/moarvm/moarvm.mk +++ b/buildroot/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2020.01.1 +MOARVM_VERSION = 2020.10 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/buildroot/package/modem-manager/Config.in b/buildroot/package/modem-manager/Config.in index c4c723776..062826fd0 100644 --- a/buildroot/package/modem-manager/Config.in +++ b/buildroot/package/modem-manager/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MODEM_MANAGER select BR2_PACKAGE_DBUS # runtime dependency select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_LIBXSLT help ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections. diff --git a/buildroot/package/modem-manager/modem-manager.hash b/buildroot/package/modem-manager/modem-manager.hash index f9d790cd0..30c4c6988 100644 --- a/buildroot/package/modem-manager/modem-manager.hash +++ b/buildroot/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c ModemManager-1.12.6.tar.xz +sha256 783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd ModemManager-1.14.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/modem-manager/modem-manager.mk b/buildroot/package/modem-manager/modem-manager.mk index 75fc5811d..53cd0aff9 100644 --- a/buildroot/package/modem-manager/modem-manager.mk +++ b/buildroot/package/modem-manager/modem-manager.mk @@ -4,12 +4,12 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.12.6 +MODEM_MANAGER_VERSION = 1.14.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 libxslt $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings diff --git a/buildroot/package/mongodb/Config.in b/buildroot/package/mongodb/Config.in index 9c5dba834..493c59241 100644 --- a/buildroot/package/mongodb/Config.in +++ b/buildroot/package/mongodb/Config.in @@ -8,12 +8,11 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS config BR2_PACKAGE_MONGODB bool "mongodb" depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_IOSTREAMS @@ -35,9 +34,8 @@ config BR2_PACKAGE_MONGODB https://www.mongodb.org/ -comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6" +comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/mongodb/mongodb.hash b/buildroot/package/mongodb/mongodb.hash index ba2181a1f..ab13d7765 100644 --- a/buildroot/package/mongodb/mongodb.hash +++ b/buildroot/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 fadfb81400a1b5d86d01943690064404856aaf1b050f4b56eb74811cadffdcef mongodb-r4.0.19.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt -sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt +sha256 f44a846514f8db8be2a662210ad7fefc059d8e17ab2c59aceeae8b0b173d8286 mongodb-src-r4.2.10.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt +sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk index 31ea972b8..6a1caf4fc 100644 --- a/buildroot/package/mongodb/mongodb.mk +++ b/buildroot/package/mongodb/mongodb.mk @@ -4,18 +4,20 @@ # ################################################################################ -MONGODB_VERSION_BASE = 4.0.19 -MONGODB_VERSION = r$(MONGODB_VERSION_BASE) -MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) +MONGODB_VERSION = 4.2.10 +MONGODB_SITE = https://fastdl.mongodb.org/src +MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database) MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt MONGODB_DEPENDENCIES = \ boost \ - host-python-cheetah \ - host-python-pyyaml \ - host-python-typing \ + host-python3-cheetah \ + host-python3-psutil \ + host-python3-pyyaml \ + host-python3-regex \ + host-python3-requests \ host-scons \ pcre \ snappy \ @@ -29,6 +31,7 @@ MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ -j"$(PARALLEL_JOBS)" MONGODB_SCONS_OPTS = \ + --disable-minimum-compiler-version-enforcement \ --disable-warnings-as-errors \ --use-system-boost \ --use-system-pcre \ @@ -38,7 +41,7 @@ MONGODB_SCONS_OPTS = \ --use-system-zlib # need to pass mongo version when not building from git repo -MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION_BASE)- +MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION)- # WiredTiger database storage engine only supported on 64 bits ifeq ($(BR2_ARCH_IS_64),y) @@ -60,21 +63,27 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL),y) MONGODB_DEPENDENCIES += libcurl -MONGODB_SCONS_OPTS += --enable-free-mon=on +MONGODB_SCONS_OPTS += \ + --enable-free-mon=on \ + --enable-http-client=on else -MONGODB_SCONS_OPTS += --enable-free-mon=off +MONGODB_SCONS_OPTS += \ + --enable-free-mon=off \ + --enable-http-client=off endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGODB_DEPENDENCIES += openssl MONGODB_SCONS_OPTS += \ - --ssl \ + --ssl=on \ --ssl-provider=openssl +else +MONGODB_SCONS_OPTS += --ssl=off endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -82,7 +91,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/buildroot/package/mongoose/mongoose.hash b/buildroot/package/mongoose/mongoose.hash index c5de11bec..b8be69be0 100644 --- a/buildroot/package/mongoose/mongoose.hash +++ b/buildroot/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5bff3cc70bb2248cf87d06a3543f120f3b29b9368d25a7715443cb10612987cc mongoose-6.17.tar.gz +sha256 f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 mongoose-6.18.tar.gz sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE diff --git a/buildroot/package/mongoose/mongoose.mk b/buildroot/package/mongoose/mongoose.mk index 7944f5e53..87f56d789 100644 --- a/buildroot/package/mongoose/mongoose.mk +++ b/buildroot/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 6.17 +MONGOOSE_VERSION = 6.18 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/mongrel2/0002-Do-not-run-tests.patch b/buildroot/package/mongrel2/0001-Do-not-run-tests.patch similarity index 100% rename from buildroot/package/mongrel2/0002-Do-not-run-tests.patch rename to buildroot/package/mongrel2/0001-Do-not-run-tests.patch diff --git a/buildroot/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch b/buildroot/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch similarity index 57% rename from buildroot/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch rename to buildroot/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch index 730d8ebfc..1961f128e 100644 --- a/buildroot/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch +++ b/buildroot/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch @@ -1,7 +1,7 @@ From 298356c44a7df2b34c4e307c531d2010e2cb4b79 Mon Sep 17 00:00:00 2001 From: Lionel Orry Date: Wed, 27 Mar 2013 15:56:56 +0100 -Subject: [PATCH 1/1] Fix Makefiles for cross-compilation +Subject: [PATCH] Fix Makefiles for cross-compilation The CFLAGS handling in mongrel2 is really messy and it is hard to make it behave correctly with cross-compiling environments. This patch @@ -10,6 +10,8 @@ restricts the Makefiles syntax to GNU Make, but help cross-compiling. This is not meant to be applied upstream. Signed-off-by: Lionel Orry +[Fabrice: refresh for 1.12.2] +Signed-off-by: Fabrice Fontaine --- Makefile | 2 +- tools/config_modules/Makefile | 2 +- @@ -19,57 +21,58 @@ Signed-off-by: Lionel Orry 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index 6dce4a6..d48e05e 100644 +index 4e89c33..2f549a8 100644 --- a/Makefile +++ b/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 -+override CFLAGS += -g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS) +@@ -1,5 +1,5 @@ + CFLAGS?=-g -O2 +-CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread ++override CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread + CFLAGS += ${OPTFLAGS} + LIBS+=-lzmq -ldl -lsqlite3 -lmbedtls -lmbedx509 -lmbedcrypto PREFIX?=/usr/local - diff --git a/tools/config_modules/Makefile b/tools/config_modules/Makefile -index 398490c..53f2255 100644 +index c2680d1..ada3169 100644 --- a/tools/config_modules/Makefile +++ b/tools/config_modules/Makefile @@ -1,5 +1,5 @@ PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build -+override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build +-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build ++override CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build LDFLAGS=$(OPTLIBS) MONGO_SRC = mongo-c-driver/src/bson.c \ diff --git a/tools/filters/Makefile b/tools/filters/Makefile -index f9f4556..6077b79 100644 +index 6505ad5..a968ef6 100644 --- a/tools/filters/Makefile +++ b/tools/filters/Makefile @@ -1,5 +1,5 @@ PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build -+ override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build +-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build ++override CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build LDFLAGS=$(OPTLIBS) - all: null.so + all: null.so rewrite.so sendfile.so diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index b50d8a0..ba378c5 100644 +index b50d8a0..cc00062 100644 --- a/tools/m2sh/Makefile +++ b/tools/m2sh/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) -+override CFLAGS += -DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) ++override CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS) PREFIX?=/usr/local diff --git a/tools/procer/Makefile b/tools/procer/Makefile -index d0d7de0..629b2e9 100644 +index bb9aa31..d377f7f 100644 --- a/tools/procer/Makefile +++ b/tools/procer/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) -+override CFLAGS += -DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) ++override CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) PREFIX?=/usr/local LIBS?=-lzmq SOURCES=$(wildcard *.c) -- -1.8.1.4 +2.27.0 diff --git a/buildroot/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch b/buildroot/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch new file mode 100644 index 000000000..e1b578849 --- /dev/null +++ b/buildroot/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch @@ -0,0 +1,25 @@ +From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001 +From: Andrew Sun +Date: Sat, 18 Jul 2020 09:11:11 -0400 +Subject: [PATCH] fix multiple definition error when building with gcc10 + +[Retrieved from: +https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc] +Signed-off-by: Fabrice Fontaine +--- + src/unixy.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unixy.h b/src/unixy.h +index 045e7c28..4225220c 100644 +--- a/src/unixy.h ++++ b/src/unixy.h +@@ -38,7 +38,7 @@ + #include + #include + +-char *m2program; ++extern char *m2program; + + int Unixy_chroot(bstring path); + diff --git a/buildroot/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/buildroot/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch deleted file mode 100644 index 83698164f..000000000 --- a/buildroot/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8d0bc79f38913b1a55e7d151b32bbc9462c24b47 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Fri, 14 Aug 2015 19:03:09 -0700 -Subject: [PATCH] Rename symbol to prevent conflict - -One of the standard headers defines max_align_t on some versions of linux. - -[Backported from upstream commit -https://github.com/mongrel2/mongrel2/commit/563bac8c59b9b32205164d237cf1ec0cb48d189f.] - -Signed-off-by: Rodrigo Rebello ---- - src/mem/align.h | 2 +- - src/mem/halloc.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mem/align.h b/src/mem/align.h -index 4c6e183..03a4999 100644 ---- a/src/mem/align.h -+++ b/src/mem/align.h -@@ -30,7 +30,7 @@ union max_align - void (*q)(void); - }; - --typedef union max_align max_align_t; -+typedef union max_align h_max_align_t; - - #endif - -diff --git a/src/mem/halloc.c b/src/mem/halloc.c -index b097d1f..40d0c09 100644 ---- a/src/mem/halloc.c -+++ b/src/mem/halloc.c -@@ -34,7 +34,7 @@ typedef struct hblock - #endif - hlist_item_t siblings; /* 2 pointers */ - hlist_head_t children; /* 1 pointer */ -- max_align_t data[1]; /* not allocated, see below */ -+ h_max_align_t data[1]; /* not allocated, see below */ - - } hblock_t; - --- -2.1.4 - diff --git a/buildroot/package/mongrel2/0004-Support-urandom-inside-chroot.patch b/buildroot/package/mongrel2/0004-Support-urandom-inside-chroot.patch new file mode 100644 index 000000000..468ddb83f --- /dev/null +++ b/buildroot/package/mongrel2/0004-Support-urandom-inside-chroot.patch @@ -0,0 +1,113 @@ +From 330e8c8352eb0ed3c178ac6e0102403c0a835492 Mon Sep 17 00:00:00 2001 +From: Jason Miller +Date: Thu, 5 Jul 2018 20:53:51 -0700 +Subject: [PATCH] Support urandom inside chroot + +This adds a new default entropy function that uses a /dev/urandom stream +opened before the chroot. If initializing that fails, it fallsback on +HAVEGE only if HAVEGE is supported by the mbedTLS. + +This should remove the hard requirement on HAVEGE + +resolves #326 +resolves #327 + +[Upstream status: https://github.com/mongrel2/mongrel2/pull/328] +Signed-off-by: Fabrice Fontaine +--- + src/mongrel2.c | 7 ------- + src/server.c | 36 +++++++++++++++++++++++------------- + 2 files changed, 23 insertions(+), 20 deletions(-) + +diff --git a/src/mongrel2.c b/src/mongrel2.c +index da632d95..48ece8a5 100644 +--- a/src/mongrel2.c ++++ b/src/mongrel2.c +@@ -404,13 +404,6 @@ void taskmain(int argc, char **argv) + rc = attempt_chroot_drop(srv); + check(rc == 0, "Major failure in chroot/droppriv, aborting."); + +- // set up rng after chroot +- // TODO: once mbedtls is updated, we can move this back into Server_create +- if(srv->use_ssl) { +- rc = Server_init_rng(srv); +- check(rc == 0, "Failed to initialize rng for server %s", bdata(srv->uuid)); +- } +- + final_setup(); + + taskcreate(tickertask, NULL, TICKER_TASK_STACK); +diff --git a/src/server.c b/src/server.c +index 45761db4..e44e199b 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -149,35 +149,45 @@ static int Server_load_ciphers(Server *srv, bstring ssl_ciphers_val) + return -1; + } + ++static int urandom_entropy_func(void *data, unsigned char *output, size_t len) ++{ ++ FILE* urandom = (FILE *)data; ++ size_t rc = fread(output, 1, len, urandom); ++ ++ if (rc != len) return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; ++ ++ return 0; ++} ++ + int Server_init_rng(Server *srv) + { + int rc; +- unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; + void *ctx = NULL; + +- mbedtls_entropy_init( &srv->entropy ); ++ FILE *urandom = fopen("/dev/urandom","r"); + +- // test the entropy source +- rc = mbedtls_entropy_func(&srv->entropy, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); +- +- if(rc == 0) { ++ if(urandom != NULL) { + ctx = calloc(sizeof(mbedtls_ctr_drbg_context), 1); + + mbedtls_ctr_drbg_init((mbedtls_ctr_drbg_context *)ctx); + rc = mbedtls_ctr_drbg_seed((mbedtls_ctr_drbg_context *)ctx, +- mbedtls_entropy_func, &srv->entropy, NULL, 0); ++ urandom_entropy_func, urandom, NULL, 0); + check(rc == 0, "Init rng failed: ctr_drbg_init returned %d\n", rc); + + srv->rng_func = mbedtls_ctr_drbg_random; + srv->rng_ctx = ctx; + } else { +- log_warn("entropy source unavailable. falling back to havege rng"); + ++#if defined(MBEDTLS_HAVEGE_C) ++ log_warn("entropy source unavailable. falling back to havege rng"); + ctx = calloc(sizeof(mbedtls_havege_state), 1); + mbedtls_havege_init((mbedtls_havege_state *)ctx); +- + srv->rng_func = mbedtls_havege_random; + srv->rng_ctx = ctx; ++#else ++ log_err("Unable to initialize urandom entropy source, and mbedTLS compiled without HAVEGE"); ++ goto error; ++#endif + } + + return 0; +@@ -278,10 +288,10 @@ Server *Server_create(bstring uuid, bstring default_host, + + // TODO: once mbedtls supports opening urandom early and keeping it open, + // put the rng initialization back here (before chroot) +- //if(use_ssl) { +- // rc = Server_init_rng(srv); +- // check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); +- //} ++ if(use_ssl) { ++ rc = Server_init_rng(srv); ++ check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); ++ } + + if(blength(chroot) > 0) { + srv->chroot = bstrcpy(chroot); check_mem(srv->chroot); diff --git a/buildroot/package/mongrel2/Config.in b/buildroot/package/mongrel2/Config.in index a9b09b786..60fee6f96 100644 --- a/buildroot/package/mongrel2/Config.in +++ b/buildroot/package/mongrel2/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_MONGREL2 depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on !BR2_STATIC_LIBS # uses dlopen() depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS + select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZEROMQ help diff --git a/buildroot/package/mongrel2/mongrel2.hash b/buildroot/package/mongrel2/mongrel2.hash index b1db917c5..ea3a1cb42 100644 --- a/buildroot/package/mongrel2/mongrel2.hash +++ b/buildroot/package/mongrel2/mongrel2.hash @@ -1,3 +1,6 @@ +# From https://mongrel2.org +sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 + # Locally computed -sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2 +sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/buildroot/package/mongrel2/mongrel2.mk b/buildroot/package/mongrel2/mongrel2.mk index a35a87248..cbe7e3fb9 100644 --- a/buildroot/package/mongrel2/mongrel2.mk +++ b/buildroot/package/mongrel2/mongrel2.mk @@ -4,37 +4,22 @@ # ################################################################################ -MONGREL2_VERSION = 1.9.2 +MONGREL2_VERSION = 1.12.2 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. -MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION) +MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/v$(MONGREL2_VERSION) MONGREL2_LICENSE = BSD-3-Clause MONGREL2_LICENSE_FILES = LICENSE -MONGREL2_DEPENDENCIES = sqlite zeromq - -define MONGREL2_POLARSSL_DISABLE_ASM - $(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_microblaze),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -endif +MONGREL2_DEPENDENCIES = mbedtls sqlite zeromq define MONGREL2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ PREFIX=/usr all endef define MONGREL2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ PREFIX=/usr DESTDIR=$(TARGET_DIR) install endef diff --git a/buildroot/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk index 8cee0d7b0..fcd9cb7de 100644 --- a/buildroot/package/mosquitto/mosquitto.mk +++ b/buildroot/package/mosquitto/mosquitto.mk @@ -48,8 +48,8 @@ else MOSQUITTO_MAKE_OPTS += WITH_THREADING=no endif -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MOSQUITTO_DEPENDENCIES += host-pkgconf openssl MOSQUITTO_MAKE_OPTS += \ WITH_TLS=yes \ CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" @@ -115,7 +115,7 @@ define MOSQUITTO_INSTALL_INIT_SYSTEMD endef define MOSQUITTO_USERS - mosquitto -1 nogroup -1 * - - - Mosquitto user + mosquitto -1 nobody -1 * - - - Mosquitto user endef endif diff --git a/buildroot/package/motion/0001-configure.ac-remove-po-Makefile.in.patch b/buildroot/package/motion/0001-configure.ac-remove-po-Makefile.in.patch new file mode 100644 index 000000000..9b514bafc --- /dev/null +++ b/buildroot/package/motion/0001-configure.ac-remove-po-Makefile.in.patch @@ -0,0 +1,29 @@ +From 0e05d4116678de3a7d913177a8fc63f10e58ad24 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jan 2020 00:00:21 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in + +The file po/Makefile.in is automatically added to AC_OUTPUT while using +gettexize + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable] +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3876adb..221dacf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -471,7 +471,6 @@ LDFLAGS="$TEMP_LDFLAGS" + AC_CONFIG_FILES([ + Makefile + src/Makefile +- po/Makefile.in + man/Makefile + data/camera1-dist.conf + data/camera2-dist.conf +-- +2.24.1 + diff --git a/buildroot/package/motion/motion.hash b/buildroot/package/motion/motion.hash index 2b25d0a52..96ab1c433 100644 --- a/buildroot/package/motion/motion.hash +++ b/buildroot/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-4.2.2.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 motion-4.3.2.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad doc/COPYING diff --git a/buildroot/package/motion/motion.mk b/buildroot/package/motion/motion.mk index ae58c5493..29b70fd85 100644 --- a/buildroot/package/motion/motion.mk +++ b/buildroot/package/motion/motion.mk @@ -4,13 +4,14 @@ # ################################################################################ -MOTION_VERSION = 4.2.2 +MOTION_VERSION = 4.3.2 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 -MOTION_LICENSE_FILES = COPYING +MOTION_LICENSE_FILES = doc/COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES +MOTION_GETTEXTIZE = YES MOTION_CONF_OPTS += --without-optimizecpu @@ -23,20 +24,14 @@ endif ifeq ($(BR2_PACKAGE_MYSQL),y) MOTION_DEPENDENCIES += mysql -MOTION_CONF_OPTS += \ - --with-mysql \ - --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ - --with-mysql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-mysql else MOTION_CONF_OPTS += --without-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) MOTION_DEPENDENCIES += postgresql -MOTION_CONF_OPTS += \ - --with-pgsql \ - --with-pgsql-include=$(STAGING_DIR)/usr/include \ - --with-pgsql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-pgsql else MOTION_CONF_OPTS += --without-pgsql endif @@ -58,9 +53,9 @@ endif # Do not use default install target as it installs many unneeded files and # directories: docs, examples and init scripts define MOTION_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ + $(INSTALL) -D -m 0644 $(@D)/data/motion-dist.conf \ $(TARGET_DIR)/etc/motion/motion.conf - $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion + $(INSTALL) -D -m 0755 $(@D)/src/motion $(TARGET_DIR)/usr/bin/motion endef define MOTION_INSTALL_INIT_SYSV diff --git a/buildroot/package/mpd/Config.in b/buildroot/package/mpd/Config.in index e9e7b83cb..fbde82ab5 100644 --- a/buildroot/package/mpd/Config.in +++ b/buildroot/package/mpd/Config.in @@ -34,6 +34,12 @@ config BR2_PACKAGE_MPD_SQLITE Enable sqlite database support. If you don't use sqlite it will use an ASCII database. +config BR2_PACKAGE_MPD_ZZIP + bool "zzip" + select BR2_PACKAGE_ZZIPLIB + help + Enable ZIP archive support. + comment "Commercial services" config BR2_PACKAGE_MPD_QOBUZ @@ -114,6 +120,16 @@ config BR2_PACKAGE_MPD_FLAC Enable flac input/streaming support. Select this if you want to play back FLAC files. +config BR2_PACKAGE_MPD_FLUIDSYNTH + bool "fluidsynth" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_FLUIDSYNTH + help + Enable fluidsynth MIDI decoder support. + +comment "fluidsynth support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_MPD_LIBSNDFILE bool "libsndfile" select BR2_PACKAGE_LIBSNDFILE @@ -130,6 +146,12 @@ config BR2_PACKAGE_MPD_MAD Enable mad input support. Select this if you want to play back MP3 files. +config BR2_PACKAGE_MPD_MODPLUG + bool "modplug" + select BR2_PACKAGE_LIBMODPLUG + help + Enable Modplug decoder support. + config BR2_PACKAGE_MPD_MPG123 bool "mpg123" select BR2_PACKAGE_LIBID3TAG @@ -155,6 +177,12 @@ config BR2_PACKAGE_MPD_OPUS Enable opus input support. Select this if you want to play back OPUS encoded files. +config BR2_PACKAGE_MPD_SIDPLAY + bool "sidplay" + select BR2_PACKAGE_LIBSIDPLAY2 + help + Enable C64 SID support. + config BR2_PACKAGE_MPD_TREMOR bool "tremor" depends on !BR2_PACKAGE_MPD_VORBIS @@ -276,6 +304,18 @@ comment "jack support needs a toolchain w/ dynamic library" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_OPENAL + bool "openal" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENAL + help + Enable OpenAL output support. + +comment "openal support needs a toolchain w/ NPTL" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_MPD_OSS bool "oss" help @@ -355,6 +395,14 @@ config BR2_PACKAGE_MPD_UPNP help Enable MPD UPnP client support. +comment "Tag plugins" + +config BR2_PACKAGE_MPD_ID3TAG + bool "id3tag" + select BR2_PACKAGE_LIBID3TAG + help + Enable ID3 support. + endif comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6" diff --git a/buildroot/package/mpd/mpd.hash b/buildroot/package/mpd/mpd.hash index ecc2ee42a..038143077 100644 --- a/buildroot/package/mpd/mpd.hash +++ b/buildroot/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 d3275e11d85637adde250cadf3b4f5aec2144228f0d8085767493fc46c55b2f9 mpd-0.21.19.tar.xz +sha256 20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201 mpd-0.21.25.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mpd/mpd.mk b/buildroot/package/mpd/mpd.mk index 647cac4f3..a5825fffe 100644 --- a/buildroot/package/mpd/mpd.mk +++ b/buildroot/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.21 -MPD_VERSION = $(MPD_VERSION_MAJOR).19 +MPD_VERSION = $(MPD_VERSION_MAJOR).25 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost @@ -97,12 +97,26 @@ else MPD_CONF_OPTS += -Dflac=disabled endif +ifeq ($(BR2_PACKAGE_MPD_FLUIDSYNTH),y) +MPD_DEPENDENCIES += fluidsynth +MPD_CONF_OPTS += -Dfluidsynth=enabled +else +MPD_CONF_OPTS += -Dfluidsynth=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_HTTPD_OUTPUT),y) MPD_CONF_OPTS += -Dhttpd=true else MPD_CONF_OPTS += -Dhttpd=false endif +ifeq ($(BR2_PACKAGE_MPD_ID3TAG),y) +MPD_DEPENDENCIES += libid3tag +MPD_CONF_OPTS += -Did3tag=enabled +else +MPD_CONF_OPTS += -Did3tag=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 MPD_CONF_OPTS += -Djack=enabled @@ -173,6 +187,13 @@ else MPD_CONF_OPTS += -Dmad=disabled endif +ifeq ($(BR2_PACKAGE_MPD_MODPLUG),y) +MPD_DEPENDENCIES += libmodplug +MPD_CONF_OPTS += -Dmodplug=enabled +else +MPD_CONF_OPTS += -Dmodplug=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_MPG123),y) MPD_DEPENDENCIES += libid3tag mpg123 MPD_CONF_OPTS += -Dmpg123=enabled @@ -193,6 +214,13 @@ else MPD_CONF_OPTS += -Dneighbor=false endif +ifeq ($(BR2_PACKAGE_MPD_OPENAL),y) +MPD_DEPENDENCIES += openal +MPD_CONF_OPTS += -Dopenal=enabled +else +MPD_CONF_OPTS += -Dopenal=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_OPUS),y) MPD_DEPENDENCIES += opus libogg MPD_CONF_OPTS += -Dopus=enabled @@ -227,6 +255,13 @@ else MPD_CONF_OPTS += -Dshout=disabled endif +ifeq ($(BR2_PACKAGE_MPD_SIDPLAY),y) +MPD_DEPENDENCIES += libsidplay2 +MPD_CONF_OPTS += -Dsidplay=enabled +else +MPD_CONF_OPTS += -Dsidplay=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled @@ -289,6 +324,13 @@ else MPD_CONF_OPTS += -Dwavpack=disabled endif +ifeq ($(BR2_PACKAGE_MPD_ZZIP),y) +MPD_DEPENDENCIES += zziplib +MPD_CONF_OPTS += -Dzzip=enabled +else +MPD_CONF_OPTS += -Dzzip=disabled +endif + define MPD_INSTALL_EXTRA_FILES $(INSTALL) -m 0644 -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf endef diff --git a/buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch index 630bbd664..60d6b4bb0 100644 --- a/buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ b/buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch @@ -9,6 +9,8 @@ that building the shared library can be disabled in pure static library contexts. Signed-off-by: Thomas Petazzoni +[Fabrice: update for 2.5.0 (add libmpdec++)] +Signed-off-by: Fabrice Fontaine --- Makefile.in | 6 ++++++ configure.ac | 13 +++++++++++++ @@ -37,11 +39,25 @@ index 2c91891..0c44f36 100644 +endif +ifeq ($(BUILD_SHARED),yes) $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) libmpdec.so + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME) +endif $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) cp -R doc/* $(DESTDIR)$(docdir) +@@ -74,9 +80,13 @@ install_libcxx: install_lib + $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) + $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) + $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) ++ifeq ($(BUILD_STATIC),yes) + $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) ++endif ++ifeq ($(BUILD_SHARED),yes) + $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) ++endif + cp -R doc/libmpdec++ $(DESTDIR)$(docdir) + + diff --git a/configure.ac b/configure.ac index 7ee8f86..2b3e505 100644 --- a/configure.ac @@ -96,6 +112,36 @@ index d9619a3..985c73c 100644 OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ +diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in +index d9619a3..985c73c 100644 +--- a/libmpdec++/Makefile.in ++++ b/libmpdec++/Makefile.in +@@ -13,6 +13,8 @@ LIBSTATIC_CXX = @LIBSTATIC_CXX@ + LIBNAME_CXX = @LIBNAME_CXX@ + LIBSONAME_CXX = @LIBSONAME_CXX@ + LIBSHARED_CXX = @LIBSHARED_CXX@ ++BUILD_SHARED = @BUILD_SHARED@ ++BUILD_STATIC = @BUILD_STATIC@ + + CXX = @CXX@ + LDXX = @LDXX@ +@@ -39,8 +41,15 @@ ifeq ($(MAKECMDGOALS), profile_use) + MPD_LDXXFLAGS += $(MPD_PUSE) + endif + ++ifeq ($(BUILD_SHARED),yes) ++TARGETS += $(LIBSHARED_CXX) ++endif ++ ++ifeq ($(BUILD_STATIC),yes) ++TARGETS += $(LIBSTATIC_CXX) ++endif + +-default: $(LIBSTATIC_CXX) $(LIBSHARED_CXX) ++default: $(TARGETS) + + + OBJS := decimal.o -- 2.1.0 diff --git a/buildroot/package/mpdecimal/mpdecimal.hash b/buildroot/package/mpdecimal/mpdecimal.hash index e15224323..c931ee4a6 100644 --- a/buildroot/package/mpdecimal/mpdecimal.hash +++ b/buildroot/package/mpdecimal/mpdecimal.hash @@ -1,4 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7 mpdecimal-2.4.2.tar.gz +sha256 15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca mpdecimal-2.5.0.tar.gz # Locally computed -sha256 e384413a13f061a50f6fadceefc0f326c22d83c13ae94978e1f86d0468332c19 LICENSE.txt +sha256 b07528d8b1dbf1e2d2741052996f0876e23342ce2d30d0effa39c5457716c25a LICENSE.txt diff --git a/buildroot/package/mpdecimal/mpdecimal.mk b/buildroot/package/mpdecimal/mpdecimal.mk index 2d06d0f6b..fa310a227 100644 --- a/buildroot/package/mpdecimal/mpdecimal.mk +++ b/buildroot/package/mpdecimal/mpdecimal.mk @@ -5,7 +5,7 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.4.2 +MPDECIMAL_VERSION = 2.5.0 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt @@ -22,4 +22,10 @@ MPDECIMAL_CONF_ENV += MACHINE=ansi32 endif endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +MPDECIMAL_CONF_OPTS += --enable-cxx +else +MPDECIMAL_CONF_OPTS += --disable-cxx +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/mpv/0002-fix-powerpc64-altivec.patch b/buildroot/package/mpv/0001-fix-powerpc64-altivec.patch similarity index 100% rename from buildroot/package/mpv/0002-fix-powerpc64-altivec.patch rename to buildroot/package/mpv/0001-fix-powerpc64-altivec.patch diff --git a/buildroot/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch b/buildroot/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch deleted file mode 100644 index 544c03c05..000000000 --- a/buildroot/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 61aea32efe675e584121295452fc7ab2a652d021 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 20 Apr 2016 09:39:30 -0300 -Subject: [PATCH] wscript: don't check for fork() on POSIX checks - -It's not being used, and in fact prevents mpv from being built in nommu -architectures (cortex M, blackfin, ...) - -Signed-off-by: Gustavo Zacarias ---- -Status: pull request https://github.com/mpv-player/mpv/pull/3068 - - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index a4ffce6..40328e4 100644 ---- a/wscript -+++ b/wscript -@@ -127,7 +127,7 @@ main_dependencies = [ - 'desc': 'POSIX environment', - # This should be good enough. - 'func': check_statement(['poll.h', 'unistd.h', 'sys/mman.h'], -- 'struct pollfd pfd; poll(&pfd, 1, 0); fork(); int f[2]; pipe(f); munmap(f,0)'), -+ 'struct pollfd pfd; poll(&pfd, 1, 0); int f[2]; pipe(f); munmap(f,0)'), - }, { - 'name': 'posix-or-mingw', - 'desc': 'development environment', --- -2.7.3 - diff --git a/buildroot/package/mpv/mpv.hash b/buildroot/package/mpv/mpv.hash index 734b6a366..37db77135 100644 --- a/buildroot/package/mpv/mpv.hash +++ b/buildroot/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz -sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL +sha256 9163f64832226d22e24bbc4874ebd6ac02372cd717bef15c28a0aa858c5fe592 mpv-0.32.0.tar.gz +sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/buildroot/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk index 6801a0468..a7c9f7d74 100644 --- a/buildroot/package/mpv/mpv.mk +++ b/buildroot/package/mpv/mpv.mk @@ -4,9 +4,8 @@ # ################################################################################ -MPV_VERSION = 0.29.1 -MPV_SITE = https://github.com/mpv-player/mpv/archive -MPV_SOURCE = v$(MPV_VERSION).tar.gz +MPV_VERSION = 0.32.0 +MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ host-pkgconf ffmpeg zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -27,9 +26,7 @@ MPV_CONF_OPTS = \ --disable-rsound \ --disable-rubberband \ --disable-uchardet \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - --disable-mali-fbdev + --disable-vapoursynth # ALSA support requires pcm+mixer ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) @@ -112,14 +109,6 @@ else MPV_CONF_OPTS += --disable-dvdnav endif -# libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) -MPV_CONF_OPTS += --enable-dvdread -MPV_DEPENDENCIES += libdvdread -else -MPV_CONF_OPTS += --disable-dvdread -endif - # libdrm ifeq ($(BR2_PACKAGE_LIBDRM),y) MPV_CONF_OPTS += --enable-drm @@ -128,16 +117,6 @@ else MPV_CONF_OPTS += --disable-drm endif -# libv4l -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MPV_CONF_OPTS += \ - --enable-libv4l2 \ - --enable-tv -MPV_DEPENDENCIES += libv4l -else -MPV_CONF_OPTS += --disable-libv4l2 -endif - # libvdpau ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MPV_CONF_OPTS += --enable-vdpau diff --git a/buildroot/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/buildroot/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch new file mode 100644 index 000000000..b3a1f5a03 --- /dev/null +++ b/buildroot/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -0,0 +1,29 @@ +From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 13 Apr 2020 20:12:11 +0200 +Subject: [PATCH] include: Declare gVERSION global as 'extern'. + +Fixes build with '-fno-common'. + +[Retrieved from: +https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] +Signed-off-by: Fabrice Fontaine +--- + include/version.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/version.h b/include/version.h +index 47366ef6f..3a567a1d5 100644 +--- a/include/version.h ++++ b/include/version.h +@@ -11,8 +11,8 @@ + extern "C" { + #endif + +-const char* gVERSION; +-const char* gVERSION_SHORT; ++extern const char* gVERSION; ++extern const char* gVERSION_SHORT; + + #ifdef __cplusplus + } diff --git a/buildroot/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/buildroot/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch new file mode 100644 index 000000000..fbadfe79e --- /dev/null +++ b/buildroot/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch @@ -0,0 +1,193 @@ +From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 13 Jun 2020 22:51:37 +0200 +Subject: [PATCH] CMakeLists.txt: add BUILDCPP option + +C++ is a mandatory dependency since version 1.4.0 and +https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc + +As a result, build on embedded toolchains that do not support C++ fails +on: + +CMake Error at CMakeLists.txt:2 (project): + The CMAKE_CXX_COMPILER: + + /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ + + is not a full path to an existing compiler tool. + +Fixes: + - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] +--- + CMakeLists.txt | 69 +++++++++++++++++++---------------- + src/java/CMakeLists.txt | 4 +- + src/javascript/CMakeLists.txt | 34 +++++++++-------- + 3 files changed, 59 insertions(+), 48 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 250d9106e..90c0dc920 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required (VERSION 2.8.11) +-project (mraa C CXX) ++project (mraa C) + + FIND_PACKAGE (Threads REQUIRED) + +@@ -11,6 +11,8 @@ else () + set (CMAKE_C_STANDARD 99) + endif () + ++option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) ++ + ############################################################################### + # Detect supported warning flags + # Modified from work By Dan Liew (fpbench - MIT) +@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS + -Werror=missing-parameter-type + ) + +-# Warning flags for the C++ compiler only +-set (MRAA_CXX_WARNING_FLAGS +- -Wnon-virtual-dtor +- -Woverloaded-virtual +- -Wreorder +-) +- + include (CheckCCompilerFlag) +-include (CheckCXXCompilerFlag) ++if (BUILDCPP) ++ # Warning flags for the C++ compiler only ++ set (MRAA_CXX_WARNING_FLAGS ++ -Wnon-virtual-dtor ++ -Woverloaded-virtual ++ -Wreorder ++ ) ++ ++ enable_language (CXX) ++ include (CheckCXXCompilerFlag) ++endif () + function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) + string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") + string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") +@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) + endif () + endforeach () + +-# Globally set C++ compiler warning flags that are supported and emit +-# a warning about unsupported flags +-foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) +- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") +- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) +- if (HAS_CXX_${SANITIZED_FLAG_NAME}) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +- else () +- message (WARNING "C++ compiler does not support flag \"${flag}\"") +- endif () +-endforeach () +- +-# This function adds the c++11 flag to a c++ target (if supported) +-function(use_cxx_11 targetname) +- include(CheckCXXCompilerFlag) +- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +- if (COMPILER_SUPPORTS_CXX11) +- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") +- else() +- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") +- endif() +-endfunction() ++if (BUILDCPP) ++ # Globally set C++ compiler warning flags that are supported and emit ++ # a warning about unsupported flags ++ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) ++ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") ++ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) ++ if (HAS_CXX_${SANITIZED_FLAG_NAME}) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") ++ else () ++ message (WARNING "C++ compiler does not support flag \"${flag}\"") ++ endif () ++ endforeach () ++ ++ # This function adds the c++11 flag to a c++ target (if supported) ++ function(use_cxx_11 targetname) ++ include(CheckCXXCompilerFlag) ++ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) ++ if (COMPILER_SUPPORTS_CXX11) ++ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") ++ else() ++ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") ++ endif() ++ endfunction() ++endif() + + # Set CMAKE_INSTALL_LIBDIR if not defined + include(GNUInstallDirs) +diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt +index 231c755fa..cfa72a0df 100644 +--- a/src/java/CMakeLists.txt ++++ b/src/java/CMakeLists.txt +@@ -16,7 +16,9 @@ include_directories ( + set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") + set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") ++if (BUILDCPP) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") ++endif() + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") + + if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) +diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt +index 25fd36275..99a96b49d 100644 +--- a/src/javascript/CMakeLists.txt ++++ b/src/javascript/CMakeLists.txt +@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES + ) + + message (STATUS "INFO - swig Version ${SWIG_VERSION}") +-message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") ++if (BUILDCPP) ++ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") + +-if (${V8_VERSION_MAJOR} GREATER 3) +- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") +- # Node 0.12.x V8 engine major version is '3'. +- # Node 2.1.0 V8 engine major version is '4'. +- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) +- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) +- if (CMAKE_VERSION VERSION_LESS "3.1") +- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") +- if (CMAKE_COMPILER_IS_GNUCXX) +- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") +- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") ++ if (${V8_VERSION_MAJOR} GREATER 3) ++ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") ++ # Node 0.12.x V8 engine major version is '3'. ++ # Node 2.1.0 V8 engine major version is '4'. ++ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) ++ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) ++ if (CMAKE_VERSION VERSION_LESS "3.1") ++ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") ++ if (CMAKE_COMPILER_IS_GNUCXX) ++ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") ++ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") ++ endif () ++ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") ++ else () ++ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") + endif () +- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") +- else () +- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") + endif () +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") + endif () + endif () + diff --git a/buildroot/package/mraa/Config.in b/buildroot/package/mraa/Config.in index cdd7b9e8f..c845fe9f9 100644 --- a/buildroot/package/mraa/Config.in +++ b/buildroot/package/mraa/Config.in @@ -1,7 +1,15 @@ +config BR2_PACKAGE_MRAA_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + config BR2_PACKAGE_MRAA bool "mraa" + depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm || BR2_i386 || BR2_x86_64 help mraa is a C/C++ library with bindings to javascript & python to interface with the IO on Galileo, Edison & other @@ -10,5 +18,6 @@ config BR2_PACKAGE_MRAA http://iotdk.intel.com/docs/master/mraa -comment "mraa needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "mraa needs a toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/mraa/mraa.hash b/buildroot/package/mraa/mraa.hash index f2eb73ca7..f29a5ce83 100644 --- a/buildroot/package/mraa/mraa.hash +++ b/buildroot/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4501e6936afb426c75b7d406c1a7a27b514297f640e887de4d88a2d9687f37b mraa-0.9.1.tar.gz -sha256 04f8503394c6d01c86538a693f6990fc1debd94119954ff4eae4407fe7c60a8e COPYING +sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/buildroot/package/mraa/mraa.mk b/buildroot/package/mraa/mraa.mk index 5077859fa..910339b38 100644 --- a/buildroot/package/mraa/mraa.mk +++ b/buildroot/package/mraa/mraa.mk @@ -4,22 +4,41 @@ # ################################################################################ -MRAA_VERSION = 0.9.1 -MRAA_SITE = $(call github,intel-iot-devkit,mraa,v$(MRAA_VERSION)) +MRAA_VERSION = 2.1.0 +MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING MRAA_INSTALL_STAGING = YES +ifeq ($(BR2_i386),y) +MRAA_ARCH = i386 +else ifeq ($(BR2_x86_64),y) +MRAA_ARCH = x86_64 +else ifeq ($(BR2_arm)$(BR2_armeb),y) +MRAA_ARCH = arm +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) +MRAA_ARCH = aarch64 +else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) +MRAA_ARCH = mips +endif + # USBPLAT only makes sense with FTDI4222, which requires the ftd2xx library, # which doesn't exist in buildroot - +# Disable C++ as it is used only by FTDI4222 and tests MRAA_CONF_OPTS += \ + -DBUILDARCH=$(MRAA_ARCH) \ + -DBUILDCPP=OFF \ -DBUILDSWIG=OFF \ -DUSBPLAT=OFF \ -DFTDI4222=OFF \ - -DIPK=OFF \ - -DRPM=OFF \ -DENABLEEXAMPLES=OFF \ -DBUILDTESTS=OFF +ifeq ($(BR2_PACKAGE_JSON_C),y) +MRAA_CONF_OPTS += -DJSONPLAT=ON +MRAA_DEPENDENCIES += json-c +else +MRAA_CONF_OPTS += -DJSONPLAT=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/mrouted/mrouted.hash b/buildroot/package/mrouted/mrouted.hash index 8f10e014e..22eeb8cef 100644 --- a/buildroot/package/mrouted/mrouted.hash +++ b/buildroot/package/mrouted/mrouted.hash @@ -1,3 +1,6 @@ +# From https://github.com/troglobit/mrouted/releases/download/4.1/mrouted-4.1.tar.gz.md5 +md5 e1f9bc0a895a2accae511a44e2a4a6f7 mrouted-4.1.tar.gz + # Locally calculated -sha256 179636d211a82d0140a3488c6b65e634b4838da23e50d8cdee15ef03fe9b46af mrouted-3.9.8.tar.gz -sha256 2e6c7d9e92afc391f584290c3817f2cdec1501621cf820abbd4bc4adc2e5b2ef LICENSE +sha256 fd4735316f5510dfccfcbed441aa11619b261501dccf9e793a311d618c0843c5 mrouted-4.1.tar.gz +sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/buildroot/package/mrouted/mrouted.mk b/buildroot/package/mrouted/mrouted.mk index b9a4eaba4..ae2f8a4e2 100644 --- a/buildroot/package/mrouted/mrouted.mk +++ b/buildroot/package/mrouted/mrouted.mk @@ -4,24 +4,17 @@ # ################################################################################ -MROUTED_VERSION = 3.9.8 -MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) +MROUTED_VERSION = 4.1 +MROUTED_SITE = \ + https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION) MROUTED_DEPENDENCIES = host-bison MROUTED_LICENSE = BSD-3-Clause MROUTED_LICENSE_FILES = LICENSE +MROUTED_CONFIGURE_OPTS = --enable-rsrr -define MROUTED_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) $(@D)/configure --enable-rsrr \ - ) +define MROUTED_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/mrouted.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mrouted.service endef -define MROUTED_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define MROUTED_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/mrp/Config.in b/buildroot/package/mrp/Config.in new file mode 100644 index 000000000..0ca18a4ef --- /dev/null +++ b/buildroot/package/mrp/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_MRP + bool "mrp" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBMNL + select BR2_PACKAGE_LIBNL + help + This is the userspace application that configures the kernel + to run MRP protocol. The userspace application is made of 2 + applications, one daemon and a client. + + https://github.com/microchip-ung/mrp + +comment "mrp needs a toolchain w/ threads, kernel headers >= 5.0" + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/buildroot/package/mrp/S65mrp b/buildroot/package/mrp/S65mrp new file mode 100644 index 000000000..0ce1f80f8 --- /dev/null +++ b/buildroot/package/mrp/S65mrp @@ -0,0 +1,55 @@ +#!/bin/sh +# +# Start mrp +# + +DAEMON="mrp_server" + +PIDFILE="/var/run/$DAEMON.pid" + +# shellcheck source=/dev/null +[ -r "/etc/default/mrp_server" ] && . "/etc/default/mrp_server" + +start() { + printf "Starting mrp daemon: " + start-stop-daemon -S -b -q -m -p $PIDFILE \ + -x /usr/bin/$DAEMON + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return $status +} + +stop() { + printf "Stopping mrp daemon: " + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return $status +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/buildroot/package/mrp/mrp.hash b/buildroot/package/mrp/mrp.hash new file mode 100644 index 000000000..02a848c7e --- /dev/null +++ b/buildroot/package/mrp/mrp.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 1a6c76d058bb425a7ec8b69a65de797650961161ec016b51ac8a1965e1ac304f mrp-1.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/mrp/mrp.mk b/buildroot/package/mrp/mrp.mk new file mode 100644 index 000000000..7e31e442c --- /dev/null +++ b/buildroot/package/mrp/mrp.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# mrp +# +################################################################################ + +MRP_VERSION = 1.1 +MRP_SITE = $(call github,microchip-ung,mrp,v$(MRP_VERSION)) +MRP_DEPENDENCIES = libev libmnl libnl +MRP_LICENSE = GPL-2.0 +MRP_LICENSE_FILES = LICENSE + +define MRP_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D $(MRP_PKGDIR)/S65mrp \ + $(TARGET_DIR)/etc/init.d/S65mrp +endef + +define MRP_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(MRP_PKGDIR)/mrp.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mrp.service +endef + +$(eval $(cmake-package)) diff --git a/buildroot/package/tinyhttpd/tinyhttpd.service b/buildroot/package/mrp/mrp.service similarity index 60% rename from buildroot/package/tinyhttpd/tinyhttpd.service rename to buildroot/package/mrp/mrp.service index 0ae5bac94..05006a70a 100644 --- a/buildroot/package/tinyhttpd/tinyhttpd.service +++ b/buildroot/package/mrp/mrp.service @@ -1,9 +1,9 @@ [Unit] -Description=Tiny HTTP daemon +Description=Media Redundancy Protocol After=network.target [Service] -ExecStart=/usr/sbin/tinyhttpd +ExecStart=/usr/bin/mrp Restart=always [Install] diff --git a/buildroot/package/msmtp/msmtp.hash b/buildroot/package/msmtp/msmtp.hash index 9849c547c..8fc674bfa 100644 --- a/buildroot/package/msmtp/msmtp.hash +++ b/buildroot/package/msmtp/msmtp.hash @@ -1,6 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.6.tar.xz.sig -sha256 6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1 msmtp-1.8.6.tar.xz +# https://marlam.de/msmtp/releases/msmtp-1.8.11.tar.xz.sig +# with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 +sha256 f25f0fa177ce9e0ad65c127e790a37f35fb64fee9e33d90345844c5c86780e60 msmtp-1.8.11.tar.xz # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk index 1518aa10e..43a9ed1e9 100644 --- a/buildroot/package/msmtp/msmtp.mk +++ b/buildroot/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.6 +MSMTP_VERSION = 1.8.11 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/mtd/mtd.hash b/buildroot/package/mtd/mtd.hash index 2e23fbb81..fda5a6ea3 100644 --- a/buildroot/package/mtd/mtd.hash +++ b/buildroot/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.1.tar.bz2.asc -sha256 8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2 mtd-utils-2.1.1.tar.bz2 -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.2.tar.bz2.asc +sha256 8ad4c5f34716d40646aa28724a2f5616d325a6f119254f914e26976f1f76e9d6 mtd-utils-2.1.2.tar.bz2 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/mtd/mtd.mk b/buildroot/package/mtd/mtd.mk index 347746020..9f259b35d 100644 --- a/buildroot/package/mtd/mtd.mk +++ b/buildroot/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.1 +MTD_VERSION = 2.1.2 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 @@ -21,7 +21,8 @@ endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf MTD_CONF_OPTS += --with-ubifs -ifeq ($(BR2_PACKAGE_OPENSSL),y) +# crypto needs linux/hash_info.h +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy) MTD_DEPENDENCIES += openssl MTD_CONF_OPTS += --with-crypto else @@ -52,10 +53,11 @@ else MTD_CONF_OPTS += --without-xattr endif -HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux host-zstd +HOST_MTD_DEPENDENCIES = host-acl host-zlib host-lzo host-util-linux host-zstd HOST_MTD_CONF_OPTS = \ --with-jffs \ --with-ubifs \ + --without-crypto \ --disable-tests MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2 diff --git a/buildroot/package/mtdev/mtdev.hash b/buildroot/package/mtdev/mtdev.hash index 7ead723ef..355e50ff6 100644 --- a/buildroot/package/mtdev/mtdev.hash +++ b/buildroot/package/mtdev/mtdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f mtdev-1.1.5.tar.bz2 -sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING +sha256 15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0 mtdev-1.1.6.tar.bz2 +sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING diff --git a/buildroot/package/mtdev/mtdev.mk b/buildroot/package/mtdev/mtdev.mk index f4c38d5c4..719185818 100644 --- a/buildroot/package/mtdev/mtdev.mk +++ b/buildroot/package/mtdev/mtdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTDEV_VERSION = 1.1.5 +MTDEV_VERSION = 1.1.6 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2 MTDEV_SITE = http://bitmath.org/code/mtdev diff --git a/buildroot/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch b/buildroot/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch deleted file mode 100644 index 810b66c61..000000000 --- a/buildroot/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f974bb1f92603973711bea36a7869dfa8358aae0 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 31 Jan 2016 09:04:46 +0100 -Subject: [PATCH 1/1] Fix build with musl libc - -Include missing header to prevent build error detected by buildroot: -http://autobuild.buildroot.net/results/aee/aee411047265bf205f8990a3d0d2310decb5fd19/build-end.log - -Signed-off-by: Bernd Kuhls ---- -Patch sent upstream: https://github.com/olivopaolo/mtdev2tuio/pull/2 - - mtdev2tuio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mtdev2tuio.c b/mtdev2tuio.c -index 3a9174f..f2c98d5 100644 ---- a/mtdev2tuio.c -+++ b/mtdev2tuio.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #define NSEC_PER_USEC 1000L - #define NSEC_PER_SEC 1000000000L --- -2.7.0.rc3 - diff --git a/buildroot/package/mtdev2tuio/Config.in b/buildroot/package/mtdev2tuio/Config.in deleted file mode 100644 index 3e88d2184..000000000 --- a/buildroot/package/mtdev2tuio/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MTDEV2TUIO - bool "mtdev2tuio" - depends on BR2_TOOLCHAIN_HAS_THREADS # liblo - select BR2_PACKAGE_LIBLO - select BR2_PACKAGE_MTDEV - help - mtdev2tuio is a simple application for converting touch - events captured from libmtdev to TUIO 1.1 - - https://github.com/olivopaolo/mtdev2tuio - -comment "mtdev2tuio needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/mtdev2tuio/mtdev2tuio.hash b/buildroot/package/mtdev2tuio/mtdev2tuio.hash deleted file mode 100644 index 9932e9e18..000000000 --- a/buildroot/package/mtdev2tuio/mtdev2tuio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 4a6aa319c44478dceaf01a24603690767e56c029a1f0380da0f31eac5a02e10f mtdev2tuio-e1e7378d86abe751158e743586133022f32fa4d1.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mtdev2tuio/mtdev2tuio.mk b/buildroot/package/mtdev2tuio/mtdev2tuio.mk deleted file mode 100644 index e9085b007..000000000 --- a/buildroot/package/mtdev2tuio/mtdev2tuio.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# mtdev2tuio -# -################################################################################ - -MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1 -MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION)) -MTDEV2TUIO_DEPENDENCIES = mtdev liblo -MTDEV2TUIO_LICENSE = GPL-3.0+ -MTDEV2TUIO_LICENSE_FILES = COPYING - -# mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD -# here. Liblo uses log(3), so we need to link with -lm -define MTDEV2TUIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CC)" \ - LIBS="-lmtdev -llo -lm" \ - -C $(@D) -endef - -define MTDEV2TUIO_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/mtdev2tuio $(TARGET_DIR)/usr/bin/mtdev2tuio -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/mtools/mtools.hash b/buildroot/package/mtools/mtools.hash index 1efc99a6b..8930c0219 100644 --- a/buildroot/package/mtools/mtools.hash +++ b/buildroot/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c708ff513fada78060a9e55db7c8d169d82d0e3d4afbd7c2744dce6ae0bfdb6d mtools-4.0.23.tar.lz +sha256 c443306ae1c5ae9ce749e6f0acc4b8f02d583fe6e4b3732489edb2e7329307d6 mtools-4.0.24.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mtools/mtools.mk b/buildroot/package/mtools/mtools.mk index bd3444022..268c3003d 100644 --- a/buildroot/package/mtools/mtools.mk +++ b/buildroot/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.23 +MTOOLS_VERSION = 4.0.24 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/buildroot/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch b/buildroot/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch new file mode 100644 index 000000000..43cf165f7 --- /dev/null +++ b/buildroot/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch @@ -0,0 +1,59 @@ +From f55b1a37e2c43b67e7fd7f6a39afe2b2316b7cf9 Mon Sep 17 00:00:00 2001 +From: Alexander Egorenkov +Date: Mon, 31 Aug 2020 19:05:46 +0200 +Subject: [PATCH] kpartx, libmultipath: use pkg-config to get path to + headers + +Use pkg-config in Makefile to find path to devmapper and udev headers +to enable cross-compilation. + +Signed-off-by: Alexander Egorenkov +--- + kpartx/Makefile | 2 +- + libmultipath/Makefile | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/kpartx/Makefile b/kpartx/Makefile +index 2906a984..29573890 100644 +--- a/kpartx/Makefile ++++ b/kpartx/Makefile +@@ -8,7 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) + + LIBDEPS += -ldevmapper + +-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_COOKIE + endif + +diff --git a/libmultipath/Makefile b/libmultipath/Makefile +index e5651e49..51ad0193 100644 +--- a/libmultipath/Makefile ++++ b/libmultipath/Makefile +@@ -20,19 +20,19 @@ ifdef SYSTEMD + endif + endif + +-ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_task_no_flush,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE + endif + +-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_COOKIE + endif + +-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) ++ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(shell $(PKG_CONFIG) --variable=includedir libudev)/libudev.h),0) + CFLAGS += -DLIBUDEV_API_RECVBUF + endif + +-ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_task_deferred_remove,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_DEFERRED + endif + +-- +2.28.0 + diff --git a/buildroot/package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch b/buildroot/package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch new file mode 100644 index 000000000..cdd408122 --- /dev/null +++ b/buildroot/package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch @@ -0,0 +1,31 @@ +From 48f537b9fef4f9db761466b8951fb63243f06602 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 6 May 2020 09:35:47 +0200 +Subject: [PATCH] libmpathpersist: depend on libmultipath + +Without this the build fails with: + +/usr/bin/ld: cannot find -lmultipath + +Signed-off-by: Christian Hesse +Signed-off-by: Alexander Egorenkov +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1dee3680..ba1d73ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ all: $(BUILDDIRS) + $(BUILDDIRS): + $(MAKE) -C $@ + +-multipath multipathd mpathpersist: libmultipath ++libmpathpersist multipath multipathd mpathpersist: libmultipath + mpathpersist: libmpathpersist + + $(BUILDDIRS.clean): +-- +2.28.0 + diff --git a/buildroot/package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch b/buildroot/package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch new file mode 100644 index 000000000..5154eb429 --- /dev/null +++ b/buildroot/package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch @@ -0,0 +1,41 @@ +From 82129852d74785267f95ef598ac483ff9af38a55 Mon Sep 17 00:00:00 2001 +From: "mail@eworm.de" +Date: Sat, 25 Apr 2020 21:11:13 +0200 +Subject: [PATCH] fix boolean value with json-c 0.14 + +Upstream json-c removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. + +[mwilck]: Use stdbool.h, and keep the log message unchanged. + +Signed-off-by: Christian Hesse +Signed-off-by: Martin Wilck +Signed-off-by: Alexander Egorenkov +--- + libdmmp/libdmmp_private.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h +index ac85b63f..b1a6ddea 100644 +--- a/libdmmp/libdmmp_private.h ++++ b/libdmmp/libdmmp_private.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include "libdmmp/libdmmp.h" +@@ -82,7 +83,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ + do { \ + json_type j_type = json_type_null; \ + json_object *j_obj_tmp = NULL; \ +- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ ++ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != true) { \ + _error(ctx, "Invalid JSON output from multipathd IPC: " \ + "key '%s' not found", key); \ + rc = DMMP_ERR_IPC_ERROR; \ +-- +2.28.0 + diff --git a/buildroot/package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patch b/buildroot/package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patch new file mode 100644 index 000000000..43bb30585 --- /dev/null +++ b/buildroot/package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patch @@ -0,0 +1,34 @@ +From ec2b935d2af33651f34de8bd6e428156005c2e3d Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Tue, 12 May 2020 22:13:51 +0200 +Subject: [PATCH] multipath-tools Makefile: add install dependency + +$(libdir) must exist before running "make install" on prioritizer, checker, +and foreign libraries. + +Cc: Christian Hesse + +Signed-off-by: Martin Wilck +Signed-off-by: Alexander Egorenkov +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index fec3b73b..8bcaba66 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,6 +32,10 @@ libmultipath libdmmp: libmpathcmd + libmpathpersist multipath multipathd: libmultipath + mpathpersist multipathd: libmpathpersist + ++libmultipath/checkers.install \ ++ libmultipath/prioritizers.install \ ++ libmultipath/foreign.install: libmultipath.install ++ + $(BUILDDIRS.clean): + $(MAKE) -C ${@:.clean=} clean + +-- +2.28.0 + diff --git a/buildroot/package/multipath-tools/0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/buildroot/package/multipath-tools/0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch new file mode 100644 index 000000000..133094a7f --- /dev/null +++ b/buildroot/package/multipath-tools/0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch @@ -0,0 +1,35 @@ +From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 +From: Alexander Egorenkov +Date: Sun, 6 Sep 2020 10:37:41 +0200 +Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined + +systemd is disabled by default, to activate it set ENABLE_SYSTEMD. + +Signed-off-by: Alexander Egorenkov +--- + Makefile.inc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.inc b/Makefile.inc +index d4d1e0dd..32bc1846 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -35,6 +35,7 @@ ifndef RUN + endif + endif + ++ifdef ENABLE_SYSTEMD + ifndef SYSTEMD + ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) + SYSTEMD = $(shell pkg-config --modversion libsystemd) +@@ -45,6 +46,7 @@ ifndef SYSTEMD + endif + endif + endif ++endif + + ifndef SYSTEMDPATH + SYSTEMDPATH=usr/lib +-- +2.28.0 + diff --git a/buildroot/package/multipath-tools/Config.in b/buildroot/package/multipath-tools/Config.in new file mode 100644 index 000000000..fc4b01b2a --- /dev/null +++ b/buildroot/package/multipath-tools/Config.in @@ -0,0 +1,32 @@ +comment "multipath-tools needs udev and a uClibc or glibc toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV + +config BR2_PACKAGE_MULTIPATH_TOOLS + bool "multipath-tools" + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBURCU + select BR2_PACKAGE_LIBAIO + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_STANDARD_INSTALL + select BR2_PACKAGE_READLINE + help + This package provides the following binaries to drive + the Device Mapper multipathing driver: + * multipath - Device mapper target autoconfig. + * multipathd - Multipath daemon. + * mpathpersist - Manages SCSI persistent reservations on + dm multipath devices. + * kpartx - Create device maps from partition tables. + + https://github.com/openSUSE/multipath-tools diff --git a/buildroot/package/multipath-tools/S60multipathd b/buildroot/package/multipath-tools/S60multipathd new file mode 100644 index 000000000..ff995e937 --- /dev/null +++ b/buildroot/package/multipath-tools/S60multipathd @@ -0,0 +1,47 @@ +#!/bin/sh + +DAEMON="multipathd" +PIDFILE="/var/run/$DAEMON.pid" + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/multipath-tools/multipath-tools.hash b/buildroot/package/multipath-tools/multipath-tools.hash new file mode 100644 index 000000000..7eaf24609 --- /dev/null +++ b/buildroot/package/multipath-tools/multipath-tools.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 ccd73bf67621161d9e42d1a770c3a7efff6e252433e8b8ed5f64a88cb5e7151d multipath-tools-0.8.4.tar.gz +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/multipath-tools/multipath-tools.mk b/buildroot/package/multipath-tools/multipath-tools.mk new file mode 100644 index 000000000..60ca90b70 --- /dev/null +++ b/buildroot/package/multipath-tools/multipath-tools.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# multipath-tools +# +################################################################################ + +MULTIPATH_TOOLS_VERSION = 0.8.4 +MULTIPATH_TOOLS_SITE = $(call github,openSUSE,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) +MULTIPATH_TOOLS_LICENSE = LGPL-2.0 +MULTIPATH_TOOLS_LICENSE_FILES = COPYING +MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf +MULTIPATH_TOOLS_MAKE_OPTS = LIB="lib" RUN="run" OPTFLAGS="" STACKPROT="" + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MULTIPATH_TOOLS_DEPENDENCIES += systemd +MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +endif + +define MULTIPATH_TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(MULTIPATH_TOOLS_MAKE_OPTS) +endef + +define MULTIPATH_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \ + $(MULTIPATH_TOOLS_MAKE_OPTS) DESTDIR="$(TARGET_DIR)" +endef + +define MULTIPATH_TOOLS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/multipath-tools/S60multipathd \ + $(TARGET_DIR)/etc/init.d/S60multipathd +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/musepack/0005-fix-build-with-gcc-10.patch b/buildroot/package/musepack/0005-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..012dbab54 --- /dev/null +++ b/buildroot/package/musepack/0005-fix-build-with-gcc-10.patch @@ -0,0 +1,30 @@ +fix build with gcc 10 + +Define __Cc, __Dc and Res_bit as extern to avoid the following build +failure with gcc 10 (which defaults to -fno-common): + +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/mpcdec_shared.dir/requant.o:(.rodata+0x0): multiple definition of `__Dc'; CMakeFiles/mpcdec_shared.dir/mpc_decoder.o:(.rodata+0x430): first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/mpcdec_shared.dir/requant.o:(.rodata+0x28): multiple definition of `__Cc'; CMakeFiles/mpcdec_shared.dir/mpc_decoder.o:(.rodata+0x458): first defined here +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/mpcdec_shared.dir/requant.o:(.rodata+0x74): multiple definition of `Res_bit'; CMakeFiles/mpcdec_shared.dir/mpc_decoder.o:(.rodata+0x4a4): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/9971da8c59484a6a26eb79d6e157461a47855dbf + +Signed-off-by: Fabrice Fontaine + +diff -Naur musepack_src_r475.orig/libmpcdec/requant.h musepack_src_r475/libmpcdec/requant.h +--- musepack_src_r475.orig/libmpcdec/requant.h 2020-09-10 08:31:50.696105246 +0200 ++++ musepack_src_r475/libmpcdec/requant.h 2020-09-10 08:32:52.944106476 +0200 +@@ -47,9 +47,9 @@ + + + /* C O N S T A N T S */ +-const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer +-const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients +-const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset ++extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer ++extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients ++extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset + + #define Cc (__Cc + 1) + #define Dc (__Dc + 1) diff --git a/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch b/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch deleted file mode 100644 index 8221c0ea3..000000000 --- a/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 329e79299daaa994b8e75941331a1093051ea5d9 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Tue, 4 Feb 2020 09:29:13 -0500 -Subject: move riscv64 register index constants to signal.h - -under _GNU_SOURCE for namespace cleanliness, analogous to other archs. -the original placement in sys/reg.h seems not to have been motivated; -such a header isn't even present on other implementations. - -Downloaded from upstream commit -https://git.musl-libc.org/cgit/musl/commit/?id=329e79299daaa994b8e75941331a1093051ea5d9 - -Signed-off-by: Mark Corbin ---- - arch/riscv64/bits/reg.h | 6 ------ - arch/riscv64/bits/signal.h | 9 +++++++++ - 2 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/arch/riscv64/bits/reg.h b/arch/riscv64/bits/reg.h -index c800788c..2633f39d 100644 ---- a/arch/riscv64/bits/reg.h -+++ b/arch/riscv64/bits/reg.h -@@ -1,8 +1,2 @@ - #undef __WORDSIZE - #define __WORDSIZE 64 --#define REG_PC 0 --#define REG_RA 1 --#define REG_SP 2 --#define REG_TP 4 --#define REG_S0 8 --#define REG_A0 10 -diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h -index 2ff4be30..b006334f 100644 ---- a/arch/riscv64/bits/signal.h -+++ b/arch/riscv64/bits/signal.h -@@ -35,6 +35,15 @@ typedef struct mcontext_t { - union __riscv_mc_fp_state __fpregs; - } mcontext_t; - -+#if defined(_GNU_SOURCE) -+#define REG_PC 0 -+#define REG_RA 1 -+#define REG_SP 2 -+#define REG_TP 4 -+#define REG_S0 8 -+#define REG_A0 10 -+#endif -+ - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - typedef unsigned long greg_t; - typedef unsigned long gregset_t[32]; --- -cgit v1.2.1 - diff --git a/buildroot/package/musl/musl.hash b/buildroot/package/musl/musl.hash index f0450897c..39f105796 100644 --- a/buildroot/package/musl/musl.hash +++ b/buildroot/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://www.musl-libc.org/releases/musl-1.1.24.tar.gz.asc -sha256 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz -sha256 3520d478bccbdf68d9dc0c03984efb0fa4b99868ab2599f5b5f72f3fb3b07a49 COPYRIGHT +# https://musl.libc.org/releases/musl-1.2.1.tar.gz.asc +sha256 68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b musl-1.2.1.tar.gz +sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/buildroot/package/musl/musl.mk b/buildroot/package/musl/musl.mk index df68c5f51..bc4237968 100644 --- a/buildroot/package/musl/musl.mk +++ b/buildroot/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.24 +MUSL_VERSION = 1.2.1 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch b/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch deleted file mode 100644 index ed15e34f6..000000000 --- a/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch +++ /dev/null @@ -1,1090 +0,0 @@ -From 27fdc2f5b55fa1849d1b51fa866a4c2a4e83a3cd Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Tue, 24 Dec 2019 19:04:07 -0800 -Subject: [PATCH] Convert makedoc.c to makedoc.pl. - -This removes the build-time dependency on a compiled program, which -doesn't work for cross-compilation. - -My perl is pretty rusty, and the result isn't super pretty. However, -since perl is already a build dependency, it made the most sense to -use that. The output of Muttrc, muttrc.man, and manual.xml match. - -There might be a few bugs, so I'm going to leave makedoc.c in for now -as a reference. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.com/muttmua/mutt/commit/27fdc2f5b55fa1849d1b51fa866a4c2a4e83a3cd] ---- - doc/Makefile.am | 16 +- - doc/devel-notes.txt | 2 +- - doc/makedoc.pl | 952 ++++++++++++++++++++++++++++++++++++++++++++ - init.h | 2 +- - sort.h | 2 +- - 5 files changed, 962 insertions(+), 12 deletions(-) - create mode 100644 doc/makedoc.pl - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 8f94a09b..1cb21b64 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -17,8 +17,6 @@ AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir) - - MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C - --noinst_PROGRAMS = makedoc -- - EXTRA_DIST = dotlock.man \ - smime_keys.man \ - mutt.man \ -@@ -38,7 +36,7 @@ EXTRA_DIST = dotlock.man \ - patch-notes.txt \ - smime-notes.txt \ - Muttrc Muttrc.head stamp-doc-rc \ -- makedoc.c makedoc-defs.h \ -+ makedoc.pl makedoc-defs.h \ - mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES) - - CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ -@@ -136,11 +134,11 @@ manual.txt: manual.html - - Muttrc: stamp-doc-rc - --stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head -+stamp-doc-rc: $(top_srcdir)/init.h makedoc.pl $(srcdir)/Muttrc.head - -rm -f Muttrc stamp-doc-rc - sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc - $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ -- $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc -+ $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -c >> Muttrc - touch stamp-doc-rc - - manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css -@@ -211,8 +209,8 @@ instdoc: instdoc.sh - - update-doc: stamp-doc-rc $(BUILD_DOC_TARGETS) - --muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail -- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \ -+muttrc.man: makedoc.pl $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail -+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -m | \ - cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\ - > muttrc.man - -@@ -232,13 +230,13 @@ mutt_pgpring.1: $(srcdir)/pgpring.man - smime_keys.1: $(srcdir)/smime_keys.man - $(EDIT) $(srcdir)/smime_keys.man > $@ - --stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \ -+stamp-doc-xml: makedoc.pl $(top_srcdir)/init.h \ - manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ - $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog - ( date=`(cd $(top_srcdir) && ./mkreldate.sh)` && \ - version=`(cd $(top_srcdir) && env sh ./version.sh)` && \ - sed -e "s/@VERSION\@/$$version ($$date)/" $(srcdir)/manual.xml.head && \ -- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \ -+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -s && \ - $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \ - perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \ - ) > manual.xml -diff --git a/doc/devel-notes.txt b/doc/devel-notes.txt -index 99bc0fa0..bde077ab 100644 ---- a/doc/devel-notes.txt -+++ b/doc/devel-notes.txt -@@ -225,7 +225,7 @@ these variables, and the global Muttrc, are generated automatically - from that documentation. To start this process, type "make - update-doc" in the top-level source directory. - --Note that you may have to update the makedoc utility (makedoc.c) -+Note that you may have to update the makedoc utility (makedoc.pl) - when adding new data types to init.h. - - More precisely, variable name, type, and default value are directly -diff --git a/doc/makedoc.pl b/doc/makedoc.pl -new file mode 100644 -index 00000000..e64d3c50 ---- /dev/null -+++ b/doc/makedoc.pl -@@ -0,0 +1,952 @@ -+#! /usr/bin/perl -w -+# -+# Copyright (C) 1999-2000 Thomas Roessler -+# Copyright (C) 2019 Kevin J. McCarthy -+# -+# 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. -+ -+# This program was translated from the C version (makedoc.c). -+# So it looks like "c'ish perl" because it is, plus my perl is rusty ;-) -+ -+ -+# Documentation line parser notes: -+# -+# The format is very remotely inspired by nroff. Most important, it's -+# easy to parse and convert, and it was easy to generate from the SGML -+# source of mutt's original manual. -+# -+# - \fI switches to italics -+# - \fB switches to boldface -+# - \fC swtiches to a literal string -+# - \fP switches to normal display -+# - .dl on a line starts a definition list (name taken taken from HTML). -+# - .dt starts a term in a definition list. -+# - .dd starts a definition in a definition list. -+# - .de on a line finishes a definition list. -+# - .il on a line starts an itemized list -+# - .dd starts an item in an itemized list -+# - .ie on a line finishes an itemized list -+# - .ts on a line starts a "tscreen" environment (name taken from SGML). -+# - .te on a line finishes this environment. -+# - .pp on a line starts a paragraph. -+# - \$word will be converted to a reference to word, where appropriate. -+# Note that \$$word is possible as well. -+# - '. ' in the beginning of a line expands to two space characters. -+# This is used to protect indentations in tables. -+# -+ -+use strict; -+use warnings; -+use Getopt::Std; -+ -+# Output formats -+my $F_CONF = 1; -+my $F_MAN = 2; -+my $F_SGML = 3; -+ -+my $OutputFormat; -+ -+# docstatus flags, used by print_it() -+my $D_INIT = (1 << 0); # init -+my $D_NL = (1 << 1); # (usually) on a new line -+my $D_NP = (1 << 2); # new paragraph ".pp" -+my $D_PA = (1 << 3); # inside paragraph ".pp" -+ -+my $D_EM = (1 << 4); # emphasis "\fI" .. "\fP" -+my $D_BF = (1 << 5); # boldface "\fB" .. "\fP" -+my $D_TT = (1 << 6); # literal string "\fC" .. "\fP" -+ -+my $D_TAB = (1 << 7); # "tscreen" screen shot ".ts" .. ".te" -+my $D_DL = (1 << 8); # start defn list ".dl" .. ".de" -+my $D_DT = (1 << 9); # dlist term ".dt" -+my $D_DD = (1 << 10); # dlist defn ".dd" -+my $D_IL = (1 << 11); # itemized list ".il" .. ".ie" -+ -+# Commands sent to print_it() in response to various input strings -+my $SP_START_EM = 1; -+my $SP_START_BF = 2; -+my $SP_START_TT = 3; -+my $SP_END_FT = 4; -+my $SP_NEWLINE = 5; -+my $SP_NEWPAR = 6; -+my $SP_END_PAR = 7; -+my $SP_STR = 8; -+my $SP_START_TAB = 9; -+my $SP_END_TAB = 10; -+my $SP_START_DL = 11; -+my $SP_DT = 12; -+my $SP_DD = 13; -+my $SP_END_DD = 14; -+my $SP_END_DL = 15; -+my $SP_START_IL = 16; -+my $SP_END_IL = 17; -+my $SP_END_SECT = 18; -+my $SP_REFER = 19; -+ -+# Types to documentation readable strings: -+my %type2human = ("DT_NONE" => "-none-", -+ "DT_BOOL" => "boolean", -+ "DT_NUM" => "number", -+ "DT_LNUM" => "number (long)", -+ "DT_STR" => "string", -+ "DT_PATH" => "path", -+ "DT_QUAD" => "quadoption", -+ "DT_SORT" => "sort order", -+ "DT_RX" => "regular expression", -+ "DT_MAGIC" => "folder magic", -+ "DT_ADDR" => "e-mail address", -+ "DT_MBCHARTBL"=> "string"); -+ -+my %string_types = ("DT_STR" => 1, -+ "DT_RX" => 1, -+ "DT_ADDR" => 1, -+ "DT_PATH" => 1, -+ "DT_MBCHARTBL" => 1); -+ -+my %quad2human = ("MUTT_YES" => "yes", -+ "MUTT_NO" => "no", -+ "MUTT_ASKYES" => "ask-yes", -+ "MUTT_ASKNO" => "ask-no"); -+ -+my %bool2human = ("1" => "yes", -+ "0" => "no"); -+ -+ -+# prototypes -+# to update: -+# M-1 M-! grep '^sub' makedoc.pl -+sub makedoc(); -+sub flush_doc($); -+sub handle_confline($); -+sub pretty_default($$); -+sub string_unescape($); -+sub string_escape($); -+sub print_confline($$$); -+sub print_confline_conf($$$); -+sub print_conf_strval($); -+sub print_confline_man($$$); -+sub man_string_escape($); -+sub print_man_strval($); -+sub print_confline_sgml($$$); -+sub print_sgml_id($); -+sub print_sgml($); -+sub print_sgml_strval($); -+sub handle_docline($$); -+sub commit_buff($$); -+sub print_docline($$$); -+sub print_ref($$); -+sub print_docline_conf($$$$); -+sub print_docline_man($$$$); -+sub print_docline_sgml($$$$); -+ -+ -+our($opt_c, $opt_m, $opt_s); -+getopts('cms'); -+if ($opt_c) { -+ $OutputFormat = $F_CONF; -+} -+elsif ($opt_m) { -+ $OutputFormat = $F_MAN; -+} -+elsif ($opt_s) { -+ $OutputFormat = $F_SGML; -+} -+else { -+ die "$0: no output format specified" -+} -+ -+makedoc(); -+ -+ -+sub makedoc() { -+ my $line; -+ my $lineno = 0; -+ my $active = 0; -+ my $docstat = $D_INIT; -+ -+ while ($line = ) { -+ chomp($line); -+ $line =~ s/^\s+//; -+ if ($line eq '/*++*/') { -+ $active = 1; -+ } -+ elsif ($line eq '/*--*/') { -+ $docstat = flush_doc($docstat); -+ $active = 0; -+ } -+ elsif ($active) { -+ if (($line =~ /^\/\*\*/) || ($line =~ /^\*\*/)) { -+ $line =~ s/^[\/*]+\s*//; -+ $docstat = handle_docline($line, $docstat); -+ } -+ elsif ($line =~ /^{/) { -+ $line =~ s/^{\s*//; -+ $docstat = flush_doc($docstat); -+ handle_confline($line); -+ } -+ } -+ } -+ flush_doc($docstat); -+ print("\n"); -+} -+ -+sub flush_doc($) { -+ my ($docstat) = @_; -+ -+ if ($docstat & $D_INIT) { -+ return $D_INIT; -+ } -+ -+ if ($docstat & ($D_PA)) { -+ $docstat = print_docline($SP_END_PAR, undef, $docstat); -+ } -+ -+ if ($docstat & ($D_TAB)) { -+ $docstat = print_docline($SP_END_TAB, undef, $docstat); -+ } -+ -+ if ($docstat & ($D_DL)) { -+ $docstat = print_docline($SP_END_DL, undef, $docstat); -+ } -+ -+ if ($docstat & ($D_EM | $D_BF | $D_TT)) { -+ $docstat = print_docline($SP_END_FT, undef, $docstat); -+ } -+ -+ $docstat = print_docline($SP_END_SECT, undef, $docstat); -+ -+ $docstat = print_docline($SP_NEWLINE, undef, 0); -+ -+ return $D_INIT; -+} -+ -+#################### -+# Confline handling -+#################### -+ -+sub handle_confline($) { -+ my ($line) = @_; -+ -+ my ($name, $type, $flags, $data, $val) = split(/\s*,\s*/, $line, 5); -+ $name =~ s/"//g; -+ -+ $type =~ s/\|.*//; -+ -+ $val =~ s/^{\s*\.[lp]\s*=\s*"?//; -+ $val =~ s/"?\s*}\s*},\s*$//; -+ # This is a hack to concatenate compile-time constants. -+ # (?\n"; -+ print_sgml($name); -+ print "\nType: ${type2human{$type}}"; -+ -+ if (exists $string_types{$type}) { -+ if ($val ne "") { -+ print "\nDefault: "; -+ print_sgml_strval($val); -+ print ""; -+ } -+ else { -+ print "\nDefault: (empty)"; -+ } -+ } -+ else { -+ print "\nDefault: ${val}" -+ } -+ -+ print "\n"; -+} -+ -+sub print_sgml_id($) { -+ my ($id) = @_; -+ -+ $id =~ s/^$//; -+ $id =~ s/_/-/g; -+ -+ print $id; -+} -+ -+sub print_sgml($) { -+ my ($val) = @_; -+ -+ $val =~ s/&/&/g; -+ $val =~ s//>/g; -+ -+ print $val; -+} -+ -+sub print_sgml_strval($) { -+ my ($val) = @_; -+ -+ $val = string_escape($val); -+ print_sgml($val); -+} -+ -+ -+################### -+# Docline handling -+################### -+ -+sub handle_docline($$) { -+ my ($line, $docstat) = @_; -+ my $buff = ""; -+ -+ if ($line =~ /^\.pp/) { -+ return print_docline($SP_NEWPAR, undef, $docstat); -+ } -+ elsif ($line =~ /^\.ts/) { -+ return print_docline($SP_START_TAB, undef, $docstat); -+ } -+ elsif ($line =~ /^\.te/) { -+ return print_docline($SP_END_TAB, undef, $docstat); -+ } -+ elsif ($line =~ /^\.dl/) { -+ return print_docline($SP_START_DL, undef, $docstat); -+ } -+ elsif ($line =~ /^\.de/) { -+ return print_docline($SP_END_DL, undef, $docstat); -+ } -+ elsif ($line =~ /^\.il/) { -+ return print_docline($SP_START_IL, undef, $docstat); -+ } -+ elsif ($line =~ /^\.ie/) { -+ return print_docline($SP_END_IL, undef, $docstat); -+ } -+ -+ $line =~ s/^\. / /; -+ -+ while ($line ne "") { -+ if ($line =~ /^\\\(as/) { -+ $buff .= "*"; -+ substr($line, 0, 4) = ""; -+ } -+ elsif ($line =~ /^\\\(rs/) { -+ $buff .= "\\"; -+ substr($line, 0, 4) = ""; -+ } -+ elsif ($line =~ /^\\fI/) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_START_EM, undef, $docstat); -+ substr($line, 0, 3) = ""; -+ } -+ elsif ($line =~ /^\\fB/) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_START_BF, undef, $docstat); -+ substr($line, 0, 3) = ""; -+ } -+ elsif ($line =~ /^\\fC/) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_START_TT, undef, $docstat); -+ substr($line, 0, 3) = ""; -+ } -+ elsif ($line =~ /^\\fP/) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_END_FT, undef, $docstat); -+ substr($line, 0, 3) = ""; -+ } -+ elsif ($line =~ /^\.dt/) { -+ if ($docstat & $D_DD) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_END_DD, undef, $docstat); -+ } -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_DT, undef, $docstat); -+ substr($line, 0, 4) = ""; -+ } -+ elsif ($line =~ /^\.dd/) { -+ if (($docstat & $D_IL) && ($docstat & $D_DD)) { -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_END_DD, undef, $docstat); -+ } -+ $docstat = commit_buff(\$buff, $docstat); -+ $docstat = print_docline($SP_DD, undef, $docstat); -+ substr($line, 0, 4) = ""; -+ } -+ elsif ($line =~ /^\$\$\$/) { -+ print "\$"; -+ substr($line, 0, 3) = ""; -+ } -+ elsif ($line =~ /^(\$(\$?)([\w\-_<>]*))/) { -+ my $whole_ref; -+ my $ref; -+ my $output_dollar = 0; -+ -+ $whole_ref = $1; -+ if ($2) { -+ $output_dollar = 1; -+ } -+ $ref = $3; -+ -+ $docstat = commit_buff(\$buff, $docstat); -+ print_ref($output_dollar, $ref); -+ substr($line, 0, length($whole_ref)) = ""; -+ } -+ else { -+ $buff .= substr($line, 0, 1); -+ substr($line, 0, 1) = ""; -+ } -+ } -+ -+ $docstat = commit_buff(\$buff, $docstat); -+ return print_docline($SP_NEWLINE, undef, $docstat); -+} -+ -+sub commit_buff($$) { -+ my ($ref_buf, $docstat) = @_; -+ -+ if ($$ref_buf ne "") { -+ $docstat = print_docline($SP_STR, $$ref_buf, $docstat); -+ $$ref_buf = ""; -+ } -+ -+ return $docstat; -+} -+ -+sub print_docline($$$) { -+ my ($special, $str, $docstat) = @_; -+ my $onl; -+ -+ $onl = ($docstat & ($D_NL | $D_NP)); -+ $docstat &= ~($D_NL | $D_NP | $D_INIT); -+ -+ if ($OutputFormat == $F_CONF) { -+ return print_docline_conf($special, $str, $docstat, $onl); -+ } -+ elsif ($OutputFormat == $F_MAN) { -+ return print_docline_man($special, $str, $docstat, $onl); -+ } -+ elsif ($OutputFormat == $F_SGML) { -+ return print_docline_sgml($special, $str, $docstat, $onl); -+ } -+ -+ return $docstat; -+} -+ -+sub print_ref($$) { -+ my ($output_dollar, $ref) = @_; -+ -+ if (($OutputFormat == $F_CONF) || ($OutputFormat == $F_MAN)) { -+ if ($output_dollar) { -+ print "\$"; -+ } -+ print $ref; -+ } -+ elsif ($OutputFormat == $F_SGML) { -+ print ""; -+ if ($output_dollar) { -+ print "\$"; -+ } -+ print_sgml($ref); -+ print ""; -+ } -+} -+ -+my $Continuation = 0; -+ -+sub print_docline_conf($$$$) { -+ my ($special, $str, $docstat, $onl) = @_; -+ -+ if ($special == $SP_END_FT) { -+ $docstat &= ~($D_EM|$D_BF|$D_TT); -+ } -+ elsif ($special == $SP_START_BF) { -+ $docstat |= $D_BF; -+ } -+ elsif ($special == $SP_START_EM) { -+ $docstat |= $D_EM; -+ } -+ elsif ($special == $SP_START_TT) { -+ $docstat |= $D_TT; -+ } -+ elsif ($special == $SP_NEWLINE) { -+ if ($onl) { -+ $docstat |= $onl; -+ } -+ else { -+ print "\n# "; -+ $docstat |= $D_NL; -+ } -+ if ($docstat & $D_DL) { -+ $Continuation++; -+ } -+ } -+ elsif ($special == $SP_NEWPAR) { -+ if ($onl & $D_NP) { -+ $docstat |= $onl; -+ } -+ else { -+ if (!($onl & $D_NL)) { -+ print "\n# "; -+ } -+ print "\n# "; -+ $docstat |= $D_NP; -+ } -+ } -+ elsif ($special == $SP_START_TAB) { -+ if (!$onl) { -+ print "\n# "; -+ } -+ $docstat |= $D_TAB; -+ } -+ elsif ($special == $SP_END_TAB) { -+ $docstat &= ~$D_TAB; -+ $docstat |= $D_NL; -+ } -+ elsif ($special == $SP_START_DL) { -+ $docstat |= $D_DL; -+ } -+ elsif ($special == $SP_DT) { -+ $Continuation = 0; -+ $docstat |= $D_DT; -+ } -+ elsif ($special == $SP_DD) { -+ if ($docstat & $D_IL) { -+ print "- "; -+ } -+ $Continuation = 0; -+ } -+ elsif ($special == $SP_END_DL) { -+ $Continuation = 0; -+ $docstat &= ~$D_DL; -+ } -+ elsif ($special == $SP_START_IL) { -+ $docstat |= $D_IL; -+ } -+ elsif ($special == $SP_END_IL) { -+ $Continuation = 0; -+ $docstat &= ~$D_IL; -+ } -+ elsif ($special == $SP_STR) { -+ if ($Continuation) { -+ $Continuation = 0; -+ print " "; -+ } -+ print $str; -+ if ($docstat & $D_DT) { -+ if (length($str) < 8) { -+ print " " x (8 - length($str)); -+ } -+ $docstat &= ~$D_DT; -+ $docstat |= $D_NL; -+ } -+ } -+ -+ return $docstat; -+} -+ -+sub print_docline_man($$$$) { -+ my ($special, $str, $docstat, $onl) = @_; -+ -+ if ($special == $SP_END_FT) { -+ print "\\fP"; -+ $docstat &= ~($D_EM|$D_BF|$D_TT); -+ } -+ elsif ($special == $SP_START_BF) { -+ print "\\fB"; -+ $docstat |= $D_BF; -+ $docstat &= ~($D_EM|$D_TT); -+ } -+ elsif ($special == $SP_START_EM) { -+ print "\\fI"; -+ $docstat |= $D_EM; -+ $docstat &= ~($D_BF|$D_TT); -+ } -+ elsif ($special == $SP_START_TT) { -+ print "\\fC"; -+ $docstat |= $D_TT; -+ $docstat &= ~($D_BF|$D_EM); -+ } -+ elsif ($special == $SP_NEWLINE) { -+ if ($onl) { -+ $docstat |= $onl; -+ } -+ else { -+ print "\n"; -+ $docstat |= $D_NL; -+ } -+ } -+ elsif ($special == $SP_NEWPAR) { -+ if ($onl & $D_NP) { -+ $docstat |= $onl; -+ } -+ else { -+ if (!($onl & $D_NL)) { -+ print "\n"; -+ } -+ print ".IP\n"; -+ $docstat |= $D_NP; -+ } -+ } -+ elsif ($special == $SP_START_TAB) { -+ print "\n.IP\n.EX\n"; -+ $docstat |= $D_TAB | $D_NL; -+ } -+ elsif ($special == $SP_END_TAB) { -+ print "\n.EE\n"; -+ $docstat &= ~$D_TAB; -+ $docstat |= $D_NL; -+ } -+ elsif ($special == $SP_START_DL) { -+ print ".RS\n.PD 0\n"; -+ $docstat |= $D_DL; -+ } -+ elsif ($special == $SP_DT) { -+ print ".TP\n"; -+ } -+ elsif ($special == $SP_DD) { -+ if ($docstat & $D_IL) { -+ print ".TP\n\\(hy "; -+ } -+ else { -+ print "\n"; -+ } -+ } -+ elsif ($special == $SP_END_DL) { -+ print ".RE\n.PD 1"; -+ $docstat &= ~$D_DL; -+ } -+ elsif ($special == $SP_START_IL) { -+ print ".RS\n.PD 0\n"; -+ $docstat |= $D_IL; -+ } -+ elsif ($special == $SP_END_IL) { -+ print ".RE\n.PD 1"; -+ $docstat &= ~$D_DL; -+ } -+ elsif ($special == $SP_STR) { -+ $str =~ s/\\/\\\\/g; -+ $str =~ s/"/\\(rq/g; -+ $str =~ s/-/\\-/g; -+ $str =~ s/``/\\(lq/g; -+ $str =~ s/''/\\(rq/g; -+ print $str; -+ } -+ -+ return $docstat; -+} -+ -+sub print_docline_sgml($$$$) { -+ my ($special, $str, $docstat, $onl) = @_; -+ -+ if ($special == $SP_END_FT) { -+ if ($docstat & $D_EM) { -+ print ""; -+ } -+ if ($docstat & $D_BF) { -+ print ""; -+ } -+ if ($docstat & $D_TT) { -+ print ""; -+ } -+ $docstat &= ~($D_EM|$D_BF|$D_TT); -+ } -+ elsif ($special == $SP_START_BF) { -+ print ""; -+ $docstat |= $D_BF; -+ $docstat &= ~($D_EM|$D_TT); -+ } -+ elsif ($special == $SP_START_EM) { -+ print ""; -+ $docstat |= $D_EM; -+ $docstat &= ~($D_BF|$D_TT); -+ } -+ elsif ($special == $SP_START_TT) { -+ print ""; -+ $docstat |= $D_TT; -+ $docstat &= ~($D_BF|$D_EM); -+ } -+ elsif ($special == $SP_NEWLINE) { -+ if ($onl) { -+ $docstat |= $onl; -+ } -+ else { -+ print "\n"; -+ $docstat |= $D_NL; -+ } -+ } -+ elsif ($special == $SP_NEWPAR) { -+ if ($onl & $D_NP) { -+ $docstat |= $onl; -+ } -+ else { -+ if (!($onl & $D_NL)) { -+ print "\n"; -+ } -+ if ($docstat & $D_PA) { -+ print "\n"; -+ } -+ print "\n"; -+ $docstat |= $D_NP; -+ $docstat |= $D_PA; -+ } -+ } -+ elsif ($special == $SP_END_PAR) { -+ print "\n"; -+ $docstat &= ~$D_PA; -+ } -+ elsif ($special == $SP_START_TAB) { -+ if ($docstat & $D_PA) { -+ print "\n\n"; -+ $docstat &= ~$D_PA; -+ } -+ print "\n\n"; -+ $docstat |= $D_TAB | $D_NL; -+ } -+ elsif ($special == $SP_END_TAB) { -+ print ""; -+ $docstat &= ~$D_TAB; -+ $docstat |= $D_NL; -+ } -+ elsif ($special == $SP_START_DL) { -+ if ($docstat & $D_PA) { -+ print "\n\n"; -+ $docstat &= ~$D_PA; -+ } -+ print "\n\n\n\n"; -+ $docstat |= $D_DL; -+ } -+ elsif ($special == $SP_DT) { -+ print ""; -+ } -+ elsif ($special == $SP_DD) { -+ $docstat |= $D_DD; -+ if ($docstat & $D_DL) { -+ print ""; -+ } -+ else { -+ print ""; -+ } -+ } -+ elsif ($special == $SP_END_DD) { -+ if ($docstat & $D_DL) { -+ print "\n"; -+ } -+ else { -+ print ""; -+ } -+ $docstat &= ~$D_DD; -+ } -+ elsif ($special == $SP_END_DL) { -+ print "\n"; -+ $docstat &= ~($D_DD|$D_DL); -+ } -+ elsif ($special == $SP_START_IL) { -+ if ($docstat & $D_PA) { -+ print "\n\n"; -+ $docstat &= ~$D_PA; -+ } -+ print "\n\n"; -+ $docstat |= $D_IL; -+ } -+ elsif ($special == $SP_END_IL) { -+ print "\n"; -+ $docstat &= ~($D_DD|$D_DL); -+ } -+ elsif ($special == $SP_END_SECT) { -+ print ""; -+ } -+ elsif ($special == $SP_STR) { -+ if ($docstat & $D_TAB) { -+ print_sgml($str); -+ } -+ else { -+ $str =~ s/&/&/g; -+ $str =~ s//>/g; -+ $str =~ s/``//g; -+ $str =~ s/''/<\/quote>/g; -+ print $str; -+ } -+ } -+ -+ return $docstat; -+} -diff --git a/init.h b/init.h -index a237cb80..b797dd1c 100644 ---- a/init.h -+++ b/init.h -@@ -27,7 +27,7 @@ - #include "buffy.h" - - #ifndef _MAKEDOC --/* If you add a data type, be sure to update doc/makedoc.c */ -+/* If you add a data type, be sure to update doc/makedoc.pl */ - #define DT_MASK 0x0f - #define DT_BOOL 1 /* boolean option */ - #define DT_NUM 2 /* a number (short) */ -diff --git a/sort.h b/sort.h -index 0a6450e9..340ad18b 100644 ---- a/sort.h -+++ b/sort.h -@@ -19,7 +19,7 @@ - #define SORT_DATE 1 /* the date the mail was sent. */ - #define SORT_SIZE 2 - #define SORT_SUBJECT 3 --#define SORT_ALPHA 3 /* makedoc.c requires this */ -+#define SORT_ALPHA 3 /* makedoc.pl requires this */ - #define SORT_FROM 4 - #define SORT_ORDER 5 /* the order the messages appear in the mailbox. */ - #define SORT_THREADS 6 --- -2.24.1 - diff --git a/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch b/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch deleted file mode 100644 index fc6851137..000000000 --- a/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch +++ /dev/null @@ -1,310 +0,0 @@ -From acd49f242c867583856973fd8644a45e53f56489 Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Wed, 8 Jan 2020 19:09:33 -0800 -Subject: [PATCH] Convert hcachever.sh.in to hcachever.pl. - -Use Digest::MD5 to remove build-time dependency on mutt_md5, for -cross-compilation support. - -Signed-off-by: Fabrice Fontaine -[Retrieved (and slightly updated to remove .gitignore) from: -https://gitlab.com/muttmua/mutt/commit/acd49f242c867583856973fd8644a45e53f56489] ---- - .gitignore | 2 - - Makefile.am | 14 +++--- - configure.ac | 7 +-- - hcachever.pl | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ - hcachever.sh.in | 89 -------------------------------------- - 5 files changed, 118 insertions(+), 106 deletions(-) - create mode 100644 hcachever.pl - delete mode 100755 hcachever.sh.in - -diff --git a/Makefile.am b/Makefile.am -index cede1adb..e46f6544 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,7 +3,7 @@ - include $(top_srcdir)/flymake.am - - AUTOMAKE_OPTIONS = 1.6 foreign --EXTRA_PROGRAMS = mutt_dotlock mutt_pgpring pgpewrap mutt_md5 -+EXTRA_PROGRAMS = mutt_dotlock mutt_pgpring pgpewrap - - if BUILD_IMAP - IMAP_SUBDIR = imap -@@ -80,7 +80,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ - README.SSL smime.h group.h mutt_zstrm.h \ - muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ - ChangeLog mkchangelog.sh mkreldate.sh mutt_idna.h sidebar.h OPS.SIDEBAR \ -- snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \ -+ snprintf.c regex.c crypt-gpgme.h hcachever.pl \ - txt2c.c txt2c.sh version.sh check_sec.sh - - EXTRA_SCRIPTS = smime_keys -@@ -93,14 +93,10 @@ mutt_pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppack - mutt_pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) - mutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) - --mutt_md5_SOURCES = md5.c --mutt_md5_CFLAGS = -DMD5UTIL --mutt_md5_LDADD = -- - txt2c_SOURCES = txt2c.c - txt2c_LDADD = - --noinst_PROGRAMS = $(MUTT_MD5) txt2c -+noinst_PROGRAMS = txt2c - - mutt_dotlock.c: dotlock.c - cp $(srcdir)/dotlock.c mutt_dotlock.c -@@ -166,9 +162,9 @@ reldate.h: $(srcdir)/mkreldate.sh $(srcdir)/ChangeLog - # If configured with --with-included-gettext this means that intl will - # not have generated libintl.h yet, and mutt.h -> lib.h will generate - # an error. --hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h hcachever.sh $(MUTT_MD5) -+hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h config.h $(srcdir)/hcachever.pl - ( echo '#include "config.h"'; echo '#undef ENABLE_NLS'; echo '#include "mutt.h"'; ) \ -- | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh ./hcachever.sh hcversion.h -+ | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | perl $(srcdir)/hcachever.pl > hcversion.h - - patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh - $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c -diff --git a/configure.ac b/configure.ac -index 7fe55402..7906ce35 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1283,11 +1283,6 @@ then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o" - fi - --if test x$db_found != xno ; then -- MUTT_MD5="mutt_md5$EXEEXT" --fi --AC_SUBST(MUTT_MD5) -- - AC_SUBST(MUTTLIBS) - AC_SUBST(MUTT_LIB_OBJECTS) - AC_SUBST(LIBIMAP) -@@ -1677,5 +1672,5 @@ fi - - AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile - intl/Makefile m4/Makefile po/Makefile.in autocrypt/Makefile -- hcachever.sh doc/instdoc.sh) -+ doc/instdoc.sh) - AC_OUTPUT -diff --git a/hcachever.pl b/hcachever.pl -new file mode 100644 -index 00000000..be630a82 ---- /dev/null -+++ b/hcachever.pl -@@ -0,0 +1,112 @@ -+#!/usr/bin/perl -w -+# -+# Copyright (C) 2020 Kevin J. McCarthy -+# -+# 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. -+ -+# This file is a rewrite of hcachever.sh.in in perl. -+# The rewrite removes the dependency on mutt_md5, in order to -+# improve cross-compilation support. -+ -+use strict; -+use warnings; -+# note Digest::MD5 is standard in perl since 5.8.0 (July 18, 2002) -+use Digest::MD5; -+ -+ -+sub read_line() { -+ my $line; -+ -+ while (1) { -+ $line = ; -+ return "" if (!$line); -+ -+ chomp($line); -+ $line =~ s/^\s+//; -+ $line =~ s/\s+$//; -+ $line =~ s/\s{2,}//g; -+ -+ return $line if ($line ne ""); -+ } -+} -+ -+ -+sub process_struct($$) { -+ my ($line, $md5) = @_; -+ my $struct = ""; -+ my @body; -+ my $bodytxt; -+ my $inbody = 0; -+ -+ return if $line =~ /;$/; -+ if ($line =~ /{$/) { -+ $inbody = 1; -+ } -+ -+ while (($line = read_line()) ne "") { -+ if (!$inbody) { -+ return if $line =~ /;$/; -+ if ($line =~ /{$/) { -+ $inbody = 1; -+ } -+ } -+ -+ if ($line =~ /^} (.*);$/) { -+ $struct = $1; -+ last; -+ } -+ elsif ($line =~ /^}/) { -+ $struct = read_line(); -+ if ($struct ne "") { -+ $struct =~ s/;$//; -+ } -+ last; -+ } -+ elsif (($line !~ /^#/) && ($line !~ /^{/)) { -+ if ($inbody) { -+ push @body, $line; -+ } -+ } -+ } -+ -+ if ($struct =~ /^(ADDRESS|LIST|BUFFER|PARAMETER|BODY|ENVELOPE|HEADER)$/) { -+ $bodytxt = join(" ", @body); -+ print " * ${struct}: ${bodytxt}\n"; -+ -+ $md5->add(" ${struct} {${bodytxt}}"); -+ } -+} -+ -+ -+my $md5; -+my $line; -+my $BASEVERSION = "2"; -+ -+$md5 = Digest::MD5->new; -+ -+$md5->add($BASEVERSION); -+print "/* base version: $BASEVERSION\n"; -+ -+while (($line = read_line()) ne "") { -+ if ($line =~ /^typedef struct/) { -+ process_struct($line, $md5); -+ } -+} -+ -+$md5->add("\n"); -+my $digest = substr($md5->hexdigest, 0, 8); -+ -+print " */\n"; -+print "#define HCACHEVER 0x${digest}\n"; -diff --git a/hcachever.sh.in b/hcachever.sh.in -deleted file mode 100755 -index 730ca76b..00000000 ---- a/hcachever.sh.in -+++ /dev/null -@@ -1,89 +0,0 @@ --#!/bin/sh -- --BASEVERSION=2 -- --cleanstruct () { -- echo "$1" | sed -e 's/} *//' -e 's/;$//' --} -- --cleanbody () { -- echo "$1" | sed -e 's/{ *//' --} -- --getstruct () { -- STRUCT="" -- BODY='' -- inbody=0 -- case "$1" in -- *'{') inbody=1 ;; -- *';') return ;; -- esac -- -- while read line -- do -- if test $inbody -eq 0 -- then -- case "$line" in -- '{'*) inbody=1 ;; -- *';') return ;; -- esac -- fi -- -- case "$line" in -- '} '*) -- STRUCT=`cleanstruct "$line"` -- break -- ;; -- '}') -- read line -- STRUCT=`cleanstruct "$line"` -- break -- ;; -- '#'*) continue ;; -- *) -- if test $inbody -ne 0 -- then -- BODY="$BODY $line" -- fi -- ;; -- esac -- done -- -- case $STRUCT in -- ADDRESS|LIST|BUFFER|PARAMETER|BODY|ENVELOPE|HEADER) -- BODY=`cleanbody "$BODY"` -- echo "$STRUCT: $BODY" -- ;; -- esac -- return --} -- --DEST="$1" --TMPD="$DEST.tmp" -- --TEXT="$BASEVERSION" -- --echo "/* base version: $BASEVERSION" > $TMPD --while read line --do -- case "$line" in -- 'typedef struct'*) -- STRUCT=`getstruct "$line"` -- if test -n "$STRUCT" -- then -- NAME=`echo $STRUCT | cut -d: -f1` -- BODY=`echo $STRUCT | cut -d' ' -f2-` -- echo " * $NAME:" $BODY >> $TMPD -- TEXT="$TEXT $NAME {$BODY}" -- fi -- ;; -- esac --done --echo " */" >> $TMPD -- --MD5TEXT=`echo "$TEXT" | ./mutt_md5` --echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD -- --# TODO: validate we have all structs -- --mv $TMPD $DEST --- -2.24.1 - diff --git a/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch b/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch deleted file mode 100644 index 913b6087b..000000000 --- a/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3e88866dc60b5fa6aaba6fd7c1710c12c1c3cd01 Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Sun, 14 Jun 2020 11:30:00 -0700 -Subject: [PATCH] Prevent possible IMAP MITM via PREAUTH response. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is similar to CVE-2014-2567 and CVE-2020-12398. STARTTLS is not -allowed in the Authenticated state, so previously Mutt would -implicitly mark the connection as authenticated and skip any -encryption checking/enabling. - -No credentials are exposed, but it does allow messages to be sent to -an attacker, via postpone or fcc'ing for instance. - -Reuse the $ssl_starttls quadoption "in reverse" to prompt to abort the -connection if it is unencrypted. - -Thanks very much to Damian Poddebniak and Fabian Ising from the -Münster University of Applied Sciences for reporting this issue, and -their help in testing the fix. - -[Retrieved from: -https://gitlab.com/muttmua/mutt/commit/3e88866dc60b5fa6aaba6fd7c1710c12c1c3cd01] -Signed-off-by: Fabrice Fontaine ---- - imap/imap.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/imap/imap.c b/imap/imap.c -index 63362176..3ca10df4 100644 ---- a/imap/imap.c -+++ b/imap/imap.c -@@ -530,6 +530,22 @@ int imap_open_connection (IMAP_DATA* idata) - } - else if (ascii_strncasecmp ("* PREAUTH", idata->buf, 9) == 0) - { -+#if defined(USE_SSL) -+ /* An unencrypted PREAUTH response is most likely a MITM attack. -+ * Require a confirmation. */ -+ if (!idata->conn->ssf) -+ { -+ if (option(OPTSSLFORCETLS) || -+ (query_quadoption (OPT_SSLSTARTTLS, -+ _("Abort unencrypted PREAUTH connection?")) != MUTT_NO)) -+ { -+ mutt_error _("Encrypted connection unavailable"); -+ mutt_sleep (1); -+ goto err_close_conn; -+ } -+ } -+#endif -+ - idata->state = IMAP_AUTHENTICATED; - if (imap_check_capabilities (idata) != 0) - goto bail; --- -GitLab - diff --git a/buildroot/package/mutt/mutt.hash b/buildroot/package/mutt/mutt.hash index f822cfee6..23e5dd0ff 100644 --- a/buildroot/package/mutt/mutt.hash +++ b/buildroot/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653 mutt-1.13.5.tar.gz -sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL +sha256 e4f507b133253cb5eef27996b8668956cdf9caac622cf8adad13f0f9a4eda864 mutt-1.14.7.tar.gz +sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk index 5d400f8b8..0ff03724c 100644 --- a/buildroot/package/mutt/mutt.mk +++ b/buildroot/package/mutt/mutt.mk @@ -4,17 +4,12 @@ # ################################################################################ -MUTT_VERSION = 1.13.5 +MUTT_VERSION = 1.14.7 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp -# We're patching configure.ac -MUTT_AUTORECONF = YES - -# 0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch -MUTT_IGNORE_CVES += CVE-2020-14093 ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv diff --git a/buildroot/package/mxml/mxml.hash b/buildroot/package/mxml/mxml.hash index 811064c31..70f82cada 100644 --- a/buildroot/package/mxml/mxml.hash +++ b/buildroot/package/mxml/mxml.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1ac8d252f62f9dc2b2004518c70d2da313bdfcd92b8350e215f46064a34b52fc mxml-3.1.tar.gz -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE -sha256 63cc06ba05adecb1fdf2c94460a98291fd71614865456e52a19a1e7cc674250f NOTICE +sha256 b894f6c64964f2e77902564c17ba00f5d077a7a24054e7c1937903b0bd42c974 mxml-3.2.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 ed63aec4c75b9c21a5156b40052138032269bd27fd6f4bc0c51389807cdc7db9 NOTICE diff --git a/buildroot/package/mxml/mxml.mk b/buildroot/package/mxml/mxml.mk index 8ca83e111..85930ab38 100644 --- a/buildroot/package/mxml/mxml.mk +++ b/buildroot/package/mxml/mxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXML_VERSION = 3.1 +MXML_VERSION = 3.2 MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) MXML_LICENSE = Apache-2.0 with exceptions MXML_LICENSE_FILES = LICENSE NOTICE diff --git a/buildroot/package/nano/nano.hash b/buildroot/package/nano/nano.hash index 965a94aa0..792f18a09 100644 --- a/buildroot/package/nano/nano.hash +++ b/buildroot/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v4/nano-4.7.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.2.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 58c0e197de5339ca3cad3ef42b65626d612ddb0b270e730f02e6ab3785c736f5 nano-4.7.tar.xz -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 32c2da43e1ae9a5e43437d8c6e1ec0388af870c7762c479e5bffb5f292bda7e1 nano-5.2.tar.xz +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/nano/nano.mk b/buildroot/package/nano/nano.mk index 5cb8d1d5c..67ce07298 100644 --- a/buildroot/package/nano/nano.mk +++ b/buildroot/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 4 -NANO_VERSION = $(NANO_VERSION_MAJOR).7 +NANO_VERSION_MAJOR = 5 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ diff --git a/buildroot/package/nanocom/0001-fix-build-with-gcc-10.patch b/buildroot/package/nanocom/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..8fcc54652 --- /dev/null +++ b/buildroot/package/nanocom/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,36 @@ +fix build with gcc 10 + +Define curr_state as extern in nanocom.h to avoid the following build +failure with gcc 10 (which defaults to -fno-common): + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /tmp/ccLQeiek.o:(.bss+0x7c): multiple definition of `curr_state'; /tmp/ccse155z.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/4af4710cb9bbb1bc770b9824339dd7dbf8a80b05 + +Signed-off-by: Fabrice Fontaine + +diff -Naurp nanocom-1.0.orig/nanocom.c nanocom-1.0/nanocom.c +--- nanocom-1.0.orig/nanocom.c 2020-09-04 14:50:15.973320870 +0200 ++++ nanocom-1.0/nanocom.c 2020-09-04 14:53:49.429325087 +0200 +@@ -20,6 +20,8 @@ Based upon microcom by Anca and Lucian J + + #include "nanocom.h" + ++state curr_state; ++ + int crnl_mapping; //0 - no mapping, 1 mapping + + char device[MAX_DEVICE_NAME]; /* serial device name */ +diff -Naurp nanocom-1.0.orig/nanocom.h nanocom-1.0/nanocom.h +--- nanocom-1.0.orig/nanocom.h 2020-09-04 14:50:15.973320870 +0200 ++++ nanocom-1.0/nanocom.h 2020-09-04 14:51:12.269321982 +0200 +@@ -73,7 +73,7 @@ typedef struct { + char echo_type; /*r for remote, l for local and n for none*/ + } state; + +-state curr_state; ++extern state curr_state; + + #endif /* NANOCOM_H */ + diff --git a/buildroot/package/nasm/nasm.hash b/buildroot/package/nasm/nasm.hash index d824f22b8..86c67d6ba 100644 --- a/buildroot/package/nasm/nasm.hash +++ b/buildroot/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5 nasm-2.14.02.tar.xz -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE +sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/buildroot/package/nasm/nasm.mk b/buildroot/package/nasm/nasm.mk index 5a46fd0a4..b44b97e62 100644 --- a/buildroot/package/nasm/nasm.mk +++ b/buildroot/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.14.02 +NASM_VERSION = 2.15.05 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause diff --git a/buildroot/package/ncdu/ncdu.hash b/buildroot/package/ncdu/ncdu.hash index 285dc9bfa..be2b6e078 100644 --- a/buildroot/package/ncdu/ncdu.hash +++ b/buildroot/package/ncdu/ncdu.hash @@ -1,5 +1,5 @@ -# From https://dev.yorhel.nl/download/ncdu-1.14.2.tar.gz.sha256 -sha256 947a7f5c1d0cd4e338e72b4f5bc5e2873651442cec3cb012e04ad2c37152c6b1 ncdu-1.14.2.tar.gz +# From https://dev.yorhel.nl/ncdu +sha256 b02ddc4dbf1db139cc6fbbe2f54a282770380f0ca5c17089855eab52a9ea3fb0 ncdu-1.15.1.tar.gz # computed locally -sha256 978f49428f21714c973706030c0ef09983cc1e2889a1b7b521dbf8860870cf05 COPYING +sha256 978f49428f21714c973706030c0ef09983cc1e2889a1b7b521dbf8860870cf05 COPYING diff --git a/buildroot/package/ncdu/ncdu.mk b/buildroot/package/ncdu/ncdu.mk index 681c8bd87..532f145b2 100644 --- a/buildroot/package/ncdu/ncdu.mk +++ b/buildroot/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.14.2 +NCDU_VERSION = 1.15.1 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses diff --git a/buildroot/package/ncftp/0001-fix-gcc-10.patch b/buildroot/package/ncftp/0001-fix-gcc-10.patch new file mode 100644 index 000000000..8ff9c44c5 --- /dev/null +++ b/buildroot/package/ncftp/0001-fix-gcc-10.patch @@ -0,0 +1,24 @@ +Fix build with gcc 10 + +Add missing extern to gBm to fix the following build failure with +-fno-common which is enabled by default with gcc 10: + +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f + +Signed-off-by: Fabrice Fontaine + +diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c +--- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200 ++++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200 +@@ -28,7 +28,7 @@ + + static int gIsAtty1 = 1, gIsAtty2 = 1; + extern int gLoadedBm, gBookmarkMatchMode; +-Bookmark gBm; ++extern Bookmark gBm; + + double + FileSize(double size, const char **uStr0, double *uMult0) diff --git a/buildroot/package/ncmpc/ncmpc.hash b/buildroot/package/ncmpc/ncmpc.hash index 963c6d260..a95358ec5 100644 --- a/buildroot/package/ncmpc/ncmpc.hash +++ b/buildroot/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7c8eb727f6e12d8f97a53915b1b5632898b4afb335a1121c5e01c81df695615c ncmpc-0.37.tar.xz +sha256 64ebe320c2fbe4dfbff4461ceae730001841d06d48c4882d69f320912a0f11a8 ncmpc-0.39.tar.xz # Hash for license file: -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/ncmpc/ncmpc.mk b/buildroot/package/ncmpc/ncmpc.mk index 29675f225..1742ad20f 100644 --- a/buildroot/package/ncmpc/ncmpc.mk +++ b/buildroot/package/ncmpc/ncmpc.mk @@ -5,7 +5,7 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).37 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).39 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = \ diff --git a/buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch index f140a6044..0aa6fd2ba 100644 --- a/buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch +++ b/buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch @@ -1,29 +1,30 @@ -From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 20 Feb 2015 10:44:15 -0600 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cody Guldner +Date: Tue, 14 Apr 2020 09:12:01 -0500 Subject: [PATCH] CMakeLists: don't hard code thumb code generation -Migrating to version 1.2.0 +Migrating to version 1.2.1 Signed-off-by: Baruch Siach Signed-off-by: Clayton Shotwell +Signed-off-by: Cody Guldner --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdf01ec..34ae26e 100644 +index fc2a5e3..25da215 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM) - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib") +@@ -135,7 +135,7 @@ if(ANDROID_PLATFORM) + ${CMAKE_C_FLAGS}") elseif(GNULINUX_PLATFORM) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3") - set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") - elseif(IOS_PLATFORM) - #set minimal target ios version.If not provided this option, Xcode + if(${NE10_TARGET_ARCH} STREQUAL "armv7") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") + # Turn on asm optimization for Linux on ARM v7. + set(NE10_ASM_OPTIMIZATION on) -- -1.9.1 +2.23.0 diff --git a/buildroot/package/ne10/Config.in b/buildroot/package/ne10/Config.in index 8d375793d..a84ac18c9 100644 --- a/buildroot/package/ne10/Config.in +++ b/buildroot/package/ne10/Config.in @@ -1,17 +1,17 @@ +config BR2_PACKAGE_NE10_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm && (BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4) + config BR2_PACKAGE_NE10 bool "ne10" - depends on BR2_arm - depends on BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4 + depends on BR2_PACKAGE_NE10_ARCH_SUPPORTS help The Ne10 project has been set up to provide a set of common, useful functions which have been heavily optimized for the - ARM Architecture and provide consistent well tested behavior - that can be easily incorporated into applications. C - interfaces to the functions are provided for both assembler - and NEON implementations. + ARM and AArch64 Architecture and provide consistent well + tested behavior that can be easily incorporated into + applications. C interfaces to the functions are provided for + both assembler and NEON implementations. http://projectne10.github.io/Ne10/ - -comment "ne10 needs a toolchain w/ neon" - depends on BR2_arm - depends on !(BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4) diff --git a/buildroot/package/ne10/ne10.hash b/buildroot/package/ne10/ne10.hash index 2c56215c1..cdb6e013a 100644 --- a/buildroot/package/ne10/ne10.hash +++ b/buildroot/package/ne10/ne10.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af ne10-1.2.0.tar.gz +sha256 dd1a96610c0692cc80154ae123edd5d25e6e0a3f81d0c16a96425f3ef57b9929 ne10-1.2.1.tar.gz sha256 eb48041c8e0ad556cf72f2a6eff89c893aa5702bba4e163ca7798cce07e6c55e doc/LICENSE diff --git a/buildroot/package/ne10/ne10.mk b/buildroot/package/ne10/ne10.mk index 2af664be3..58652c045 100644 --- a/buildroot/package/ne10/ne10.mk +++ b/buildroot/package/ne10/ne10.mk @@ -4,13 +4,15 @@ # ################################################################################ -NE10_VERSION = 1.2.0 +NE10_VERSION = 1.2.1 NE10_SITE = $(call github,projectNe10,Ne10,v$(NE10_VERSION)) NE10_LICENSE = BSD-3-Clause or Apache-2.0 NE10_LICENSE_FILES = doc/LICENSE NE10_INSTALL_STAGING = YES -NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON +NE10_CONF_OPTS = \ + -DGNULINUX_PLATFORM=ON \ + -DNE10_LINUX_TARGET_ARCH=$(if $(BR2_aarch64),aarch64,armv7) ifeq ($(BR2_STATIC_LIBS),) NE10_CONF_OPTS += \ diff --git a/buildroot/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch b/buildroot/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..c9c455502 --- /dev/null +++ b/buildroot/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch @@ -0,0 +1,35 @@ +From 08467411d7dfc2a2b7ede62e5fdc640748ea1db2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 9 Sep 2020 19:14:52 +0200 +Subject: [PATCH] lib/neardal.h: fix build with gcc 10 + +Define neardal_output_cb as extern to avoid the following build failure +with gcc 10 (which defaults to -fno-common): + +/srv/storage/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./.libs/neardal_adapter.o:(.bss+0x0): multiple definition of `neardal_output_cb'; ./.libs/neardal.o:(.bss+0x68): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/connectivity/neardal/pull/10] +--- + lib/neardal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/neardal.h b/lib/neardal.h +index d1cd18b..3e83595 100644 +--- a/lib/neardal.h ++++ b/lib/neardal.h +@@ -638,7 +638,7 @@ neardal_record *neardal_g_variant_to_record(GVariant *in); + + void neardal_trace(const char *func, FILE *fp, char *fmt, ...) + __attribute__((format(printf, 3, 4))); +-int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap); ++extern int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap); + + #ifdef __cplusplus + } +-- +2.28.0 + diff --git a/buildroot/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/buildroot/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch new file mode 100644 index 000000000..e7ccc5255 --- /dev/null +++ b/buildroot/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch @@ -0,0 +1,25 @@ +From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 +From: Andrew Bauer +Date: Wed, 22 Jan 2020 09:59:47 -0600 +Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries + +[Retrieved from: +https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] +Signed-off-by: Fabrice Fontaine +--- + etc/afpd/directory.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h +index eb89c606..81bfa9cb 100644 +--- a/etc/afpd/directory.h ++++ b/etc/afpd/directory.h +@@ -91,7 +91,7 @@ struct maccess { + #define AR_UWRITE (1<<2) + #define AR_UOWN (1<<7) + +-q_t *invalid_dircache_entries; ++extern q_t *invalid_dircache_entries; + + typedef int (*dir_loop)(struct dirent *, char *, void *); + diff --git a/buildroot/package/netcalc/Config.in b/buildroot/package/netcalc/Config.in new file mode 100644 index 000000000..897cb872c --- /dev/null +++ b/buildroot/package/netcalc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_NETCALC + bool "netcalc" + help + netcalc (40 kiB) is a slimmed down version of sipcalc + using the popular output format of ipcalc. Both IPv4 + and IPv6 are supported. + + https://github.com/troglobit/netcalc/ diff --git a/buildroot/package/netcalc/netcalc.hash b/buildroot/package/netcalc/netcalc.hash new file mode 100644 index 000000000..34d64b167 --- /dev/null +++ b/buildroot/package/netcalc/netcalc.hash @@ -0,0 +1,5 @@ +# From https://github.com/troglobit/netcalc/releases/tag/v2.1.6 +md5 c8660b61370c76d866247fe65966a35b netcalc-2.1.6.tar.gz +# Locally computed: +sha256 cff41782fcf63d7d4ce6d35f95ed302127f6ddf6fc0ca03a8188af95a7c3243b netcalc-2.1.6.tar.gz +sha256 745538f8d515d37af6f03442df982a8b211b129e8dc10d0195e33c4b42f8fe5f LICENSE diff --git a/buildroot/package/netcalc/netcalc.mk b/buildroot/package/netcalc/netcalc.mk new file mode 100644 index 000000000..7d96fc53c --- /dev/null +++ b/buildroot/package/netcalc/netcalc.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# netcalc +# +################################################################################ + +NETCALC_VERSION = 2.1.6 +NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) +NETCALC_LICENSE = BSD-3-Clause +NETCALC_LICENSE_FILES = LICENSE +NETCALC_CONF_OPTS = --disable-ipcalc-symlink + +$(eval $(autotools-package)) diff --git a/buildroot/package/netdata/Config.in b/buildroot/package/netdata/Config.in new file mode 100644 index 000000000..88f88cb7e --- /dev/null +++ b/buildroot/package/netdata/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_NETDATA + bool "netdata" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_ZLIB + help + Netdata is distributed, real-time, performance and health + monitoring for systems and applications. It is a highly + optimized monitoring agent you install on all your systems and + containers. + + https://github.com/netdata/netdata + +comment "netdata needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/buildroot/package/netdata/S60netdata b/buildroot/package/netdata/S60netdata new file mode 100644 index 000000000..421f0715c --- /dev/null +++ b/buildroot/package/netdata/S60netdata @@ -0,0 +1,55 @@ +#!/bin/sh + +DAEMON="netdata" +PIDFILE="/var/run/$DAEMON.pid" + +NETDATA_ARGS="-u root -P $PIDFILE" + +# Create needed directories. +mkdir -p /var/cache/$DAEMON /var/lib/$DAEMON /var/log/$DAEMON + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $NETDATA_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/netdata/netdata.hash b/buildroot/package/netdata/netdata.hash new file mode 100644 index 000000000..8d5ce51fc --- /dev/null +++ b/buildroot/package/netdata/netdata.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 netdata-1.21.1.tar.gz +sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6 LICENSE diff --git a/buildroot/package/netdata/netdata.mk b/buildroot/package/netdata/netdata.mk new file mode 100644 index 000000000..1c20c49de --- /dev/null +++ b/buildroot/package/netdata/netdata.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# netdata +# +################################################################################ + +NETDATA_VERSION = 1.21.1 +NETDATA_SITE = $(call github,netdata,netdata,v$(NETDATA_VERSION)) +NETDATA_LICENSE = GPL-3.0+ +NETDATA_LICENSE_FILES = LICENSE +# netdata's source code is released without a generated configure script +NETDATA_AUTORECONF = YES +NETDATA_CONF_OPTS = --disable-dbengine +NETDATA_DEPENDENCIES = libuv util-linux zlib + +ifeq ($(BR2_GCC_ENABLE_LTO),y) +NETDATA_CONF_OPTS += --enable-lto +else +NETDATA_CONF_OPTS += --disable-lto +endif + +ifeq ($(BR2_PACKAGE_CUPS),y) +NETDATA_CONF_OPTS += --enable-plugin-cups +NETDATA_DEPENDENCIES += cups +else +NETDATA_CONF_OPTS += --disable-plugin-cups +endif + +ifeq ($(BR2_PACKAGE_JSON_C),y) +NETDATA_CONF_OPTS += --enable-jsonc +NETDATA_DEPENDENCIES += json-c +else +NETDATA_CONF_OPTS += --disable-jsonc +endif + +ifeq ($(BR2_PACKAGE_NFACCT),y) +NETDATA_CONF_OPTS += --enable-plugin-nfacct +NETDATA_DEPENDENCIES += nfacct +else +NETDATA_CONF_OPTS += --disable-plugin-nfacct +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +NETDATA_CONF_OPTS += --enable-https +NETDATA_DEPENDENCIES += openssl +else +NETDATA_CONF_OPTS += --disable-https +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +NETDATA_CONF_ENV += LIBS=-latomic +endif + +define NETDATA_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/netdata/S60netdata \ + $(TARGET_DIR)/etc/init.d/S60netdata +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch new file mode 100644 index 000000000..76c71d0ff --- /dev/null +++ b/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch @@ -0,0 +1,93 @@ +From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 +From: Michal Vasko +Date: Mon, 24 Aug 2020 13:47:40 +0200 +Subject: [PATCH] scripts FEATURE support using current user for SR modules + +Mostly for special cases user/group configuration +when the user/group cannot be retrieved normally. + +Fixes #701 +--- + CMakeLists.txt | 10 +++++----- + scripts/setup.sh | 23 +++++++++++++++++++---- + 2 files changed, 24 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77aea1f..8fd6b43 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) + OUTPUT_VARIABLE MODULES_OWNER OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE) + if(RET) +- message(FATAL_ERROR "Learning server module user failed: ${ERROR_STR}") ++ message(WARNING "Learning server module user failed (${ERROR_STR}), the current user will be used.") + endif() + endif() +-set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules") +-if(NOT MODULES_GROUP) ++set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules, empty means the current user") ++if(NOT MODULES_GROUP AND MODULES_OWNER) + execute_process(COMMAND id -gn ${MODULES_OWNER} RESULT_VARIABLE RET + OUTPUT_VARIABLE MODULES_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE) + if(RET) +- message(FATAL_ERROR "Learning server module group failed: ${ERROR_STR}") ++ message(WARNING "Learning server module group failed (${ERROR_STR}), the current user group will be used.") + endif() + endif() +-set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to") ++set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to, empty means the current user group") + + # set prefix for the PID file + if(NOT PIDFILE_PREFIX) +diff --git a/scripts/setup.sh b/scripts/setup.sh +index 9591a49..b7c7ba4 100755 +--- a/scripts/setup.sh ++++ b/scripts/setup.sh +@@ -1,7 +1,8 @@ + #!/bin/bash + +-# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS, NP2_MODULE_OWNER, NP2_MODULE_GROUP must be defined when executing this script! +-if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" -o -z "$NP2_MODULE_OWNER" -o -z "$NP2_MODULE_GROUP" ]; then ++# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS must be defined and NP2_MODULE_OWNER, NP2_MODULE_GROUP will be used if ++# defined when executing this script! ++if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" ]; then + echo "Required environment variables not defined!" + exit 1 + fi +@@ -37,7 +38,14 @@ MODULES=( + + # functions + INSTALL_MODULE() { +- "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 ++ CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" ++ if [ ! -z ${OWNER} ]; then ++ CMD="$CMD -o '$OWNER'" ++ fi ++ if [ ! -z ${GROUP} ]; then ++ CMD="$CMD -g '$GROUP'" ++ fi ++ eval $CMD + local rc=$? + if [ $rc -ne 0 ]; then + exit $rc +@@ -45,7 +53,14 @@ INSTALL_MODULE() { + } + + UPDATE_MODULE() { +- "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 ++ CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" ++ if [ ! -z ${OWNER} ]; then ++ CMD="$CMD -o '$OWNER'" ++ fi ++ if [ ! -z ${GROUP} ]; then ++ CMD="$CMD -g '$GROUP'" ++ fi ++ eval $CMD + local rc=$? + if [ $rc -ne 0 ]; then + exit $rc +-- +2.20.1 + diff --git a/buildroot/package/netopeer2/Config.in b/buildroot/package/netopeer2/Config.in new file mode 100644 index 000000000..763b1f234 --- /dev/null +++ b/buildroot/package/netopeer2/Config.in @@ -0,0 +1,34 @@ +comment "netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +config BR2_PACKAGE_NETOPEER2 + bool "netopeer2" + depends on BR2_USE_MMU # libnetconf2, libssh, sysrepo + depends on !BR2_STATIC_LIBS # libnetconf2, libssh, libyang, sysrepo + depends on BR2_INSTALL_LIBSTDCPP # sysrepo + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sysrepo + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_LIBSSH_SERVER # For libnetconf2 to have SSH + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_OPENSSL # For libnetconf2 to have TLS + select BR2_PACKAGE_SYSREPO + help + Netopeer2 is a set of tools implementing network configuration + tools based on the NETCONF Protocol. + + This is the server part. + + https://github.com/CESNET/Netopeer2 + +if BR2_PACKAGE_NETOPEER2 + +config BR2_PACKAGE_NETOPEER2_CLI + bool "cli" + help + Enable netopeer2 CLI. + +endif diff --git a/buildroot/package/netopeer2/S52netopeer2 b/buildroot/package/netopeer2/S52netopeer2 new file mode 100644 index 000000000..cf53a8f10 --- /dev/null +++ b/buildroot/package/netopeer2/S52netopeer2 @@ -0,0 +1,50 @@ +#!/bin/sh + +DAEMON="netopeer2-server" +PIDFILE="/var/run/$DAEMON.pid" + +NETOPEER2_SERVER_ARGS="" + +start() { + printf 'Starting %s: ' "$DAEMON" + + start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + -- $NETOPEER2_SERVER_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + # we do not support real reload .. just restart + restart +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" +esac diff --git a/buildroot/package/netopeer2/netopeer2.hash b/buildroot/package/netopeer2/netopeer2.hash new file mode 100644 index 000000000..1d5997505 --- /dev/null +++ b/buildroot/package/netopeer2/netopeer2.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e983683eda68792fedd73af54a5c7997496091489aa921f2a9e0dd27f2f6e19a netopeer2-1.1.39.tar.gz +sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/buildroot/package/netopeer2/netopeer2.mk b/buildroot/package/netopeer2/netopeer2.mk new file mode 100644 index 000000000..5787d3a8c --- /dev/null +++ b/buildroot/package/netopeer2/netopeer2.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# netopeer2 +# +################################################################################ + +NETOPEER2_VERSION = 1.1.39 +NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) +NETOPEER2_DL_SUBDIR = netopeer2 +NETOPEER2_LICENSE = BSD-3-Clause +NETOPEER2_LICENSE_FILES = LICENSE +NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo + +NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) + +define NETOPEER2_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/netopeer2/S52netopeer2 \ + $(TARGET_DIR)/etc/init.d/S52netopeer2 +endef + +$(eval $(cmake-package)) diff --git a/buildroot/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch b/buildroot/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch new file mode 100644 index 000000000..261dfe9a0 --- /dev/null +++ b/buildroot/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch @@ -0,0 +1,42 @@ +From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Sep 2020 14:30:20 +0200 +Subject: [PATCH] src/nettest_omni.c: fix compilation with GCC10 + +GCC10 defaults to -fno-common, which breaks compilation when there are +multiple definitions of implicit "extern" variables. Remove the extra +definitions. + +Fix #42 + +Signed-off-by: Tony Ambardar +[Retrieved from: +https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/HewlettPackard/netperf/pull/48] +--- + src/nettest_omni.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/nettest_omni.c b/src/nettest_omni.c +index 852eeb1..862088a 100644 +--- a/src/nettest_omni.c ++++ b/src/nettest_omni.c +@@ -458,14 +458,6 @@ static int client_port_max = 65535; + + /* different options for the sockets */ + +-int +- loc_nodelay, /* don't/do use NODELAY locally */ +- rem_nodelay, /* don't/do use NODELAY remotely */ +- loc_sndavoid, /* avoid send copies locally */ +- loc_rcvavoid, /* avoid recv copies locally */ +- rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- + extern int + loc_tcpcork, + rem_tcpcork, +-- +2.28.0 + diff --git a/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch b/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch new file mode 100644 index 000000000..b07682a76 --- /dev/null +++ b/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch @@ -0,0 +1,41 @@ +From c6dd9abd8d7a5332d0c1078196528926054791ae Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Mon, 15 Jun 2020 18:05:09 +0200 +Subject: [PATCH] mausezahn: remove unused MZ_SIZE_LONG_INT + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/c6dd9abd8d7a5332d0c1078196528926054791ae] +Signed-off-by: Fabrice Fontaine +--- + staging/mausezahn.c | 3 --- + staging/mz.h | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/staging/mausezahn.c b/staging/mausezahn.c +index 6c36166e..19d2937a 100644 +--- a/staging/mausezahn.c ++++ b/staging/mausezahn.c +@@ -192,9 +192,6 @@ int reset(void) + int i; + time_t t; + +- // Determine platform type sizes: +- MZ_SIZE_LONG_INT = sizeof(long int); +- + mz_default_config_path[0] = 0x00; + mz_default_log_path[0] = 0x00; + +diff --git a/staging/mz.h b/staging/mz.h +index 5afe57d1..c7a131d8 100644 +--- a/staging/mz.h ++++ b/staging/mz.h +@@ -108,8 +108,6 @@ static inline void verbose_l2(const char *format, ...) + #define IPADDRSIZE 46 + + +-int MZ_SIZE_LONG_INT; +- + char mz_default_config_path[256]; + char mz_default_log_path[256]; + diff --git a/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch b/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch new file mode 100644 index 000000000..d944406f3 --- /dev/null +++ b/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch @@ -0,0 +1,139 @@ +From bfa3c89317869ffe1e90b7e01e7cacad7a7ea10e Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Thu, 13 Aug 2020 12:09:28 +0200 +Subject: [PATCH] mausezahn: make needlessly global variables static + +Move variables only used withing a single compilation unit from mz.h and +make them static. This avoids "multiple definition of symbol" linker +errors with gcc-10. + +Updates #216 + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/bfa3c89317869ffe1e90b7e01e7cacad7a7ea10e] +Signed-off-by: Fabrice Fontaine +--- + staging/dns.c | 2 ++ + staging/mz.h | 28 +--------------------------- + staging/rcv_rtp.c | 19 +++++++++++++++++++ + staging/rtp.c | 1 - + 4 files changed, 22 insertions(+), 28 deletions(-) + +diff --git a/staging/dns.c b/staging/dns.c +index bfa61d84..83227e25 100644 +--- a/staging/dns.c ++++ b/staging/dns.c +@@ -89,6 +89,8 @@ + "| arcount (or arc) ........... Number of RRs in additional records section 0 / 0\n" \ + "\n" + ++static u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily ++static u_int32_t gbuf_s; + + int dns_get_query (char* argval); + int dns_get_answer (char* argval); +diff --git a/staging/mz.h b/staging/mz.h +index c7a131d8..42e64cfc 100644 +--- a/staging/mz.h ++++ b/staging/mz.h +@@ -285,11 +285,6 @@ FILE *fp, *fp2; // global multipurpose file pointer + long double total_d; + clock_t mz_start, mz_stop; + +-enum rtp_display_mode { +- BAR, NCURSES, TEXT +-} rtp_dm; +- +- + int mz_rand; + int bwidth; + +@@ -298,14 +293,7 @@ struct mz_timestamp { + u_int32_t nsec; + }; + +-struct mz_timestamp +- tv, +- timeTX[TIME_COUNT_MAX], +- timeRX[TIME_COUNT_MAX]; +- + int32_t +- time0, +- jitter_rfc, + jitter[TIME_COUNT_MAX]; + + int +@@ -322,14 +310,8 @@ u_int16_t + sqnr_next; + + u_int32_t +- drop, // packet drop count +- dis, // packet disorder count + gind, // a global index to run through deltaRX, deltaTX, and jitter +- gind_max, // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT +- gtotal; // counts number of file write cycles (see "got_rtp_packet()") +- +- +-char rtp_filter_str[64]; ++ gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT + + struct tx_struct + { +@@ -496,14 +478,6 @@ struct tx_struct + + } tx; // NOTE: tx elements are considered as default values for MOPS + +- +- +- +- +-u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily +-u_int32_t gbuf_s; // +- +- + // ************************************ + // + // Prototypes: General Tools +diff --git a/staging/rcv_rtp.c b/staging/rcv_rtp.c +index 0a911552..f43b92cd 100644 +--- a/staging/rcv_rtp.c ++++ b/staging/rcv_rtp.c +@@ -39,6 +39,25 @@ + #include "mz.h" + #include "mops.h" + ++static enum rtp_display_mode { ++ BAR, NCURSES, TEXT ++} rtp_dm; ++ ++static int32_t ++ time0, ++ jitter_rfc; ++ ++static struct mz_timestamp ++ timeTX[TIME_COUNT_MAX], ++ timeRX[TIME_COUNT_MAX]; ++ ++static u_int32_t ++ drop, // packet drop count ++ dis, // packet disorder count ++ gtotal; // counts number of file write cycles (see "got_rtp_packet()") ++ ++static char rtp_filter_str[64]; ++ + // Initialize the rcv_rtp process: Read user parameters and initialize globals + int rcv_rtp_init(void) + { +diff --git a/staging/rtp.c b/staging/rtp.c +index 54a195eb..da40884b 100644 +--- a/staging/rtp.c ++++ b/staging/rtp.c +@@ -56,7 +56,6 @@ + "|\n" + + +- + int create_rtp_packet(void) + { + u_int8_t byte1, byte2; diff --git a/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch b/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch new file mode 100644 index 000000000..12662d78f --- /dev/null +++ b/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch @@ -0,0 +1,77 @@ +From 0d5aa3246c20dad2d76165559fb575136b7216e8 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Wed, 19 Aug 2020 12:04:47 +0200 +Subject: [PATCH] mausezahn: move variable definitions cli.h to cli.c + +Move variable definitions to avoid "multiple definition of symbol" +linker errors with gcc-10. + +Updates #216 + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/0d5aa3246c20dad2d76165559fb575136b7216e8] +Signed-off-by: Fabrice Fontaine +--- + staging/cli.c | 13 +++++++++++++ + staging/cli.h | 20 ++++++++++---------- + 2 files changed, 23 insertions(+), 10 deletions(-) + +diff --git a/staging/cli.c b/staging/cli.c +index 5b5a1592..dbfdb550 100644 +--- a/staging/cli.c ++++ b/staging/cli.c +@@ -23,6 +23,19 @@ + #include "mops.h" + #include "llist.h" + ++struct cli_def *gcli; ++ ++char mz_username[32]; ++char mz_password[32]; ++char mz_enable[32]; ++char mz_listen_addr[16]; ++int mz_port; ++struct mops *clipkt; // actual packet used by CLI thread ++ ++int clidev; ++ ++int cli_debug; ++ + void mz_cli_init(void) + { + amp_head = automops_init(); +diff --git a/staging/cli.h b/staging/cli.h +index 1a0156fd..2ec153a0 100644 +--- a/staging/cli.h ++++ b/staging/cli.h +@@ -54,19 +54,19 @@ + #define MZ_DEFAULT_ENABLE_PASSWORD "mops" + #define MZ_DEFAULT_PORT 25542 // Towel day and 42 + +-struct cli_def *gcli; +- +-char mz_username[32]; +-char mz_password[32]; +-char mz_enable[32]; +-char mz_listen_addr[16]; +-int mz_port; +-struct mops *clipkt; // actual packet used by CLI thread ++extern struct cli_def *gcli; ++ ++extern char mz_username[32]; ++extern char mz_password[32]; ++extern char mz_enable[32]; ++extern char mz_listen_addr[16]; ++extern int mz_port; ++extern struct mops *clipkt; // actual packet used by CLI thread + +-int clidev; ++extern int clidev; + + // ================================================================= +-int cli_debug; ++extern int cli_debug; + + // Flags from 0x0000 to 0xFFFF + // cli_debug & 8000 => Developer specific debugs diff --git a/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch b/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch new file mode 100644 index 000000000..834ee93a9 --- /dev/null +++ b/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch @@ -0,0 +1,69 @@ +From 3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Wed, 19 Aug 2020 12:58:51 +0200 +Subject: [PATCH] mausezahn: move variable definitions from mops.h to mops.c + +Move variable definitions to avoid "multiple definition of symbol" +linker errors with gcc-10. + +Updates #216 + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44] +Signed-off-by: Fabrice Fontaine +--- + staging/mops.c | 5 ++++- + staging/mops.h | 8 ++++---- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/staging/mops.c b/staging/mops.c +index 599d317f..fc00e29a 100644 +--- a/staging/mops.c ++++ b/staging/mops.c +@@ -46,8 +46,11 @@ + #include "mz.h" + #include "mops.h" + ++unsigned int min_frame_s; ++unsigned int max_frame_s; + +- ++struct automops * amp_head; ++struct mops *mp_head; // This global will point to the head of the mops list + + // Creates first element, aka "head" element + // This element can also be used! See mops_alloc_packet! +diff --git a/staging/mops.h b/staging/mops.h +index 96953e66..cf19f098 100644 +--- a/staging/mops.h ++++ b/staging/mops.h +@@ -114,8 +114,8 @@ + // These are initialized with the definitions MIN_MOPS_FRAME_SIZE and + // MAX_MOPS_FRAME_SIZE above but can be overridden by the user (without + // extending these limits) +-unsigned int min_frame_s; +-unsigned int max_frame_s; ++extern unsigned int min_frame_s; ++extern unsigned int max_frame_s; + + struct mops_counter + { +@@ -246,7 +246,7 @@ struct automops { + }; + + +-struct automops * amp_head; ++extern struct automops * amp_head; + + + struct mops +@@ -688,7 +688,7 @@ struct mops_ext_syslog //TODO + + ///////////////////////////////////////////////////////////////// + +-struct mops *mp_head; // This global will point to the head of the mops list ++extern struct mops *mp_head; // This global will point to the head of the mops list + + ///////////////////////////////////////////////////////////////// + // MOPS Prototypes: diff --git a/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch b/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch new file mode 100644 index 000000000..99eba8e7d --- /dev/null +++ b/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch @@ -0,0 +1,47 @@ +From 6f20cd366ea73b8b9cf49568e9b95cd79922daed Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Wed, 19 Aug 2020 13:13:34 +0200 +Subject: [PATCH] mausezahn: move variable definitions from llist.h to llist.c + +Move variable definitions to avoid "multiple definition of symbol" +linker errors with gcc-10. + +Updates #216 + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/6f20cd366ea73b8b9cf49568e9b95cd79922daed] +Signed-off-by: Fabrice Fontaine +--- + staging/llist.c | 2 ++ + staging/llist.h | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/staging/llist.c b/staging/llist.c +index d729e465..9ef2d1a2 100644 +--- a/staging/llist.c ++++ b/staging/llist.c +@@ -40,6 +40,8 @@ + * + */ + ++struct mz_ll *packet_sequences; ++struct mz_ll *cli_seq; // currently edited packet sequence used by CLI + + // Create new list element - may be the first one (list==NULL) + // +diff --git a/staging/llist.h b/staging/llist.h +index 49a87c7d..d9e59b86 100644 +--- a/staging/llist.h ++++ b/staging/llist.h +@@ -49,8 +49,8 @@ struct mz_ll { + void *data; // points to your data + }; + +-struct mz_ll *packet_sequences; +-struct mz_ll *cli_seq; // currently edited packet sequence used by CLI ++extern struct mz_ll *packet_sequences; ++extern struct mz_ll *cli_seq; // currently edited packet sequence used by CLI + + // prototypes + struct mz_ll * mz_ll_create_new_element(struct mz_ll *list); diff --git a/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch b/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch new file mode 100644 index 000000000..d8db7dffd --- /dev/null +++ b/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch @@ -0,0 +1,184 @@ +From 56f8f399a20275a4a73ebc4450bd8eeba7ee1656 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +Date: Wed, 19 Aug 2020 13:13:54 +0200 +Subject: [PATCH] mausezahn: move variable definitions from mz.h to mausezahn.c + +Move variable definitions to avoid "multiple definition of symbol" +linker errors with gcc-10. + +Fixes #216 + +Signed-off-by: Tobias Klauser +[Retrieved from: +https://github.com/netsniff-ng/netsniff-ng/commit/56f8f399a20275a4a73ebc4450bd8eeba7ee1656] +Signed-off-by: Fabrice Fontaine +--- + staging/mausezahn.c | 46 ++++++++++++++++++++++++++++++++++++++++ + staging/mz.h | 51 +++++++++++++++++++++++++-------------------- + 2 files changed, 74 insertions(+), 23 deletions(-) + +diff --git a/staging/mausezahn.c b/staging/mausezahn.c +index 19d2937a..cae57a1b 100644 +--- a/staging/mausezahn.c ++++ b/staging/mausezahn.c +@@ -32,8 +32,54 @@ + #include "die.h" + #include "dev.h" + ++enum operating_modes mode; ++ ++int ipv6_mode; ++int quiet; // don't even print 'important standard short messages' ++int verbose; // report character ++int simulate; // if 1 then don't really send frames ++ ++char path[256]; ++char filename[256]; ++FILE *fp, *fp2; // global multipurpose file pointer ++ ++long double total_d; ++clock_t mz_start, mz_stop; ++ ++int mz_rand; ++int bwidth; ++ ++int32_t ++ jitter[TIME_COUNT_MAX]; ++ ++int ++ rtp_log, ++ time0_flag, // If set then time0 has valid data ++ sqnr0_flag; ++ ++u_int8_t ++ mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() ++ ++u_int16_t ++ sqnr_cur, ++ sqnr_last, ++ sqnr_next; ++ ++u_int32_t ++ gind, // a global index to run through deltaRX, deltaTX, and jitter ++ gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT ++ ++struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS ++ ++struct device_struct device_list[MZ_MAX_DEVICES]; ++ ++int device_list_entries; ++ + int verbose_level = 0; + ++char mz_default_config_path[256]; ++char mz_default_log_path[256]; ++ + static const char *short_options = "46hqvVSxra:A:b:B:c:d:E:f:F:l:p:P:R:t:T:M:Q:X:"; + + static void signal_handler(int number) +diff --git a/staging/mz.h b/staging/mz.h +index 42e64cfc..33e74e60 100644 +--- a/staging/mz.h ++++ b/staging/mz.h +@@ -108,8 +108,8 @@ static inline void verbose_l2(const char *format, ...) + #define IPADDRSIZE 46 + + +-char mz_default_config_path[256]; +-char mz_default_log_path[256]; ++extern char mz_default_config_path[256]; ++extern char mz_default_log_path[256]; + + + struct arp_table_struct { +@@ -159,9 +159,11 @@ struct device_struct + struct pcap *p_arp; // pcap handle + struct arp_table_struct *arp_table; // dedicated ARP table + int ps; // packet socket +-} device_list[MZ_MAX_DEVICES]; ++}; ++ ++extern struct device_struct device_list[MZ_MAX_DEVICES]; + +-int device_list_entries; ++extern int device_list_entries; + + + #pragma pack(1) +@@ -270,46 +272,47 @@ enum operating_modes + SYSLOG, + LLDP, + IGMP +-} mode; ++}; + ++extern enum operating_modes mode; + +-int ipv6_mode; +-int quiet; // don't even print 'important standard short messages' +-int verbose; // report character +-int simulate; // if 1 then don't really send frames ++extern int ipv6_mode; ++extern int quiet; // don't even print 'important standard short messages' ++extern int verbose; // report character ++extern int simulate; // if 1 then don't really send frames + +-char path[256]; +-char filename[256]; +-FILE *fp, *fp2; // global multipurpose file pointer ++extern char path[256]; ++extern char filename[256]; ++extern FILE *fp, *fp2; // global multipurpose file pointer + +-long double total_d; +-clock_t mz_start, mz_stop; ++extern long double total_d; ++extern clock_t mz_start, mz_stop; + +-int mz_rand; +-int bwidth; ++extern int mz_rand; ++extern int bwidth; + + struct mz_timestamp { + u_int32_t sec; + u_int32_t nsec; + }; + +-int32_t +- jitter[TIME_COUNT_MAX]; ++extern int32_t ++ jitter[TIME_COUNT_MAX]; + +-int ++extern int + rtp_log, + time0_flag, // If set then time0 has valid data + sqnr0_flag; + +-u_int8_t ++extern u_int8_t + mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() + +-u_int16_t ++extern u_int16_t + sqnr_cur, + sqnr_last, + sqnr_next; + +-u_int32_t ++extern u_int32_t + gind, // a global index to run through deltaRX, deltaTX, and jitter + gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT + +@@ -476,7 +479,9 @@ struct tx_struct + rtp_sqnr, + rtp_stmp; + +-} tx; // NOTE: tx elements are considered as default values for MOPS ++}; ++ ++extern struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS + + // ************************************ + // diff --git a/buildroot/package/netsniff-ng/netsniff-ng.hash b/buildroot/package/netsniff-ng/netsniff-ng.hash index c9408ccbd..80736f85c 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.hash +++ b/buildroot/package/netsniff-ng/netsniff-ng.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 7949d38eb5b507700ea0f3c87e9f804d87b43f86ea5de0e961451044c2d3dba2 netsniff-ng-0.6.6.tar.xz +sha256 96d85f2d216abcf6ba0ff610809b62c3a6430e21cbdd7bfef48cd9bde074848f netsniff-ng-0.6.7.tar.xz # Locally computed sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING diff --git a/buildroot/package/netsniff-ng/netsniff-ng.mk b/buildroot/package/netsniff-ng/netsniff-ng.mk index 283ecaf24..46f1b3d15 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.mk +++ b/buildroot/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = 0.6.6 +NETSNIFF_NG_VERSION = 0.6.7 NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 diff --git a/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch b/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch new file mode 100644 index 000000000..2d5b38eb3 --- /dev/null +++ b/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch @@ -0,0 +1,30 @@ +From cd09fd82522861830aaf9d237b26eef5f9ba50d2 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 21 Nov 2018 20:47:42 -0800 +Subject: [PATCH] MIB-II: Only log once that opening /proc/net/if_inet6 failed + +If IPv6 has been disabled (ipv6.disable=1) then opening /proc/net/if_inet6 +fails. Only log this once instead of thousand of times a day. + +Reported-by: Fif +Signed-off-by: Peter Korsgaard +--- + agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +index 5ddead3e0c..280575ce39 100644 +--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +@@ -234,7 +234,7 @@ _load_v6(netsnmp_container *container, int idx_offset) + + #define PROCFILE "/proc/net/if_inet6" + if (!(in = fopen(PROCFILE, "r"))) { +- snmp_log_perror("ipaddress_linux: could not open " PROCFILE); ++ NETSNMP_LOGONCE((LOG_ERR, "ipaddress_linux: could not open " PROCFILE)); + return -2; + } + +-- +2.20.1 + diff --git a/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch b/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch index 01e77e977..2d4637511 100644 --- a/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch +++ b/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch @@ -16,7 +16,7 @@ diff --git a/Makefile b/Makefile index f279f01..5698c87 100644 --- a/Makefile +++ b/Makefile -@@ -109,7 +109,7 @@ endef +@@ -110,7 +110,7 @@ endef # prefixed install macro for each host sub target define do_build_prefix_install diff --git a/buildroot/package/netsurf/netsurf.hash b/buildroot/package/netsurf/netsurf.hash index 0f38ea208..77de5c6de 100644 --- a/buildroot/package/netsurf/netsurf.hash +++ b/buildroot/package/netsurf/netsurf.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e384eaf47e65c186da5001f1055a02f2d72ff17b50f403b8392546a2cf65ff netsurf-all-3.9.tar.gz -sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING +sha256 495adf6b6614ce36fca6c605f7c321f9cb4a3df838043158122678ce2b3325b7 netsurf-all-3.10.tar.gz +sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING diff --git a/buildroot/package/netsurf/netsurf.mk b/buildroot/package/netsurf/netsurf.mk index 0077adde2..5677b6946 100644 --- a/buildroot/package/netsurf/netsurf.mk +++ b/buildroot/package/netsurf/netsurf.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSURF_VERSION = 3.9 +NETSURF_VERSION = 3.10 NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_LICENSE = GPL-2.0 @@ -15,7 +15,7 @@ NETSURF_DEPENDENCIES = expat jpeg libpng \ ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) NETSURF_DEPENDENCIES += libgtk2 -NETSURF_FRONTEND = gtk +NETSURF_FRONTEND = gtk2 endif ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y) diff --git a/buildroot/package/nettle/nettle.hash b/buildroot/package/nettle/nettle.hash index 1e13aab41..1bbc1c6d2 100644 --- a/buildroot/package/nettle/nettle.hash +++ b/buildroot/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.5.1.tar.gz.sig -sha256 75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 nettle-3.5.1.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.6.tar.gz.sig +sha256 d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 nettle-3.6.tar.gz # Locally calculated -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk index 380d16752..50ebdc706 100644 --- a/buildroot/package/nettle/nettle.mk +++ b/buildroot/package/nettle/nettle.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETTLE_VERSION = 3.5.1 +NETTLE_VERSION = 3.6 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES diff --git a/buildroot/package/network-manager/Config.in b/buildroot/package/network-manager/Config.in index accea923a..218dc860f 100644 --- a/buildroot/package/network-manager/Config.in +++ b/buildroot/package/network-manager/Config.in @@ -41,8 +41,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER - select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - select BR2_PACKAGE_MODEM_MANAGER_LIBQMI help This option enables support for ModemManager diff --git a/buildroot/package/network-manager/network-manager.hash b/buildroot/package/network-manager/network-manager.hash index ca8b0a2f4..93a9b5017 100644 --- a/buildroot/package/network-manager/network-manager.hash +++ b/buildroot/package/network-manager/network-manager.hash @@ -1,5 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.20.4.sha256sum -sha256 a3d738b7e702d9548b522a5781a5fb75ba69363f468c400ddd885ca65035914c NetworkManager-1.20.4.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.22.10.sha256sum +sha256 2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77 NetworkManager-1.22.10.tar.xz # Locally computed -sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING -sha256 64a6d38d1b551a1bfd8509e732cdc9202d2681b61f5b39298f488674d3466fc9 CONTRIBUTING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 f0543c137bc0eece552d42642d1bab31707ca3b3663d9c7a81ac3b270a4780e7 CONTRIBUTING diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index 727cfb98a..2a04b00ce 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/package/network-manager/network-manager.mk @@ -4,18 +4,15 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.20 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 +NETWORK_MANAGER_VERSION_MAJOR = 1.22 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ libgcrypt wpa_supplicant util-linux host-intltool readline libndp -# Even though the COPYING file only contains the GPL-2.0 text, many -# parts of network-manager are under LGPL-2.0. See the "Legal" section -# of the CONTRIBUTING file for details. -NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm) -NETWORK_MANAGER_LICENSE_FILES = COPYING CONTRIBUTING +NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) +NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING NETWORK_MANAGER_CONF_ENV = \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ @@ -26,12 +23,14 @@ NETWORK_MANAGER_CONF_ENV = \ ac_cv_file__etc_SuSE_release=no NETWORK_MANAGER_CONF_OPTS = \ + --disable-introspection \ --disable-tests \ --disable-qt \ --disable-more-warnings \ --with-crypto=gnutls \ --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown + --disable-ifupdown \ + --without-nm-cloud-setup ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono diff --git a/buildroot/package/nfs-utils/nfs-utils.hash b/buildroot/package/nfs-utils/nfs-utils.hash index a30013af9..6268552ca 100644 --- a/buildroot/package/nfs-utils/nfs-utils.hash +++ b/buildroot/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.4.3/sha256sums.asc -sha256 af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599 nfs-utils-2.4.3.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.2/sha256sums.asc +sha256 d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de nfs-utils-2.5.2.tar.xz # Locally computed -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/buildroot/package/nfs-utils/nfs-utils.mk b/buildroot/package/nfs-utils/nfs-utils.mk index 7af229a57..d60b5055a 100644 --- a/buildroot/package/nfs-utils/nfs-utils.mk +++ b/buildroot/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.4.3 +NFS_UTILS_VERSION = 2.5.2 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ diff --git a/buildroot/package/nftables/Config.in b/buildroot/package/nftables/Config.in index 6452ab4f5..8d172b725 100644 --- a/buildroot/package/nftables/Config.in +++ b/buildroot/package/nftables/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_NFTABLES bool "nftables" depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_PACKAGE_GMP select BR2_PACKAGE_LIBMNL select BR2_PACKAGE_LIBNFTNL help diff --git a/buildroot/package/nftables/nftables.hash b/buildroot/package/nftables/nftables.hash index 93c816edc..1112b7a8a 100644 --- a/buildroot/package/nftables/nftables.hash +++ b/buildroot/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 nftables-0.9.3.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 68d6fdfe8ab02303e6b1f13968a4022da5b0120110eaee3233d806857937b66e nftables-0.9.6.tar.bz2 +sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/buildroot/package/nftables/nftables.mk b/buildroot/package/nftables/nftables.mk index 210e950c1..8a003a5e3 100644 --- a/buildroot/package/nftables/nftables.mk +++ b/buildroot/package/nftables/nftables.mk @@ -4,15 +4,21 @@ # ################################################################################ -NFTABLES_VERSION = 0.9.3 +NFTABLES_VERSION = 0.9.6 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files -NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ - host-pkgconf $(TARGET_NLS_DEPENDENCIES) +NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc +ifeq ($(BR2_PACKAGE_GMP),y) +NFTABLES_DEPENDENCIES += gmp +NFTABLES_CONF_OPTS += --without-mini-gmp +else +NFTABLES_CONF_OPTS += --with-mini-gmp +endif + ifeq ($(BR2_PACKAGE_READLINE),y) NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses @@ -40,4 +46,10 @@ endif NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" +define NFTABLES_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch b/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch deleted file mode 100644 index 116175154..000000000 --- a/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 600d0a36c2af785c8284acadeb062d73247281af Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Sun, 23 Jul 2017 09:21:23 -0500 -Subject: [PATCH] nginx-upload-module: add openssl lib dependency - -When building against nginx 1.11.2+, requires additional --lcrypto dependency. (Nginx changed crypto approach -and dependencies for openssl are no longer default) - -More details found here: -https://github.com/vkholodkov/nginx-upload-module/issues/79 - -Upstream pull request: -https://github.com/vkholodkov/nginx-upload-module/pull/93 - -Resolves build failure: -objs/addon/nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3/ngx_http_upload_module.o \ -objs/ngx_modules.o \ --ldl -lpthread -lpthread -lpcre -lz -latomic_ops \ --Wl,-E -ngx_http_upload_module.o: In function `ngx_http_upload_flush_output_buffer': -ngx_http_upload_module.c:1625: undefined reference to `MD5_Update' -ngx_http_upload_module.c:1628: undefined reference to `SHA1_Update' -ngx_http_upload_module.c:1631: undefined reference to `SHA256_Update' -ngx_http_upload_module.c:1634: undefined reference to `SHA512_Update' - -Fixes: -http://autobuild.buildroot.net/results/e25f8ba8d8743e47a77707cf582e58477e1860e6 -http://autobuild.buildroot.net/results/c4aa6e22033be934bd311cd9761f646d44618dc0 -http://autobuild.buildroot.net/results/75e935d248b46df11c32c95526423a2287ac8c62 - -Signed-off-by: Matthew Weber ---- - config | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/config b/config -index cabd4f1..293529f 100644 ---- a/config -+++ b/config -@@ -1,11 +1,10 @@ --USE_MD5=YES --USE_SHA1=YES - ngx_addon_name=ngx_http_upload_module - - if test -n "$ngx_module_link"; then - ngx_module_type=HTTP - ngx_module_name=$ngx_addon_name - ngx_module_srcs="$ngx_addon_dir/ngx_http_upload_module.c" -+ ngx_module_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" - - . auto/module - else --- -1.9.1 - diff --git a/buildroot/package/nginx-upload/nginx-upload.hash b/buildroot/package/nginx-upload/nginx-upload.hash index ac04626eb..b1d380eb1 100644 --- a/buildroot/package/nginx-upload/nginx-upload.hash +++ b/buildroot/package/nginx-upload/nginx-upload.hash @@ -1,3 +1,3 @@ #Locally Computed: -sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz +sha256 61ad5bcb67c8f688a4c7a5611311a351049361840b8dfe78be542066f475166e nginx-upload-4423994c7d8fb491d95867f6af968585d949e7a9.tar.gz sha256 825f9684c427e29fd1ab085d5c421a4cbf96a460f3c58884a42c28bfbac5e544 LICENCE diff --git a/buildroot/package/nginx-upload/nginx-upload.mk b/buildroot/package/nginx-upload/nginx-upload.mk index 738542571..253ebeb34 100644 --- a/buildroot/package/nginx-upload/nginx-upload.mk +++ b/buildroot/package/nginx-upload/nginx-upload.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_UPLOAD_VERSION = 70bee48f1811eecd255ed094ce9f0fb560c390c3 +NGINX_UPLOAD_VERSION = 4423994c7d8fb491d95867f6af968585d949e7a9 NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION)) NGINX_UPLOAD_LICENSE = BSD-3-Clause NGINX_UPLOAD_LICENSE_FILES = LICENCE diff --git a/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch index cea68035e..31ccf88ff 100644 --- a/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ b/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch @@ -9,6 +9,8 @@ dependencies. Signed-off-by: Martin Bark [Peter: updated for 1.15.6] Signed-off-by: Peter Korsgaard +[Fabrice: use pkg-config instead of gdlib-config] +Signed-off-by: Fabrice Fontaine --- auto/lib/libgd/conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17,14 +19,15 @@ diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index 67863976..1a4379a5 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf -@@ -7,8 +7,8 @@ +@@ -7,8 +7,9 @@ ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs="-lgd" -+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" -+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" ++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib| ++ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" ++ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)" ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); (void) img" . auto/feature diff --git a/buildroot/package/nginx/Config.in b/buildroot/package/nginx/Config.in index 5c34f11ed..6ae790a94 100644 --- a/buildroot/package/nginx/Config.in +++ b/buildroot/package/nginx/Config.in @@ -75,6 +75,12 @@ config BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE help Enable ngx_http_image_filter_module +config BR2_PACKAGE_NGINX_HTTP_GEOIP_MODULE + bool "ngx_http_geoip_module" + select BR2_PACKAGE_GEOIP + help + Enable ngx_http_geoip_module + config BR2_PACKAGE_NGINX_HTTP_SUB_MODULE bool "ngx_http_sub_module" help @@ -128,6 +134,11 @@ config BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE help Enable ngx_http_degradation_module +config BR2_PACKAGE_NGINX_HTTP_SLICE_MODULE + bool "ngx_http_slice_module" + help + Enable ngx_http_slice_module + config BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE bool "ngx_http_stub_status_module" help @@ -279,6 +290,12 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE help Enable ngx_http_upstream_keepalive_module +config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE + bool "ngx_http_upstream_random_module" + default y + help + Enable ngx_http_upstream_random_module + endif #BR2_PACKAGE_NGINX_HTTP config BR2_PACKAGE_NGINX_MAIL @@ -317,12 +334,28 @@ config BR2_PACKAGE_NGINX_STREAM if BR2_PACKAGE_NGINX_STREAM +config BR2_PACKAGE_NGINX_STREAM_REALIP_MODULE + bool "ngx_stream_realip_module" + help + Enable ngx_stream_realip_module + config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE bool "ngx_stream_ssl_module" select BR2_PACKAGE_OPENSSL help Enable ngx_stream_ssl_module +config BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE + bool "ngx_stream_geoip_module" + select BR2_PACKAGE_GEOIP + help + Enable ngx_stream_geoip_module + +config BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE + bool "ngx_stream_ssl_preread_module" + help + Enable ngx_stream_ssl_preread_module + config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE bool "ngx_stream_limit_conn_module" default y @@ -335,6 +368,30 @@ config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE help Enable ngx_stream_access_module +config BR2_PACKAGE_NGINX_STREAM_GEO_MODULE + bool "ngx_stream_geo_module" + default y + help + Enable ngx_stream_geo_module + +config BR2_PACKAGE_NGINX_STREAM_MAP_MODULE + bool "ngx_stream_map_module" + default y + help + Enable ngx_stream_map_module + +config BR2_PACKAGE_NGINX_STREAM_SPLIT_CLIENTS_MODULE + bool "ngx_stream_split_clients_module" + default y + help + Enable ngx_stream_split_clients_module + +config BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE + bool "ngx_stream_return_module" + default y + help + Enable ngx_stream_return_module + config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE bool "ngx_stream_upstream_hash_module" default y @@ -347,6 +404,12 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE help Enable ngx_stream_upstream_least_conn_module +config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE + bool "ngx_stream_upstream_random_module" + default y + help + Enable ngx_stream_upstream_random_module + config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE bool "ngx_stream_upstream_zone_module" default y diff --git a/buildroot/package/nginx/nginx.hash b/buildroot/package/nginx/nginx.hash index 3ec7ff244..8d17931a2 100644 --- a/buildroot/package/nginx/nginx.hash +++ b/buildroot/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 7dd65d405c753c41b7fdab9415cfb4bdbaf093ec6d9f7432072d52cb7bcbb689 nginx-1.17.9.tar.gz +sha256 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 nginx-1.18.0.tar.gz # License files, locally calculated -sha256 28ad30e2f64bd89ac1287b4606906bb99ed04d9f4e13fb6564a0be9c8a23f509 LICENSE +sha256 28ad30e2f64bd89ac1287b4606906bb99ed04d9f4e13fb6564a0be9c8a23f509 LICENSE diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 9bbb3fc20..00fb14768 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.17.9 +NGINX_VERSION = 1.18.0 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE @@ -14,8 +14,7 @@ NGINX_CONF_OPTS = \ --crossbuild=Linux::$(BR2_ARCH) \ --with-cc="$(TARGET_CC)" \ --with-cpp="$(TARGET_CC)" \ - --with-ld-opt="$(TARGET_LDFLAGS)" \ - --with-ipv6 + --with-ld-opt="$(TARGET_LDFLAGS)" # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. @@ -50,8 +49,8 @@ NGINX_CONF_OPTS += \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/lock/nginx.lock \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ --user=www-data \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \ @@ -86,7 +85,6 @@ endif # modules disabled or not activated because of missing dependencies: # - google_perftools (googleperftools) -# - http_geoip_module (geoip) # - http_perl_module (host-perl) # - pcre-jit (want to rebuild pcre) @@ -135,6 +133,11 @@ NGINX_DEPENDENCIES += gd jpeg libpng NGINX_CONF_OPTS += --with-http_image_filter_module endif +ifeq ($(BR2_PACKAGE_NGINX_HTTP_GEOIP_MODULE),y) +NGINX_DEPENDENCIES += geoip +NGINX_CONF_OPTS += --with-http_geoip_module +endif + ifeq ($(BR2_PACKAGE_NGINX_HTTP_GUNZIP_MODULE),y) NGINX_DEPENDENCIES += zlib NGINX_CONF_OPTS += --with-http_gunzip_module @@ -172,6 +175,7 @@ NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_HTTP_AUTH_REQUEST_MODULE),--with-http_auth_request_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_RANDOM_INDEX_MODULE),--with-http_random_index_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE),--with-http_degradation_module) \ + $(if $(BR2_PACKAGE_NGINX_HTTP_SLICE_MODULE),--with-http_slice_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE),--with-http_stub_status_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE),,--without-http_charset_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_SSI_MODULE),,--without-http_ssi_module) \ @@ -194,6 +198,7 @@ NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE),,--without-http_browser_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \ + $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) else # !BR2_PACKAGE_NGINX_HTTP @@ -220,16 +225,34 @@ endif # BR2_PACKAGE_NGINX_MAIL ifeq ($(BR2_PACKAGE_NGINX_STREAM),y) NGINX_CONF_OPTS += --with-stream +ifeq ($(BR2_PACKAGE_NGINX_STREAM_REALIP_MODULE),y) +NGINX_CONF_OPTS += --with-stream_realip_module +endif + ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y) NGINX_DEPENDENCIES += openssl NGINX_CONF_OPTS += --with-stream_ssl_module endif +ifeq ($(BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE),y) +NGINX_DEPENDENCIES += geoip +NGINX_CONF_OPTS += --with-stream_geoip_module +endif + +ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE),y) +NGINX_CONF_OPTS += --with-stream_ssl_preread_module +endif + NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_GEO_MODULE),,--without-stream_geo_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_MAP_MODULE),,--without-stream_map_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_SPLIT_CLIENTS_MODULE),,--without-stream_split_clients_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE),,--without-stream_return_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \ + $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE),,--without-stream_upstream_random_module) \ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module) endif # BR2_PACKAGE_NGINX_STREAM @@ -267,7 +290,6 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR define NGINX_CONFIGURE_CMDS cd $(@D) ; $(NGINX_CONF_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \ ./configure $(NGINX_CONF_OPTS) \ --with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)" endef diff --git a/buildroot/package/nginx/nginx.service b/buildroot/package/nginx/nginx.service index 9fd215fd3..f203cecdc 100644 --- a/buildroot/package/nginx/nginx.service +++ b/buildroot/package/nginx/nginx.service @@ -6,10 +6,10 @@ After=syslog.target network.target Type=forking PIDFile=/run/nginx.pid ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit +ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -s quit PrivateDevices=yes [Install] diff --git a/buildroot/package/nmon/nmon.hash b/buildroot/package/nmon/nmon.hash index 432f71d84..fd3f09c63 100644 --- a/buildroot/package/nmon/nmon.hash +++ b/buildroot/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 246ccfc74d5af55d992601fc4d3d4a72 lmon16g.c -sha1 926217a98f78dd398d4d5690d7b10b8b2b620168 lmon16g.c +md5 df67f07ea4006c6204acff586beada81 lmon16m.c +sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c # Locally computed -sha256 da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688 lmon16g.c +sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c diff --git a/buildroot/package/nmon/nmon.mk b/buildroot/package/nmon/nmon.mk index f7edd66a2..8b39748cc 100644 --- a/buildroot/package/nmon/nmon.mk +++ b/buildroot/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16g +NMON_VERSION = 16m NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ diff --git a/buildroot/package/nodm/Config.in b/buildroot/package/nodm/Config.in index 38171e8dc..2dd6f1e1c 100644 --- a/buildroot/package/nodm/Config.in +++ b/buildroot/package/nodm/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_NODM depends on BR2_PACKAGE_XORG7 depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_LINUX_PAM @@ -18,7 +17,7 @@ config BR2_PACKAGE_NODM https://github.com/spanezz/nodm/ -comment "nodm needs a glibc or uClibc toolchain w/ wchar, locale, dynamic library" +comment "nodm needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_PACKAGE_XORG7 depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS diff --git a/buildroot/package/ntp/S49ntp b/buildroot/package/ntp/S49ntp index 35e58746b..66c5f70a5 100644 --- a/buildroot/package/ntp/S49ntp +++ b/buildroot/package/ntp/S49ntp @@ -1,34 +1,56 @@ -#! /bin/sh +#!/bin/sh +# +# Starts Network Time Protocol daemon +# -NAME=ntpd +DAEMON="ntpd" +PIDFILE="/var/run/$DAEMON.pid" -# Read config file if it is present. -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi +NTPD_ARGS="-g" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $NTPD_ARGS -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} case "$1" in - start) - printf "Starting $NAME: " - start-stop-daemon -S -q -x /usr/sbin/ntpd -- -g - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping $NAME: " - start-stop-daemon -K -q -n $NAME - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - echo "Restarting $NAME: " - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac - -exit 0 diff --git a/buildroot/package/numactl/Config.in b/buildroot/package/numactl/Config.in index 8ea07bb85..cd47f2f9a 100644 --- a/buildroot/package/numactl/Config.in +++ b/buildroot/package/numactl/Config.in @@ -1,9 +1,15 @@ -config BR2_PACKAGE_NUMACTL - bool "numactl" +config BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS + bool # numactl uses some system calls that are not available on all # architectures. - depends on BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc + +config BR2_PACKAGE_NUMACTL + bool "numactl" + depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS help numactl allows you to run your application on specific cpus and memory nodes. It does this by supplying a NUMA memory diff --git a/buildroot/package/numactl/numactl.hash b/buildroot/package/numactl/numactl.hash index 61cb94b3b..802175d36 100644 --- a/buildroot/package/numactl/numactl.hash +++ b/buildroot/package/numactl/numactl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d numactl-2.0.13.tar.gz -sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md +sha256 1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035 numactl-2.0.14.tar.gz +sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md diff --git a/buildroot/package/numactl/numactl.mk b/buildroot/package/numactl/numactl.mk index 4d3ceeb6c..d0dd5c26f 100644 --- a/buildroot/package/numactl/numactl.mk +++ b/buildroot/package/numactl/numactl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.13 +NUMACTL_VERSION = 2.0.14 NUMACTL_SITE = $(call github,numactl,numactl,v$(NUMACTL_VERSION)) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = README.md diff --git a/buildroot/package/nut/0004-nut_check_libgd.m4-try-to-find-gd-through-pkg-config.patch b/buildroot/package/nut/0004-nut_check_libgd.m4-try-to-find-gd-through-pkg-config.patch new file mode 100644 index 000000000..3c4a88b47 --- /dev/null +++ b/buildroot/package/nut/0004-nut_check_libgd.m4-try-to-find-gd-through-pkg-config.patch @@ -0,0 +1,120 @@ +From cb507c44d26d8ae04a0cc3d1c24e79e3bf33ba23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 29 Jul 2020 22:51:54 +0200 +Subject: [PATCH] nut_check_libgd.m4: try to find gd through pkg-config + +gdlib-config has been dropped from version 2.3.0 with +https://github.com/libgd/libgd/commit/d62f608c7c4a814c70d4ba777725e3e62d9e2cde + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/networkupstools/nut/commit/cb507c44d26d8ae04a0cc3d1c24e79e3bf33ba23] +--- + m4/nut_check_libgd.m4 | 88 ++++++++++++++++++++++++------------------- + 1 file changed, 50 insertions(+), 38 deletions(-) + +diff --git a/m4/nut_check_libgd.m4 b/m4/nut_check_libgd.m4 +index 73f4da76d..c4e96761c 100644 +--- a/m4/nut_check_libgd.m4 ++++ b/m4/nut_check_libgd.m4 +@@ -12,50 +12,62 @@ if test -z "${nut_have_libgd_seen}"; then + LDFLAGS_ORIG="${LDFLAGS}" + LIBS_ORIG="${LIBS}" + +- dnl Initial defaults. These are only used if gdlib-config is +- dnl unusable and the user fails to pass better values in --with +- dnl arguments +- CFLAGS="" +- LDFLAGS="-L/usr/X11R6/lib" +- LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11" ++ AC_MSG_CHECKING(for gd version via pkg-config) ++ GD_VERSION="`pkg-config --silence-errors --modversion gdlib 2>/dev/null`" ++ if test "$?" = "0" -a -n "${GD_VERSION}"; then ++ CFLAGS="`pkg-config --silence-errors --cflags gdlib 2>/dev/null`" ++ LIBS="`pkg-config --silence-errors --libs gdlib 2>/dev/null`" ++ else ++ GD_VERSION="none" ++ fi ++ AC_MSG_RESULT(${GD_VERSION} found) + +- dnl By default seek in PATH +- GDLIB_CONFIG=gdlib-config +- AC_ARG_WITH(gdlib-config, +- AS_HELP_STRING([@<:@--with-gdlib-config=/path/to/gdlib-config@:>@], +- [path to program that reports GDLIB configuration]), +- [ +- case "${withval}" in +- "") ;; +- yes|no) +- AC_MSG_ERROR(invalid option --with(out)-gdlib-config - see docs/configure.txt) ++ if test "${GD_VERSION}" = "none"; then ++ dnl Initial defaults. These are only used if gdlib-config is ++ dnl unusable and the user fails to pass better values in --with ++ dnl arguments ++ CFLAGS="" ++ LDFLAGS="-L/usr/X11R6/lib" ++ LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11" ++ ++ dnl By default seek in PATH ++ GDLIB_CONFIG=gdlib-config ++ AC_ARG_WITH(gdlib-config, ++ AS_HELP_STRING([@<:@--with-gdlib-config=/path/to/gdlib-config@:>@], ++ [path to program that reports GDLIB configuration]), ++ [ ++ case "${withval}" in ++ "") ;; ++ yes|no) ++ AC_MSG_ERROR(invalid option --with(out)-gdlib-config - see docs/configure.txt) ++ ;; ++ *) ++ GDLIB_CONFIG="${withval}" ++ ;; ++ esac ++ ]) ++ ++ AC_MSG_CHECKING(for gd version via ${GDLIB_CONFIG}) ++ GD_VERSION=`${GDLIB_CONFIG} --version 2>/dev/null` ++ if test "$?" != "0" -o -z "${GD_VERSION}"; then ++ GD_VERSION="none" ++ fi ++ AC_MSG_RESULT(${GD_VERSION} found) ++ ++ case "${GD_VERSION}" in ++ none) ++ ;; ++ 2.0.5 | 2.0.6 | 2.0.7) ++ AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use ${GDLIB_CONFIG} script]]) ++ AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]]) + ;; + *) +- GDLIB_CONFIG="${withval}" ++ CFLAGS="`${GDLIB_CONFIG} --includes 2>/dev/null`" ++ LDFLAGS="`${GDLIB_CONFIG} --ldflags 2>/dev/null`" ++ LIBS="`${GDLIB_CONFIG} --libs 2>/dev/null`" + ;; + esac +- ]) +- +- AC_MSG_CHECKING(for gd version via ${GDLIB_CONFIG}) +- GD_VERSION=`${GDLIB_CONFIG} --version 2>/dev/null` +- if test "$?" != "0" -o -z "${GD_VERSION}"; then +- GD_VERSION="none" + fi +- AC_MSG_RESULT(${GD_VERSION} found) +- +- case "${GD_VERSION}" in +- none) +- ;; +- 2.0.5 | 2.0.6 | 2.0.7) +- AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use ${GDLIB_CONFIG} script]]) +- AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]]) +- ;; +- *) +- CFLAGS="`${GDLIB_CONFIG} --includes 2>/dev/null`" +- LDFLAGS="`${GDLIB_CONFIG} --ldflags 2>/dev/null`" +- LIBS="`${GDLIB_CONFIG} --libs 2>/dev/null`" +- ;; +- esac + + dnl Now allow overriding gd settings if the user knows best + AC_MSG_CHECKING(for gd include flags) diff --git a/buildroot/package/nut/nut.mk b/buildroot/package/nut/nut.mk index 4ea994712..ad575310f 100644 --- a/buildroot/package/nut/nut.mk +++ b/buildroot/package/nut/nut.mk @@ -9,6 +9,7 @@ NUT_VERSION = $(NUT_VERSION_MAJOR).4 NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR) NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client) NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3 +NUT_INSTALL_STAGING = YES NUT_DEPENDENCIES = host-pkgconf # Our patch changes m4 macros, so we need to autoreconf @@ -21,6 +22,7 @@ NUT_MAKE = $(MAKE1) # since the default location (/var/state/ups) maybe readonly. NUT_CONF_OPTS = \ --with-altpidpath=/var/run/upsd \ + --with-dev \ --without-hal # For uClibc-based toolchains, nut forgets to link with -lm @@ -44,9 +46,7 @@ endif # gd with support for png is required for the CGI ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) NUT_DEPENDENCIES += gd libpng -NUT_CONF_OPTS += \ - --with-cgi \ - --with-gdlib-config=$(STAGING_DIR)/usr/bin/gdlib-config +NUT_CONF_OPTS += --with-cgi else NUT_CONF_OPTS += --without-cgi endif diff --git a/buildroot/package/nvidia-driver/gl.pc b/buildroot/package/nvidia-driver/gl.pc index d822763f5..d01f5d694 100644 --- a/buildroot/package/nvidia-driver/gl.pc +++ b/buildroot/package/nvidia-driver/gl.pc @@ -7,5 +7,5 @@ Name: gl Description: Nvidia OpenGL library Version: 10.4.2 Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS +Cflags: -I${includedir} -DEGL_NO_X11 glx_tls: no diff --git a/buildroot/package/nvidia-tegra23/Config.in b/buildroot/package/nvidia-tegra23/Config.in deleted file mode 100644 index 9c9fd198d..000000000 --- a/buildroot/package/nvidia-tegra23/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -menuconfig BR2_PACKAGE_NVIDIA_TEGRA23 - bool "nvidia-tegra23" - depends on BR2_cortex_a9 - depends on BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - help - Install NVidia proprietary blobs to drive Tegra2 or Tegra3 - GPUs found in some mobile-targeted ARM SoCs. - -if BR2_PACKAGE_NVIDIA_TEGRA23 - -choice - prompt "Tegra platform" - help - Select the SOC platform. - -config BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA2 - bool "Tegra 2" - help - NVIDIA Tegra 2 is a dual-core Cortex-A9 without NEON. - -config BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA3 - bool "Tegra 3" - depends on BR2_ARM_CPU_HAS_NEON - help - NVIDIA Tegra 3 is a quad-core Cortex-A9 with NEON. - -endchoice - -source "package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in" -source "package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in" -endif - -comment "nvidia-tegra23 needs Xorg <= 1.14 and a glibc toolchain w/ EABIhf" - depends on BR2_cortex_a9 - depends on !BR2_ARM_EABIHF || !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in deleted file mode 100644 index 0c09051b6..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - bool "nvidia-tegra23 binaries" - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENMAX - help - Those packages provide libraries, drivers and firmware that - comes from NVIDIA Linux For Tegra. - - https://developer.nvidia.com/linux-tegra - -if BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "nvidia-tegra23-binaries" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "nvidia-tegra23-binaries" - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - default "nvidia-tegra23-binaries" - -endif diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc deleted file mode 100644 index 3af7eecc0..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: egl -Description: EGL implementation -Version: 1 -Cflags: -I${includedir}/EGL -Libs: -L${libdir} -lEGL diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc deleted file mode 100644 index 91387c979..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 1.1 implementation -Version: 1.1 -Cflags: -I${includedir}/GLES -Libs: -L${libdir} -lGLESv1_CM diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc deleted file mode 100644 index 356a1cba4..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 2 implementation -Version: 2 -Cflags: -I${includedir}/GLESv2 -Libs: -L${libdir} -lGLESv2 diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash deleted file mode 100644 index 50c3cda64..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://developer.nvidia.com/linux-tegra-rel-16 -sha1 295dcd63b2f122c2d99f07fcc083db9adb8ac178 Tegra20_Linux_R16.5_armhf.tbz2 -sha1 6be645c20d81d518856bc8520ef4c2472d57eaef Tegra30_Linux_R16.5_armhf.tbz2 diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk deleted file mode 100644 index ed3c5a78b..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# nvidia-tegra23-binaries -# -################################################################################ - -NVIDIA_TEGRA23_BINARIES_VERSION = $(NVIDIA_TEGRA23_VERSION) -NVIDIA_TEGRA23_BINARIES_SITE = $(NVIDIA_TEGRA23_SITE) -NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARIES_VERSION)_armhf.tbz2 - -NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software -NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE - -NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES - -# Those are not really needed to build nvidia-tegra23-binaries, but -# will be needed by packages who link against libraries provided by -# nvidia-tegra23-binaries. - -NVIDIA_TEGRA23_BINARIES_DEPENDENCIES = mesa3d-headers \ - xlib_libX11 xlib_libXext - -NVIDIA_TEGRA23_BINARIES_PROVIDES = libegl libgles libopenmax - -NVIDIA_TEGRA23_BINARIES_DRV = \ - nv_tegra/nvidia_drivers/usr/lib/xorg/modules/drivers/tegra_drv.abi$(BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI).so - -define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER - $(INSTALL) -d $(@D)/nv_tegra/nvidia_drivers - $(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \ - $(@D)/nv_tegra/nvidia_drivers.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) - -endef -NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER - -define NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS - mkdir -p $(1)/usr/lib - cp -dpfr $(@D)/nv_tegra/nvidia_drivers/usr/lib/*.so $(1)/usr/lib/ - (cd $(1)/usr/lib; \ - ln -sf libGLESv2.so.2 libGLESv2.so; \ - ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so; \ - ln -sf libEGL.so.1 libEGL.so \ - ) -endef - -define NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING_CMDS - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(STAGING_DIR)) - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ - cp -dpfr package/nvidia-tegra23/nvidia-tegra23-binaries/*.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/ -endef - -define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(TARGET_DIR)) - mkdir -p $(TARGET_DIR)/lib/firmware/ - cp -dpfr $(@D)/nv_tegra/nvidia_drivers/lib/firmware/*.bin \ - $(TARGET_DIR)/lib/firmware/ - $(INSTALL) -D -m 0644 $(@D)/nv_tegra/nvidia_drivers/etc/nv_tegra_release \ - $(TARGET_DIR)/etc/nv_tegra_release - $(INSTALL) -D -m 0644 $(@D)/$(NVIDIA_TEGRA23_BINARIES_DRV) \ - $(TARGET_DIR)/usr/lib/xorg/modules/drivers/tegra_drv.so -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in deleted file mode 100644 index df9de69dc..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_NVIDIA_TEGRA23_CODECS - bool "nvidia-tegra23 codecs" - depends on BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - help - NVIDIA Tegra restricted codecs from Linux For Tegra 16.5. - - https://developer.nvidia.com/linux-tegra-rel-16 diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash deleted file mode 100644 index 9b5c61496..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://developer.nvidia.com/linux-tegra-rel-16 -sha1 540e89d5462537cd59c8a86efdb786b3b4310868 Tegra20_Linux-codecs_R16.5_armhf.tbz2 -sha1 3637efe808f25594e3cdc2756aef6e0274ab70f4 Tegra30_Linux-codecs_R16.5_armhf.tbz2 diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk deleted file mode 100644 index 2885021c5..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# nvidia-tegra23-codecs -# -################################################################################ - -NVIDIA_TEGRA23_CODECS_VERSION = $(NVIDIA_TEGRA23_VERSION) -NVIDIA_TEGRA23_CODECS_SOURCE = $(NVIDIA_TEGRA23_BASE)-codecs_R$(NVIDIA_TEGRA23_CODECS_VERSION)_armhf.tbz2 -NVIDIA_TEGRA23_CODECS_SITE = $(NVIDIA_TEGRA23_SITE) -NVIDIA_TEGRA23_CODECS_LICENSE = NVIDIA(r) Tegra(r) Software License Agreement -NVIDIA_TEGRA23_CODECS_LICENSE_FILES = Tegra_Software_License_Agreement-Tegra-Linux-codecs.txt -NVIDIA_TEGRA23_CODECS_REDISTRIBUTE = NO - -# The archive contains an archive with the firmware codecs -define NVIDIA_TEGRA23_CODECS_EXTRACT_CMDS - $(INSTALL) -d $(@D) - $(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \ - $(NVIDIA_TEGRA23_CODECS_DL_DIR)/$(NVIDIA_TEGRA23_CODECS_SOURCE) | \ - $(TAR) --strip-components=0 -C $(@D) $(TAR_OPTIONS) - - $(INSTALL) -d $(@D)/restricted_codecs - $(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \ - $(@D)/restricted_codecs.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/restricted_codecs/ $(TAR_OPTIONS) - -endef - -define NVIDIA_TEGRA23_CODECS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/ - cp -dpfr $(@D)/restricted_codecs/lib/firmware/*.axf \ - $(TARGET_DIR)/lib/firmware/ -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23.mk deleted file mode 100644 index b97d0ccac..000000000 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# nvidia-tegra23 -# -################################################################################ - -NVIDIA_TEGRA23_VERSION = 16.5 - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA2),y) -NVIDIA_TEGRA23_SITE = http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/ventana_release_armhf -NVIDIA_TEGRA23_BASE = Tegra20_Linux -endif -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA3),y) -NVIDIA_TEGRA23_SITE = http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/cardhu_release_armhf -NVIDIA_TEGRA23_BASE = Tegra30_Linux -endif - -include $(sort $(wildcard package/nvidia-tegra23/*/*.mk)) diff --git a/buildroot/package/nvme/nvme.hash b/buildroot/package/nvme/nvme.hash index 94aefb2ff..a7ce51ca7 100644 --- a/buildroot/package/nvme/nvme.hash +++ b/buildroot/package/nvme/nvme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5 nvme-1.9.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 a75270e65a4a7a6add48f748ba216d8f68d78f90f8cb77e88e9753b74d527991 nvme-1.12.tar.gz +sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE diff --git a/buildroot/package/nvme/nvme.mk b/buildroot/package/nvme/nvme.mk index 5a7c634e3..678b97821 100644 --- a/buildroot/package/nvme/nvme.mk +++ b/buildroot/package/nvme/nvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVME_VERSION = 1.9 +NVME_VERSION = 1.12 NVME_SITE = $(call github,linux-nvme,nvme-cli,v$(NVME_VERSION)) NVME_LICENSE = GPL-2.0+ NVME_LICENSE_FILES = LICENSE diff --git a/buildroot/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch b/buildroot/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch new file mode 100644 index 000000000..0216038f2 --- /dev/null +++ b/buildroot/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch @@ -0,0 +1,30 @@ +From f0bbc17aeed1b636782a4b92e8191d90f310d0a2 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Mon, 1 Jun 2015 19:08:33 +0200 +Subject: [PATCH] include in gcc.hxx appears to be no longer necessary + +On MIPS this file pulls in enum processor which conflicts with +our class processor. + +[Upstream: f0bbc17aeed1b636782a4b92e8191d90f310d0a2] +Signed-off-by: Kamel Bouhara +--- + odb/gcc.hxx | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index 504b59b..c953047 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -46,8 +46,6 @@ extern "C" + #include + #include + +-#include +- + #include + #include + +-- +2.26.2 + diff --git a/buildroot/package/odb/0002-Remove-gratuitous-classes.patch b/buildroot/package/odb/0002-Remove-gratuitous-classes.patch new file mode 100644 index 000000000..f2d9303e0 --- /dev/null +++ b/buildroot/package/odb/0002-Remove-gratuitous-classes.patch @@ -0,0 +1,444 @@ +From 5486c8c85b9cfb92232518b2fadf6d8ed7b332d5 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 3 Jun 2015 21:35:43 +0200 +Subject: [PATCH] Remove gratuitous classes + +In the process also get rid of global class processor which conflicts +with enum processor on MIPS. + +[Upstream: bbc39ffe31c67506b4c03fc56fa3adcb925b6325] +Signed-off-by: Kamel Bouhara +--- + odb/context.hxx | 3 ++- + odb/generator.cxx | 24 ++++++++++++------------ + odb/generator.hxx | 26 ++++++++------------------ + odb/plugin.cxx | 18 +++++++----------- + odb/processor.cxx | 4 ++-- + odb/processor.hxx | 22 ++++++---------------- + odb/relational/validator.cxx | 6 +++--- + odb/relational/validator.hxx | 29 +++++++++-------------------- + odb/validator.cxx | 13 ++++++------- + odb/validator.hxx | 28 +++++++++------------------- + 10 files changed, 64 insertions(+), 109 deletions(-) + +diff --git a/odb/context.hxx b/odb/context.hxx +index 1cf002a..351bc61 100644 +--- a/odb/context.hxx ++++ b/odb/context.hxx +@@ -41,7 +41,8 @@ typedef cutl::re::format regex_format; + + typedef std::vector regex_mapping; + +-// ++// Generic exception thrown to indicate a failure when diagnostics ++// has already been issued (to stderr). + // + class operation_failed {}; + +diff --git a/odb/generator.cxx b/odb/generator.cxx +index e165faf..6aa5151 100644 +--- a/odb/generator.cxx ++++ b/odb/generator.cxx +@@ -58,7 +58,7 @@ namespace + if (!ifs.is_open ()) + { + cerr << "error: unable to open '" << p << "' in read mode" << endl; +- throw generator::failed (); ++ throw generator_failed (); + } + } + +@@ -70,7 +70,7 @@ namespace + if (!ofs.is_open ()) + { + cerr << "error: unable to open '" << p << "' in write mode" << endl; +- throw generator::failed (); ++ throw generator_failed (); + } + } + +@@ -118,7 +118,7 @@ namespace + } + } + +-void generator:: ++void + generate (options const& ops, + features& fts, + semantics::unit& unit, +@@ -259,7 +259,7 @@ generate (options const& ops, + cerr << in_log_path << ": error: wrong database '" << + old_changelog->database () << "', expected '" << db << + "'" << endl; +- throw generator::failed (); ++ throw generator_failed (); + } + + string sn (ops.schema_name ()[db]); +@@ -268,18 +268,18 @@ generate (options const& ops, + cerr << in_log_path << ": error: wrong schema name '" << + old_changelog->schema_name () << "', expected '" << sn << + "'" << endl; +- throw generator::failed (); ++ throw generator_failed (); + } + } + catch (const ios_base::failure& e) + { + cerr << in_log_path << ": read failure" << endl; +- throw failed (); ++ throw generator_failed (); + } + catch (const xml::parsing& e) + { + cerr << e.what () << endl; +- throw failed (); ++ throw generator_failed (); + } + } + +@@ -976,12 +976,12 @@ generate (options const& ops, + catch (const ios_base::failure& e) + { + cerr << out_log_path << ": write failure" << endl; +- throw failed (); ++ throw generator_failed (); + } + catch (const xml::serialization& e) + { + cerr << e.what () << endl; +- throw failed (); ++ throw generator_failed (); + } + } + +@@ -998,18 +998,18 @@ generate (options const& ops, + { + // Code generation failed. Diagnostics has already been issued. + // +- throw failed (); ++ throw generator_failed (); + } + catch (semantics::invalid_path const& e) + { + cerr << "error: '" << e.path () << "' is not a valid filesystem path" + << endl; +- throw failed (); ++ throw generator_failed (); + } + catch (fs::error const&) + { + // Auto-removal of generated files failed. Ignore it. + // +- throw failed (); ++ throw generator_failed (); + } + } +diff --git a/odb/generator.hxx b/odb/generator.hxx +index ce49295..e83d94d 100644 +--- a/odb/generator.hxx ++++ b/odb/generator.hxx +@@ -11,23 +11,13 @@ + #include + #include + +-class generator +-{ +-public: +- class failed {}; +- +- void +- generate (options const&, +- features&, +- semantics::unit&, +- semantics::path const& file, +- std::vector const& inputs); +- +- generator () {} +- +-private: +- generator (generator const&); +- generator& operator= (generator const&); +-}; ++class generator_failed {}; ++ ++void ++generate (options const&, ++ features&, ++ semantics::unit&, ++ semantics::path const& file, ++ std::vector const& inputs); + + #endif // ODB_GENERATOR_HXX +diff --git a/odb/plugin.cxx b/odb/plugin.cxx +index e32f225..51f0cb1 100644 +--- a/odb/plugin.cxx ++++ b/odb/plugin.cxx +@@ -199,27 +199,23 @@ gate_callback (void*, void*) + parser p (*options_, loc_pragmas_, ns_loc_pragmas_, decl_pragmas_); + auto_ptr u (p.parse (global_namespace, file_)); + +- + features f; + + // Validate, pass 1. + // +- validator v; +- v.validate (*options_, f, *u, file_, 1); ++ validate (*options_, f, *u, file_, 1); + + // Process. + // +- processor pr; +- pr.process (*options_, f, *u, file_); ++ process (*options_, f, *u, file_); + + // Validate, pass 2. + // +- v.validate (*options_, f, *u, file_, 2); ++ validate (*options_, f, *u, file_, 2); + + // Generate. + // +- generator g; +- g.generate (*options_, f, *u, file_, inputs_); ++ generate (*options_, f, *u, file_, inputs_); + } + catch (cutl::re::format const& e) + { +@@ -239,19 +235,19 @@ gate_callback (void*, void*) + // + r = 1; + } +- catch (validator::failed const&) ++ catch (validator_failed const&) + { + // Diagnostics has aready been issued. + // + r = 1; + } +- catch (processor::failed const&) ++ catch (processor_failed const&) + { + // Diagnostics has aready been issued. + // + r = 1; + } +- catch (generator::failed const&) ++ catch (generator_failed const&) + { + // Diagnostics has aready been issued. + // +diff --git a/odb/processor.cxx b/odb/processor.cxx +index a808a52..3a2cb1d 100644 +--- a/odb/processor.cxx ++++ b/odb/processor.cxx +@@ -3064,7 +3064,7 @@ namespace + }; + } + +-void processor:: ++void + process (options const& ops, + features& f, + semantics::unit& unit, +@@ -3120,6 +3120,6 @@ process (options const& ops, + { + // Processing failed. Diagnostics has already been issued. + // +- throw failed (); ++ throw processor_failed (); + } + } +diff --git a/odb/processor.hxx b/odb/processor.hxx +index 602b999..e62dd25 100644 +--- a/odb/processor.hxx ++++ b/odb/processor.hxx +@@ -9,22 +9,12 @@ + #include + #include + +-class processor +-{ +-public: +- class failed {}; ++class processor_failed {}; + +- void +- process (options const&, +- features&, +- semantics::unit&, +- semantics::path const&); +- +- processor () {} +- +-private: +- processor (processor const&); +- processor& operator= (processor const&); +-}; ++void ++process (options const&, ++ features&, ++ semantics::unit&, ++ semantics::path const&); + + #endif // ODB_PROCESSOR_HXX +diff --git a/odb/relational/validator.cxx b/odb/relational/validator.cxx +index 1d51c9a..47f089c 100644 +--- a/odb/relational/validator.cxx ++++ b/odb/relational/validator.cxx +@@ -528,7 +528,7 @@ namespace relational + }; + } + +- void validator:: ++ void + validate (options const&, + features&, + semantics::unit& u, +@@ -608,7 +608,7 @@ namespace relational + } + + if (!valid) +- throw failed (); ++ throw operation_failed (); + + if (pass == 1) + { +@@ -636,6 +636,6 @@ namespace relational + } + + if (!valid) +- throw failed (); ++ throw operation_failed (); + } + } +diff --git a/odb/relational/validator.hxx b/odb/relational/validator.hxx +index f0ede53..93360c3 100644 +--- a/odb/relational/validator.hxx ++++ b/odb/relational/validator.hxx +@@ -11,26 +11,15 @@ + + namespace relational + { +- class validator +- { +- public: +- struct failed {}; +- +- // The first pass is performed before processing. The second -- after. +- // +- void +- validate (options const&, +- features&, +- semantics::unit&, +- semantics::path const&, +- unsigned short pass); +- +- validator () {} +- +- private: +- validator (validator const&); +- validator& operator= (validator const&); +- }; ++ // The first pass is performed before processing. The second -- after. ++ // Throws operation_failed to signal a failure. ++ // ++ void ++ validate (options const&, ++ features&, ++ semantics::unit&, ++ semantics::path const&, ++ unsigned short pass); + } + + #endif // ODB_RELATIONAL_VALIDATOR_HXX +diff --git a/odb/validator.cxx b/odb/validator.cxx +index e80f4d8..91d91e5 100644 +--- a/odb/validator.cxx ++++ b/odb/validator.cxx +@@ -1457,7 +1457,7 @@ namespace + }; + } + +-void validator:: ++void + validate (options const& ops, + features& f, + semantics::unit& u, +@@ -1506,7 +1506,7 @@ validate (options const& ops, + } + + if (!valid) +- throw failed (); ++ throw validator_failed (); + + auto_ptr ctx (create_context (cerr, u, ops, f, 0)); + +@@ -1559,7 +1559,7 @@ validate (options const& ops, + } + + if (!valid) +- throw failed (); ++ throw validator_failed (); + + switch (db) + { +@@ -1575,12 +1575,11 @@ validate (options const& ops, + { + try + { +- relational::validator v; +- v.validate (ops, f, u, p, pass); ++ relational::validate (ops, f, u, p, pass); + } +- catch (relational::validator::failed const&) ++ catch (operation_failed const&) + { +- throw failed (); ++ throw validator_failed (); + } + + break; +diff --git a/odb/validator.hxx b/odb/validator.hxx +index f913049..3ffa470 100644 +--- a/odb/validator.hxx ++++ b/odb/validator.hxx +@@ -9,25 +9,15 @@ + #include + #include + +-class validator +-{ +-public: +- struct failed {}; ++class validator_failed {}; + +- // The first pass is performed before processing. The second -- after. +- // +- void +- validate (options const&, +- features&, +- semantics::unit&, +- semantics::path const&, +- unsigned short pass); +- +- validator () {} +- +-private: +- validator (validator const&); +- validator& operator= (validator const&); +-}; ++// The first pass is performed before processing. The second -- after. ++// ++void ++validate (options const&, ++ features&, ++ semantics::unit&, ++ semantics::path const&, ++ unsigned short pass); + + #endif // ODB_VALIDATOR_HXX +-- +2.25.0 + diff --git a/buildroot/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch b/buildroot/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch new file mode 100644 index 000000000..e2b97cca6 --- /dev/null +++ b/buildroot/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch @@ -0,0 +1,312 @@ +From bf389fd5185143847b1d91aed423e79c322dba51 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 5 Feb 2016 16:01:42 +0200 +Subject: [PATCH] Initial work to make ODB compatible with GCC 6 + +[Upstream: 511dcf67322ad87fb32f97d1cf7725c129e83898] +Signed-off-by: Kamel Bouhara +--- + odb/cxx-lexer.cxx | 4 ++++ + odb/gcc-fwd.hxx | 23 ++++++++++++++++++++++- + odb/gcc.hxx | 10 ++++++++++ + odb/include.cxx | 31 +++++++++++++++++++++---------- + odb/parser.cxx | 8 ++++---- + odb/plugin.cxx | 29 +++++++++++++++++++++++++++-- + odb/semantics/elements.cxx | 4 ++-- + 7 files changed, 90 insertions(+), 19 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index 7029c7e..64df296 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -135,8 +135,12 @@ cpp_error_callback ( + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5 + int /*reason*/, // Added in GCC 4.6.0. + #endif ++#if BUILDING_GCC_MAJOR <= 5 + location_t, + unsigned int, ++#else ++ rich_location*, ++#endif + char const* msg, + va_list *ap) + { +diff --git a/odb/gcc-fwd.hxx b/odb/gcc-fwd.hxx +index a120f05..618b106 100644 +--- a/odb/gcc-fwd.hxx ++++ b/odb/gcc-fwd.hxx +@@ -7,6 +7,24 @@ + + #include + ++#if BUILDING_GCC_MAJOR >= 6 ++ ++// If we include here, it pulls in all kinds of GCC trouble that ++// "poisons" standard C/C++ declarations; see safe-ctype.h. So instead we ++// are going to "exclude" safe-ctype.h. To compensate, however, we will ++// include it first thing in gcc.hxx. ++// ++# include ++# define SAFE_CTYPE_H ++# include ++# undef SAFE_CTYPE_H ++# include ++ ++typedef unsigned int source_location; // ++typedef source_location location_t; // ++ ++#else // GCC < 6 ++ + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 8 + # include // CHAR_BIT + # include +@@ -33,6 +51,9 @@ extern "C" + + typedef unsigned int source_location; // + typedef source_location location_t; // +-} ++ ++} // extern "C" ++ ++#endif + + #endif // ODB_GCC_FWD_HXX +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index c953047..858d685 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -7,6 +7,10 @@ + + #include + ++#if BUILDING_GCC_MAJOR >= 6 ++# include // See gcc-fwd.hxx. ++#endif ++ + // GCC header includes to get the plugin and parse tree declarations. + // The order is important and doesn't follow any kind of logic. + // +@@ -145,4 +149,10 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + #define DECL_CHAIN(x) TREE_CHAIN(x) + #endif + ++// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p(). ++// ++#if BUILDING_GCC_MAJOR < 6 ++# define anon_aggrname_p(X) ANON_AGGRNAME_P(X) ++#endif ++ + #endif // ODB_GCC_HXX +diff --git a/odb/include.cxx b/odb/include.cxx +index c397993..08c93ce 100644 +--- a/odb/include.cxx ++++ b/odb/include.cxx +@@ -30,9 +30,18 @@ namespace + path path_; + }; + ++#if BUILDING_GCC_MAJOR >= 6 ++ typedef line_map_ordinary line_map_type; ++#else ++ typedef line_map line_map_type; ++# ifndef linemap_check_ordinary ++# define linemap_check_ordinary(X) (X) ++# endif ++#endif ++ + struct includes + { +- typedef std::map map_type; ++ typedef std::map map_type; + bool trailing; // Included at the beginning or at the end of the main file. + map_type map; + }; +@@ -144,7 +153,9 @@ namespace + // + if (l > BUILTINS_LOCATION) + { +- line_map const* lm (linemap_lookup (line_table, l)); ++ line_map_type const* lm ( ++ linemap_check_ordinary ( ++ linemap_lookup (line_table, l))); + + if (lm != 0 && !MAIN_FILE_P (lm)) + { +@@ -537,20 +548,20 @@ namespace + // + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + size_t used (line_table->used); +- line_map const* maps (line_table->maps); ++ line_map_type const* maps (line_table->maps); + #else + size_t used (line_table->info_ordinary.used); +- line_map const* maps (line_table->info_ordinary.maps); ++ line_map_type const* maps (line_table->info_ordinary.maps); + #endif + + for (size_t i (0); i < used; ++i) + { +- line_map const* m (maps + i); ++ line_map_type const* m (maps + i); + + if (MAIN_FILE_P (m) || m->reason != LC_ENTER) + continue; + +- line_map const* ifm (INCLUDED_FROM (line_table, m)); ++ line_map_type const* ifm (INCLUDED_FROM (line_table, m)); + + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + path f (m->to_file); +@@ -580,7 +591,7 @@ namespace + for (includes::iterator j (i->second.begin ()); + j != i->second.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + cerr << '\t' << lm->to_file << ":" << LAST_SOURCE_LINE (lm) << endl; + } + */ +@@ -589,13 +600,13 @@ namespace + // it is preferred over all others. Use the first one if there are + // several. + // +- line_map const* main_lm (0); ++ line_map_type const* main_lm (0); + include_directive* main_inc (0); + + for (includes::map_type::iterator j (i->second.map.begin ()); + j != i->second.map.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + + if (MAIN_FILE_P (lm)) + { +@@ -636,7 +647,7 @@ namespace + for (includes::map_type::iterator j (i->second.map.begin ()); + j != i->second.map.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + string f (lm->to_file); +diff --git a/odb/parser.cxx b/odb/parser.cxx +index a8e6a6a..feda9d4 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -1044,14 +1044,14 @@ emit_type_decl (tree decl) + // says that in typedef struct {} S; S becomes struct's + // name. + // +- if (ANON_AGGRNAME_P (decl_name)) ++ if (anon_aggrname_p (decl_name)) + { + tree d (TYPE_NAME (t)); + + if (d != NULL_TREE && + !DECL_ARTIFICIAL (d) && + DECL_NAME (d) != NULL_TREE && +- !ANON_AGGRNAME_P (DECL_NAME (d))) ++ !anon_aggrname_p (DECL_NAME (d))) + { + decl = d; + decl_name = DECL_NAME (decl); +@@ -1668,7 +1668,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d))) ++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) + { + if (tc == RECORD_TYPE) + r = &emit_class (t, file, line, clmn); +@@ -1765,7 +1765,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d))) ++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) + { + r = &emit_enum (t, access, file, line, clmn); + } +diff --git a/odb/plugin.cxx b/odb/plugin.cxx +index 51f0cb1..779faed 100644 +--- a/odb/plugin.cxx ++++ b/odb/plugin.cxx +@@ -45,14 +45,28 @@ path file_; // File being compiled. + paths inputs_; // List of input files in at-once mode or just file_. + + bool (*cpp_error_prev) ( +- cpp_reader*, int, int, location_t, unsigned int, const char*, va_list*); ++ cpp_reader*, ++ int, ++ int, ++#if BUILDING_GCC_MAJOR >= 6 ++ rich_location*, ++#else ++ location_t, ++ unsigned int, ++#endif ++ const char*, ++ va_list*); + + static bool + cpp_error_filter (cpp_reader* r, + int level, + int reason, ++#if BUILDING_GCC_MAJOR >= 6 ++ rich_location* l, ++#else + location_t l, + unsigned int column_override, ++#endif + const char* msg, + va_list* ap) + { +@@ -66,7 +80,18 @@ cpp_error_filter (cpp_reader* r, + if (strstr (msg, "#pragma once") != 0) + return true; + +- return cpp_error_prev (r, level, reason, l, column_override, msg, ap); ++ return cpp_error_prev ( ++ r, ++ level, ++ reason, ++#if BUILDING_GCC_MAJOR >= 6 ++ l, ++#else ++ l, ++ column_override, ++#endif ++ msg, ++ ap); + } + + // A prefix of the _cpp_file struct. This struct is not part of the +diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx +index 21e3260..399d5e9 100644 +--- a/odb/semantics/elements.cxx ++++ b/odb/semantics/elements.cxx +@@ -59,7 +59,7 @@ namespace semantics + if (tree decl = TYPE_NAME (n)) + name = DECL_NAME (decl); + +- return name != 0 && ANON_AGGRNAME_P (name); ++ return name != 0 && anon_aggrname_p (name); + } + + return true; +@@ -108,7 +108,7 @@ namespace semantics + if (tree decl = TYPE_NAME (type)) + { + name = DECL_NAME (decl); +- if (name != 0 && ANON_AGGRNAME_P (name)) ++ if (name != 0 && anon_aggrname_p (name)) + return true; + + tree s (CP_DECL_CONTEXT (decl)); +-- +2.25.0 + diff --git a/buildroot/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch b/buildroot/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch new file mode 100644 index 000000000..57288af04 --- /dev/null +++ b/buildroot/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch @@ -0,0 +1,48 @@ +From 4584b69c45b701c3689d6a974f1ee560a79a243e Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Mon, 8 Feb 2016 18:39:21 +0200 +Subject: [PATCH] Make compilable with GCC 6 in C++14 mode + +[Upstream: 61d13eb53ade9f30a64892a901401bda5e42c335] +Signed-off-by: Kamel Bouhara +--- + odb/gcc.hxx | 9 ++++++--- + odb/parser.cxx | 2 ++ + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index 858d685..a22357d 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -7,9 +7,12 @@ + + #include + +-#if BUILDING_GCC_MAJOR >= 6 +-# include // See gcc-fwd.hxx. +-#endif ++// Actually, let's keep it out. With it included we can compile in C++98 ++// but not in C++14 (GCC 6 default). ++// ++// #if BUILDING_GCC_MAJOR >= 6 ++// # include // See gcc-fwd.hxx. ++// #endif + + // GCC header includes to get the plugin and parse tree declarations. + // The order is important and doesn't follow any kind of logic. +diff --git a/odb/parser.cxx b/odb/parser.cxx +index feda9d4..a9d22fb 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -1831,6 +1831,8 @@ create_type (tree t, + // the array type. In other words, we view it as "constant array" + // rather than "array of constant elements". + // ++ using semantics::array; // vs std::array. ++ + tree bt (TREE_TYPE (t)); + tree bt_mv (TYPE_MAIN_VARIANT (bt)); + type& bt_node (emit_type (bt_mv, access::public_, file, line, clmn)); +-- +2.25.0 + diff --git a/buildroot/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch b/buildroot/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch new file mode 100644 index 000000000..4e8c8f4fc --- /dev/null +++ b/buildroot/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch @@ -0,0 +1,34 @@ +From 029687831099bf1dcc944517f9e48af1db5b0361 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 23 Dec 2016 10:18:01 +0200 +Subject: [PATCH] Fix bug in GCC 6 input_location translation + +[Upstream: ec777147024fde72e4411cc6b1e1e49f4a1d1804] +Signed-off-by: Kamel Bouhara +--- + odb/cxx-lexer.cxx | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index 64df296..ae045d9 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -106,7 +106,15 @@ next (string& token, tree* node) + location_t cxx_pragma_lexer:: + location () const + { ++ // Starting from GCC 6 the input location seem to require the same ++ // translation as what we do in real_source_location(). ++ // ++#if BUILDING_GCC_MAJOR >= 6 ++ return linemap_resolve_location ( ++ line_table, input_location, LRK_MACRO_EXPANSION_POINT, 0); ++#else + return input_location; ++#endif + } + + string cxx_pragma_lexer:: +-- +2.25.0 + diff --git a/buildroot/package/odb/0006-Adapt-to-changes-in-GCC-8.patch b/buildroot/package/odb/0006-Adapt-to-changes-in-GCC-8.patch new file mode 100644 index 000000000..c0ef4e8bf --- /dev/null +++ b/buildroot/package/odb/0006-Adapt-to-changes-in-GCC-8.patch @@ -0,0 +1,228 @@ +From aca617685045b1984c19c415a474893407578394 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Tue, 7 Nov 2017 14:58:43 +0200 +Subject: [PATCH] Adapt to changes in GCC 8 + +[Upstream: 356630ced28f3101e8e2d88e3c52f8d3008515c7] +Signed-off-by: Kamel Bouhara +--- + odb/cxx-lexer.cxx | 16 ++++++++++++++-- + odb/parser.cxx | 27 ++++++++++++++++++++++++++- + odb/processor.cxx | 30 ++++++++++++++++++++++-------- + odb/semantics/elements.cxx | 8 ++++++++ + odb/validator.cxx | 10 +++++++++- + 5 files changed, 79 insertions(+), 12 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index ae045d9..cfebbb5 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -93,7 +93,13 @@ next (string& token, tree* node) + // See if this is a keyword using the C++ parser machinery and + // the current C++ dialect. + // +- if (*type_ == CPP_NAME && C_IS_RESERVED_WORD (*token_)) ++ if (*type_ == CPP_NAME && ++#if BUILDING_GCC_MAJOR >= 8 ++ IDENTIFIER_KEYWORD_P (*token_) ++#else ++ C_IS_RESERVED_WORD (*token_) ++#endif ++ ) + *type_ = CPP_KEYWORD; + + if (node != 0 && node != token_) +@@ -281,7 +287,13 @@ next (string& token, tree* node) + // + tree id (get_identifier (name)); + +- if (C_IS_RESERVED_WORD (id)) ++ if ( ++#if BUILDING_GCC_MAJOR >= 8 ++ IDENTIFIER_KEYWORD_P (id) ++#else ++ C_IS_RESERVED_WORD (id) ++#endif ++ ) + tt = CPP_KEYWORD; + + if (node != 0) +diff --git a/odb/parser.cxx b/odb/parser.cxx +index a9d22fb..927063b 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -889,8 +889,23 @@ collect (tree ns) + + // Traverse namespaces. + // +- for (decl = level->namespaces; decl != NULL_TREE; decl = TREE_CHAIN (decl)) ++ for ( ++#if BUILDING_GCC_MAJOR >= 8 ++ decl = level->names; ++#else ++ decl = level->namespaces; ++#endif ++ decl != NULL_TREE; ++ decl = TREE_CHAIN (decl)) + { ++#if BUILDING_GCC_MAJOR >= 8 ++ // Now namespaces are interleaved with other declarations. In fact, we ++ // could probably collect everything in a single pass. ++ // ++ if (TREE_CODE (decl) != NAMESPACE_DECL) ++ continue; ++#endif ++ + if (!DECL_IS_BUILTIN (decl) || DECL_NAMESPACE_STD_P (decl)) + { + if (trace) +@@ -960,9 +975,15 @@ emit () + // approximation for this namespace origin. Also resolve + // the tree node for this namespace. + // ++#if BUILDING_GCC_MAJOR >= 8 ++ tree tree_node ( ++ get_namespace_binding ( ++ scope_->tree_node (), get_identifier (n.c_str ()))); ++#else + tree tree_node ( + namespace_binding ( + get_identifier (n.c_str ()), scope_->tree_node ())); ++#endif + + namespace_& node (unit_->new_node (f, l, c, tree_node)); + unit_->new_edge (*scope_, node, n); +@@ -2218,7 +2239,11 @@ fq_scope (tree decl) + + // If this is an inline namespace, pretend it doesn't exist. + // ++#if BUILDING_GCC_MAJOR >= 8 ++ if (!is_nested_namespace (prev, scope, true)) ++#else + if (!is_associated_namespace (prev, scope)) ++#endif + { + tree n = DECL_NAME (scope); + +diff --git a/odb/processor.cxx b/odb/processor.cxx +index 3a2cb1d..bea3624 100644 +--- a/odb/processor.cxx ++++ b/odb/processor.cxx +@@ -423,12 +423,17 @@ namespace + + // OVL_* macros work for both FUNCTION_DECL and OVERLOAD. + // +- for (tree o (BASELINK_FUNCTIONS (decl)); +- o != 0; +- o = OVL_NEXT (o)) ++#if BUILDING_GCC_MAJOR >= 8 ++ for (ovl_iterator i (BASELINK_FUNCTIONS (decl)); i; ++i) ++#else ++ for (tree o (BASELINK_FUNCTIONS (decl)); o != 0; o = OVL_NEXT (o)) ++#endif + { ++#if BUILDING_GCC_MAJOR >= 8 ++ tree f (*i); ++#else + tree f (OVL_CURRENT (o)); +- ++#endif + // We are only interested in public non-static member + // functions. Note that TREE_PUBLIC() returns something + // other than what we need. +@@ -530,12 +535,17 @@ namespace + { + // OVL_* macros work for both FUNCTION_DECL and OVERLOAD. + // +- for (tree o (BASELINK_FUNCTIONS (decl)); +- o != 0; +- o = OVL_NEXT (o)) ++#if BUILDING_GCC_MAJOR >= 8 ++ for (ovl_iterator i (BASELINK_FUNCTIONS (decl)); i; ++i) ++#else ++ for (tree o (BASELINK_FUNCTIONS (decl)); o != 0; o = OVL_NEXT (o)) ++#endif + { ++#if BUILDING_GCC_MAJOR >= 8 ++ tree f (*i); ++#else + tree f (OVL_CURRENT (o)); +- ++#endif + // We are only interested in non-static member functions. + // + if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (f)) +@@ -2934,7 +2944,11 @@ namespace + { + tree prev (CP_DECL_CONTEXT (scope)); + ++#if BUILDING_GCC_MAJOR >= 8 ++ if (!is_nested_namespace (prev, scope, true)) ++#else + if (!is_associated_namespace (prev, scope)) ++#endif + break; + + scope = prev; +diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx +index 399d5e9..4c380d8 100644 +--- a/odb/semantics/elements.cxx ++++ b/odb/semantics/elements.cxx +@@ -126,7 +126,11 @@ namespace semantics + { + tree prev (CP_DECL_CONTEXT (s)); + ++#if BUILDING_GCC_MAJOR >= 8 ++ if (!is_nested_namespace (prev, s, true)) ++#else + if (!is_associated_namespace (prev, s)) ++#endif + break; + + s = prev; +@@ -223,7 +227,11 @@ namespace semantics + { + // Check if this is an inline namespace and skip it if so. + // ++#if BUILDING_GCC_MAJOR >= 8 ++ if (is_nested_namespace (ns, new_ns, true)) ++#else + if (is_associated_namespace (ns, new_ns)) ++#endif + { + // Skip also the following scope operator. Strictly speaking + // there could be none (i.e., this is a name of an inline +diff --git a/odb/validator.cxx b/odb/validator.cxx +index 91d91e5..aac52e4 100644 +--- a/odb/validator.cxx ++++ b/odb/validator.cxx +@@ -520,9 +520,17 @@ namespace + // Figure out if we have a const version of the callback. OVL_* + // macros work for both FUNCTION_DECL and OVERLOAD. + // ++#if BUILDING_GCC_MAJOR >= 8 ++ for (ovl_iterator i (BASELINK_FUNCTIONS (decl)); i; ++i) ++#else + for (tree o (BASELINK_FUNCTIONS (decl)); o != 0; o = OVL_NEXT (o)) ++#endif + { ++#if BUILDING_GCC_MAJOR >= 8 ++ tree f (*i); ++#else + tree f (OVL_CURRENT (o)); ++#endif + if (DECL_CONST_MEMFUNC_P (f)) + { + c.set ("callback-const", true); +@@ -1223,7 +1231,7 @@ namespace + compiler, get_identifier ("has_lt_operator"), false, false); + + if (has_lt_operator_ != error_mark_node) +- has_lt_operator_ = OVL_CURRENT (has_lt_operator_); ++ has_lt_operator_ = OVL_FIRST (has_lt_operator_); + else + { + os << unit.file () << ": error: unable to resolve has_lt_operator " +-- +2.25.0 + diff --git a/buildroot/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch b/buildroot/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch new file mode 100644 index 000000000..bf856eb48 --- /dev/null +++ b/buildroot/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch @@ -0,0 +1,351 @@ +From c5bea9562929c6b55ca208a530ae80033eeb1614 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Tue, 7 Nov 2017 10:37:53 +0200 +Subject: [PATCH] Switch to C++11, get rid of auto_ptr use + +[Upstream: 6e374de9ae2f2978f2fca3390aba4ea3f72bfade] +Signed-off-by: Kamel Bouhara +--- + odb/Makefile.am | 5 +++++ + odb/context.cxx | 4 ++-- + odb/context.hxx | 4 ++-- + odb/generator.cxx | 18 +++++++++--------- + odb/options.cli | 4 ++-- + odb/parser.cxx | 14 ++++++++++---- + odb/parser.hxx | 7 ++++--- + odb/plugin.cxx | 10 +++++----- + odb/processor.cxx | 6 +++--- + odb/validator.cxx | 2 +- + 10 files changed, 43 insertions(+), 31 deletions(-) + +diff --git a/odb/Makefile.am b/odb/Makefile.am +index 2f01398..d9e83d7 100644 +--- a/odb/Makefile.am ++++ b/odb/Makefile.am +@@ -9,6 +9,11 @@ plugin_LTLIBRARIES = odb.la + + AM_CPPFLAGS = -I'$(top_builddir)' -I'$(top_srcdir)' + ++# Note: not passed by libtool when linking odb.so. Seems to be harmless for ++# now. ++# ++AM_CXXFLAGS = -std=c++0x ++ + EXTRA_DIST = common-query.hxx common.hxx context.hxx context.ixx cxx-lexer.hxx cxx-token.hxx diagnostics.hxx emitter.hxx features.hxx gcc-fwd.hxx gcc.hxx generate.hxx generator.hxx instance.hxx location.hxx lookup.hxx option-functions.hxx option-parsers.hxx option-types.hxx options.hxx options.ixx parser.hxx pragma.hxx processor.hxx profile.hxx relational/common-query.hxx relational/common.hxx relational/common.txx relational/context.hxx relational/context.ixx relational/generate.hxx relational/header.hxx relational/inline.hxx relational/model.hxx relational/mssql/common.hxx relational/mssql/context.hxx relational/mysql/common.hxx relational/mysql/context.hxx relational/oracle/common.hxx relational/oracle/context.hxx relational/pgsql/common.hxx relational/pgsql/context.hxx relational/processor.hxx relational/schema-source.hxx relational/schema.hxx relational/source.hxx relational/sqlite/common.hxx relational/sqlite/context.hxx relational/validator.hxx semantics.hxx semantics/class-template.hxx semantics/class.hxx semantics/derived.hxx semantics/elements.hxx semantics/elements.ixx semantics/enum.hxx semantics/fundamental.hxx semantics/namespace.hxx semantics/relational.hxx semantics/relational/changelog.hxx semantics/relational/changeset.hxx semantics/relational/column.hxx semantics/relational/deferrable.hxx semantics/relational/elements.hxx semantics/relational/elements.txx semantics/relational/foreign-key.hxx semantics/relational/index.hxx semantics/relational/key.hxx semantics/relational/model.hxx semantics/relational/name.hxx semantics/relational/primary-key.hxx semantics/relational/table.hxx semantics/template.hxx semantics/union-template.hxx semantics/union.hxx semantics/unit.hxx sql-lexer.hxx sql-lexer.ixx sql-token.hxx sql-token.ixx traversal.hxx traversal/class-template.hxx traversal/class.hxx traversal/derived.hxx traversal/elements.hxx traversal/enum.hxx traversal/fundamental.hxx traversal/namespace.hxx traversal/relational.hxx traversal/relational/changelog.hxx traversal/relational/changeset.hxx traversal/relational/column.hxx traversal/relational/elements.hxx traversal/relational/foreign-key.hxx traversal/relational/index.hxx traversal/relational/key.hxx traversal/relational/model.hxx traversal/relational/primary-key.hxx traversal/relational/table.hxx traversal/template.hxx traversal/union-template.hxx traversal/union.hxx traversal/unit.hxx validator.hxx version.hxx options.cli + + # Plugin. +diff --git a/odb/context.cxx b/odb/context.cxx +index d62fa88..87f1c32 100644 +--- a/odb/context.cxx ++++ b/odb/context.cxx +@@ -564,14 +564,14 @@ namespace + }; + } + +-auto_ptr ++unique_ptr + create_context (ostream& os, + semantics::unit& unit, + options const& ops, + features& f, + semantics::relational::model* m) + { +- auto_ptr r; ++ unique_ptr r; + + switch (ops.database ()[0]) + { +diff --git a/odb/context.hxx b/odb/context.hxx +index 351bc61..10de237 100644 +--- a/odb/context.hxx ++++ b/odb/context.hxx +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include // std::auto_ptr ++#include // std::unique_ptr + #include + #include // std::size_t + #include +@@ -1691,7 +1691,7 @@ private: + + // Create concrete database context. + // +-std::auto_ptr ++std::unique_ptr + create_context (std::ostream&, + semantics::unit&, + options const&, +diff --git a/odb/generator.cxx b/odb/generator.cxx +index 6aa5151..266b75f 100644 +--- a/odb/generator.cxx ++++ b/odb/generator.cxx +@@ -4,7 +4,7 @@ + + #include // std::toupper, std::is{alpha,upper,lower} + #include +-#include // std::auto_ptr ++#include // std::unique_ptr + #include + #include + #include +@@ -141,7 +141,7 @@ generate (options const& ops, + + if (gen_schema) + { +- auto_ptr ctx (create_context (cerr, unit, ops, fts, 0)); ++ unique_ptr ctx (create_context (cerr, unit, ops, fts, 0)); + + switch (db) + { +@@ -471,7 +471,7 @@ generate (options const& ops, + // + if (gen_cxx) + { +- auto_ptr ctx ( ++ unique_ptr ctx ( + create_context (hxx, unit, ops, fts, model.get ())); + + sloc_filter sloc (ctx->os); +@@ -581,7 +581,7 @@ generate (options const& ops, + // + if (gen_cxx) + { +- auto_ptr ctx ( ++ unique_ptr ctx ( + create_context (ixx, unit, ops, fts, model.get ())); + + sloc_filter sloc (ctx->os); +@@ -641,7 +641,7 @@ generate (options const& ops, + // + if (gen_cxx && (db != database::common || md == multi_database::dynamic)) + { +- auto_ptr ctx ( ++ unique_ptr ctx ( + create_context (cxx, unit, ops, fts, model.get ())); + + sloc_filter sloc (ctx->os); +@@ -734,7 +734,7 @@ generate (options const& ops, + // + if (gen_sep_schema) + { +- auto_ptr ctx ( ++ unique_ptr ctx ( + create_context (sch, unit, ops, fts, model.get ())); + + sloc_filter sloc (ctx->os); +@@ -799,7 +799,7 @@ generate (options const& ops, + // + if (gen_sql_schema) + { +- auto_ptr ctx ( ++ unique_ptr ctx ( + create_context (sql, unit, ops, fts, model.get ())); + + switch (db) +@@ -865,7 +865,7 @@ generate (options const& ops, + // + { + ofstream& mig (*mig_pre[i]); +- auto_ptr ctx (create_context (mig, unit, ops, fts, 0)); ++ unique_ptr ctx (create_context (mig, unit, ops, fts, 0)); + + switch (db) + { +@@ -908,7 +908,7 @@ generate (options const& ops, + // + { + ofstream& mig (*mig_post[i]); +- auto_ptr ctx (create_context (mig, unit, ops, fts, 0)); ++ unique_ptr ctx (create_context (mig, unit, ops, fts, 0)); + + switch (db) + { +diff --git a/odb/options.cli b/odb/options.cli +index cf278cb..c994975 100644 +--- a/odb/options.cli ++++ b/odb/options.cli +@@ -211,10 +211,10 @@ class options + \cb{db pointer} pragma will use this pointer by default. The value + of this option can be \cb{*} which denotes the raw pointer and is + the default, or qualified name of a smart pointer class template, +- for example, \cb{std::auto_ptr}. In the latter case, the ODB compiler ++ for example, \cb{std::shared_ptr}. In the latter case, the ODB compiler + constructs the object or view pointer by adding a single template + argument of the object or view type to the qualified name, for example +- \cb{std::auto_ptr}. The ODB runtime uses object and view ++ \cb{std::shared_ptr}. The ODB runtime uses object and view + pointers to return, and, in case of objects, pass and cache + dynamically allocated instances of object and view types. + +diff --git a/odb/parser.cxx b/odb/parser.cxx +index 927063b..30e45af 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -26,7 +26,7 @@ public: + + impl (options const&, loc_pragmas&, ns_loc_pragmas&, decl_pragmas&); + +- auto_ptr ++ unique_ptr + parse (tree global_scope, path const& main_file); + + private: +@@ -728,10 +728,10 @@ impl (options const& ops, + { + } + +-auto_ptr parser::impl:: ++unique_ptr parser::impl:: + parse (tree global_scope, path const& main_file) + { +- auto_ptr u (new unit (main_file)); ++ unique_ptr u (new unit (main_file)); + u->insert (global_namespace, *u); + process_named_pragmas (global_namespace, *u); + +@@ -2263,6 +2263,12 @@ fq_scope (tree decl) + // parser + // + ++parser:: ++~parser () ++{ ++ // Needs parser::impl definition. ++} ++ + parser:: + parser (options const& ops, + loc_pragmas& lp, +@@ -2272,7 +2278,7 @@ parser (options const& ops, + { + } + +-auto_ptr parser:: ++unique_ptr parser:: + parse (tree global_scope, path const& main_file) + { + return impl_->parse (global_scope, main_file); +diff --git a/odb/parser.hxx b/odb/parser.hxx +index 80e4aa4..648337f 100644 +--- a/odb/parser.hxx ++++ b/odb/parser.hxx +@@ -7,7 +7,7 @@ + + #include + +-#include // std::auto_ptr ++#include // std::unique_ptr + + #include + #include +@@ -18,9 +18,10 @@ class parser + public: + class failed {}; + ++ ~parser (); + parser (options const&, loc_pragmas&, ns_loc_pragmas&, decl_pragmas&); + +- std::auto_ptr ++ std::unique_ptr + parse (tree global_scope, semantics::path const& main_file); + + private: +@@ -31,7 +32,7 @@ private: + + private: + class impl; +- std::auto_ptr impl_; ++ std::unique_ptr impl_; + }; + + #endif // ODB_PARSER_HXX +diff --git a/odb/plugin.cxx b/odb/plugin.cxx +index 779faed..0fac632 100644 +--- a/odb/plugin.cxx ++++ b/odb/plugin.cxx +@@ -8,7 +8,7 @@ + #include // stat + #include // stat + +-#include // std::auto_ptr ++#include // std::unique_ptr + #include + #include + #include // std::strcpy, std::strstr +@@ -39,7 +39,7 @@ using cutl::fs::invalid_path; + typedef vector paths; + + int plugin_is_GPL_compatible; +-auto_ptr options_; ++unique_ptr options_; + paths profile_paths_; + path file_; // File being compiled. + paths inputs_; // List of input files in at-once mode or just file_. +@@ -222,7 +222,7 @@ gate_callback (void*, void*) + // Parse the GCC tree to semantic graph. + // + parser p (*options_, loc_pragmas_, ns_loc_pragmas_, decl_pragmas_); +- auto_ptr u (p.parse (global_namespace, file_)); ++ unique_ptr u (p.parse (global_namespace, file_)); + + features f; + +@@ -377,14 +377,14 @@ plugin_init (plugin_name_args* plugin_info, plugin_gcc_version*) + oi[2].arg = &pd; + + cli::argv_file_scanner scan (argc, &argv[0], oi, 3); +- auto_ptr ops ( ++ unique_ptr ops ( + new options (scan, cli::unknown_mode::fail, cli::unknown_mode::fail)); + + // Process options. + // + process_options (*ops); + +- options_ = ops; ++ options_ = move (ops); + pragma_db_ = db; + pragma_multi_ = options_->multi_database (); + } +diff --git a/odb/processor.cxx b/odb/processor.cxx +index bea3624..c787e0d 100644 +--- a/odb/processor.cxx ++++ b/odb/processor.cxx +@@ -120,8 +120,8 @@ namespace + // both the wrapper type and the wrapped type must be const. + // To see why, consider these possibilities: + // +- // auto_ptr - can modify by setting a new pointer +- // const auto_ptr - can modify by changing the pointed-to value ++ // unique_ptr - can modify by setting a new pointer ++ // const unique_ptr - can modify by changing the pointed-to value + // + if (const_type (m.type ()) && + !(id (m) || version (m) || m.count ("inverse"))) +@@ -3086,7 +3086,7 @@ process (options const& ops, + { + try + { +- auto_ptr ctx (create_context (cerr, unit, ops, f, 0)); ++ unique_ptr ctx (create_context (cerr, unit, ops, f, 0)); + + // Common processing. + // +diff --git a/odb/validator.cxx b/odb/validator.cxx +index aac52e4..196386c 100644 +--- a/odb/validator.cxx ++++ b/odb/validator.cxx +@@ -1516,7 +1516,7 @@ validate (options const& ops, + if (!valid) + throw validator_failed (); + +- auto_ptr ctx (create_context (cerr, u, ops, f, 0)); ++ unique_ptr ctx (create_context (cerr, u, ops, f, 0)); + + if (pass == 1) + { +-- +2.25.0 + diff --git a/buildroot/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch b/buildroot/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch new file mode 100644 index 000000000..b89c35fb8 --- /dev/null +++ b/buildroot/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch @@ -0,0 +1,33 @@ +From 8cc165a2f7f945db36a18e462138553a000292cd Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Tue, 7 Nov 2017 16:57:35 +0200 +Subject: [PATCH] Fix GCC 8 adaptation to be compatible with previous + versions + +[Upstream: 006bbc5748a8197d7874550cc9186545f1c55ad8] +Signed-off-by: Kamel Bouhara +--- + odb/validator.cxx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/odb/validator.cxx b/odb/validator.cxx +index 196386c..f0edaaf 100644 +--- a/odb/validator.cxx ++++ b/odb/validator.cxx +@@ -1231,7 +1231,13 @@ namespace + compiler, get_identifier ("has_lt_operator"), false, false); + + if (has_lt_operator_ != error_mark_node) ++ { ++#if BUILDING_GCC_MAJOR >= 8 + has_lt_operator_ = OVL_FIRST (has_lt_operator_); ++#else ++ has_lt_operator_ = OVL_CURRENT (has_lt_operator_); ++#endif ++ } + else + { + os << unit.file () << ": error: unable to resolve has_lt_operator " +-- +2.25.0 + diff --git a/buildroot/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch b/buildroot/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch new file mode 100644 index 000000000..bac7abea1 --- /dev/null +++ b/buildroot/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch @@ -0,0 +1,30 @@ +From 2d37e44753c1e67de4658b6fdf95760432c74ead Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 5 Oct 2018 07:20:18 +0200 +Subject: [PATCH] Handle namespace aliases when parsing GCC tree + +[Upstream: 3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6] +Signed-off-by: Kamel Bouhara +--- + odb/parser.cxx | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/odb/parser.cxx b/odb/parser.cxx +index 30e45af..03bcb01 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -906,6 +906,11 @@ collect (tree ns) + continue; + #endif + ++ // Ignore namespace aliases. ++ // ++ if (DECL_NAMESPACE_ALIAS (decl)) ++ continue; ++ + if (!DECL_IS_BUILTIN (decl) || DECL_NAMESPACE_STD_P (decl)) + { + if (trace) +-- +2.25.0 + diff --git a/buildroot/package/odb/0010-Add-initial-support-for-GCC-9.patch b/buildroot/package/odb/0010-Add-initial-support-for-GCC-9.patch new file mode 100644 index 000000000..dd36882bc --- /dev/null +++ b/buildroot/package/odb/0010-Add-initial-support-for-GCC-9.patch @@ -0,0 +1,233 @@ +From cd9a15f42ef35449a8ad480352f9f5495eb37c30 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 15 Mar 2019 17:37:28 +0200 +Subject: [PATCH] Add initial support for GCC 9 + +[Upstream: 841140bbf13ae2bfaa5978a181718cda0a8edae7] +Signed-off-by: Kamel Bouhara +--- + odb/cxx-lexer.cxx | 33 +++++++++++++++++++++++++++------ + odb/gcc.hxx | 32 ++++++++++++++++++++++++++++++++ + odb/include.cxx | 3 +++ + odb/plugin.cxx | 45 ++++++++++++++++++++++++++++++--------------- + 4 files changed, 92 insertions(+), 21 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index cfebbb5..acd13be 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -143,12 +143,20 @@ translate () + // Diagnostics callback. + // + extern "C" bool +-cpp_error_callback ( ++cpp_diagnostic_callback ( + cpp_reader* reader, ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_diagnostic_level level, ++#else + int level, ++#endif + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5 ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_warning_reason, ++#else + int /*reason*/, // Added in GCC 4.6.0. + #endif ++#endif + #if BUILDING_GCC_MAJOR <= 5 + location_t, + unsigned int, +@@ -185,10 +193,14 @@ cpp_error_callback ( + vfprintf (stderr, msg, *ap); + fprintf (stderr, "\n"); + +- // By resetting the error callback we indicate to cxx_string_lexer +- // that there was an error. ++ // By resetting the callback we indicate to cxx_string_lexer that there ++ // was an error. + // ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_get_callbacks (reader)->diagnostic = 0; ++#else + cpp_get_callbacks (reader)->error = 0; ++#endif + return true; + } + +@@ -247,7 +259,12 @@ start (string const& data) + // The previous lexing session should have popped the buffer. + // + assert (cpp_get_buffer (reader_) == 0); +- callbacks_->error = &cpp_error_callback; ++ ++#if BUILDING_GCC_MAJOR >= 9 ++ callbacks_->diagnostic = &cpp_diagnostic_callback; ++#else ++ callbacks_->error = &cpp_diagnostic_callback; ++#endif + + data_ = data; + buf_ = data; +@@ -267,10 +284,14 @@ next (string& token, tree* node) + token.clear (); + cpp_token const* t (cpp_get_token (reader_)); + +- // If there was an error, the error callback will be reset to 0. +- // Diagnostics has already been issued. ++ // If there was an error, the callback will be reset to 0. Diagnostics has ++ // already been issued. + // ++#if BUILDING_GCC_MAJOR >= 9 ++ if (callbacks_->diagnostic == 0) ++#else + if (callbacks_->error == 0) ++#endif + throw invalid_input (); + + cpp_ttype tt (t->type); +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index a22357d..0304192 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -158,4 +158,36 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + # define anon_aggrname_p(X) ANON_AGGRNAME_P(X) + #endif + ++// In GCC 9: ++// ++// INCLUDED_FROM Became linemap_included_from_linemap(). ++// LAST_SOURCE_LINE Was removed apparently as no longer used. Studying ++// the line-map.h diff from 8.3 suggests that the old ++// implementation should still work. ++// ++#if BUILDING_GCC_MAJOR >= 9 ++ ++inline const line_map_ordinary* ++INCLUDED_FROM (line_maps* set, const line_map_ordinary* map) ++{ ++ return linemap_included_from_linemap (set, map); ++} ++ ++inline source_location ++LAST_SOURCE_LINE_LOCATION (const line_map_ordinary* map) ++{ ++ return (((map[1].start_location - 1 ++ - map->start_location) ++ & ~((1 << map->m_column_and_range_bits) - 1)) ++ + map->start_location); ++} ++ ++inline linenum_type ++LAST_SOURCE_LINE (const line_map_ordinary* map) ++{ ++ return SOURCE_LINE (map, LAST_SOURCE_LINE_LOCATION (map)); ++} ++ ++#endif ++ + #endif // ODB_GCC_HXX +diff --git a/odb/include.cxx b/odb/include.cxx +index 08c93ce..0082f5e 100644 +--- a/odb/include.cxx ++++ b/odb/include.cxx +@@ -584,6 +584,9 @@ namespace + + for (include_map::iterator i (imap.begin ()), e (imap.end ()); i != e; ++i) + { ++ // Note that the LAST_SOURCE_LINE value of a map that includes another ++ // map is the line of that include. ++ + /* + cerr << endl + << i->first << " included from" << endl; +diff --git a/odb/plugin.cxx b/odb/plugin.cxx +index 0fac632..892f27c 100644 +--- a/odb/plugin.cxx ++++ b/odb/plugin.cxx +@@ -44,10 +44,15 @@ paths profile_paths_; + path file_; // File being compiled. + paths inputs_; // List of input files in at-once mode or just file_. + +-bool (*cpp_error_prev) ( ++bool (*cpp_diagnostic_prev) ( + cpp_reader*, ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_diagnostic_level, ++ cpp_warning_reason, ++#else + int, + int, ++#endif + #if BUILDING_GCC_MAJOR >= 6 + rich_location*, + #else +@@ -58,17 +63,22 @@ bool (*cpp_error_prev) ( + va_list*); + + static bool +-cpp_error_filter (cpp_reader* r, +- int level, +- int reason, ++cpp_diagnostic_filter (cpp_reader* r, ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_diagnostic_level level, ++ cpp_warning_reason reason, ++#else ++ int level, ++ int reason, ++#endif + #if BUILDING_GCC_MAJOR >= 6 +- rich_location* l, ++ rich_location* l, + #else +- location_t l, +- unsigned int column_override, ++ location_t l, ++ unsigned int column_override, + #endif +- const char* msg, +- va_list* ap) ++ const char* msg, ++ va_list* ap) + { + // #pragma once in the main file. Note that the message that we get is + // potentially translated so we search for the substring (there is +@@ -80,7 +90,7 @@ cpp_error_filter (cpp_reader* r, + if (strstr (msg, "#pragma once") != 0) + return true; + +- return cpp_error_prev ( ++ return cpp_diagnostic_prev ( + r, + level, + reason, +@@ -119,15 +129,20 @@ start_unit_callback (void*, void*) + // + cpp_callbacks* cb (cpp_get_callbacks (parse_in)); + +- if (cb->error == 0) ++#if BUILDING_GCC_MAJOR >= 9 ++ cpp_diagnostic_prev = cb->diagnostic; ++ cb->diagnostic = &cpp_diagnostic_filter; ++#else ++ cpp_diagnostic_prev = cb->error; ++ cb->error = &cpp_diagnostic_filter; ++#endif ++ ++ if (cpp_diagnostic_prev == 0) + { +- cerr << "ice: expected cpp error callback to be set" << endl; ++ cerr << "ice: expected cpp diagnostic callback to be set" << endl; + exit (1); + } + +- cpp_error_prev = cb->error; +- cb->error = &cpp_error_filter; +- + // Set the directory of the main file (stdin) to that of the orginal + // file so that relative inclusion works. Also adjust the path and + // re-stat the file so that #pragma once works. +-- +2.25.0 + diff --git a/buildroot/package/odb/0011-Adjust-to-changes-in-GCC-10.patch b/buildroot/package/odb/0011-Adjust-to-changes-in-GCC-10.patch new file mode 100644 index 000000000..33d46d792 --- /dev/null +++ b/buildroot/package/odb/0011-Adjust-to-changes-in-GCC-10.patch @@ -0,0 +1,97 @@ +From 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 17 Jun 2020 11:22:11 +0200 +Subject: [PATCH] Adjust to changes in GCC 10 + +[Upstream: 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 7 +++++-- + odb/parser.cxx | 8 ++++---- + odb/semantics/elements.cxx | 4 ++-- + 3 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index 9b644d7..af0e2a0 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -151,10 +151,13 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + #define DECL_CHAIN(x) TREE_CHAIN(x) + #endif + +-// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p(). ++// In GCC 6 ANON_AGGRNAME_P became anon_aggrname_p(). ++// In GCC 10 anon_aggrname_p() became IDENTIFIER_ANON_P. + // + #if BUILDING_GCC_MAJOR < 6 +-# define anon_aggrname_p(X) ANON_AGGRNAME_P(X) ++# define IDENTIFIER_ANON_P(X) ANON_AGGRNAME_P(X) ++#elif BUILDING_GCC_MAJOR < 10 ++# define IDENTIFIER_ANON_P(X) anon_aggrname_p(X) + #endif + + // In GCC 9: +diff --git a/odb/parser.cxx b/odb/parser.cxx +index 69d9b28..58388c9 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -1103,14 +1103,14 @@ emit_type_decl (tree decl) + // says that in typedef struct {} S; S becomes struct's + // name. + // +- if (anon_aggrname_p (decl_name)) ++ if (IDENTIFIER_ANON_P (decl_name)) + { + tree d (TYPE_NAME (t)); + + if (d != NULL_TREE && + !DECL_ARTIFICIAL (d) && + DECL_NAME (d) != NULL_TREE && +- !anon_aggrname_p (DECL_NAME (d))) ++ !IDENTIFIER_ANON_P (DECL_NAME (d))) + { + decl = d; + decl_name = DECL_NAME (decl); +@@ -1727,7 +1727,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) ++ if (d == NULL_TREE || IDENTIFIER_ANON_P (DECL_NAME (d))) + { + if (tc == RECORD_TYPE) + r = &emit_class (t, file, line, clmn); +@@ -1824,7 +1824,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) ++ if (d == NULL_TREE || IDENTIFIER_ANON_P (DECL_NAME (d))) + { + r = &emit_enum (t, access, file, line, clmn); + } +diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx +index f937f54..2d266cf 100644 +--- a/odb/semantics/elements.cxx ++++ b/odb/semantics/elements.cxx +@@ -75,7 +75,7 @@ namespace semantics + if (tree decl = TYPE_NAME (n)) + name = DECL_NAME (decl); + +- return name != 0 && anon_aggrname_p (name); ++ return name != 0 && IDENTIFIER_ANON_P (name); + } + + return true; +@@ -124,7 +124,7 @@ namespace semantics + if (tree decl = TYPE_NAME (type)) + { + name = DECL_NAME (decl); +- if (name != 0 && anon_aggrname_p (name)) ++ if (name != 0 && IDENTIFIER_ANON_P (name)) + return true; + + tree s (CP_DECL_CONTEXT (decl)); +-- +2.26.2 + diff --git a/buildroot/package/odb/Config.in.host b/buildroot/package/odb/Config.in.host new file mode 100644 index 000000000..e80a141be --- /dev/null +++ b/buildroot/package/odb/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_ODB + bool "host-odb" + select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT + help + This is a compiler that takes a specially crafted c++ header + file and auto-generates a schema that works with libodb and + the subsequent libodb-database library. + + https://www.codesynthesis.com/products/odb/ diff --git a/buildroot/package/odb/odb.hash b/buildroot/package/odb/odb.hash new file mode 100644 index 000000000..773a9c829 --- /dev/null +++ b/buildroot/package/odb/odb.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/products/odb/download.xhtml +sha1 810fc02e591429ed19f5a2699d144fb611fb121b odb-2.4.0.tar.bz2 + +# Locally computed +sha256 6785154fa98ea3977c8c2ab38cec16c4aa78c2c2039e80cd2908347b1c1d4198 odb-2.4.0.tar.bz2 +sha256 7983b82cb1f1686ac2b55420ded9c0f348f93dd17bf3e048ae3b25c1da51b80e LICENSE diff --git a/buildroot/package/odb/odb.mk b/buildroot/package/odb/odb.mk new file mode 100644 index 000000000..11086471e --- /dev/null +++ b/buildroot/package/odb/odb.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# odb +# +################################################################################ + +ODB_VERSION_MAJOR = 2.4 +ODB_VERSION = $(ODB_VERSION_MAJOR).0 +ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 +ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) +ODB_LICENSE = GPL-3.0 +ODB_LICENSE_FILES = LICENSE +HOST_ODB_DEPENDENCIES = host-libcutl + +# Prevent odb from trying to install the gcc plugin into the hosts +# gcc plugin directory. Instead, this will install the gcc plugin +# into host/libexec/odb +HOST_ODB_CONF_OPTS = --with-gcc-plugin-dir=no + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/odhcp6c/Config.in b/buildroot/package/odhcp6c/Config.in index 97ea4b44e..ca3a2f642 100644 --- a/buildroot/package/odhcp6c/Config.in +++ b/buildroot/package/odhcp6c/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_ODHCP6C odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux systems, especially routers. - https://github.com/sbyx/odhcp6c + https://git.openwrt.org/project/odhcp6c.git diff --git a/buildroot/package/odhcp6c/odhcp6c.hash b/buildroot/package/odhcp6c/odhcp6c.hash index 8b16fa98b..2ac4a6821 100644 --- a/buildroot/package/odhcp6c/odhcp6c.hash +++ b/buildroot/package/odhcp6c/odhcp6c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6d472320ccfa2e57197596869507f2a4bf9900a502939404bf0c033dceeadf5f odhcp6c-d2e247d8d87ecf8c60fcf0acdad05667bd379521.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 e715c1408982152306c65f1c3ce7c58fb6f15fa8f9626c266819119239f32418 odhcp6c-f575351cbb3defc0bf52680c9082912a6c264374.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/odhcp6c/odhcp6c.mk b/buildroot/package/odhcp6c/odhcp6c.mk index 3b4e7580a..c7f214ff7 100644 --- a/buildroot/package/odhcp6c/odhcp6c.mk +++ b/buildroot/package/odhcp6c/odhcp6c.mk @@ -4,8 +4,9 @@ # ################################################################################ -ODHCP6C_VERSION = d2e247d8d87ecf8c60fcf0acdad05667bd379521 -ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION)) +ODHCP6C_VERSION = f575351cbb3defc0bf52680c9082912a6c264374 +ODHCP6C_SITE = https://git.openwrt.org/project/odhcp6c.git +ODHCP6C_SITE_METHOD = git ODHCP6C_LICENSE = GPL-2.0 ODHCP6C_LICENSE_FILES = COPYING diff --git a/buildroot/package/odroidc2-firmware/Config.in b/buildroot/package/odroidc2-firmware/Config.in new file mode 100644 index 000000000..d55003af3 --- /dev/null +++ b/buildroot/package/odroidc2-firmware/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_ODROIDC2_FIRMWARE + bool "odroidc2-firmware" + help + This package extracts from + https://github.com/hardkernel/u-boot/tree/odroidc2-v2015.01 + the pre-built firmware files, as well as the host tool + fip_create that are needed to create bootable images for the + Odroid C2 platform. See doc/board/amlogic/odroid-c2.rst in + upstream U-Boot for more details. + + https://github.com/hardkernel/u-boot/tree/odroidc2-v2015.01 diff --git a/buildroot/package/odroidc2-firmware/odroidc2-firmware.hash b/buildroot/package/odroidc2-firmware/odroidc2-firmware.hash new file mode 100644 index 000000000..67d046e8d --- /dev/null +++ b/buildroot/package/odroidc2-firmware/odroidc2-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a2fba4c6d9332ecc5f04283f370d5c275f35d6cb62dba1f685d011269bacb6d0 odroidc2-firmware-s905_6.0.1_v5.5.tar.gz diff --git a/buildroot/package/odroidc2-firmware/odroidc2-firmware.mk b/buildroot/package/odroidc2-firmware/odroidc2-firmware.mk new file mode 100644 index 000000000..acd5ce237 --- /dev/null +++ b/buildroot/package/odroidc2-firmware/odroidc2-firmware.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# odroidc2-firmware +# +################################################################################ + +ODROIDC2_FIRMWARE_VERSION = s905_6.0.1_v5.5 +ODROIDC2_FIRMWARE_SITE = $(call github,hardkernel,u-boot,$(ODROIDC2_FIRMWARE_VERSION)) +ODROIDC2_FIRMWARE_INSTALL_IMAGES = YES + +define ODROIDC2_FIRMWARE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D)/tools/fip_create/ +endef + +ODROIDC2_FIRMWARE_FILES = \ + fip/gxb/bl301.bin \ + fip/gxb/bl30.bin \ + fip/gxb/bl31.bin \ + fip/gxb/bl2.package \ + sd_fuse/bl1.bin.hardkernel + +define ODROIDC2_FIRMWARE_INSTALL_IMAGES_CMDS + $(foreach f,$(ODROIDC2_FIRMWARE_FILES), \ + $(INSTALL) -D -m 0644 $(@D)/$(f) $(BINARIES_DIR)/$(notdir $(f)) + ) + $(INSTALL) -D -m0755 $(@D)/tools/fip_create/fip_create \ + $(HOST_DIR)/bin/fip_create +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/ofono/Config.in b/buildroot/package/ofono/Config.in index 57ee4bc53..c1d0cae4e 100644 --- a/buildroot/package/ofono/Config.in +++ b/buildroot/package/ofono/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OFONO depends on BR2_USE_MMU # dbus, libglib2 depends on !BR2_STATIC_LIBS # dlopen(), ell depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell select BR2_PACKAGE_DBUS select BR2_PACKAGE_ELL select BR2_PACKAGE_LIBCAP_NG @@ -17,7 +18,9 @@ config BR2_PACKAGE_OFONO http://ofono.org/ -comment "ofono needs a toolchain w/ dynamic library, wchar, threads" +comment "ofono needs a toolchain w/ dynamic library, wchar, threads, headers >= 4.12" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/buildroot/package/ogre/Config.in b/buildroot/package/ogre/Config.in index b5475a7cb..1d7784714 100644 --- a/buildroot/package/ogre/Config.in +++ b/buildroot/package/ogre/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_OGRE depends on BR2_USE_WCHAR # use wchar_t select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBFREEIMAGE - select BR2_PACKAGE_LIBGLU # GL/glu.h select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_OPENGL select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11 diff --git a/buildroot/package/ogre/ogre.mk b/buildroot/package/ogre/ogre.mk index 253e022a7..2df685a23 100644 --- a/buildroot/package/ogre/ogre.mk +++ b/buildroot/package/ogre/ogre.mk @@ -15,7 +15,6 @@ OGRE_DEPENDENCIES = host-pkgconf \ freetype \ libfreeimage \ libgl \ - libglu \ sdl2 \ xlib_libX11 \ xlib_libXaw \ @@ -23,12 +22,17 @@ OGRE_DEPENDENCIES = host-pkgconf \ xlib_libXrandr \ zziplib +OGRE_CFLAGS = $(TARGET_CFLAGS) -DGLEW_NO_GLU +OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU + # Unbundle freetype and zziplib. # Disable java and nvidia cg support. OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \ - -DOGRE_INSTALL_DOCS=OFF + -DOGRE_INSTALL_DOCS=OFF \ + -DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)" # Enable optional python component if python interpreter is present on the target. ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) @@ -41,7 +45,7 @@ endif # Uses __atomic_fetch_add_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -OGRE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +OGRE_CXXFLAGS += -latomic endif $(eval $(cmake-package)) diff --git a/buildroot/package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch b/buildroot/package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch new file mode 100644 index 000000000..c29ecfc5d --- /dev/null +++ b/buildroot/package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch @@ -0,0 +1,48 @@ +From f31eec323ae65124474664f8a0444f7c035556dd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Sep 2020 22:31:12 +0200 +Subject: [PATCH] olsrd: migrate to using bison 3.7.1 + +With the upgrade to bison 3.7.1 (openwrt commit 1cf842d) building +olsrd was failing. Now, instead of the contents of header files +being directly inserted into the generated source files, they are +instead included with a #include directive. + +The local.mk has, until now, done some magic with *-tmp files, +which is not longer necessary and even causes builds to fail. + +src/cfgparser/oparse.c:265:10: fatal error: oparse.h-tmp: No such file or directory + #include "oparse.h-tmp" + +Suggested-by: Jo-Philipp Wich +Signed-off-by: Perry Melange +[Retrieved from: +https://github.com/openwrt-routing/packages/commit/5cc8e058850acbc22fe92c5e2b24863efc577971] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OLSR/olsrd/pull/87] +--- + src/cfgparser/local.mk | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/cfgparser/local.mk b/src/cfgparser/local.mk +index e767abfc..56e594e4 100644 +--- a/src/cfgparser/local.mk ++++ b/src/cfgparser/local.mk +@@ -74,12 +74,8 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefile + ifeq ($(VERBOSE),0) + @echo "[BISON] $@" + endif +- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" +- $(MAKECMDPREFIX)sed -e 's/register //' \ +- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \ +- < "$@-tmp" >"$@" +- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)" +- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)" ++ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<" ++ $(MAKECMDPREFIX)sed -e 's/register //' "$@" > "$@.o" && mv "$@.o" "$@" + + $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS)) + +-- +2.28.0 + diff --git a/buildroot/package/omniorb/omniorb.hash b/buildroot/package/omniorb/omniorb.hash index 9911c4d6a..5ac861468 100644 --- a/buildroot/package/omniorb/omniorb.hash +++ b/buildroot/package/omniorb/omniorb.hash @@ -1,7 +1,8 @@ -# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.3/ -sha1 0af1b8c181088c096de237315cce7b52fc457c78 omniORB-4.2.3.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ +sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 +md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 # Locally generated -sha256 26412ac08ab495ce5a6a8e40961fa20b7c43f623c6c26b616d210ca32f078bca omniORB-4.2.3.tar.bz2 +sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/buildroot/package/omniorb/omniorb.mk b/buildroot/package/omniorb/omniorb.mk index b5caf6ff8..4ecbb9d2c 100644 --- a/buildroot/package/omniorb/omniorb.mk +++ b/buildroot/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.3 +OMNIORB_VERSION = 4.2.4 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES diff --git a/buildroot/package/oniguruma/0001-207-Out-of-bounds-write.patch b/buildroot/package/oniguruma/0001-207-Out-of-bounds-write.patch new file mode 100644 index 000000000..331744970 --- /dev/null +++ b/buildroot/package/oniguruma/0001-207-Out-of-bounds-write.patch @@ -0,0 +1,25 @@ +From cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Mon, 21 Sep 2020 12:58:29 +0900 +Subject: [PATCH] #207: Out-of-bounds write + +[Retrieved from: +https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0] +Signed-off-by: Fabrice Fontaine +--- + src/regcomp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/regcomp.c b/src/regcomp.c +index f6494b6d..a0a68561 100644 +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -6257,7 +6257,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc) + + for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) { + len = enclen(enc, p); +- if (i + len > OPT_EXACT_MAXLEN) break; ++ if (i + len >= OPT_EXACT_MAXLEN) break; + for (j = 0; j < len && p < end; j++) + to->s[i++] = *p++; + } diff --git a/buildroot/package/oniguruma/oniguruma.hash b/buildroot/package/oniguruma/oniguruma.hash index b0764ab1f..82354d4b9 100644 --- a/buildroot/package/oniguruma/oniguruma.hash +++ b/buildroot/package/oniguruma/oniguruma.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53 onig-6.9.4.tar.gz -sha256 ae266a1ad1c2ef50baf14a1a2993e926cd46d09c6cc8b0b3a8498e44da2746b8 COPYING +sha256 2f25cc3165e6da4b12dcabdb6b77c48f436d835e127ec2e3cad7abae9ea8e9a6 onig-6.9.5.tar.gz +sha256 6c7038393e8f30fee16257e713f77e383712f1465d6d25929596746b10b42bd3 COPYING diff --git a/buildroot/package/oniguruma/oniguruma.mk b/buildroot/package/oniguruma/oniguruma.mk index 2126ff912..c2330c738 100644 --- a/buildroot/package/oniguruma/oniguruma.mk +++ b/buildroot/package/oniguruma/oniguruma.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.4 +ONIGURUMA_VERSION = 6.9.5 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz @@ -12,4 +12,7 @@ ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING ONIGURUMA_INSTALL_STAGING = YES +# 0001-207-Out-of-bounds-write.patch +ONIGURUMA_IGNORE_CVES += CVE-2020-26159 + $(eval $(autotools-package)) diff --git a/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch b/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch deleted file mode 100644 index c20267786..000000000 --- a/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3c7887bb8a61a3b49a2989329c756a038023c544 Mon Sep 17 00:00:00 2001 -From: Laurent Charpentier -Date: Fri, 12 Jan 2018 12:25:41 +0100 -Subject: [PATCH] vdptool: fixed compile error for getline() - -vdptool.c was generating an error: implicit declaration for the getline() function. - -Signed-off-by: Laurent Charpentier ---- - vdptool.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vdptool.c b/vdptool.c -index b805372..4930f6a 100644 ---- a/vdptool.c -+++ b/vdptool.c -@@ -36,6 +36,7 @@ - * set and query VSI profile settings. - */ - -+#define _GNU_SOURCE - #include - #include - #include --- -2.14.3 - diff --git a/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch b/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch deleted file mode 100644 index 57a23b2a7..000000000 --- a/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch +++ /dev/null @@ -1,73 +0,0 @@ -From e186ca9ebda181f62504a1922559ef3ddae5e3b6 Mon Sep 17 00:00:00 2001 -From: Laurent Charpentier -Date: Mon, 15 Jan 2018 11:24:45 +0100 -Subject: [PATCH] get inline functions work with both gnu11 and gnu89 - -After gcc upgraded to gcc5, and if the codes are compiled without optimization(-O0), and the below error will happen: - -./include/lldp_8021qaz.h:237:12: error: inline function 'ieee8021qaz_clif_cmd' declared but never defined [-Werror] - inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from, - ^ -./include/lldp_8021qaz.h:222:13: error: inline function 'set_prio_map' declared but never defined [-Werror] - inline void set_prio_map(u32 *prio_map, u8 prio, int tc); - ^ -./include/lldp_8021qaz.h:221:12: error: inline function 'get_prio_map' declared but never defined [-Werror] - inline int get_prio_map(u32 prio_map, int tc); - -gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that exactly one C source file has the callable copy of the inline function. - -Signed-off-by: Laurent Charpentier ---- - include/lldp_8021qaz.h | 6 ------ - lldp_8021qaz.c | 4 ++-- - 2 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/include/lldp_8021qaz.h b/include/lldp_8021qaz.h -index 55353b8..09dee20 100644 ---- a/include/lldp_8021qaz.h -+++ b/include/lldp_8021qaz.h -@@ -218,9 +218,6 @@ int ieee8021qaz_mod_app(struct app_tlv_head *head, int peer, - u8 prio, u8 sel, u16 proto, u32 ops); - int ieee8021qaz_app_sethw(char *ifname, struct app_tlv_head *head); - --inline int get_prio_map(u32 prio_map, int tc); --inline void set_prio_map(u32 *prio_map, u8 prio, int tc); -- - struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *); - - int ieee8021qaz_tlvs_rxed(const char *ifname); -@@ -234,9 +231,6 @@ int ieee8021qaz_rchange(struct port *port, struct lldp_agent *, - void ieee8021qaz_ifup(char *ifname, struct lldp_agent *); - void ieee8021qaz_ifdown(char *ifname, struct lldp_agent *); - u8 ieee8021qaz_mibDeleteObject(struct port *port, struct lldp_agent *); --inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from, -- socklen_t fromlen, char *ibuf, int ilen, -- char *rbuf); - int ieee8021qaz_check_operstate(void); - int get_dcbx_hw(const char *ifname, __u8 *dcbx); - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index 094676d..f154317 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -396,7 +396,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent *agent, - return 0; - } - --inline int get_prio_map(u32 prio_map, int prio) -+static inline int get_prio_map(u32 prio_map, int prio) - { - if (prio > 7) - return 0; -@@ -404,7 +404,7 @@ inline int get_prio_map(u32 prio_map, int prio) - return (prio_map >> (4 * (7-prio))) & 0xF; - } - --inline void set_prio_map(u32 *prio_map, u8 prio, int tc) -+static inline void set_prio_map(u32 *prio_map, u8 prio, int tc) - { - u32 mask = ~(0xffffffff & (0xF << (4 * (7-prio)))); - *prio_map &= mask; --- -2.14.3 - diff --git a/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch b/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch deleted file mode 100644 index d6393bdc6..000000000 --- a/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c350f263136801fd54d42322a07a3b5ad2181dd9 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 18 Jan 2018 09:29:32 +0100 -Subject: [PATCH] Makefile.am: disable -Werror - -Due to additional warnings in recent gcc versions and the use of --Werror the build fails for reasons that are not that important. For -example: - -clif.c:54:2: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration] - memset(clif, 0, sizeof(*clif)); - -or: - -log.c:46:30: error: format '%ld' expects argument of type 'long int', but argument 5 has type '__suseconds_t {aka int}' [-Werror=format=] - printf("%02d:%02d:%02d.%06ld ", - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 551d4c7..62a52a5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4 - parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error - - ## system requires a shared libconfig --AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) -+AM_CFLAGS = -Wall -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) - AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS) -lrt - - ## header files to be installed, for programs using the client interface to lldpad --- -2.14.3 - diff --git a/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch b/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch deleted file mode 100644 index 2d3b9148e..000000000 --- a/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 41e9e6b5aa13d65480cc960a7f15f97d74d64090 Mon Sep 17 00:00:00 2001 -From: Laurent Charpentier -Date: Mon, 22 Jan 2018 10:49:45 +0100 -Subject: [PATCH] fixed unknown type pid_t - -Fixed 'unknown type pid_t' gcc compile error in dcbtool_cmds.c and -lldptool_cmds.c - -Signed-off-by: Laurent Charpentier ---- - dcbtool_cmds.c | 1 + - lldptool_cmds.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/dcbtool_cmds.c b/dcbtool_cmds.c -index a5cd0fe..ee5c144 100644 ---- a/dcbtool_cmds.c -+++ b/dcbtool_cmds.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include "clif.h" - #include "dcbtool.h" - #include "lldp_dcbx_cmds.h" -diff --git a/lldptool_cmds.c b/lldptool_cmds.c -index daef8c8..c793e34 100644 ---- a/lldptool_cmds.c -+++ b/lldptool_cmds.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include "clif.h" - #include "dcb_types.h" - #include "lldptool.h" --- -2.14.3 - diff --git a/buildroot/package/open-lldp/Config.in b/buildroot/package/open-lldp/Config.in index b40bff899..5bf363ef1 100644 --- a/buildroot/package/open-lldp/Config.in +++ b/buildroot/package/open-lldp/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPEN_LLDP configuration tool for Intel LLDP Agent with Enhanced Ethernet support for the Data Center. - http://open-lldp.org/ + https://github.com/intel/openlldp/ comment "open-lldp needs a toolchain w/ dynamic library, threads" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/open-lldp/open-lldp.hash b/buildroot/package/open-lldp/open-lldp.hash index fdd85fed4..1fbd8dd0c 100644 --- a/buildroot/package/open-lldp/open-lldp.hash +++ b/buildroot/package/open-lldp/open-lldp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f2c8a3307970374b01ad832ea18cf6d9abce6f00b3d8aed9305aa1428ad8252d open-lldp-036e314bd93602f7388262cc37faf8b626980af1.tar.gz -sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b COPYING +sha256 13e0890527192a6289e6dac82056c447a1e2624ff93b0b6bbd8a42d15b2cbc8c open-lldp-1.1.tar.gz +sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b COPYING diff --git a/buildroot/package/open-lldp/open-lldp.mk b/buildroot/package/open-lldp/open-lldp.mk index c9fd958a4..d42dbcc5c 100644 --- a/buildroot/package/open-lldp/open-lldp.mk +++ b/buildroot/package/open-lldp/open-lldp.mk @@ -4,13 +4,18 @@ # ################################################################################ -OPEN_LLDP_VERSION = 036e314bd93602f7388262cc37faf8b626980af1 -OPEN_LLDP_SITE = git://open-lldp.org/open-lldp.git +OPEN_LLDP_VERSION = 1.1 +OPEN_LLDP_SITE = $(call github,intel,openlldp,v$(OPEN_LLDP_VERSION)) OPEN_LLDP_DEPENDENCIES = readline libnl libconfig host-pkgconf OPEN_LLDP_LICENSE = GPL-2.0 OPEN_LLDP_LICENSE_FILES = COPYING -# Fetching from git, need to generate configure/Makefile.in +# Fetching from git OPEN_LLDP_AUTORECONF = YES +ifeq ($(BR2_INIT_SYSTEMD),y) +OPEN_LLDP_DEPENDENCIES += systemd +OPEN_LLDP_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch b/buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch index 9fc30a969..d3364440e 100644 --- a/buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch +++ b/buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch @@ -1,4 +1,4 @@ -From fdfeac7e77382ddd0e3fb4f2abeae84f0a31584f Mon Sep 17 00:00:00 2001 +From 1fe7b756365254f7175558e7a89c1d89f95c5e2e Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Tue, 30 Sep 2014 13:46:59 +0200 Subject: [PATCH] Remove OWNER and GROUPS parameters to install @@ -8,25 +8,25 @@ Buildroot we don't want that, since fakeroot will do its job when we finalize the rootfs. Signed-off-by: Maxime Hadjinlian +[aduskett@gmail.com: Updated for 32408520fcebe785983a68e39ec83830a3005779] +Signed-off-by: Adam Duskett --- - docbook/Makefile | 4 ++-- - ether/Makefile | 8 ++++---- - iso15118/Makefile | 8 ++++---- - key/Makefile | 8 ++++---- - mdio/Makefile | 8 ++++---- - mme/Makefile | 8 ++++---- - nvm/Makefile | 8 ++++---- - pib/Makefile | 8 ++++---- - plc/Makefile | 8 ++++---- - ram/Makefile | 8 ++++---- - scripts/Makefile | 4 ++-- - serial/Makefile | 8 ++++---- - slac/Makefile | 8 ++++---- - tools/Makefile | 2 +- - 14 files changed, 49 insertions(+), 49 deletions(-) + docbook/Makefile | 4 ++-- + ether/Makefile | 8 ++++---- + key/Makefile | 8 ++++---- + mdio/Makefile | 8 ++++---- + mme/Makefile | 8 ++++---- + nvm/Makefile | 8 ++++---- + pib/Makefile | 8 ++++---- + plc/Makefile | 8 ++++---- + ram/Makefile | 8 ++++---- + serial/Makefile | 8 ++++---- + slac/Makefile | 8 ++++---- + tools/Makefile | 2 +- + 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile -index d630822..23a9b5a 100755 +index d630822..039d62a 100755 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -32,9 +32,9 @@ manuals: @@ -42,7 +42,7 @@ index d630822..23a9b5a 100755 rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.1.html setup: diff --git a/ether/Makefile b/ether/Makefile -index 807cbcb..574050a 100755 +index 89174cb..8256d50 100755 --- a/ether/Makefile +++ b/ether/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -62,31 +62,9 @@ index 807cbcb..574050a 100755 + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/iso15118/Makefile b/iso15118/Makefile -index 72afdc4..da11a1c 100755 ---- a/iso15118/Makefile -+++ b/iso15118/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}; fi -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -d ${MAN}; fi -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: compile library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} + cd ${MAN}; rm -f ${PAGES} diff --git a/key/Makefile b/key/Makefile -index 7de75ff..ee8968c 100755 +index de62a49..78fa200 100755 --- a/key/Makefile +++ b/key/Makefile @@ -28,13 +28,13 @@ compact: compile @@ -108,7 +86,7 @@ index 7de75ff..ee8968c 100755 cd ${BIN}; rm -f ${TOOLS} cd ${MAN}; rm -f ${PAGES} diff --git a/mdio/Makefile b/mdio/Makefile -index 60a75a9..062d858 100755 +index 049b08e..3ff4c26 100755 --- a/mdio/Makefile +++ b/mdio/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -130,7 +108,7 @@ index 60a75a9..062d858 100755 cd ${BIN}; rm -f int6k ${TOOLS} cd ${MAN}; rm -f int6k ${PAGES} diff --git a/mme/Makefile b/mme/Makefile -index d6a9132..23f4775 100755 +index 0313aea..77a6b96 100755 --- a/mme/Makefile +++ b/mme/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -150,9 +128,9 @@ index d6a9132..23f4775 100755 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/nvm/Makefile b/nvm/Makefile -index 5ae47d2..d7f4037 100755 +index 9aa05ec..b468e70 100755 --- a/nvm/Makefile +++ b/nvm/Makefile @@ -28,12 +28,12 @@ compact: compile @@ -171,9 +149,9 @@ index 5ae47d2..d7f4037 100755 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/pib/Makefile b/pib/Makefile -index 3af94c8..908b03a 100644 +index 93f0c3b..23195b4 100644 --- a/pib/Makefile +++ b/pib/Makefile @@ -30,12 +30,12 @@ compact: compile @@ -192,9 +170,9 @@ index 3af94c8..908b03a 100644 + install -m ${BIN_PERM} ${TOOLS} ${BIN} uninstall: cd ${BIN}; rm -f ${TOOLS} - check: + cd ${MAN}; rm -f ${PAGES} diff --git a/plc/Makefile b/plc/Makefile -index bd8b806..5b41c0b 100644 +index 43d6bd5..9fd4e0a 100644 --- a/plc/Makefile +++ b/plc/Makefile @@ -32,13 +32,13 @@ compact: compile @@ -213,10 +191,10 @@ index bd8b806..5b41c0b 100644 - install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: - cd ${BIN}; rm -f int6k ${TOOLS} - cd ${MAN}; rm -f int6k ${PAGES} + cd ${BIN}; rm -f ${TOOLS} + cd ${MAN}; rm -f ${PAGES} diff --git a/ram/Makefile b/ram/Makefile -index 60b9bb3..c951218 100755 +index 60b9bb3..c34ddd0 100755 --- a/ram/Makefile +++ b/ram/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -238,7 +216,7 @@ index 60b9bb3..c951218 100755 cd ${BIN}; rm -f ${TOOLS} cd ${MAN}; rm -f ${PAGES} diff --git a/serial/Makefile b/serial/Makefile -index c25f1a6..6420d4a 100755 +index c25f1a6..aebbac9 100755 --- a/serial/Makefile +++ b/serial/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -260,7 +238,7 @@ index c25f1a6..6420d4a 100755 cd ${BIN}; rm -f int6k ${TOOLS} cd ${MAN}; rm -f int6k ${PAGES} diff --git a/slac/Makefile b/slac/Makefile -index d69da17..449f20a 100755 +index bd12db9..1f0b65d 100755 --- a/slac/Makefile +++ b/slac/Makefile @@ -27,13 +27,13 @@ compact: compile @@ -279,10 +257,10 @@ index d69da17..449f20a 100755 - install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} + install -m ${SUID_PERM} ${TOOLS} ${BIN} uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} + cd ${BIN}; rm -f ${TOOLS} + cd ${MAN}; rm -f ${PAGES} diff --git a/tools/Makefile b/tools/Makefile -index 1d992cf..f17db3d 100755 +index 1d992cf..a74fd24 100755 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,7 +27,7 @@ compact: compile @@ -294,5 +272,6 @@ index 1d992cf..f17db3d 100755 scripts: manuals: # install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} --- -2.1.0 +-- +2.26.2 + diff --git a/buildroot/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch b/buildroot/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..063bfc536 --- /dev/null +++ b/buildroot/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch @@ -0,0 +1,37 @@ +From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 23 Sep 2020 19:05:23 +0200 +Subject: [PATCH] plc/plc.h: fix build with gcc 10 + +Drop plcproperty from plc/plc.h to avoid the following build failure +with gcc 10 (which defaults to -fno-common): + +/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/qca/open-plc-utils/pull/141] +--- + plc/plc.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/plc/plc.h b/plc/plc.h +index 1fa32b53..208cf91a 100644 +--- a/plc/plc.h ++++ b/plc/plc.h +@@ -496,9 +496,7 @@ struct __packed plcproperty + uint8_t DATA_FORMAT; + uint32_t DATA_LENGTH; + uint8_t DATA_BUFFER [128]; +-} +- +-plcproperty; ++}; + + #ifndef __GNUC__ + #pragma pack (pop) +-- +2.28.0 + diff --git a/buildroot/package/open-plc-utils/open-plc-utils.hash b/buildroot/package/open-plc-utils/open-plc-utils.hash index 0c3b64b7e..1788b42fc 100644 --- a/buildroot/package/open-plc-utils/open-plc-utils.hash +++ b/buildroot/package/open-plc-utils/open-plc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00cd7f71e03849b1d6a96ec040351b819481e2f420cfb246f0b0f02cde73e098 open-plc-utils-1be781d1ea81827e5f6c1a35961c65dd4d15472c.tar.gz +sha256 b0156567a71c608cc1a0b18bbb1c5a97dd0ad9180097435f7e99119712bb299b open-plc-utils-32408520fcebe785983a68e39ec83830a3005779.tar.gz sha256 3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921 LICENSE diff --git a/buildroot/package/open-plc-utils/open-plc-utils.mk b/buildroot/package/open-plc-utils/open-plc-utils.mk index 3030301f7..d2ac39aca 100644 --- a/buildroot/package/open-plc-utils/open-plc-utils.mk +++ b/buildroot/package/open-plc-utils/open-plc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN_PLC_UTILS_VERSION = 1be781d1ea81827e5f6c1a35961c65dd4d15472c +OPEN_PLC_UTILS_VERSION = 32408520fcebe785983a68e39ec83830a3005779 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION)) OPEN_PLC_UTILS_LICENSE = BSD-3-Clause OPEN_PLC_UTILS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/open2300/open2300.hash b/buildroot/package/open2300/open2300.hash index 414041b92..f8b115069 100644 --- a/buildroot/package/open2300/open2300.hash +++ b/buildroot/package/open2300/open2300.hash @@ -1,6 +1,4 @@ # Localy computed -# Note: open2300's upstream svn tree is off-line, so this tarball is -# served from s.b.o. instead, which actually makes it stable. -sha256 f4239d2f16d52156586d06be38f06a3eb58168377e243a8de8720b66e33ddb8f open2300-12.tar.gz +sha256 ffa7f8d35b16abfbf5e52285cb21f2a7fc6afb901abb40c0c80eef9d23d08aab open2300-f21982e0b1f8321561e5ad1668307fde97700e1b.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/open2300/open2300.mk b/buildroot/package/open2300/open2300.mk index 0ffb8b504..9fb7dbc2f 100644 --- a/buildroot/package/open2300/open2300.mk +++ b/buildroot/package/open2300/open2300.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPEN2300_SITE = http://www.lavrsen.dk/svn/open2300/trunk -OPEN2300_SITE_METHOD = svn -OPEN2300_VERSION = 12 +OPEN2300_VERSION = f21982e0b1f8321561e5ad1668307fde97700e1b +OPEN2300_SITE = $(call github,wezm,open2300,$(OPEN2300_VERSION)) OPEN2300_LICENSE = GPL-2.0 OPEN2300_LICENSE_FILES = COPYING diff --git a/buildroot/package/openal/Config.in b/buildroot/package/openal/Config.in index a56415655..6b0e9973d 100644 --- a/buildroot/package/openal/Config.in +++ b/buildroot/package/openal/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_OPENAL_ARCH_SUPPORTS config BR2_PACKAGE_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS help @@ -26,7 +27,8 @@ config BR2_PACKAGE_OPENAL http://kcat.strangesoft.net/openal.html -comment "openal needs a toolchain w/ NPTL, C++" +comment "openal needs a toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/openal/openal.hash b/buildroot/package/openal/openal.hash index a133808ca..1592dd56b 100644 --- a/buildroot/package/openal/openal.hash +++ b/buildroot/package/openal/openal.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7 openal-1.19.1.tar.gz -sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING +sha256 c32d10473457a8b545aab50070fe84be2b5b041e1f2099012777ee6be0057c13 openal-1.20.1.tar.gz +sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING diff --git a/buildroot/package/openal/openal.mk b/buildroot/package/openal/openal.mk index 8e761a8d9..ed63abfb3 100644 --- a/buildroot/package/openal/openal.mk +++ b/buildroot/package/openal/openal.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENAL_VERSION = 1.19.1 +OPENAL_VERSION = 1.20.1 OPENAL_SITE = $(call github,kcat,openal-soft,openal-soft-$(OPENAL_VERSION)) OPENAL_LICENSE = LGPL-2.0+ OPENAL_LICENSE_FILES = COPYING diff --git a/buildroot/package/openblas/openblas.hash b/buildroot/package/openblas/openblas.hash index 5b1fb17fa..c58def9d5 100644 --- a/buildroot/package/openblas/openblas.hash +++ b/buildroot/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379 openblas-0.3.7.tar.gz -sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE +sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/buildroot/package/openblas/openblas.mk b/buildroot/package/openblas/openblas.mk index f06840226..9701df914 100644 --- a/buildroot/package/openblas/openblas.mk +++ b/buildroot/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.7 +OPENBLAS_VERSION = 0.3.9 OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch b/buildroot/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch deleted file mode 100644 index 683dd95d9..000000000 --- a/buildroot/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f66fc199a20882c546fa31142e9c0f5a8b3cf983 Mon Sep 17 00:00:00 2001 -From: Florian Jung -Date: Wed, 29 Jul 2020 18:51:55 +0200 -Subject: [PATCH] Fix build of grfmt_jpeg2000.cpp - -libjasper has recently changed `jas_matrix_get` from a macro to an inline function -(389951d071 in https://github.com/jasper-software/jasper), causing the build to fail. - -[Retrieved (and backported) from: -https://github.com/opencv/opencv/commit/f66fc199a20882c546fa31142e9c0f5a8b3cf983] -Signed-off-by: Fabrice Fontaine ---- - modules/imgcodecs/src/grfmt_jpeg2000.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/highgui/src/grfmt_jpeg2000.cpp b/modules/highgui/src/grfmt_jpeg2000.cpp -index fe69f80c86f..0f4d28d6f4d 100644 ---- a/modules/highgui/src/grfmt_jpeg2000.cpp -+++ b/modules/highgui/src/grfmt_jpeg2000.cpp -@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - uchar* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) -@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - ushort* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) diff --git a/buildroot/package/opencv/0001-atomic.patch b/buildroot/package/opencv/0001-atomic.patch deleted file mode 100644 index 8c9724d25..000000000 --- a/buildroot/package/opencv/0001-atomic.patch +++ /dev/null @@ -1,259 +0,0 @@ -From f71c288c6d853e623461f97cd72e6a9e6541f61a Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 1 Nov 2016 09:25:30 +0100 -Subject: [PATCH 1/4] Bug#714923: opencv FTBFS on sparc64 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714923 - -opencv uses functions from , but it wrongly assumes -this functions apply to an int type. While it is true for some -architectures, some architectures are using a long type there. The -correct type to use is _Atomic_word. - -Signed-off-by: Waldemar Brodkorb -[Samuel Martin: convert to git diff] -Signed-off-by: Samuel Martin ---- - modules/core/include/opencv2/core/core.hpp | 10 +++++----- - modules/core/include/opencv2/core/gpumat.hpp | 2 +- - modules/core/include/opencv2/core/operations.hpp | 4 ++-- - modules/core/src/gpumat.cpp | 2 +- - modules/core/src/matrix.cpp | 4 ++-- - modules/core/src/system.cpp | 8 ++++---- - modules/gpu/include/opencv2/gpu/gpu.hpp | 2 +- - modules/ocl/include/opencv2/ocl/ocl.hpp | 2 +- - modules/ocl/src/matrix_operations.cpp | 2 +- - modules/python/src2/cv2.cpp | 8 ++++---- - 10 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp -index 591d50a..5b4261e 100644 ---- a/modules/core/include/opencv2/core/core.hpp -+++ b/modules/core/include/opencv2/core/core.hpp -@@ -1290,7 +1290,7 @@ public: - operator const _Tp*() const; - - _Tp* obj; //< the object pointer. -- int* refcount; //< the associated reference counter -+ _Atomic_word* refcount; //< the associated reference counter - }; - - template -@@ -1490,9 +1490,9 @@ class CV_EXPORTS MatAllocator - public: - MatAllocator() {} - virtual ~MatAllocator() {} -- virtual void allocate(int dims, const int* sizes, int type, int*& refcount, -+ virtual void allocate(int dims, const int* sizes, int type, _Atomic_word*& refcount, - uchar*& datastart, uchar*& data, size_t* step) = 0; -- virtual void deallocate(int* refcount, uchar* datastart, uchar* data) = 0; -+ virtual void deallocate(_Atomic_word* refcount, uchar* datastart, uchar* data) = 0; - }; - - /*! -@@ -1985,7 +1985,7 @@ public: - - //! pointer to the reference counter; - // when matrix points to user-allocated data, the pointer is NULL -- int* refcount; -+ _Atomic_word* refcount; - - //! helper fields used in locateROI and adjustROI - uchar* datastart; -@@ -3449,7 +3449,7 @@ public: - { - Hdr(int _dims, const int* _sizes, int _type); - void clear(); -- int refcount; -+ _Atomic_word refcount; - int dims; - int valueOffset; - size_t nodeSize; -diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpumat.hpp -index 68647d9..d488c27 100644 ---- a/modules/core/include/opencv2/core/gpumat.hpp -+++ b/modules/core/include/opencv2/core/gpumat.hpp -@@ -301,7 +301,7 @@ namespace cv { namespace gpu - - //! pointer to the reference counter; - // when GpuMatrix points to user-allocated data, the pointer is NULL -- int* refcount; -+ _Atomic_word* refcount; - - //! helper fields used in locateROI and adjustROI - uchar* datastart; -diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp -index 0ae51c6..a455502 100644 ---- a/modules/core/include/opencv2/core/operations.hpp -+++ b/modules/core/include/opencv2/core/operations.hpp -@@ -2589,7 +2589,7 @@ template inline Ptr<_Tp>::Ptr(_Tp* _obj) : obj(_obj) - { - if(obj) - { -- refcount = (int*)fastMalloc(sizeof(*refcount)); -+ refcount = (_Atomic_word*)fastMalloc(sizeof(*refcount)); - *refcount = 1; - } - else -@@ -2628,7 +2628,7 @@ template inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _p - { - if (this != &_ptr) - { -- int* _refcount = _ptr.refcount; -+ _Atomic_word* _refcount = _ptr.refcount; - if( _refcount ) - CV_XADD(_refcount, 1); - release(); -diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp -index 9669191..0bd2568 100644 ---- a/modules/core/src/gpumat.cpp -+++ b/modules/core/src/gpumat.cpp -@@ -716,7 +716,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type) - datastart = data = static_cast(devPtr); - dataend = data + nettosize; - -- refcount = static_cast(fastMalloc(sizeof(*refcount))); -+ refcount = static_cast<_Atomic_word*>(fastMalloc(sizeof(*refcount))); - *refcount = 1; - } - } -diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp -index 57abffc..7b840a0 100644 ---- a/modules/core/src/matrix.cpp -+++ b/modules/core/src/matrix.cpp -@@ -213,7 +213,7 @@ void Mat::create(int d, const int* _sizes, int _type) - { - size_t totalsize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); - data = datastart = (uchar*)fastMalloc(totalsize + (int)sizeof(*refcount)); -- refcount = (int*)(data + totalsize); -+ refcount = (_Atomic_word*)(data + totalsize); - *refcount = 1; - } - else -@@ -228,7 +228,7 @@ void Mat::create(int d, const int* _sizes, int _type) - allocator = 0; - size_t totalSize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); - data = datastart = (uchar*)fastMalloc(totalSize + (int)sizeof(*refcount)); -- refcount = (int*)(data + totalSize); -+ refcount = (_Atomic_word*)(data + totalSize); - *refcount = 1; - } - #else -diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp -index f5a1af2..9a7b262 100644 ---- a/modules/core/src/system.cpp -+++ b/modules/core/src/system.cpp -@@ -892,7 +892,7 @@ struct Mutex::Impl - void unlock() { LeaveCriticalSection(&cs); } - - CRITICAL_SECTION cs; -- int refcount; -+ _Atomic_word refcount; - }; - - #ifndef __GNUC__ -@@ -920,7 +920,7 @@ struct Mutex::Impl - void unlock() { OSSpinLockUnlock(&sl); } - - OSSpinLock sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__ -@@ -935,7 +935,7 @@ struct Mutex::Impl - void unlock() { pthread_spin_unlock(&sl); } - - pthread_spinlock_t sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #else -@@ -950,7 +950,7 @@ struct Mutex::Impl - void unlock() { pthread_mutex_unlock(&sl); } - - pthread_mutex_t sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #endif -diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp -index de16982..266fa2f 100644 ---- a/modules/gpu/include/opencv2/gpu/gpu.hpp -+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp -@@ -125,7 +125,7 @@ public: - size_t step; - - uchar* data; -- int* refcount; -+ _Atomic_word* refcount; - - uchar* datastart; - uchar* dataend; -diff --git a/modules/ocl/include/opencv2/ocl/ocl.hpp b/modules/ocl/include/opencv2/ocl/ocl.hpp -index e8eb3e8..5ea05fc 100644 ---- a/modules/ocl/include/opencv2/ocl/ocl.hpp -+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp -@@ -404,7 +404,7 @@ namespace cv - - //! pointer to the reference counter; - // when oclMatrix points to user-allocated data, the pointer is NULL -- int *refcount; -+ _Atomic_word *refcount; - - //! helper fields used in locateROI and adjustROI - //datastart and dataend are not used in current version -diff --git a/modules/ocl/src/matrix_operations.cpp b/modules/ocl/src/matrix_operations.cpp -index 331e432..c61dca4 100644 ---- a/modules/ocl/src/matrix_operations.cpp -+++ b/modules/ocl/src/matrix_operations.cpp -@@ -591,7 +591,7 @@ void cv::ocl::oclMat::createEx(int _rows, int _cols, int _type, DevMemRW rw_type - datastart = data = (uchar *)dev_ptr; - dataend = data + nettosize; - -- refcount = (int *)fastMalloc(sizeof(*refcount)); -+ refcount = (_Atomic_word *)fastMalloc(sizeof(*refcount)); - *refcount = 1; - } - } -diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp -index 04cea39..40e5d43 100644 ---- a/modules/python/src2/cv2.cpp -+++ b/modules/python/src2/cv2.cpp -@@ -157,12 +157,12 @@ static PyObject* failmsgp(const char *fmt, ...) - static size_t REFCOUNT_OFFSET = (size_t)&(((PyObject*)0)->ob_refcnt) + - (0x12345678 != *(const size_t*)"\x78\x56\x34\x12\0\0\0\0\0")*sizeof(int); - --static inline PyObject* pyObjectFromRefcount(const int* refcount) -+static inline PyObject* pyObjectFromRefcount(const _Atomic_word* refcount) - { - return (PyObject*)((size_t)refcount - REFCOUNT_OFFSET); - } - --static inline int* refcountFromPyObject(const PyObject* obj) -+static inline _Atomic_word* refcountFromPyObject(const PyObject* obj) - { - return (int*)((size_t)obj + REFCOUNT_OFFSET); - } -@@ -173,7 +173,7 @@ public: - NumpyAllocator() {} - ~NumpyAllocator() {} - -- void allocate(int dims, const int* sizes, int type, int*& refcount, -+ void allocate(int dims, const int* sizes, int type, _Atomic_word*& refcount, - uchar*& datastart, uchar*& data, size_t* step) - { - PyEnsureGIL gil; -@@ -206,7 +206,7 @@ public: - datastart = data = (uchar*)PyArray_DATA((PyArrayObject*) o); - } - -- void deallocate(int* refcount, uchar*, uchar*) -+ void deallocate(_Atomic_word* refcount, uchar*, uchar*) - { - PyEnsureGIL gil; - if( !refcount ) --- -2.10.2 - diff --git a/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch deleted file mode 100644 index 6d63411b0..000000000 --- a/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 22e03ef8a9e3adcbc6b2f16c3cc98e4e14443eed Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 24 Sep 2016 17:51:22 +0200 -Subject: [PATCH 1/1] CMakeLists.txt: Do not add libdl to LINKER_LIBS for - static builds - -Without this patch -ldl is present in opencv.pc which breaks OpenCV -detection by ffmpeg, detected by buildroot autobuilders: - -http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04//ffmpeg-3.1.3/config.log - -/home/peko/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.9.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -ldl - -Patch sent upstream: https://github.com/opencv/opencv/pull/7337 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 007b80d..99b047d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -457,7 +457,10 @@ if(UNIX) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m) - else() -- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) -+ if(BUILD_SHARED_LIBS) -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl) -+ endif() -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread rt) - endif() - else() - set(HAVE_LIBPTHREAD YES) --- -2.9.3 - diff --git a/buildroot/package/opencv/Config.in b/buildroot/package/opencv/Config.in deleted file mode 100644 index 836f5c96e..000000000 --- a/buildroot/package/opencv/Config.in +++ /dev/null @@ -1,275 +0,0 @@ -menuconfig BR2_PACKAGE_OPENCV - bool "opencv-2.4" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - select BR2_PACKAGE_ZLIB - help - OpenCV (Open Source Computer Vision) is a library of - programming functions for real time computer vision. - - http://opencv.org/ - -if BR2_PACKAGE_OPENCV - -comment "OpenCV modules" - -config BR2_PACKAGE_OPENCV_LIB_CALIB3D - bool "calib3d" - default y - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_calib3d module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_CONTRIB - bool "contrib" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_contrib module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_FEATURES2D - bool "features2d" - default y - select BR2_PACKAGE_OPENCV_LIB_FLANN - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_features2d module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_FLANN - bool "flann" - default y - # opencv_core dependency is already enabled - help - Include opencv_flann module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_GPU - bool "gpu" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_LEGACY - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_PHOTO - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_gpu module into the OpenCV build. - -comment "gpu module needs a toolchain w/ dynamic libraries" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_OPENCV_LIB_HIGHGUI - bool "highgui" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_highgui module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_IMGPROC - bool "imgproc" - default y - # opencv_core dependency is already enabled - help - Include opencv_imgproc module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_LEGACY - bool "legacy" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_legacy module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_ML - bool "ml (machine learning)" - default y - # opencv_core dependency is already enabled - help - Include opencv_ml module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_NONFREE - bool "nonfree" - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_nonfree module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_OBJDETECT - bool "objdetect" - default y - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_objdetect module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_PHOTO - bool "photo" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_photo module into the OpenCV build. - -comment "opencv_python module requires numpy which is not yet available." - -config BR2_PACKAGE_OPENCV_LIB_STITCHING - bool "stitching" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - help - Include opencv_stitching module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_SUPERRES - bool "superres" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_superres "super resolution" - module into the - OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_TS - bool "ts (touchscreen)" - default y - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_ts module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_VIDEO - bool "video" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_video module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB - bool "videostab" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_PHOTO - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_videostab module into the OpenCV build. - -if !BR2_STATIC_LIBS - -comment "Test sets" - -config BR2_PACKAGE_OPENCV_BUILD_TESTS - bool "build tests" - -config BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS - bool "build performance tests" - -endif - -comment "Tests sets need a toolchain w/ dynamic libraries" - depends on BR2_STATIC_LIBS - -comment "3rd party support" - -config BR2_PACKAGE_OPENCV_WITH_FFMPEG - bool "ffmpeg support" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE - help - Use ffmpeg from the target system. - -config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 - bool "gstreamer support" - depends on BR2_USE_MMU # gstreamer1 -> libglib2 - depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - help - Enable gstreamer support. - -comment "gstreamer support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_OPENCV_WITH_JASPER - bool "jpeg2000 support" - select BR2_PACKAGE_JASPER - help - Enable jpeg2000 support. - - Note: this does not use the libjasper bundled with opencv, - but uses the libjasper package installed system-wide by - Buildroot. - -config BR2_PACKAGE_OPENCV_WITH_JPEG - bool "jpeg support" - select BR2_PACKAGE_JPEG - help - Use shared libjpeg from the target system. - -config BR2_PACKAGE_OPENCV_WITH_PNG - bool "png support" - select BR2_PACKAGE_LIBPNG - help - Use shared libpng from the target system. - -config BR2_PACKAGE_OPENCV_WITH_TIFF - bool "tiff support" - select BR2_PACKAGE_TIFF - help - Use shared libtiff from the target system. - -config BR2_PACKAGE_OPENCV_WITH_V4L - bool "v4l support" - help - Enable Video 4 Linux support. - - If the package libv4l is enabled, its support is - automatically enabled. - -comment "Install options" - -config BR2_PACKAGE_OPENCV_INSTALL_DATA - bool "install extra data" - help - Install various data that is used by cv libraries and/or demo - applications, specifically for haarcascades and lbpcascades - features. - - For further information: see OpenCV documentation. - -endif # BR2_PACKAGE_OPENCV - -comment "opencv needs a toolchain w/ C++, NPTL, wchar" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL) diff --git a/buildroot/package/opencv/opencv.hash b/buildroot/package/opencv/opencv.hash deleted file mode 100644 index dfb3b2858..000000000 --- a/buildroot/package/opencv/opencv.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 192d903588ae2cdceab3d7dc5a5636b023132c8369f184ca89ccec0312ae33d0 opencv-2.4.13.7.tar.gz -sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4 LICENSE diff --git a/buildroot/package/opencv/opencv.mk b/buildroot/package/opencv/opencv.mk deleted file mode 100644 index 939058e4e..000000000 --- a/buildroot/package/opencv/opencv.mk +++ /dev/null @@ -1,255 +0,0 @@ -################################################################################ -# -# opencv -# -################################################################################ - -OPENCV_VERSION = 2.4.13.7 -OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION)) -OPENCV_INSTALL_STAGING = YES -OPENCV_LICENSE = BSD-3-Clause -OPENCV_LICENSE_FILES = LICENSE -OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO -OPENCV_CXXFLAGS = $(TARGET_CXXFLAGS) - -# OpenCV component options -OPENCV_CONF_OPTS += \ - -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \ - -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \ - -DBUILD_WITH_DEBUG_INFO=OFF - -# OpenCV build options -OPENCV_CONF_OPTS += \ - -DBUILD_WITH_STATIC_CRT=OFF \ - -DENABLE_FAST_MATH=ON \ - -DENABLE_NOISY_WARNINGS=OFF \ - -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DENABLE_PROFILING=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON - -# OpenCV link options -OPENCV_CONF_OPTS += \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF - -# OpenCV packaging options: -OPENCV_CONF_OPTS += \ - -DBUILD_PACKAGE=OFF \ - -DENABLE_SOLUTION_FOLDERS=OFF \ - -DINSTALL_CREATE_DISTRIB=OFF - -# OpenCV module selection -OPENCV_CONF_OPTS += \ - -DBUILD_opencv_androidcamera=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \ - -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \ - -DBUILD_opencv_core=ON \ - -DBUILD_opencv_dynamicuda=OFF \ - -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \ - -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \ - -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \ - -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \ - -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \ - -DBUILD_opencv_java=OFF \ - -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \ - -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \ - -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \ - -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \ - -DBUILD_opencv_ocl=OFF \ - -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \ - -DBUILD_opencv_python=OFF \ - -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \ - -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \ - -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \ - -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \ - -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \ - -DBUILD_opencv_world=OFF - -# Hardware support options. -# -# * PowerPC support is turned off since its only effect is altering CFLAGS, -# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. -OPENCV_CONF_OPTS += \ - -DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ - -DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ - -DENABLE_POWERPC=OFF \ - -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \ - -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ - -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ - -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ - -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ - -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) \ - -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) - -# Cuda stuff -OPENCV_CONF_OPTS += \ - -DWITH_CUBLAS=OFF \ - -DWITH_CUDA=OFF \ - -DWITH_CUFFT=OFF - -# NVidia stuff -OPENCV_CONF_OPTS += -DWITH_NVCUVID=OFF - -# AMD stuff -OPENCV_CONF_OPTS += \ - -DWITH_OPENCLAMDBLAS=OFF \ - -DWITH_OPENCLAMDFFT=OFF - -# Intel stuff -OPENCV_CONF_OPTS += \ - -DWITH_INTELPERC=OFF \ - -DWITH_IPP=OFF \ - -DWITH_TBB=OFF - -# Smartek stuff -OPENCV_CONF_OPTS += -DWITH_GIGEAPI=OFF - -# Prosilica stuff -OPENCV_CONF_OPTS += -DWITH_PVAPI=OFF - -# Ximea stuff -OPENCV_CONF_OPTS += -DWITH_XIMEA=OFF - -# Non-Linux support (Android options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \ - -DBUILD_ANDROID_EXAMPLES=OFF \ - -DBUILD_FAT_JAVA_LIB=OFF \ - -DBUILD_JAVA_SUPPORT=OFF \ - -DINSTALL_ANDROID_EXAMPLES=OFF \ - -DWITH_ANDROID_CAMERA=OFF - -# Non-Linux support (Mac OSX options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DWITH_AVFOUNDATION=OFF \ - -DWITH_CARBON=OFF \ - -DWITH_QUICKTIME=OFF - -# Non-Linux support (Windows options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DWITH_CSTRIPES=OFF \ - -DWITH_DSHOW=OFF \ - -DWITH_MSMF=OFF \ - -DWITH_VFW=OFF \ - -DWITH_VIDEOINPUT=OFF \ - -DWITH_WIN32UI=OFF - -# Software/3rd-party support options. -OPENCV_CONF_OPTS += \ - -DBUILD_JASPER=OFF \ - -DBUILD_JPEG=OFF \ - -DBUILD_NEW_PYTHON_SUPPORT=OFF \ - -DBUILD_OPENEXR=OFF \ - -DBUILD_PNG=OFF \ - -DBUILD_TIFF=OFF \ - -DBUILD_ZLIB=OFF \ - -DINSTALL_C_EXAMPLES=OFF \ - -DINSTALL_PYTHON_EXAMPLES=OFF \ - -DINSTALL_TO_MANGLED_PATHS=OFF - -# Disabled features (mostly because they are not available in Buildroot), but -# - eigen: OpenCV does not use it, not take any benefit from it. -OPENCV_CONF_OPTS += \ - -DWITH_1394=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_GSTREAMER_0_10=OFF \ - -DWITH_IMAGEIO=OFF \ - -DWITH_OPENCL=OFF \ - -DWITH_OPENEXR=OFF \ - -DWITH_OPENGL=OFF \ - -DWITH_OPENMP=OFF \ - -DWITH_OPENNI=OFF \ - -DWITH_QT=OFF \ - -DWITH_UNICAP=OFF \ - -DWITH_XINE=OFF - -OPENCV_DEPENDENCIES += zlib - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) -OPENCV_CXXFLAGS += -O0 -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y) -OPENCV_CONF_OPTS += -DWITH_FFMPEG=ON -OPENCV_DEPENDENCIES += ffmpeg bzip2 -else -OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y) -OPENCV_CONF_OPTS += -DWITH_GTK=ON -OPENCV_DEPENDENCIES += libgtk2 -else -OPENCV_CONF_OPTS += -DWITH_GTK=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y) -OPENCV_CONF_OPTS += -DWITH_JASPER=ON -OPENCV_CXXFLAGS += -D__STDC_LIMIT_MACROS -OPENCV_DEPENDENCIES += jasper -else -OPENCV_CONF_OPTS += -DWITH_JASPER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_JPEG),y) -OPENCV_CONF_OPTS += -DWITH_JPEG=ON -OPENCV_DEPENDENCIES += jpeg -else -OPENCV_CONF_OPTS += -DWITH_JPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y) -OPENCV_CONF_OPTS += -DWITH_PNG=ON -OPENCV_DEPENDENCIES += libpng -else -OPENCV_CONF_OPTS += -DWITH_PNG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y) -OPENCV_CONF_OPTS += -DWITH_TIFF=ON -OPENCV_DEPENDENCIES += tiff -else -OPENCV_CONF_OPTS += -DWITH_TIFF=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y) -OPENCV_CONF_OPTS += \ - -DWITH_LIBV4L=$(if $(BR2_PACKAGE_LIBV4L),ON,OFF) \ - -DWITH_V4L=ON -OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBV4L),libv4l) -else -OPENCV_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF -endif - -OPENCV_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(OPENCV_CXXFLAGS)" - -# Installation hooks: -define OPENCV_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC - -define OPENCV_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE - -ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y) -define OPENCV_CLEAN_INSTALL_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ - $(TARGET_DIR)/usr/share/OpenCV/lbpcascades -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA -endif - -$(eval $(cmake-package)) diff --git a/buildroot/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch b/buildroot/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch deleted file mode 100644 index e54fab852..000000000 --- a/buildroot/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f66fc199a20882c546fa31142e9c0f5a8b3cf983 Mon Sep 17 00:00:00 2001 -From: Florian Jung -Date: Wed, 29 Jul 2020 18:51:55 +0200 -Subject: [PATCH] Fix build of grfmt_jpeg2000.cpp - -libjasper has recently changed `jas_matrix_get` from a macro to an inline function -(389951d071 in https://github.com/jasper-software/jasper), causing the build to fail. - -[Retrieved from: -https://github.com/opencv/opencv/commit/f66fc199a20882c546fa31142e9c0f5a8b3cf983] -Signed-off-by: Fabrice Fontaine ---- - modules/imgcodecs/src/grfmt_jpeg2000.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -index fe69f80c86f..0f4d28d6f4d 100644 ---- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp -+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - uchar* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) -@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - ushort* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) diff --git a/buildroot/package/opencv3/Config.in b/buildroot/package/opencv3/Config.in index d4b17b6ac..b9ea033f1 100644 --- a/buildroot/package/opencv3/Config.in +++ b/buildroot/package/opencv3/Config.in @@ -5,7 +5,6 @@ menuconfig BR2_PACKAGE_OPENCV3 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS # include dlfcn.h - depends on !BR2_PACKAGE_OPENCV select BR2_PACKAGE_ZLIB help OpenCV (Open Source Computer Vision) is a library of @@ -85,7 +84,6 @@ comment "gtk3 support needs libgtk3" config BR2_PACKAGE_OPENCV3_WITH_QT5 bool "qt5" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS @@ -156,7 +154,7 @@ config BR2_PACKAGE_OPENCV3_LIB_PHOTO config BR2_PACKAGE_OPENCV3_LIB_PYTHON bool "python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_NUMPY @@ -165,6 +163,8 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON python example is installed. comment "python support needs glibc or musl" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) config BR2_PACKAGE_OPENCV3_LIB_SHAPE @@ -312,6 +312,14 @@ config BR2_PACKAGE_OPENCV3_WITH_V4L If the package libv4l is enabled, its support is automatically enabled. +config BR2_PACKAGE_OPENCV3_WITH_WEBP + bool "webp support" + select BR2_PACKAGE_WEBP + help + Enable WebP support. + + Use shared libwebp from the target system. + comment "Install options" config BR2_PACKAGE_OPENCV3_INSTALL_DATA diff --git a/buildroot/package/opencv3/opencv3.hash b/buildroot/package/opencv3/opencv3.hash index 4953d01a1..545108a73 100644 --- a/buildroot/package/opencv3/opencv3.hash +++ b/buildroot/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz -sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE +sha256 c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13 opencv3-3.4.12.tar.gz +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 LICENSE diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk index fab671634..3e3e5987a 100644 --- a/buildroot/package/opencv3/opencv3.mk +++ b/buildroot/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.9 +OPENCV3_VERSION = 3.4.12 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause @@ -13,6 +13,11 @@ OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS) +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENCV3_CXXFLAGS += -latomic +endif + # Fix c++11 build with missing std::exception_ptr ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y) OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0 @@ -48,7 +53,7 @@ OPENCV3_CONF_OPTS += \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ - -DOPENCV3_WARNINGS_ARE_ERRORS=OFF + -DOPENCV_WARNINGS_ARE_ERRORS=OFF # OpenCV link options OPENCV3_CONF_OPTS += \ @@ -218,7 +223,6 @@ OPENCV3_CONF_OPTS += \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VTK=OFF \ - -DWITH_WEBP=OFF \ -DWITH_XINE=OFF OPENCV3_DEPENDENCIES += host-pkgconf zlib @@ -313,20 +317,14 @@ else OPENCV3_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON),y) -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=ON \ - -DBUILD_opencv_python3=OFF \ - -DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \ - -DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \ - -DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \ - -DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - -DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python -OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/cv2/config*.py +ifeq ($(BR2_PACKAGE_OPENCV3_WITH_WEBP),y) +OPENCV3_CONF_OPTS += -DWITH_WEBP=ON +OPENCV3_DEPENDENCIES += webp else +OPENCV3_CONF_OPTS += -DWITH_WEBP=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) OPENCV3_CONF_OPTS += \ -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ @@ -338,7 +336,6 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -endif OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else @@ -348,16 +345,21 @@ OPENCV3_CONF_OPTS += \ endif # Installation hooks: -define OPENCV3_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc +define OPENCV3_CLEAN_INSTALL_LICENSE + $(RM) -fr $(TARGET_DIR)/usr/share/licenses/opencv3 endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_DOC +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_LICENSE define OPENCV3_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCV*.cmake endef OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_CMAKE +define OPENCV3_CLEAN_INSTALL_VALGRIND + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/valgrind* +endef +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_VALGRIND + ifneq ($(BR2_PACKAGE_OPENCV3_INSTALL_DATA),y) define OPENCV3_CLEAN_INSTALL_DATA $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ diff --git a/buildroot/package/openfpgaloader/Config.in b/buildroot/package/openfpgaloader/Config.in new file mode 100644 index 000000000..5bf496627 --- /dev/null +++ b/buildroot/package/openfpgaloader/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_OPENFPGALOADER + bool "openfpgaloader" + depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi1 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBFTDI1 + help + Universal utility for programming FPGA + + https://github.com/trabucayre/openFPGALoader/ + +comment "openfpgaloader needs a toolchain w/ threads, C++" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/openfpgaloader/openfpgaloader.hash b/buildroot/package/openfpgaloader/openfpgaloader.hash new file mode 100644 index 000000000..990149cde --- /dev/null +++ b/buildroot/package/openfpgaloader/openfpgaloader.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ef3ed60297ab560f15cd4362d61b7da86c44b84e18937e0411023f8d1cf6a606 openfpgaloader-381c67de00a3102cf6e9bb20ca84030a71c7a0f2.tar.gz +sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/buildroot/package/openfpgaloader/openfpgaloader.mk b/buildroot/package/openfpgaloader/openfpgaloader.mk new file mode 100644 index 000000000..1bb3de37f --- /dev/null +++ b/buildroot/package/openfpgaloader/openfpgaloader.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# openfpgaloader +# +################################################################################ + +OPENFPGALOADER_VERSION = 381c67de00a3102cf6e9bb20ca84030a71c7a0f2 +OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,$(OPENFPGALOADER_VERSION)) +OPENFPGALOADER_LICENSE = AGPL-3.0 +OPENFPGALOADER_LICENSE_FILES = LICENSE +OPENFPGALOADER_DEPENDENCIES = libftdi1 + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +OPENFPGALOADER_DEPENDENCIES += udev +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch b/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch deleted file mode 100644 index 112d63854..000000000 --- a/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6a051666b50ae1df24b24312a7a56a03e343c15d Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 16 Aug 2019 09:48:21 +0300 -Subject: [PATCH] sample: fix readline include in ipmi_serial_bmc_emu.c - -Bundled editline has been removed. Use the readline headers instead. Fix -the build when editline is not installed on host. - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to openipmi-developer@lists.sourceforge.net (moderated) - - sample/ipmi_serial_bmc_emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae0197688b..1b8bb9ac201f 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,7 @@ - #include - #include - #include --#include -+#include - - #define _GNU_SOURCE - #include --- -2.23.0.rc1 - diff --git a/buildroot/package/openipmi/openipmi.hash b/buildroot/package/openipmi/openipmi.hash index 756ea539f..2ec9dd31a 100644 --- a/buildroot/package/openipmi/openipmi.hash +++ b/buildroot/package/openipmi/openipmi.hash @@ -1,7 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 043738af9e1aaa6ae4f372d4af7870683e68faf8 OpenIPMI-2.0.27.tar.gz +sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz +md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz # Locally computed -sha256 f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b OpenIPMI-2.0.27.tar.gz +sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/buildroot/package/openipmi/openipmi.mk b/buildroot/package/openipmi/openipmi.mk index ca8fa7734..3240b8989 100644 --- a/buildroot/package/openipmi/openipmi.mk +++ b/buildroot/package/openipmi/openipmi.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.27 -OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library +OPENIPMI_VERSION = 2.0.28 +OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD diff --git a/buildroot/package/openjdk-bin/openjdk-bin.hash b/buildroot/package/openjdk-bin/openjdk-bin.hash index 3e4df5923..482804802 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.hash +++ b/buildroot/package/openjdk-bin/openjdk-bin.hash @@ -1,6 +1,9 @@ -# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases -sha256 9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998 OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases +sha256 7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz + +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 6e4cead158037cb7747ca47416474d4f408c9126be5b96f9befd532e0a762b47 OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz # Locally calculated -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE -sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/buildroot/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk index 90256f593..dd5b87fd9 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.mk +++ b/buildroot/package/openjdk-bin/openjdk-bin.mk @@ -4,11 +4,19 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 13.0.2 -HOST_OPENJDK_BIN_VERSION_MINOR = 8 +ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.2 +HOST_OPENJDK_BIN_VERSION_MINOR = 12 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) -HOST_OPENJDK_BIN_SOURCE = OpenJDK13U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.8 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch b/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch new file mode 100644 index 000000000..9941d0151 --- /dev/null +++ b/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch @@ -0,0 +1,119 @@ +From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 +From: Patrick Zhang +Date: Wed, 05 Feb 2020 17:14:15 -0700 +Subject: [PATCH] fix gcc 10 support + +This patch fixes the "multiple definition" link errors with GCC10 due to +GCC10 setting -fno-common by default. + +This is a combination of the following upstream commits: + - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca + - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 + - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 + +Signed-off-by: Patrick Zhang +Signed-off-by: Adam Duskett +--- + src/java.base/unix/native/libjava/childproc.c | 1 + + src/java.base/unix/native/libjava/childproc.h | 2 +- + .../share/native/libj2gss/NativeFunc.c | 3 +++ + .../share/native/libj2gss/NativeFunc.h | 2 +- + src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ + src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ + 6 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c +index 811aaeac5..16480bfbf 100644 +--- a/src/java.base/unix/native/libjava/childproc.c ++++ b/src/java.base/unix/native/libjava/childproc.c +@@ -33,6 +33,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h +index 091150930..d57e44b6e 100644 +--- a/src/java.base/unix/native/libjava/childproc.h ++++ b/src/java.base/unix/native/libjava/childproc.h +@@ -118,7 +118,7 @@ typedef struct _SpawnInfo { + * The cached and split version of the JDK's effective PATH. + * (We don't support putenv("PATH=...") in native code) + */ +-const char * const *parentPathv; ++extern const char * const *parentPathv; + + ssize_t restartableWrite(int fd, const void *buf, size_t count); + int restartableDup2(int fd_from, int fd_to); +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +index da7bc0445..5941f7b5a 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +@@ -27,6 +27,9 @@ + #include + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +index 82914387c..e4a4981a3 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif +diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h +index cc1367f78..46b07db0a 100644 +--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h ++++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h +@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + #endif /* __linux__ */ + +-sctp_getladdrs_func* nio_sctp_getladdrs; +-sctp_freeladdrs_func* nio_sctp_freeladdrs; +-sctp_getpaddrs_func* nio_sctp_getpaddrs; +-sctp_freepaddrs_func* nio_sctp_freepaddrs; +-sctp_bindx_func* nio_sctp_bindx; +-sctp_peeloff_func* nio_sctp_peeloff; ++extern sctp_getladdrs_func* nio_sctp_getladdrs; ++extern sctp_freeladdrs_func* nio_sctp_freeladdrs; ++extern sctp_getpaddrs_func* nio_sctp_getpaddrs; ++extern sctp_freepaddrs_func* nio_sctp_freepaddrs; ++extern sctp_bindx_func* nio_sctp_bindx; ++extern sctp_peeloff_func* nio_sctp_peeloff; + + jboolean loadSocketExtensionFuncs(JNIEnv* env); + +diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +index d40c15aa3..ab9b6e093 100644 +--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c ++++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; + static const char* nativeSctpLib = "libsctp.so.1"; + static jboolean funcsLoaded = JNI_FALSE; + ++sctp_getladdrs_func* nio_sctp_getladdrs; ++sctp_freeladdrs_func* nio_sctp_freeladdrs; ++sctp_getpaddrs_func* nio_sctp_getpaddrs; ++sctp_freepaddrs_func* nio_sctp_freepaddrs; ++sctp_bindx_func* nio_sctp_bindx; ++sctp_peeloff_func* nio_sctp_peeloff; ++ + JNIEXPORT jint JNICALL DEF_JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; +-- +2.26.2 + diff --git a/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch b/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch new file mode 100644 index 000000000..5364c4725 --- /dev/null +++ b/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch @@ -0,0 +1,119 @@ +From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 +From: Patrick Zhang +Date: Wed, 05 Feb 2020 17:14:15 -0700 +Subject: [PATCH] fix gcc 10 support + +This patch fixes the "multiple definition" link errors with GCC10 due to +GCC10 setting -fno-common by default. + +This is a combination of the following upstream commits: + - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca + - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 + - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 + +Signed-off-by: Patrick Zhang +Signed-off-by: Adam Duskett +--- + src/java.base/unix/native/libjava/childproc.c | 1 + + src/java.base/unix/native/libjava/childproc.h | 2 +- + .../share/native/libj2gss/NativeFunc.c | 3 +++ + .../share/native/libj2gss/NativeFunc.h | 2 +- + src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ + src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ + 6 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c +index 811aaeac5..16480bfbf 100644 +--- a/src/java.base/unix/native/libjava/childproc.c ++++ b/src/java.base/unix/native/libjava/childproc.c +@@ -34,6 +34,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h +index 091150930..d57e44b6e 100644 +--- a/src/java.base/unix/native/libjava/childproc.h ++++ b/src/java.base/unix/native/libjava/childproc.h +@@ -126,7 +126,7 @@ typedef struct _SpawnInfo { + * The cached and split version of the JDK's effective PATH. + * (We don't support putenv("PATH=...") in native code) + */ +-const char * const *parentPathv; ++extern const char * const *parentPathv; + + ssize_t restartableWrite(int fd, const void *buf, size_t count); + int restartableDup2(int fd_from, int fd_to); +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +index da7bc0445..5941f7b5a 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +@@ -27,6 +27,9 @@ + #include + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +index 82914387c..e4a4981a3 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif +diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h +index cc1367f78..46b07db0a 100644 +--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h ++++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h +@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + #endif /* __linux__ */ + +-sctp_getladdrs_func* nio_sctp_getladdrs; +-sctp_freeladdrs_func* nio_sctp_freeladdrs; +-sctp_getpaddrs_func* nio_sctp_getpaddrs; +-sctp_freepaddrs_func* nio_sctp_freepaddrs; +-sctp_bindx_func* nio_sctp_bindx; +-sctp_peeloff_func* nio_sctp_peeloff; ++extern sctp_getladdrs_func* nio_sctp_getladdrs; ++extern sctp_freeladdrs_func* nio_sctp_freeladdrs; ++extern sctp_getpaddrs_func* nio_sctp_getpaddrs; ++extern sctp_freepaddrs_func* nio_sctp_freepaddrs; ++extern sctp_bindx_func* nio_sctp_bindx; ++extern sctp_peeloff_func* nio_sctp_peeloff; + + jboolean loadSocketExtensionFuncs(JNIEnv* env); + +diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +index d40c15aa3..ab9b6e093 100644 +--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c ++++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; + static const char* nativeSctpLib = "libsctp.so.1"; + static jboolean funcsLoaded = JNI_FALSE; + ++sctp_getladdrs_func* nio_sctp_getladdrs; ++sctp_freeladdrs_func* nio_sctp_freeladdrs; ++sctp_getpaddrs_func* nio_sctp_getpaddrs; ++sctp_freepaddrs_func* nio_sctp_freepaddrs; ++sctp_bindx_func* nio_sctp_bindx; ++sctp_peeloff_func* nio_sctp_peeloff; ++ + JNIEXPORT jint JNICALL DEF_JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; +-- +2.26.2 + diff --git a/buildroot/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in index df769bbb3..3b35c725e 100644 --- a/buildroot/package/openjdk/Config.in +++ b/buildroot/package/openjdk/Config.in @@ -48,6 +48,74 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_LATEST + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_LTS + bool "LTS (OpenJDK 11)" + +config BR2_OPENJDK_VERSION_LATEST + bool "latest (OpenJDK 14)" + +endchoice + +config BR2_PACKAGE_OPENJDK_FULL_JDK + bool "Build the full JDK" + help + Install the full JDK instead of just the run time. + The full JDK includes several packages used for debugging and + development. Some useful tools included with the JDK are: + - javaws + Command line tool for launching Java Web Start and setting + various options. + + - jcmd: + JVM Diagnostic Commands tool: Sends diagnostic command + requests to a running Java Virtual Machine. + + - jinfo + Configuration Info for Java: Prints configuration + information for a given process or core file or a remote + debug server. + + - jmap + Memory Map for Java: Prints shared object memory maps or + heap memory details of a given process or core file or a + remote debug server. + + - jsadebugd + Serviceability Agent Debug Daemon for Java: Attaches to a + process or core file and acts as a debug server. + + - jstack + Stack Trace for Java - Prints a stack trace of threads for + a given process or core file or remote debug server. + + - jstat + JVM Statistics Monitoring Tool: Attaches to an + instrumented HotSpot Java virtual machine and collects and + logs performance statistics as specified by the command + line options. + + - jstatd + JVM jstat Daemon - Launches an RMI server application that + monitors for the creation and termination of instrumented + HotSpot Java virtual machines and provides an interface to + allow remote monitoring tools to attach to Java virtual + machines running on the local system. + + Note: + While the JDK also comes with several tools which can be used + for developing java applications on a target, Buildroot does + not support development on a target. Building the full JDK is + supported for debugging purposes only. + + Selecting this option increases the file system by + approximately 110M. + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc diff --git a/buildroot/package/openjdk/openjdk.hash b/buildroot/package/openjdk/openjdk.hash index ca282591e..6acfa2243 100644 --- a/buildroot/package/openjdk/openjdk.hash +++ b/buildroot/package/openjdk/openjdk.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0 jdk-13.0.2+8.tar.gz -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE +sha256 dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 jdk-14.0.2+12.tar.gz +sha256 7fc124b5e20428cd5df42d78b001abc663558b0881e66a5def0892b98265b6e9 jdk-11.0.8+10.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk index 8a01060ff..80e1fc1aa 100644 --- a/buildroot/package/openjdk/openjdk.mk +++ b/buildroot/package/openjdk/openjdk.mk @@ -4,13 +4,23 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 13.0.2 -OPENJDK_VERSION_MINOR = 8 +ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) +OPENJDK_VERSION_MAJOR = 14.0.2 +OPENJDK_VERSION_MINOR = 12 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz -OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk13u/archive +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +else +OPENJDK_VERSION_MAJOR = 11.0.8 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE +OPENJDK_INSTALL_STAGING = YES # OpenJDK requires Alsa, cups, and X11 even for a headless build. # host-zip is needed for the zip executable. @@ -46,6 +56,14 @@ OPENJDK_JVM_VARIANT = zero OPENJDK_DEPENDENCIES += libffi endif +ifeq ($(BR2_PACKAGE_OPENJDK_FULL_JDK),y) +OPENJDK_VARIANT = jdk +OPENJDK_MAKE_TARGET = jdk-image +else +OPENJDK_VARIANT = jre +OPENJDK_MAKE_TARGET = legacy-jre-image +endif + # OpenJDK installs a file named 'modules' in jre/lib, which gets installed as # /usr/lib/modules. However, with a merged /usr, this conflicts with the # directory named 'modules' installed by the kernel. If OpenJDK gets built @@ -116,16 +134,31 @@ endef # Make -jn is unsupported. Instead, set the "--with-jobs=" configure option, # and use $(MAKE1). define OPENJDK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) legacy-jre-image + $(TARGET_MAKE_ENV) $(OPENJDK_CONF_ENV) $(MAKE1) -C $(@D) $(OPENJDK_MAKE_TARGET) endef # Calling make install always builds and installs the JDK instead of the JRE, # which makes manual installation necessary. define OPENJDK_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL_BASE) - cp -dpfr $(@D)/build/linux-*-release/images/jre/* \ + cp -dpfr $(@D)/build/linux-*-release/images/$(OPENJDK_VARIANT)/* \ $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/ cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/bin/* . endef +define OPENJDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/jvm + cp -dpfr $(@D)/build/linux-*-release/jdk/include/* \ + $(STAGING_DIR)/usr/include/jvm +endef + +# Demos and includes are not needed on the target +ifeq ($(BR2_PACKAGE_OPENJDK_FULL_JDK),y) +define OPENJDK_REMOVE_UNEEDED_JDK_DIRECTORIES + $(RM) -r $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/include/ + $(RM) -r $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/demo/ +endef +OPENJDK_TARGET_FINALIZE_HOOKS += OPENJDK_REMOVE_UNEEDED_JDK_DIRECTORIES +endif + $(eval $(generic-package)) diff --git a/buildroot/package/openlayers/openlayers.hash b/buildroot/package/openlayers/openlayers.hash index b9efd448a..2774b8064 100644 --- a/buildroot/package/openlayers/openlayers.hash +++ b/buildroot/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 9513cf83d5a2c6093e8c4321fc50ef03cb16fb7c455858924059f5924b0fa20c v6.1.1-dist.zip +sha256 8371bbca2f7b33be0db5b416a78bc9559dd8f9afb6a406994daeeecf7b37f3f6 v6.4.3-dist.zip diff --git a/buildroot/package/openlayers/openlayers.mk b/buildroot/package/openlayers/openlayers.mk index 85003b620..c3e137adc 100644 --- a/buildroot/package/openlayers/openlayers.mk +++ b/buildroot/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.1.1 +OPENLAYERS_VERSION = 6.4.3 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause diff --git a/buildroot/package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch b/buildroot/package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch new file mode 100644 index 000000000..76d61f3e8 --- /dev/null +++ b/buildroot/package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch @@ -0,0 +1,57 @@ +From 240634b1afb968a051f8c68696eae2a582a02450 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Aug 2020 20:16:25 +0200 +Subject: [PATCH] Rename openpgm-5.2.pc.in + +This will fix the following build failure: + +config.status: error: cannot find input file: `openpgm-5.3.pc.in' + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-o/openpgm/pull/66] +--- + openpgm/pgm/openpgm-5.2.pc.in | 12 ------------ + openpgm/pgm/openpgm-5.3.pc.in | 12 ++++++++++++ + 2 files changed, 12 insertions(+), 12 deletions(-) + delete mode 100644 openpgm/pgm/openpgm-5.2.pc.in + create mode 100644 openpgm/pgm/openpgm-5.3.pc.in + +diff --git a/openpgm/pgm/openpgm-5.2.pc.in b/openpgm/pgm/openpgm-5.2.pc.in +deleted file mode 100644 +index 9e30a6d..0000000 +--- a/openpgm/pgm/openpgm-5.2.pc.in ++++ /dev/null +@@ -1,12 +0,0 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +- +-Name: OpenPGM +-Description: PGM Protocol Library. +-Version: @PACKAGE_VERSION@ +-# packagers may wish to move @LIBS@ to Libs.private for platforms with +-# versions of pkg-config that support static linking. +-Libs: -L${libdir} -lpgm @LIBS@ +-Cflags: -I${includedir}/pgm-@VERSION_MAJOR@.@VERSION_MINOR@ +diff --git a/openpgm/pgm/openpgm-5.3.pc.in b/openpgm/pgm/openpgm-5.3.pc.in +new file mode 100644 +index 0000000..9e30a6d +--- /dev/null ++++ b/openpgm/pgm/openpgm-5.3.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: OpenPGM ++Description: PGM Protocol Library. ++Version: @PACKAGE_VERSION@ ++# packagers may wish to move @LIBS@ to Libs.private for platforms with ++# versions of pkg-config that support static linking. ++Libs: -L${libdir} -lpgm @LIBS@ ++Cflags: -I${includedir}/pgm-@VERSION_MAJOR@.@VERSION_MINOR@ +-- +2.28.0 + diff --git a/buildroot/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch b/buildroot/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch deleted file mode 100644 index 97cff29df..000000000 --- a/buildroot/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e04f5c20fc1536f8e6d4faf32f2f4657d441f7c8 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Mon, 14 Apr 2014 17:54:37 +0200 -Subject: [PATCH] version_generator.py: make it python3 compliant - -Signed-off-by: Samuel Martin ---- - openpgm/pgm/version_generator.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py -index 2265480..c31376f 100755 ---- a/openpgm/pgm/version_generator.py -+++ b/openpgm/pgm/version_generator.py -@@ -1,5 +1,7 @@ - #!/usr/bin/python - -+from __future__ import print_function -+ - import os - import platform - import time -@@ -8,7 +10,7 @@ build_date = time.strftime ("%Y-%m-%d") - build_time = time.strftime ("%H:%M:%S") - build_rev = filter (str.isdigit, "$Revision: 1369 $") - --print """ -+print(""" - /* vim:ts=8:sts=8:sw=4:noai:noexpandtab - * - * OpenPGM version. -@@ -47,6 +49,6 @@ const char* pgm_build_revision = "%s"; - - - /* eof */ --"""%(build_date, build_time, platform.system(), platform.machine(), build_rev) -+"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)) - - # end of file --- -1.9.2 - diff --git a/buildroot/package/openpgm/0002-cross-compile.patch b/buildroot/package/openpgm/0002-cross-compile.patch deleted file mode 100644 index 07a24492e..000000000 --- a/buildroot/package/openpgm/0002-cross-compile.patch +++ /dev/null @@ -1,38 +0,0 @@ -configure.ac: cross-compilation fix - -This patch enables to configure the package when cross-compiling in a way -recommended by Autoconf manual (see manual for version 2.69, Section 6.6 -Checking Runtime Behavior). - -Signed-off-by: Alexander Lukichev - ---- a/openpgm/pgm/configure.ac 2011-09-27 20:59:08.000000000 +0300 -+++ b/openpgm/pgm/configure.ac 2013-02-12 10:33:53.000000000 +0200 -@@ -272,14 +272,19 @@ uint32_t add32_with_carry (uint32_t a, u - ;; - esac - # ticket spinlock friendly: unaligned pointers & atomic ops (excl. Sun Pro) --AC_MSG_CHECKING([for unaligned pointers]) --AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -- [[short x = *(short*)(nezumi + 2)]])], -- [AC_MSG_RESULT([yes]) -- pgm_unaligned_pointers=yes], -- [AC_MSG_RESULT([no]) -- pgm_unaligned_pointers=no]) -+AC_CACHE_CHECK([if unaligned access fails], [ac_cv_lbl_unaligned_fail], -+ [AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -+ [[short x = *(short*)(nezumi + 2)]])], -+ [ac_cv_lbl_unaligned_fail=no], -+ [ac_cv_lbl_unaligned_fail=yes], -+ [ac_cv_lbl_unaligned_fail=yes]) -+ ]) -+if test "$ac_cv_lbl_unaligned_fail" = yes; then -+ pgm_unaligned_pointers=no -+else -+ pgm_unaligned_pointers=yes -+fi - AC_MSG_CHECKING([for intrinsic atomic ops]) - # AC_PREPROC_IFELSE not always portable - AC_COMPILE_IFELSE( diff --git a/buildroot/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch b/buildroot/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch deleted file mode 100644 index 4d700fb4d..000000000 --- a/buildroot/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 01128a2d8ad3288e8b96a908888049f186d156ee Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 21 May 2016 19:44:48 +0200 -Subject: [PATCH 1/1] Rework headers includes to fix build with musl libc - -Downloaded patch from -http://git.alpinelinux.org/cgit/aports/plain/main/openpgm/openpgm-fix-includes.patch -and adjusted paths by prefixing with "openpgm/pgm/" - -A build log with the compile error can be found here: -http://autobuild.buildroot.net/results/854/854554827ead82f29b293ddceced6eb7fbfeec27/build-end.log - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: https://github.com/steve-o/openpgm/pull/44) ---- - openpgm/pgm/include/impl/security.h | 3 ++- - openpgm/pgm/include/pgm/types.h | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/openpgm/pgm/include/impl/security.h b/openpgm/pgm/include/impl/security.h -index c2b3e3d..896316f 100644 ---- a/openpgm/pgm/include/impl/security.h -+++ b/openpgm/pgm/include/impl/security.h -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -41,6 +40,8 @@ - PGM_BEGIN_DECLS - - #ifdef HAVE_FTIME -+#include -+ - static inline - errno_t - # if !defined( _WIN32 ) -diff --git a/openpgm/pgm/include/pgm/types.h b/openpgm/pgm/include/pgm/types.h -index 4e41261..58731a3 100644 ---- a/openpgm/pgm/include/pgm/types.h -+++ b/openpgm/pgm/include/pgm/types.h -@@ -27,6 +27,7 @@ - - #ifndef _MSC_VER - # include -+# include - #endif - #include - --- -2.8.1 - diff --git a/buildroot/package/openpgm/openpgm.hash b/buildroot/package/openpgm/openpgm.hash index 472053173..9d61bcdc9 100644 --- a/buildroot/package/openpgm/openpgm.hash +++ b/buildroot/package/openpgm/openpgm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 openpgm-5-2-122.tar.gz +sha256 8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b306499c6d393 openpgm-5-3-128.tar.gz sha256 4a7d4ec71fa60969399fd4caad64d5a3003fee2775445f271a5a36a8ae743a29 openpgm/pgm/LICENSE diff --git a/buildroot/package/openpgm/openpgm.mk b/buildroot/package/openpgm/openpgm.mk index ec293b42d..ded06f3d9 100644 --- a/buildroot/package/openpgm/openpgm.mk +++ b/buildroot/package/openpgm/openpgm.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPGM_VERSION = 5-2-122 +OPENPGM_VERSION = 5-3-128 OPENPGM_SITE = $(call github,steve-o,openpgm,release-$(OPENPGM_VERSION)) OPENPGM_LICENSE = LGPL-2.1+ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE diff --git a/buildroot/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch b/buildroot/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch new file mode 100644 index 000000000..feeff2225 --- /dev/null +++ b/buildroot/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch @@ -0,0 +1,33 @@ +From b39ab180358ed451eae9df900f49a72ef1eb7442 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Mar 2020 09:04:48 -0300 +Subject: [PATCH] init.d/agetty: replace /sbin/agetty by /sbin/getty + +In Buildroot getty is provided by BusyBox or util-linux (agetty). Both +create a /sbin/getty symlink pointing to the actual program, so make the +agetty service use that path instead of /sbin/agetty. + +The patch is required because it's not possible to override the command +by means of a configuration file. + +Signed-off-by: Carlos Santos +--- + init.d/agetty.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/agetty.in b/init.d/agetty.in +index e4866f7a..e1864628 100644 +--- a/init.d/agetty.in ++++ b/init.d/agetty.in +@@ -14,7 +14,7 @@ supervisor=supervise-daemon + port="${RC_SVCNAME#*.}" + respawn_period="${respawn_period:-60}" + term_type="${term_type:-linux}" +-command=/sbin/agetty ++command=/sbin/getty + command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}" + pidfile="/run/${RC_SVCNAME}.pid" + +-- +2.18.2 + diff --git a/buildroot/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch b/buildroot/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch new file mode 100644 index 000000000..f1c927a45 --- /dev/null +++ b/buildroot/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch @@ -0,0 +1,29 @@ +From c2dc04f6b8c6784941b896e0b17c160dd43a566f Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Mar 2020 11:14:37 -0300 +Subject: [PATCH] init.d/agetty: start agetty after all services + +This is required for Buildroot, to prevent mixing service initialization +messages with the getty prompt on devices with a single serial console. + +Signed-off-by: Carlos Santos +--- + init.d/agetty.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/agetty.in b/init.d/agetty.in +index e1864628..a1ad4e9f 100644 +--- a/init.d/agetty.in ++++ b/init.d/agetty.in +@@ -19,7 +19,7 @@ command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}" + pidfile="/run/${RC_SVCNAME}.pid" + + depend() { +- after local ++ after * + keyword -prefix + provide getty + } +-- +2.18.2 + diff --git a/buildroot/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch b/buildroot/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch new file mode 100644 index 000000000..733506ada --- /dev/null +++ b/buildroot/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch @@ -0,0 +1,34 @@ +From 014dc43447fa553e875984ac4a528e5916cc9e06 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sat, 29 Feb 2020 22:41:30 -0300 +Subject: [PATCH] runlevels: do not add agetty.tty[1-6] if MKSYSVINIT=yes + +Buildroot starts a single getty, according to the system configuration. +Also tty[1-6] may not exist (e.g. embedded devices with serial consoles +only). + +Signed-off-by: Carlos Santos +--- + runlevels/Makefile | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/runlevels/Makefile b/runlevels/Makefile +index 73843d8b..dbfb59ca 100644 +--- a/runlevels/Makefile ++++ b/runlevels/Makefile +@@ -90,12 +90,6 @@ install: + fi; \ + ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \ + fi +- if test "${MKSYSVINIT}" = yes && test "${OS}" = Linux; then \ +- for x in tty1 tty2 tty3 tty4 tty5 tty6; do \ +- ln -snf ${INITDIR}/agetty ${DESTDIR}/${INITDIR}/"agetty.$$x" || exit $$?; \ +- ln -snf ${INITDIR}/agetty.$$x ${DEFAULTDIR}/"agetty.$$x" || exit $$?; \ +- done; \ +- fi + + check test:: + +-- +2.18.2 + diff --git a/buildroot/package/openrc/getty b/buildroot/package/openrc/getty deleted file mode 100755 index 8fcb071f8..000000000 --- a/buildroot/package/openrc/getty +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# based on agetty service from OpenRC package - -description="start getty on terminal" -supervisor=supervise-daemon -port="${RC_SVCNAME#*.}" -term_type="${term_type:-linux}" -command=/sbin/getty -command_args_foreground="${getty_options} ${baud} ${port} ${term_type}" -pidfile="/run/${RC_SVCNAME}.pid" - -depend() { - # start getty at the very end of init - after * - keyword -prefix -} - -start_pre() { - export EINFO_QUIET="${quiet:-yes}" -} - -stop_pre() { - export EINFO_QUIET="${quiet:-yes}" -} diff --git a/buildroot/package/openrc/openrc.hash b/buildroot/package/openrc/openrc.hash index 7d58e254c..bb5880806 100644 --- a/buildroot/package/openrc/openrc.hash +++ b/buildroot/package/openrc/openrc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c99488ca54f2b795328d07bbd456ade49b571136bba7501f7eaaeb1ca9f9ecc4 openrc-0.41.2.tar.gz +sha256 91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2 openrc-0.42.1.tar.gz sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE diff --git a/buildroot/package/openrc/openrc.mk b/buildroot/package/openrc/openrc.mk index 1f8516f5e..97536dad3 100644 --- a/buildroot/package/openrc/openrc.mk +++ b/buildroot/package/openrc/openrc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENRC_VERSION = 0.41.2 +OPENRC_VERSION = 0.42.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE @@ -18,7 +18,6 @@ OPENRC_MAKE_OPTS = \ LIBNAME=lib \ LIBEXECDIR=/usr/libexec/rc \ MKPKGCONFIG=no \ - MKSELINUX=no \ MKSYSVINIT=yes \ BRANDING="Buildroot $(BR2_VERSION_FULL)" \ CC=$(TARGET_CC) @@ -29,6 +28,13 @@ else OPENRC_MAKE_OPTS += MKSTATICLIBS=yes endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +OPENRC_MAKE_OPTS += MKSELINUX=yes +OPENRC_DEPENDENCIES += libselinux +else +OPENRC_MAKE_OPTS += MKSELINUX=no +endif + define OPENRC_BUILD_CMDS $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D) endef @@ -68,17 +74,15 @@ endef OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED ifeq ($(BR2_TARGET_GENERIC_GETTY),y) -OPENRC_GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT) +OPENRC_GETTY_SVCNAME = agetty.$(SYSTEM_GETTY_PORT) OPENRC_GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(OPENRC_GETTY_SVCNAME) define OPENRC_SET_GETTY { \ echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\""; \ echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" ; \ - echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \ + echo "agetty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \ } > $(OPENRC_GETTY_CONF_D) - $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/getty \ - $(TARGET_DIR)/etc/init.d/getty - ln -sf getty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME) + ln -sf agetty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME) ln -sf /etc/init.d/$(OPENRC_GETTY_SVCNAME) \ $(TARGET_DIR)/etc/runlevels/default/$(OPENRC_GETTY_SVCNAME) endef diff --git a/buildroot/package/openresolv/openresolv.hash b/buildroot/package/openresolv/openresolv.hash index b8eb4346b..f2a101df3 100644 --- a/buildroot/package/openresolv/openresolv.hash +++ b/buildroot/package/openresolv/openresolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0024df7c4568a157db1c3511a55d37d442629d586c575d9e0f9c2004df8297bd openresolv-3.9.2.tar.gz -sha256 f78b2c2bfb333e66e935c81510580d002b6e2009a5b8132b3b5be8ed8f8f3fa7 LICENSE +sha256 7d74c669849183ecefdfcec30d25664b1ca24ba1ca8c2ad5de50fcaeef3b4810 openresolv-3.10.0.tar.gz +sha256 384740bf5e19e7628d20f4dcc22925062fdc6020e9a6f074e567d4d797be57a0 LICENSE diff --git a/buildroot/package/openresolv/openresolv.mk b/buildroot/package/openresolv/openresolv.mk index 3a6444669..44e072042 100644 --- a/buildroot/package/openresolv/openresolv.mk +++ b/buildroot/package/openresolv/openresolv.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENRESOLV_VERSION = 3.9.2 +OPENRESOLV_VERSION = 3.10.0 OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION)) OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE diff --git a/buildroot/package/openssh/Config.in b/buildroot/package/openssh/Config.in index 683a9c0e5..cc5998742 100644 --- a/buildroot/package/openssh/Config.in +++ b/buildroot/package/openssh/Config.in @@ -9,3 +9,26 @@ config BR2_PACKAGE_OPENSSH friends. http://www.openssh.com/ + +if BR2_PACKAGE_OPENSSH + +config BR2_PACKAGE_OPENSSH_CLIENT + bool "client" + default y + help + Client programs: ssh, scp, sftp, ssh-agent, ssh-add, + ssh-copy-id. + +config BR2_PACKAGE_OPENSSH_SERVER + bool "server" + default y + help + Server programs: sshd, sftp-server + +config BR2_PACKAGE_OPENSSH_KEY_UTILS + bool "key utilities" + default y + help + Key utilities: ssh-keygen, ssh-keyscan. + +endif diff --git a/buildroot/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash index 4db933f7b..1d7dc14fb 100644 --- a/buildroot/package/openssh/openssh.hash +++ b/buildroot/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.1 (base64 encoded) -sha256 02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff openssh-8.1p1.tar.gz +# From https://www.openssh.com/txt/release-8.3 (base64 encoded) +sha256 f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2 openssh-8.3p1.tar.gz # Locally calculated -sha256 73d0db766229670c7b4e1ec5e6baed54977a0694a565e7cc878c45ee834045d7 LICENCE +sha256 73d0db766229670c7b4e1ec5e6baed54977a0694a565e7cc878c45ee834045d7 LICENCE diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 9720fcdb0..64ac22181 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 8.1p1 +OPENSSH_VERSION = 8.3p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE @@ -78,6 +78,31 @@ define OPENSSH_USERS endef endif +# Let the default install rule only install the configuration file. +# The programs will be installed based on the config options selected. +OPENSSH_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-sysconf + +ifeq ($(BR2_PACKAGE_OPENSSH_CLIENT),y) +define OPENSSH_INSTALL_CLIENT_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/ssh $(TARGET_DIR)/usr/bin/ssh + $(INSTALL) -D -m 0755 $(@D)/scp $(TARGET_DIR)/usr/bin/scp + $(INSTALL) -D -m 0755 $(@D)/sftp $(TARGET_DIR)/usr/bin/sftp + $(INSTALL) -D -m 0755 $(@D)/ssh-agent $(TARGET_DIR)/usr/bin/ssh-agent + $(INSTALL) -D -m 0755 $(@D)/ssh-add $(TARGET_DIR)/usr/bin/ssh-add + $(INSTALL) -D -m 4711 $(@D)/ssh-keysign $(TARGET_DIR)/usr/libexec/ssh-keysign + $(INSTALL) -D -m 0755 $(@D)/ssh-pkcs11-helper $(TARGET_DIR)/usr/libexec/ssh-pkcs11-helper + $(INSTALL) -D -m 0755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_CLIENT_PROGRAMS +endif + +ifeq ($(BR2_PACKAGE_OPENSSH_SERVER),y) +define OPENSSH_INSTALL_SERVER_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd + $(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS + define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service @@ -88,11 +113,14 @@ define OPENSSH_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/openssh/S50sshd \ $(TARGET_DIR)/etc/init.d/S50sshd endef +endif -define OPENSSH_INSTALL_SSH_COPY_ID - $(INSTALL) -D -m 755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +ifeq ($(BR2_PACKAGE_OPENSSH_KEY_UTILS),y) +define OPENSSH_INSTALL_KEY_UTILS + $(INSTALL) -D -m 0755 $(@D)/ssh-keygen $(TARGET_DIR)/usr/bin/ssh-keygen + $(INSTALL) -D -m 0755 $(@D)/ssh-keyscan $(TARGET_DIR)/usr/bin/ssh-keyscan endef - -OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SSH_COPY_ID +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_KEY_UTILS +endif $(eval $(autotools-package)) diff --git a/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch b/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..eb474b56a --- /dev/null +++ b/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,49 @@ +From 3324d5ab1d00920ea46f453240da1356e0639e98 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 21:55:31 +0200 +Subject: [PATCH] fix build with gcc 10 + +Define kw_host_list and kw_connaddrfamily_list as extern to avoid the following +build failure with gcc 10 (which defaults to -fno-common): + +/home/peko/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: initiate.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: multiple definition of `kw_host_list'; connections.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: first defined here + +Fixes: + - http://autobuild.buildroot.org/results/650fc0046fd063c70e17ce5ebd9592195657434d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xelerance/Openswan/pull/444] +--- + include/ipsecconf/keywords.h | 2 +- + include/pluto_constants.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/ipsecconf/keywords.h b/include/ipsecconf/keywords.h +index e32be7968..02e8e073e 100644 +--- a/include/ipsecconf/keywords.h ++++ b/include/ipsecconf/keywords.h +@@ -314,7 +314,7 @@ struct config_parsed { + bool got_default; + }; + +-const struct keyword_enum_values kw_connaddrfamily_list; ++extern const struct keyword_enum_values kw_connaddrfamily_list; + + extern struct keyword_def ipsec_conf_keywords_v2[]; + extern const int ipsec_conf_keywords_v2_count; +diff --git a/include/pluto_constants.h b/include/pluto_constants.h +index c35dd9576..dcbd3b5b4 100644 +--- a/include/pluto_constants.h ++++ b/include/pluto_constants.h +@@ -665,7 +665,7 @@ enum keyword_host { + KH_IPADDR = LOOSE_ENUM_OTHER, + }; + /* keyword_name(&kw_host_list, type, buffer[KEYWORD_NAME_BUFLEN]) */ +-struct keyword_enum_values kw_host_list; ++extern struct keyword_enum_values kw_host_list; + #define KH_ISWILDCARD(type) ((type) == KH_ANY || (type) == KH_DEFAULTROUTE) + #define KH_ISKNOWNADDR(type) ((type) == KH_IPADDR || (type)==KH_IFACE) + +-- +2.28.0 + diff --git a/buildroot/package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch b/buildroot/package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch new file mode 100644 index 000000000..f41758ce3 --- /dev/null +++ b/buildroot/package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch @@ -0,0 +1,365 @@ +From 962ee8fc46ca51691bde1c8c1022dacbe8a037ed Mon Sep 17 00:00:00 2001 +From: Carl Reinke +Date: Sun, 14 Jun 2020 14:11:00 -0600 +Subject: [PATCH] Move definitions that don't need to be exposed from opl.h to + opl.c + +[Retrieved from: +https://github.com/opentyrian/opentyrian/commit/962ee8fc46ca51691bde1c8c1022dacbe8a037ed] +Signed-off-by: Fabrice Fontaine +--- + src/opl.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++- + src/opl.h | 157 ++---------------------------------------------------- + 2 files changed, 154 insertions(+), 156 deletions(-) + +diff --git a/src/opl.c b/src/opl.c +index a4071c5..f15474c 100644 +--- a/src/opl.c ++++ b/src/opl.c +@@ -23,12 +23,161 @@ + * Copyright (C) 1998-2001 Ken Silverman + * Ken Silverman's official web site: "http://www.advsys.net/ken" + */ +- ++#include "opl.h" + + #include ++#include + #include // rand() + #include // memset() +-#include "opl.h" ++ ++#define fltype double ++ ++ /* ++ define attribution that inlines/forces inlining of a function (optional) ++ */ ++#define OPL_INLINE inline ++ ++ ++#undef NUM_CHANNELS ++#if defined(OPLTYPE_IS_OPL3) ++#define NUM_CHANNELS 18 ++#else ++#define NUM_CHANNELS 9 ++#endif ++ ++#define MAXOPERATORS (NUM_CHANNELS*2) ++ ++ ++#define FL05 ((fltype)0.5) ++#define FL2 ((fltype)2.0) ++#define PI ((fltype)3.1415926535897932384626433832795) ++ ++ ++#define FIXEDPT 0x10000 // fixed-point calculations using 16+16 ++#define FIXEDPT_LFO 0x1000000 // fixed-point calculations using 8+24 ++ ++#define WAVEPREC 1024 // waveform precision (10 bits) ++ ++#define INTFREQU ((fltype)(14318180.0 / 288.0)) // clocking of the chip ++ ++ ++#define OF_TYPE_ATT 0 ++#define OF_TYPE_DEC 1 ++#define OF_TYPE_REL 2 ++#define OF_TYPE_SUS 3 ++#define OF_TYPE_SUS_NOKEEP 4 ++#define OF_TYPE_OFF 5 ++ ++#define ARC_CONTROL 0x00 ++#define ARC_TVS_KSR_MUL 0x20 ++#define ARC_KSL_OUTLEV 0x40 ++#define ARC_ATTR_DECR 0x60 ++#define ARC_SUSL_RELR 0x80 ++#define ARC_FREQ_NUM 0xa0 ++#define ARC_KON_BNUM 0xb0 ++#define ARC_PERC_MODE 0xbd ++#define ARC_FEEDBACK 0xc0 ++#define ARC_WAVE_SEL 0xe0 ++ ++#define ARC_SECONDSET 0x100 // second operator set for OPL3 ++ ++ ++#define OP_ACT_OFF 0x00 ++#define OP_ACT_NORMAL 0x01 // regular channel activated (bitmasked) ++#define OP_ACT_PERC 0x02 // percussion channel activated (bitmasked) ++ ++#define BLOCKBUF_SIZE 512 ++ ++ ++ // vibrato constants ++#define VIBTAB_SIZE 8 ++#define VIBFAC 70/50000 // no braces, integer mul/div ++ ++ // tremolo constants and table ++#define TREMTAB_SIZE 53 ++#define TREM_FREQ ((fltype)(3.7)) // tremolo at 3.7hz ++ ++ ++ /* operator struct definition ++ For OPL2 all 9 channels consist of two operators each, carrier and modulator. ++ Channel x has operators x as modulator and operators (9+x) as carrier. ++ For OPL3 all 18 channels consist either of two operators (2op mode) or four ++ operators (4op mode) which is determined through register4 of the second ++ adlib register set. ++ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as ++ 4op channels. The two additional operators for a channel y come from the ++ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op ++ channel. ++ */ ++typedef struct operator_struct { ++ Bit32s cval, lastcval; // current output/last output (used for feedback) ++ Bit32u tcount, wfpos, tinc; // time (position in waveform) and time increment ++ fltype amp, step_amp; // and amplification (envelope) ++ fltype vol; // volume ++ fltype sustain_level; // sustain level ++ Bit32s mfbi; // feedback amount ++ fltype a0, a1, a2, a3; // attack rate function coefficients ++ fltype decaymul, releasemul; // decay/release rate functions ++ Bit32u op_state; // current state of operator (attack/decay/sustain/release/off) ++ Bit32u toff; ++ Bit32s freq_high; // highest three bits of the frequency, used for vibrato calculations ++ Bit16s* cur_wform; // start of selected waveform ++ Bit32u cur_wmask; // mask for selected waveform ++ Bit32u act_state; // activity state (regular, percussion) ++ bool sus_keep; // keep sustain level when decay finished ++ bool vibrato,tremolo; // vibrato/tremolo enable bits ++ ++ // variables used to provide non-continuous envelopes ++ Bit32u generator_pos; // for non-standard sample rates we need to determine how many samples have passed ++ Bits cur_env_step; // current (standardized) sample position ++ Bits env_step_a,env_step_d,env_step_r; // number of std samples of one step (for attack/decay/release mode) ++ Bit8u step_skip_pos_a; // position of 8-cyclic step skipping (always 2^x to check against mask) ++ Bits env_step_skip_a; // bitmask that determines if a step is skipped (respective bit is zero then) ++ ++#if defined(OPLTYPE_IS_OPL3) ++ bool is_4op,is_4op_attached; // base of a 4op channel/part of a 4op channel ++ Bit32s left_pan,right_pan; // opl3 stereo panning amount ++#endif ++} op_type; ++ ++// per-chip variables ++static op_type op[MAXOPERATORS]; ++ ++static Bits int_samplerate; ++ ++static Bit8u status; ++static Bit32u opl_index; ++#if defined(OPLTYPE_IS_OPL3) ++static Bit8u adlibreg[512]; // adlib register set (including second set) ++static Bit8u wave_sel[44]; // waveform selection ++#else ++static Bit8u adlibreg[256]; // adlib register set ++static Bit8u wave_sel[22]; // waveform selection ++#endif ++ ++ ++ // vibrato/tremolo increment/counter ++static Bit32u vibtab_pos; ++static Bit32u vibtab_add; ++static Bit32u tremtab_pos; ++static Bit32u tremtab_add; ++ ++ ++// enable an operator ++void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type); ++ ++// functions to change parameters of an operator ++void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt); ++ ++void change_attackrate(Bitu regbase, op_type* op_pt); ++void change_decayrate(Bitu regbase, op_type* op_pt); ++void change_releaserate(Bitu regbase, op_type* op_pt); ++void change_sustainlevel(Bitu regbase, op_type* op_pt); ++void change_waveform(Bitu regbase, op_type* op_pt); ++void change_keepsustain(Bitu regbase, op_type* op_pt); ++void change_vibrato(Bitu regbase, op_type* op_pt); ++void change_feedback(Bitu chanbase, op_type* op_pt); ++ + + static Bit32u generator_add; // should be a chip parameter + +diff --git a/src/opl.h b/src/opl.h +index c8e643b..cbb56ad 100644 +--- a/src/opl.h ++++ b/src/opl.h +@@ -25,11 +25,8 @@ + * Ken Silverman's official web site: "http://www.advsys.net/ken" + */ + +- +-#define fltype double +- +-#include + #include ++ + typedef uintptr_t Bitu; + typedef intptr_t Bits; + typedef uint32_t Bit32u; +@@ -39,154 +36,6 @@ typedef int16_t Bit16s; + typedef uint8_t Bit8u; + typedef int8_t Bit8s; + +- +-/* +- define attribution that inlines/forces inlining of a function (optional) +-*/ +-#define OPL_INLINE inline +- +- +-#undef NUM_CHANNELS +-#if defined(OPLTYPE_IS_OPL3) +-#define NUM_CHANNELS 18 +-#else +-#define NUM_CHANNELS 9 +-#endif +- +-#define MAXOPERATORS (NUM_CHANNELS*2) +- +- +-#define FL05 ((fltype)0.5) +-#define FL2 ((fltype)2.0) +-#define PI ((fltype)3.1415926535897932384626433832795) +- +- +-#define FIXEDPT 0x10000 // fixed-point calculations using 16+16 +-#define FIXEDPT_LFO 0x1000000 // fixed-point calculations using 8+24 +- +-#define WAVEPREC 1024 // waveform precision (10 bits) +- +-#define INTFREQU ((fltype)(14318180.0 / 288.0)) // clocking of the chip +- +- +-#define OF_TYPE_ATT 0 +-#define OF_TYPE_DEC 1 +-#define OF_TYPE_REL 2 +-#define OF_TYPE_SUS 3 +-#define OF_TYPE_SUS_NOKEEP 4 +-#define OF_TYPE_OFF 5 +- +-#define ARC_CONTROL 0x00 +-#define ARC_TVS_KSR_MUL 0x20 +-#define ARC_KSL_OUTLEV 0x40 +-#define ARC_ATTR_DECR 0x60 +-#define ARC_SUSL_RELR 0x80 +-#define ARC_FREQ_NUM 0xa0 +-#define ARC_KON_BNUM 0xb0 +-#define ARC_PERC_MODE 0xbd +-#define ARC_FEEDBACK 0xc0 +-#define ARC_WAVE_SEL 0xe0 +- +-#define ARC_SECONDSET 0x100 // second operator set for OPL3 +- +- +-#define OP_ACT_OFF 0x00 +-#define OP_ACT_NORMAL 0x01 // regular channel activated (bitmasked) +-#define OP_ACT_PERC 0x02 // percussion channel activated (bitmasked) +- +-#define BLOCKBUF_SIZE 512 +- +- +-// vibrato constants +-#define VIBTAB_SIZE 8 +-#define VIBFAC 70/50000 // no braces, integer mul/div +- +-// tremolo constants and table +-#define TREMTAB_SIZE 53 +-#define TREM_FREQ ((fltype)(3.7)) // tremolo at 3.7hz +- +- +-/* operator struct definition +- For OPL2 all 9 channels consist of two operators each, carrier and modulator. +- Channel x has operators x as modulator and operators (9+x) as carrier. +- For OPL3 all 18 channels consist either of two operators (2op mode) or four +- operators (4op mode) which is determined through register4 of the second +- adlib register set. +- Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as +- 4op channels. The two additional operators for a channel y come from the +- 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op +- channel. +-*/ +-typedef struct operator_struct { +- Bit32s cval, lastcval; // current output/last output (used for feedback) +- Bit32u tcount, wfpos, tinc; // time (position in waveform) and time increment +- fltype amp, step_amp; // and amplification (envelope) +- fltype vol; // volume +- fltype sustain_level; // sustain level +- Bit32s mfbi; // feedback amount +- fltype a0, a1, a2, a3; // attack rate function coefficients +- fltype decaymul, releasemul; // decay/release rate functions +- Bit32u op_state; // current state of operator (attack/decay/sustain/release/off) +- Bit32u toff; +- Bit32s freq_high; // highest three bits of the frequency, used for vibrato calculations +- Bit16s* cur_wform; // start of selected waveform +- Bit32u cur_wmask; // mask for selected waveform +- Bit32u act_state; // activity state (regular, percussion) +- bool sus_keep; // keep sustain level when decay finished +- bool vibrato,tremolo; // vibrato/tremolo enable bits +- +- // variables used to provide non-continuous envelopes +- Bit32u generator_pos; // for non-standard sample rates we need to determine how many samples have passed +- Bits cur_env_step; // current (standardized) sample position +- Bits env_step_a,env_step_d,env_step_r; // number of std samples of one step (for attack/decay/release mode) +- Bit8u step_skip_pos_a; // position of 8-cyclic step skipping (always 2^x to check against mask) +- Bits env_step_skip_a; // bitmask that determines if a step is skipped (respective bit is zero then) +- +-#if defined(OPLTYPE_IS_OPL3) +- bool is_4op,is_4op_attached; // base of a 4op channel/part of a 4op channel +- Bit32s left_pan,right_pan; // opl3 stereo panning amount +-#endif +-} op_type; +- +-// per-chip variables +-Bitu chip_num; +-op_type op[MAXOPERATORS]; +- +-Bits int_samplerate; +- +-Bit8u status; +-Bit32u opl_index; +-#if defined(OPLTYPE_IS_OPL3) +-Bit8u adlibreg[512]; // adlib register set (including second set) +-Bit8u wave_sel[44]; // waveform selection +-#else +-Bit8u adlibreg[256]; // adlib register set +-Bit8u wave_sel[22]; // waveform selection +-#endif +- +- +-// vibrato/tremolo increment/counter +-Bit32u vibtab_pos; +-Bit32u vibtab_add; +-Bit32u tremtab_pos; +-Bit32u tremtab_add; +- +- +-// enable an operator +-void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type); +- +-// functions to change parameters of an operator +-void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt); +- +-void change_attackrate(Bitu regbase, op_type* op_pt); +-void change_decayrate(Bitu regbase, op_type* op_pt); +-void change_releaserate(Bitu regbase, op_type* op_pt); +-void change_sustainlevel(Bitu regbase, op_type* op_pt); +-void change_waveform(Bitu regbase, op_type* op_pt); +-void change_keepsustain(Bitu regbase, op_type* op_pt); +-void change_vibrato(Bitu regbase, op_type* op_pt); +-void change_feedback(Bitu chanbase, op_type* op_pt); +- + // general functions + void adlib_init(Bit32u samplerate); + void adlib_write(Bitu idx, Bit8u val); +@@ -195,8 +44,8 @@ void adlib_getsample(Bit16s* sndptr, Bits numsamples); + Bitu adlib_reg_read(Bitu port); + void adlib_write_index(Bitu port, Bit8u val); + +-#endif /* OPL_H */ +- + #define opl_init() adlib_init(OUTPUT_QUALITY * 11025) + #define opl_write(reg, val) adlib_write(reg, val) + #define opl_update(buf, num) adlib_getsample(buf, num) ++ ++#endif /* OPL_H */ diff --git a/buildroot/package/openvmtools/Config.in b/buildroot/package/openvmtools/Config.in index 1a077a2a4..a50b6b9b3 100644 --- a/buildroot/package/openvmtools/Config.in +++ b/buildroot/package/openvmtools/Config.in @@ -27,13 +27,12 @@ config BR2_PACKAGE_OPENVMTOOLS_PAM # linux-pam needs locale and wchar, but we already have this # dependency on the main symbol, above. depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a glibc toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL +comment "PAM support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" diff --git a/buildroot/package/openvpn/Config.in b/buildroot/package/openvpn/Config.in index 0a1675573..3f4a617fb 100644 --- a/buildroot/package/openvpn/Config.in +++ b/buildroot/package/openvpn/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_OPENVPN bool "openvpn" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS help OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including road diff --git a/buildroot/package/openvpn/S60openvpn b/buildroot/package/openvpn/S60openvpn index bc1ab01c1..f097cf11e 100644 --- a/buildroot/package/openvpn/S60openvpn +++ b/buildroot/package/openvpn/S60openvpn @@ -11,13 +11,15 @@ CONFIG_DIR=/etc/openvpn test -d $CONFIG_DIR || exit 0 start_vpn () { - /usr/sbin/openvpn --daemon --writepid /var/run/openvpn.$NAME.pid \ - --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || printf " FAILED->" - printf " $NAME" + printf " $NAME " + start-stop-daemon -S -p /var/run/openvpn.$NAME.pid -x /usr/sbin/openvpn -- \ + --daemon --writepid /var/run/openvpn.$NAME.pid \ + --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR + [ $? = 0 ] && echo "OK" || echo "FAIL" } stop_vpn () { - kill `cat $PIDFILE` || true - rm $PIDFILE + printf " $NAME " + start-stop-daemon -K -p /var/run/openvpn.$NAME.pid -x /usr/sbin/openvpn } case "$1" in @@ -48,7 +50,6 @@ stop) NAME=`echo $PIDFILE | cut -c18-` NAME=${NAME%%.pid} stop_vpn - printf " $NAME" done else if test -e /var/run/openvpn.$2.pid ; then @@ -56,7 +57,6 @@ stop) NAME=`echo $PIDFILE | cut -c18-` NAME=${NAME%%.pid} stop_vpn - printf " $NAME" else printf " No such VPN: $2" fi diff --git a/buildroot/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk index 6a64e780c..1008c47b5 100644 --- a/buildroot/package/openvpn/openvpn.mk +++ b/buildroot/package/openvpn/openvpn.mk @@ -7,12 +7,11 @@ OPENVPN_VERSION = 2.4.9 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases -OPENVPN_DEPENDENCIES = host-pkgconf openssl +OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_CONF_OPTS = \ --enable-iproute2 \ - --with-crypto-library=openssl \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ NETSTAT=/bin/netstat \ @@ -51,6 +50,21 @@ else OPENVPN_CONF_OPTS += --disable-plugin-auth-pam endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENVPN_DEPENDENCIES += openssl +OPENVPN_CONF_OPTS += --with-crypto-library=openssl +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +OPENVPN_DEPENDENCIES += mbedtls +OPENVPN_CONF_OPTS += --with-crypto-library=mbedtls +endif + +ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y) +OPENVPN_DEPENDENCIES += pkcs11-helper +OPENVPN_CONF_OPTS += --enable-pkcs11 +else +OPENVPN_CONF_OPTS += --disable-pkcs11 +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) OPENVPN_DEPENDENCIES += systemd OPENVPN_CONF_OPTS += --enable-systemd diff --git a/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch b/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch deleted file mode 100644 index 51a06a20f..000000000 --- a/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f Mon Sep 17 00:00:00 2001 -From: Justin Hammond -Date: Sat, 4 May 2019 02:58:15 +0800 -Subject: [PATCH] Fix issue #1783 - Most Compilers Get it, Some need a little - help - -Signed-off-by: Fabrice Fontaine -[Retrieved from -https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f] ---- - cpp/src/CompatOptionManager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpp/src/CompatOptionManager.cpp b/cpp/src/CompatOptionManager.cpp -index 90c87b54d..2d9ac435e 100644 ---- a/cpp/src/CompatOptionManager.cpp -+++ b/cpp/src/CompatOptionManager.cpp -@@ -237,7 +237,7 @@ void CompatOptionManager::WriteXML - { - TiXmlElement* valElement = new TiXmlElement( it->first.c_str() ); - char str[32]; -- TiXmlText * text; -+ TiXmlText * text = NULL; - // std::cout << "Name " << it->first << " Type: " << m_CompatVals[it->second].type << std::endl; - switch (m_CompatVals[it->second].type) { - case COMPAT_FLAG_TYPE_BOOL: diff --git a/buildroot/package/openzwave/0002-update-spec-files.patch b/buildroot/package/openzwave/0002-update-spec-files.patch deleted file mode 100644 index 0ba74ab10..000000000 --- a/buildroot/package/openzwave/0002-update-spec-files.patch +++ /dev/null @@ -1,445 +0,0 @@ -From 601e5fb16232a7984885e67fdddaf5b9c9dd8105 Mon Sep 17 00:00:00 2001 -From: Justin Hammond -Date: Mon, 6 May 2019 17:05:17 +0800 -Subject: [PATCH] update spec files - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105] ---- - cpp/build/Makefile | 22 ++- - cpp/build/support.mk | 7 +- - cpp/src/command_classes/DoorLockLogging.cpp | 4 +- - cpp/src/command_classes/UserCode.cpp | 4 +- - dist/libopenzwave.spec | 152 -------------------- - dist/openzwave.spec.in | 145 +++++++++++++++++++ - distfiles.mk | 2 +- - 7 files changed, 174 insertions(+), 162 deletions(-) - delete mode 100644 dist/libopenzwave.spec - create mode 100644 dist/openzwave.spec.in - -diff --git a/cpp/build/Makefile b/cpp/build/Makefile -index bd9463c86..b404a87fd 100644 ---- a/cpp/build/Makefile -+++ b/cpp/build/Makefile -@@ -84,7 +84,19 @@ endif - #where to put the temporary library - LIBDIR ?= $(top_builddir) - --INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -+INCLUDES := -I $(top_srcdir)/cpp/src -+ -+ -+ifeq ($(USE_BI_TXML), 1) -+INCLUDES += -I $(top_srcdir)/cpp/tinyxml/ -+SOURCES_TXML =$(top_srcdir)/cpp/tinyxml/ -+tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp)) -+else -+LIBS+= -ltinyxml -+endif -+ -+ -+ - - - ifeq ($(USE_HID),1) -@@ -105,12 +117,11 @@ LIBS += -ludev - endif - endif # USE_HID - --SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \ -+SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(SOURCES_TXML) \ - $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/ --VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\ -+VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(SOURCES_TXML):\ - $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/ - --tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp)) - - ifeq ($(USE_HID),1) - ifeq ($(UNAME),Darwin) -@@ -163,6 +174,9 @@ $(top_srcdir)/cpp/src/vers.cpp: - @echo 'uint16_t ozw_vers_minor = $(VERSION_MIN);' >> $(top_srcdir)/cpp/src/vers.cpp - @echo 'uint16_t ozw_vers_revision = $(VERSION_REV);' >> $(top_srcdir)/cpp/src/vers.cpp - @echo 'char ozw_version_string[] = "$(GITVERSION)";' >> $(top_srcdir)/cpp/src/vers.cpp -+ @$(SED) \ -+ -e 's|[@]VERSION@|$(VERSION).$(VERSION_REV)|g' \ -+ < "$(top_srcdir)/dist/openzwave.spec.in" > "$(top_srcdir)/dist/openzwave.spec" - - - #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp -diff --git a/cpp/build/support.mk b/cpp/build/support.mk -index 562a9b280..3ffd17e48 100644 ---- a/cpp/build/support.mk -+++ b/cpp/build/support.mk -@@ -8,8 +8,11 @@ BUILD ?= release - #the prefix to install the library into - PREFIX ?= /usr/local - --# build HID support by default --USE_HID ?= 1 -+# dont build HID support by default -+USE_HID ?= 0 -+ -+# use builtin tinyXML by default -+USE_BI_TXML ?= 1 - - #the System we are building on - UNAME := $(shell uname -s) -diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp -index a8d824cd5..f318b3e59 100644 ---- a/cpp/src/command_classes/DoorLockLogging.cpp -+++ b/cpp/src/command_classes/DoorLockLogging.cpp -@@ -268,13 +268,13 @@ bool DoorLockLogging::HandleMsg - } - uint8 userid = (_data[10]); - uint8 usercodelength = (_data[11]); -- char usercode[254], tmpusercode[254]; -+ char usercode[254], tmpusercode[10]; - snprintf(usercode, sizeof(usercode), "UserCode:"); - if (usercodelength > 0) - for (int i = 0; i < usercodelength; i++ ) - { - snprintf(tmpusercode, sizeof(tmpusercode), "%d", (int)_data[12+i]); -- strncat(usercode, tmpusercode, sizeof(usercode) - strlen(usercode) - 1 ); -+ strncat(usercode, tmpusercode, 10); - } - - if (valid) { -diff --git a/cpp/src/command_classes/UserCode.cpp b/cpp/src/command_classes/UserCode.cpp -index a58091aca..dab006731 100644 ---- a/cpp/src/command_classes/UserCode.cpp -+++ b/cpp/src/command_classes/UserCode.cpp -@@ -466,7 +466,9 @@ bool UserCode::HandleMsg - node->CreateValueString( ValueID::ValueGenre_User, GetCommandClassId(), _instance, i, str, "", false, false, data, 0 ); - } - m_userCode[i].status = UserCode_Available; -- memcpy(&m_userCode[i].usercode, 0, 10); -+ /* silly compilers */ -+ for (int j = 0; j < 10; j++) -+ m_userCode[i].usercode[i] = 0; - } - if (m_com.GetFlagBool(COMPAT_FLAG_UC_EXPOSERAWVALUE)) { - node->CreateValueRaw( ValueID::ValueGenre_User, GetCommandClassId(), _instance, UserCodeIndex_RawValue, "Raw UserCode", "", false, false, 0, 0, 0); -diff --git a/dist/libopenzwave.spec b/dist/libopenzwave.spec -deleted file mode 100644 -index 3f29473dd..000000000 ---- a/dist/libopenzwave.spec -+++ /dev/null -@@ -1,152 +0,0 @@ --Name: libopenzwave --%if 0%{?fedora} > 0 --Group: Development/Libraries --%else --Group: Productivity/Networking/Other --%endif --Summary: Library to access Z-Wave interfaces --URL:http://code.google.com/p/open-zwave/ --%if 0%{?suse_version} > 0 --License: LGPL-2.0+ --%else --License: LGPLv2+ --%endif --Version: 1.6.0 --Release: 1 --BuildRequires: gcc-c++ make libudev-devel doxygen graphviz --%if 0%{?fedora} >= 18 --BuildRequires: systemd-devel pkgconfig --%else --%if 0%{?suse_version} >= 1220 --BuildRequires: systemd-devel pkg-config --%else --BuildRequires: libudev-devel pkgconfig --%endif --%endif --Source0: open-zwave-%{version}.tar.gz -- -- --BuildRoot: %{_tmppath}/libopenzwave-root -- --%description --OpenZWave is an open-source, cross-platform library designed to enable anyone to --add support for Z-Wave home-automation devices to their applications, without --requiring any in depth knowledge of the Z-Wave protocol. -- --Z-Wave employs a proprietary protocol which the owners, Sigma Designs, have --chosen not to release into the public domain. There is also no official free --or low-cost SDK that can be used to develop applications (The ControlThink SDK --is now tied exclusively to their own Z-Wave PC interface). The only way to --obtain the protocol documentation and sample code is to purchase an expensive --development kit, and sign a non-disclosure agreement (NDA) preventing the --release of that knowledge. -- --OpenZWave was created to fill that gap. We do not have the official --documentation, have signed no NDA, and are free to develop the library as we --see fit. Our knowledge comes from existing bodies of open-source code --(principally the Z-Wave parts of LinuxMCE), and through examining the --messages sent by Z-Wave devices. -- --The goal of the project is to make a positive contribution to the Z-Wave --community by creating a library that supports as much of the Z-Wave --specification as possible, and that can be used as a "black-box" solution --by anyone wanting to add Z-Wave to their application. It is NOT our aim --to publish alternative documentation of the Z-Wave protocol, or to --attempt to "punish" Sigma Designs for their decision to keep the --protocol closed. -- --%package -n libopenzwave-devel --Summary: Open-ZWave header files --%if 0%{?fedora} > 0 --Group: Development/Libraries --%else --Group: Development/Libraries/C and C++ --%endif --Requires: %{name} = %{version}-%{release} -- --%description -n libopenzwave-devel --header files needed when you want to compile your own --applications using openzwave -- --%package -n openzwave --Summary: Open-ZWave Sample Executables --%if 0%{?fedora} > 0 --Group: Development/Libraries --%else --Group: Development/Libraries/C and C++ --%endif --Requires: %{name} = %{version}-%{release} -- --%description -n openzwave --Sample Executables for OpenZWave -- --%prep -- --%setup -q -n open-zwave-%{version} -- -- -- -- --%build --major_ver=$(echo %{version} | awk -F \. {'print $1'}) --minor_ver=$(echo %{version} | awk -F \. {'print $2'}) --revision=$(echo %{version} | awk -F \. {'print $3'}) --CPPFLAGS=-g VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags} -- --%install --rm -rf %{buildroot}/* --major_ver=$(echo %{version} | awk -F \. {'print $1'}) --minor_ver=$(echo %{version} | awk -F \. {'print $2'}) --revision=$(echo %{version} | awk -F \. {'print $3'}) --mkdir -p %{buildroot}/%{_bindir} --mkdir -p %{buildroot}/%{_libdir} --mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ --mkdir -p %{buildroot}/%{_sysconfdir}/ --mkdir -p %{buildroot}/%{_includedir}/openzwave/ --DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install --cp -p INSTALL %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ --cp -pr license %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ --rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in --rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/ -- --%files --%defattr(-,root,root,-) --%{_libdir}/libopenzwave.so.* --%dir %{_defaultdocdir}/openzwave-%{version} --%doc %{_defaultdocdir}/openzwave-%{version}/default.htm --%doc %{_defaultdocdir}/openzwave-%{version}/general/ --%doc %{_defaultdocdir}/openzwave-%{version}/images+css/ --%doc %{_defaultdocdir}/openzwave-%{version}/license/ --%doc %{_defaultdocdir}/openzwave-%{version}/INSTALL --%config(noreplace) %{_sysconfdir}/openzwave/ -- -- -- --%files -n libopenzwave-devel --%defattr(-,root,root,-) --%{_bindir}/ozw_config --%{_includedir}/openzwave/ --%{_libdir}/libopenzwave.so --%{_libdir}/pkgconfig/libopenzwave.pc --%dir %{_defaultdocdir}/openzwave-%{version} --%doc %{_defaultdocdir}/openzwave-%{version}/api/ -- -- --%files -n openzwave --%defattr(-,root,root,-) --%{_bindir}/MinOZW -- -- --%post --/sbin/ldconfig -- --%post -n libopenzwave-devel --/sbin/ldconfig -- --%postun --/sbin/ldconfig -- --%changelog --* Tue Feb 04 2014 Justin Hammond+justin@dynam.ac - 1.0.730-1 --- Initial Release -- -diff --git a/dist/openzwave.spec.in b/dist/openzwave.spec.in -new file mode 100644 -index 000000000..4d7d22151 ---- /dev/null -+++ b/dist/openzwave.spec.in -@@ -0,0 +1,145 @@ -+Name: openzwave -+Version: @VERSION@ -+Release: 1.0%{?dist} -+Summary: Sample Executables for OpenZWave -+URL: http://www.openzwave.net -+License: LGPLv3+ -+Source0: http://old.openzwave.com/downloads/openzwave-%{version}.tar.gz -+ -+# Use system tinyxml -+#Patch1: openzwave-tinyxml.patch -+# Use system hidapi -+#Patch2: openzwave-hidapi.patch -+# Fix FTBFS -+#Patch3: openzwave-1.5.0-format.patch -+ -+BuildRequires: gcc-c++ -+BuildRequires: doxygen -+BuildRequires: graphviz -+BuildRequires: hidapi-devel -+BuildRequires: systemd-devel -+BuildRequires: tinyxml-devel -+ -+ -+%description -+OpenZWave is an open-source, cross-platform library designed to enable anyone to -+add support for Z-Wave home-automation devices to their applications, without -+requiring any in depth knowledge of the Z-Wave protocol. -+ -+ -+%package -n libopenzwave -+Summary: Library to access Z-Wave interfaces -+ -+ -+%description -n libopenzwave -+OpenZWave is an open-source, cross-platform library designed to enable anyone to -+add support for Z-Wave home-automation devices to their applications, without -+requiring any in depth knowledge of the Z-Wave protocol. -+ -+ -+%package -n libopenzwave-devel -+Summary: Open-ZWave header files -+Requires: libopenzwave%{?_isa} = %{version}-%{release} -+ -+ -+%description -n libopenzwave-devel -+Header files needed when you want to compile your own -+applications using openzwave -+ -+ -+%package -n libopenzwave-devel-doc -+Summary: Open-ZWave API documentation files -+Requires: libopenzwave-devel%{?_isa} = %{version}-%{release} -+ -+ -+%description -n libopenzwave-devel-doc -+API documentation files needed when you want to compile your own -+applications using openzwave -+ -+ -+%prep -+%setup -q -n openzwave-%{version} -+#%patch1 -p1 -b.tinyxml -+#%patch2 -p1 -b.hidapi -+#%patch3 -p1 -b.format -+ -+ -+%build -+major_ver=$(echo %{version} | awk -F \. {'print $1'}) -+minor_ver=$(echo %{version} | awk -F \. {'print $2'}) -+revision=$(echo %{version} | awk -F \. {'print $3'}) -+CPPFLAGS="%{optflags} -Wformat -DOPENZWAVE_ENABLE_EXCEPTIONS" LDFLAGS="%{__global_ldflags}" VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags} -+ -+ -+%install -+rm -rf %{buildroot}/* -+major_ver=$(echo %{version} | awk -F \. {'print $1'}) -+minor_ver=$(echo %{version} | awk -F \. {'print $2'}) -+revision=$(echo %{version} | awk -F \. {'print $3'}) -+mkdir -p %{buildroot}/%{_bindir} -+mkdir -p %{buildroot}/%{_libdir} -+mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ -+mkdir -p %{buildroot}/%{_sysconfdir}/ -+mkdir -p %{buildroot}/%{_includedir}/openzwave/ -+DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install -+rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in -+rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/ -+rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/default.htm -+rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/general/ -+rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/images+css/ -+rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/ -+ -+ -+%files -+%{_bindir}/MinOZW -+ -+ -+%files -n libopenzwave -+%license license/*.txt -+%doc docs/default.htm docs/general/ docs/images+css/ -+%{_libdir}/libopenzwave.so.* -+%dir %{_sysconfdir}/openzwave/ -+%config(noreplace) %{_sysconfdir}/openzwave/* -+ -+ -+%files -n libopenzwave-devel -+%{_bindir}/ozw_config -+%{_includedir}/openzwave/ -+%{_libdir}/libopenzwave.so -+%{_libdir}/pkgconfig/libopenzwave.pc -+ -+ -+%files -n libopenzwave-devel-doc -+%doc docs/api/ -+ -+ -+%ldconfig_scriptlets -n libopenzwave -+ -+ -+%changelog -+* Fri Feb 01 2019 Fedora Release Engineering - 1.5.0-0.20180624git1e36dcc.0 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -+ -+* Wed Jul 18 2018 Michael Cronenworth - 1.5.0-0.20180623git1e36dcc.0 -+- Update to 20180623 git checkout to fix FTBFS -+- Drop patches that revert BARRIER_OPERATOR support and use newer version -+ -+* Fri Jul 13 2018 Fedora Release Engineering - 1.5.0-0.20171212gitc3b0e31.0 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -+ -+* Mon Feb 26 2018 Michael Cronenworth - 1.5.0-0.20171211gitc3b0e31.0 -+- Update to 20171211 git checkout -+- Revert new BARRIER_OPERATOR support and use older version -+ -+* Thu Feb 08 2018 Fedora Release Engineering - 1.5.0-0.20170725gitde1c0e6 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -+ -+* Mon Jul 31 2017 Michael Cronenworth - 1.5.0-0.20170724gitde1c0e6 -+- Update to a git checkout, execeptions patch is upstream -+- Fixes crashing issues with domoticz -+ -+* Thu Jul 27 2017 Fedora Release Engineering - 1.4.164-2 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -+ -+* Wed Jul 12 2017 Michael Cronenworth - 1.4.164-1 -+- Initial spec -diff --git a/distfiles.mk b/distfiles.mk -index e68082967..9cf436a6f 100644 ---- a/distfiles.mk -+++ b/distfiles.mk -@@ -1273,7 +1273,7 @@ DISTFILES = .gitignore \ - debian/watch \ - dist.mk \ - dist/libopenzwave.changes \ -- dist/libopenzwave.spec \ -+ dist/openzwave.spec \ - distfiles.mk \ - docs/Doxyfile.in \ - docs/default.htm \ diff --git a/buildroot/package/openzwave/openzwave.hash b/buildroot/package/openzwave/openzwave.hash index 897973c8d..e32908df1 100644 --- a/buildroot/package/openzwave/openzwave.hash +++ b/buildroot/package/openzwave/openzwave.hash @@ -1,6 +1,7 @@ # Locally computed: -sha256 3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b openzwave-1.6.tar.gz -sha256 c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b license/license.txt -sha256 4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284 license/lgpl.txt -sha256 33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83 license/gpl.txt -sha256 6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1 license/Apache-License-2.0.txt +sha256 3c0b7e63319832c0eea5a251facd8c4d43f8815356ea61361f8bb9652b2ad8be openzwave-62444b0f979c337d2091d77d89cf63c2ae9775cf.tar.gz +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 LICENSE +sha256 c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b licenses/license.txt +sha256 4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284 licenses/lgpl.txt +sha256 33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83 licenses/gpl.txt +sha256 6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1 licenses/Apache-License-2.0.txt diff --git a/buildroot/package/openzwave/openzwave.mk b/buildroot/package/openzwave/openzwave.mk index d343f9aad..357d19f32 100644 --- a/buildroot/package/openzwave/openzwave.mk +++ b/buildroot/package/openzwave/openzwave.mk @@ -4,11 +4,11 @@ # ################################################################################ -OPENZWAVE_VERSION = 1.6 -OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,v$(OPENZWAVE_VERSION)) +OPENZWAVE_VERSION = 62444b0f979c337d2091d77d89cf63c2ae9775cf +OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION)) OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh) -OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \ - license/gpl.txt license/Apache-License-2.0.txt +OPENZWAVE_LICENSE_FILES = LICENSE licenses/license.txt licenses/lgpl.txt \ + licenses/gpl.txt licenses/Apache-License-2.0.txt OPENZWAVE_DEPENDENCIES = tinyxml OPENZWAVE_INSTALL_STAGING = YES diff --git a/buildroot/package/opkg-utils/opkg-utils.hash b/buildroot/package/opkg-utils/opkg-utils.hash index d95286abc..471ce4c2f 100644 --- a/buildroot/package/opkg-utils/opkg-utils.hash +++ b/buildroot/package/opkg-utils/opkg-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5a3071019715cf3066946ac9a57fcb51117c611a3114efc56894afc8b3b51b4c opkg-utils-0.4.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 acb208fe32f93f7fc0f7fdf9f870c07e40a016bcb7fa07ada6c99503e033dafd opkg-utils-0.4.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/opkg-utils/opkg-utils.mk b/buildroot/package/opkg-utils/opkg-utils.mk index 38137bc67..fa14053f6 100644 --- a/buildroot/package/opkg-utils/opkg-utils.mk +++ b/buildroot/package/opkg-utils/opkg-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPKG_UTILS_VERSION = 0.4.2 +OPKG_UTILS_VERSION = 0.4.3 OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ diff --git a/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch b/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch deleted file mode 100644 index 98dcac690..000000000 --- a/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ff172a49d1ca5708f45939b9b4f125cafba01db3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 24 Mar 2020 22:50:32 +0100 -Subject: [PATCH] configure.ac: add foreign option to AM_INIT_AUTOMAKE - -oprofile doesn't provide the NEWS, AUTHORS and ChangeLog file, so -autoreconf complains with: - -Makefile.am: error: required file './NEWS' not found -Makefile.am: error: required file './AUTHORS' not found -Makefile.am: error: required file './ChangeLog' not found - -Such errors can be avoided by passing the "foreign" option to -AM_INIT_AUTOMAKE. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 00e30079..87afe2b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,7 @@ AC_PREREQ(2.13) - - AC_INIT([OProfile], [1.3.0]) - AC_CONFIG_SRCDIR([libop/op_config.h]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS(config.h) - - AC_CHECK_DECLS([basename], [], [], [[#include ]]) --- -2.25.1 - diff --git a/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch b/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch deleted file mode 100644 index cff5030e0..000000000 --- a/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 377610414fb6cd7ac30e4485d9d6482fcf29aca6 Mon Sep 17 00:00:00 2001 -From: William Cohen -Date: Wed, 18 Mar 2020 21:19:16 -0400 -Subject: [PATCH] Macro wrappers to handle the binutils 2.34 api changes - -Changes in binutils 2.34 API prevented oprofile from compiling with -it. This patch tests for the changes in the binutils API during -configuration and selects the appropiate wrappers to allow oprofile to -compile. This allows oprofile to compile with both older and newer -versions of binutils. - -Upstream: 377610414fb6cd7ac30e4485d9d6482fcf29aca6 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 20 ++++++++++++++++++++ - libutil++/bfd_support.cpp | 11 ++++++----- - libutil/op_bfd_wrappers.h | 28 ++++++++++++++++++++++++++++ - opjitconv/create_bfd.c | 7 ++++--- - 4 files changed, 58 insertions(+), 8 deletions(-) - create mode 100644 libutil/op_bfd_wrappers.h - -diff --git a/configure.ac b/configure.ac -index ac2fd35e..df032a78 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then - fi - AC_SUBST(PFM_LIB) - -+HAVE_BINUTILS_234='1' -+AC_MSG_CHECKING([whether binutils 2.34 is being used]) -+rm -f test-for-BINUTILS -+AC_LANG_CONFTEST( -+ [AC_LANG_PROGRAM([[#include ]], -+ [[asection * sect; -+ bfd_size_type buildid_sect_size = bfd_section_size(sect); -+ return 0;]]) -+ ]) -+$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS > /dev/null 2>&1 -+if test -f test-for-BINUTILS; then -+ echo "yes" -+ HAVE_BINUTILS_234='1' -+else -+ echo "no" -+ HAVE_BINUTILS_234='0' -+fi -+AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34]) -+rm -f test-for-BINUTILS* -+ - AC_ARG_WITH(java, - [ --with-java=java-home Path to Java home directory (default is "no"; "yes" will use /usr as Java home)], - JAVA_HOMEDIR=$with_java, [with_java=no]) -diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp -index fa904839..cd0f4f71 100644 ---- a/libutil++/bfd_support.cpp -+++ b/libutil++/bfd_support.cpp -@@ -19,6 +19,7 @@ - #include "locate_images.h" - #include "op_libiberty.h" - #include "op_exception.h" -+#include "op_bfd_wrappers.h" - - #include - #include -@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) - } - } - -- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); -+ bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect); - char * contents = (char *) xmalloc(buildid_sect_size); - errno = 0; - if (!bfd_get_section_contents(ibfd, sect, -@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) - if (sect == NULL) - return false; - -- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); -+ bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect); - char * contents = (char *) xmalloc(debuglink_size); - cverb << vbfd - << ".gnu_debuglink section has size " << debuglink_size << endl; -@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, - // first restrict the search on a sensible range of vma, 16 is - // an intuitive value based on epilog code look - size_t max_search = 16; -- size_t section_size = bfd_section_size(abfd, section); -+ size_t section_size = op_bfd_section_size(abfd, section); - if (pc + max_search > section_size) - max_search = section_size - pc; - -@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, - else - pc = (sym.value() + offset) - sym.filepos(); - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+ if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) - goto fail; - -- if (pc >= bfd_section_size(abfd, section)) -+ if (pc >= op_bfd_section_size(abfd, section)) - goto fail; - - ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, -diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h -new file mode 100644 -index 00000000..b229cc12 ---- /dev/null -+++ b/libutil/op_bfd_wrappers.h -@@ -0,0 +1,28 @@ -+/** -+ * @file op_bfd_wrappers.h -+ * Wrappers to hide API changes in binutils 2.34 -+ * -+ * @remark Copyright 2020 OProfile authors -+ * @remark Read the file COPYING -+ * -+ * @author William Cohen -+ */ -+ -+#ifndef OP_BFD_WRAPPERS_H -+#define OP_BFD_WRAPPERS_H -+ -+#if HAVE_BINUTILS_234 -+#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec) -+#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec) -+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags) -+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma) -+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size) -+#else -+#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec) -+#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec) -+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags) -+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma) -+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size) -+#endif -+ -+#endif /* !OP_BFD_WRAPPERS_H */ -diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c -index 48db143b..da1e6d29 100644 ---- a/opjitconv/create_bfd.c -+++ b/opjitconv/create_bfd.c -@@ -16,6 +16,7 @@ - - #include "opjitconv.h" - #include "op_libiberty.h" -+#include "op_bfd_wrappers.h" - - #include - #include -@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name, - bfd_perror("bfd_make_section"); - goto error; - } -- bfd_set_section_vma(abfd, section, vma); -- if (bfd_set_section_size(abfd, section, size) == FALSE) { -+ op_bfd_set_section_vma(abfd, section, vma); -+ if (op_bfd_set_section_size(abfd, section, size) == FALSE) { - bfd_perror("bfd_set_section_size"); - goto error; - } -- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { -+ if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) { - bfd_perror("bfd_set_section_flags"); - goto error; - } --- -2.25.1 - diff --git a/buildroot/package/oprofile/oprofile.hash b/buildroot/package/oprofile/oprofile.hash index d1d96c623..7d005aa74 100644 --- a/buildroot/package/oprofile/oprofile.hash +++ b/buildroot/package/oprofile/oprofile.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.3.0/ -sha1 7daa0cca8587e399cb3df9eb817c6a39ffea2082 oprofile-1.3.0.tar.gz -md5 bd998df5521ebedae31e71cd3fb6200b oprofile-1.3.0.tar.gz +# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.4.0/ +sha1 d4d7634372d18de821b33650ad0ff7392e94c6e3 oprofile-1.4.0.tar.gz +md5 ac0ff685ec9735e30d6a4d19de0efed7 oprofile-1.4.0.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/oprofile/oprofile.mk b/buildroot/package/oprofile/oprofile.mk index b9d7d9e60..50693ddd1 100644 --- a/buildroot/package/oprofile/oprofile.mk +++ b/buildroot/package/oprofile/oprofile.mk @@ -4,13 +4,10 @@ # ################################################################################ -OPROFILE_VERSION = 1.3.0 +OPROFILE_VERSION = 1.4.0 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_LICENSE = GPL-2.0+ OPROFILE_LICENSE_FILES = COPYING -# 0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch -# 0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch -OPROFILE_AUTORECONF = YES OPROFILE_CONF_OPTS = \ --disable-account-check \ --enable-gui=no \ diff --git a/buildroot/package/optee-benchmark/0001-main-fix-typo.patch b/buildroot/package/optee-benchmark/0001-main-fix-typo.patch new file mode 100644 index 000000000..8ad5a26f1 --- /dev/null +++ b/buildroot/package/optee-benchmark/0001-main-fix-typo.patch @@ -0,0 +1,55 @@ +From ffa935dc881c394a824e063c8fde7dd102e06d8c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 8 May 2020 23:39:59 +0200 +Subject: [PATCH] main: fix typo +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The function yaml_mapping_start_event_initialize() +take yaml_mapping_style_t style as last argument: + +int yaml_mapping_start_event_initialize( + yaml_event_t *event, + const yaml_char_t *anchor, + const yaml_char_t *tag, + int implicit, + yaml_mapping_style_t style) + +Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE + +Fixes: +main.c:173:5: error: implicit conversion from ‘enum yaml_sequence_style_e’ to ‘yaml_mapping_style_t’ {aka ‘enum yaml_mapping_style_e’} [-Werror=enum-conversion] + 173 | YAML_ANY_SEQUENCE_STYLE)) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Romain Naour +--- + main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/main.c b/main.c +index 29a7c42..1685d3e 100644 +--- a/main.c ++++ b/main.c +@@ -170,7 +170,7 @@ static bool init_emitter(FILE *ts_file) + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_GOTO(emitter_delete, + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +@@ -263,7 +263,7 @@ static bool fill_timestamp(uint32_t core, uint64_t count, uint64_t addr, + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_RETURN_FALSE( + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +-- +2.25.4 + diff --git a/buildroot/package/optee-benchmark/optee-benchmark.hash b/buildroot/package/optee-benchmark/optee-benchmark.hash index 3f5195db6..12d1ddea8 100644 --- a/buildroot/package/optee-benchmark/optee-benchmark.hash +++ b/buildroot/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.7.0.tar.gz -sha256 c2bbeb188e3ebe06c62b1a7d6483d023737695c36d4752402fae33bd8f487c40 optee-benchmark-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.11.0.tar.gz +sha256 34c314a5cda1e9e3b92f01759585722b44503d9eea19f6b936fc951f5acbac16 optee-benchmark-3.11.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/buildroot/package/optee-benchmark/optee-benchmark.mk b/buildroot/package/optee-benchmark/optee-benchmark.mk index 9d67f9d26..f9d7cae30 100644 --- a/buildroot/package/optee-benchmark/optee-benchmark.mk +++ b/buildroot/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.7.0 +OPTEE_BENCHMARK_VERSION = 3.11.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/optee-client/0001-libckteec-replace-initializer.patch b/buildroot/package/optee-client/0001-libckteec-replace-initializer.patch new file mode 100644 index 000000000..21c75d142 --- /dev/null +++ b/buildroot/package/optee-client/0001-libckteec-replace-initializer.patch @@ -0,0 +1,93 @@ +From 4fff84cebc05a238a8fed3c66d7dcde18f9574fb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 2 Nov 2020 08:04:14 +0100 +Subject: [PATCH] =?UTF-8?q?libckteec:=20replace=20{=C2=A0}=20initializer?= + =?UTF-8?q?=20by=20{=C2=A00=20}?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Replace { } initializer by { 0 } to fix the following build failure with +gcc 4.8: + +libckteec/src/pkcs11_processing.c: In function 'ck_create_object': +libckteec/src/pkcs11_processing.c:22:9: error: missing initializer for field 'buffer' of 'struct serializer' [-Werror=missing-field-initializers] + struct serializer obj = { }; + ^ + +Fixes: http://autobuild.buildroot.org/results/a3d663adb943aee814180f01d6e153b3309be962 +Reviewed-by: Etienne Carriere +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OP-TEE/optee_client/pull/230] +--- + libckteec/src/pkcs11_processing.c | 4 ++-- + libckteec/src/serialize_ck.c | 4 ++-- + libckteec/src/serializer.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libckteec/src/pkcs11_processing.c b/libckteec/src/pkcs11_processing.c +index 2eb191f5..8eebe769 100644 +--- a/libckteec/src/pkcs11_processing.c ++++ b/libckteec/src/pkcs11_processing.c +@@ -19,7 +19,7 @@ CK_RV ck_create_object(CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR attribs, + CK_ULONG count, CK_OBJECT_HANDLE_PTR handle) + { + CK_RV rv = CKR_GENERAL_ERROR; +- struct serializer obj = { }; ++ struct serializer obj = { 0 }; + size_t ctrl_size = 0; + TEEC_SharedMemory *ctrl = NULL; + TEEC_SharedMemory *out_shm = NULL; +@@ -114,7 +114,7 @@ CK_RV ck_encdecrypt_init(CK_SESSION_HANDLE session, + { + CK_RV rv = CKR_GENERAL_ERROR; + TEEC_SharedMemory *ctrl = NULL; +- struct serializer obj = { }; ++ struct serializer obj = { 0 }; + uint32_t session_handle = session; + uint32_t key_handle = key; + size_t ctrl_size = 0; +diff --git a/libckteec/src/serialize_ck.c b/libckteec/src/serialize_ck.c +index 1fc26ddc..0e5df90a 100644 +--- a/libckteec/src/serialize_ck.c ++++ b/libckteec/src/serialize_ck.c +@@ -39,7 +39,7 @@ static CK_RV serialize_indirect_attribute(struct serializer *obj, + CK_ATTRIBUTE_PTR attr = NULL; + CK_ULONG count = 0; + CK_RV rv = CKR_GENERAL_ERROR; +- struct serializer obj2 = { }; ++ struct serializer obj2 = { 0 }; + + switch (attribute->type) { + /* These are serialized each separately */ +@@ -263,7 +263,7 @@ static CK_RV serialize_mecha_aes_iv(struct serializer *obj, + CK_RV serialize_ck_mecha_params(struct serializer *obj, + CK_MECHANISM_PTR mechanism) + { +- CK_MECHANISM mecha = { }; ++ CK_MECHANISM mecha = { 0 }; + CK_RV rv = CKR_GENERAL_ERROR; + + memset(obj, 0, sizeof(*obj)); +diff --git a/libckteec/src/serializer.c b/libckteec/src/serializer.c +index 0e3df65c..d94932ba 100644 +--- a/libckteec/src/serializer.c ++++ b/libckteec/src/serializer.c +@@ -14,7 +14,7 @@ + + CK_RV init_serial_object(struct serializer *obj) + { +- struct pkcs11_object_head head = { }; ++ struct pkcs11_object_head head = { 0 }; + + memset(obj, 0, sizeof(*obj)); + +@@ -23,7 +23,7 @@ CK_RV init_serial_object(struct serializer *obj) + + void finalize_serial_object(struct serializer *obj) + { +- struct pkcs11_object_head head = { }; ++ struct pkcs11_object_head head = { 0 }; + + head.attrs_size = obj->size - sizeof(head); + head.attrs_count = obj->item_count; diff --git a/buildroot/package/optee-client/Config.in b/buildroot/package/optee-client/Config.in index e519a1345..1ef0a1401 100644 --- a/buildroot/package/optee-client/Config.in +++ b/buildroot/package/optee-client/Config.in @@ -13,5 +13,17 @@ config BR2_PACKAGE_OPTEE_CLIENT https://github.com/OP-TEE/optee_client +if BR2_PACKAGE_OPTEE_CLIENT + +config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH + string "Path for normal world OS secure storage" + default "/data/tee" + help + Path to storage area for secure storage based on the + normal world OS providing the actual storage via + tee-supplicant. + +endif + comment "optee-client needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/optee-client/optee-client.hash b/buildroot/package/optee-client/optee-client.hash index 3fae359f3..d8e507dba 100644 --- a/buildroot/package/optee-client/optee-client.hash +++ b/buildroot/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.7.0.tar.gz -sha256 7a31076a3a77398c6db2b5d3e0a6ac297923bee126ff83430e8f1ebc2a060faa optee-client-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.11.0.tar.gz +sha256 91f8ec191cd999ee666b6203ec376415d5dc90a8a9955f3d5fce1f48df77169b optee-client-3.11.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/buildroot/package/optee-client/optee-client.mk b/buildroot/package/optee-client/optee-client.mk index 15bebdc61..8108fc213 100644 --- a/buildroot/package/optee-client/optee-client.mk +++ b/buildroot/package/optee-client/optee-client.mk @@ -4,12 +4,15 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.7.0 +OPTEE_CLIENT_VERSION = 3.11.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE OPTEE_CLIENT_INSTALL_STAGING = YES +OPTEE_CLIENT_CONF_OPTS = \ + -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) + define OPTEE_CLIENT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ $(TARGET_DIR)/etc/init.d/S30optee diff --git a/buildroot/package/optee-examples/optee-examples.hash b/buildroot/package/optee-examples/optee-examples.hash index 8b14e43ad..230d5d3cc 100644 --- a/buildroot/package/optee-examples/optee-examples.hash +++ b/buildroot/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.7.0.tar.gz -sha256 6c5600871edc64dbdca08dfe40b3161bfb55a11e6004699957c6da8f67b2a475 optee-examples-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.11.0.tar.gz +sha256 b910479a2d432014b6c49aafed27e26dd6f930e7c31d277c1500c1b60b4b3876 optee-examples-3.11.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/buildroot/package/optee-examples/optee-examples.mk b/buildroot/package/optee-examples/optee-examples.mk index 093b8600c..b6f77c72f 100644 --- a/buildroot/package/optee-examples/optee-examples.mk +++ b/buildroot/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.7.0 +OPTEE_EXAMPLES_VERSION = 3.11.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE diff --git a/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch b/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 2765a980d..000000000 --- a/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cc3cb798375c5f47ea5c7579f32060933435e231 Mon Sep 17 00:00:00 2001 -From: Scott Branden -Date: Fri, 27 Dec 2019 12:54:28 -0800 -Subject: [PATCH] use python3 instead of python - -use python3 instead of python as python2 is EOL January 2020. - -Signed-off-by: Scott Branden -Reviewed-by: Jerome Forissier -Tested-by: Jerome Forissier (QEMU, CFG_GCM_NIST_VECTORS=y) - -(cherry picked from commit 6271160639002a2580d80b75b5397a96d56329f2) -Signed-off-by: Romain Naour ---- - scripts/file_to_c.py | 4 ++-- - scripts/rsp_to_gcm_test.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index ae16f52..b4ce2a2 100755 ---- a/scripts/file_to_c.py -+++ b/scripts/file_to_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2018, Linaro Limited -@@ -29,7 +29,7 @@ def main(): - - f.write("const uint8_t " + args.name + "[] = {\n") - i = 0 -- for x in array.array("B", inf.read()): -+ for x in array.array("B", map(ord, (inf.read()))): - f.write("0x" + '{0:02x}'.format(x) + ",") - i = i + 1 - if i % 8 == 0: -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py -index 0543541..e4418be 100755 ---- a/scripts/rsp_to_gcm_test.py -+++ b/scripts/rsp_to_gcm_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - modes = {'encrypt': 0, 'decrypt': 1} - --- -2.24.1 - diff --git a/buildroot/package/optee-test/Config.in b/buildroot/package/optee-test/Config.in index a40f1e906..357a6b0c5 100644 --- a/buildroot/package/optee-test/Config.in +++ b/buildroot/package/optee-test/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -22,6 +23,6 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ threads" +comment "optee-test needs a toolchain w/ threads and C++" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/optee-test/optee-test.hash b/buildroot/package/optee-test/optee-test.hash index 17f73e26d..52e2373bf 100644 --- a/buildroot/package/optee-test/optee-test.hash +++ b/buildroot/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.7.0.tar.gz -sha256 6486ba7eba8ea8b43278032c9d6ea1d6b35340a7f76ef4c6f34efbca3d80265d optee-test-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.11.0.tar.gz +sha256 54d4b7e2ad22cd409ee8e25e990c1878690b1b5eb8843f649d12022888186a53 optee-test-3.11.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/buildroot/package/optee-test/optee-test.mk b/buildroot/package/optee-test/optee-test.mk index 4cf2f9530..1f4f58667 100644 --- a/buildroot/package/optee-test/optee-test.mk +++ b/buildroot/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.7.0 +OPTEE_TEST_VERSION = 3.11.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/oracle-mysql/oracle-mysql.mk b/buildroot/package/oracle-mysql/oracle-mysql.mk index 1449c58e4..ccfa40cfb 100644 --- a/buildroot/package/oracle-mysql/oracle-mysql.mk +++ b/buildroot/package/oracle-mysql/oracle-mysql.mk @@ -102,7 +102,7 @@ ORACLE_MYSQL_CONF_OPTS += --without-debug endif define ORACLE_MYSQL_USERS - mysql -1 nogroup -1 * /var/mysql - - MySQL daemon + mysql -1 nobody -1 * /var/mysql - - MySQL daemon endef define ORACLE_MYSQL_ADD_FOLDER diff --git a/buildroot/package/orc/orc.hash b/buildroot/package/orc/orc.hash index c30a50112..f48c2932a 100644 --- a/buildroot/package/orc/orc.hash +++ b/buildroot/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz.sha256sum -sha256 a0ab5f10a6a9ae7c3a6b4218246564c3bf00d657cbdf587e6d34ec3ef0616075 orc-0.4.31.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum +sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz # Locally calculated -sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING +sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/buildroot/package/orc/orc.mk b/buildroot/package/orc/orc.mk index 51a9b7848..a93a4f875 100644 --- a/buildroot/package/orc/orc.mk +++ b/buildroot/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.31 +ORC_VERSION = 0.4.32 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause diff --git a/buildroot/package/ortp/Config.in b/buildroot/package/ortp/Config.in index 052ff1d39..e296e82f7 100644 --- a/buildroot/package/ortp/Config.in +++ b/buildroot/package/ortp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_ORTP bool "oRTP" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox select BR2_PACKAGE_BCTOOLBOX help oRTP, a Real-time Transport Protocol (RTP,RFC3550) library @@ -10,3 +11,6 @@ config BR2_PACKAGE_ORTP comment "ortp needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + +comment "ortp needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/ortp/ortp.hash b/buildroot/package/ortp/ortp.hash index 93ec39297..65a514160 100644 --- a/buildroot/package/ortp/ortp.hash +++ b/buildroot/package/ortp/ortp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb61a833ab3ad80978d7007411240f46e9b2d1034373b9d9dfaac88c1b6ec0af ortp-0.27.0.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 55d12b71ed7c3958abb8d892105e616499d66c88200c46e3ec3cfbbe79771b2e ortp-4.3.1.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/ortp/ortp.mk b/buildroot/package/ortp/ortp.mk index 0bd61e88d..436e04c14 100644 --- a/buildroot/package/ortp/ortp.mk +++ b/buildroot/package/ortp/ortp.mk @@ -4,13 +4,22 @@ # ################################################################################ -ORTP_VERSION = 0.27.0 -ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources - -ORTP_CONF_OPTS = --disable-strict +ORTP_VERSION = 4.3.1 +ORTP_SITE = https://gitlab.linphone.org/BC/public/ortp/-/archive/$(ORTP_VERSION) +ORTP_LICENSE = GPL-3.0+ +ORTP_LICENSE_FILES = LICENSE.txt ORTP_INSTALL_STAGING = YES -ORTP_LICENSE = LGPL-2.1+ -ORTP_LICENSE_FILES = COPYING ORTP_DEPENDENCIES = bctoolbox +ORTP_CONF_OPTS = \ + -DENABLE_DOC=OFF \ + -DENABLE_STRICT=OFF -$(eval $(autotools-package)) +ifeq ($(BR2_STATIC_LIBS),y) +ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON +else ifeq ($(BR2_SHARED_LIBS),y) +ORTP_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/owfs/0001-Fix-compilation-with-GCC10.patch b/buildroot/package/owfs/0001-Fix-compilation-with-GCC10.patch new file mode 100644 index 000000000..49b703ee2 --- /dev/null +++ b/buildroot/package/owfs/0001-Fix-compilation-with-GCC10.patch @@ -0,0 +1,41 @@ +From 43a4bc6b750c37f585d03b14941f3633ed5348d8 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Tue, 9 Jun 2020 11:30:38 +0300 +Subject: [PATCH] Fix compilation with GCC10 + +Fixed compilation with -fno-common, which enabled in GCC 10 by default. +See https://bugs.gentoo.org/707438. +[Retrieved from: +https://github.com/owfs/owfs/commit/43a4bc6b750c37f585d03b14941f3633ed5348d8] +Signed-off-by: Fabrice Fontaine +--- + module/owserver/src/c/owserver.c | 2 ++ + module/owserver/src/include/owserver.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c +index db29988e..2ed29161 100644 +--- a/module/owserver/src/c/owserver.c ++++ b/module/owserver/src/c/owserver.c +@@ -36,6 +36,8 @@ + + #include "owserver.h" + ++pthread_mutex_t persistence_mutex ; ++ + /* --- Prototypes ------------ */ + static void SetupAntiloop(int argc, char **argv); + +diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h +index 8be582f0..a257ed02 100644 +--- a/module/owserver/src/include/owserver.h ++++ b/module/owserver/src/include/owserver.h +@@ -18,7 +18,7 @@ + #include "ow.h" + #include "ow_connection.h" + +-pthread_mutex_t persistence_mutex ; ++extern pthread_mutex_t persistence_mutex ; + #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; + #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; + diff --git a/buildroot/package/p7zip/0004-Fix-build-with-gcc-10.patch b/buildroot/package/p7zip/0004-Fix-build-with-gcc-10.patch new file mode 100644 index 000000000..b01833db2 --- /dev/null +++ b/buildroot/package/p7zip/0004-Fix-build-with-gcc-10.patch @@ -0,0 +1,32 @@ +From 78b760eae21d7b340c69e8abab8ca706e1e00adc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= +Date: Mon, 4 May 2020 09:19:46 +0200 +Subject: [PATCH] Fix build with gcc 10. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add cast to code that mixes HRESULT (aka long) and DWORD (aka unsigned +int) which causes an narrowing error with gcc 10. + +Signed-off-by: Stefan Sørensen +--- + CPP/Windows/ErrorMsg.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +index 99684ae..ab48352 100644 +--- a/CPP/Windows/ErrorMsg.cpp ++++ b/CPP/Windows/ErrorMsg.cpp +@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode) + const char * txt = 0; + AString msg; + +- switch(errorCode) { ++ switch((HRESULT)errorCode) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; + case E_NOTIMPL : txt = "E_NOTIMPL"; break ; + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +-- +2.26.2 + diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash index 3c1a27084..4d9939af3 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 996eef9e498519da79108f58a887a34abc50cd76770b19b0300b27783706c71f paho-mqtt-c-1.3.5.tar.gz +sha256 ecbc2c2000c6d8dcf1a76325312c61ed29db0b010acbd40cb92fcd4c014cd017 paho-mqtt-c-1.3.6.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 -sha256 99d3a5c5cc2812f0593a85ec7c1b6dd83e8477b5090c01d9de0d49d49f367a4a LICENSE +sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk index e11f0687d..3ac46397d 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.5 +PAHO_MQTT_C_VERSION = 1.3.6 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE diff --git a/buildroot/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch b/buildroot/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch new file mode 100644 index 000000000..934dca219 --- /dev/null +++ b/buildroot/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch @@ -0,0 +1,35 @@ +From 8aeafa1c2ec90b0e95ba5944266eda115457e10d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 15 Jun 2020 13:40:22 +0200 +Subject: [PATCH] cmake/FindMahoMqttC.cmake: fix static build + +Static libraries of paho-mqtt-c are not suffixed with -static since +version 1.3.2 and +https://github.com/eclipse/paho.mqtt.c/commit/8cc51c78b76a1eabd1df3124b0887ce8b01070ff + +See: https://github.com/eclipse/paho.mqtt.c/pull/704 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/eclipse/paho.mqtt.cpp/pull/275] +--- + cmake/FindPahoMqttC.cmake | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/cmake/FindPahoMqttC.cmake b/cmake/FindPahoMqttC.cmake +index 53f15a3..0ec95bd 100644 +--- a/cmake/FindPahoMqttC.cmake ++++ b/cmake/FindPahoMqttC.cmake +@@ -5,10 +5,6 @@ if(PAHO_WITH_SSL) + else() + set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a) + endif() +-# add suffix when using static Paho MQTT C library variant +-if(PAHO_BUILD_STATIC) +- set(_PAHO_MQTT_C_LIB_NAME ${_PAHO_MQTT_C_LIB_NAME}-static) +-endif() + + find_library(PAHO_MQTT_C_LIBRARIES NAMES ${_PAHO_MQTT_C_LIB_NAME}) + unset(_PAHO_MQTT_C_LIB_NAME) +-- +2.26.2 + diff --git a/buildroot/package/paho-mqtt-cpp/Config.in b/buildroot/package/paho-mqtt-cpp/Config.in index dfeb5545f..a46c1256e 100644 --- a/buildroot/package/paho-mqtt-cpp/Config.in +++ b/buildroot/package/paho-mqtt-cpp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PAHO_MQTT_CPP bool "paho-mqtt-cpp" - depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_INSTALL_LIBSTDCPP @@ -10,9 +9,8 @@ config BR2_PACKAGE_PAHO_MQTT_CPP https://eclipse.org/paho/clients/cpp/ -comment "paho-mqtt-cpp needs a toolchain w/ threads, C++, dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP +comment "paho-mqtt-cpp needs a toolchain w/ threads, C++" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 comment "paho-mqtt-cpp needs a toolchain not affected by GCC bug 64735" diff --git a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk index 2cb65d984..bf1c4a27b 100644 --- a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk +++ b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -22,4 +22,18 @@ else PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=FALSE endif +ifeq ($(BR2_SHARED_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=FALSE +else ifeq ($(BR2_STATIC_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=FALSE \ + -DPAHO_BUILD_STATIC=TRUE +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +PAHO_MQTT_CPP_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=TRUE +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/pango/pango.hash b/buildroot/package/pango/pango.hash index 1cd19d3cf..32808c6ca 100644 --- a/buildroot/package/pango/pango.hash +++ b/buildroot/package/pango/pango.hash @@ -1,3 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.44/pango-1.44.6.sha256sum -sha256 3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c pango-1.44.6.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +# From https://ftp.gnome.org/pub/GNOME/sources/pango/1.46/pango-1.46.2.sha256sum +sha256 d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841 pango-1.46.2.tar.xz + +# Locally computed +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/pango/pango.mk b/buildroot/package/pango/pango.mk index 48edd18b0..92bd6c3ea 100644 --- a/buildroot/package/pango/pango.mk +++ b/buildroot/package/pango/pango.mk @@ -4,15 +4,15 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.44 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).6 +PANGO_VERSION_MAJOR = 1.46 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING -PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false +PANGO_CONF_OPTS = -Duse_fontconfig=true HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false PANGO_DEPENDENCIES = \ @@ -33,6 +33,13 @@ HOST_PANGO_DEPENDENCIES = \ host-fontconfig \ host-freetype +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +PANGO_CONF_OPTS += -Dintrospection=true +PANGO_DEPENDENCIES += gobject-introspection +else +PANGO_CONF_OPTS += -Dintrospection=false +endif + ifeq ($(BR2_PACKAGE_XORG7),y) PANGO_DEPENDENCIES += xlib_libX11 endif diff --git a/buildroot/package/parprouted/Config.in b/buildroot/package/parprouted/Config.in new file mode 100644 index 000000000..7cf839da3 --- /dev/null +++ b/buildroot/package/parprouted/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_PARPROUTED + bool "parprouted" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + help + parprouted is a daemon for transparent IP (Layer 3) proxy ARP + bridging. This is useful for creation of transparent firewalls + and bridging networks with different MAC protocols. Also, + unlike standard bridging, proxy ARP bridging allows to bridge + Ethernet networks behind wireless nodes without using WDS or + layer 2 bridging. + + https://www.hazard.maks.net/parprouted + +comment "parprouted needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/parprouted/parprouted.hash b/buildroot/package/parprouted/parprouted.hash new file mode 100644 index 000000000..d35691b62 --- /dev/null +++ b/buildroot/package/parprouted/parprouted.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d63643c95d4149a3d71112da5892f459433456bf0279bfa304625f109178defc parprouted-0.7.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/parprouted/parprouted.mk b/buildroot/package/parprouted/parprouted.mk new file mode 100644 index 000000000..a0425d92c --- /dev/null +++ b/buildroot/package/parprouted/parprouted.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# parprouted +# +################################################################################ + +PARPROUTED_VERSION = 0.7 +PARPROUTED_SITE = https://www.hazard.maks.net/parprouted +PARPROUTED_LICENSE = GPL-2.0 +PARPROUTED_LICENSE_FILES = COPYING + +define PARPROUTED_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define PARPROUTED_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/parprouted $(TARGET_DIR)/usr/sbin/parprouted +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/parted/Config.in b/buildroot/package/parted/Config.in index a35b30662..f48b365a2 100644 --- a/buildroot/package/parted/Config.in +++ b/buildroot/package/parted/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -10,6 +9,5 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a glibc or musl toolchain w/ locale, wchar" - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "parted needs a toolchain w/ locale, wchar" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/buildroot/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch b/buildroot/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch new file mode 100644 index 000000000..0d7931cd5 --- /dev/null +++ b/buildroot/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch @@ -0,0 +1,176 @@ +From 79c093226e609b99fa889f6e37480b92b399610d Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 7 Mar 2017 21:08:34 +0000 +Subject: [PATCH] Avoid inflating file sizes needlessly and allow binaries to + be stripped + +The current approach to changing sections in ET_DYN executables is to move +the INTERP section to the end of the file. +This means changing PT_PHDR to +add an extra PT_LOAD section so that the new section is mmaped into memory +by the elf loader in the kernel. In order to extend PHDR, this means moving +it to the end of the file. + +Its documented in BUGS there is a kernel 'bug' which means that if you have holes +in memory between the base load address and the PT_LOAD segment that contains PHDR, +it will pass an incorrect PHDR address to ld.so and fail to load the binary, segfaulting. + +To avoid this, the code currently inserts space into the binary to ensure that when +loaded into memory there are no holes between the PT_LOAD sections. This inflates the +binaries by many MBs in some cases. Whilst we could make them sparse, there is a second +issue which is that strip can fail to process these binaries: + +$ strip fixincl +Not enough room for program headers, try linking with -N +[.note.ABI-tag]: Bad value + +This turns out to be due to libbfd not liking the relocated PHDR section either +(https://github.com/NixOS/patchelf/issues/10). + +Instead this patch implements a different approach, leaving PHDR where it is but extending +it in place to allow addition of a new PT_LOAD section. This overwrites sections in the +binary but those get moved to the end of the file in the new PT_LOAD section. + +This is based on patches linked from the above github issue, however whilst the idea +was good, the implementation wasn't correct and they've been rewritten here. + +Signed-off-by: Richard Purdie + +Fetch from: https://github.com/NixOS/patchelf/commit/c4deb5e9e1ce9c98a48e0d5bb37d87739b8cfee4 + +Backported to v0.9 + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 71 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 40 insertions(+), 31 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 1d58061..c2147af 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -209,6 +209,8 @@ private: + string & replaceSection(const SectionName & sectionName, + unsigned int size); + ++ bool haveReplacedSection(const SectionName & sectionName); ++ + void writeReplacedSections(Elf_Off & curOff, + Elf_Addr startAddr, Elf_Off startOffset); + +@@ -632,6 +634,15 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, + replacedSections.clear(); + } + ++template ++bool ElfFile::haveReplacedSection(const SectionName & sectionName) ++{ ++ ReplacedSections::iterator i = replacedSections.find(sectionName); ++ ++ if (i != replacedSections.end()) ++ return true; ++ return false; ++} + + template + void ElfFile::rewriteSectionsLibrary() +@@ -648,52 +659,53 @@ void ElfFile::rewriteSectionsLibrary() + + debug("last page is 0x%llx\n", (unsigned long long) startPage); + ++ /* Because we're adding a new section header, we're necessarily increasing ++ the size of the program header table. This can cause the first section ++ to overlap the program header table in memory; we need to shift the first ++ few segments to someplace else. */ ++ /* Some sections may already be replaced so account for that */ ++ unsigned int i = 1; ++ Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); ++ while( shdrs[i].sh_addr <= pht_size && i < rdi(hdr->e_shnum) ) { ++ if (not haveReplacedSection(getSectionName(shdrs[i]))) ++ replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); ++ i++; ++ } + +- /* Compute the total space needed for the replaced sections and +- the program headers. */ +- off_t neededSpace = (phdrs.size() + 1) * sizeof(Elf_Phdr); ++ /* Compute the total space needed for the replaced sections */ ++ off_t neededSpace = 0; + for (ReplacedSections::iterator i = replacedSections.begin(); + i != replacedSections.end(); ++i) + neededSpace += roundUp(i->second.size(), sectionAlignment); + debug("needed space is %d\n", neededSpace); + +- + size_t startOffset = roundUp(fileSize, getPageSize()); + + growFile(startOffset + neededSpace); + +- + /* Even though this file is of type ET_DYN, it could actually be + an executable. For instance, Gold produces executables marked +- ET_DYN. In that case we can still hit the kernel bug that +- necessitated rewriteSectionsExecutable(). However, such +- executables also tend to start at virtual address 0, so ++ ET_DYN as does LD when linking with pie. If we move PT_PHDR, it ++ has to stay in the first PT_LOAD segment or any subsequent ones ++ if they're continuous in memory due to linux kernel constraints ++ (see BUGS). Since the end of the file would be after bss, we can't ++ move PHDR there, we therefore choose to leave PT_PHDR where it is but ++ move enough following sections such that we can add the extra PT_LOAD ++ section to it. This PT_LOAD segment ensures the sections at the end of ++ the file are mapped into memory for ld.so to process. ++ We can't use the approach in rewriteSectionsExecutable() ++ since DYN executables tend to start at virtual address 0, so + rewriteSectionsExecutable() won't work because it doesn't have +- any virtual address space to grow downwards into. As a +- workaround, make sure that the virtual address of our new +- PT_LOAD segment relative to the first PT_LOAD segment is equal +- to its offset; otherwise we hit the kernel bug. This may +- require creating a hole in the executable. The bigger the size +- of the uninitialised data segment, the bigger the hole. */ ++ any virtual address space to grow downwards into. */ + if (isExecutable) { + if (startOffset >= startPage) { + debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); +- } else { +- size_t hole = startPage - startOffset; +- /* Print a warning, because the hole could be very big. */ +- fprintf(stderr, "warning: working around a Linux kernel bug by creating a hole of %zu bytes in ‘%s’\n", hole, fileName.c_str()); +- assert(hole % getPageSize() == 0); +- /* !!! We could create an actual hole in the file here, +- but it's probably not worth the effort. */ +- growFile(fileSize + hole); +- startOffset += hole; + } + startPage = startOffset; + } + + +- /* Add a segment that maps the replaced sections and program +- headers into memory. */ ++ /* Add a segment that maps the replaced sections into memory. */ + phdrs.resize(rdi(hdr->e_phnum) + 1); + wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); + Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; +@@ -706,15 +718,12 @@ void ElfFile::rewriteSectionsLibrary() + + + /* Write out the replaced sections. */ +- Elf_Off curOff = startOffset + phdrs.size() * sizeof(Elf_Phdr); ++ Elf_Off curOff = startOffset; + writeReplacedSections(curOff, startPage, startOffset); + assert(curOff == startOffset + neededSpace); + +- +- /* Move the program header to the start of the new area. */ +- wri(hdr->e_phoff, startOffset); +- +- rewriteHeaders(startPage); ++ /* Write out the updated program and section headers */ ++ rewriteHeaders(hdr->e_phoff); + } + + +-- +2.17.1 + diff --git a/buildroot/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch b/buildroot/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch new file mode 100644 index 000000000..9fb3e260c --- /dev/null +++ b/buildroot/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch @@ -0,0 +1,55 @@ +From 5df4791bf077127684faceeeea8bfab063e43774 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 3 Jun 2020 12:14:58 +0100 +Subject: [PATCH] Fix shared library corruption when rerunning patchelf + +When running patchelf on some existing patchelf'd binaries to change to longer +RPATHS, ldd would report the binaries as invalid. The output of objdump -x on +those libraryies should show the top of the .dynamic section is getting trashed, +something like: + +0x600000001 0x0000000000429000 +0x335000 0x0000000000335000 +0xc740 0x000000000000c740 +0x1000 0x0000000000009098 +SONAME libglib-2.0.so.0 + +(which should be RPATH and DT_NEEDED entries) + +This was tracked down to the code which injects the PT_LOAD section. + +The issue is that if the program headers were previously relocated to the end +of the file which was how patchelf operated previously, the relocation code +wouldn't work properly on a second run as it now assumes they're located after +the elf header. This change forces them back to immediately follow the elf +header which is where the code has made space for them. + +Should fix https://github.com/NixOS/patchelf/issues/170 +and https://github.com/NixOS/patchelf/issues/192 + +Signed-off-by: Richard Purdie + +Fetch from: https://github.com/NixOS/patchelf/commit/ad5f1f078b716802dfb8f7226cb1d5c720348a78 + +Backported to v0.9 + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index c2147af..1224a89 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -706,6 +706,7 @@ void ElfFile::rewriteSectionsLibrary() + + + /* Add a segment that maps the replaced sections into memory. */ ++ wri(hdr->e_phoff, sizeof(Elf_Ehdr)); + phdrs.resize(rdi(hdr->e_phnum) + 1); + wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); + Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; +-- +2.17.1 + diff --git a/buildroot/package/patchelf/0007-fix-adjusting-startPage.patch b/buildroot/package/patchelf/0007-fix-adjusting-startPage.patch new file mode 100644 index 000000000..fd044964e --- /dev/null +++ b/buildroot/package/patchelf/0007-fix-adjusting-startPage.patch @@ -0,0 +1,45 @@ +From 4a82c97e8a0677706d1d532812daaa73249768a8 Mon Sep 17 00:00:00 2001 +From: Ed Bartosh +Date: Fri, 21 Jul 2017 12:33:53 +0300 +Subject: [PATCH] fix adjusting startPage + +startPage is adjusted unconditionally for all executables. +This results in incorrect addresses assigned to INTERP and LOAD +program headers, which breaks patched executable. + +Adjusting startPage variable only when startOffset > startPage +should fix this. + +This change is related to the issue NixOS#10 + +Signed-off-by: Ed Bartosh + +Fetch from: https://github.com/NixOS/patchelf/commit/1cc234fea5600190d872329aca60e2365cefc39e + +Backported to v0.9 + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 1224a89..4676157 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -697,10 +697,8 @@ void ElfFile::rewriteSectionsLibrary() + since DYN executables tend to start at virtual address 0, so + rewriteSectionsExecutable() won't work because it doesn't have + any virtual address space to grow downwards into. */ +- if (isExecutable) { +- if (startOffset >= startPage) { +- debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); +- } ++ if (isExecutable && startOffset > startPage) { ++ debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); + startPage = startOffset; + } + +-- +2.17.1 + diff --git a/buildroot/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch b/buildroot/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch new file mode 100644 index 000000000..d423cad23 --- /dev/null +++ b/buildroot/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch @@ -0,0 +1,38 @@ +From cb8326de54ad7a56658b0dc8efb7da5e71684a7c Mon Sep 17 00:00:00 2001 +From: Pablo Galindo +Date: Tue, 22 Sep 2020 01:33:47 +0100 +Subject: [PATCH] Use sh_offset instead of sh_addr when checking already + replaced libs + +When checking for already replaced libs, the check against the size must +be done using the section header offset, not the section file address. +This was not crashing in many situations because normally sh_address and +sh_offset have the same value but these two may differ and using the +sh_address value instead can cause library corruption in these +situations. + +Fetch from: https://github.com/NixOS/patchelf/commit/83aa89addf8757e2d63aa73222f2fa9bc6d7321a + +Backported to v0.9 + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 4676157..c025ae2 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -666,7 +666,7 @@ void ElfFile::rewriteSectionsLibrary() + /* Some sections may already be replaced so account for that */ + unsigned int i = 1; + Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); +- while( shdrs[i].sh_addr <= pht_size && i < rdi(hdr->e_shnum) ) { ++ while( shdrs[i].sh_offset <= pht_size && i < rdi(hdr->e_shnum) ) { + if (not haveReplacedSection(getSectionName(shdrs[i]))) + replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); + i++; +-- +2.17.1 + diff --git a/buildroot/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch b/buildroot/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch new file mode 100644 index 000000000..a820f2d1d --- /dev/null +++ b/buildroot/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch @@ -0,0 +1,41 @@ +From e22ca2f593aa8fd392f1ac4f8dd104bc56d0d100 Mon Sep 17 00:00:00 2001 +From: Ezra Cooper +Date: Thu, 21 Jun 2018 11:07:35 -0700 +Subject: [PATCH] Fix issue #66 by ignoring the first section header when + sorting, and not overwriting NOBITS entries. + +Fetch from: https://github.com/NixOS/patchelf/commit/52ab908394958a2a5d0476e306e2cad4da4fdeae + +Backported to v0.9 + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index c025ae2..fa2945e 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -435,7 +435,7 @@ void ElfFile::sortShdrs() + /* Sort the sections by offset. */ + CompShdr comp; + comp.elfFile = this; +- sort(shdrs.begin(), shdrs.end(), comp); ++ sort(shdrs.begin() + 1, shdrs.end(), comp); + + /* Restore the sh_link mappings. */ + for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i) +@@ -586,7 +586,8 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, + { + string sectionName = i->first; + Elf_Shdr & shdr = findSection(sectionName); +- memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); ++ if (shdr.sh_type != SHT_NOBITS) ++ memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); + } + + for (ReplacedSections::iterator i = replacedSections.begin(); +-- +2.17.1 + diff --git a/buildroot/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch b/buildroot/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch new file mode 100644 index 000000000..6a3500b91 --- /dev/null +++ b/buildroot/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch @@ -0,0 +1,80 @@ +From c61c2960d782c67566790b210163ff9c799f018a Mon Sep 17 00:00:00 2001 +From: Conrad Ratschan +Date: Sat, 3 Oct 2020 20:17:24 -0500 +Subject: [PATCH] Fix endianness issues for powerpc PIE + +Previously when running `patchelf --set-rpath "/usr/sbin" my_bin` on a +PIE ppc32 binary that had no RPATH a few issues were encountered. + +This commit fixes: + +1. The PT_PHDR being sorted improperly due to the type being read in + incorrect endianness + +3. The interpreter being clobbered due to the replace sections routine + reading sh_offset and sh_size in incorrect endianness + +4. The PHDR segment having an incorrect virt and phys address due to + reading the e_phoff in the incorrect endianness + +This also fixes a read of the shdr.sh_type in writeReplacedSections but +this was not encountered during testing. + +Fetch from: https://github.com/NixOS/patchelf/commit/884eccc4f061a3dbdbe63a4c73f1cc9bbf77fa7d + +Backported to v0.9. Removed item 2 from the fix list as it is not +applicable to v0.9. + +Signed-off-by: Conrad Ratschan +--- + src/patchelf.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index fa2945e..e60b17c 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -173,8 +173,8 @@ private: + ElfFile * elfFile; + bool operator ()(const Elf_Phdr & x, const Elf_Phdr & y) + { +- if (x.p_type == PT_PHDR) return true; +- if (y.p_type == PT_PHDR) return false; ++ if (elfFile->rdi(x.p_type) == PT_PHDR) return true; ++ if (elfFile->rdi(y.p_type) == PT_PHDR) return false; + return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr); + } + }; +@@ -586,7 +586,7 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, + { + string sectionName = i->first; + Elf_Shdr & shdr = findSection(sectionName); +- if (shdr.sh_type != SHT_NOBITS) ++ if (rdi(shdr.sh_type) != SHT_NOBITS) + memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); + } + +@@ -667,9 +667,9 @@ void ElfFile::rewriteSectionsLibrary() + /* Some sections may already be replaced so account for that */ + unsigned int i = 1; + Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); +- while( shdrs[i].sh_offset <= pht_size && i < rdi(hdr->e_shnum) ) { ++ while( rdi(shdrs[i].sh_offset) <= pht_size && i < rdi(hdr->e_shnum) ) { + if (not haveReplacedSection(getSectionName(shdrs[i]))) +- replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); ++ replaceSection(getSectionName(shdrs[i]), rdi(shdrs[i].sh_size)); + i++; + } + +@@ -723,7 +723,7 @@ void ElfFile::rewriteSectionsLibrary() + assert(curOff == startOffset + neededSpace); + + /* Write out the updated program and section headers */ +- rewriteHeaders(hdr->e_phoff); ++ rewriteHeaders(rdi(hdr->e_phoff)); + } + + +-- +2.17.1 + diff --git a/buildroot/package/pax-utils/Config.in b/buildroot/package/pax-utils/Config.in index 58100e482..ebcca9850 100644 --- a/buildroot/package/pax-utils/Config.in +++ b/buildroot/package/pax-utils/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PAX_UTILS bool "pax-utils" + depends on BR2_USE_WCHAR help ELF related utils for ELF 32/64 binaries that can check files for security relevant properties. http://www.gentoo.org/proj/en/hardened/pax-utils.xml + +comment "pax-utils needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/buildroot/package/pax-utils/pax-utils.hash b/buildroot/package/pax-utils/pax-utils.hash index 1b4cee4fb..0ef8fad64 100644 --- a/buildroot/package/pax-utils/pax-utils.hash +++ b/buildroot/package/pax-utils/pax-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9 pax-utils-1.2.2.tar.xz +sha256 9742d2a31d53a4e0f6df0d3721ab6f7cf8b0404c95fee3b00e678c1ff6db7f21 pax-utils-1.2.6.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/pax-utils/pax-utils.mk b/buildroot/package/pax-utils/pax-utils.mk index b31468eca..502fc8744 100644 --- a/buildroot/package/pax-utils/pax-utils.mk +++ b/buildroot/package/pax-utils/pax-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAX_UTILS_VERSION = 1.2.2 +PAX_UTILS_VERSION = 1.2.6 PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz PAX_UTILS_LICENSE = GPL-2.0 diff --git a/buildroot/package/pciutils/pciutils.hash b/buildroot/package/pciutils/pciutils.hash index da0358cac..4b13c7484 100644 --- a/buildroot/package/pciutils/pciutils.hash +++ b/buildroot/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5 pciutils-3.5.5.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb pciutils-3.7.0.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/pciutils/pciutils.mk b/buildroot/package/pciutils/pciutils.mk index 30d429e75..9b83b62b5 100644 --- a/buildroot/package/pciutils/pciutils.mk +++ b/buildroot/package/pciutils/pciutils.mk @@ -4,20 +4,19 @@ # ################################################################################ -PCIUTILS_VERSION = 3.5.5 +PCIUTILS_VERSION = 3.7.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES PCIUTILS_LICENSE = GPL-2.0+ PCIUTILS_LICENSE_FILES = COPYING PCIUTILS_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ HOST="$(KERNEL_ARCH)-linux" \ OPT="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - RANLIB=$(TARGET_RANLIB) \ - AR=$(TARGET_AR) \ - DNS=no + DNS=no \ + STRIP= ifeq ($(BR2_PACKAGE_HAS_UDEV),y) PCIUTILS_DEPENDENCIES += udev @@ -48,10 +47,6 @@ endif define PCIUTILS_CONFIGURE_CMDS $(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh - $(SED) 's/uname -s/echo Linux/' \ - -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \ - $(PCIUTILS_DIR)/lib/configure - $(SED) 's/^STRIP/#STRIP/' $(PCIUTILS_DIR)/Makefile endef define PCIUTILS_BUILD_CMDS diff --git a/buildroot/package/pcm-tools/pcm-tools.mk b/buildroot/package/pcm-tools/pcm-tools.mk index 6d5938f94..6de11c0da 100644 --- a/buildroot/package/pcm-tools/pcm-tools.mk +++ b/buildroot/package/pcm-tools/pcm-tools.mk @@ -33,4 +33,8 @@ define PCM_TOOLS_INSTALL_TARGET_CMDS $(PCM_TOOLS_INSTALL_PMU_QUERY) endef +define PCM_TOOLS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR) +endef + $(eval $(generic-package)) diff --git a/buildroot/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch b/buildroot/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch new file mode 100644 index 000000000..9d8e44a3a --- /dev/null +++ b/buildroot/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch @@ -0,0 +1,59 @@ +From 5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 Mon Sep 17 00:00:00 2001 +From: Zoltan Herczeg +Date: Tue, 3 Nov 2020 14:12:01 +0100 +Subject: [PATCH] Use the standard code path of sljit_emit_cmov on mips r6. + (#97) + +[Retrieved (and updated to fix paths) from: +https://github.com/zherczeg/sljit/commit/5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 +SVN commit: https://vcs.pcre.org/pcre2?view=revision&revision=1281] +Signed-off-by: Fabrice Fontaine +--- + sljit_src/sljitLir.c | 2 +- + sljit_src/sljitNativeMIPS_common.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/sljit/sljitLir.c b/src/sljit/sljitLir.c +index 4078613..d817c90 100644 +--- a/src/sljit/sljitLir.c ++++ b/src/sljit/sljitLir.c +@@ -2043,7 +2043,7 @@ static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *comp + #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \ + || (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC) \ + || (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) \ +- || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1)) ++ || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6)) + + static SLJIT_INLINE sljit_s32 sljit_emit_cmov_generic(struct sljit_compiler *compiler, sljit_s32 type, + sljit_s32 dst_reg, +diff --git a/src/sljit/sljitNativeMIPS_common.c b/src/sljit/sljitNativeMIPS_common.c +index 8b8c12a..ecf4dac 100644 +--- a/src/sljit/sljitNativeMIPS_common.c ++++ b/src/sljit/sljitNativeMIPS_common.c +@@ -2186,14 +2186,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil + sljit_s32 dst_reg, + sljit_s32 src, sljit_sw srcw) + { +-#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) ++#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) + sljit_ins ins; +-#endif /* SLJIT_MIPS_REV >= 1 */ ++#endif /* SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6 */ + + CHECK_ERROR(); + CHECK(check_sljit_emit_cmov(compiler, type, dst_reg, src, srcw)); + +-#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) ++#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) + + if (SLJIT_UNLIKELY(src & SLJIT_IMM)) { + #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) +@@ -2250,7 +2250,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil + + return push_inst(compiler, ins | S(src) | D(dst_reg), DR(dst_reg)); + +-#else /* SLJIT_MIPS_REV < 1 */ ++#else /* SLJIT_MIPS_REV < 1 || SLJIT_MIPS_REV >= 6 */ + return sljit_emit_cmov_generic(compiler, type, dst_reg, src, srcw); + #endif /* SLJIT_MIPS_REV >= 1 */ + } diff --git a/buildroot/package/pcre2/pcre2.hash b/buildroot/package/pcre2/pcre2.hash index 03f7eb32d..81313039f 100644 --- a/buildroot/package/pcre2/pcre2.hash +++ b/buildroot/package/pcre2/pcre2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.33.tar.bz2.sig -sha256 35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa pcre2-10.33.tar.bz2 +# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2.sig +sha256 9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613 pcre2-10.35.tar.bz2 # Locally computed -sha256 982293becea3f18eb4e3ce2145f66638e46d105a27b88418766caf321a684d03 LICENCE +sha256 9cb35e4fe442e49d1fbe9c7e07d9601ac959774b24e1884665a3e2f88b7f0831 LICENCE diff --git a/buildroot/package/pcre2/pcre2.mk b/buildroot/package/pcre2/pcre2.mk index 61f41e06e..ddb53280f 100644 --- a/buildroot/package/pcre2/pcre2.mk +++ b/buildroot/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.33 +PCRE2_VERSION = 10.35 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause diff --git a/buildroot/package/pcsc-lite/pcsc-lite.hash b/buildroot/package/pcsc-lite/pcsc-lite.hash index 5df6a9358..08bc85b15 100644 --- a/buildroot/package/pcsc-lite/pcsc-lite.hash +++ b/buildroot/package/pcsc-lite/pcsc-lite.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9 pcsc-lite-1.8.26.tar.bz2 -sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt +sha256 0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9 pcsc-lite-1.9.0.tar.bz2 +sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt diff --git a/buildroot/package/pcsc-lite/pcsc-lite.mk b/buildroot/package/pcsc-lite/pcsc-lite.mk index 96fa3f937..c411e9c7e 100644 --- a/buildroot/package/pcsc-lite/pcsc-lite.mk +++ b/buildroot/package/pcsc-lite/pcsc-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.8.26 +PCSC_LITE_VERSION = 1.9.0 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files PCSC_LITE_INSTALL_STAGING = YES diff --git a/buildroot/package/pdbg/pdbg.hash b/buildroot/package/pdbg/pdbg.hash index 486dff240..bc5772f06 100644 --- a/buildroot/package/pdbg/pdbg.hash +++ b/buildroot/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 10f701c4bb8557a35de166c4322d77fa64ddbdd1146141a88a3d530144545820 pdbg-2.4.tar.gz +sha256 622446c76adbb41ccbe0b1e3a84b704ef66cdd8429e1e6fedec80493c54801e7 pdbg-3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/pdbg/pdbg.mk b/buildroot/package/pdbg/pdbg.mk index 9977a126f..79e4f5c7c 100644 --- a/buildroot/package/pdbg/pdbg.mk +++ b/buildroot/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 2.4 +PDBG_VERSION = 3.1 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING diff --git a/buildroot/package/pdmenu/pdmenu.hash b/buildroot/package/pdmenu/pdmenu.hash index ab3a6660a..00c2569ad 100644 --- a/buildroot/package/pdmenu/pdmenu.hash +++ b/buildroot/package/pdmenu/pdmenu.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea pdmenu_1.3.4.tar.gz +sha256 dedd2a4a5719278b5e49041161990c2f20b5909818837542aaca01819f2c14eb pdmenu-1.3.6.tar.gz # License file hash, locally calculated -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 doc/COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 doc/COPYING diff --git a/buildroot/package/pdmenu/pdmenu.mk b/buildroot/package/pdmenu/pdmenu.mk index 783509585..2691a67ef 100644 --- a/buildroot/package/pdmenu/pdmenu.mk +++ b/buildroot/package/pdmenu/pdmenu.mk @@ -4,9 +4,8 @@ # ################################################################################ -PDMENU_VERSION = 1.3.4 -PDMENU_SOURCE = pdmenu_$(PDMENU_VERSION).tar.gz -PDMENU_SITE = http://snapshot.debian.org/archive/debian/20170828T160058Z/pool/main/p/pdmenu +PDMENU_VERSION = 1.3.6 +PDMENU_SITE = https://git.joeyh.name/index.cgi/pdmenu.git/snapshot PDMENU_LICENSE = GPL-2.0 PDMENU_LICENSE_FILES = doc/COPYING PDMENU_DEPENDENCIES = slang $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/perl-data-uuid/perl-data-uuid.hash b/buildroot/package/perl-data-uuid/perl-data-uuid.hash index 280567177..b2c862960 100644 --- a/buildroot/package/perl-data-uuid/perl-data-uuid.hash +++ b/buildroot/package/perl-data-uuid/perl-data-uuid.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 71510bbcce760c394591fca83a9b5e6d Data-UUID-1.224.tar.gz -sha256 c958c17502bbef5eccf40c040874895747f7f9b9f9e5192c18688370981bf47c Data-UUID-1.224.tar.gz +md5 13468e0fb65a0b5ce27b8628cb2f0109 Data-UUID-1.226.tar.gz +sha256 093d57ffa0d411a94bafafae495697db26f5c9d0277198fe3f7cf2be22996453 Data-UUID-1.226.tar.gz # computed by scancpan -sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE +sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE diff --git a/buildroot/package/perl-data-uuid/perl-data-uuid.mk b/buildroot/package/perl-data-uuid/perl-data-uuid.mk index 00dccdb7e..93060964b 100644 --- a/buildroot/package/perl-data-uuid/perl-data-uuid.mk +++ b/buildroot/package/perl-data-uuid/perl-data-uuid.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_UUID_VERSION = 1.224 +PERL_DATA_UUID_VERSION = 1.226 PERL_DATA_UUID_SOURCE = Data-UUID-$(PERL_DATA_UUID_VERSION).tar.gz PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS # The license is documented at diff --git a/buildroot/package/perl-date-manip/perl-date-manip.hash b/buildroot/package/perl-date-manip/perl-date-manip.hash index bb2e6efe7..207c59208 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.hash +++ b/buildroot/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a3b2c1129f02cc5ce5de59d506afab1a Date-Manip-6.79.tar.gz -sha256 71a8c42ce4edbd46a3ca2a17a7218ceed958cd7ad0dfeb79389f23d0f466943a Date-Manip-6.79.tar.gz +md5 13c7600ff8a33d585b753874df85e4ea Date-Manip-6.82.tar.gz +sha256 fa96bcf94c6b4b7d3333f073f5d0faad59f546e5aec13ac01718f2e6ef14672a Date-Manip-6.82.tar.gz # computed by scancpan -sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE +sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/buildroot/package/perl-date-manip/perl-date-manip.mk b/buildroot/package/perl-date-manip/perl-date-manip.mk index d930ee8c9..a54a53a1f 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.mk +++ b/buildroot/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.79 +PERL_DATE_MANIP_VERSION = 6.82 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-dbi/perl-dbi.hash b/buildroot/package/perl-dbi/perl-dbi.hash index 100d07038..707accf01 100644 --- a/buildroot/package/perl-dbi/perl-dbi.hash +++ b/buildroot/package/perl-dbi/perl-dbi.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f2ba18b5cea1c8cb322a62be0a847f3d DBI-1.642.tar.gz -sha256 3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d DBI-1.642.tar.gz +md5 352f80b1e23769c116082a90905d7398 DBI-1.643.tar.gz +sha256 8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa DBI-1.643.tar.gz # computed by scancpan sha256 33453c8b0d8d474a42669ac702a13c20f39c91a34b3df4e6ca778fc2f0f711c7 LICENSE diff --git a/buildroot/package/perl-dbi/perl-dbi.mk b/buildroot/package/perl-dbi/perl-dbi.mk index 3b824d748..482d3d176 100644 --- a/buildroot/package/perl-dbi/perl-dbi.mk +++ b/buildroot/package/perl-dbi/perl-dbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DBI_VERSION = 1.642 +PERL_DBI_VERSION = 1.643 PERL_DBI_SOURCE = DBI-$(PERL_DBI_VERSION).tar.gz PERL_DBI_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TI/TIMB PERL_DBI_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash index 1d36c63a1..c714ef902 100644 --- a/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash +++ b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e33f25f7556f5f5264a92cb9870d0eac Exporter-Tiny-1.002001.tar.gz -sha256 a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d Exporter-Tiny-1.002001.tar.gz +md5 485897322a2514b4d6ca90b2daacb7cd Exporter-Tiny-1.002002.tar.gz +sha256 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 Exporter-Tiny-1.002002.tar.gz # computed by scancpan -sha256 a109768ea1493cc7555d4381d6178d3cfc1fe52adc5d63d3831a2697d9fc90e6 COPYRIGHT -sha256 c614dadb36b02257ab492e3d4341e52f3f03fe8147cafd2b7da03b3b5c0361e9 LICENSE +sha256 f4cb223c8ac37d6ccd0e78b2892ca54a48a6adbe6a271c3c17c0226646297e66 COPYRIGHT +sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE diff --git a/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk index 1ba1a5ac7..c7abfbae2 100644 --- a/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk +++ b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_EXPORTER_TINY_VERSION = 1.002001 +PERL_EXPORTER_TINY_VERSION = 1.002002 PERL_EXPORTER_TINY_SOURCE = Exporter-Tiny-$(PERL_EXPORTER_TINY_VERSION).tar.gz PERL_EXPORTER_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_EXPORTER_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-file-listing/perl-file-listing.hash b/buildroot/package/perl-file-listing/perl-file-listing.hash index 6189948a1..5496646d2 100644 --- a/buildroot/package/perl-file-listing/perl-file-listing.hash +++ b/buildroot/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 83f636b477741f3a014585bb9cc079a6 File-Listing-6.04.tar.gz -sha256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5 File-Listing-6.04.tar.gz +md5 6f298b96fdc072fbd0e0c2890a70ab2e File-Listing-6.11.tar.gz +sha256 c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e File-Listing-6.11.tar.gz # computed by scancpan -sha256 9ee526d1593c48e65141aea5567f0cdf156eb57e68448cd91584c7aae92bd787 README +sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE diff --git a/buildroot/package/perl-file-listing/perl-file-listing.mk b/buildroot/package/perl-file-listing/perl-file-listing.mk index 9f3ca9516..f8d449ba3 100644 --- a/buildroot/package/perl-file-listing/perl-file-listing.mk +++ b/buildroot/package/perl-file-listing/perl-file-listing.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.04 +PERL_FILE_LISTING_VERSION = 6.11 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz -PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ -PERL_FILE_LISTING_LICENSE_FILES = README +PERL_FILE_LISTING_LICENSE_FILES = LICENSE PERL_FILE_LISTING_DISTNAME = File-Listing $(eval $(perl-package)) diff --git a/buildroot/package/perl-file-sharedir/perl-file-sharedir.hash b/buildroot/package/perl-file-sharedir/perl-file-sharedir.hash index e0a496655..413678d6a 100644 --- a/buildroot/package/perl-file-sharedir/perl-file-sharedir.hash +++ b/buildroot/package/perl-file-sharedir/perl-file-sharedir.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f2a0eee9f04c93753dd56437175e5bda File-ShareDir-1.116.tar.gz -sha256 59d90bfdf98c4656ff4173e62954ea8cf0de66565e35d108ecd7050596cb8328 File-ShareDir-1.116.tar.gz +md5 0084f730f4e3d4d89703d92b3ea82f54 File-ShareDir-1.118.tar.gz +sha256 3bb2a20ba35df958dc0a4f2306fc05d903d8b8c4de3c8beefce17739d281c958 File-ShareDir-1.118.tar.gz # computed by scancpan -sha256 db57983ce0a3bce54900b5a3a3a69e9a593e7b07d0f58dd9f87ac9b016ff4a6b LICENSE +sha256 db57983ce0a3bce54900b5a3a3a69e9a593e7b07d0f58dd9f87ac9b016ff4a6b LICENSE diff --git a/buildroot/package/perl-file-sharedir/perl-file-sharedir.mk b/buildroot/package/perl-file-sharedir/perl-file-sharedir.mk index d907f3b06..0121b5634 100644 --- a/buildroot/package/perl-file-sharedir/perl-file-sharedir.mk +++ b/buildroot/package/perl-file-sharedir/perl-file-sharedir.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_SHAREDIR_VERSION = 1.116 +PERL_FILE_SHAREDIR_VERSION = 1.118 PERL_FILE_SHAREDIR_SOURCE = File-ShareDir-$(PERL_FILE_SHAREDIR_VERSION).tar.gz PERL_FILE_SHAREDIR_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK PERL_FILE_SHAREDIR_DEPENDENCIES = host-perl-file-sharedir-install diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.hash b/buildroot/package/perl-file-slurp/perl-file-slurp.hash index 5fc123851..f3cc579f8 100644 --- a/buildroot/package/perl-file-slurp/perl-file-slurp.hash +++ b/buildroot/package/perl-file-slurp/perl-file-slurp.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 603483824746ab4b1958bf7cf956c57a File-Slurp-9999.29.tar.gz -sha256 0e6e47e0bba639e37e51fdc7a43b187cd90ac642e4baa13a7185bc6c223e19c7 File-Slurp-9999.29.tar.gz +md5 a10ddfcbe153fc8d0076936ee83b98ed File-Slurp-9999.32.tar.gz +sha256 4c3c21992a9d42be3a79dd74a3c83d27d38057269d65509a2f555ea0fb2bc5b0 File-Slurp-9999.32.tar.gz # computed by scancpan -sha256 2281c2e5a690ac7f227fd9934b3d0b9abc419fd514f001d421f2f854203d92b4 README.md +sha256 d1be945657536c93caf481b9f3c73fd1952ef66388c664e29021ab91d4fe47e8 README.md diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.mk b/buildroot/package/perl-file-slurp/perl-file-slurp.mk index c1a64a7b2..0d4ab9403 100644 --- a/buildroot/package/perl-file-slurp/perl-file-slurp.mk +++ b/buildroot/package/perl-file-slurp/perl-file-slurp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_SLURP_VERSION = 9999.29 +PERL_FILE_SLURP_VERSION = 9999.32 PERL_FILE_SLURP_SOURCE = File-Slurp-$(PERL_FILE_SLURP_VERSION).tar.gz PERL_FILE_SLURP_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPOEIRAB PERL_FILE_SLURP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-file-util/perl-file-util.hash b/buildroot/package/perl-file-util/perl-file-util.hash index 0915494f7..7e529e03e 100644 --- a/buildroot/package/perl-file-util/perl-file-util.hash +++ b/buildroot/package/perl-file-util/perl-file-util.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 5706487ecf0daae885f709914915e832 File-Util-4.161950.tar.gz -sha256 88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee File-Util-4.161950.tar.gz +md5 093fe77c4658f98375c7f6cc68694948 File-Util-4.201720.tar.gz +sha256 d4491021850d5c5cbd702c7e4744858079841d2fa93f1c2d09ddc9a7863608df File-Util-4.201720.tar.gz # computed by scancpan -sha256 5f3732812570654ba911e45ec4e5f7353f4b63747ebfc506c543e8fb1ccf797f COPYING -sha256 48428fd07c402ea82d3556753ca936c7030f0d7a6a93c3ef09423c36820ffb91 LICENSE +sha256 5f3732812570654ba911e45ec4e5f7353f4b63747ebfc506c543e8fb1ccf797f COPYING +sha256 996b77ca668f16a443ed14758fce492bddd9f55fe831ee8353274c89191b8544 LICENSE diff --git a/buildroot/package/perl-file-util/perl-file-util.mk b/buildroot/package/perl-file-util/perl-file-util.mk index 5437bc11c..4348b0e95 100644 --- a/buildroot/package/perl-file-util/perl-file-util.mk +++ b/buildroot/package/perl-file-util/perl-file-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_UTIL_VERSION = 4.161950 +PERL_FILE_UTIL_VERSION = 4.201720 PERL_FILE_UTIL_SOURCE = File-Util-$(PERL_FILE_UTIL_VERSION).tar.gz PERL_FILE_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOMMY PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build diff --git a/buildroot/package/perl-gd/perl-gd.hash b/buildroot/package/perl-gd/perl-gd.hash index 5895cc345..780b1d1e2 100644 --- a/buildroot/package/perl-gd/perl-gd.hash +++ b/buildroot/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1e2534e1d0db57d6aad438f15ca63253 GD-2.71.tar.gz -sha256 451be4873b2ad7261cc5679698cd9d2e84dbdde4309971869fc7734b569b7ac7 GD-2.71.tar.gz +md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz +sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz # computed by scancpan -sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE +sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/buildroot/package/perl-gd/perl-gd.mk b/buildroot/package/perl-gd/perl-gd.mk index d52ba1cce..d34328f0d 100644 --- a/buildroot/package/perl-gd/perl-gd.mk +++ b/buildroot/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.71 +PERL_GD_VERSION = 2.73 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = zlib libpng freetype gd diff --git a/buildroot/package/perl-html-parser/perl-html-parser.hash b/buildroot/package/perl-html-parser/perl-html-parser.hash index f06ec034b..021ef26c6 100644 --- a/buildroot/package/perl-html-parser/perl-html-parser.hash +++ b/buildroot/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb7505e5f626913350df9dd4a03d54a8 HTML-Parser-3.72.tar.gz -sha256 ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b HTML-Parser-3.72.tar.gz +md5 65bf65aa8b34b35443e094010f991406 HTML-Parser-3.75.tar.gz +sha256 ac6b5e25a8df7af54885201e91c45fb9ab6744c08cedc1a38fcc7d95d21193a9 HTML-Parser-3.75.tar.gz # computed by scancpan -sha256 663867028ae22c6f2fabab11238f65f1bf8dd789233b844bead5f6d22220d160 README +sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE diff --git a/buildroot/package/perl-html-parser/perl-html-parser.mk b/buildroot/package/perl-html-parser/perl-html-parser.mk index 6e5a81bb7..93e4f6745 100644 --- a/buildroot/package/perl-html-parser/perl-html-parser.mk +++ b/buildroot/package/perl-html-parser/perl-html-parser.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.72 +PERL_HTML_PARSER_VERSION = 3.75 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz -PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPOEIRAB PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ -PERL_HTML_PARSER_LICENSE_FILES = README +PERL_HTML_PARSER_LICENSE_FILES = LICENSE PERL_HTML_PARSER_DISTNAME = HTML-Parser $(eval $(perl-package)) diff --git a/buildroot/package/perl-http-daemon/perl-http-daemon.hash b/buildroot/package/perl-http-daemon/perl-http-daemon.hash index b2e5dbceb..f8272a4fc 100644 --- a/buildroot/package/perl-http-daemon/perl-http-daemon.hash +++ b/buildroot/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c5d6e1d84f7f09770d9ce52d4bddef59 HTTP-Daemon-6.06.tar.gz -sha256 fc03a161b54553f766457a4267e7066767f54ad01cacfe9a91d7caa2a0319bad HTTP-Daemon-6.06.tar.gz +md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz +sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE diff --git a/buildroot/package/perl-http-daemon/perl-http-daemon.mk b/buildroot/package/perl-http-daemon/perl-http-daemon.mk index 3fb89db92..e47507262 100644 --- a/buildroot/package/perl-http-daemon/perl-http-daemon.mk +++ b/buildroot/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.06 +PERL_HTTP_DAEMON_VERSION = 6.12 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash index 6e0dccba9..882bf0a3d 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d8256c95119a3ddc6f4a88e59b67f0ec HTTP-Entity-Parser-0.22.tar.gz -sha256 93fe1cf2a2b4e6834bf0c1abd0d3bf28c614e8582ff10e6e0426f46a81eed6c8 HTTP-Entity-Parser-0.22.tar.gz +md5 b5ead58775c2f151f2174651807fdf2d HTTP-Entity-Parser-0.24.tar.gz +sha256 f68e0fc87150cb9241ac23d7226fc2a35324d2e8990830c1e2a7203244f1e612 HTTP-Entity-Parser-0.24.tar.gz # computed by scancpan -sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE +sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk index 1638d5b1d..0b09ea41c 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_ENTITY_PARSER_VERSION = 0.22 +PERL_HTTP_ENTITY_PARSER_VERSION = 0.24 PERL_HTTP_ENTITY_PARSER_SOURCE = HTTP-Entity-Parser-$(PERL_HTTP_ENTITY_PARSER_VERSION).tar.gz PERL_HTTP_ENTITY_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_HTTP_ENTITY_PARSER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-http-message/perl-http-message.hash b/buildroot/package/perl-http-message/perl-http-message.hash index 78fda135c..989d7efd0 100644 --- a/buildroot/package/perl-http-message/perl-http-message.hash +++ b/buildroot/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9fd400da24e1784f85d32de1705fc795 HTTP-Message-6.18.tar.gz -sha256 d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112 HTTP-Message-6.18.tar.gz +md5 3b4b64fff4885429b997390564521db0 HTTP-Message-6.26.tar.gz +sha256 6ce6c359de75c3bb86696a390189b485ec93e3ffc55326b6d044fa900f1725e1 HTTP-Message-6.26.tar.gz # computed by scancpan -sha256 66f0d1e8593d5512d7a8cd90549a976aaae97e4fa9b6097249b3682f14747a6b LICENSE +sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE diff --git a/buildroot/package/perl-http-message/perl-http-message.mk b/buildroot/package/perl-http-message/perl-http-message.mk index becae4d17..114fc8000 100644 --- a/buildroot/package/perl-http-message/perl-http-message.mk +++ b/buildroot/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.18 +PERL_HTTP_MESSAGE_VERSION = 6.26 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-i18n/Config.in b/buildroot/package/perl-i18n/Config.in new file mode 100644 index 000000000..d50456396 --- /dev/null +++ b/buildroot/package/perl-i18n/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PERL_I18N + bool "perl-i18n" + select BR2_PACKAGE_PERL_LOCALE_MAKETEXT_LEXICON # runtime + help + Perl Internationalization Pragma. + + https://metacpan.org/release/i18n diff --git a/buildroot/package/perl-i18n/perl-i18n.hash b/buildroot/package/perl-i18n/perl-i18n.hash new file mode 100644 index 000000000..f6ef8931a --- /dev/null +++ b/buildroot/package/perl-i18n/perl-i18n.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 4c3004474d6ff3554f82b52f92b3b1e1 i18n-0.13.tar.gz +sha256 2dbc3e4e25b41578cd83508fe011209e8f3c2b259fa4b5b6eafaac0d6ce4b457 i18n-0.13.tar.gz + +# computed by scancpan +sha256 4755e5f2096e8ef0494f1565bf5a028a8fb4eeb5c1250e7d30948d1ed13c5ad7 README diff --git a/buildroot/package/perl-i18n/perl-i18n.mk b/buildroot/package/perl-i18n/perl-i18n.mk new file mode 100644 index 000000000..04d75c214 --- /dev/null +++ b/buildroot/package/perl-i18n/perl-i18n.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-i18n +# +################################################################################ + +PERL_I18N_VERSION = 0.13 +PERL_I18N_SOURCE = i18n-$(PERL_I18N_VERSION).tar.gz +PERL_I18N_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AU/AUDREYT +PERL_I18N_LICENSE = MIT +PERL_I18N_LICENSE_FILES = README +PERL_I18N_DISTNAME = i18n + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-io-html/perl-io-html.hash b/buildroot/package/perl-io-html/perl-io-html.hash index d8d865e8d..4067d2faa 100644 --- a/buildroot/package/perl-io-html/perl-io-html.hash +++ b/buildroot/package/perl-io-html/perl-io-html.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3f8958718844dc96b9f6946f21d70d22 IO-HTML-1.001.tar.gz -sha256 ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 IO-HTML-1.001.tar.gz +md5 04bbe363686fd19bfb4cc0ed775e3d03 IO-HTML-1.004.tar.gz +sha256 c87b2df59463bbf2c39596773dfb5c03bde0f7e1051af339f963f58c1cbd8bf5 IO-HTML-1.004.tar.gz # computed by scancpan -sha256 b386f0545c17589141d98810dd46aa1c4a14d7028cae6bdd807969639ea7405e LICENSE +sha256 669fdd41b60ef6169a975b87a5fe35c50e81b9efc8f96b2459f4fbb238079d84 LICENSE diff --git a/buildroot/package/perl-io-html/perl-io-html.mk b/buildroot/package/perl-io-html/perl-io-html.mk index ae8c6405a..934ac60cb 100644 --- a/buildroot/package/perl-io-html/perl-io-html.mk +++ b/buildroot/package/perl-io-html/perl-io-html.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_HTML_VERSION = 1.001 +PERL_IO_HTML_VERSION = 1.004 PERL_IO_HTML_SOURCE = IO-HTML-$(PERL_IO_HTML_VERSION).tar.gz PERL_IO_HTML_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CJ/CJM PERL_IO_HTML_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index de9b28abe..2180b6be3 100644 --- a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ecf96ce2ff9e04a03a2d101c76ce1020 IO-Socket-SSL-2.066.tar.gz -sha256 0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd IO-Socket-SSL-2.066.tar.gz +md5 4230c829c8875889848093b2b46a7284 IO-Socket-SSL-2.068.tar.gz +sha256 4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9 IO-Socket-SSL-2.068.tar.gz # computed by scancpan -sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README +sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index 59c340759..b6c0ceb37 100644 --- a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.066 +PERL_IO_SOCKET_SSL_VERSION = 2.068 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash b/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash index c8bf172aa..3f1a99c38 100644 --- a/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash +++ b/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 db61fb5515f8e2f19709a317e26dde42 JSON-MaybeXS-1.004000.tar.gz -sha256 59bda02e8f4474c73913723c608b539e2452e16c54ed7f0150c01aad06e0a126 JSON-MaybeXS-1.004000.tar.gz +md5 2c40209b38b7a569b3bfc4d88e47d98c JSON-MaybeXS-1.004002.tar.gz +sha256 3b8e2fdc3b36d0c5edbc78121840dced63798ad49cabcf875d5c5e32336d77b5 JSON-MaybeXS-1.004002.tar.gz # computed by scancpan -sha256 d972e00126c5337e88d81d64fc349a3f4c54841075f4180a1145441d30c86f83 README +sha256 0f2d6b537f7a735c981511875d832bc8ff767bf97d62848cf0bada964e40aadd LICENSE diff --git a/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk b/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk index cb6518b59..bb11cd3a2 100644 --- a/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk +++ b/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_JSON_MAYBEXS_VERSION = 1.004000 +PERL_JSON_MAYBEXS_VERSION = 1.004002 PERL_JSON_MAYBEXS_SOURCE = JSON-MaybeXS-$(PERL_JSON_MAYBEXS_VERSION).tar.gz -PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG +PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_JSON_MAYBEXS_LICENSE = Artistic or GPL-1.0+ -PERL_JSON_MAYBEXS_LICENSE_FILES = README +PERL_JSON_MAYBEXS_LICENSE_FILES = LICENSE PERL_JSON_MAYBEXS_DISTNAME = JSON-MaybeXS $(eval $(perl-package)) diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash index bdd3df7db..58cb2e847 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e64d87052eb51bb55627c756ccdfe233 libwww-perl-6.43.tar.gz -sha256 e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d libwww-perl-6.43.tar.gz +md5 86601652f46b924a26acecad0fe5c110 libwww-perl-6.49.tar.gz +sha256 c3e4d0deae254c8b8fdc13e14b7b4b893594c947c43f4b5401e06322c96360a6 libwww-perl-6.49.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk index dbc77db08..d749b1b60 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.43 +PERL_LIBWWW_PERL_VERSION = 6.49 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-locale-maketext-lexicon/Config.in b/buildroot/package/perl-locale-maketext-lexicon/Config.in new file mode 100644 index 000000000..4aed7b63b --- /dev/null +++ b/buildroot/package/perl-locale-maketext-lexicon/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_LOCALE_MAKETEXT_LEXICON + bool "perl-locale-maketext-lexicon" + help + Use other catalog formats in Maketext. + + http://search.cpan.org/dist/Locale-Maketext-Lexicon diff --git a/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash b/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash new file mode 100644 index 000000000..683e8c7d1 --- /dev/null +++ b/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 51acf0cb00cc01a2c8f560d74dd6c593 Locale-Maketext-Lexicon-1.00.tar.gz +sha256 b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c Locale-Maketext-Lexicon-1.00.tar.gz + +# computed by scancpan +sha256 af693c8c99bee68656f09328c97d50b24eb742ae4473f57cdafaa90691807fbe LICENSE diff --git a/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.mk b/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.mk new file mode 100644 index 000000000..64b37f920 --- /dev/null +++ b/buildroot/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-locale-maketext-lexicon +# +################################################################################ + +PERL_LOCALE_MAKETEXT_LEXICON_VERSION = 1.00 +PERL_LOCALE_MAKETEXT_LEXICON_SOURCE = Locale-Maketext-Lexicon-$(PERL_LOCALE_MAKETEXT_LEXICON_VERSION).tar.gz +PERL_LOCALE_MAKETEXT_LEXICON_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DR/DRTECH +PERL_LOCALE_MAKETEXT_LEXICON_LICENSE = MIT +PERL_LOCALE_MAKETEXT_LEXICON_LICENSE_FILES = LICENSE +PERL_LOCALE_MAKETEXT_LEXICON_DISTNAME = Locale-Maketext-Lexicon + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-lwp-protocol-https/Config.in b/buildroot/package/perl-lwp-protocol-https/Config.in new file mode 100644 index 000000000..c4a7b306b --- /dev/null +++ b/buildroot/package/perl-lwp-protocol-https/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PERL_LWP_PROTOCOL_HTTPS + bool "perl-lwp-protocol-https" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PERL_IO_SOCKET_SSL # runtime + select BR2_PACKAGE_PERL_MOZILLA_CA # runtime + select BR2_PACKAGE_PERL_NET_HTTP # runtime + select BR2_PACKAGE_PERL_LIBWWW_PERL # runtime + help + Provide https support for LWP::UserAgent. + + https://metacpan.org/release/LWP-Protocol-https + +comment "perl-lwp-protocol-https needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash new file mode 100644 index 000000000..680e24f60 --- /dev/null +++ b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 6d497ec74f3cf88ad41898fcb8b01145 LWP-Protocol-https-6.09.tar.gz +sha256 16cfe1a511690b066db5667c8714802ee2b9c5d28a31a3e7bd36fbc70a3af592 LWP-Protocol-https-6.09.tar.gz + +# computed by scancpan +sha256 294e73f9bd40ea600e9478cd57489a7da72558a83c6a66f37a82e4e0d5a706d9 LICENSE diff --git a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk new file mode 100644 index 000000000..0c36e7aea --- /dev/null +++ b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-lwp-protocol-https +# +################################################################################ + +PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.09 +PERL_LWP_PROTOCOL_HTTPS_SOURCE = LWP-Protocol-https-$(PERL_LWP_PROTOCOL_HTTPS_VERSION).tar.gz +PERL_LWP_PROTOCOL_HTTPS_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS +PERL_LWP_PROTOCOL_HTTPS_LICENSE = Artistic or GPL-1.0+ +PERL_LWP_PROTOCOL_HTTPS_LICENSE_FILES = LICENSE +PERL_LWP_PROTOCOL_HTTPS_DISTNAME = LWP-Protocol-https + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash b/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash index 86a638479..e94adfc6e 100644 --- a/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9b03bcd334cbf22a93fd94af9935e11b Mail-DKIM-0.58.tar.gz -sha256 0a43a42b528a435f9e393171bf8ca1dc0cb54092f1d120d6299e615c0c55f331 Mail-DKIM-0.58.tar.gz +md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz +sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz + +# computed by scancpan +sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk b/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk index d331fe9d6..e67bf5ee1 100644 --- a/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,9 +4,11 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 0.58 +PERL_MAIL_DKIM_VERSION = 1.20200824 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW +PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ +PERL_MAIL_DKIM_LICENSE_FILES = LICENSE PERL_MAIL_DKIM_DISTNAME = Mail-DKIM $(eval $(perl-package)) diff --git a/buildroot/package/perl-module-build/perl-module-build.hash b/buildroot/package/perl-module-build/perl-module-build.hash index 2af1a1ac8..aad0b78e3 100644 --- a/buildroot/package/perl-module-build/perl-module-build.hash +++ b/buildroot/package/perl-module-build/perl-module-build.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1447d9e02e63f7a1643986789a8f1ba9 Module-Build-0.4229.tar.gz -sha256 1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18 Module-Build-0.4229.tar.gz +md5 066b193e461d7dfe1eca17a139353001 Module-Build-0.4231.tar.gz +sha256 7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717 Module-Build-0.4231.tar.gz # computed by scancpan sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE diff --git a/buildroot/package/perl-module-build/perl-module-build.mk b/buildroot/package/perl-module-build/perl-module-build.mk index a8a01f6ba..f5cab3689 100644 --- a/buildroot/package/perl-module-build/perl-module-build.mk +++ b/buildroot/package/perl-module-build/perl-module-build.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_VERSION = 0.4229 +PERL_MODULE_BUILD_VERSION = 0.4231 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-mojolicious-plugin-authorization/Config.in b/buildroot/package/perl-mojolicious-plugin-authorization/Config.in new file mode 100644 index 000000000..87976cbbe --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-authorization/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION + bool "perl-mojolicious-plugin-authorization" + select BR2_PACKAGE_PERL_MOJOLICIOUS # runtime + help + A plugin to make authorization a bit easier. + + https://metacpan.org/module/Mojolicious::Plugin::Authorization diff --git a/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash b/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash new file mode 100644 index 000000000..c55eefe2f --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 9c009599cf397e3eacf5d7cd0dec45b8 Mojolicious-Plugin-Authorization-1.05.tar.gz +sha256 87f84092d5698595ad0d01e745eca1d6affd1f3d662786f39f3583c54ffed0e3 Mojolicious-Plugin-Authorization-1.05.tar.gz + +# computed by scancpan +sha256 fd9632faca5a3d6af4cb9cf776514de87d2b34bff3a6cf06c23eea0f9cc3ab06 LICENSE diff --git a/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk b/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk new file mode 100644 index 000000000..3fcee08a4 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-authorization/perl-mojolicious-plugin-authorization.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perl-mojolicious-plugin-authorization +# +################################################################################ + +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_VERSION = 1.05 +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_SOURCE = Mojolicious-Plugin-Authorization-$(PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_VERSION).tar.gz +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_SITE = $(BR2_CPAN_MIRROR)/authors/id/B/BY/BYTEROCK +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_DEPENDENCIES = host-perl-module-build +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_LICENSE = Artistic or GPL-1.0+ +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_LICENSE_FILES = LICENSE +PERL_MOJOLICIOUS_PLUGIN_AUTHORIZATION_DISTNAME = Mojolicious-Plugin-Authorization + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mojolicious-plugin-cspheader/Config.in b/buildroot/package/perl-mojolicious-plugin-cspheader/Config.in new file mode 100644 index 000000000..841b30947 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-cspheader/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_CSPHEADER + bool "perl-mojolicious-plugin-cspheader" + select BR2_PACKAGE_PERL_MOJOLICIOUS # runtime + help + Mojolicious Plugin to add Content-Security-Policy header to + every HTTP response. + + https://metacpan.org/release/Mojolicious-Plugin-CSPHeader diff --git a/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash b/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash new file mode 100644 index 000000000..d0f9dc3ab --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 3d1b01c393e7ed576e4b503d26a88a3e Mojolicious-Plugin-CSPHeader-0.06.tar.gz +sha256 0523a170af6620dab5b746725f171a138b6cff3d2d84e1a30af891741550f4a7 Mojolicious-Plugin-CSPHeader-0.06.tar.gz + +# computed by scancpan +sha256 4bb36edd2bcafef11ca615f69607953a31ee05ae172b69990aee317e95653456 LICENSE diff --git a/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.mk b/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.mk new file mode 100644 index 000000000..438d6d517 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-mojolicious-plugin-cspheader +# +################################################################################ + +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_VERSION = 0.06 +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_SOURCE = Mojolicious-Plugin-CSPHeader-$(PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_VERSION).tar.gz +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDIDRY +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_LICENSE = Artistic or GPL-1.0+ +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_LICENSE_FILES = LICENSE +PERL_MOJOLICIOUS_PLUGIN_CSPHEADER_DISTNAME = Mojolicious-Plugin-CSPHeader + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mojolicious-plugin-i18n/Config.in b/buildroot/package/perl-mojolicious-plugin-i18n/Config.in new file mode 100644 index 000000000..cbe11451c --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-i18n/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_I18N + bool "perl-mojolicious-plugin-i18n" + select BR2_PACKAGE_PERL_MOJOLICIOUS # runtime + help + Internationalization Plugin for Mojolicious. + + https://metacpan.org/release/Mojolicious-Plugin-I18N diff --git a/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash b/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash new file mode 100644 index 000000000..ed4bc2074 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 4002f7a7da4c90973ad6eedfb0fcfa16 Mojolicious-Plugin-I18N-1.6.tar.gz +sha256 32fb5ef8037d954b7ecebef5c1b2b24b420abd829702312f4ad42794f52b514d Mojolicious-Plugin-I18N-1.6.tar.gz + +# manually computed +sha256 82b05028033057b388b0040a3b5590a1c51168fe3b9899bffdb5ef7962c4eb47 README.pod diff --git a/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.mk b/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.mk new file mode 100644 index 000000000..11d41ac55 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perl-mojolicious-plugin-i18n +# +################################################################################ + +PERL_MOJOLICIOUS_PLUGIN_I18N_VERSION = 1.6 +PERL_MOJOLICIOUS_PLUGIN_I18N_SOURCE = Mojolicious-Plugin-I18N-$(PERL_MOJOLICIOUS_PLUGIN_I18N_VERSION).tar.gz +PERL_MOJOLICIOUS_PLUGIN_I18N_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHARIFULN +PERL_MOJOLICIOUS_PLUGIN_I18N_DEPENDENCIES = host-perl-module-build +PERL_MOJOLICIOUS_PLUGIN_I18N_LICENSE = Artistic-2.0 +PERL_MOJOLICIOUS_PLUGIN_I18N_LICENSE_FILES = README.pod +PERL_MOJOLICIOUS_PLUGIN_I18N_DISTNAME = Mojolicious-Plugin-I18N + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mojolicious-plugin-securityheader/Config.in b/buildroot/package/perl-mojolicious-plugin-securityheader/Config.in new file mode 100644 index 000000000..35e8e122a --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-securityheader/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER + bool "perl-mojolicious-plugin-securityheader" + select BR2_PACKAGE_PERL_MOJOLICIOUS # runtime + help + Mojolicious Plugin. + + http://github.com/reneeb/Mojolicious-Plugin-SecurityHeader diff --git a/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash b/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash new file mode 100644 index 000000000..b8a20bdd6 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 38cf59258547ac866577db2d43632f30 Mojolicious-Plugin-SecurityHeader-0.07.tar.gz +sha256 940474eaf7a415e5117b004387862473612e079a413590db1eb9c85d17a6648f Mojolicious-Plugin-SecurityHeader-0.07.tar.gz + +# computed by scancpan +sha256 0c38e4629cc9eee869217d62ad765e581e54958596672046a62dfa4cfd87bb09 LICENSE diff --git a/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.mk b/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.mk new file mode 100644 index 000000000..1f287f6f6 --- /dev/null +++ b/buildroot/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-mojolicious-plugin-securityheader +# +################################################################################ + +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_VERSION = 0.07 +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_SOURCE = Mojolicious-Plugin-SecurityHeader-$(PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_VERSION).tar.gz +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/RENEEB +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_LICENSE = Artistic-2.0 +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_LICENSE_FILES = LICENSE +PERL_MOJOLICIOUS_PLUGIN_SECURITYHEADER_DISTNAME = Mojolicious-Plugin-SecurityHeader + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.hash b/buildroot/package/perl-mojolicious/perl-mojolicious.hash index f409e484d..65a3b641a 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.hash +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c714aae5e1c3914efc0352531718c473 Mojolicious-8.32.tar.gz -sha256 503450e76b5d114c79a01b76a3c661c8138c5729062582a88e307a4d46f9de85 Mojolicious-8.32.tar.gz +md5 7033bd9404776d92b48c0f86b81a0983 Mojolicious-8.63.tar.gz +sha256 c62cc22d8a43982f6f81d47da6875f77ba6fbaa56760251857be4d13390085db Mojolicious-8.63.tar.gz # computed by scancpan -sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE +sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.mk b/buildroot/package/perl-mojolicious/perl-mojolicious.mk index 62281d7de..049783ff3 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.mk +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 8.32 +PERL_MOJOLICIOUS_VERSION = 8.63 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 diff --git a/buildroot/package/perl-moo/perl-moo.hash b/buildroot/package/perl-moo/perl-moo.hash index 21bcc6cca..00e8117ad 100644 --- a/buildroot/package/perl-moo/perl-moo.hash +++ b/buildroot/package/perl-moo/perl-moo.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 53af7e7849492a8e3994ee379d12e348 Moo-2.003006.tar.gz -sha256 bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472 Moo-2.003006.tar.gz +md5 e542104553d616b15631b5c66ccee904 Moo-2.004000.tar.gz +sha256 323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834 Moo-2.004000.tar.gz # computed by scancpan -sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE +sha256 0f2d6b537f7a735c981511875d832bc8ff767bf97d62848cf0bada964e40aadd LICENSE diff --git a/buildroot/package/perl-moo/perl-moo.mk b/buildroot/package/perl-moo/perl-moo.mk index 691377640..fce88f6ad 100644 --- a/buildroot/package/perl-moo/perl-moo.mk +++ b/buildroot/package/perl-moo/perl-moo.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOO_VERSION = 2.003006 +PERL_MOO_VERSION = 2.004000 PERL_MOO_SOURCE = Moo-$(PERL_MOO_VERSION).tar.gz PERL_MOO_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOO_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-mozilla-ca/Config.in b/buildroot/package/perl-mozilla-ca/Config.in new file mode 100644 index 000000000..733d07e1f --- /dev/null +++ b/buildroot/package/perl-mozilla-ca/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_MOZILLA_CA + bool "perl-mozilla-ca" + help + Mozilla's CA cert bundle in PEM format. + + https://metacpan.org/release/Mozilla-CA diff --git a/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.hash b/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.hash new file mode 100644 index 000000000..c577d4887 --- /dev/null +++ b/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 8ac3fe1a83c45da3f468f78ab8133ea6 Mozilla-CA-20200520.tar.gz +sha256 b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726 Mozilla-CA-20200520.tar.gz + +# computed by scancpan +sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.mk b/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.mk new file mode 100644 index 000000000..3bcb947f7 --- /dev/null +++ b/buildroot/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-mozilla-ca +# +################################################################################ + +PERL_MOZILLA_CA_VERSION = 20200520 +PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz +PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH +PERL_MOZILLA_CA_LICENSE = MPL-2.0 +PERL_MOZILLA_CA_LICENSE_FILES = README +PERL_MOZILLA_CA_DISTNAME = Mozilla-CA + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-net-dns/perl-net-dns.hash b/buildroot/package/perl-net-dns/perl-net-dns.hash index e015b872d..dfedb0a95 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.hash +++ b/buildroot/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 91e8593eb6eed41995e6edc567fb6fec Net-DNS-1.21.tar.gz -sha256 ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a Net-DNS-1.21.tar.gz +md5 204e08e5c8042ce0e7d7f0851af46d50 Net-DNS-1.27.tar.gz +sha256 f336277710f3672095b23efe0735d8093fc493070944c57c4ec39191a52abd41 Net-DNS-1.27.tar.gz # computed by scancpan -sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README +sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README diff --git a/buildroot/package/perl-net-dns/perl-net-dns.mk b/buildroot/package/perl-net-dns/perl-net-dns.mk index a4424c113..3d9ee3a2f 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.mk +++ b/buildroot/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.21 +PERL_NET_DNS_VERSION = 1.27 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT diff --git a/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash b/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash index 006f79477..d65b6f36b 100644 --- a/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash +++ b/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ef8d282c410728aa452fb380a7d22b05 Net-SSH2-0.70.tar.gz -sha256 47236af8f4a5e4cfa3036f7969d940247349b65b032478a0c72ba0b2e398b000 Net-SSH2-0.70.tar.gz +md5 baa1b19fec9ca37ecfc12a22ba0c9122 Net-SSH2-0.71.tar.gz +sha256 ee411ec263c900c441fd1c490e9d52fc56b0bb32e1ed98869229501b200f8fa2 Net-SSH2-0.71.tar.gz # computed by scancpan -sha256 3e479d43f8316315caa30ba00b7a143175326a3be83fd4e03146c831afaa22bd README +sha256 b9fe64368dd41bb5b9405b23f95ee0deb970427895ab0119eb3cd4d221764c1d README.pod diff --git a/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk b/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk index e75d01d9b..10657c39c 100644 --- a/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk +++ b/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_SSH2_VERSION = 0.70 +PERL_NET_SSH2_VERSION = 0.71 PERL_NET_SSH2_SOURCE = Net-SSH2-$(PERL_NET_SSH2_VERSION).tar.gz -PERL_NET_SSH2_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SA/SALVA +PERL_NET_SSH2_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RK/RKITOVER PERL_NET_SSH2_LICENSE = Artistic or GPL-1.0+ -PERL_NET_SSH2_LICENSE_FILES = README +PERL_NET_SSH2_LICENSE_FILES = README.pod PERL_NET_SSH2_DEPENDENCIES = libssh2 zlib PERL_NET_SSH2_DISTNAME = Net-SSH2 diff --git a/buildroot/package/perl-params-util/perl-params-util.hash b/buildroot/package/perl-params-util/perl-params-util.hash index 0c247ebfe..d43b8baff 100644 --- a/buildroot/package/perl-params-util/perl-params-util.hash +++ b/buildroot/package/perl-params-util/perl-params-util.hash @@ -1,6 +1,8 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 02db120c0eef87aae1830cc62bdec37b Params-Util-1.07.tar.gz -sha256 30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c Params-Util-1.07.tar.gz +md5 eaf000a27bbd21abfd55f83473ab79fd Params-Util-1.101.tar.gz +sha256 97f391bc092b9c911e4536d103afd48058eb1f8a53d729af7adb65430eb338b7 Params-Util-1.101.tar.gz # computed by scancpan -sha256 71b5fb95de1ba013a517c926feaa2a7d0fb0e8f132818e8529e0da5ec01187cd LICENSE +sha256 08c2ed7589aff3b2076b48b792078d3479c2295559ee7bc4615e93abe0473939 ARTISTIC-1.0 +sha256 3d2fb9b42d1134f39c2e990d66b5e9b77005663fe956db526cc380eb3d9a77d8 GPL-1 +sha256 834c4ebff45be11f35f059b077fdd747dee4b8a747b95049d849fef1c0ccdc62 LICENSE diff --git a/buildroot/package/perl-params-util/perl-params-util.mk b/buildroot/package/perl-params-util/perl-params-util.mk index c33ea816e..1a48a46fe 100644 --- a/buildroot/package/perl-params-util/perl-params-util.mk +++ b/buildroot/package/perl-params-util/perl-params-util.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_PARAMS_UTIL_VERSION = 1.07 +PERL_PARAMS_UTIL_VERSION = 1.101 PERL_PARAMS_UTIL_SOURCE = Params-Util-$(PERL_PARAMS_UTIL_VERSION).tar.gz -PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AD/ADAMK +PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK PERL_PARAMS_UTIL_LICENSE = Artistic or GPL-1.0+ -PERL_PARAMS_UTIL_LICENSE_FILES = LICENSE +PERL_PARAMS_UTIL_LICENSE_FILES = ARTISTIC-1.0 GPL-1 LICENSE PERL_PARAMS_UTIL_DISTNAME = Params-Util $(eval $(perl-package)) diff --git a/buildroot/package/perl-path-class/perl-path-class.hash b/buildroot/package/perl-path-class/perl-path-class.hash new file mode 100644 index 000000000..d2741dfca --- /dev/null +++ b/buildroot/package/perl-path-class/perl-path-class.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 13e6db714f6d5a0e62ca1c4a7fc4d0f3 Path-Class-0.37.tar.gz +sha256 654781948602386f2cb2e4473a739f17dc6953d92aabc2498a4ca2561bc248ce Path-Class-0.37.tar.gz + +# computed by scancpan +sha256 636b5c82eabfe3d4cd86126db9502fd537d1442ad2c88c93dbe221e62b5f1710 LICENSE diff --git a/buildroot/package/perl-path-class/perl-path-class.mk b/buildroot/package/perl-path-class/perl-path-class.mk new file mode 100644 index 000000000..185b7f639 --- /dev/null +++ b/buildroot/package/perl-path-class/perl-path-class.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perl-path-class +# +################################################################################ + +PERL_PATH_CLASS_VERSION = 0.37 +PERL_PATH_CLASS_SOURCE = Path-Class-$(PERL_PATH_CLASS_VERSION).tar.gz +PERL_PATH_CLASS_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KW/KWILLIAMS +HOST_PERL_PATH_CLASS_DEPENDENCIES = host-perl-module-build +PERL_PATH_CLASS_LICENSE = Artistic or GPL-1.0+ +PERL_PATH_CLASS_LICENSE_FILES = LICENSE +PERL_PATH_CLASS_DISTNAME = Path-Class + +$(eval $(host-perl-package)) diff --git a/buildroot/package/perl-path-tiny/perl-path-tiny.hash b/buildroot/package/perl-path-tiny/perl-path-tiny.hash index 954843a0a..5138f401b 100644 --- a/buildroot/package/perl-path-tiny/perl-path-tiny.hash +++ b/buildroot/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 da6316a7b9e4fd747cf98c11be95f630 Path-Tiny-0.110.tar.gz -sha256 a849dc0777315899689d0b351e815d90eaa636a01ed1d5e6de99a368529b5cfa Path-Tiny-0.110.tar.gz +md5 dd6092293f8766fb87d003dceebe4263 Path-Tiny-0.114.tar.gz +sha256 cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1 Path-Tiny-0.114.tar.gz # computed by scancpan -sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE +sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE diff --git a/buildroot/package/perl-path-tiny/perl-path-tiny.mk b/buildroot/package/perl-path-tiny/perl-path-tiny.mk index b2748834d..579f3f588 100644 --- a/buildroot/package/perl-path-tiny/perl-path-tiny.mk +++ b/buildroot/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.110 +PERL_PATH_TINY_VERSION = 0.114 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 diff --git a/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash index e8c5219c4..bdc6fd45a 100644 --- a/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash +++ b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c0a5f76b1b0ce9cdb90d627b017e6cf5 POSIX-strftime-Compiler-0.42.tar.gz -sha256 26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11 POSIX-strftime-Compiler-0.42.tar.gz +md5 3a5ae7d56a5917410c1b661e01ed1a68 POSIX-strftime-Compiler-0.44.tar.gz +sha256 dfd3c97398dcfe51c8236b85e3dc28035667b76531f7aa0a6535f3aa5405b35a POSIX-strftime-Compiler-0.44.tar.gz # computed by scancpan -sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE +sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk index d7e23d254..c11ed5851 100644 --- a/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk +++ b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk @@ -4,10 +4,10 @@ # ################################################################################ -PERL_POSIX_STRFTIME_COMPILER_VERSION = 0.42 +PERL_POSIX_STRFTIME_COMPILER_VERSION = 0.44 PERL_POSIX_STRFTIME_COMPILER_SOURCE = POSIX-strftime-Compiler-$(PERL_POSIX_STRFTIME_COMPILER_VERSION).tar.gz PERL_POSIX_STRFTIME_COMPILER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO -PERL_POSIX_STRFTIME_COMPILER_DEPENDENCIES = host-perl-module-build +PERL_POSIX_STRFTIME_COMPILER_DEPENDENCIES = host-perl-module-build-tiny PERL_POSIX_STRFTIME_COMPILER_LICENSE = Artistic or GPL-1.0+ PERL_POSIX_STRFTIME_COMPILER_LICENSE_FILES = LICENSE PERL_POSIX_STRFTIME_COMPILER_DISTNAME = POSIX-strftime-Compiler diff --git a/buildroot/package/perl-sys-mmap/perl-sys-mmap.hash b/buildroot/package/perl-sys-mmap/perl-sys-mmap.hash index d50fb717d..ce4d67354 100644 --- a/buildroot/package/perl-sys-mmap/perl-sys-mmap.hash +++ b/buildroot/package/perl-sys-mmap/perl-sys-mmap.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 990c9106a88dc843035f7bcb109e6c0e Sys-Mmap-0.19.tar.gz -sha256 09295e25cc9b0599d9009d19b2be89fcecaecc62ce594f873d7f70d7c10900fa Sys-Mmap-0.19.tar.gz +md5 57172ce9b33c04de460b4e7ad68d2e9c Sys-Mmap-0.20.tar.gz +sha256 1820ce2c89f1ab7357644f8db0f49f142f54526250fb1e235db10aa80f15e2cf Sys-Mmap-0.20.tar.gz # computed by scancpan sha256 4ac2afe465736476a06e52edcc78c72cfa0fa4d625916e58ab4f2af6c598709c Artistic diff --git a/buildroot/package/perl-sys-mmap/perl-sys-mmap.mk b/buildroot/package/perl-sys-mmap/perl-sys-mmap.mk index 489d4dd7e..5e0814526 100644 --- a/buildroot/package/perl-sys-mmap/perl-sys-mmap.mk +++ b/buildroot/package/perl-sys-mmap/perl-sys-mmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_SYS_MMAP_VERSION = 0.19 +PERL_SYS_MMAP_VERSION = 0.20 PERL_SYS_MMAP_SOURCE = Sys-Mmap-$(PERL_SYS_MMAP_VERSION).tar.gz -PERL_SYS_MMAP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SW/SWALTERS +PERL_SYS_MMAP_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR PERL_SYS_MMAP_LICENSE = Artistic or GPL-1.0+ PERL_SYS_MMAP_LICENSE_FILES = Artistic Copying PERL_SYS_MMAP_DISTNAME = Sys-Mmap diff --git a/buildroot/package/perl-timedate/perl-timedate.hash b/buildroot/package/perl-timedate/perl-timedate.hash index 5ddfbd251..5ea4d49cb 100644 --- a/buildroot/package/perl-timedate/perl-timedate.hash +++ b/buildroot/package/perl-timedate/perl-timedate.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 230d361a13eae79dfe3fb650acece511 TimeDate-2.31.tar.gz -sha256 5c720fedb245122d073ea9c030aca24b06a615c71d40c46f832a8a1809354d81 TimeDate-2.31.tar.gz +md5 5e5afe22c8d417417283d1f7f4572a57 TimeDate-2.33.tar.gz +sha256 c0b69c4b039de6f501b0d9f13ec58c86b040c1f7e9b27ef249651c143d605eb2 TimeDate-2.33.tar.gz # computed by scancpan -sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README +sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README diff --git a/buildroot/package/perl-timedate/perl-timedate.mk b/buildroot/package/perl-timedate/perl-timedate.mk index d4b6305ab..89a82c042 100644 --- a/buildroot/package/perl-timedate/perl-timedate.mk +++ b/buildroot/package/perl-timedate/perl-timedate.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TIMEDATE_VERSION = 2.31 +PERL_TIMEDATE_VERSION = 2.33 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AT/ATOOMIC PERL_TIMEDATE_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.hash b/buildroot/package/perl-type-tiny/perl-type-tiny.hash index 8263e14c9..85e312c6f 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.hash +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.hash @@ -1,7 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 04194fe9673ef5504be9d50aa5d6782a Type-Tiny-1.008003.tar.gz -sha256 a44e6e3ab29f05516d2a670de817278a7a06d55bce6f4ceaeb84ce032dcd00f5 Type-Tiny-1.008003.tar.gz +md5 b56b6d578843f509100f49b6ffddc21e Type-Tiny-1.010006.tar.gz +sha256 f1568e3f0bf103e65faadc1804c6184fe29bf52559e7ff3c12f4dad437befd82 Type-Tiny-1.010006.tar.gz # computed by scancpan -sha256 7cf4a3f3f81896130c0bc8041fddd737052cdf28e1bd8af7046884f63f262e53 COPYRIGHT -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.mk b/buildroot/package/perl-type-tiny/perl-type-tiny.mk index ea1290bb2..3fa119a8c 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.mk +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_TYPE_TINY_VERSION = 1.008003 +PERL_TYPE_TINY_VERSION = 1.010006 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_TYPE_TINY_LICENSE_FILES = COPYRIGHT LICENSE +PERL_TYPE_TINY_LICENSE_FILES = LICENSE PERL_TYPE_TINY_DISTNAME = Type-Tiny $(eval $(perl-package)) diff --git a/buildroot/package/perl-uri/perl-uri.hash b/buildroot/package/perl-uri/perl-uri.hash index 02287a064..39f2f4765 100644 --- a/buildroot/package/perl-uri/perl-uri.hash +++ b/buildroot/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c236e0142adecc1b1104da664bc43a79 URI-1.76.tar.gz -sha256 b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e URI-1.76.tar.gz +md5 978454ba823a6908bad1c3c1804945d3 URI-5.05.tar.gz +sha256 a5c113d2d02706d9fbdca6a86f290c5b05b2f86836d4e7fe1447f063261b79ec URI-5.05.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE diff --git a/buildroot/package/perl-uri/perl-uri.mk b/buildroot/package/perl-uri/perl-uri.mk index 730b39052..1a4886590 100644 --- a/buildroot/package/perl-uri/perl-uri.mk +++ b/buildroot/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 1.76 +PERL_URI_VERSION = 5.05 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/php-xdebug/Config.in b/buildroot/package/php-xdebug/Config.in new file mode 100644 index 000000000..b5919e06c --- /dev/null +++ b/buildroot/package/php-xdebug/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PHP_XDEBUG + bool "php-xdebug" + help + Extension for PHP to assist with debugging and development. + + http://xdebug.org diff --git a/buildroot/package/php-xdebug/php-xdebug.hash b/buildroot/package/php-xdebug/php-xdebug.hash new file mode 100644 index 000000000..8b90352eb --- /dev/null +++ b/buildroot/package/php-xdebug/php-xdebug.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE +sha256 e330c5ccb77890b06dd7bf093567051450b2438b79fed8e7e6c4834278d46092 php-xdebug-2.9.6.tar.gz diff --git a/buildroot/package/php-xdebug/php-xdebug.mk b/buildroot/package/php-xdebug/php-xdebug.mk new file mode 100644 index 000000000..ab6ade4cb --- /dev/null +++ b/buildroot/package/php-xdebug/php-xdebug.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# php-xdebug +# +################################################################################ + +PHP_XDEBUG_VERSION = 2.9.6 +PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_INSTALL_STAGING = YES +PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) +PHP_XDEBUG_LICENSE_FILES = LICENSE +# phpize does the autoconf magic +PHP_XDEBUG_DEPENDENCIES = php host-autoconf +PHP_XDEBUG_CONF_OPTS = \ + --enable-xdebug \ + --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ + --with-xdebug=$(STAGING_DIR)/usr + +define PHP_XDEBUG_PHPIZE + (cd $(@D); \ + PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + $(STAGING_DIR)/usr/bin/phpize) +endef + +PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE + +$(eval $(autotools-package)) diff --git a/buildroot/package/php/Config.ext b/buildroot/package/php/Config.ext index 66ee935cf..44afea010 100644 --- a/buildroot/package/php/Config.ext +++ b/buildroot/package/php/Config.ext @@ -65,11 +65,6 @@ config BR2_PACKAGE_PHP_EXT_ZLIB comment "Cryptography extensions" -config BR2_PACKAGE_PHP_EXT_HASH - bool "hash" - help - HASH message digest framework - comment "libargon2 needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS @@ -136,7 +131,6 @@ endif config BR2_PACKAGE_PHP_EXT_MYSQLI bool "Mysqli" - select BR2_PACKAGE_PHP_EXT_HASH help MySQL Improved extension support @@ -168,7 +162,6 @@ if BR2_PACKAGE_PHP_EXT_PDO config BR2_PACKAGE_PHP_EXT_PDO_MYSQL bool "MySQL" - select BR2_PACKAGE_PHP_EXT_HASH help PDO driver for MySQL @@ -222,9 +215,10 @@ config BR2_PACKAGE_PHP_EXT_ICONV config BR2_PACKAGE_PHP_EXT_INTL bool "intl" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_TOOLCHAIN_HAS_THREADS # icu depends on !BR2_STATIC_LIBS @@ -232,11 +226,12 @@ config BR2_PACKAGE_PHP_EXT_INTL help Internationalization support -comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8" +comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 config BR2_PACKAGE_PHP_EXT_MBSTRING bool "mbstring" @@ -425,4 +420,15 @@ config BR2_PACKAGE_PHP_EXT_XSL help XSL transformation support +config BR2_PACKAGE_PHP_EXT_FFI + bool "FFI" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBFFI + help + Foreign Function Interface support + +comment "PHP FFI extension needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endmenu diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 77a0feb55..8e8131d30 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce php-7.4.11.tar.xz +sha256 e82d2bcead05255f6b7d2ff4e2561bc334204955820cabc2457b5239fde96b76 php-7.4.12.tar.xz # License file sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index 011c9019c..ce0e3e4a4 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.11 +PHP_VERSION = 7.4.12 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -97,7 +97,6 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \ $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \ - $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \ $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \ $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \ $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \ @@ -151,7 +150,7 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) PHP_CONF_ENV += php_cv_libxml_build_works=yes -PHP_CONF_OPTS += --with-libxml --with-libxml-dir=$(STAGING_DIR)/usr +PHP_CONF_OPTS += --with-libxml PHP_DEPENDENCIES += libxml2 endif @@ -333,6 +332,11 @@ PHP_CONF_OPTS += \ PHP_DEPENDENCIES += jpeg libpng freetype zlib endif +ifeq ($(BR2_PACKAGE_PHP_EXT_FFI),y) +PHP_CONF_OPTS += --with-ffi +PHP_DEPENDENCIES += libffi +endif + ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) define PHP_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \ diff --git a/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch b/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch deleted file mode 100644 index 4183f2343..000000000 --- a/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8417ca1725d523493d8f6782699273dc056888ac Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin -Date: Thu, 1 Aug 2019 20:51:55 +0300 -Subject: [PATCH] tests: fix test build requiring gles3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This should be built only on gles3. - -Signed-off-by: Lionel Landwerlin -Reported-by: Krzysztof Raszkowski -Fixes: ef761094be ("tests: Reproducer for 110796") -Reviewed-by: Tapani Pälli -[Retrieved from: -https://gitlab.freedesktop.org/mesa/piglit/commit/8417ca1725d523493d8f6782699273dc056888ac] -Signed-off-by: Fabrice Fontaine ---- - tests/shaders/CMakeLists.gl.txt | 1 - - tests/shaders/CMakeLists.gles3.txt | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt -index f1512f9cf..a299001cb 100644 ---- a/tests/shaders/CMakeLists.gl.txt -+++ b/tests/shaders/CMakeLists.gl.txt -@@ -43,7 +43,6 @@ IF (UNIX) - ENDIF (UNIX) - piglit_add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c) - piglit_add_executable (glsl-bindattriblocation glsl-bindattriblocation.c) --piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c) - piglit_add_executable (glsl-bug-22603 glsl-bug-22603.c) - piglit_add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c) - piglit_add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c) -diff --git a/tests/shaders/CMakeLists.gles3.txt b/tests/shaders/CMakeLists.gles3.txt -index 18b8c3534..c8ccfad42 100644 ---- a/tests/shaders/CMakeLists.gles3.txt -+++ b/tests/shaders/CMakeLists.gles3.txt -@@ -3,6 +3,7 @@ link_libraries( - ) - - piglit_add_executable (built-in-constants_${piglit_target_api} built-in-constants.c parser_utils.c) -+piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c) - piglit_add_executable(shader_runner_${piglit_target_api} shader_runner.c parser_utils.c) - - # vim: ft=cmake: --- -2.24.1 - diff --git a/buildroot/package/piglit/piglit.hash b/buildroot/package/piglit/piglit.hash index 8cfd04f7e..1a0011850 100644 --- a/buildroot/package/piglit/piglit.hash +++ b/buildroot/package/piglit/piglit.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 4eba46520df1c47b0aea5446c302ff51d52f905a63d1ba29230866fc6c952a2e piglit-ef761094be04d14e258ad7706e7295f80d4411f2.tar.gz -sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 +sha256 0d42dc46295a6b3ecfeb379887bd78128ce7938242ae56d58d5e9b3dea8c98b6 piglit-2affee53f3ad7a96f5b397a2b6d6408af8a374b0.tar.gz +sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 diff --git a/buildroot/package/piglit/piglit.mk b/buildroot/package/piglit/piglit.mk index d4753b9f7..4d17405d1 100644 --- a/buildroot/package/piglit/piglit.mk +++ b/buildroot/package/piglit/piglit.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGLIT_VERSION = ef761094be04d14e258ad7706e7295f80d4411f2 +PIGLIT_VERSION = 2affee53f3ad7a96f5b397a2b6d6408af8a374b0 PIGLIT_SITE = https://gitlab.freedesktop.org/mesa/piglit.git PIGLIT_SITE_METHOD = git PIGLIT_LICENSE = MIT (code), \ diff --git a/buildroot/package/pigpio/S50pigpio b/buildroot/package/pigpio/S50pigpio new file mode 100644 index 000000000..8b7b6815c --- /dev/null +++ b/buildroot/package/pigpio/S50pigpio @@ -0,0 +1,50 @@ +#!/bin/sh + +DAEMON="pigpiod" +PIDFILE="/var/run/pigpio.pid" + +PIGPIOD_ARGS="" + +[ -r "/etc/default/pigpio" ] && . "/etc/default/pigpio" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -x "/usr/bin/$DAEMON" -- $PIGPIOD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/pigpio/pigpio.hash b/buildroot/package/pigpio/pigpio.hash index f20b9bf6b..b6de0c19f 100644 --- a/buildroot/package/pigpio/pigpio.hash +++ b/buildroot/package/pigpio/pigpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87ec2ec87cb6cb0f42af47868631e657217b5927cdfbea3ad0ecdc2ca885a2d1 pigpio-7301.tar.gz -sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE +sha256 ef4a4dc7ca8ca2f97fbdb9fd75586f61be7222d0f6c14e58af6c9192ad42f682 pigpio-78.tar.gz +sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE diff --git a/buildroot/package/pigpio/pigpio.mk b/buildroot/package/pigpio/pigpio.mk index aed5f2744..345b315c4 100644 --- a/buildroot/package/pigpio/pigpio.mk +++ b/buildroot/package/pigpio/pigpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGPIO_VERSION = 7301 +PIGPIO_VERSION = 78 PIGPIO_SITE = $(call github,joan2937,pigpio,v$(PIGPIO_VERSION)) PIGPIO_LICENSE = Unlicense PIGPIO_LICENSE_FILES = UNLICENCE @@ -38,4 +38,14 @@ define PIGPIO_INSTALL_STAGING_CMDS ln -sf libpigpiod_if2.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if2.so endef +define PIGPIO_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/pigpio/S50pigpio \ + $(TARGET_DIR)/etc/init.d/S50pigpio +endef + +define PIGPIO_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/pigpio/pigpio.service \ + $(TARGET_DIR)/usr/lib/systemd/system/pigpio.service +endef + $(eval $(generic-package)) diff --git a/buildroot/package/pigpio/pigpio.service b/buildroot/package/pigpio/pigpio.service new file mode 100644 index 000000000..135624cc4 --- /dev/null +++ b/buildroot/package/pigpio/pigpio.service @@ -0,0 +1,10 @@ +[Unit] +Description=Pigpio daemon +After=network.target + +[Service] +EnvironmentFile=-/etc/default/pigpio +ExecStart=/usr/bin/pigpiod -g $PIGPIOD_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/pigz/Config.in.host b/buildroot/package/pigz/Config.in.host new file mode 100644 index 000000000..9903cada7 --- /dev/null +++ b/buildroot/package/pigz/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_PIGZ + bool "host pigz" + help + pigz, which stands for parallel implementation of gzip, is a + fully functional replacement for gzip that exploits multiple + processors and multiple cores to the hilt when compressing + data. + + http://www.zlib.net/pigz/ diff --git a/buildroot/package/pigz/pigz.mk b/buildroot/package/pigz/pigz.mk index b4f28c048..23df0f5fc 100644 --- a/buildroot/package/pigz/pigz.mk +++ b/buildroot/package/pigz/pigz.mk @@ -7,6 +7,7 @@ PIGZ_VERSION = 2.4 PIGZ_SITE = $(call github,madler,pigz,v$(PIGZ_VERSION)) PIGZ_DEPENDENCIES = zlib +HOST_PIGZ_DEPENDENCIES = host-zlib PIGZ_LICENSE = Zlib PIGZ_LICENSE_FILES = README @@ -14,8 +15,17 @@ define PIGZ_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef +define HOST_PIGZ_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) +endef + define PIGZ_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/pigz $(TARGET_DIR)/usr/bin/pigz endef +define HOST_PIGZ_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/pigz $(HOST_DIR)/bin/pigz +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/pinentry/Config.in b/buildroot/package/pinentry/Config.in index ef7090850..586ffea29 100644 --- a/buildroot/package/pinentry/Config.in +++ b/buildroot/package/pinentry/Config.in @@ -61,7 +61,8 @@ config BR2_PACKAGE_PINENTRY_QT5 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5 @@ -70,10 +71,10 @@ config BR2_PACKAGE_PINENTRY_QT5 help The pinentry-qt5 tool -comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library" +comment "pinentry-qt5 needs a host gcc >= 5.0, and a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library" depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_5 endif diff --git a/buildroot/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/buildroot/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch new file mode 100644 index 000000000..c393a48d0 --- /dev/null +++ b/buildroot/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch @@ -0,0 +1,70 @@ +From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 16 Aug 2020 12:31:46 +0200 +Subject: [PATCH] CMakeLists.txt: add C language to project statement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will fix the detection of atomic: + +-- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB +-- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed +-- Looking for __atomic_load_8 in atomic +-- Looking for __atomic_load_8 in atomic - not found +CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): + Host compiler appears to require libatomic for 64-bit operations, but + cannot find it. +Call Stack (most recent call first): + CMakeLists.txt:19 (include) + +Indeed if C language is not enabled, the test will be run with the C++ +compiler resulting in the following error: + +Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o +/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx +: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] +/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' + CHECK_FUNCTION_EXISTS(void); + ^~~~~~~~~~~~~~~~~~~~~ +/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': +/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' + CHECK_FUNCTION_EXISTS(); + ^ + +whereas with a C compiler, we'll get: + +Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o +/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c +: warning: conflicting types for built-in function ‘__atomic_load_8’ [-Wbuiltin-declaration-mismatch] +/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ‘CHECK_FUNCTION_EXISTS’ + CHECK_FUNCTION_EXISTS(void); + ^~~~~~~~~~~~~~~~~~~~~ +Linking C executable cmTC_4b0f4 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 +/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic + +Fixes: + - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 + +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index edc73c5..0286647 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + + project (pistache +- LANGUAGES CXX) ++ LANGUAGES C CXX) + + include(GNUInstallDirs) + +-- +2.27.0 + diff --git a/buildroot/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/buildroot/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch new file mode 100644 index 000000000..09f59b11e --- /dev/null +++ b/buildroot/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch @@ -0,0 +1,95 @@ +From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Oct 2020 22:26:55 +0200 +Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS + +Don't build and install pistache_shared if the standard cmake +BUILD_SHARED_LIBS is set to OFF + +Signed-off-by: Fabrice Fontaine +[Backport from upstream: + https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 +] +--- + src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 18 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6521b20..c5b049f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) + set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) + set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) + +-add_library(pistache_shared SHARED $) +-add_library(pistache_static STATIC $) ++if (BUILD_SHARED_LIBS) ++ add_library(pistache_shared SHARED $) ++ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) ++ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) ++endif () + +-target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) ++add_library(pistache_static STATIC $) + target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) +- +-target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) + target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) + + if (PISTACHE_USE_SSL) + target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) +- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) + target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) + + target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) +- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) + target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) ++ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) ++ endif () + endif () + + set(Pistache_OUTPUT_NAME "pistache") +-set_target_properties(pistache_shared PROPERTIES +- OUTPUT_NAME ${Pistache_OUTPUT_NAME} +- VERSION ${version} +- SOVERSION ${VERSION_MAJOR} +-) ++if (BUILD_SHARED_LIBS) ++ set_target_properties(pistache_shared PROPERTIES ++ OUTPUT_NAME ${Pistache_OUTPUT_NAME} ++ VERSION ${version} ++ SOVERSION ${VERSION_MAJOR} ++ ) ++endif () + + set_target_properties(pistache_static PROPERTIES + OUTPUT_NAME ${Pistache_OUTPUT_NAME} +@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) + set(Pistache_CONFIG_FILE "PistacheConfig.cmake") + set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") + +- install( +- TARGETS pistache_shared +- EXPORT PistacheTargets +- ARCHIVE DESTINATION ${lib_install_dir} +- LIBRARY DESTINATION ${lib_install_dir} +- RUNTIME DESTINATION ${bin_install_dir} +- INCLUDES DESTINATION ${include_install_dir}) ++ if (BUILD_SHARED_LIBS) ++ install( ++ TARGETS pistache_shared ++ EXPORT PistacheTargets ++ ARCHIVE DESTINATION ${lib_install_dir} ++ LIBRARY DESTINATION ${lib_install_dir} ++ RUNTIME DESTINATION ${bin_install_dir} ++ INCLUDES DESTINATION ${include_install_dir}) ++ endif() + + install( + DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" +-- +2.28.0 + diff --git a/buildroot/package/pistache/Config.in b/buildroot/package/pistache/Config.in new file mode 100644 index 000000000..64d634082 --- /dev/null +++ b/buildroot/package/pistache/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_PISTACHE + bool "pistache" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_USES_UCLIBC + help + Pistache is a modern and elegant HTTP and REST framework + for C++. It is entirely written in pure C++14 and provides + a clear and pleasant API. + + https://github.com/oktal/pistache + +comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/pistache/pistache.hash b/buildroot/package/pistache/pistache.hash new file mode 100644 index 000000000..5079387eb --- /dev/null +++ b/buildroot/package/pistache/pistache.hash @@ -0,0 +1,3 @@ +#locally computed +sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/buildroot/package/pistache/pistache.mk b/buildroot/package/pistache/pistache.mk new file mode 100644 index 000000000..4d6bd283e --- /dev/null +++ b/buildroot/package/pistache/pistache.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# pistache +# +################################################################################ + +PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) +PISTACHE_LICENSE = Apache-2.0 +PISTACHE_LICENSE_FILES = LICENSE + +PISTACHE_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PISTACHE_DEPENDENCIES += openssl +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +else +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/pixman/pixman.hash b/buildroot/package/pixman/pixman.hash index 7a79c206f..1af632a9f 100644 --- a/buildroot/package/pixman/pixman.hash +++ b/buildroot/package/pixman/pixman.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-April/002991.html -md5 16a350a8a40116ddf67632a1d2623711 pixman-0.38.4.tar.bz2 -sha1 87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd pixman-0.38.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-April/003043.html +sha256 da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e pixman-0.40.0.tar.xz +sha512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 pixman-0.40.0.tar.xz + # Locally computed -sha256 84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 pixman-0.38.4.tar.bz2 -sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING +sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/buildroot/package/pixman/pixman.mk b/buildroot/package/pixman/pixman.mk index e566603d2..a446ebca4 100644 --- a/buildroot/package/pixman/pixman.mk +++ b/buildroot/package/pixman/pixman.mk @@ -4,9 +4,9 @@ # ################################################################################ -PIXMAN_VERSION = 0.38.4 -PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 -PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib +PIXMAN_VERSION = 0.40.0 +PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz +PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT PIXMAN_LICENSE_FILES = COPYING diff --git a/buildroot/package/pixz/0001-fix-linkage.patch b/buildroot/package/pixz/0001-fix-linkage.patch new file mode 100644 index 000000000..712c280ec --- /dev/null +++ b/buildroot/package/pixz/0001-fix-linkage.patch @@ -0,0 +1,41 @@ +From f385e7be8adb620ca7eb89f84abe4d1df94c1029 Mon Sep 17 00:00:00 2001 +From: Dave Vasilevsky +Date: Sat, 25 Apr 2020 19:16:05 -0400 +Subject: [PATCH] fix linkage + +[Retrieved from: +https://github.com/vasi/pixz/commit/f385e7be8adb620ca7eb89f84abe4d1df94c1029] +Signed-off-by: Fabrice Fontaine +--- + src/common.c | 2 +- + src/pixz.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/common.c b/src/common.c +index 59d3273..5938633 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -7,7 +7,7 @@ + + #pragma mark UTILS + +-FILE *gInFile = NULL; ++FILE *gInFile = NULL, *gOutFile = NULL; + lzma_stream gStream = LZMA_STREAM_INIT; + + +diff --git a/src/pixz.h b/src/pixz.h +index 0fa60f2..0939a9a 100644 +--- a/src/pixz.h ++++ b/src/pixz.h +@@ -54,8 +54,8 @@ void pixz_read(bool verify, size_t nspecs, char **specs); + + #pragma mark UTILS + +-FILE *gInFile, *gOutFile; +-lzma_stream gStream; ++extern FILE *gInFile, *gOutFile; ++extern lzma_stream gStream; + + extern lzma_index *gIndex; + diff --git a/buildroot/package/pkcs11-helper/Config.in b/buildroot/package/pkcs11-helper/Config.in new file mode 100644 index 000000000..36204d7d3 --- /dev/null +++ b/buildroot/package/pkcs11-helper/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PKCS11_HELPER + bool "pkcs11-helper" + depends on !BR2_STATIC_LIBS # dlfcn.h + help + pkcs11-helper is a library that simplifies the interaction + with PKCS#11 providers for end-user applications. + + pkcs11-helper allows using multiple PKCS#11 providers at the + same time, enumerating available token certificates, or + selecting a certificate directly by serialized id, handling + card removal and card insert events, handling card re-insert + to a different slot, supporting session expiration and much + more all using a simple API. + + pkcs11-helper is not designed to manage card content, since + object attributes are usually vendor specific, and 99% of + application need to access existing objects in order to + perform signature and decryption. + + https://github.com/OpenSC/pkcs11-helper + +comment "pkcs11-helper needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/pkcs11-helper/pkcs11-helper.hash b/buildroot/package/pkcs11-helper/pkcs11-helper.hash new file mode 100644 index 000000000..276ed2e22 --- /dev/null +++ b/buildroot/package/pkcs11-helper/pkcs11-helper.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 e5e2eefeda6c3db3d8862b42b180a6a5b2f41285f35b0ad0d622c6767683fd84 pkcs11-helper-1.26.tar.gz +sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING +sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD +sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/buildroot/package/pkcs11-helper/pkcs11-helper.mk b/buildroot/package/pkcs11-helper/pkcs11-helper.mk new file mode 100644 index 000000000..a651be98b --- /dev/null +++ b/buildroot/package/pkcs11-helper/pkcs11-helper.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# pkcs11-helper +# +################################################################################ + +PKCS11_HELPER_VERSION = 1.26 +PKCS11_HELPER_SITE = $(call github,OpenSC,pkcs11-helper,pkcs11-helper-$(PKCS11_HELPER_VERSION)) +PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause +PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL +PKCS11_HELPER_DEPENDENCIES = host-pkgconf +PKCS11_HELPER_AUTORECONF = YES +PKCS11_HELPER_INSTALL_STAGING = YES + +PKCS11_HELPER_CONF_OPTS = \ + --disable-crypto-engine-polarssl \ + --disable-crypto-engine-cryptoapi + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +PKCS11_HELPER_CONF_OPTS += --enable-slotevent --enable-threading +else +PKCS11_HELPER_CONF_OPTS += --disable-slotevent --disable-threading +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +PKCS11_HELPER_DEPENDENCIES += gnutls +PKCS11_HELPER_CONF_OPTS += --enable-crypto-engine-gnutls +else +PKCS11_HELPER_CONF_OPTS += --disable-crypto-engine-gnutls +endif + +ifeq ($(BR2_PACKAGE_LIBNSS),y) +PKCS11_HELPER_DEPENDENCIES += libnss +PKCS11_HELPER_CONF_OPTS += --enable-crypto-engine-nss +else +PKCS11_HELPER_CONF_OPTS += --disable-crypto-engine-nss +endif + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +PKCS11_HELPER_DEPENDENCIES += mbedtls +PKCS11_HELPER_CONF_OPTS += --enable-crypto-engine-mbedtls +else +PKCS11_HELPER_CONF_OPTS += --disable-crypto-engine-mbedtls +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PKCS11_HELPER_DEPENDENCIES += openssl +PKCS11_HELPER_CONF_OPTS += \ + --enable-openssl \ + --enable-crypto-engine-openssl +else +PKCS11_HELPER_CONF_OPTS += \ + --disable-openssl \ + --disable-crypto-engine-openssl +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/pkg-cmake.mk b/buildroot/package/pkg-cmake.mk index 57bfea9be..dc545caed 100644 --- a/buildroot/package/pkg-cmake.mk +++ b/buildroot/package/pkg-cmake.mk @@ -146,6 +146,7 @@ define $(2)_CONFIGURE_CMDS -DBUILD_TEST=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ $$(CMAKE_QUIET) \ $$($$(PKG)_CONF_OPTS) \ ) diff --git a/buildroot/package/pkg-generic.mk b/buildroot/package/pkg-generic.mk index 7679c4155..54de03da0 100644 --- a/buildroot/package/pkg-generic.mk +++ b/buildroot/package/pkg-generic.mk @@ -55,62 +55,6 @@ define step_time endef GLOBAL_INSTRUMENTATION_HOOKS += step_time -# Hooks to collect statistics about installed files - -# $(1): package name -# $(2): base directory to search in -# $(3): suffix of file (optional) -define step_pkg_size_before - cd $(2); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).before -endef - -# $(1): package name -# $(2): base directory to search in -# $(3): suffix of file (optional) -define step_pkg_size_after - cd $(2); \ - LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).after - LC_ALL=C comm -13 \ - $($(PKG)_DIR)/.files-list$(3).before \ - $($(PKG)_DIR)/.files-list$(3).after \ - | sed -r -e 's/^[^,]+/$(1)/' \ - > $($(PKG)_DIR)/.files-list$(3).txt - rm -f $($(PKG)_DIR)/.files-list$(3).before - rm -f $($(PKG)_DIR)/.files-list$(3).after -endef - -define step_pkg_size - $(if $(filter start-install-target,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(TARGET_DIR))) - $(if $(filter start-install-staging,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(STAGING_DIR),-staging)) - $(if $(filter start-install-host,$(1)-$(2)),\ - $(call step_pkg_size_before,$(3),$(HOST_DIR),-host)) - - $(if $(filter end-install-target,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(TARGET_DIR))) - $(if $(filter end-install-staging,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(STAGING_DIR),-staging)) - $(if $(filter end-install-host,$(1)-$(2)),\ - $(call step_pkg_size_after,$(3),$(HOST_DIR),-host)) -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size - -# Relies on step_pkg_size, so must be after -define check_bin_arch - $(if $(filter end-install-target,$(1)-$(2)),\ - support/scripts/check-bin-arch -p $(3) \ - -l $($(PKG)_DIR)/.files-list.txt \ - $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ - -r $(TARGET_READELF) \ - -a $(BR2_READELF_ARCH_NAME)) -endef - -GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch - # This hook checks that host packages that need libraries that we build # have a proper DT_RPATH or DT_RUNPATH tag define check_host_rpath @@ -158,6 +102,39 @@ define fixup-libtool-files endef endif +# Functions to collect statistics about installed files + +# $(1): base directory to search in +# $(2): suffix of file (optional) +define pkg_size_before + cd $(1); \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).before +endef + +# $(1): base directory to search in +# $(2): suffix of file (optional) +define pkg_size_after + cd $(1); \ + LC_ALL=C find . -not -path './$(STAGING_SUBDIR)/*' \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(2).after + LC_ALL=C comm -13 \ + $($(PKG)_DIR)/.files-list$(2).before \ + $($(PKG)_DIR)/.files-list$(2).after \ + | sed -r -e 's/^[^,]+/$($(PKG)_NAME)/' \ + > $($(PKG)_DIR)/.files-list$(2).txt + rm -f $($(PKG)_DIR)/.files-list$(2).before + rm -f $($(PKG)_DIR)/.files-list$(2).after +endef + +define check_bin_arch + support/scripts/check-bin-arch -p $($(PKG)_NAME) \ + -l $($(PKG)_DIR)/.files-list.txt \ + $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ + -r $(TARGET_READELF) \ + -a $(BR2_READELF_ARCH_NAME) +endef + ################################################################################ # Implicit targets -- produce a stamp file for each step of a package build ################################################################################ @@ -253,7 +230,11 @@ $(foreach dir,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)),\ $(BUILD_DIR)/%/.stamp_configured: @$(call step_start,configure) @$(call MESSAGE,"Configuring") + $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + @$(call pkg_size_before,$(TARGET_DIR)) + @$(call pkg_size_before,$(STAGING_DIR),-staging) + @$(call pkg_size_before,$(HOST_DIR),-host) $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -273,7 +254,6 @@ $(BUILD_DIR)/%/.stamp_built:: # Install to host dir $(BUILD_DIR)/%/.stamp_host_installed: - @mkdir -p $(HOST_DIR) @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -303,7 +283,6 @@ $(BUILD_DIR)/%/.stamp_host_installed: # empty when we use an internal toolchain. # $(BUILD_DIR)/%/.stamp_staging_installed: - @mkdir -p $(STAGING_DIR) @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) @@ -346,7 +325,6 @@ $(BUILD_DIR)/%/.stamp_staging_installed: # Install to images dir $(BUILD_DIR)/%/.stamp_images_installed: - @mkdir -p $(BINARIES_DIR) @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) @@ -357,7 +335,6 @@ $(BUILD_DIR)/%/.stamp_images_installed: # Install to target dir $(BUILD_DIR)/%/.stamp_target_installed: - @mkdir -p $(TARGET_DIR) @$(call step_start,install-target) @$(call MESSAGE,"Installing to target") $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) @@ -376,6 +353,15 @@ $(BUILD_DIR)/%/.stamp_target_installed: @$(call step_end,install-target) $(Q)touch $@ +# Final installation step, completed when all installation steps +# (host, images, staging, target) have completed +$(BUILD_DIR)/%/.stamp_installed: + @$(call pkg_size_after,$(TARGET_DIR)) + @$(call pkg_size_after,$(STAGING_DIR),-staging) + @$(call pkg_size_after,$(HOST_DIR),-host) + @$(call check_bin_arch) + $(Q)touch $@ + # Remove package sources $(BUILD_DIR)/%/.stamp_dircleaned: $(if $(BR2_PER_PACKAGE_DIRECTORIES),rm -Rf $(PER_PACKAGE_DIR)/$(NAME)) @@ -577,7 +563,7 @@ ifndef $(2)_DL_OPTS endif endif -ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),) +ifneq ($$(filter bzr cvs hg,$$($(2)_SITE_METHOD)),) BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) endif @@ -706,11 +692,8 @@ $(2)_FINAL_RECURSIVE_RDEPENDENCIES = $$(sort \ ) \ $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)) -$(2)_INSTALL_STAGING ?= NO -$(2)_INSTALL_IMAGES ?= NO -$(2)_INSTALL_TARGET ?= YES - # define sub-target stamps +$(2)_TARGET_INSTALL = $$($(2)_DIR)/.stamp_installed $(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed $(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed $(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed @@ -766,11 +749,23 @@ endif # human-friendly targets and target sequencing $(1): $(1)-install +$(1)-install: $$($(2)_TARGET_INSTALL) ifeq ($$($(2)_TYPE),host) -$(1)-install: $(1)-install-host +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_HOST) else -$(1)-install: $(1)-install-staging $(1)-install-target $(1)-install-images +$(2)_INSTALL_STAGING ?= NO +$(2)_INSTALL_IMAGES ?= NO +$(2)_INSTALL_TARGET ?= YES +ifeq ($$($(2)_INSTALL_TARGET),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_TARGET) +endif +ifeq ($$($(2)_INSTALL_STAGING),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_STAGING) +endif +ifeq ($$($(2)_INSTALL_IMAGES),YES) +$$($(2)_TARGET_INSTALL): $$($(2)_TARGET_INSTALL_IMAGES) +endif endif ifeq ($$($(2)_INSTALL_TARGET),YES) @@ -920,6 +915,7 @@ $(1)-clean-for-reinstall: ifneq ($$($(2)_OVERRIDE_SRCDIR),) rm -f $$($(2)_TARGET_RSYNC) endif + rm -f $$($(2)_TARGET_INSTALL) rm -f $$($(2)_TARGET_INSTALL_STAGING) rm -f $$($(2)_TARGET_INSTALL_TARGET) rm -f $$($(2)_TARGET_INSTALL_IMAGES) @@ -939,6 +935,7 @@ $(1)-reconfigure: $(1)-clean-for-reconfigure $(1) # define the PKG variable for all targets, containing the # uppercase package variable prefix +$$($(2)_TARGET_INSTALL): PKG=$(2) $$($(2)_TARGET_INSTALL_TARGET): PKG=$(2) $$($(2)_TARGET_INSTALL_STAGING): PKG=$(2) $$($(2)_TARGET_INSTALL_IMAGES): PKG=$(2) @@ -962,6 +959,7 @@ $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the # package being enabled. We handle three cases: the special Linux # kernel case, the bootloaders case, and the normal packages case. +# Virtual packages are handled separately (see below). ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) @@ -1084,10 +1082,19 @@ endif ifneq ($$($(2)_USERS),) PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif +ifneq ($$($(2)_LINUX_CONFIG_FIXUPS),) +PACKAGES_LINUX_CONFIG_FIXUPS += $$($(2)_LINUX_CONFIG_FIXUPS)$$(sep) +endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) +ifneq ($$($(2)_SELINUX_MODULES),) +PACKAGES_SELINUX_MODULES += $$($(2)_SELINUX_MODULES) +endif +PACKAGES_SELINUX_EXTRA_MODULES_DIRS += \ + $$(if $$(wildcard $$($(2)_PKGDIR)/selinux),$$($(2)_PKGDIR)/selinux) + ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn else ifeq ($$($(2)_SITE_METHOD),git) @@ -1151,6 +1158,22 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif +# Virtual packages are not built but it's useful to allow them to have +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR + +ifneq ($$($(2)_PERMISSIONS),) +PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) +endif +ifneq ($$($(2)_DEVICES),) +PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) +endif +ifneq ($$($(2)_USERS),) +PACKAGES_USERS += $$($(2)_USERS)$$(sep) +endif +TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) +ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) + endif # $(2)_KCONFIG_VAR endef # inner-generic-package diff --git a/buildroot/package/pkg-golang.mk b/buildroot/package/pkg-golang.mk index 2494ce028..3813e1c40 100644 --- a/buildroot/package/pkg-golang.mk +++ b/buildroot/package/pkg-golang.mk @@ -23,22 +23,6 @@ GO_BIN = $(HOST_DIR)/bin/go -# We pass an empty GOBIN, otherwise "go install: cannot install -# cross-compiled binaries when GOBIN is set" -GO_COMMON_ENV = \ - PATH=$(BR_PATH) \ - GOBIN= \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) - -GO_TARGET_ENV = \ - $(HOST_GO_TARGET_ENV) \ - $(GO_COMMON_ENV) - -GO_HOST_ENV = \ - CGO_CFLAGS="$(HOST_CFLAGS)" \ - CGO_LDFLAGS="$(HOST_LDFLAGS)" \ - $(GO_COMMON_ENV) - ################################################################################ # inner-golang-package -- defines how the configuration, compilation and # installation of a Go package should be done, implements a few hooks to tune @@ -56,8 +40,6 @@ GO_HOST_ENV = \ define inner-golang-package -$(2)_WORKSPACE ?= _gopath - $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ -tags "$$($(2)_TAGS)" \ @@ -79,25 +61,25 @@ endif $(2)_INSTALL_BINS ?= $(1) -# Source files in Go should be extracted in a precise folder in the hierarchy -# of GOPATH. It usually resolves around domain/vendor/software. By default, we -# derive domain/vendor/software from the upstream URL of the project, but we -# allow $(2)_SRC_SUBDIR to be overridden if needed. +# Source files in Go usually use an import path resolved around +# domain/vendor/software. We infer domain/vendor/software from the upstream URL +# of the project. $(2)_SRC_DOMAIN = $$(call domain,$$($(2)_SITE)) $(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) $(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) -$(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -$(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) +# $(2)_GOMOD is the root Go module path for the project, inferred if not set. +# If the go.mod file does not exist, one is written with this root path. +$(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -# Configure step. Only define it if not already defined by the package .mk -# file. -ifndef $(2)_CONFIGURE_CMDS -define $(2)_CONFIGURE_CMDS - mkdir -p $$(dir $$($(2)_SRC_PATH)) - ln -sf $$(@D) $$($(2)_SRC_PATH) +# Generate a go.mod file if it doesn't exist. Note: Go is configured +# to use the "vendor" dir and not make network calls. +define $(2)_GEN_GOMOD + if [ ! -f $$(@D)/go.mod ]; then \ + printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \ + fi endef -endif +$(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD # Build step. Only define it if not already defined by the package .mk # file. @@ -111,26 +93,24 @@ endif # Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ - $$(GO_TARGET_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + cd $$(@D); \ + $$(HOST_GO_TARGET_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$($(2)_GOMOD)/$$(d) ) endef else # Build package for host define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ - $$(GO_HOST_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + cd $$(@D); \ + $$(HOST_GO_HOST_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$($(2)_GOMOD)/$$(d) ) endef endif diff --git a/buildroot/package/pkg-luarocks.mk b/buildroot/package/pkg-luarocks.mk index 78d6c325f..fd7985587 100644 --- a/buildroot/package/pkg-luarocks.mk +++ b/buildroot/package/pkg-luarocks.mk @@ -17,6 +17,17 @@ # ################################################################################ +LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks +LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC +HOST_LUAROCKS_CFLAGS = $(HOST_CFLAGS) -fPIC +ifeq ($(BR2_PACKAGE_LUA_5_3),y) +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 +endif + ################################################################################ # inner-luarocks-package -- defines how the configuration, compilation and # installation of a LuaRocks package should be done, implements a few hooks to @@ -33,16 +44,50 @@ define inner-luarocks-package -$(2)_BUILD_OPTS ?= -$(2)_NAME_UPSTREAM ?= $(1) -$(2)_SUBDIR ?= $$($(2)_NAME_UPSTREAM)-$$(shell echo "$$($(2)_VERSION)" | sed -e "s/-[0-9]$$$$//") -$(2)_ROCKSPEC ?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).rockspec -$(2)_SOURCE ?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).src.rock -$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) +ifndef $(2)_NAME_UPSTREAM + ifdef $(3)_NAME_UPSTREAM + $(2)_NAME_UPSTREAM = $($(3)_NAME_UPSTREAM) + else + $(2)_NAME_UPSTREAM ?= $(1) + endif +endif -# Since we do not support host-luarocks-package, we know this is -# a target package, and can just add the required dependencies -$(2)_DEPENDENCIES += luainterpreter +ifndef $(2)_SUBDIR + ifdef $(3)_SUBDIR + $(2)_SUBDIR = $($(3)_SUBDIR) + else + $(2)_SUBDIR ?= $$($(3)_NAME_UPSTREAM)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//") + endif +endif + +ifndef $(2)_ROCKSPEC + ifdef $(3)_ROCKSPEC + $(2)_ROCKSPEC = $($(3)_ROCKSPEC) + else + $(2)_ROCKSPEC ?= $$(call LOWERCASE,$$($(3)_NAME_UPSTREAM))-$$($(3)_VERSION).rockspec + endif +endif + +ifndef $(2)_SOURCE + ifdef $(3)_SOURCE + $(2)_SOURCE = $($(3)_SOURCE) + else + $(2)_SOURCE ?= $$(call LOWERCASE,$$($(3)_NAME_UPSTREAM))-$$($(3)_VERSION).src.rock + endif +endif + +ifndef $(2)_SITE + ifdef $(3)_SITE + $(2)_SITE = $($(3)_SITE) + else + $(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) + endif +endif + +ifeq ($(4),target) +$(2)_DEPENDENCIES += luainterpreter +endif +# host-luarocks implies host-luainterpreter $(2)_EXTRACT_DEPENDENCIES += host-luarocks # @@ -53,7 +98,7 @@ ifndef $(2)_EXTRACT_CMDS define $(2)_EXTRACT_CMDS mkdir -p $$($(2)_DIR)/luarocks-extract cd $$($(2)_DIR)/luarocks-extract && \ - $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$($(2)_DL_DIR)/$$($(2)_SOURCE) + $$(LUAROCKS_RUN_CMD) unpack --force $$($(2)_DL_DIR)/$$($(2)_SOURCE) mv $$($(2)_DIR)/luarocks-extract/*/* $$($(2)_DIR) endef endif @@ -63,8 +108,30 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) \ - $$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) + cd $$($(2)_SRCDIR) && \ + LUAROCKS_CONFIG=$$(LUAROCKS_CONFIG_FILE) \ + $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ + --tree "$$(TARGET_DIR)/usr" \ + DEPS_DIR="$$(STAGING_DIR)/usr" \ + LUA_INCDIR="$$(STAGING_DIR)/usr/include" \ + LUA_LIBDIR="$$(STAGING_DIR)/usr/lib" \ + CC=$$(TARGET_CC) \ + LD=$$(TARGET_CC) \ + CFLAGS="$$(LUAROCKS_CFLAGS)" \ + LIBFLAG="-shared $$(TARGET_LDFLAGS)" \ + $$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$($(2)_SRCDIR) && \ + LUAROCKS_CONFIG=$$(HOST_LUAROCKS_CONFIG_FILE) \ + $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ + DEPS_DIR="$$(HOST_DIR)" \ + CFLAGS="$$(HOST_LUAROCKS_CFLAGS)" \ + LIBFLAG="-shared $$(HOST_LDFLAGS)" \ + $$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC) endef endif @@ -85,4 +152,4 @@ endef ################################################################################ luarocks-package = $(call inner-luarocks-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -# host-luarocks-package not supported +host-luarocks-package = $(call inner-luarocks-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk index 185832bd0..3a34ba703 100644 --- a/buildroot/package/pkg-meson.mk +++ b/buildroot/package/pkg-meson.mk @@ -71,13 +71,14 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ + -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ + -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ + -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ @@ -86,6 +87,7 @@ define $(2)_CONFIGURE_CMDS --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef @@ -188,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ diff --git a/buildroot/package/pkg-qmake.mk b/buildroot/package/pkg-qmake.mk new file mode 100644 index 000000000..27727119d --- /dev/null +++ b/buildroot/package/pkg-qmake.mk @@ -0,0 +1,110 @@ +################################################################################ +# QMake package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for QMake packages. It should be used for all packages that use +# Qmake as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this QMake infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default QMake behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +################################################################################ +# inner-qmake-package -- defines how the configuration, compilation and +# installation of a qmake package should be done, implements a few hooks +# to tune the build process for qmake specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +################################################################################ + +define inner-qmake-package + +$(2)_CONF_ENV ?= +$(2)_CONF_OPTS ?= +$(2)_MAKE_ENV ?= +$(2)_MAKE_OPTS ?= +$(2)_INSTALL_STAGING_OPTS ?= install +$(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) + +ifneq ($(1),qt5base) +$(2)_DEPENDENCIES += qt5base +endif + +# +# Configure step. Only define it if not already defined by the package +# .mk file. +# +ifndef $(2)_CONFIGURE_CMDS +define $(2)_CONFIGURE_CMDS + $$(QT5_QT_CONF_FIXUP) + cd $$($(2)_BUILDDIR) && \ + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) +endef +endif + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) $$($(2)_MAKE_OPTS) +endef +endif + +# +# Staging installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_STAGING_CMDS +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) $$($(2)_INSTALL_STAGING_OPTS) +endef +endif + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +# Unfortunately we can't use INSTALL_ROOT to directly install to TARGET_DIR +# because in a crosscompile setup, the qmake generated install destinations +# are prefixed with the hardcoded sysroot (=STAGING_DIR) and hostprefix +# (=HOST_DIR). +# Instead we set INSTALL_ROOT, which comes before the install path, to a +# temporary folder inside the build directory and effectively install to +# $(@D)/tmp-target-install/$(STAGING_DIR) and $(@D)/tmp-target-install/$(HOST_DIR). +# We subsequently rsync only the files from the temporary staging dir and that +# way exclude files for the build host from target. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) INSTALL_ROOT=$$($(2)_BUILDDIR)tmp-target-install $$($(2)_INSTALL_TARGET_OPTS) + rsync -arv $$($(2)_BUILDDIR)tmp-target-install$$(STAGING_DIR)/ $$(TARGET_DIR)/ +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# qmake-package -- the target generator macro for QMake packages +################################################################################ + +qmake-package = $(call inner-qmake-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) diff --git a/buildroot/package/pkg-utils.mk b/buildroot/package/pkg-utils.mk index c4cafeeee..4fcb076e2 100644 --- a/buildroot/package/pkg-utils.mk +++ b/buildroot/package/pkg-utils.mk @@ -107,21 +107,29 @@ define _json-info-pkg "virtual": false$(comma) $(call _json-info-pkg-details,$(1)) \ ) + "build_dir": "$(patsubst $(BASE_DIR)/%,%,$($(1)_BUILDDIR))", + $(if $(filter target,$($(1)_TYPE)), \ + "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET))$(comma) \ + "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING))$(comma) \ + "install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES))$(comma) \ + ) "dependencies": [ $(call make-comma-list,$(sort $($(1)_FINAL_ALL_DEPENDENCIES))) ], "reverse_dependencies": [ $(call make-comma-list,$(sort $($(1)_RDEPENDENCIES))) ] + $(if $($(1)_IGNORE_CVES), + $(comma) "ignore_cves": [ + $(call make-comma-list,$(sort $($(1)_IGNORE_CVES))) + ] + ) endef define _json-info-pkg-details "version": "$($(1)_DL_VERSION)", "licenses": "$($(1)_LICENSE)", "dl_dir": "$($(1)_DL_SUBDIR)", - "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET)), - "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING)), - "install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), { diff --git a/buildroot/package/pkg-waf.mk b/buildroot/package/pkg-waf.mk index a32d5dab3..038d89454 100644 --- a/buildroot/package/pkg-waf.mk +++ b/buildroot/package/pkg-waf.mk @@ -36,8 +36,8 @@ define inner-waf-package -# We need host-python to run waf -$(2)_DEPENDENCIES += host-python +# We need host-python3 to run waf +$(2)_DEPENDENCIES += host-python3 $(2)_NEEDS_EXTERNAL_WAF ?= NO @@ -46,7 +46,7 @@ ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf else -$(2)_WAF = ./waf +$(2)_WAF ?= ./waf endif $(2)_BUILD_OPTS ?= @@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_CONFIGURE_OPTS) \ $$($(2)_CONF_ENV) \ - $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \ + $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \ --prefix=/usr \ --libdir=/usr/lib \ $$($(2)_CONF_OPTS) \ @@ -78,7 +78,7 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef @@ -91,7 +91,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_WAF_OPTS) @@ -105,7 +105,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_WAF_OPTS) diff --git a/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch index 5a9713d65..a7811752d 100644 --- a/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +++ b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -15,11 +15,13 @@ be prefixed by the sysroot, and which path should not be prefixed by the sysroot. So, let's simply have a whitelist of paths that should be prefixed: -includedir, libdir, mapdir, pkgdatadir and sdkdir. This list of -variables was collected over years of Buildroot development. All other -paths are not prefixed by the sysroot. +g_ir_scanner, g_ir_compiler, g_ir_generate, includedir, libdir, mapdir, +pkgdatadir and sdkdir. This list of variables was collected over years of +Buildroot development. All other paths are not prefixed by the sysroot. Signed-off-by: Thomas Petazzoni +[Updated to include gobject-introspection paths] +Signed-off-by: Adam Duskett --- libpkgconf/tuple.c | 60 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 18 deletions(-) @@ -28,7 +30,7 @@ diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c index 8523709..7cd2fff 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c -@@ -160,6 +160,18 @@ dequote(const char *value) +@@ -160,6 +160,21 @@ dequote(const char *value) return buf; } @@ -36,6 +38,9 @@ index 8523709..7cd2fff 100644 +pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot); + +const char *sysrooted_keys[] = { ++ "g_ir_scanner", ++ "g_ir_compiler", ++ "g_ir_generate", + "includedir", + "libdir", + "mapdir", diff --git a/buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch index 5453cba13..fbabfc8f2 100644 --- a/buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ b/buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch @@ -1,4 +1,4 @@ -From a3cb6e42fc2cfa0620ba737148fcbea0cf96a984 Mon Sep 17 00:00:00 2001 +From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 4 Aug 2015 10:14:00 +0200 Subject: [PATCH] poco: add the staging path to search path @@ -14,19 +14,21 @@ must be set from the make command line. Signed-off-by: Baruch Siach [Jörg: Update to version 1.6.1 from github] Signed-off-by: Jörg Krause +[Julien: Rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Data/MySQL/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index c6fc2ac1c..955fee2d4 100644 +index 64a7d3f82..955fee2d4 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -6,8 +6,8 @@ include $(POCO_BASE)/build/rules/global --SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient +-SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include +SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient +INCLUDE += -I$(MYSQL_INCDIR) @@ -34,5 +36,5 @@ index c6fc2ac1c..955fee2d4 100644 objects = Binder Extractor SessionImpl Connector \ -- -2.14.4 +2.26.2 diff --git a/buildroot/package/poco/0002-Add-support-for-m68000-1856.patch b/buildroot/package/poco/0002-Add-support-for-m68000-1856.patch index 1cf99bf09..bc04a9bf6 100644 --- a/buildroot/package/poco/0002-Add-support-for-m68000-1856.patch +++ b/buildroot/package/poco/0002-Add-support-for-m68000-1856.patch @@ -1,4 +1,4 @@ -From e49753f7654dc62087e47731832d5992cc4d194e Mon Sep 17 00:00:00 2001 +From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 23 Aug 2017 16:50:51 +0200 Subject: [PATCH] Add support for m68000 (#1856) @@ -8,16 +8,18 @@ Originally taken from https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da Signed-off-by: Thomas Petazzoni +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..a7bda0171 100644 +index c87cee13c..e891c0f10 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -65,6 +65,8 @@ - defined(__AARCH64EL__) || \ +@@ -66,6 +66,8 @@ + defined(__AARCH64EL__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#elif defined(__mc68000__) @@ -26,5 +28,5 @@ index 69cea1aca..a7bda0171 100644 #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. -- -2.14.4 +2.26.2 diff --git a/buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch index 8193457f9..c06eebe8b 100644 --- a/buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ b/buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch @@ -1,4 +1,4 @@ -From b077b4a5afbfde47288baed072152a6b7f318250 Mon Sep 17 00:00:00 2001 +From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:37:47 +0200 Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for @@ -10,23 +10,25 @@ allows Poco to build on AArch64 big-endian. Signed-off-by: Thomas Petazzoni Upstream: https://github.com/pocoproject/poco/pull/2378 +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index a7bda0171..fd49e1768 100644 +index e891c0f10..892f7db18 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -62,7 +62,7 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +@@ -63,7 +63,7 @@ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ + defined(__riscv) || \ +- defined(__AARCH64EL__) || \ ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) -- -2.14.4 +2.26.2 diff --git a/buildroot/package/poco/Config.in b/buildroot/package/poco/Config.in index 05e56eb6b..24514a371 100644 --- a/buildroot/package/poco/Config.in +++ b/buildroot/package/poco/Config.in @@ -5,13 +5,14 @@ config BR2_PACKAGE_POCO_ARCH_SUPPORTS depends on !BR2_microblaze depends on !BR2_mipsel depends on !BR2_or1k - depends on !BR2_riscv + depends on !BR2_RISCV_32 depends on !BR2_xtensa config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -89,9 +90,15 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_JSON + select BR2_PACKAGE_POCO_CRYPTO + endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/buildroot/package/poco/poco.hash b/buildroot/package/poco/poco.hash index 0cdaf0d3f..2a2629733 100644 --- a/buildroot/package/poco/poco.hash +++ b/buildroot/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 367014cdbcfe9df8f1d746239902149d2398af9b49ba2c1aaaa88616fd538f61 poco-1.9.4.tar.gz +sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/buildroot/package/poco/poco.mk b/buildroot/package/poco/poco.mk index d2b668ae1..c605044ba 100644 --- a/buildroot/package/poco/poco.mk +++ b/buildroot/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.9.4 +POCO_VERSION = 1.10.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -31,7 +31,8 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring @@ -59,6 +60,7 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ + --cflags=-std=c++14 \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ --unbundled \ diff --git a/buildroot/package/policycoreutils/policycoreutils.hash b/buildroot/package/policycoreutils/policycoreutils.hash index c601c7818..5dae18f17 100644 --- a/buildroot/package/policycoreutils/policycoreutils.hash +++ b/buildroot/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c53c344f28007b3c0742bd958751e9b5d2385898adeb8aec6281ae57342f0f7b policycoreutils-2.9.tar.gz +sha256 c889f62ee80f8b6a369469a9b8af51f5b797975aeaa291f5c5960cc12eed1934 policycoreutils-3.1.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/policycoreutils/policycoreutils.mk b/buildroot/package/policycoreutils/policycoreutils.mk index 6cd5a019c..4c0fdc71a 100644 --- a/buildroot/package/policycoreutils/policycoreutils.mk +++ b/buildroot/package/policycoreutils/policycoreutils.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 2.9 -POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +POLICYCOREUTILS_VERSION = 3.1 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk index ee0b3674d..3ae42b231 100644 --- a/buildroot/package/polkit/polkit.mk +++ b/buildroot/package/polkit/polkit.mk @@ -26,6 +26,13 @@ POLKIT_CONF_OPTS = \ --disable-libelogind \ --disable-libsystemd-login +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +POLKIT_CONF_OPTS += --enable-introspection +POLKIT_DEPENDENCIES += gobject-introspection +else +POLKIT_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLKIT_DEPENDENCIES += linux-pam POLKIT_CONF_OPTS += --with-authfw=pam diff --git a/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch b/buildroot/package/popt/0001-add-libiconv-to-popt.pc.patch similarity index 67% rename from buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch rename to buildroot/package/popt/0001-add-libiconv-to-popt.pc.patch index 087a30bb7..baa3cd530 100644 --- a/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch +++ b/buildroot/package/popt/0001-add-libiconv-to-popt.pc.patch @@ -8,12 +8,12 @@ Fixes: Signed-off-by: Fabrice Fontaine -diff -Naurp popt-1.16-vanilla/popt.pc.in popt-1.16/popt.pc.in ---- popt-1.16-vanilla/popt.pc.in 2018-11-22 20:26:55.735211662 +0100 -+++ popt-1.16/popt.pc.in 2018-11-22 20:34:11.371303724 +0100 +diff -Naurp popt-1.18-vanilla/popt.pc.in popt-1.18/popt.pc.in +--- popt-1.18-vanilla/popt.pc.in 2020-03-24 10:36:25.000000000 +0100 ++++ popt-1.18/popt.pc.in 2020-09-18 21:18:03.112609343 +0200 @@ -7,4 +7,5 @@ Name: popt Version: @VERSION@ Description: popt library. - Libs: @POPT_PKGCONFIG_LIBS@ + Libs: -L${libdir} -lpopt +Libs.private: @LTLIBICONV@ Cflags: -I${includedir} diff --git a/buildroot/package/popt/0001-no-wchar.patch b/buildroot/package/popt/0001-no-wchar.patch deleted file mode 100644 index 161165e72..000000000 --- a/buildroot/package/popt/0001-no-wchar.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru popt-1.14_vanilla/popthelp.c popt-1.14_no-wchar/popthelp.c ---- popt-1.14_vanilla/popthelp.c 2008-03-27 17:33:08.000000000 +0000 -+++ popt-1.14_no-wchar/popthelp.c 2008-04-10 05:44:43.000000000 +0000 -@@ -15,7 +15,7 @@ - #include - #endif - --#define POPT_WCHAR_HACK -+/* #define POPT_WCHAR_HACK */ - #ifdef POPT_WCHAR_HACK - #include /* for mbsrtowcs */ - /*@access mbstate_t @*/ diff --git a/buildroot/package/popt/0002-Detect-glob_pattern_p.patch b/buildroot/package/popt/0002-Detect-glob_pattern_p.patch new file mode 100644 index 000000000..f64ad36f8 --- /dev/null +++ b/buildroot/package/popt/0002-Detect-glob_pattern_p.patch @@ -0,0 +1,53 @@ +From 3938da1286534e4b280340411336eed5b6311d1b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 Jul 2020 23:21:32 +0200 +Subject: [PATCH] Detect glob_pattern_p() + +The current popt build system tests the existence of , and +then assumes that if __GLIBC__ is defined, then glob_pattern_p() must +be available. Unfortunately, that's not true with uClibc: may +be installed, but not necessarily the GNU glob extensions... and +uClibc defines __GLIBC__. This is causing build issues with certain +uClibc toolchains that do not have GNU glob extensions enabled. + +To fix this, this patch adds an AC_CHECK_FUNCS() test for +glob_pattern_p, and uses that to find out whether glob_pattern_p() is +available or not. + +Signed-off-by: Thomas Petazzoni +[Retrieved (and slightly updated) from: +https://git.buildroot.net/buildroot/tree/package/popt/0003-glob-detection.patch] +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/rpm-software-management/popt/commit/3938da1286534e4b280340411336eed5b6311d1b] +--- + configure.ac | 2 +- + src/poptconfig.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a5568c4..3b71d1a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ AC_ARG_ENABLE(build-gcov, + ]) + + AC_SEARCH_LIBS(setreuid, [ucb]) +-AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom) ++AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p) + + AM_GNU_GETTEXT_VERSION([0.18.2]) + AM_GNU_GETTEXT([external]) +diff --git a/src/poptconfig.c b/src/poptconfig.c +index 9d97ccd..b4d1b76 100644 +--- a/src/poptconfig.c ++++ b/src/poptconfig.c +@@ -21,7 +21,7 @@ + #if defined(HAVE_GLOB_H) + #include + +-#if !defined(__GLIBC__) ++#if !defined(HAVE_GLOB_PATTERN_P) + /* Return nonzero if PATTERN contains any metacharacters. + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ + static int diff --git a/buildroot/package/popt/0002-fix-autoreconf.patch b/buildroot/package/popt/0002-fix-autoreconf.patch deleted file mode 100644 index f1fcc57a8..000000000 --- a/buildroot/package/popt/0002-fix-autoreconf.patch +++ /dev/null @@ -1,38 +0,0 @@ -Make sure we can autoreconfigure popt - -This commit makes a few changes in the popt build system to allow it -to be autoreconfigured with modern autotools: - - - the TESTS variable shouldn't be using $(top_srcdir), and since we - don't care about tests in Buildroot, we just disable it. - - - the AM_C_PROTOTYPES macro is deprecated and should no longer be - used, causes an error with autoconf/automake. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,8 +37,6 @@ - TESTS_ENVIRONMENT = \ - test1="$(top_builddir)/test1" - --TESTS = $(top_srcdir)/testit.sh -- - include_HEADERS = popt.h - - usrlibdir = $(libdir) -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,6 @@ - AC_SYS_LARGEFILE - - AC_ISC_POSIX --AM_C_PROTOTYPES - - AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h) - diff --git a/buildroot/package/popt/0003-configure-replace-deprecated-macros.patch b/buildroot/package/popt/0003-configure-replace-deprecated-macros.patch new file mode 100644 index 000000000..32a6a8dc2 --- /dev/null +++ b/buildroot/package/popt/0003-configure-replace-deprecated-macros.patch @@ -0,0 +1,76 @@ +From f492b19f59229b0494b5b9ffe5c660a35493a405 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +Date: Mon, 29 Jun 2020 18:58:09 +0200 +Subject: [PATCH] configure: replace deprecated macros + +* use LT_INIT instead of deprecated AC_PROG_LIBTOOL +* use AS_HELP_STRING instead of deprecated AC_HELP_STRING +* quote macros + +[Retrieved from: +https://github.com/rpm-software-management/popt/commit/f492b19f59229b0494b5b9ffe5c660a35493a405] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + mode change 100755 => 100644 configure.ac + +diff --git a/configure.ac b/configure.ac +old mode 100755 +new mode 100644 +index 3b71d1a..009ae7b +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ +-AC_PREREQ(2.57) +-AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org) ++AC_PREREQ([2.57]) ++AC_INIT([popt], [1.18], [rpm-maint@lists.rpm.org]) + AC_CONFIG_SRCDIR([src/popt.h]) + AC_CONFIG_HEADERS([config.h]) + +@@ -14,11 +14,11 @@ AC_USE_SYSTEM_EXTENSIONS + AM_PROG_AR + + AC_PROG_INSTALL +-AC_PROG_LIBTOOL ++LT_INIT + + AC_SYS_LARGEFILE + +-AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h) ++AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) + + # For some systems we know that we have ld_version scripts. + # Use it then as default. +@@ -32,15 +32,15 @@ case "${host}" in + ;; + esac + AC_ARG_ENABLE([ld-version-script], +- AC_HELP_STRING([--enable-ld-version-script], ++ [AS_HELP_STRING([--enable-ld-version-script], + [enable/disable use of linker version script. +- (default is system dependent)]), ++ (default is system dependent)])], + [have_ld_version_script=$enableval], + [ : ] ) + AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") + +-AC_ARG_ENABLE(build-gcov, +- AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl ++AC_ARG_ENABLE([build-gcov], ++ [AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl + if test ".$enableval" = .yes; then + if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then + dnl # GNU GCC (usually "gcc") +@@ -49,8 +49,8 @@ AC_ARG_ENABLE(build-gcov, + fi + ]) + +-AC_SEARCH_LIBS(setreuid, [ucb]) +-AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p) ++AC_SEARCH_LIBS([setreuid], [ucb]) ++AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) + + AM_GNU_GETTEXT_VERSION([0.18.2]) + AM_GNU_GETTEXT([external]) diff --git a/buildroot/package/popt/0003-glob-detection.patch b/buildroot/package/popt/0003-glob-detection.patch deleted file mode 100644 index 7bdce7d71..000000000 --- a/buildroot/package/popt/0003-glob-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ -Detect glob_pattern_p() - -The current popt build system tests the existence of , and -then assumes that if __GLIBC__ is defined, then glob_pattern_p() must -be available. Unfortunately, that's not true with uClibc: may -be installed, but not necessarily the GNU glob extensions... and -uClibc defines __GLIBC__. This is causing build issues with certain -uClibc toolchains that do not have GNU glob extensions enabled. - -To fix this, this patch adds an AC_CHECK_FUNCS() test for -glob_pattern_p, and uses that to find out whether glob_pattern_p() is -available or not. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,7 @@ - AC_CHECK_FUNC(setreuid, [], [ - AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) - ]) --AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom) -+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom glob_pattern_p) - - AM_GNU_GETTEXT([external]) - AM_ICONV_LINK -Index: b/poptconfig.c -=================================================================== ---- a/poptconfig.c -+++ b/poptconfig.c -@@ -42,7 +42,7 @@ - /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ - #endif /* __LCLINT__ */ - --#if !defined(__GLIBC__) -+#if !defined(HAVE_GLOB_PATTERN_P) - /* Return nonzero if PATTERN contains any metacharacters. - Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ - static int diff --git a/buildroot/package/popt/0004-fix-build-without-wchar.patch b/buildroot/package/popt/0004-fix-build-without-wchar.patch new file mode 100644 index 000000000..a5bb09918 --- /dev/null +++ b/buildroot/package/popt/0004-fix-build-without-wchar.patch @@ -0,0 +1,53 @@ +From 41911aac46d69df6a205af59d60f23a418b0e875 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Sep 2020 11:55:17 +0200 +Subject: [PATCH] fix build without wchar + +Check for wchar.h and use HAVE_WCHAR_H instead of hardcoding +POPT_WCHAR_HACK to fix the build with (embedded) toolchains that don't +support wchar + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/rpm-software-management/popt/commit/41911aac46d69df6a205af59d60f23a418b0e875] +--- + configure.ac | 2 +- + src/popthelp.c | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 009ae7b..1fce6df 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ LT_INIT + + AC_SYS_LARGEFILE + +-AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) ++AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h]) + + # For some systems we know that we have ld_version scripts. + # Use it then as default. +diff --git a/src/popthelp.c b/src/popthelp.c +index 9a3f489..5cbc1f4 100644 +--- a/src/popthelp.c ++++ b/src/popthelp.c +@@ -15,8 +15,7 @@ + #include + #endif + +-#define POPT_WCHAR_HACK +-#ifdef POPT_WCHAR_HACK ++#ifdef HAVE_WCHAR_H + #include /* for mbsrtowcs */ + #endif + #include "poptint.h" +@@ -118,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp) + static inline size_t stringDisplayWidth(const char *s) + { + size_t n = strlen(s); +-#ifdef POPT_WCHAR_HACK ++#ifdef HAVE_WCHAR_H + mbstate_t t; + + memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ diff --git a/buildroot/package/popt/0005-fix-build-without-mbstate_t.patch b/buildroot/package/popt/0005-fix-build-without-mbstate_t.patch new file mode 100644 index 000000000..12bc73ee9 --- /dev/null +++ b/buildroot/package/popt/0005-fix-build-without-mbstate_t.patch @@ -0,0 +1,68 @@ +From e4788a0f9d820574a165b2609ff16b717ce0baba Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Sep 2020 18:51:15 +0200 +Subject: [PATCH] fix build without mbstate_t + +Commit 41911aac46d69df6a205af59d60f23a418b0e875 tried to fix build +without wchar by checking for the availability of wchar.h however some +toolchains have wchar.h but does not define mbstate_t and mbsrtowcs so +replace HAVE_WCHAR_H by HAVE_MBSRTOWCS + +Fixes: + - http://autobuild.buildroot.org/results/27f184af35468941173628e5e847a284c0b80d73 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/rpm-software-management/popt/pull/51] +--- + configure.ac | 4 ++-- + src/popthelp.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1fce6df..442086b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ LT_INIT + + AC_SYS_LARGEFILE + +-AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h]) ++AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) + + # For some systems we know that we have ld_version scripts. + # Use it then as default. +@@ -50,7 +50,7 @@ AC_ARG_ENABLE([build-gcov], + ]) + + AC_SEARCH_LIBS([setreuid], [ucb]) +-AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) ++AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs]) + + AM_GNU_GETTEXT_VERSION([0.18.2]) + AM_GNU_GETTEXT([external]) +diff --git a/src/popthelp.c b/src/popthelp.c +index f604516..b4ab9b4 100644 +--- a/src/popthelp.c ++++ b/src/popthelp.c +@@ -15,7 +15,7 @@ + #include + #endif + +-#ifdef HAVE_WCHAR_H ++#ifdef HAVE_MBSRTOWCS + #include /* for mbsrtowcs */ + #endif + #include "poptint.h" +@@ -117,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp) + static inline size_t stringDisplayWidth(const char *s) + { + size_t n = strlen(s); +-#ifdef HAVE_WCHAR_H ++#ifdef HAVE_MBSRTOWCS + mbstate_t t; + + memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ +-- +2.28.0 + diff --git a/buildroot/package/popt/Config.in b/buildroot/package/popt/Config.in index cbcdc15dc..80bac7ff6 100644 --- a/buildroot/package/popt/Config.in +++ b/buildroot/package/popt/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_POPT help Popt is a C library for parsing command line parameters. - http://rpm5.org + https://github.com/rpm-software-management/popt diff --git a/buildroot/package/popt/popt.hash b/buildroot/package/popt/popt.hash index 1422f4b92..9b5efe4be 100644 --- a/buildroot/package/popt/popt.hash +++ b/buildroot/package/popt/popt.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 popt-1.16.tar.gz -sha256 518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5 COPYING +sha256 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 popt-1.18.tar.gz +sha256 518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5 COPYING diff --git a/buildroot/package/popt/popt.mk b/buildroot/package/popt/popt.mk index 99c5138bd..5c4863ce4 100644 --- a/buildroot/package/popt/popt.mk +++ b/buildroot/package/popt/popt.mk @@ -4,14 +4,15 @@ # ################################################################################ -POPT_VERSION = 1.16 -POPT_SITE = http://rpm5.org/files/popt +POPT_VERSION = 1.18 +POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING -POPT_AUTORECONF = YES POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# We're patching configure.ac +POPT_AUTORECONF = YES POPT_CONF_ENV = ac_cv_va_copy=yes diff --git a/buildroot/package/powerpc-utils/powerpc-utils.hash b/buildroot/package/powerpc-utils/powerpc-utils.hash index 0e86d8cca..8d0b10425 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.hash +++ b/buildroot/package/powerpc-utils/powerpc-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-1.3.5.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4e3a21419863c08adde49f0795eff0fbfe4597ce82593fa5fe1f1177913fb7b9 powerpc-utils-1.3.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/powerpc-utils/powerpc-utils.mk b/buildroot/package/powerpc-utils/powerpc-utils.mk index 221e5b04e..cd96435a7 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.mk +++ b/buildroot/package/powerpc-utils/powerpc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -POWERPC_UTILS_VERSION = 1.3.5 +POWERPC_UTILS_VERSION = 1.3.8 POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,v$(POWERPC_UTILS_VERSION)) POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES @@ -13,12 +13,13 @@ POWERPC_UTILS_LICENSE_FILES = COPYING POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +POWERPC_UTILS_CONF_OPTS = --disable-werror ifeq ($(BR2_PACKAGE_POWERPC_UTILS_RTAS),y) POWERPC_UTILS_DEPENDENCIES += librtas -POWERPC_UTILS_CONF_OPTS = --with-librtas +POWERPC_UTILS_CONF_OPTS += --with-librtas else -POWERPC_UTILS_CONF_OPTS = --without-librtas +POWERPC_UTILS_CONF_OPTS += --without-librtas endif $(eval $(autotools-package)) diff --git a/buildroot/package/powertop/powertop.hash b/buildroot/package/powertop/powertop.hash index a3261789d..fc8f3cc52 100644 --- a/buildroot/package/powertop/powertop.hash +++ b/buildroot/package/powertop/powertop.hash @@ -1,3 +1,5 @@ -# Locally-generated hash -sha256 ae68c913784f78b497076e0b1d588f59854a66c074690d545dae7956e4f5d64f powertop-v2.11-1-g7ef7f79.tar.gz -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +# Locally calculated after checking pgp signature +# https://01.org/sites/default/files/downloads/powertop-2.13.tar.gz.asc.txt +# using key 22E8F306C8FA4BAA2A5F36F3A0303B060918941C +sha256 a65f992ca4a419bc73b623651060eb9fc00c5a86fa03556358cd9db011ef3178 powertop-2.13.tar.gz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/powertop/powertop.mk b/buildroot/package/powertop/powertop.mk index 3dbc015ce..c3e8d2549 100644 --- a/buildroot/package/powertop/powertop.mk +++ b/buildroot/package/powertop/powertop.mk @@ -4,9 +4,8 @@ # ################################################################################ -POWERTOP_VERSION = 2.11 +POWERTOP_VERSION = 2.13 POWERTOP_SITE = https://01.org/sites/default/files/downloads -POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION)-1-g7ef7f79.tar.gz POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) POWERTOP_LICENSE = GPL-2.0 diff --git a/buildroot/package/prelink-cross/prelink-cross.hash b/buildroot/package/prelink-cross/prelink-cross.hash new file mode 100644 index 000000000..3ac33ac3d --- /dev/null +++ b/buildroot/package/prelink-cross/prelink-cross.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/buildroot/package/prelink-cross/prelink-cross.mk b/buildroot/package/prelink-cross/prelink-cross.mk new file mode 100644 index 000000000..2312ee53e --- /dev/null +++ b/buildroot/package/prelink-cross/prelink-cross.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# host-prelink-cross +# +################################################################################ + +PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2 +PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross +PRELINK_CROSS_SITE_METHOD = git +PRELINK_CROSS_LICENSE = GPL-2.0+ +PRELINK_CROSS_LICENSE_FILES = COPYING +# Sources from git, no configure script present +PRELINK_CROSS_AUTORECONF = YES +HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty + +$(eval $(host-autotools-package)) diff --git a/buildroot/package/privoxy/privoxy.hash b/buildroot/package/privoxy/privoxy.hash index 9cf08f116..84daf5c61 100644 --- a/buildroot/package/privoxy/privoxy.hash +++ b/buildroot/package/privoxy/privoxy.hash @@ -1,5 +1,6 @@ -# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.26%20%28stable%29/ -md5 8a1c842112ccea68c19b7ceb4a0e999f privoxy-3.0.26-stable-src.tar.gz -sha1 b646624006225979f83453ba542e448667f45998 privoxy-3.0.26-stable-src.tar.gz +# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.28%20%28stable%29/ +md5 c7e8900d5aff33d9a5fc37ac28154f21 privoxy-3.0.28-stable-src.tar.gz +sha1 fa8f9f355a48afe94afcaef31c5404b2294c1043 privoxy-3.0.28-stable-src.tar.gz # Locally computed +sha256 b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a privoxy-3.0.28-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/privoxy/privoxy.mk b/buildroot/package/privoxy/privoxy.mk index df0e7372a..f12d015ef 100644 --- a/buildroot/package/privoxy/privoxy.mk +++ b/buildroot/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.26 +PRIVOXY_VERSION = 3.0.28 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped diff --git a/buildroot/package/procps-ng/S02sysctl b/buildroot/package/procps-ng/S02sysctl index 3a58578de..85d9ed50d 100644 --- a/buildroot/package/procps-ng/S02sysctl +++ b/buildroot/package/procps-ng/S02sysctl @@ -1,4 +1,17 @@ #!/bin/sh +# +# This script is used by busybox and procps-ng. +# +# With procps-ng, the "--system" option of sysctl also enables "--ignore", so +# errors are not reported via syslog. Use the run_logger function to mimic the +# --system behavior, still reporting errors via syslog. Users not interested +# on error reports can add "-e" to SYSCTL_ARGS. +# +# busybox does not have a "--system" option neither reports errors via syslog, +# so the scripting provides a consistent behavior between the implementations. +# Testing the busybox sysctl exit code is fruitless, as at the moment, since +# its exit status is zero even if errors happen. Hopefully this will be fixed +# in a future busybox version. PROGRAM="sysctl" @@ -12,38 +25,55 @@ SYSCTL_ARGS="" # symlinks to it. No attempt is made to prevent this. SYSCTL_SOURCES="/etc/sysctl.d/ /usr/local/lib/sysctl.d/ /usr/lib/sysctl.d/ /lib/sysctl.d/ /etc/sysctl.conf" -# The "--system" option activates "--ignore", which is bad because invalid -# variable settings in the configuration files will not be reported on the -# system log. Use some scripting to mimic the --system behavior but still -# reporting errors. Users not interested on error report can put "-e" in -# SYSCTL_ARGS. -# -# The file redirections do the following: +# If the logger utility is available all messages are sent to syslog, except +# for the final status. The file redirections do the following: # # - stdout is redirected to syslog with facility.level "kern.info" # - stderr is redirected to syslog with facility.level "kern.err" # - file dscriptor 4 is used to pass the result to the "start" function. # -run_program() { +run_logger() { # shellcheck disable=SC2086 # we need the word splitting find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ xargs -0 -r -n 1 readlink -f | { prog_status="OK" while :; do - read -r file - if [ -z "$file" ]; then + read -r file || { echo "$prog_status" >&4 break - fi + } echo "* Applying $file ..." /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err } 3>&1 | /usr/bin/logger -t sysctl -p kern.info } +# If logger is not available all messages are sent to stdout/stderr. +run_std() { + # shellcheck disable=SC2086 # we need the word splitting + find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ + xargs -0 -r -n 1 readlink -f | { + prog_status="OK" + while :; do + read -r file || { + echo "$prog_status" >&4 + break + } + echo "* Applying $file ..." + /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + done + } +} + +if [ -x /usr/bin/logger ]; then + run_program="run_logger" +else + run_program="run_std" +fi + start() { printf '%s %s: ' "$1" "$PROGRAM" - status=$(run_program 4>&1) + status=$("$run_program" 4>&1) echo "$status" if [ "$status" = "OK" ]; then return 0 diff --git a/buildroot/package/procps-ng/procps-ng.mk b/buildroot/package/procps-ng/procps-ng.mk index 6a41e9b32..5bafc7ee9 100644 --- a/buildroot/package/procps-ng/procps-ng.mk +++ b/buildroot/package/procps-ng/procps-ng.mk @@ -44,6 +44,11 @@ ifeq ($(BR2_STATIC_LIBS),y) PROCPS_NG_CONF_OPTS += --disable-numa endif +# Avoid installing S02sysctl, since openrc provides /etc/init.d/sysctl. +define PROCPS_NG_INSTALL_INIT_OPENRC + @: +endef + define PROCPS_NG_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/procps-ng/S02sysctl \ $(TARGET_DIR)/etc/init.d/S02sysctl diff --git a/buildroot/package/proftpd/Config.in b/buildroot/package/proftpd/Config.in index 4a544f0c5..4898f49dd 100644 --- a/buildroot/package/proftpd/Config.in +++ b/buildroot/package/proftpd/Config.in @@ -47,6 +47,13 @@ config BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE endif +config BR2_PACKAGE_PROFTPD_MOD_SFTP_SQL + bool "mod_sftp_sql support" + select BR2_PACKAGE_PROFTPD_MOD_SQL + select BR2_PACKAGE_PROFTPD_MOD_SFTP + help + Compile ProFTPD with mod_sftp_sql support + config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB bool "mod_quotatab support" help diff --git a/buildroot/package/proftpd/proftpd.mk b/buildroot/package/proftpd/proftpd.mk index 946a37d69..e126d0e0a 100644 --- a/buildroot/package/proftpd/proftpd.mk +++ b/buildroot/package/proftpd/proftpd.mk @@ -60,6 +60,10 @@ PROFTPD_MODULES += mod_sql_sqlite PROFTPD_DEPENDENCIES += sqlite endif +ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP_SQL),y) +PROFTPD_MODULES += mod_sftp_sql +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_QUOTATAB),y) PROFTPD_MODULES += mod_quotatab endif diff --git a/buildroot/package/proj/proj.hash b/buildroot/package/proj/proj.hash index ade9502b6..0d59d54e2 100644 --- a/buildroot/package/proj/proj.hash +++ b/buildroot/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from http://download.osgeo.org/proj/proj-6.3.0.tar.gz.md5 -md5 09243feb4f243a2bdd455035a2007384 proj-6.3.0.tar.gz +# Fetched from http://download.osgeo.org/proj/proj-7.1.1.tar.gz.md5 +md5 b7ce84943dcf2b660b11c2ef9657dad5 proj-7.1.1.tar.gz # Locally calculated -sha256 68ce9ba0005d442c2c1d238a3b9bc6654c358159b4af467b91e8d5b407c79c77 proj-6.3.0.tar.gz -sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING +sha256 324e7abb5569fb5f787dadf1d4474766915c485a188cf48cf07153b99156b5f9 proj-7.1.1.tar.gz +sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING diff --git a/buildroot/package/proj/proj.mk b/buildroot/package/proj/proj.mk index 2be000402..663db4abc 100644 --- a/buildroot/package/proj/proj.mk +++ b/buildroot/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 6.3.0 +PROJ_VERSION = 7.1.1 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING @@ -23,4 +23,18 @@ PROJ_CONF_ENV = \ CFLAGS="$(PROJ_CFLAGS)" \ CXXFLAGS="$(PROJ_CXXFLAGS)" +ifeq ($(BR2_PACKAGE_LIBCURL),y) +PROJ_DEPENDENCIES += libcurl +PROJ_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr/bin/curl-config +else +PROJ_CONF_OPTS += --without-curl +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +PROJ_DEPENDENCIES += tiff +PROJ_CONF_OPTS += --enable-tiff +else +PROJ_CONF_OPTS += --disable-tiff +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/prosody/Config.in b/buildroot/package/prosody/Config.in index c32ca20e2..d93350702 100644 --- a/buildroot/package/prosody/Config.in +++ b/buildroot/package/prosody/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_PROSODY bool "prosody" depends on BR2_USE_MMU # fork depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on !BR2_PACKAGE_LUA_5_3 + depends on !BR2_PACKAGE_LUA_5_4 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime @@ -22,5 +22,5 @@ comment "prosody needs the lua interpreter, dynamic library" depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_STATIC_LIBS depends on BR2_USE_MMU -comment "prosody needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 +comment "prosody needs a Lua <= 5.3" + depends on BR2_PACKAGE_LUA_5_4 diff --git a/buildroot/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash index e39fafde6..dc4e567d4 100644 --- a/buildroot/package/prosody/prosody.hash +++ b/buildroot/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 375a3737ffd6831d967fb1917f097372 prosody-0.11.4.tar.gz -sha1 59e9e684230c26daf53526e18b0e6e2efb0d63c5 prosody-0.11.4.tar.gz -sha256 b5f26fa343c7f32f6242721d6991cb35f5d2a28d2bf59d2bc329a940523704fd prosody-0.11.4.tar.gz -sha512 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3 prosody-0.11.4.tar.gz +md5 a9bf18a713804b5cc9d0322d1bf5d5d8 prosody-0.11.7.tar.gz +sha1 425e1c7ca37464b31711da8eb4a4c9444a70360f prosody-0.11.7.tar.gz +sha256 28ffc07653485cb63e22b387d3ea4825ee2baaee0c5827de4d6053a35b1c8747 prosody-0.11.7.tar.gz +sha512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20 prosody-0.11.7.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/buildroot/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk index 7245afdc6..ad51f6797 100644 --- a/buildroot/package/prosody/prosody.mk +++ b/buildroot/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.4 +PROSODY_VERSION = 0.11.7 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING diff --git a/buildroot/package/protobuf-c/protobuf-c.hash b/buildroot/package/protobuf-c/protobuf-c.hash index 4f9c75a02..abc11afc5 100644 --- a/buildroot/package/protobuf-c/protobuf-c.hash +++ b/buildroot/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5205312e561b75b9d2db671b22f28d67afb5c7d1fef94a6f2d29d775ca4e0519 protobuf-c-1.3.2.tar.gz -sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE +sha256 8515da8b84ea36768ae69a52f9ede8d718936d6058077265b6e458cfc55f8bdb protobuf-c-1.3.3.tar.gz +sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE diff --git a/buildroot/package/protobuf-c/protobuf-c.mk b/buildroot/package/protobuf-c/protobuf-c.mk index 2770d35b7..f28f5ff57 100644 --- a/buildroot/package/protobuf-c/protobuf-c.mk +++ b/buildroot/package/protobuf-c/protobuf-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.3.2 +PROTOBUF_C_VERSION = 1.3.3 PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,v$(PROTOBUF_C_VERSION)) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf diff --git a/buildroot/package/protobuf/protobuf.hash b/buildroot/package/protobuf/protobuf.hash index 5ebf99a99..c11f54edc 100644 --- a/buildroot/package/protobuf/protobuf.hash +++ b/buildroot/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5abfd5bf11dc0a14bb2303883fa76ecde48a4b447eb2f9f90b84592ce8b8707c protobuf-cpp-3.11.0.tar.gz -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 f8a547dfe143a9f61fadafba47fa6573713a33cb80909307c1502e26e1102298 protobuf-cpp-3.13.0.tar.gz diff --git a/buildroot/package/protobuf/protobuf.mk b/buildroot/package/protobuf/protobuf.mk index ed21f13c4..5f2690603 100644 --- a/buildroot/package/protobuf/protobuf.mk +++ b/buildroot/package/protobuf/protobuf.mk @@ -5,9 +5,9 @@ ################################################################################ # When bumping this package, make sure to also verify if the -# python-protobuf package still works, as they share the same -# version/site variables. -PROTOBUF_VERSION = 3.11.0 +# python-protobuf package still works and to update its hash, +# as they share the same version/site variables. +PROTOBUF_VERSION = 3.13.0 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/buildroot/package/pru-software-support/pru-software-support.hash b/buildroot/package/pru-software-support/pru-software-support.hash index 9deb3e666..cd81488e1 100644 --- a/buildroot/package/pru-software-support/pru-software-support.hash +++ b/buildroot/package/pru-software-support/pru-software-support.hash @@ -1,3 +1,3 @@ # Locally-calculated hash -sha256 d6d1f76ab5a50dbdf1dff834b271f9d3ffa7424e4d9615e00713f3f81ed5787e pru-software-support-package-v5.6.0.tar.gz -sha256 a68530804624227e4f2e007eacb5c2d616695426082e895ee1e2d77d3833f5f7 PRU-Package-v6.0-Manifest.html +sha256 57e47128dc5437c5a64d4ef94f419d9ea38e894c0c31ab10cad99c0da614b296 pru-software-support-package-v5.7.0.tar.gz +sha256 62a2f56498cd1bac2d4ea6ea1c941affba1e4bb65bfdf2dcffd8e5079fa34399 PRU-Package-v6.1-Manifest.html diff --git a/buildroot/package/pru-software-support/pru-software-support.mk b/buildroot/package/pru-software-support/pru-software-support.mk index b56ac0af1..91f41bcb9 100644 --- a/buildroot/package/pru-software-support/pru-software-support.mk +++ b/buildroot/package/pru-software-support/pru-software-support.mk @@ -4,12 +4,11 @@ # ################################################################################ -PRU_SOFTWARE_SUPPORT_VERSION = 5.6.0 -# https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot/pru-software-support-package-5.6.0.tar.gz +PRU_SOFTWARE_SUPPORT_VERSION = 5.7.0 PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot PRU_SOFTWARE_SUPPORT_SOURCE = $(PRU_SOFTWARE_SUPPORT_NAME)-package-v$(PRU_SOFTWARE_SUPPORT_VERSION).tar.gz -PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, GPL-2.0, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v6.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, Public Domain +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v6.1-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru diff --git a/buildroot/package/psplash/psplash-quit.service b/buildroot/package/psplash/psplash-quit.service deleted file mode 100644 index 14bd4994b..000000000 --- a/buildroot/package/psplash/psplash-quit.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Terminate Psplash Boot Screen -After=psplash-start.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/psplash-write QUIT -TimeoutSec=20 - -[Install] -WantedBy=multi-user.target diff --git a/buildroot/package/psplash/psplash-start.service b/buildroot/package/psplash/psplash-start.service index 2de3cfce2..b97e883e5 100644 --- a/buildroot/package/psplash/psplash-start.service +++ b/buildroot/package/psplash/psplash-start.service @@ -1,8 +1,7 @@ [Unit] Description=Starts Psplash Boot screen -Wants=systemd-vconsole-setup.service -After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service DefaultDependencies=no +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash -n diff --git a/buildroot/package/psplash/psplash-systemd.service b/buildroot/package/psplash/psplash-systemd.service new file mode 100644 index 000000000..249aa5403 --- /dev/null +++ b/buildroot/package/psplash/psplash-systemd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/buildroot/package/psplash/psplash.hash b/buildroot/package/psplash/psplash.hash index c8865697c..46d5e12ce 100644 --- a/buildroot/package/psplash/psplash.hash +++ b/buildroot/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aaddb20ef892dfb03d4e046cc634159bbcdfe555f7291652dde2b7d4cf491289 psplash-5b3c1cc28f5abdc2c33830150b48b278cc4f7bca.tar.gz +sha256 0042192bf94be4f5792d9ff6b7a2ddff77c79e51274745180d14be5815b3a0f4 psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c.tar.gz sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/buildroot/package/psplash/psplash.mk b/buildroot/package/psplash/psplash.mk index 3dd2f4d57..a0f01869b 100644 --- a/buildroot/package/psplash/psplash.mk +++ b/buildroot/package/psplash/psplash.mk @@ -4,18 +4,26 @@ # ################################################################################ -PSPLASH_VERSION = 5b3c1cc28f5abdc2c33830150b48b278cc4f7bca +PSPLASH_VERSION = fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c PSPLASH_SITE = git://git.yoctoproject.org/psplash PSPLASH_LICENSE = GPL-2.0+ PSPLASH_LICENSE_FILES = COPYING PSPLASH_AUTORECONF = YES +PSPLASH_DEPENDENCIES = host-gdk-pixbuf host-pkgconf + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PSPLASH_DEPENDENCIES += systemd +PSPLASH_CONF_OPTS += --with-systemd +else +PSPLASH_CONF_OPTS += --without-systemd +endif define PSPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ - $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service + $(INSTALL) -D -m 644 package/psplash/psplash-systemd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/psplash-systemd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/pulseview/0002-Replace-obsolete-deprecated-Qt-methods.patch b/buildroot/package/pulseview/0002-Replace-obsolete-deprecated-Qt-methods.patch new file mode 100644 index 000000000..42cdc467b --- /dev/null +++ b/buildroot/package/pulseview/0002-Replace-obsolete-deprecated-Qt-methods.patch @@ -0,0 +1,133 @@ +From caacc9bc622238ca48674ea6f40d07466e4b97a5 Mon Sep 17 00:00:00 2001 +From: Valentin Ochs +Date: Sat, 20 Jun 2020 16:01:27 +0200 +Subject: [PATCH] Replace obsolete/deprecated Qt methods + +[Thomas: Backport from upstream commit +ae726b70a7ada9a4be5808e00f0c951318479684, one conflict manually +resolved in pv/util.cpp.] +Signed-off-by: Thomas Petazzoni +--- + pv/util.cpp | 21 +++++++++++++++++++-- + pv/util.hpp | 10 ++++++++++ + pv/views/trace/decodetrace.cpp | 3 ++- + pv/views/trace/ruler.cpp | 2 +- + pv/widgets/timestampspinbox.cpp | 2 +- + 5 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/pv/util.cpp b/pv/util.cpp +index 49b9467c..2a63038d 100644 +--- a/pv/util.cpp ++++ b/pv/util.cpp +@@ -137,7 +137,7 @@ QString format_time_si(const Timestamp& v, SIPrefix prefix, + QString s; + QTextStream ts(&s); + if (sign && !v.is_zero()) +- ts << forcesign; ++ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); + ts << qSetRealNumberPrecision(precision) << (v * multiplier) << ' ' + << prefix << unit; + +@@ -171,7 +171,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision, + QString s; + QTextStream ts(&s); + if (sign && (v != 0)) +- ts << forcesign; ++ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); + ts.setRealNumberNotation(QTextStream::FixedNotation); + ts.setRealNumberPrecision(precision); + ts << (v * multiplier) << ' ' << prefix << unit; +@@ -281,5 +281,22 @@ vector split_string(string text, string separator) + return result; + } + ++/** ++ * Return the width of a string in a given font. ++ * ++ * @param[in] metric metrics of the font ++ * @param[in] string the string whose width should be determined ++ * ++ * @return width of the string in pixels ++ */ ++std::streamsize text_width(const QFontMetrics &metric, const QString &string) ++{ ++#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) ++ return metric.horizontalAdvance(string); ++#else ++ return metric.width(string); ++#endif ++} ++ + } // namespace util + } // namespace pv +diff --git a/pv/util.hpp b/pv/util.hpp +index dd7be222..ad904f85 100644 +--- a/pv/util.hpp ++++ b/pv/util.hpp +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + using std::string; + using std::vector; +@@ -137,6 +138,15 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0, + + vector split_string(string text, string separator); + ++/** ++ * Return the width of a string in a given font. ++ * @param[in] metric metrics of the font ++ * @param[in] string the string whose width should be determined ++ * ++ * @return width of the string in pixels ++ */ ++std::streamsize text_width(const QFontMetrics &metric, const QString &string); ++ + } // namespace util + } // namespace pv + +diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp +index 9c7196bf..1ee7ae9f 100644 +--- a/pv/views/trace/decodetrace.cpp ++++ b/pv/views/trace/decodetrace.cpp +@@ -103,7 +103,8 @@ DecodeTrace::DecodeTrace(pv::Session &session, + + // Determine shortest string we want to see displayed in full + QFontMetrics m(QApplication::font()); +- min_useful_label_width_ = m.width("XX"); // e.g. two hex characters ++ // e.g. two hex characters ++ min_useful_label_width_ = util::text_width(m, "XX"); + + // For the base color, we want to start at a very different color for + // every decoder stack, so multiply the index with a number that is +diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp +index acea8a36..68134966 100644 +--- a/pv/views/trace/ruler.cpp ++++ b/pv/views/trace/ruler.cpp +@@ -218,7 +218,7 @@ void Ruler::paintEvent(QPaintEvent*) + const int rightedge = width(); + const int x_tick = tick.first; + if ((x_tick > leftedge) && (x_tick < rightedge)) { +- const int x_left_bound = QFontMetrics(font()).width(tick.second) / 2; ++ const int x_left_bound = util::text_width(QFontMetrics(font()), tick.second) / 2; + const int x_right_bound = rightedge - x_left_bound; + const int x_legend = min(max(x_tick, x_left_bound), x_right_bound); + p.drawText(x_legend, ValueMargin, 0, text_height, +diff --git a/pv/widgets/timestampspinbox.cpp b/pv/widgets/timestampspinbox.cpp +index 21b3d0d7..383aed1f 100644 +--- a/pv/widgets/timestampspinbox.cpp ++++ b/pv/widgets/timestampspinbox.cpp +@@ -75,7 +75,7 @@ QSize TimestampSpinBox::minimumSizeHint() const + { + const QFontMetrics fm(fontMetrics()); + const int l = round(value_).str().size() + precision_ + 10; +- const int w = fm.width(QString(l, '0')); ++ const int w = util::text_width(fm, QString(l, '0')); + const int h = lineEdit()->minimumSizeHint().height(); + return QSize(w, h); + } +-- +2.26.2 + diff --git a/buildroot/package/python-aioconsole/python-aioconsole.hash b/buildroot/package/python-aioconsole/python-aioconsole.hash index 28c841cf1..0aa9a7882 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.hash +++ b/buildroot/package/python-aioconsole/python-aioconsole.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 918caf70f00a3fbc8a61cd74579da1c4 aioconsole-0.1.15.tar.gz -sha256 498e567805b74c1ecf4501d28e48727e8e77af8d6a0b8f1b7aa9a4842e02743d aioconsole-0.1.15.tar.gz +md5 a8b0640a1e2a3869baf4efcbb1182fbe aioconsole-0.3.0.tar.gz +sha256 b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5 aioconsole-0.3.0.tar.gz diff --git a/buildroot/package/python-aioconsole/python-aioconsole.mk b/buildroot/package/python-aioconsole/python-aioconsole.mk index 83c694fe3..5c26d863c 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.mk +++ b/buildroot/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.1.15 +PYTHON_AIOCONSOLE_VERSION = 0.3.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c4/68/56b09bf94aff8e02a6080493b3f85bdf7ddea7e4f264e6a90a158e064898 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/d1/bc/2e52bd41293e63d95fcb6c5de406d43ccbb91255a48feaa22c1b8e2e4a40 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 diff --git a/buildroot/package/python-aiofiles/Config.in b/buildroot/package/python-aiofiles/Config.in new file mode 100644 index 000000000..9cc3d7fe5 --- /dev/null +++ b/buildroot/package/python-aiofiles/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOFILES + bool "python-aiofiles" + depends on BR2_PACKAGE_PYTHON3 + help + aiofiles aims to handle local disk files in + asyncio applications. + + https://pypi.org/project/aiofiles diff --git a/buildroot/package/python-aiofiles/python-aiofiles.hash b/buildroot/package/python-aiofiles/python-aiofiles.hash new file mode 100644 index 000000000..3c3e8565a --- /dev/null +++ b/buildroot/package/python-aiofiles/python-aiofiles.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiofiles/json +md5 2243eff06072115e8afe8907677ca51d aiofiles-0.5.0.tar.gz +sha256 98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af aiofiles-0.5.0.tar.gz +# Locally computed sha256 checksums +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/buildroot/package/python-aiofiles/python-aiofiles.mk b/buildroot/package/python-aiofiles/python-aiofiles.mk new file mode 100644 index 000000000..28f41e396 --- /dev/null +++ b/buildroot/package/python-aiofiles/python-aiofiles.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiofiles +# +################################################################################ + +PYTHON_AIOFILES_VERSION = 0.5.0 +PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/2b/64/437053d6a4ba3b3eea1044131a25b458489320cb9609e19ac17261e4dc9b +PYTHON_AIOFILES_SETUP_TYPE = setuptools +PYTHON_AIOFILES_LICENSE = Apache-2.0 +PYTHON_AIOFILES_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiozipkin/python-aiozipkin.hash b/buildroot/package/python-aiozipkin/python-aiozipkin.hash index 803438175..af07285c2 100644 --- a/buildroot/package/python-aiozipkin/python-aiozipkin.hash +++ b/buildroot/package/python-aiozipkin/python-aiozipkin.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiozipkin/json -md5 01766aa607ae121d2cbb3ebf15a8cd0b aiozipkin-0.6.0.tar.gz -sha256 7270cdaff81f4a6ea70de48b3e4597629c3beef76740bfe6f7c9b58b45b67c73 aiozipkin-0.6.0.tar.gz +md5 7be9acaa48d4d4dc14abcc79edfd6c16 aiozipkin-0.7.1.tar.gz +sha256 aa99984832225378d900a5cd0d4e8e89af7ec9f359612c2e311f55b9039ed501 aiozipkin-0.7.1.tar.gz # Locally computed sha256 checksums -sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/buildroot/package/python-aiozipkin/python-aiozipkin.mk b/buildroot/package/python-aiozipkin/python-aiozipkin.mk index 2f5b54be6..e351dbacf 100644 --- a/buildroot/package/python-aiozipkin/python-aiozipkin.mk +++ b/buildroot/package/python-aiozipkin/python-aiozipkin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOZIPKIN_VERSION = 0.6.0 +PYTHON_AIOZIPKIN_VERSION = 0.7.1 PYTHON_AIOZIPKIN_SOURCE = aiozipkin-$(PYTHON_AIOZIPKIN_VERSION).tar.gz -PYTHON_AIOZIPKIN_SITE = https://files.pythonhosted.org/packages/8d/14/33c79497c3082dd93172f834e4f3d1d6d0eb9b957b6885c919ca73462ed6 +PYTHON_AIOZIPKIN_SITE = https://files.pythonhosted.org/packages/9e/33/120925f90470b7f52f46e2b9f71caf2514e389f42b3ed3b62f6389baee95 PYTHON_AIOZIPKIN_SETUP_TYPE = setuptools PYTHON_AIOZIPKIN_LICENSE = Apache-2.0 PYTHON_AIOZIPKIN_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-ansicolors/Config.in b/buildroot/package/python-ansicolors/Config.in new file mode 100644 index 000000000..78da50dfc --- /dev/null +++ b/buildroot/package/python-ansicolors/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ANSICOLORS + bool "python-ansicolors" + help + ANSI colors for Python. + + http://github.com/jonathaneunice/colors/ diff --git a/buildroot/package/python-ansicolors/python-ansicolors.hash b/buildroot/package/python-ansicolors/python-ansicolors.hash new file mode 100644 index 000000000..9fb51eb5d --- /dev/null +++ b/buildroot/package/python-ansicolors/python-ansicolors.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ansicolors/json +md5 9ca7e2396ffa2e20af023c6b83ab7b14 ansicolors-1.1.8.zip +sha256 99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0 ansicolors-1.1.8.zip +# Locally computed sha256 checksums +sha256 71a13496c621f01b454f9aa54fa608a712f58eb253e6dd2c91027fe78340c773 LICENSE diff --git a/buildroot/package/python-ansicolors/python-ansicolors.mk b/buildroot/package/python-ansicolors/python-ansicolors.mk new file mode 100644 index 000000000..787ce8c40 --- /dev/null +++ b/buildroot/package/python-ansicolors/python-ansicolors.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-ansicolors +# +################################################################################ + +PYTHON_ANSICOLORS_VERSION = 1.1.8 +PYTHON_ANSICOLORS_SOURCE = ansicolors-$(PYTHON_ANSICOLORS_VERSION).zip +PYTHON_ANSICOLORS_SITE = https://files.pythonhosted.org/packages/76/31/7faed52088732704523c259e24c26ce6f2f33fbeff2ff59274560c27628e +PYTHON_ANSICOLORS_SETUP_TYPE = setuptools +PYTHON_ANSICOLORS_LICENSE = ISC +PYTHON_ANSICOLORS_LICENSE_FILES = LICENSE + +define PYTHON_ANSICOLORS_EXTRACT_CMDS + unzip $(PYTHON_ANSICOLORS_DL_DIR)/$(PYTHON_ANSICOLORS_SOURCE) -d $(@D) + mv $(@D)/ansicolors-$(PYTHON_ANSICOLORS_VERSION)/* $(@D) + $(RM) -r $(@D)/ansicolors-$(PYTHON_ANSICOLORS_VERSION) +endef + +$(eval $(python-package)) diff --git a/buildroot/package/python-argon2-cffi/Config.in b/buildroot/package/python-argon2-cffi/Config.in new file mode 100644 index 000000000..16bbe6c4e --- /dev/null +++ b/buildroot/package/python-argon2-cffi/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI + bool "python-argon2-cffi" + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_LIBARGON2 + help + The secure Argon2 password hashing algorithm. + + https://argon2-cffi.readthedocs.io/ diff --git a/buildroot/package/python-argon2-cffi/python-argon2-cffi.hash b/buildroot/package/python-argon2-cffi/python-argon2-cffi.hash new file mode 100644 index 000000000..730a9b6c4 --- /dev/null +++ b/buildroot/package/python-argon2-cffi/python-argon2-cffi.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2_cffi/json +md5 e49ccb29351387fd853f31bf19b67f59 argon2-cffi-20.1.0.tar.gz +sha256 d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d argon2-cffi-20.1.0.tar.gz +# Locally computed sha256 checksums +sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/buildroot/package/python-argon2-cffi/python-argon2-cffi.mk b/buildroot/package/python-argon2-cffi/python-argon2-cffi.mk new file mode 100644 index 000000000..674e089eb --- /dev/null +++ b/buildroot/package/python-argon2-cffi/python-argon2-cffi.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-argon2-cffi +# +################################################################################ + +PYTHON_ARGON2_CFFI_VERSION = 20.1.0 +PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/74/fd/d78e003a79c453e8454197092fce9d1c6099445b7e7da0b04eb4fe1dbab7 +PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_LICENSE = MIT +PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 +PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) diff --git a/buildroot/package/python-asn1crypto/python-asn1crypto.hash b/buildroot/package/python-asn1crypto/python-asn1crypto.hash index d2c8487b8..b00474bdc 100644 --- a/buildroot/package/python-asn1crypto/python-asn1crypto.hash +++ b/buildroot/package/python-asn1crypto/python-asn1crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asn1crypto/json -md5 fc3815cdd4812505e3ee297740c5f5d3 asn1crypto-1.2.0.tar.gz -sha256 87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384 asn1crypto-1.2.0.tar.gz +md5 daad112940181917e3ff169b47b9bd9a asn1crypto-1.3.0.tar.gz +sha256 5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d asn1crypto-1.3.0.tar.gz # Locally computed sha256 checksums sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE diff --git a/buildroot/package/python-asn1crypto/python-asn1crypto.mk b/buildroot/package/python-asn1crypto/python-asn1crypto.mk index 43d3842ff..2d8d384cc 100644 --- a/buildroot/package/python-asn1crypto/python-asn1crypto.mk +++ b/buildroot/package/python-asn1crypto/python-asn1crypto.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASN1CRYPTO_VERSION = 1.2.0 +PYTHON_ASN1CRYPTO_VERSION = 1.3.0 PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz -PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/c1/a9/86bfedaf41ca590747b4c9075bc470d0b2ec44fb5db5d378bc61447b3b6b +PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123 PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools PYTHON_ASN1CRYPTO_LICENSE = MIT PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-autobahn/Config.in b/buildroot/package/python-autobahn/Config.in index ba54d8b12..78b16897b 100644 --- a/buildroot/package/python-autobahn/Config.in +++ b/buildroot/package/python-autobahn/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TXAIO # runtime help WebSocket client and server library, WAMP real-time @@ -12,3 +12,4 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN comment "python-autobahn needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/python-autobahn/python-autobahn.hash b/buildroot/package/python-autobahn/python-autobahn.hash index 1dc6c1eea..a5aa2a5a7 100644 --- a/buildroot/package/python-autobahn/python-autobahn.hash +++ b/buildroot/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 472d965c75dba0f8cb5f3b9f9001ed1b autobahn-19.11.1.tar.gz -sha256 201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181 autobahn-19.11.1.tar.gz +md5 dcae3cf26203aa4bbd9912137e5c9512 autobahn-20.4.3.tar.gz +sha256 c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f autobahn-20.4.3.tar.gz # Locally computed sha256 checksums -sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE +sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/buildroot/package/python-autobahn/python-autobahn.mk b/buildroot/package/python-autobahn/python-autobahn.mk index 4b367177a..37b3d3353 100644 --- a/buildroot/package/python-autobahn/python-autobahn.mk +++ b/buildroot/package/python-autobahn/python-autobahn.mk @@ -4,22 +4,11 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 19.11.1 +PYTHON_AUTOBAHN_VERSION = 20.4.3 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/3f/f4/e907b172d3c1d912b8da57560b8b298ebad22f900f8a412002247716328a +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/cb/16/38d27874ef827974f44acb6dd64a92a9248b624734c0e84b91083c2d9350 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_SETUP_TYPE = setuptools -ifeq ($(BR2_PACKAGE_PYTHON),y) -# only needed/valid for python 3.x -define PYTHON_AUTOBAHN_RM_PY3_FILES - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/autobahn/asyncio \ - $(TARGET_DIR)/usr/lib/python*/site-packages/autobahn/xbr \ - $(TARGET_DIR)/usr/lib/python*/site-packages/autobahn/twisted/xbr.py -endef - -PYTHON_AUTOBAHN_POST_INSTALL_TARGET_HOOKS += PYTHON_AUTOBAHN_RM_PY3_FILES -endif - $(eval $(python-package)) diff --git a/buildroot/package/python-automat/python-automat.hash b/buildroot/package/python-automat/python-automat.hash index 1be91e0e9..33a64abed 100644 --- a/buildroot/package/python-automat/python-automat.hash +++ b/buildroot/package/python-automat/python-automat.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/automat/json -md5 47e980a48201a1dabe37fa11f0187013 Automat-0.8.0.tar.gz -sha256 269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484 Automat-0.8.0.tar.gz +md5 d6cef9886b037b8857bfbc686f3ae30a Automat-20.2.0.tar.gz +sha256 7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 Automat-20.2.0.tar.gz # Locally computed sha256 checksums -sha256 b2201301678d0a937d938543827ca1360712eb34e23de8ee3f3bfffbd4c0e376 LICENSE +sha256 b2201301678d0a937d938543827ca1360712eb34e23de8ee3f3bfffbd4c0e376 LICENSE diff --git a/buildroot/package/python-automat/python-automat.mk b/buildroot/package/python-automat/python-automat.mk index 0bd40daf7..b94fd2e1c 100644 --- a/buildroot/package/python-automat/python-automat.mk +++ b/buildroot/package/python-automat/python-automat.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 0.8.0 +PYTHON_AUTOMAT_VERSION = 20.2.0 PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/4c/9a/3052851fa3a888d1ff32f053fba424ed929b47383fb5327855fdf70018cd +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/80/c5/82c63bad570f4ef745cc5c2f0713c8eddcd07153b4bee7f72a8dc9f9384b PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/buildroot/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch new file mode 100644 index 000000000..41231e923 --- /dev/null +++ b/buildroot/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch @@ -0,0 +1,46 @@ +From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Mon, 17 Feb 2020 15:12:13 +0100 +Subject: [PATCH] drop install time linting and imports sorting + +Since the 1.9.2 release, the setup script is also performing code linting +tasks, which require additional python libraries. + +These linting tasks are not needed anyway, since they are intended to prepare +the code for distribution, but the Buildroot package is already using a +distributed version. We therefore simply remove them. + +Signed-off-by: Titouan Christophe +--- + setup.cfg | 2 -- + setup.py | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index 7b5de18..d46a36e 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -25,8 +25,6 @@ package_dir = + include_package_data = true + packages = avro + setup_requires = +- isort +- pycodestyle + install_requires = + zip_safe = true + scripts = +diff --git a/setup.py b/setup.py +index f6297bb..91d3287 100755 +--- a/setup.py ++++ b/setup.py +@@ -164,7 +164,6 @@ def main(): + setuptools.setup(cmdclass={ + "clean": CleanCommand, + "generate_interop_data": GenerateInteropDataCommand, +- "lint": LintCommand, + }) + + +-- +2.24.1 + diff --git a/buildroot/package/python-avro/python-avro.hash b/buildroot/package/python-avro/python-avro.hash index f63b37ee0..2428be96e 100644 --- a/buildroot/package/python-avro/python-avro.hash +++ b/buildroot/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://www-eu.apache.org/dist/avro/avro-1.9.1/py3/avro-python3-1.9.1.tar.gz.sha512 -sha512 771ce6e5ca6315f5b9108cb4f5dd9488575cc3433ffdd744f96ce7989763728259c89475319fd9c411ed6b65c996b762548c50a697eb1fba9ab024112ca17daa avro-python3-1.9.1.tar.gz +# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 +sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz # License files -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/buildroot/package/python-avro/python-avro.mk b/buildroot/package/python-avro/python-avro.mk index 3f9140e94..dd6008b1b 100644 --- a/buildroot/package/python-avro/python-avro.mk +++ b/buildroot/package/python-avro/python-avro.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-1.9.1/py3 +PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE diff --git a/buildroot/package/python-backcall/python-backcall.hash b/buildroot/package/python-backcall/python-backcall.hash index 2eccbdef5..063b4bed2 100644 --- a/buildroot/package/python-backcall/python-backcall.hash +++ b/buildroot/package/python-backcall/python-backcall.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/backcall/json -md5 87ce0c7839808e6a3427d57df6a792e7 backcall-0.1.0.tar.gz -sha256 38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4 backcall-0.1.0.tar.gz +md5 1f4c9a370c78743406296f48e56e8821 backcall-0.2.0.tar.gz +sha256 5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e backcall-0.2.0.tar.gz +# Locally computed sha256 checksums +sha256 d422f8ce77312733c07f5fec8ccbe61d58d539774f7a66f37e4bc54740d86020 LICENSE diff --git a/buildroot/package/python-backcall/python-backcall.mk b/buildroot/package/python-backcall/python-backcall.mk index 3f95ea3d2..2ead3421a 100644 --- a/buildroot/package/python-backcall/python-backcall.mk +++ b/buildroot/package/python-backcall/python-backcall.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BACKCALL_VERSION = 0.1.0 +PYTHON_BACKCALL_VERSION = 0.2.0 PYTHON_BACKCALL_SOURCE = backcall-$(PYTHON_BACKCALL_VERSION).tar.gz -PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/84/71/c8ca4f5bb1e08401b916c68003acf0a0655df935d74d93bf3f3364b310e0 +PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/a2/40/764a663805d84deee23043e1426a9175567db89c8b3287b5c2ad9f71aa93 PYTHON_BACKCALL_SETUP_TYPE = distutils -# From https://github.com/takluyver/backcall/blob/master/LICENSE PYTHON_BACKCALL_LICENSE = BSD-3-Clause +PYTHON_BACKCALL_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-bitstring/python-bitstring.hash b/buildroot/package/python-bitstring/python-bitstring.hash index 07586d530..04e491469 100644 --- a/buildroot/package/python-bitstring/python-bitstring.hash +++ b/buildroot/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 38372014dd629be75c3a0ff7d799aa3f bitstring-3.1.6.tar.gz -sha256 c97a8e2a136e99b523b27da420736ae5cb68f83519d633794a6a11192f69f8bf bitstring-3.1.6.tar.gz +md5 18661a3e5c47c59bd926dd0fefae0baa bitstring-3.1.7.tar.gz +sha256 fdf3eb72b229d2864fb507f8f42b1b2c57af7ce5fec035972f9566de440a864a bitstring-3.1.7.tar.gz # Locally computed sha256 checksums -sha256 2e97cff64585d7cb66190ad298e9d77fd791e8b91bcc97967fa743edf8c2ba1b LICENSE +sha256 ea3c0e2288994d3dfeaac0fd2163f2cf5f9671c3ae70a9e9d563795e28cfb0b9 LICENSE diff --git a/buildroot/package/python-bitstring/python-bitstring.mk b/buildroot/package/python-bitstring/python-bitstring.mk index 636ae0e0c..c36993416 100644 --- a/buildroot/package/python-bitstring/python-bitstring.mk +++ b/buildroot/package/python-bitstring/python-bitstring.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.6 +PYTHON_BITSTRING_VERSION = 3.1.7 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/f4/87/fe6f7093088f4396e84c1b5d5dfb08c4840487ad46ff4805b7008c8f5ffc -PYTHON_BITSTRING_SETUP_TYPE = setuptools +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/c3/fc/ffac2c199d2efe1ec5111f55efeb78f5f2972456df6939fea849f103f9f5 +PYTHON_BITSTRING_SETUP_TYPE = distutils PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-boto3/Config.in b/buildroot/package/python-boto3/Config.in new file mode 100644 index 000000000..67b142038 --- /dev/null +++ b/buildroot/package/python-boto3/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_BOTO3 + bool "python-boto3" + select BR2_PACKAGE_PYTHON_BOTOCORE # runtime + select BR2_PACKAGE_PYTHON_JMESPATH # runtime + select BR2_PACKAGE_PYTHON_S3TRANSFER # runtime + help + The AWS SDK for Python. + + https://github.com/boto/boto3 diff --git a/buildroot/package/python-boto3/python-boto3.hash b/buildroot/package/python-boto3/python-boto3.hash new file mode 100644 index 000000000..49eb9ae5c --- /dev/null +++ b/buildroot/package/python-boto3/python-boto3.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/boto3/json +md5 02e0d5ea4affd9c64e9166d5d3786766 boto3-1.9.210.tar.gz +sha256 e221f6867282266e06aec2213f0ea5fdbd4eb3facbca4fcbf96886073350bc5e boto3-1.9.210.tar.gz +# Locally computed sha256 checksums +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/python-boto3/python-boto3.mk b/buildroot/package/python-boto3/python-boto3.mk new file mode 100644 index 000000000..e00cb84ad --- /dev/null +++ b/buildroot/package/python-boto3/python-boto3.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-boto3 +# +################################################################################ + +PYTHON_BOTO3_VERSION = 1.9.210 +PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/d3/ac/79093e14a5397096d1fe4a17329a8453cebed8629cbc434e2dad5fb75b65 +PYTHON_BOTO3_SETUP_TYPE = setuptools +PYTHON_BOTO3_LICENSE = Apache-2.0 +PYTHON_BOTO3_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-botocore/Config.in b/buildroot/package/python-botocore/Config.in new file mode 100644 index 000000000..a552900b6 --- /dev/null +++ b/buildroot/package/python-botocore/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_BOTOCORE + bool "python-botocore" + select BR2_PACKAGE_PYTHON_JMESPATH # runtime + select BR2_PACKAGE_PYTHON_DOCUTILS # runtime + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime + help + Low-level, data-driven core of boto 3. + + https://github.com/boto/botocore diff --git a/buildroot/package/python-botocore/python-botocore.hash b/buildroot/package/python-botocore/python-botocore.hash new file mode 100644 index 000000000..446c67f83 --- /dev/null +++ b/buildroot/package/python-botocore/python-botocore.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/botocore/json +md5 a75ae28d58d64dbf689d18ac3424342a botocore-1.12.210.tar.gz +sha256 7983b7624b3f71648a7101fbcb437e3d599b4f79b754e89220e574482a2f8298 botocore-1.12.210.tar.gz +# Locally computed sha256 checksums +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/buildroot/package/python-botocore/python-botocore.mk b/buildroot/package/python-botocore/python-botocore.mk new file mode 100644 index 000000000..378bd9376 --- /dev/null +++ b/buildroot/package/python-botocore/python-botocore.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-botocore +# +################################################################################ + +PYTHON_BOTOCORE_VERSION = 1.12.210 +PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/39/78/068e7cf5bb9901f34eacbf449cdfbdf32e470333930cbcda890cfc9fb820 +PYTHON_BOTOCORE_SETUP_TYPE = setuptools +PYTHON_BOTOCORE_LICENSE = Apache-2.0 +PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-brotli/python-brotli.hash b/buildroot/package/python-brotli/python-brotli.hash index eaf59ae71..de4964dd2 100644 --- a/buildroot/package/python-brotli/python-brotli.hash +++ b/buildroot/package/python-brotli/python-brotli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/brotli/json -md5 3444b534e86f65f9f229fd123965be87 Brotli-1.0.7.zip -sha256 0538dc1744fd17c314d2adc409ea7d1b779783b89fd95bcfb0c2acc93a6ea5a7 Brotli-1.0.7.zip +md5 08f1f098697c64aa4596468b556d0c94 Brotli-1.0.9.zip +sha256 4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438 Brotli-1.0.9.zip # Locally computed sha256 checksums -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE diff --git a/buildroot/package/python-brotli/python-brotli.mk b/buildroot/package/python-brotli/python-brotli.mk index 2ec549ed0..ff78e6ab2 100644 --- a/buildroot/package/python-brotli/python-brotli.mk +++ b/buildroot/package/python-brotli/python-brotli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BROTLI_VERSION = 1.0.7 +PYTHON_BROTLI_VERSION = 1.0.9 PYTHON_BROTLI_SOURCE = Brotli-$(PYTHON_BROTLI_VERSION).zip -PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/cd/9c/7955895f5672ecc85270244582c6b53ff95bb4c24bf77bd9271d42351635 +PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0 PYTHON_BROTLI_SETUP_TYPE = setuptools PYTHON_BROTLI_LICENSE = MIT PYTHON_BROTLI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-bsdiff4/Config.in b/buildroot/package/python-bsdiff4/Config.in new file mode 100644 index 000000000..a383cda0f --- /dev/null +++ b/buildroot/package/python-bsdiff4/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_BSDIFF4 + bool "python-bsdiff4" + select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime + help + binary diff and patch using the BSDIFF4-format. + + https://github.com/ilanschnell/bsdiff4 diff --git a/buildroot/package/python-bsdiff4/python-bsdiff4.hash b/buildroot/package/python-bsdiff4/python-bsdiff4.hash new file mode 100644 index 000000000..e64e817f9 --- /dev/null +++ b/buildroot/package/python-bsdiff4/python-bsdiff4.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bsdiff4/json +md5 a0d047e91429ce67a3b0231facf41169 bsdiff4-1.2.0.tar.gz +sha256 3c2f7f5504f41a54d238b54b00b4544d0eb4276179edabf02b9d00415a03cc9d bsdiff4-1.2.0.tar.gz +# Locally computed sha256 +sha256 c6c921c90383f1c43beb53c49a652d28309a410a7c394c729fd8870271451cf0 LICENSE diff --git a/buildroot/package/python-bsdiff4/python-bsdiff4.mk b/buildroot/package/python-bsdiff4/python-bsdiff4.mk new file mode 100644 index 000000000..7bc607b2d --- /dev/null +++ b/buildroot/package/python-bsdiff4/python-bsdiff4.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bsdiff4 +# +################################################################################ + +PYTHON_BSDIFF4_VERSION = 1.2.0 +PYTHON_BSDIFF4_SOURCE = bsdiff4-$(PYTHON_BSDIFF4_VERSION).tar.gz +PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/9b/ca/06cd939630ca78125c36489f92b52918980cbcfee2dcc0969411eb5ae8a8 +PYTHON_BSDIFF4_LICENSE = BSD-2-Clause, BSD-Protection (core.c) +PYTHON_BSDIFF4_LICENSE_FILES = LICENSE +PYTHON_BSDIFF4_SETUP_TYPE = distutils + +$(eval $(python-package)) diff --git a/buildroot/package/python-can/python-can.hash b/buildroot/package/python-can/python-can.hash index 0a945eb00..ced51d8b7 100644 --- a/buildroot/package/python-can/python-can.hash +++ b/buildroot/package/python-can/python-can.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/pypi/python-can/json -sha256 8dc9e0f926e880cd57a3badbaebc6393cde7adffdd3e1975a78a82c48d4e3bbe python-can-3.3.1.tar.gz +sha256 ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488 python-can-3.3.3.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/buildroot/package/python-can/python-can.mk b/buildroot/package/python-can/python-can.mk index 749583f96..158e89f20 100644 --- a/buildroot/package/python-can/python-can.mk +++ b/buildroot/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.1 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/d1/7e/d92889e3fa6ed625b5d6f065bff1c1b5921519a5133553905affb0d6b97c +PYTHON_CAN_VERSION = 3.3.3 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/b0/fa/8c6eb8988130f256db4c3cf84537c44684dbb3d528d2e1a1d2209eac4d90 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-canopen/Config.in b/buildroot/package/python-canopen/Config.in new file mode 100644 index 000000000..e36b8c764 --- /dev/null +++ b/buildroot/package/python-canopen/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_CANOPEN + bool "python-canopen" + select BR2_PACKAGE_PYTHON_CAN # runtime + help + A Python implementation of the CANopen standard. The aim + of the project is to support the most common parts of the + CiA 301 standard in a Pythonic interface. + + https://github.com/christiansandberg/canopen diff --git a/buildroot/package/python-canopen/python-canopen.hash b/buildroot/package/python-canopen/python-canopen.hash new file mode 100644 index 000000000..e1a628a3a --- /dev/null +++ b/buildroot/package/python-canopen/python-canopen.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/pypi/canopen/json +sha256 4394770d528e93a48936138c4a7b37b5dff26d54f82a435ad9790cd1e43f55b9 canopen-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt diff --git a/buildroot/package/python-canopen/python-canopen.mk b/buildroot/package/python-canopen/python-canopen.mk new file mode 100644 index 000000000..fc328c698 --- /dev/null +++ b/buildroot/package/python-canopen/python-canopen.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-canopen +# +################################################################################ + +PYTHON_CANOPEN_VERSION = 1.0.0 +PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1f/2b/55b6d82b3dcba184a01c6fe027df239953940e36a463cd24b71e67bd1f37 +PYTHON_CANOPEN_SETUP_TYPE = setuptools +PYTHON_CANOPEN_LICENSE = MIT +PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-cbor2/Config.in b/buildroot/package/python-cbor2/Config.in new file mode 100644 index 000000000..ba9383f78 --- /dev/null +++ b/buildroot/package/python-cbor2/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CBOR2 + bool "python-cbor2" + help + Pure Python CBOR (de)serializer with extensive tag support. + + https://cbor2.readthedocs.io/ diff --git a/buildroot/package/python-cbor2/python-cbor2.hash b/buildroot/package/python-cbor2/python-cbor2.hash new file mode 100644 index 000000000..a643cdbe2 --- /dev/null +++ b/buildroot/package/python-cbor2/python-cbor2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/cbor2/json +md5 693c1bd6635bee8a591a70ea924ad676 cbor2-5.1.2.tar.gz +sha256 91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6 cbor2-5.1.2.tar.gz +# Locally computed sha256 checksums +sha256 6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758 LICENSE.txt diff --git a/buildroot/package/python-cbor2/python-cbor2.mk b/buildroot/package/python-cbor2/python-cbor2.mk new file mode 100644 index 000000000..115eb8d27 --- /dev/null +++ b/buildroot/package/python-cbor2/python-cbor2.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-cbor2 +# +################################################################################ + +PYTHON_CBOR2_VERSION = 5.1.2 +PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/3f/14/a7cdcab562ee9b599ce409168eb0a5f7c7190a83f23c92c8c310e56d1b58 +PYTHON_CBOR2_SETUP_TYPE = setuptools +PYTHON_CBOR2_LICENSE = MIT +PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt +PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/buildroot/package/python-cchardet/python-cchardet.hash b/buildroot/package/python-cchardet/python-cchardet.hash index d02345785..960801f88 100644 --- a/buildroot/package/python-cchardet/python-cchardet.hash +++ b/buildroot/package/python-cchardet/python-cchardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cchardet/json -md5 681af4e6546e47e2ae856057a8a7d105 cchardet-2.1.5.tar.gz -sha256 240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb cchardet-2.1.5.tar.gz +md5 ee884e2c7762e56e8a0600aa34ad4fa3 cchardet-2.1.6.tar.gz +sha256 b76afb2059ad69eab576949980a17413c1e9e5a5624abf9e43542d8853f146b3 cchardet-2.1.6.tar.gz # Locally computed sha256 checksums -sha256 107a29ccdd2d778aa2df5462f85dddfa099059abd22e064e07ec2cc9bafc37cd COPYING +sha256 107a29ccdd2d778aa2df5462f85dddfa099059abd22e064e07ec2cc9bafc37cd COPYING diff --git a/buildroot/package/python-cchardet/python-cchardet.mk b/buildroot/package/python-cchardet/python-cchardet.mk index 58082538d..78daf6075 100644 --- a/buildroot/package/python-cchardet/python-cchardet.mk +++ b/buildroot/package/python-cchardet/python-cchardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CCHARDET_VERSION = 2.1.5 +PYTHON_CCHARDET_VERSION = 2.1.6 PYTHON_CCHARDET_SOURCE = cchardet-$(PYTHON_CCHARDET_VERSION).tar.gz -PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/73/25/73649708a30aa97124631bd088a22f1bf721d05d4e72fb9cc9bedb97de51 +PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/41/e6/2e2184a3bc887bfb6e6b97aef5e94af9b8de43806ce14b023ddbbcb0b30d PYTHON_CCHARDET_SETUP_TYPE = setuptools PYTHON_CCHARDET_LICENSE = MPL-1.1 PYTHON_CCHARDET_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-certifi/python-certifi.hash b/buildroot/package/python-certifi/python-certifi.hash index 122ad55ca..8543393d8 100644 --- a/buildroot/package/python-certifi/python-certifi.hash +++ b/buildroot/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 cadd4e373fc08f649fa39b82aed9ad96 certifi-2019.9.11.tar.gz -sha256 e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50 certifi-2019.9.11.tar.gz +md5 89525ece725d674d91b0c43007d2a47e certifi-2020.6.20.tar.gz +sha256 5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 certifi-2020.6.20.tar.gz # Locally computed sha256 checksums -sha256 6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131 LICENSE +sha256 6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131 LICENSE diff --git a/buildroot/package/python-certifi/python-certifi.mk b/buildroot/package/python-certifi/python-certifi.mk index e614b8356..faa0a0a89 100644 --- a/buildroot/package/python-certifi/python-certifi.mk +++ b/buildroot/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2019.9.11 +PYTHON_CERTIFI_VERSION = 2020.6.20 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/62/85/7585750fd65599e88df0fed59c74f5075d4ea2fe611deceb95dd1c2fb25b +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/40/a7/ded59fa294b85ca206082306bba75469a38ea1c7d44ea7e1d64f5443d67a PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-cffi/python-cffi.hash b/buildroot/package/python-cffi/python-cffi.hash index dd8720e82..37676f266 100644 --- a/buildroot/package/python-cffi/python-cffi.hash +++ b/buildroot/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 824ad9f228fbc6ce203c334e2ff4ab8f cffi-1.13.1.tar.gz -sha256 558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b cffi-1.13.1.tar.gz +md5 3cc2f1daf62dd66eda79b4d6281cebfc cffi-1.14.2.tar.gz +sha256 ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b cffi-1.14.2.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/buildroot/package/python-cffi/python-cffi.mk b/buildroot/package/python-cffi/python-cffi.mk index b43e8887e..f882349fd 100644 --- a/buildroot/package/python-cffi/python-cffi.mk +++ b/buildroot/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.13.1 +PYTHON_CFFI_VERSION = 1.14.2 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/0d/aa/c5ac2f337d9a10ee95d160d47beb8d9400e1b2a46bb94990a0409fe6d133 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/f7/09/88bbe20b76ca76be052c366fe77aa5e3cd6e5f932766e5597fecdd95b2a8 PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/buildroot/package/python-cheetah/Config.in b/buildroot/package/python-cheetah/Config.in index 12749a168..7cbfc5c25 100644 --- a/buildroot/package/python-cheetah/Config.in +++ b/buildroot/package/python-cheetah/Config.in @@ -1,13 +1,12 @@ config BR2_PACKAGE_PYTHON_CHEETAH bool "python-cheetah" - depends on BR2_PACKAGE_PYTHON help Cheetah is an open source template engine and code generation tool. It can be used standalone or combined with other tools and - frameworks. Web development is its principle use, but + frameworks. Web development is its principle use, but Cheetah is very flexible and is also being used to generate C++ game code, Java, sql, form emails and even Python code. - https://pypi.python.org/pypi/Cheetah/ + https://pypi.org/project/Cheetah3/ diff --git a/buildroot/package/python-cheetah/python-cheetah.hash b/buildroot/package/python-cheetah/python-cheetah.hash index 477ee5483..286b41fd9 100644 --- a/buildroot/package/python-cheetah/python-cheetah.hash +++ b/buildroot/package/python-cheetah/python-cheetah.hash @@ -1,4 +1,5 @@ -# From https://pypi.python.org/pypi/Cheetah/2.4.4 -md5 853917116e731afbc8c8a43c37e6ddba Cheetah-2.4.4.tar.gz -# Calculated based on the hash above -sha256 be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550 Cheetah-2.4.4.tar.gz +# From https://pypi.org/pypi/Cheetah3/json +md5 8c0ac643263ffc3454fb321342284d0a Cheetah3-3.2.4.tar.gz +sha256 caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b Cheetah3-3.2.4.tar.gz +# Locally computed sha256 checksums +sha256 635349ae512fafc2e60eb74a50d0a5276fa06c00b5ecb20da53546449ddc45ea LICENSE diff --git a/buildroot/package/python-cheetah/python-cheetah.mk b/buildroot/package/python-cheetah/python-cheetah.mk index eee87fcee..3dfd1fc54 100644 --- a/buildroot/package/python-cheetah/python-cheetah.mk +++ b/buildroot/package/python-cheetah/python-cheetah.mk @@ -4,17 +4,13 @@ # ################################################################################ -PYTHON_CHEETAH_VERSION = 2.4.4 -PYTHON_CHEETAH_SOURCE = Cheetah-$(PYTHON_CHEETAH_VERSION).tar.gz -PYTHON_CHEETAH_SITE = https://pypi.python.org/packages/source/C/Cheetah +# Please keep in sync with package/python3-cheetah/python3-cheetah.mk +PYTHON_CHEETAH_VERSION = 3.2.4 +PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz +PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/4e/72/e6a7d92279e3551db1b68fd336fd7a6e3d2f2ec742bf486486e6150d77d2 PYTHON_CHEETAH_LICENSE = MIT +PYTHON_CHEETAH_LICENSE_FILES = LICENSE PYTHON_CHEETAH_SETUP_TYPE = setuptools -HOST_PYTHON_CHEETAH_NEEDS_HOST_PYTHON = python2 - -# The dependency on host-python-markdown is needed to prevent -# setuptools from downloading markdown if it is not installed yet. -HOST_PYTHON_CHEETAH_DEPENDENCIES = host-python-markdown - $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-coherence/Config.in b/buildroot/package/python-coherence/Config.in index 63427964a..0f50080e6 100644 --- a/buildroot/package/python-coherence/Config.in +++ b/buildroot/package/python-coherence/Config.in @@ -1,15 +1,10 @@ config BR2_PACKAGE_PYTHON_COHERENCE bool "python-coherence" depends on BR2_PACKAGE_PYTHON - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn select BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - select BR2_PACKAGE_PYTHON_PYASN + select BR2_PACKAGE_PYTHON_PYASN1 help A DLNA/UPnP Media Server and Framework for the Digital Living. https://github.com/coherence-project/Coherence - -comment "python-coherence needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-colorama/python-colorama.hash b/buildroot/package/python-colorama/python-colorama.hash index 06f61f80a..312b9e1f7 100644 --- a/buildroot/package/python-colorama/python-colorama.hash +++ b/buildroot/package/python-colorama/python-colorama.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/colorama/json -md5 f927529cd1735f6f50ee2c61628e9c1f colorama-0.4.1.tar.gz -sha256 05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d colorama-0.4.1.tar.gz +# sha256 from https://pypi.org/pypi/colorama/json +sha256 e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1 colorama-0.4.3.tar.gz # Locally computed sha256 checksums sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/buildroot/package/python-colorama/python-colorama.mk b/buildroot/package/python-colorama/python-colorama.mk index 2f4bc5e1f..6117b853a 100644 --- a/buildroot/package/python-colorama/python-colorama.mk +++ b/buildroot/package/python-colorama/python-colorama.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORAMA_VERSION = 0.4.1 +PYTHON_COLORAMA_VERSION = 0.4.3 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz -PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/76/53/e785891dce0e2f2b9f4b4ff5bc6062a53332ed28833c7afede841f46a5db +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/82/75/f2a4c0c94c85e2693c229142eb448840fba0f9230111faa889d1f541d12d PYTHON_COLORAMA_SETUP_TYPE = setuptools PYTHON_COLORAMA_LICENSE = BSD-3-Clause PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-colorzero/Config.in b/buildroot/package/python-colorzero/Config.in new file mode 100644 index 000000000..b2ef711fb --- /dev/null +++ b/buildroot/package/python-colorzero/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_COLORZERO + bool "python-colorzero" + help + A color manipulation library for Python. + + https://github.com/waveform80/colorzero diff --git a/buildroot/package/python-colorzero/python-colorzero.hash b/buildroot/package/python-colorzero/python-colorzero.hash new file mode 100644 index 000000000..118ccea7d --- /dev/null +++ b/buildroot/package/python-colorzero/python-colorzero.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 24d30b55793150f9ae7478f8aa2126fe5598a31f928907eadbf9d5a19aa9964c python-colorzero-1.1.tar.gz +# Locally computed +sha256 47778d78e05bb6c39c022814e3712a0327c6418c7251757e72167ab8ff12bb4d LICENSE.txt diff --git a/buildroot/package/python-colorzero/python-colorzero.mk b/buildroot/package/python-colorzero/python-colorzero.mk new file mode 100644 index 000000000..6ddbcbe1c --- /dev/null +++ b/buildroot/package/python-colorzero/python-colorzero.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-colorzero +# +################################################################################ + +PYTHON_COLORZERO_VERSION = 1.1 +PYTHON_COLORZERO_SITE = $(call github,waveform80,colorzero,release-$(PYTHON_COLORZERO_VERSION)) +PYTHON_COLORZERO_LICENSE = BSD-3-Clause +PYTHON_COLORZERO_LICENSE_FILES = LICENSE.txt +PYTHON_COLORZERO_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-crayons/Config.in b/buildroot/package/python-crayons/Config.in new file mode 100644 index 000000000..10f3ece00 --- /dev/null +++ b/buildroot/package/python-crayons/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CRAYONS + bool "python-crayons" + depends on BR2_PACKAGE_PYTHON3 + help + This module is really simple, it gives you + colored strings for terminal usage. + + https://pypi.org/project/crayons diff --git a/buildroot/package/python-crayons/python-crayons.hash b/buildroot/package/python-crayons/python-crayons.hash new file mode 100644 index 000000000..e3d663216 --- /dev/null +++ b/buildroot/package/python-crayons/python-crayons.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/crayons/json +md5 88a79c854ce54bcbb8376d18a448d627 crayons-0.4.0.tar.gz +sha256 bd33b7547800f2cfbd26b38431f9e64b487a7de74a947b0fafc89b45a601813f crayons-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 7deeb137f78337fd1e2e3966a7896821c6ebff244200d009d3f4157246b5a457 LICENSE diff --git a/buildroot/package/python-crayons/python-crayons.mk b/buildroot/package/python-crayons/python-crayons.mk new file mode 100644 index 000000000..33562d097 --- /dev/null +++ b/buildroot/package/python-crayons/python-crayons.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-crayons +# +################################################################################ + +PYTHON_CRAYONS_VERSION = 0.4.0 +PYTHON_CRAYONS_SOURCE = crayons-$(PYTHON_CRAYONS_VERSION).tar.gz +PYTHON_CRAYONS_SITE = https://files.pythonhosted.org/packages/b8/6b/12a1dea724c82f1c19f410365d3e25356625b48e8009a7c3c9ec4c42488d +PYTHON_CRAYONS_LICENSE = MIT +PYTHON_CRAYONS_LICENSE_FILES = LICENSE +PYTHON_CRAYONS_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-crontab/python-crontab.hash b/buildroot/package/python-crontab/python-crontab.hash index c4f3636f5..2247cf3d3 100644 --- a/buildroot/package/python-crontab/python-crontab.hash +++ b/buildroot/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 e1f2ca65e0218a85c724e3d6058da2a3 python-crontab-2.4.0.tar.gz -sha256 3ac1608ff76032e6fc6e16b5fbf83b51557e0e066bf78e9f88571571e7bd7ae6 python-crontab-2.4.0.tar.gz +md5 7731a2253e853abfb6eceb8045368f22 python-crontab-2.5.1.tar.gz +sha256 4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31 python-crontab-2.5.1.tar.gz # Locally computed sha256 checksums -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/python-crontab/python-crontab.mk b/buildroot/package/python-crontab/python-crontab.mk index f6bf8d707..ddb1067db 100644 --- a/buildroot/package/python-crontab/python-crontab.mk +++ b/buildroot/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.4.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/bc/03/852f9c5f8da7f58abce06fe8ae769cbcf6502f1c60684b16bad72ffcced3 +PYTHON_CRONTAB_VERSION = 2.5.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/1b/7e/fb78b96de58a49b8ef807c321870ef4de3de5928fd71a40a400aed714310 PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch index fb8e4a276..0ff7cae21 100644 --- a/buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch +++ b/buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch @@ -1,4 +1,4 @@ -From 9ab2b96c2ee679c6dcb387174be211db5d70fa97 Mon Sep 17 00:00:00 2001 +From 423a1b081f6b7198f6a921ca83043270ebbace1a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 May 2016 15:35:32 +0200 Subject: [PATCH] Avoid intentional syntax error @@ -15,15 +15,15 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 2 deletions(-) diff --git a/crossbar/worker/test/examples/syntaxerror.py b/crossbar/worker/test/examples/syntaxerror.py -index a5947cc..585c995 100644 +index 7b88e088..cd7de901 100644 --- a/crossbar/worker/test/examples/syntaxerror.py +++ b/crossbar/worker/test/examples/syntaxerror.py -@@ -29,5 +29,3 @@ +@@ -27,5 +27,3 @@ + # with this program. If not, see . + # ##################################################################################### - - from __future__ import absolute_import, division - -class # noqa -- -2.7.4 +2.20.1 diff --git a/buildroot/package/python-crossbar/Config.in b/buildroot/package/python-crossbar/Config.in index 2b9077ae8..50b70b8e0 100644 --- a/buildroot/package/python-crossbar/Config.in +++ b/buildroot/package/python-crossbar/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR select BR2_PACKAGE_PYTHON_AUTOBAHN select BR2_PACKAGE_PYTHON_BITSTRING select BR2_PACKAGE_PYTHON_CBOR + select BR2_PACKAGE_PYTHON_CBOR2 select BR2_PACKAGE_PYTHON_CLICK select BR2_PACKAGE_PYTHON_CONSTANTLY select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY diff --git a/buildroot/package/python-crossbar/python-crossbar.hash b/buildroot/package/python-crossbar/python-crossbar.hash index f956dc27e..486b4d569 100644 --- a/buildroot/package/python-crossbar/python-crossbar.hash +++ b/buildroot/package/python-crossbar/python-crossbar.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/crossbar/json -md5 462a204da3c776cbb770b98f9047e8e7 crossbar-19.1.2.tar.gz -sha256 269d534a65c136a5c952a6accccf256f457569f731ee65e201e5a14e69db471a crossbar-19.1.2.tar.gz +md5 f1756c5a7eac95aa0ff3e307cdd960df crossbar-20.4.2.tar.gz +sha256 67a14864850b562c2b5586eca37f39b2eff3d650ba955bace894e6b5d0633dbb crossbar-20.4.2.tar.gz # Locally computed -sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 LICENSE +sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 crossbar/LICENSE diff --git a/buildroot/package/python-crossbar/python-crossbar.mk b/buildroot/package/python-crossbar/python-crossbar.mk index 064d2d92b..99ddc67df 100644 --- a/buildroot/package/python-crossbar/python-crossbar.mk +++ b/buildroot/package/python-crossbar/python-crossbar.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_CROSSBAR_VERSION = 19.1.2 +PYTHON_CROSSBAR_VERSION = 20.4.2 PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz -PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/86/19/54c7bd9da1ac70643b9ae7d3d4592a73391f62fcb376fcd30f8328c1c5ce +PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/3f/a2/d8aff4b366b565669236e6bbb09d9f1bbe9162eb542822e89210141dd738 PYTHON_CROSSBAR_LICENSE = AGPL-3.0 -PYTHON_CROSSBAR_LICENSE_FILES = LICENSE +PYTHON_CROSSBAR_LICENSE_FILES = crossbar/LICENSE PYTHON_CROSSBAR_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-cryptography/python-cryptography.hash b/buildroot/package/python-cryptography/python-cryptography.hash index 30ffa73d7..c6768ff21 100644 --- a/buildroot/package/python-cryptography/python-cryptography.hash +++ b/buildroot/package/python-cryptography/python-cryptography.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 77730058b556c6d9838679a94c6229ce cryptography-2.8.tar.gz -sha256 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 cryptography-2.8.tar.gz +md5 163608a7cb838c6b39360e1e64377d54 cryptography-3.0.tar.gz +sha256 8e924dbc025206e97756e8903039662aa58aa9ba357d8e1d8fc29e3092322053 cryptography-3.0.tar.gz # Locally computed sha256 checksums -sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE -sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE -sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD +sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE +sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/buildroot/package/python-cryptography/python-cryptography.mk b/buildroot/package/python-cryptography/python-cryptography.mk index 54437ae68..6eb7be8d5 100644 --- a/buildroot/package/python-cryptography/python-cryptography.mk +++ b/buildroot/package/python-cryptography/python-cryptography.mk @@ -4,13 +4,12 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 2.8 +PYTHON_CRYPTOGRAPHY_VERSION = 3.0 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/bf/ac/552fc8729d90393845cc3a2062facf4a89dcbe206fa78771d60ddaae7554 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -PYTHON_CRYPTOGRAPHY_ENV = CFLAGS="$(TARGET_CFLAGS) -pthread" $(eval $(python-package)) diff --git a/buildroot/package/python-cython/python-cython.hash b/buildroot/package/python-cython/python-cython.hash index 06ebbd5a9..168d16883 100644 --- a/buildroot/package/python-cython/python-cython.hash +++ b/buildroot/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 63c819697ed7ce89c6455ff578312a26 Cython-0.29.15.tar.gz -sha256 60d859e1efa5cc80436d58aecd3718ff2e74b987db0518376046adedba97ac30 Cython-0.29.15.tar.gz +md5 12c5e45af71dcc6dff28cdcbcbef6f39 Cython-0.29.21.tar.gz +sha256 e57acb89bd55943c8d8bf813763d20b9099cc7165c0f16b707631a7654be9cad Cython-0.29.21.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt -sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/buildroot/package/python-cython/python-cython.mk b/buildroot/package/python-cython/python-cython.mk index 997a38db1..c8dcf382f 100644 --- a/buildroot/package/python-cython/python-cython.mk +++ b/buildroot/package/python-cython/python-cython.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.15 +# Please keep in sync with package/python3-cython/python3-cython.mk +PYTHON_CYTHON_VERSION = 0.29.21 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/d9/82/d01e767abb9c4a5c07a6a1e6f4d5a8dfce7369318d31f48a52374094372e +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/6c/9f/f501ba9d178aeb1f5bf7da1ad5619b207c90ac235d9859961c11829d0160 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/buildroot/package/python-dataproperty/Config.in b/buildroot/package/python-dataproperty/Config.in index 2d42b02c6..2c5da40ff 100644 --- a/buildroot/package/python-dataproperty/Config.in +++ b/buildroot/package/python-dataproperty/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime diff --git a/buildroot/package/python-dataproperty/python-dataproperty.hash b/buildroot/package/python-dataproperty/python-dataproperty.hash index 2a1625065..bd23c461b 100644 --- a/buildroot/package/python-dataproperty/python-dataproperty.hash +++ b/buildroot/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dataproperty/json -md5 8280a85691959d988e58f52c0ed3d311 DataProperty-0.43.1.tar.gz -sha256 ac2bc221a53fcd2afa140d1feb45cadbe62b335f667dba1e08e3c43a93339103 DataProperty-0.43.1.tar.gz +md5 14a3e13d611d063df43304c3adeb6d12 DataProperty-0.48.1.tar.gz +sha256 96bd47c14b4aaba4780d77fa4d2c876cf35eb6848ab1df1a6338447b6c2c10e4 DataProperty-0.48.1.tar.gz # Locally computed sha256 checksums -sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/buildroot/package/python-dataproperty/python-dataproperty.mk b/buildroot/package/python-dataproperty/python-dataproperty.mk index 74eeb859a..33e07bc67 100644 --- a/buildroot/package/python-dataproperty/python-dataproperty.mk +++ b/buildroot/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.43.1 +PYTHON_DATAPROPERTY_VERSION = 0.48.1 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/95/68/fb3498145a106f700ff304158b6d0f0c76eb3001ee5129a4f16c9846b338 +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/2e/b5/d644919656adf4e7ae94b5479a3fec7497060c89292c335b27e59d66706f PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-decorator/python-decorator.mk b/buildroot/package/python-decorator/python-decorator.mk index 8df1dd70c..ea56b786c 100644 --- a/buildroot/package/python-decorator/python-decorator.mk +++ b/buildroot/package/python-decorator/python-decorator.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-decorator/python3-decorator.mk PYTHON_DECORATOR_VERSION = 4.4.1 PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz @@ -12,4 +13,3 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_SETUP_TYPE = setuptools $(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/buildroot/package/python-ecdsa/Config.in b/buildroot/package/python-ecdsa/Config.in index ce11910e8..eb0d65801 100644 --- a/buildroot/package/python-ecdsa/Config.in +++ b/buildroot/package/python-ecdsa/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_ECDSA bool "python-ecdsa" + select BR2_PACKAGE_PYTHON_SIX # runtime help ECDSA cryptographic signature library (pure python). diff --git a/buildroot/package/python-ecdsa/python-ecdsa.hash b/buildroot/package/python-ecdsa/python-ecdsa.hash index 3e2478365..efe396bf0 100644 --- a/buildroot/package/python-ecdsa/python-ecdsa.hash +++ b/buildroot/package/python-ecdsa/python-ecdsa.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ecdsa/json -md5 b1b33f7fe171eb1278de6f93eefc34f8 ecdsa-0.13.3.tar.gz -sha256 163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d ecdsa-0.13.3.tar.gz +md5 821d543047941dd26f543f62912230d4 ecdsa-0.15.tar.gz +sha256 8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277 ecdsa-0.15.tar.gz # Locally computed sha256 checksums sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE diff --git a/buildroot/package/python-ecdsa/python-ecdsa.mk b/buildroot/package/python-ecdsa/python-ecdsa.mk index 90e359f8b..ffb51a3aa 100644 --- a/buildroot/package/python-ecdsa/python-ecdsa.mk +++ b/buildroot/package/python-ecdsa/python-ecdsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ECDSA_VERSION = 0.13.3 +PYTHON_ECDSA_VERSION = 0.15 PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/8c/d8/9c3596fd0f18ae0a76333492a119c00183323d8e64de1a4f4bd642856963 +PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/e3/7c/b508ade1feb47cd79222e06d85e477f5cfc4fb0455ad3c70eb6330fc49aa PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-engineio/python-engineio.hash b/buildroot/package/python-engineio/python-engineio.hash index f10e69af6..ef852cf1a 100644 --- a/buildroot/package/python-engineio/python-engineio.hash +++ b/buildroot/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 bec3b06a112a7f09a0a9c92b627282fe python-engineio-3.10.0.tar.gz -sha256 9c9a6035b4b5e5a225f426f846afa14cf627f7571d1ae02167cb703fefd134b7 python-engineio-3.10.0.tar.gz +md5 e6ea8b3f2f32eeeb02014c46092f2adb python-engineio-3.12.1.tar.gz +sha256 2481732d93646998f7372ef0ecf003af7817b82720b881db173c3d50b4887916 python-engineio-3.12.1.tar.gz # Locally computed sha256 checksums -sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE +sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/buildroot/package/python-engineio/python-engineio.mk b/buildroot/package/python-engineio/python-engineio.mk index 507a0f27f..d0e073fa9 100644 --- a/buildroot/package/python-engineio/python-engineio.mk +++ b/buildroot/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 3.10.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/78/8e/c58cf2725fd17d65b9fe818b70aff4ccce4903b47aaee6f4321727a8b8bb +PYTHON_ENGINEIO_VERSION = 3.12.1 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/71/5d/620b75396ce993001cbccc80dd786ab09a16a8e3f6c4878ad05f051064d6 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-enum34/python-enum34.hash b/buildroot/package/python-enum34/python-enum34.hash index 7c0746f80..e43e00a5f 100644 --- a/buildroot/package/python-enum34/python-enum34.hash +++ b/buildroot/package/python-enum34/python-enum34.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/enum34/json -md5 5f13a0841a61f7fc295c514490d120d0 enum34-1.1.6.tar.gz +md5 b5ac0bb5ea9e830029599e410d09d3b5 enum34-1.1.10.tar.gz # Locally computed -sha256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 enum34-1.1.6.tar.gz +sha256 cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 enum34-1.1.10.tar.gz sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/buildroot/package/python-enum34/python-enum34.mk b/buildroot/package/python-enum34/python-enum34.mk index 09d1143ab..3d3ce3883 100644 --- a/buildroot/package/python-enum34/python-enum34.mk +++ b/buildroot/package/python-enum34/python-enum34.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ENUM34_VERSION = 1.1.6 +PYTHON_ENUM34_VERSION = 1.1.10 PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876 +PYTHON_ENUM34_SITE = https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c PYTHON_ENUM34_SETUP_TYPE = setuptools PYTHON_ENUM34_LICENSE = BSD-3-Clause PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE diff --git a/buildroot/package/python-filelock/Config.in b/buildroot/package/python-filelock/Config.in new file mode 100644 index 000000000..57ec03940 --- /dev/null +++ b/buildroot/package/python-filelock/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_FILELOCK + bool "python-filelock" + help + A platform independent file lock. + + https://github.com/benediktschmitt/py-filelock diff --git a/buildroot/package/python-filelock/python-filelock.hash b/buildroot/package/python-filelock/python-filelock.hash new file mode 100644 index 000000000..d50d2d561 --- /dev/null +++ b/buildroot/package/python-filelock/python-filelock.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/filelock/json +md5 c1fe6d9a7433a7ca6ce4f36e273317d1 filelock-3.0.12.tar.gz +sha256 18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59 filelock-3.0.12.tar.gz +# Locally computed sha256 checksums +sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/buildroot/package/python-filelock/python-filelock.mk b/buildroot/package/python-filelock/python-filelock.mk new file mode 100644 index 000000000..35b3374d2 --- /dev/null +++ b/buildroot/package/python-filelock/python-filelock.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-filelock +# +################################################################################ + +PYTHON_FILELOCK_VERSION = 3.0.12 +PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/14/ec/6ee2168387ce0154632f856d5cc5592328e9cf93127c5c9aeca92c8c16cb +PYTHON_FILELOCK_SETUP_TYPE = setuptools +PYTHON_FILELOCK_LICENSE = Public Domain +PYTHON_FILELOCK_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-fire/python-fire.hash b/buildroot/package/python-fire/python-fire.hash index 411270b70..a6a2df8c0 100644 --- a/buildroot/package/python-fire/python-fire.hash +++ b/buildroot/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 9f3a91c285b50351d039b6f0bb91aac3 fire-0.2.1.tar.gz -sha256 6865fefc6981a713d2ce56a2a2c92c56c729269f74a6cddd6f4b94d16ae084c9 fire-0.2.1.tar.gz +md5 af6da611394a2332fbd5bd9f1227254e fire-0.3.1.tar.gz +sha256 9736a16227c3d469e5d2d296bce5b4d8fa8d7851e953bda327a455fc2994307f fire-0.3.1.tar.gz # Locally computed sha256 checksums -sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE +sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/buildroot/package/python-fire/python-fire.mk b/buildroot/package/python-fire/python-fire.mk index 5f41a83f7..f6a2e073f 100644 --- a/buildroot/package/python-fire/python-fire.mk +++ b/buildroot/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.2.1 +PYTHON_FIRE_VERSION = 0.3.1 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/d9/69/faeaae8687f4de0f5973694d02e9d6c3eb827636a009157352d98de1129e +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/34/a7/0e22e70778aca01a52b9c899d9c145c6396d7b613719cd63db97ffa13f2f PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-babel/python-flask-babel.hash b/buildroot/package/python-flask-babel/python-flask-babel.hash index e059a594d..288036eea 100644 --- a/buildroot/package/python-flask-babel/python-flask-babel.hash +++ b/buildroot/package/python-flask-babel/python-flask-babel.hash @@ -1,5 +1,6 @@ -# md5, sha256 from https://pypi.org/pypi/flask-babel/json -md5 fcf2f360ff279d3133e40974804efd72 Flask-Babel-0.12.2.tar.gz -sha256 316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86 Flask-Babel-0.12.2.tar.gz -# Locally computed sha256 checksums +# From: https://pypi.org/project/Flask-Babel/#copy-hash-modal-91caaca6-a716-4751-9ec0-08baadced4b1 +md5 162ccb275958f9a463211ece841a2b9a Flask-Babel-1.0.0.tar.gz +sha256 d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e Flask-Babel-1.0.0.tar.gz + +# License files sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE diff --git a/buildroot/package/python-flask-babel/python-flask-babel.mk b/buildroot/package/python-flask-babel/python-flask-babel.mk index 978d29943..cd1465895 100644 --- a/buildroot/package/python-flask-babel/python-flask-babel.mk +++ b/buildroot/package/python-flask-babel/python-flask-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_BABEL_VERSION = 0.12.2 +PYTHON_FLASK_BABEL_VERSION = 1.0.0 PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz -PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/82/b0/986b29938d4e8be7deb552ebfd1ef16c311276a59bcae10dec567a5b3d20 +PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/7a/73/e4a9532ca11daeead1a99251f2ec1a5faf98117b83dbfe1b30535004cd98 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-login/python-flask-login.hash b/buildroot/package/python-flask-login/python-flask-login.hash index 75dbe30c7..9ff1f82a0 100644 --- a/buildroot/package/python-flask-login/python-flask-login.hash +++ b/buildroot/package/python-flask-login/python-flask-login.hash @@ -1,6 +1,6 @@ -# from https://pypi.python.org/pypi/flask_login/json -md5 25b34c74bd509792f291c16e184225df Flask-Login-0.4.1.tar.gz -sha256 c815c1ac7b3e35e2081685e389a665f2c74d7e077cb93cecabaea352da4752ec Flask-Login-0.4.1.tar.gz +# From https://pypi.org/project/Flask-Login/#copy-hash-modal-8bb2ac58-b80a-4793-84d4-4f32b92976d9 +md5 a2d94aa6ae935345ebc68eb3cbb5fccd Flask-Login-0.5.0.tar.gz +sha256 6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b Flask-Login-0.5.0.tar.gz -# Locally computed -sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE +# License files +sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE diff --git a/buildroot/package/python-flask-login/python-flask-login.mk b/buildroot/package/python-flask-login/python-flask-login.mk index f81a4cdff..efb63b262 100644 --- a/buildroot/package/python-flask-login/python-flask-login.mk +++ b/buildroot/package/python-flask-login/python-flask-login.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_LOGIN_VERSION = 0.4.1 +PYTHON_FLASK_LOGIN_VERSION = 0.5.0 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/c1/ff/bd9a4d2d81bf0c07d9e53e8cd3d675c56553719bbefd372df69bf1b3c1e4 +PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/f9/01/f6c0a3a654ca125cf9cd273314c03a8bc6a47bf861765c8c1d375e15a28d PYTHON_FLASK_LOGIN_LICENSE = MIT PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-flatbuffers/Config.in b/buildroot/package/python-flatbuffers/Config.in new file mode 100644 index 000000000..b24b5aaf6 --- /dev/null +++ b/buildroot/package/python-flatbuffers/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_FLATBUFFERS + bool "python-flatbuffers" + help + The FlatBuffers serialization format for Python. + + https://github.com/google/flatbuffers diff --git a/buildroot/package/python-flatbuffers/python-flatbuffers.hash b/buildroot/package/python-flatbuffers/python-flatbuffers.hash new file mode 100644 index 000000000..ba7df6bab --- /dev/null +++ b/buildroot/package/python-flatbuffers/python-flatbuffers.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flatbuffers/json +md5 b9a5b8dfbbb4751788529310118ea6db flatbuffers-1.12.tar.gz +sha256 63bb9a722d5e373701913e226135b28a6f6ac200d5cc7b4d919fa38d73b44610 flatbuffers-1.12.tar.gz diff --git a/buildroot/package/python-flatbuffers/python-flatbuffers.mk b/buildroot/package/python-flatbuffers/python-flatbuffers.mk new file mode 100644 index 000000000..33bb57ddf --- /dev/null +++ b/buildroot/package/python-flatbuffers/python-flatbuffers.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-flatbuffers +# +################################################################################ + +PYTHON_FLATBUFFERS_VERSION = 1.12 +PYTHON_FLATBUFFERS_SOURCE = flatbuffers-$(PYTHON_FLATBUFFERS_VERSION).tar.gz +PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/4d/c4/7b995ab9bf0c7eaf10c386d29a03408dfcf72648df4102b1f18896c3aeea +PYTHON_FLATBUFFERS_LICENSE = Apache-2.0 +PYTHON_FLATBUFFERS_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-frozenlist/python-frozenlist.hash b/buildroot/package/python-frozenlist/python-frozenlist.hash index 4a006586d..0ecc5f9cd 100644 --- a/buildroot/package/python-frozenlist/python-frozenlist.hash +++ b/buildroot/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 7d493070a7fe12b6be753585c1995abe frozenlist-1.0.0.tar.gz -sha256 d1076a40cd1bef6edf148cc05aecce52a11c9bbd2a3d60ce37cc07e03c8dc6c7 frozenlist-1.0.0.tar.gz +md5 2a83a520014203d0a56993c332ff7e23 frozenlist-1.1.0.tar.gz +sha256 d167a5050628323fcb3db410375eb06390ab135454fd85fd79c5832f5ec2b8ed frozenlist-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt diff --git a/buildroot/package/python-frozenlist/python-frozenlist.mk b/buildroot/package/python-frozenlist/python-frozenlist.mk index 1d36b4df5..b113c3808 100644 --- a/buildroot/package/python-frozenlist/python-frozenlist.mk +++ b/buildroot/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.0.0 +PYTHON_FROZENLIST_VERSION = 1.1.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/85/32/12f1247bf4915b74a00264aa0033745ee871759daee47499641bd13aeee7 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/12/0e/119f1f186e93c21d078db1ddd7b21247a8a49261689d9284dec28be3b08e PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch b/buildroot/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch deleted file mode 100644 index d883f60dd..000000000 --- a/buildroot/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] m4/python.m4: add PYTHON_INCLUDES override for cross compilation - -As the configure script mixes up host/target python. Equivalent to the -similar code in dbus-python. - -Signed-off-by: Peter Korsgaard ---- - m4/python.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: python-gobject-2.28.6/m4/python.m4 -=================================================================== ---- python-gobject-2.28.6.orig/m4/python.m4 -+++ python-gobject-2.28.6/m4/python.m4 -@@ -43,6 +43,9 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+if test "${PYTHON_INCLUDES+set}" = set; then -+ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES]) -+else - py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` - py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` - PYTHON_CONFIG=`which $PYTHON`-config -@@ -54,6 +57,7 @@ - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" diff --git a/buildroot/package/python-gobject/Config.in b/buildroot/package/python-gobject/Config.in index 36ddffebb..1c9303b0b 100644 --- a/buildroot/package/python-gobject/Config.in +++ b/buildroot/package/python-gobject/Config.in @@ -1,16 +1,19 @@ config BR2_PACKAGE_PYTHON_GOBJECT bool "python-gobject" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_PACKAGE_PYTHON # Broken with python 3.8 + depends on BR2_USE_MMU # libglib2, gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBGLIB2 help Python bindings for the GLib/GObject library https://wiki.gnome.org/action/show/Projects/PyGObject -comment "python-gobject needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_PYTHON +comment "python-gobject needs a glibc toolchain, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-gobject/python-gobject.hash b/buildroot/package/python-gobject/python-gobject.hash index 0c093f330..fd2235f20 100644 --- a/buildroot/package/python-gobject/python-gobject.hash +++ b/buildroot/package/python-gobject/python-gobject.hash @@ -1,4 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.sha256sum -sha256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 pygobject-2.28.6.tar.xz -# Locally computed +# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.1.sha256sum +sha256 d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f pygobject-3.36.1.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/buildroot/package/python-gobject/python-gobject.mk b/buildroot/package/python-gobject/python-gobject.mk index cf5c87415..0cada82fb 100644 --- a/buildroot/package/python-gobject/python-gobject.mk +++ b/buildroot/package/python-gobject/python-gobject.mk @@ -4,36 +4,29 @@ # ################################################################################ -PYTHON_GOBJECT_VERSION_MAJOR = 2.28 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).6 +PYTHON_GOBJECT_VERSION_MAJOR = 3.36 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz -PYTHON_GOBJECT_SITE = http://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) +PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ PYTHON_GOBJECT_LICENSE_FILES = COPYING -PYTHON_GOBJECT_DEPENDENCIES = host-pkgconf libglib2 -PYTHON_GOBJECT_CONF_OPTS = --disable-introspection -# for 0001-add-PYTHON_INCLUDES-override.patch -PYTHON_GOBJECT_AUTORECONF = YES +PYTHON_GOBJECT_INSTALL_STAGING = YES +PYTHON_GOBJECT_DEPENDENCIES = \ + gobject-introspection \ + host-pkgconf \ + libglib2 \ + python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_GOBJECT_DEPENDENCIES += python host-python +PYTHON_GOBJECT_CONF_OPTS += \ + -Dpycairo=false \ + -Dtests=false -PYTHON_GOBJECT_CONF_ENV = \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" -else -PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3 +# A sysconfigdata_name must be manually specified or the resulting .so +# will have a x86_64 prefix, which causes "import gi" to fail. +# A pythonpath must be specified or the host python path will be used resulting +# in a "not a valid python" error. +PYTHON_GOBJECT_CONF_ENV += \ + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) -PYTHON_GOBJECT_CONF_ENV = \ - PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" -endif - -ifeq ($(BR2_PACKAGE_LIBFFI),y) -PYTHON_GOBJECT_CONF_OPTS += --with-ffi -PYTHON_GOBJECT_DEPENDENCIES += libffi -else -PYTHON_GOBJECT_CONF_OPTS += --without-ffi -endif - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/python-gpiozero/Config.in b/buildroot/package/python-gpiozero/Config.in new file mode 100644 index 000000000..1e2735be4 --- /dev/null +++ b/buildroot/package/python-gpiozero/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_GPIOZERO + bool "python-gpiozero" + depends on BR2_arm + select BR2_PACKAGE_PYTHON_COLORZERO # runtime + select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime + help + A simple interface to GPIO devices with Raspberry Pi. + + https://github.com/gpiozero/gpiozero diff --git a/buildroot/package/python-gpiozero/python-gpiozero.hash b/buildroot/package/python-gpiozero/python-gpiozero.hash new file mode 100644 index 000000000..230200356 --- /dev/null +++ b/buildroot/package/python-gpiozero/python-gpiozero.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 8cb9824fe1b08e7935de03899455e20ce2c242e4cebb0c954c274c48059f6ea5 python-gpiozero-1.5.1.tar.gz +# Locally computed +sha256 b6e26763b79d7904d6eaa66f7f53ae374cf30431bb6ba8bcb0d9d5ff56dc69e3 LICENSE.rst diff --git a/buildroot/package/python-gpiozero/python-gpiozero.mk b/buildroot/package/python-gpiozero/python-gpiozero.mk new file mode 100644 index 000000000..67e8067a8 --- /dev/null +++ b/buildroot/package/python-gpiozero/python-gpiozero.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-gpiozero +# +################################################################################ + +PYTHON_GPIOZERO_VERSION = 1.5.1 +PYTHON_GPIOZERO_SITE = $(call github,gpiozero,gpiozero,v$(PYTHON_GPIOZERO_VERSION)) +PYTHON_GPIOZERO_LICENSE = BSD-3-Clause +PYTHON_GPIOZERO_LICENSE_FILES = LICENSE.rst +PYTHON_GPIOZERO_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-greenlet/Config.in b/buildroot/package/python-greenlet/Config.in new file mode 100644 index 000000000..c73eeb7b1 --- /dev/null +++ b/buildroot/package/python-greenlet/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 + default y if BR2_csky + default y if BR2_m68k + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_sparc || BR2_sparc64 + default y if BR2_i386 || BR2_x86_64 + +config BR2_PACKAGE_PYTHON_GREENLET + bool "python-greenlet" + depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + help + Lightweight in-process concurrent programming. + + https://github.com/python-greenlet/greenlet diff --git a/buildroot/package/python-greenlet/python-greenlet.hash b/buildroot/package/python-greenlet/python-greenlet.hash new file mode 100644 index 000000000..eed8e5971 --- /dev/null +++ b/buildroot/package/python-greenlet/python-greenlet.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/greenlet/json +md5 9aebea08f7beb6b87143d0588578c984 greenlet-0.4.16.tar.gz +sha256 6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c greenlet-0.4.16.tar.gz +# Locally computed sha256 checksums +sha256 bbde55d5456a1e912633ed3f66d1dbd9504e3e3dce4f4c2015043cdcbc56e697 LICENSE +sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/buildroot/package/python-greenlet/python-greenlet.mk b/buildroot/package/python-greenlet/python-greenlet.mk new file mode 100644 index 000000000..9243afe51 --- /dev/null +++ b/buildroot/package/python-greenlet/python-greenlet.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-greenlet +# +################################################################################ + +PYTHON_GREENLET_VERSION = 0.4.16 +PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/20/5e/b989a19f4597b825f44125345cd8a8574216fae7fafe69e2cb1238ebd18a +PYTHON_GREENLET_SETUP_TYPE = distutils +PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 +PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF + +$(eval $(python-package)) diff --git a/buildroot/package/python-h2/python-h2.hash b/buildroot/package/python-h2/python-h2.hash index 1d5df8878..4193567d3 100644 --- a/buildroot/package/python-h2/python-h2.hash +++ b/buildroot/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 950b5a62a2a608dc4547a01edf99aa8f h2-3.1.1.tar.gz -sha256 b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4 h2-3.1.1.tar.gz +md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz +sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE diff --git a/buildroot/package/python-h2/python-h2.mk b/buildroot/package/python-h2/python-h2.mk index 0043ee2d5..81397bbb1 100644 --- a/buildroot/package/python-h2/python-h2.mk +++ b/buildroot/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.1.1 +PYTHON_H2_VERSION = 3.2.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/56/73/0bc3a2f4238bdfbd9b0dc41a972fb558d96e8580ef2a37129ee5a54fa04e +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-hiredis/python-hiredis.hash b/buildroot/package/python-hiredis/python-hiredis.hash index 1a013bb3a..091532dd2 100644 --- a/buildroot/package/python-hiredis/python-hiredis.hash +++ b/buildroot/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 ad421ea848734c7be5c10689caa2a6f1 hiredis-1.0.1.tar.gz -sha256 aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4 hiredis-1.0.1.tar.gz +md5 430294afb3ebb37ebc7cc05bf3e5a389 hiredis-1.1.0.tar.gz +sha256 996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132 hiredis-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING -sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING +sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING +sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/buildroot/package/python-hiredis/python-hiredis.mk b/buildroot/package/python-hiredis/python-hiredis.mk index 435918feb..7d871d1f0 100644 --- a/buildroot/package/python-hiredis/python-hiredis.mk +++ b/buildroot/package/python-hiredis/python-hiredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 1.0.1 +PYTHON_HIREDIS_VERSION = 1.1.0 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/7f/5c/62e5c6b811b4dcef4125b4a01f76db82c496d79299dd67053b8f9c0732c0 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/3d/9f/abc69e73055f73d42ddf9c46b3e01a08b9e74b579b8fc413cbd31112a749 PYTHON_HIREDIS_SETUP_TYPE = setuptools PYTHON_HIREDIS_LICENSE = BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = COPYING vendor/hiredis/COPYING diff --git a/buildroot/package/python-httplib2/python-httplib2.hash b/buildroot/package/python-httplib2/python-httplib2.hash index d299b61bc..c272d8517 100644 --- a/buildroot/package/python-httplib2/python-httplib2.hash +++ b/buildroot/package/python-httplib2/python-httplib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httplib2/json -md5 427cda9f4d55762db325bd2eb46b7fe0 httplib2-0.14.0.tar.gz -sha256 34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107 httplib2-0.14.0.tar.gz +md5 4c05b09eb6f6c20a31ca488c7a87dda9 httplib2-0.17.2.tar.gz +sha256 eb7a6b137ae31e61c5f429083c5bebb71fe5fd1958e7f3d5c39b21b11cd4b290 httplib2-0.17.2.tar.gz # Locally computer sha256 checksums -sha256 d8b8e99f77a260b8ca939f6a73ed0ea86977229a3d97f85547f499a62f61f5af PKG-INFO +sha256 4205f0d88e04380ba13b9c60e2f85771196b66ee84bf48971d30d82a78e84c3f PKG-INFO diff --git a/buildroot/package/python-httplib2/python-httplib2.mk b/buildroot/package/python-httplib2/python-httplib2.mk index a74c0e7c7..fbdb6d83c 100644 --- a/buildroot/package/python-httplib2/python-httplib2.mk +++ b/buildroot/package/python-httplib2/python-httplib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.14.0 +PYTHON_HTTPLIB2_VERSION = 0.17.2 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ce/2e/87461bfbb7e561203b759b3f7f639e2144226604372830d00a8279960ae1 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/1b/f0/a35a448afea308aeb6a1430dbcfb46f4cef11360cbc18f22af6e567bb847 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO diff --git a/buildroot/package/python-idna/python-idna.hash b/buildroot/package/python-idna/python-idna.hash index ddfd44e97..c5f7378fd 100644 --- a/buildroot/package/python-idna/python-idna.hash +++ b/buildroot/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 2e9ae0b4a0b26d1747c6127cdb060bc1 idna-2.8.tar.gz -sha256 c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 idna-2.8.tar.gz +md5 7a910c706db30d758f377db2762c0f9a idna-2.10.tar.gz +sha256 b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 idna-2.10.tar.gz # Locally computed sha256 checksums -sha256 0d4bc7abd48dcfb14e24254ee404066737ff0167144e222914a2113b8794683e LICENSE.rst +sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst diff --git a/buildroot/package/python-idna/python-idna.mk b/buildroot/package/python-idna/python-idna.mk index 1dae47bb2..b4d9839e2 100644 --- a/buildroot/package/python-idna/python-idna.mk +++ b/buildroot/package/python-idna/python-idna.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 2.8 +PYTHON_IDNA_VERSION = 2.10 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ad/13/eb56951b6f7950cadb579ca166e448ba77f9d24efc03edd7e55fa57d04b7 -PYTHON_IDNA_LICENSE = BSD-3-Clause +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70 +PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.rst PYTHON_IDNA_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-ifaddr/python-ifaddr.hash b/buildroot/package/python-ifaddr/python-ifaddr.hash index 18df40ac4..57b155caa 100644 --- a/buildroot/package/python-ifaddr/python-ifaddr.hash +++ b/buildroot/package/python-ifaddr/python-ifaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ifaddr/json -md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz -sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz -# Locally calculated -sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py +md5 97c4eb7505643b5f1fe17733cb42abd9 ifaddr-0.1.7.tar.gz +sha256 1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 ifaddr-0.1.7.tar.gz +# Locally computed sha256 checksums +sha256 8700856576ae2bc80c63bc970250510d9213fb02fed006d5f22742c9ddde24d7 LICENSE.txt diff --git a/buildroot/package/python-ifaddr/python-ifaddr.mk b/buildroot/package/python-ifaddr/python-ifaddr.mk index 23c4ee365..f1154d9de 100644 --- a/buildroot/package/python-ifaddr/python-ifaddr.mk +++ b/buildroot/package/python-ifaddr/python-ifaddr.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IFADDR_VERSION = 0.1.6 +PYTHON_IFADDR_VERSION = 0.1.7 PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz -PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8 +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/3d/fc/4ce147e3997cd0ea470ad27112087545cf83bf85015ddb3054673cb471bb PYTHON_IFADDR_SETUP_TYPE = setuptools PYTHON_IFADDR_LICENSE = MIT -PYTHON_IFADDR_LICENSE_FILES = setup.py +PYTHON_IFADDR_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/buildroot/package/python-influxdb/Config.in b/buildroot/package/python-influxdb/Config.in index a848e4f2a..6ebbd4aa9 100644 --- a/buildroot/package/python-influxdb/Config.in +++ b/buildroot/package/python-influxdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_INFLUXDB bool "python-influxdb" select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/buildroot/package/python-influxdb/python-influxdb.hash b/buildroot/package/python-influxdb/python-influxdb.hash index d1f25552c..7b43091ec 100644 --- a/buildroot/package/python-influxdb/python-influxdb.hash +++ b/buildroot/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 01db77f4ca825d554a78804a4be4a353 influxdb-5.2.3.tar.gz -sha256 30276c7e04bf7659424c733b239ba2f0804d7a1f3c59ec5dd3f88c56176c8d36 influxdb-5.2.3.tar.gz +md5 d528c8ccd8ab40bc608ad1e507e7788a influxdb-5.3.0.tar.gz +sha256 9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6 influxdb-5.3.0.tar.gz # Locally computed sha256 checksums -sha256 70146f78d168b33ac5903490a918469e22a801a8d3a81103f3d8706dc0024c9a LICENSE +sha256 b654917e2c25a69d2bd56e72dddbc6eb29bf7e40384d7c46bb291d5c5185213b LICENSE diff --git a/buildroot/package/python-influxdb/python-influxdb.mk b/buildroot/package/python-influxdb/python-influxdb.mk index 160a9d413..e5b1aea70 100644 --- a/buildroot/package/python-influxdb/python-influxdb.mk +++ b/buildroot/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.2.3 +PYTHON_INFLUXDB_VERSION = 5.3.0 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/d2/0d/351a346886ecbe61211cbfcad8ac73f99f5a9bf526916631c5668dbad601 +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/be/8d/85ec8f11299a6dfc115244db71fd8f13e9a69f5e9eb77dc3392f4f959e9a PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-iniconfig/Config.in b/buildroot/package/python-iniconfig/Config.in new file mode 100644 index 000000000..a288da8a6 --- /dev/null +++ b/buildroot/package/python-iniconfig/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_INICONFIG + bool "python-iniconfig" + help + iniconfig: brain-dead simple config-ini parsing. + + http://github.com/RonnyPfannschmidt/iniconfig diff --git a/buildroot/package/python-iniconfig/python-iniconfig.hash b/buildroot/package/python-iniconfig/python-iniconfig.hash new file mode 100644 index 000000000..708c0553a --- /dev/null +++ b/buildroot/package/python-iniconfig/python-iniconfig.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/iniconfig/json +md5 464179a74789d033b170101f6aa38c2a iniconfig-1.0.1.tar.gz +sha256 e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69 iniconfig-1.0.1.tar.gz +# Locally computed sha256 checksums +sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/buildroot/package/python-iniconfig/python-iniconfig.mk b/buildroot/package/python-iniconfig/python-iniconfig.mk new file mode 100644 index 000000000..57f31c419 --- /dev/null +++ b/buildroot/package/python-iniconfig/python-iniconfig.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-iniconfig +# +################################################################################ + +PYTHON_INICONFIG_VERSION = 1.0.1 +PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/aa/6e/60dafce419de21f2f3f29319114808cac9f49b6c15117a419737a4ce3813 +PYTHON_INICONFIG_SETUP_TYPE = setuptools +PYTHON_INICONFIG_LICENSE = MIT +PYTHON_INICONFIG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-intelhex/Config.in b/buildroot/package/python-intelhex/Config.in new file mode 100644 index 000000000..d67de822f --- /dev/null +++ b/buildroot/package/python-intelhex/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_INTELHEX + bool "python-intelhex" + help + Python library for Intel HEX files manipulations. + + https://github.com/python-intelhex/intelhex diff --git a/buildroot/package/python-intelhex/python-intelhex.hash b/buildroot/package/python-intelhex/python-intelhex.hash new file mode 100644 index 000000000..917bd72cd --- /dev/null +++ b/buildroot/package/python-intelhex/python-intelhex.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/intelhex/json +md5 9de0e92c1b66f75322581c8b22c020c2 intelhex-2.3.0.tar.gz +sha256 892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093 intelhex-2.3.0.tar.gz +# Locally computed sha256 checksums +sha256 1b2eb032ab8a1b0266f7995c76e44509f89ca9c0e90ec507763b5e735aca7de4 LICENSE.txt diff --git a/buildroot/package/python-intelhex/python-intelhex.mk b/buildroot/package/python-intelhex/python-intelhex.mk new file mode 100644 index 000000000..cc8b973f0 --- /dev/null +++ b/buildroot/package/python-intelhex/python-intelhex.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-intelhex +# +################################################################################ + +PYTHON_INTELHEX_VERSION = 2.3.0 +PYTHON_INTELHEX_SOURCE = intelhex-$(PYTHON_INTELHEX_VERSION).tar.gz +PYTHON_INTELHEX_SITE = https://files.pythonhosted.org/packages/66/37/1e7522494557d342a24cb236e2aec5d078fac8ed03ad4b61372586406b01 +PYTHON_INTELHEX_SETUP_TYPE = setuptools +PYTHON_INTELHEX_LICENSE = BSD-3-Clause +PYTHON_INTELHEX_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-ipdb/Config.in b/buildroot/package/python-ipdb/Config.in new file mode 100644 index 000000000..4a89bf75d --- /dev/null +++ b/buildroot/package/python-ipdb/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_IPDB + bool "python-ipdb" + depends on BR2_PACKAGE_PYTHON3 # python-ipython + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_IPYTHON # runtime + help + IPython-enabled pdb. + + https://github.com/gotcha/ipdb diff --git a/buildroot/package/python-ipdb/python-ipdb.hash b/buildroot/package/python-ipdb/python-ipdb.hash new file mode 100644 index 000000000..c7cd93225 --- /dev/null +++ b/buildroot/package/python-ipdb/python-ipdb.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ipdb/json +md5 7db72771b279924ac4e5905d7eee184e ipdb-0.13.2.tar.gz +sha256 77fb1c2a6fccdfee0136078c9ed6fe547ab00db00bebff181f1e8c9e13418d49 ipdb-0.13.2.tar.gz +# Locally computed sha256 checksums +sha256 4eeb49de04f4894f8ea1f69a04f500799041b750b3d554c06de5ca877258e734 COPYING.txt diff --git a/buildroot/package/python-ipdb/python-ipdb.mk b/buildroot/package/python-ipdb/python-ipdb.mk new file mode 100644 index 000000000..c98f9700b --- /dev/null +++ b/buildroot/package/python-ipdb/python-ipdb.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-ipdb +# +################################################################################ + +PYTHON_IPDB_VERSION = 0.13.2 +PYTHON_IPDB_SOURCE = ipdb-$(PYTHON_IPDB_VERSION).tar.gz +PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/2c/bb/a3e1a441719ebd75c6dac8170d3ddba884b7ee8a5c0f9aefa7297386627a +PYTHON_IPDB_SETUP_TYPE = setuptools +PYTHON_IPDB_LICENSE = BSD-3-Clause +PYTHON_IPDB_LICENSE_FILES = COPYING.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-janus/python-janus.hash b/buildroot/package/python-janus/python-janus.hash index 509876990..9108db632 100644 --- a/buildroot/package/python-janus/python-janus.hash +++ b/buildroot/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 26283b122439fbca4ae1db18ff839b7c janus-0.4.0.tar.gz -sha256 cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef janus-0.4.0.tar.gz +md5 577c3c8939ef945c5dc00319bd59484f janus-0.5.0.tar.gz +sha256 0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c janus-0.5.0.tar.gz # Locally computed sha256 checksums -sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE +sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/buildroot/package/python-janus/python-janus.mk b/buildroot/package/python-janus/python-janus.mk index f718d0c19..b5fa44f72 100644 --- a/buildroot/package/python-janus/python-janus.mk +++ b/buildroot/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.4.0 +PYTHON_JANUS_VERSION = 0.5.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/e2/39/41fd545b99eac81d47fe346b8c78c09a3b187ce2fd9f3c9656dfe035e39a +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/9a/76/fbb89aa5d3cb5f3fec6ce74d34cf980ccd475b015d1a59cb5a14fe4cd2c5 PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-jedi/python-jedi.hash b/buildroot/package/python-jedi/python-jedi.hash index 77af6e79f..ac5f82e1d 100644 --- a/buildroot/package/python-jedi/python-jedi.hash +++ b/buildroot/package/python-jedi/python-jedi.hash @@ -1,7 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 ba88266caac41988ffb4fd6041a3c354 jedi-0.15.1.tar.gz -sha256 ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e jedi-0.15.1.tar.gz +md5 d6a8e5832939c51dceda474b720696f6 jedi-0.17.0.tar.gz +sha256 df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030 jedi-0.17.0.tar.gz # Locally computed sha256 checksums sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt -sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE sha256 b41b78f562a2e65b75cab44354335f6f435d4ef73065509600ac910cf4e22fe0 jedi/third_party/typeshed/LICENSE diff --git a/buildroot/package/python-jedi/python-jedi.mk b/buildroot/package/python-jedi/python-jedi.mk index 4e756a709..245ba99a3 100644 --- a/buildroot/package/python-jedi/python-jedi.mk +++ b/buildroot/package/python-jedi/python-jedi.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.15.1 +PYTHON_JEDI_VERSION = 0.17.0 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/85/03/cd5a6e44a5753b4d539288d9d1f9645caac889c17dd2950292a8818f86b2 +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/e3/5b/65ff9c102d92bf719dfaeff57bc8074d68f26ea480005704a956da995799 PYTHON_JEDI_SETUP_TYPE = setuptools -PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme), Apache-2.0 (typeshed) -PYTHON_JEDI_LICENSE_FILES = \ - LICENSE.txt docs/_themes/flask/LICENSE jedi/third_party/typeshed/LICENSE +PYTHON_JEDI_LICENSE = MIT, Apache-2.0 (typeshed) +PYTHON_JEDI_LICENSE_FILES = LICENSE.txt jedi/third_party/typeshed/LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-jinja2/Config.in b/buildroot/package/python-jinja2/Config.in index a1900e94d..5b99df75b 100644 --- a/buildroot/package/python-jinja2/Config.in +++ b/buildroot/package/python-jinja2/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_JINJA2 bool "python-jinja2" select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime + select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 help Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports diff --git a/buildroot/package/python-jinja2/python-jinja2.hash b/buildroot/package/python-jinja2/python-jinja2.hash index 7231123b5..21170a2a9 100644 --- a/buildroot/package/python-jinja2/python-jinja2.hash +++ b/buildroot/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 7883559bc5cc3e2781d94b4be61cfdcd Jinja2-2.10.3.tar.gz -sha256 9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de Jinja2-2.10.3.tar.gz -# Locally computed sha256 -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +md5 0362203b22547abca06ed1082bc1e7b4 Jinja2-2.11.2.tar.gz +sha256 89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0 Jinja2-2.11.2.tar.gz +# Locally computed sha256 checksums +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/buildroot/package/python-jinja2/python-jinja2.mk b/buildroot/package/python-jinja2/python-jinja2.mk index 5f011aa1a..5f6492915 100644 --- a/buildroot/package/python-jinja2/python-jinja2.mk +++ b/buildroot/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 2.10.3 +PYTHON_JINJA2_VERSION = 2.11.2 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/7b/db/1d037ccd626d05a7a47a1b81ea73775614af83c2b3e53d86a0bb41d8d799 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/64/a7/45e11eebf2f15bf987c3bc11d37dcc838d9dc81250e67e4c5968f6008b6c PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst @@ -20,7 +20,7 @@ HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe # Hence remove both files after package extraction. ifeq ($(BR2_PACKAGE_PYTHON),y) define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT - rm $(@D)/jinja2/asyncsupport.py $(@D)/jinja2/asyncfilters.py + rm $(@D)/src/jinja2/asyncsupport.py $(@D)/src/jinja2/asyncfilters.py endef PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT diff --git a/buildroot/package/python-jmespath/Config.in b/buildroot/package/python-jmespath/Config.in new file mode 100644 index 000000000..7bcd8f6a1 --- /dev/null +++ b/buildroot/package/python-jmespath/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_JMESPATH + bool "python-jmespath" + help + JMESPath is a query language for JSON. + + https://github.com/jmespath/jmespath.py diff --git a/buildroot/package/python-jmespath/python-jmespath.hash b/buildroot/package/python-jmespath/python-jmespath.hash new file mode 100644 index 000000000..4d1ccb5bb --- /dev/null +++ b/buildroot/package/python-jmespath/python-jmespath.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jmespath/json +md5 5c3380a84c565d7438e4766fd4b7a775 jmespath-0.9.4.tar.gz +sha256 bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c jmespath-0.9.4.tar.gz +# Locally computed sha256 checksums +sha256 66b313cce80ed0623fc7db3f24863a0c80fd83eb341a46b57864158ae74faa56 LICENSE.txt diff --git a/buildroot/package/python-jmespath/python-jmespath.mk b/buildroot/package/python-jmespath/python-jmespath.mk new file mode 100644 index 000000000..4afd06fd4 --- /dev/null +++ b/buildroot/package/python-jmespath/python-jmespath.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jmespath +# +################################################################################ + +PYTHON_JMESPATH_VERSION = 0.9.4 +PYTHON_JMESPATH_SOURCE = jmespath-$(PYTHON_JMESPATH_VERSION).tar.gz +PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/2c/30/f0162d3d83e398c7a3b70c91eef61d409dea205fb4dc2b47d335f429de32 +PYTHON_JMESPATH_SETUP_TYPE = setuptools +PYTHON_JMESPATH_LICENSE = MIT +PYTHON_JMESPATH_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-keyring/Config.in b/buildroot/package/python-keyring/Config.in index 2dc990a50..18fad8400 100644 --- a/buildroot/package/python-keyring/Config.in +++ b/buildroot/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" - depends on BR2_PACKAGE_PYTHON3 # python-secretstorage + depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage + select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help The Python keyring lib provides a easy way to access the diff --git a/buildroot/package/python-keyring/python-keyring.hash b/buildroot/package/python-keyring/python-keyring.hash index a57419039..159579f79 100644 --- a/buildroot/package/python-keyring/python-keyring.hash +++ b/buildroot/package/python-keyring/python-keyring.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/keyring/json, sha256 locally computed -md5 9c53e4f2427ebaa59d304a826311fbcf keyring-10.5.0.tar.gz -sha256 0e6129e8c5bc80da34cc1942d30daad79ed40419fcaaa538278c3b2ff235b313 keyring-10.5.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/keyring/json +md5 1eb6d586ee5794de4bf39c1f513a3139 keyring-19.2.0.tar.gz +sha256 91037ccaf0c9a112a76f7740e4a416b9457a69b66c2799421581bee710a974b3 keyring-19.2.0.tar.gz +# Locally computed sha256 checksums sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-keyring/python-keyring.mk b/buildroot/package/python-keyring/python-keyring.mk index 27db2802e..2f6ee8497 100644 --- a/buildroot/package/python-keyring/python-keyring.mk +++ b/buildroot/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 10.5.0 +PYTHON_KEYRING_VERSION = 19.2.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/ee/46/77fdb7cd2b0f1f684afbc35a59b3d7ebb6961fe528f97b86900002968914 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-lmdb/python-lmdb.hash b/buildroot/package/python-lmdb/python-lmdb.hash index f57437b5f..569d1d0bd 100644 --- a/buildroot/package/python-lmdb/python-lmdb.hash +++ b/buildroot/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 917f611903283a05d43a85ad1e7d05d3 lmdb-0.97.tar.gz -sha256 173d71ade5fd402c7e9ecb0a1d6022c92a7f89c313132ef4e5e561d349b0834b lmdb-0.97.tar.gz +md5 ae2efef18202e51c9e4a807a47900ce2 lmdb-0.98.tar.gz +sha256 0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708 lmdb-0.98.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/python-lmdb/python-lmdb.mk b/buildroot/package/python-lmdb/python-lmdb.mk index 5e1c0f4c7..f92c7f775 100644 --- a/buildroot/package/python-lmdb/python-lmdb.mk +++ b/buildroot/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 0.97 +PYTHON_LMDB_VERSION = 0.98 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/9f/8f/37cc080deb867305bf2d3ec4639e33b981d0def8d78949454a4654ca16bf +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/c0/5c/d56dbc2532ecf14fa004c543927500c0f645eaca8bd7ec39420c7546396a PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-lxml/python-lxml.hash b/buildroot/package/python-lxml/python-lxml.hash index eb7acbaab..240314e88 100644 --- a/buildroot/package/python-lxml/python-lxml.hash +++ b/buildroot/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692 lxml-4.4.1.tar.gz +sha256 27ee0faf8077c7c1a589573b1450743011117f1aa1a91d5ae776bbc5ca6070f2 lxml-4.5.1.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/buildroot/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk index 0eb837080..7e727a675 100644 --- a/buildroot/package/python-lxml/python-lxml.mk +++ b/buildroot/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.4.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/c4/43/3f1e7d742e2a7925be180b6af5e0f67d38de2f37560365ac1a0b9a04c015 +PYTHON_LXML_VERSION = 4.5.1 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/03/a8/73d795778143be51d8b86750b371b3efcd7139987f71618ad9f4b8b65543 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. @@ -26,11 +26,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --with-xslt-config=$(HOST_DIR)/bin/xslt-config \ - --with-xml2-config=$(HOST_DIR)/bin/xml2-config + --xslt-config=$(HOST_DIR)/bin/xslt-config \ + --xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-m2crypto/Config.in b/buildroot/package/python-m2crypto/Config.in new file mode 100644 index 000000000..7481d49e5 --- /dev/null +++ b/buildroot/package/python-m2crypto/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_M2CRYPTO + bool "python-m2crypto" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + help + M2Crypto: A Python crypto and SSL toolkit. + + https://gitlab.com/m2crypto/m2crypto diff --git a/buildroot/package/python-m2crypto/python-m2crypto.hash b/buildroot/package/python-m2crypto/python-m2crypto.hash new file mode 100644 index 000000000..148cdd831 --- /dev/null +++ b/buildroot/package/python-m2crypto/python-m2crypto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/m2crypto/json +md5 b8b34c5b83892096a8676b6f2e8f4e7e M2Crypto-0.36.0.tar.gz +sha256 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1 M2Crypto-0.36.0.tar.gz +# Locally computed sha256 checksums +sha256 4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0 LICENCE diff --git a/buildroot/package/python-m2crypto/python-m2crypto.mk b/buildroot/package/python-m2crypto/python-m2crypto.mk new file mode 100644 index 000000000..ccc63058c --- /dev/null +++ b/buildroot/package/python-m2crypto/python-m2crypto.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-m2crypto +# +################################################################################ + +PYTHON_M2CRYPTO_VERSION = 0.36.0 +PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz +PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/ff/df/84609ed874b5e6fcd3061a517bf4b6e4d0301f553baf9fa37bef2b509797 +PYTHON_M2CRYPTO_SETUP_TYPE = setuptools +PYTHON_M2CRYPTO_LICENSE = MIT +PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE +PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig +PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr + +$(eval $(python-package)) diff --git a/buildroot/package/python-mako/python-mako.hash b/buildroot/package/python-mako/python-mako.hash index 0f0dadcd0..19b122179 100644 --- a/buildroot/package/python-mako/python-mako.hash +++ b/buildroot/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 6c3f2da0b74af529a4c4a537d0848bf2 Mako-1.1.0.tar.gz -sha256 a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b Mako-1.1.0.tar.gz +md5 e1939facb40f38f15e8cc74cb5887c4c Mako-1.1.2.tar.gz +sha256 3139c5d64aa5d175dbafb95027057128b5fbd05a40c53999f3905ceb53366d9d Mako-1.1.2.tar.gz # Locally computed sha256 checksums -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 LICENSE +sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE diff --git a/buildroot/package/python-mako/python-mako.mk b/buildroot/package/python-mako/python-mako.mk index 622359493..ce34321cb 100644 --- a/buildroot/package/python-mako/python-mako.mk +++ b/buildroot/package/python-mako/python-mako.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python3-mako/python3-mako.mk -PYTHON_MAKO_VERSION = 1.1.0 +PYTHON_MAKO_VERSION = 1.1.2 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/42/64/fc7c506d14d8b6ed363e7798ffec2dfe4ba21e14dda4cfab99f4430cba3a PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-markdown/Config.in b/buildroot/package/python-markdown/Config.in index 670668414..454c2729b 100644 --- a/buildroot/package/python-markdown/Config.in +++ b/buildroot/package/python-markdown/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_MARKDOWN bool "python-markdown" + depends on BR2_PACKAGE_PYTHON3 # runtime dependency on Python's xml module - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT help This is a Python implementation of John Gruber's Markdown diff --git a/buildroot/package/python-markdown/python-markdown.hash b/buildroot/package/python-markdown/python-markdown.hash index 6eff2035b..4d54ce924 100644 --- a/buildroot/package/python-markdown/python-markdown.hash +++ b/buildroot/package/python-markdown/python-markdown.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown/json -md5 d84732ecc65b3a1bff693d9d4c24277f Markdown-3.1.1.tar.gz -sha256 2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a Markdown-3.1.1.tar.gz +md5 7a894dc55992b37cdbcba5c4049455fc Markdown-3.2.1.tar.gz +sha256 90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902 Markdown-3.2.1.tar.gz # Locally computed sha256 -sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md +sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md diff --git a/buildroot/package/python-markdown/python-markdown.mk b/buildroot/package/python-markdown/python-markdown.mk index a8311168f..1f352fd7f 100644 --- a/buildroot/package/python-markdown/python-markdown.mk +++ b/buildroot/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.1.1 +PYTHON_MARKDOWN_VERSION = 3.2.1 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/ac/df/0ae25a9fd5bb528fe3c65af7143708160aa3b47970d5272003a1ad5c03c6 +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/98/79/ce6984767cb9478e6818bd0994283db55c423d733cc62a88a3ffb8581e11 PYTHON_MARKDOWN_LICENSE = BSD-3-Clause PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md PYTHON_MARKDOWN_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch b/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch deleted file mode 100644 index ee980e22e..000000000 --- a/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 -From: Gareth Simpson -Date: Fri, 1 May 2020 19:31:21 +0100 -Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as - part of the tag name are a source of XSS - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] ---- - lib/markdown2.py | 2 +- - test/tm-cases/issue348_incomplete_tag.html | 1 + - test/tm-cases/issue348_incomplete_tag.opts | 1 + - test/tm-cases/issue348_incomplete_tag.text | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 test/tm-cases/issue348_incomplete_tag.html - create mode 100644 test/tm-cases/issue348_incomplete_tag.opts - create mode 100644 test/tm-cases/issue348_incomplete_tag.text - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 3a5d5d9..636bf07 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): -diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html -new file mode 100644 -index 0000000..46059cc ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.html -@@ -0,0 +1 @@ -+

      <lol@/ //id="pwn"//onclick="alert(1)"//abc

      -diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts -new file mode 100644 -index 0000000..ad487c0 ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.opts -@@ -0,0 +1 @@ -+{"safe_mode": "escape"} -diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text -new file mode 100644 -index 0000000..bb4a0de ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.text -@@ -0,0 +1 @@ -+ -Date: Sat, 2 May 2020 21:22:36 +0100 -Subject: [PATCH] Better fix for issue 348 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] ---- - lib/markdown2.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 636bf07..be86502 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): - return text -+ -+ if text.endswith(">"): -+ return text # this is not an incomplete tag, this is a link in the form - - return self._incomplete_tags_re.sub("<\\1", text) - diff --git a/buildroot/package/python-markdown2/python-markdown2.hash b/buildroot/package/python-markdown2/python-markdown2.hash index 2d72a7805..03315fd3e 100644 --- a/buildroot/package/python-markdown2/python-markdown2.hash +++ b/buildroot/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 a8dee88993d05a3e10765a57b1e1ea07 markdown2-2.3.8.tar.gz -sha256 7ff88e00b396c02c8e1ecd8d176cfa418fb01fe81234dcea77803e7ce4f05dbe markdown2-2.3.8.tar.gz +md5 5c1f9002060cf534bde0bdd584d6b70a markdown2-2.3.9.tar.gz +sha256 89526090907ae5ece66d783c434b35c29ee500c1986309e306ce2346273ada6a markdown2-2.3.9.tar.gz # Locally computed sha256 checksums -sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt +sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/buildroot/package/python-markdown2/python-markdown2.mk b/buildroot/package/python-markdown2/python-markdown2.mk index f508c17a2..c7858a396 100644 --- a/buildroot/package/python-markdown2/python-markdown2.mk +++ b/buildroot/package/python-markdown2/python-markdown2.mk @@ -4,15 +4,11 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.3.8 +PYTHON_MARKDOWN2_VERSION = 2.3.9 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/e3/93/d37055743009d1a492b2670cc215831a388b3d6e4a28b7672fdf0f7854f5 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/14/69/c542025f80916457ff4fe962404a27ab6417d43822fe54bf88ee2dd1b36f PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch -# 0002-Better-fix-for-issue-348.patch -PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 - $(eval $(python-package)) diff --git a/buildroot/package/python-matplotlib/Config.in b/buildroot/package/python-matplotlib/Config.in index e6ed8cda2..e7e2804b4 100644 --- a/buildroot/package/python-matplotlib/Config.in +++ b/buildroot/package/python-matplotlib/Config.in @@ -23,6 +23,17 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB https://matplotlib.org/ +if BR2_PACKAGE_PYTHON_MATPLOTLIB + +config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT + bool "qt display" + depends on BR2_PACKAGE_QT5 # python-pyqt5 + select BR2_PACKAGE_PYTHON_PYQT5 + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_WIDGETS + +endif + comment "python-matplotlib needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-matplotlib/python-matplotlib.mk b/buildroot/package/python-matplotlib/python-matplotlib.mk index 7082637d0..8d00ac8a0 100644 --- a/buildroot/package/python-matplotlib/python-matplotlib.mk +++ b/buildroot/package/python-matplotlib/python-matplotlib.mk @@ -13,4 +13,8 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ libpng python-cycler PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) +PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 +endif + $(eval $(python-package)) diff --git a/buildroot/package/python-mbstrdecoder/Config.in b/buildroot/package/python-mbstrdecoder/Config.in index 017002c97..8982814ce 100644 --- a/buildroot/package/python-mbstrdecoder/Config.in +++ b/buildroot/package/python-mbstrdecoder/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MBSTRDECODER bool "python-mbstrdecoder" + depends on BR2_PACKAGE_PYTHON3 help multi-byte character string decoder. diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash index b46f5d7cf..f8103b0ad 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json -md5 6dd814b20e7c68c2da2afe5bf72a5e9d mbstrdecoder-0.8.1.tar.gz -sha256 dabfae008a6b3b78f09847c2a73e9e866f97dcd9b52f7ccadf3b05a10a3656e6 mbstrdecoder-0.8.1.tar.gz +md5 3ab822b853bfd2f08e35ba85c1ac2e2e mbstrdecoder-1.0.0.tar.gz +sha256 9df7778c0c051c98f6b5a848909202e5cd423c9692665b20d1a9bd0f771b8235 mbstrdecoder-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE +sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk index 4400cd673..4a768ef69 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 0.8.1 +PYTHON_MBSTRDECODER_VERSION = 1.0.0 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/fd/0f/11982e1321f484b5ec85bb3e03878c9636ca5328fbcbed8b25ecbd76fd44 +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/5e/05/7dd1704e3e1522757708f59e727b540a6e5032ba6bb20e73851da7111b11 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-modbus-tk/Config.in b/buildroot/package/python-modbus-tk/Config.in new file mode 100644 index 000000000..16d87ffc9 --- /dev/null +++ b/buildroot/package/python-modbus-tk/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MODBUS_TK + bool "python-modbus-tk" + select BR2_PACKAGE_PYTHON_SERIAL # runtime + help + Implementation of modbus protocol in python. + + https://github.com/ljean/modbus-tk/ diff --git a/buildroot/package/python-modbus-tk/python-modbus-tk.hash b/buildroot/package/python-modbus-tk/python-modbus-tk.hash new file mode 100644 index 000000000..c4fde683c --- /dev/null +++ b/buildroot/package/python-modbus-tk/python-modbus-tk.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/modbus-tk/json +md5 e52d5de22cc9d97f2c1086d9b11f0f1e modbus_tk-1.1.1.tar.gz +sha256 c6dd004bc6bbff6d9fa93e61654c30a26c817c6632036c656383c9ecadca6639 modbus_tk-1.1.1.tar.gz +# Locally computed sha256 checksums +sha256 3b6a7f9c478ac1982e86cdadb45eb4788241b95839500eb26839d5053b74a24a license.txt +sha256 aa7ca42152a13db6a27b31944f99851efc3b9ee813912ff21d7d6ceadca62e6f copying.txt diff --git a/buildroot/package/python-modbus-tk/python-modbus-tk.mk b/buildroot/package/python-modbus-tk/python-modbus-tk.mk new file mode 100644 index 000000000..37927575a --- /dev/null +++ b/buildroot/package/python-modbus-tk/python-modbus-tk.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-modbus-tk +# +################################################################################ + +PYTHON_MODBUS_TK_VERSION = 1.1.1 +PYTHON_MODBUS_TK_SOURCE = modbus_tk-$(PYTHON_MODBUS_TK_VERSION).tar.gz +PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/63/2e/991c8965fd45db4c38fefe1fa70356825e847e1bbb1f14e127aa2b4d37aa +PYTHON_MODBUS_TK_SETUP_TYPE = setuptools +PYTHON_MODBUS_TK_LICENSE = LGPL-2.1+ +PYTHON_MODBUS_TK_LICENSE_FILES = license.txt copying.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-more-itertools/python-more-itertools.hash b/buildroot/package/python-more-itertools/python-more-itertools.hash index 3bb65897c..189498ec5 100644 --- a/buildroot/package/python-more-itertools/python-more-itertools.hash +++ b/buildroot/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 f647bfd27243a7bebe53b5ddb6a3b1c4 more-itertools-7.2.0.tar.gz -sha256 409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832 more-itertools-7.2.0.tar.gz +md5 0912041c05148ed079984cff69af2e99 more-itertools-8.4.0.tar.gz +sha256 68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5 more-itertools-8.4.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/buildroot/package/python-more-itertools/python-more-itertools.mk b/buildroot/package/python-more-itertools/python-more-itertools.mk index 4932fdc4a..ef21f4d27 100644 --- a/buildroot/package/python-more-itertools/python-more-itertools.mk +++ b/buildroot/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 7.2.0 +PYTHON_MORE_ITERTOOLS_VERSION = 8.4.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/c2/31/45f61c8927c9550109f1c4b99ba3ca66d328d889a9c9853a808bff1c9fa0 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/67/4a/16cb3acf64709eb0164e49ba463a42dc45366995848c4f0cf770f57b8120 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-msgfy/Config.in b/buildroot/package/python-msgfy/Config.in index 7875379e9..f5a471633 100644 --- a/buildroot/package/python-msgfy/Config.in +++ b/buildroot/package/python-msgfy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MSGFY bool "python-msgfy" + depends on BR2_PACKAGE_PYTHON3 help msgfy is a Python library for convert Exception instance to a human-readable error message. diff --git a/buildroot/package/python-msgfy/python-msgfy.hash b/buildroot/package/python-msgfy/python-msgfy.hash index 8f664ec2e..c795f7fa5 100644 --- a/buildroot/package/python-msgfy/python-msgfy.hash +++ b/buildroot/package/python-msgfy/python-msgfy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgfy/json -md5 3a94f49d7b31cc7bca21e0a9bfadf767 msgfy-0.0.7.tar.gz -sha256 370c54bb036d3728af8004e750b7cd7bc5a4ac25f9cdb8be13b7865cae3c73ee msgfy-0.0.7.tar.gz +md5 4a3d8ac9908acd5f661a58b12f9e0d17 msgfy-0.1.0.tar.gz +sha256 474c08302cd56ccee1300ac7976a01ebd1e42716fc9bcd947d39a311a15b7012 msgfy-0.1.0.tar.gz # Locally computed sha256 checksums -sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE +sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE diff --git a/buildroot/package/python-msgfy/python-msgfy.mk b/buildroot/package/python-msgfy/python-msgfy.mk index 0a642b434..c187061d4 100644 --- a/buildroot/package/python-msgfy/python-msgfy.mk +++ b/buildroot/package/python-msgfy/python-msgfy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGFY_VERSION = 0.0.7 +PYTHON_MSGFY_VERSION = 0.1.0 PYTHON_MSGFY_SOURCE = msgfy-$(PYTHON_MSGFY_VERSION).tar.gz -PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/23/82/b61a8353c36e60c2c8291c56ad7d00aa37918ef56811727510acada09f7f +PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/24/b5/7cc6ba75b6489245f9b75f11a85202b934fa92f6c99a4fa1c639f08d68e8 PYTHON_MSGFY_SETUP_TYPE = setuptools PYTHON_MSGFY_LICENSE = MIT PYTHON_MSGFY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-msgpack/python-msgpack.hash b/buildroot/package/python-msgpack/python-msgpack.hash index e58537d06..e34ea118e 100644 --- a/buildroot/package/python-msgpack/python-msgpack.hash +++ b/buildroot/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 ba46fdee995565f40e332bd7eea882f1 msgpack-0.6.2.tar.gz -sha256 ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830 msgpack-0.6.2.tar.gz -# Locally computed sha256 +md5 c35ee8f991dad3969884e9585e56ebba msgpack-1.0.0.tar.gz +sha256 9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0 msgpack-1.0.0.tar.gz +# Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/buildroot/package/python-msgpack/python-msgpack.mk b/buildroot/package/python-msgpack/python-msgpack.mk index f4e059f5e..18d5a998f 100644 --- a/buildroot/package/python-msgpack/python-msgpack.mk +++ b/buildroot/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 0.6.2 +PYTHON_MSGPACK_VERSION = 1.0.0 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/74/0a/de673c1c987f5779b65ef69052331ec0b0ebd22958bda77a8284be831964 +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/e4/4f/057549afbd12fdd5d9aae9df19a6773a3d91988afe7be45b277e8cee2f4d PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-multidict/python-multidict.hash b/buildroot/package/python-multidict/python-multidict.hash index 431a94247..a08a14a8a 100644 --- a/buildroot/package/python-multidict/python-multidict.hash +++ b/buildroot/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 9a1ed2cc0cd3e5dd2e71921104f2b760 multidict-4.7.5.tar.gz -sha256 aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e multidict-4.7.5.tar.gz +md5 c2c3311e25636a6f213e998cd1e80d72 multidict-5.0.0.tar.gz +sha256 1b324444299c3a49b601b1bf621fc21704e29066f6ac2b7d7e4034a4a18662a1 multidict-5.0.0.tar.gz # Locally computed sha256 checksums sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE diff --git a/buildroot/package/python-multidict/python-multidict.mk b/buildroot/package/python-multidict/python-multidict.mk index 2f80b1f85..1084fe0f6 100644 --- a/buildroot/package/python-multidict/python-multidict.mk +++ b/buildroot/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 4.7.5 +PYTHON_MULTIDICT_VERSION = 5.0.0 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/61/b4/475114b3f1671da634f89239e61038f8742d9ac13aa34b32a05bf8022d22 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/d2/5a/e95b0f9ebacd42e094e229a9a0a9e44d02876abf64969d0cb07dadcf3c4a PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-mwscrape2slob/Config.in b/buildroot/package/python-mwscrape2slob/Config.in index dc2b2ae3b..6d543bda2 100644 --- a/buildroot/package/python-mwscrape2slob/Config.in +++ b/buildroot/package/python-mwscrape2slob/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB bool "python-mwscrape2slob" depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-slob -> python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime select BR2_PACKAGE_PYTHON_CSSSELECT # runtime @@ -15,7 +16,8 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB https://github.com/itkach/mwscrape2slob -comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.8" +comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-netaddr/python-netaddr.hash b/buildroot/package/python-netaddr/python-netaddr.hash index c834721d2..91b200768 100644 --- a/buildroot/package/python-netaddr/python-netaddr.hash +++ b/buildroot/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/netaddr/json -md5 51019ef59c93f3979bcb37d3b8527e07 netaddr-0.7.19.tar.gz +md5 34cad578473b66ad77bc3b2a7613ed4a netaddr-0.8.0.tar.gz # Locally computed -sha256 38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd netaddr-0.7.19.tar.gz +sha256 d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243 netaddr-0.8.0.tar.gz sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/buildroot/package/python-netaddr/python-netaddr.mk b/buildroot/package/python-netaddr/python-netaddr.mk index a539845d5..e3ffe4e85 100644 --- a/buildroot/package/python-netaddr/python-netaddr.mk +++ b/buildroot/package/python-netaddr/python-netaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETADDR_VERSION = 0.7.19 +PYTHON_NETADDR_VERSION = 0.8.0 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = https://pypi.python.org/packages/0c/13/7cbb180b52201c07c796243eeff4c256b053656da5cfe3916c3f5b57b3a0 +PYTHON_NETADDR_SITE = https://pypi.python.org/packages/c3/3b/fe5bda7a3e927d9008c897cf1a0858a9ba9924a6b4750ec1824c9e617587 PYTHON_NETADDR_LICENSE = BSD-3-Clause PYTHON_NETADDR_LICENSE_FILES = LICENSE PYTHON_NETADDR_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-networkx/Config.in b/buildroot/package/python-networkx/Config.in index 0f3e86f49..2ae3841df 100644 --- a/buildroot/package/python-networkx/Config.in +++ b/buildroot/package/python-networkx/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, diff --git a/buildroot/package/python-networkx/python-networkx.hash b/buildroot/package/python-networkx/python-networkx.hash index 92383e75c..6c4b793e0 100644 --- a/buildroot/package/python-networkx/python-networkx.hash +++ b/buildroot/package/python-networkx/python-networkx.hash @@ -1,4 +1,4 @@ -# md5 from https://pypi.python.org/pypi/networks/json, sha256 locally computed -md5 6ef584a879e9163013e9a762e1cf7cd1 networkx-1.11.tar.gz -sha256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 networkx-1.11.tar.gz -sha256 f4c13bf0e83bef45116ebda6c360066df6fd99610efaea9790b998c5441b0c0d LICENSE.txt +# From: https://pypi.org/project/networkx/ +sha256 f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64 networkx-2.4.tar.gz +# Locally computed +sha256 f421f7c5d30022aa268174976e43e488b856ad953f32cdd13f0675630996d8c0 LICENSE.txt diff --git a/buildroot/package/python-networkx/python-networkx.mk b/buildroot/package/python-networkx/python-networkx.mk index 4dfdbd5a1..2efc53d62 100644 --- a/buildroot/package/python-networkx/python-networkx.mk +++ b/buildroot/package/python-networkx/python-networkx.mk @@ -4,14 +4,14 @@ # ################################################################################ -# The current version of setools (v4.1.1) does not work with python-networkx past v1.11 -PYTHON_NETWORKX_VERSION = 1.11 +PYTHON_NETWORKX_VERSION = 2.4 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/c2/93/dbb41b03cf7c878a7409c8e92226531f840a423c9309ea534873a83c9192 +PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/bf/63/7b579dd3b1c49ce6b7fd8f6f864038f255201410905dd183cf7f4a3845cf PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator +HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python3-decorator +HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-numpy/Config.in b/buildroot/package/python-numpy/Config.in index 5b9ee5803..23dcbc798 100644 --- a/buildroot/package/python-numpy/Config.in +++ b/buildroot/package/python-numpy/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL @@ -28,4 +29,6 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ comment "python-numpy needs glibc or musl" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/buildroot/package/python-numpy/python-numpy.hash b/buildroot/package/python-numpy/python-numpy.hash index eb4123e3f..ff9d02643 100644 --- a/buildroot/package/python-numpy/python-numpy.hash +++ b/buildroot/package/python-numpy/python-numpy.hash @@ -1,9 +1,9 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.4 -sha256 a3bccb70ad94091a5b9e2469fabd41ac877c140a6828c2022e35560a2ec0346c numpy-1.16.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.18.1 +sha256 da204ce460aa4247e595b7c7189d2fb2ed5f796bc03197055de01dac61d0125e numpy-1.18.2.tar.gz # License files, locally calculated -sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt -sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt +sha256 ad81d0c21843ba6ce6fe5fa3eaacb61120be70cd798c52f63df3f4c12a843f0c LICENSE.txt +sha256 d3045980e80a6b39f98586c24bc7f39a7625b4b9f08ce72e367d12814743d047 numpy/core/src/multiarray/dragon4.c +sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt -sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt -sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt -sha256 d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4 numpy/core/src/multiarray/dragon4.c +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/buildroot/package/python-numpy/python-numpy.mk b/buildroot/package/python-numpy/python-numpy.mk index 3b474efa6..8260de7e5 100644 --- a/buildroot/package/python-numpy/python-numpy.mk +++ b/buildroot/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.16.4 +PYTHON_NUMPY_VERSION = 1.18.2 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ tools/npy_tempita/license.txt \ numpy/core/src/multiarray/dragon4.c PYTHON_NUMPY_SETUP_TYPE = setuptools +PYTHON_NUMPY_DEPENDENCIES = host-python-cython +HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython ifeq ($(BR2_PACKAGE_CLAPACK),y) PYTHON_NUMPY_DEPENDENCIES += clapack diff --git a/buildroot/package/python-opcua-asyncio/Config.in b/buildroot/package/python-opcua-asyncio/Config.in new file mode 100644 index 000000000..3700e00e1 --- /dev/null +++ b/buildroot/package/python-opcua-asyncio/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO + bool "python-opcua-asyncio" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOFILES # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_LXML # runtime + select BR2_PACKAGE_PYTHON_PYTZ # runtime + help + opcua-asyncio is an asyncio-based asynchronous + OPC UA client based on python-opcua, removing + hacks for support of python < 3.6. + + https://github.com/FreeOpcUa/opcua-asyncio diff --git a/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.hash b/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.hash new file mode 100644 index 000000000..d8aee272d --- /dev/null +++ b/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e5fab37a92162351fe40cab43df09db8a2e9f8b8a2a8f13ed680aa6f6d687ec3 opcua-asyncio-0.8.4.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.mk b/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.mk new file mode 100644 index 000000000..50b581037 --- /dev/null +++ b/buildroot/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-opcua-asyncio +# +################################################################################ + +PYTHON_OPCUA_ASYNCIO_VERSION = 0.8.4 +PYTHON_OPCUA_ASYNCIO_SOURCE = opcua-asyncio-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz +PYTHON_OPCUA_ASYNCIO_SITE = $(call github,FreeOpcUa,opcua-asyncio,$(PYTHON_OPCUA_ASYNCIO_VERSION)) +PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools +PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ +PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING + +$(eval $(python-package)) diff --git a/buildroot/package/python-packaging/Config.in b/buildroot/package/python-packaging/Config.in new file mode 100644 index 000000000..5a8135cd5 --- /dev/null +++ b/buildroot/package/python-packaging/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PACKAGING + bool "python-packaging" + select BR2_PACKAGE_PYTHON_PYPARSING # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Core utilities for Python packages. + + https://github.com/pypa/packaging diff --git a/buildroot/package/python-packaging/python-packaging.hash b/buildroot/package/python-packaging/python-packaging.hash new file mode 100644 index 000000000..aafb16c1b --- /dev/null +++ b/buildroot/package/python-packaging/python-packaging.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/packaging/json +md5 3208229da731c5d8e29d4d8941e75005 packaging-20.4.tar.gz +sha256 4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 packaging-20.4.tar.gz +# Locally computed sha256 checksums +sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE +sha256 b70e7e9b742f1cc6f948b34c16aa39ffece94196364bc88ff0d2180f0028fac5 LICENSE.BSD diff --git a/buildroot/package/python-packaging/python-packaging.mk b/buildroot/package/python-packaging/python-packaging.mk new file mode 100644 index 000000000..62a9d68cb --- /dev/null +++ b/buildroot/package/python-packaging/python-packaging.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-packaging +# +################################################################################ + +PYTHON_PACKAGING_VERSION = 20.4 +PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/55/fd/fc1aca9cf51ed2f2c11748fa797370027babd82f87829c7a8e6dbe720145 +PYTHON_PACKAGING_SETUP_TYPE = setuptools +PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause +PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD + +$(eval $(python-package)) diff --git a/buildroot/package/python-pam/Config.in b/buildroot/package/python-pam/Config.in index 02865d00d..92ba105eb 100644 --- a/buildroot/package/python-pam/Config.in +++ b/buildroot/package/python-pam/Config.in @@ -1,7 +1,6 @@ -comment "python-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "python-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS config BR2_PACKAGE_PYTHON_PAM bool "python-pam" @@ -10,7 +9,6 @@ config BR2_PACKAGE_PYTHON_PAM depends on BR2_USE_WCHAR # linux-pam depends on BR2_USE_MMU # linux-pam depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam select BR2_PACKAGE_LINUX_PAM help PAM (Pluggable Authentication Module) bindings for Python. diff --git a/buildroot/package/python-paramiko/python-paramiko.hash b/buildroot/package/python-paramiko/python-paramiko.hash index 48cc79e7e..6054e8d49 100644 --- a/buildroot/package/python-paramiko/python-paramiko.hash +++ b/buildroot/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 f729a45c9122bf975b9177ec5aaa3791 paramiko-2.6.0.tar.gz -sha256 f4b2edfa0d226b70bd4ca31ea7e389325990283da23465d572ed1f70a7583041 paramiko-2.6.0.tar.gz +md5 bf8239dc820ca86dd3c3226f4281c35f paramiko-2.7.1.tar.gz +sha256 920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f paramiko-2.7.1.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/buildroot/package/python-paramiko/python-paramiko.mk b/buildroot/package/python-paramiko/python-paramiko.mk index 381cd2df2..c9e144c96 100644 --- a/buildroot/package/python-paramiko/python-paramiko.mk +++ b/buildroot/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.6.0 +PYTHON_PARAMIKO_VERSION = 2.7.1 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/54/68/dde7919279d4ecdd1607a7eb425a2874ccd49a73a5a71f8aa4f0102d3eb8 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/ac/15/4351003352e11300b9f44a13576bff52dcdc6e4a911129c07447bda0a358 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-parso/python-parso.hash b/buildroot/package/python-parso/python-parso.hash index e687c437c..ab2e20943 100644 --- a/buildroot/package/python-parso/python-parso.hash +++ b/buildroot/package/python-parso/python-parso.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/parso/json -md5 cfdc0d7ce446ac3984cd7ef3e5850354 parso-0.5.1.tar.gz -sha256 666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c parso-0.5.1.tar.gz +md5 d3a892fb4d9a0ffed838b0a3416145bf parso-0.7.0.tar.gz +sha256 908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c parso-0.7.0.tar.gz # Locally computed sha256 checksums -sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt -sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE -sha256 368780dd953e09148834e8d8c6cc1b09b3d621e77dbd1c4f5e8873561acda873 test/normalizer_issue_files/LICENSE +sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt +sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 368780dd953e09148834e8d8c6cc1b09b3d621e77dbd1c4f5e8873561acda873 test/normalizer_issue_files/LICENSE diff --git a/buildroot/package/python-parso/python-parso.mk b/buildroot/package/python-parso/python-parso.mk index 28f699d64..a0b6af873 100644 --- a/buildroot/package/python-parso/python-parso.mk +++ b/buildroot/package/python-parso/python-parso.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARSO_VERSION = 0.5.1 +PYTHON_PARSO_VERSION = 0.7.0 PYTHON_PARSO_SOURCE = parso-$(PYTHON_PARSO_VERSION).tar.gz -PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/21/40/615957db4d178b7504c87b1a5b85fa5945b0b4fa5f5a845e31fc7aad6018 +PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/fe/24/c30eb4be8a24b965cfd6e2e6b41180131789b44042112a16f9eb10c80f6e PYTHON_PARSO_SETUP_TYPE = setuptools PYTHON_PARSO_LICENSE = MIT, Python-2.0, BSD-3-Clause (flask theme) PYTHON_PARSO_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE test/normalizer_issue_files/LICENSE diff --git a/buildroot/package/python-passlib/python-passlib.hash b/buildroot/package/python-passlib/python-passlib.hash index 8e7f790af..867223e19 100644 --- a/buildroot/package/python-passlib/python-passlib.hash +++ b/buildroot/package/python-passlib/python-passlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/passlib/json -md5 254869dae3fd9f09f0746a3cb29a0b15 passlib-1.7.1.tar.gz -sha256 3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0 passlib-1.7.1.tar.gz +md5 b908529cfd4c33057c244324c692eae7 passlib-1.7.2.tar.gz +sha256 8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8 passlib-1.7.2.tar.gz # Locally computed sha256 checksums -sha256 ae8cd74bd5be7be586c52def8bcddfe817872cf2e0782b159d37f88bf0ff11fc LICENSE +sha256 49a74ad666f456493d6b9e2cda7c55e46ad512ce2c67db4accaddb27bb240bb9 LICENSE diff --git a/buildroot/package/python-passlib/python-passlib.mk b/buildroot/package/python-passlib/python-passlib.mk index 1a3726b60..6ab94fd66 100644 --- a/buildroot/package/python-passlib/python-passlib.mk +++ b/buildroot/package/python-passlib/python-passlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PASSLIB_VERSION = 1.7.1 +PYTHON_PASSLIB_VERSION = 1.7.2 PYTHON_PASSLIB_SOURCE = passlib-$(PYTHON_PASSLIB_VERSION).tar.gz -PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/25/4b/6fbfc66aabb3017cd8c3bd97b37f769d7503ead2899bf76e570eb91270de +PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/6d/6b/4bfca0c13506535289b58f9c9761d20f56ed89439bfe6b8e07416ce58ee1 PYTHON_PASSLIB_SETUP_TYPE = setuptools PYTHON_PASSLIB_LICENSE = BSD-3-Clause PYTHON_PASSLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-periphery/python-periphery.hash b/buildroot/package/python-periphery/python-periphery.hash index e9c3869eb..13636d17a 100644 --- a/buildroot/package/python-periphery/python-periphery.hash +++ b/buildroot/package/python-periphery/python-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e6da8dcf8f639d1c3be3f19d27cbd472ef904db204c5453b250f87ab9bca2025 python-periphery-2.0.1.tar.gz -sha256 bf032b9319cfd918368219450a9917529f131925e698cbab1b63f42b629ff505 LICENSE +sha256 2c2482d026afc974ba5a966cd2c3a724ecf55e253223a9ea80fc98f77a3ca414 python-periphery-2.1.0.tar.gz +sha256 4a2ed465d05c7ec58bb5a8cd7d2475a2d423bb73cb9bc3e3565500c222d03dc8 LICENSE diff --git a/buildroot/package/python-periphery/python-periphery.mk b/buildroot/package/python-periphery/python-periphery.mk index 97cb52e58..c322ded3b 100644 --- a/buildroot/package/python-periphery/python-periphery.mk +++ b/buildroot/package/python-periphery/python-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PERIPHERY_VERSION = 2.0.1 +PYTHON_PERIPHERY_VERSION = 2.1.0 PYTHON_PERIPHERY_SITE = $(call github,vsergeev,python-periphery,v$(PYTHON_PERIPHERY_VERSION)) PYTHON_PERIPHERY_LICENSE = MIT PYTHON_PERIPHERY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pexpect/python-pexpect.hash b/buildroot/package/python-pexpect/python-pexpect.hash index 6972cdb80..87df05d88 100644 --- a/buildroot/package/python-pexpect/python-pexpect.hash +++ b/buildroot/package/python-pexpect/python-pexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pexpect/json -md5 ed003242cbf308aee1b1eaecdef59e43 pexpect-4.7.0.tar.gz -sha256 9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb pexpect-4.7.0.tar.gz +md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz +sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz # Locally computed sha256 checksums sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE diff --git a/buildroot/package/python-pexpect/python-pexpect.mk b/buildroot/package/python-pexpect/python-pexpect.mk index 45e331f64..a9609cbe7 100644 --- a/buildroot/package/python-pexpect/python-pexpect.mk +++ b/buildroot/package/python-pexpect/python-pexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEXPECT_VERSION = 4.7.0 +PYTHON_PEXPECT_VERSION = 4.8.0 PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz -PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3 +PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10 PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils diff --git a/buildroot/package/python-piexif/Config.in b/buildroot/package/python-piexif/Config.in new file mode 100644 index 000000000..2f7eff80b --- /dev/null +++ b/buildroot/package/python-piexif/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_PIEXIF + bool "python-piexif" + depends on BR2_PACKAGE_PYTHON3 + help + Piexif simplifies interacting with EXIF data in Python. It + includes the tools necessary for extracting, creating, + manipulating, converting and writing EXIF data to JPEG, WebP + and TIFF files. + + https://github.com/hMatoba/Piexif diff --git a/buildroot/package/python-piexif/python-piexif.hash b/buildroot/package/python-piexif/python-piexif.hash new file mode 100644 index 000000000..9663ed722 --- /dev/null +++ b/buildroot/package/python-piexif/python-piexif.hash @@ -0,0 +1,3 @@ +# Locally computed sha256 checksums +sha256 abfd9a67795e23d7a76f9407d60841efa68c5d6e43376b295bb821a30602c569 python-piexif-1.1.3.tar.gz +sha256 d517a0940b8eb92ace7fc88f75892d84d260d85b3062d36d9e6445bc5091f697 LICENSE.txt diff --git a/buildroot/package/python-piexif/python-piexif.mk b/buildroot/package/python-piexif/python-piexif.mk new file mode 100644 index 000000000..2ab15cd30 --- /dev/null +++ b/buildroot/package/python-piexif/python-piexif.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-piexif +# +################################################################################ + +PYTHON_PIEXIF_VERSION = 1.1.3 +PYTHON_PIEXIF_SITE = $(call github,hMatoba,Piexif,$(PYTHON_PIEXIF_VERSION)) +PYTHON_PIEXIF_LICENSE = MIT +PYTHON_PIEXIF_LICENSE_FILES = LICENSE.txt +PYTHON_PIEXIF_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-pigpio/python-pigpio.hash b/buildroot/package/python-pigpio/python-pigpio.hash index 3498b762e..7e02054b2 100644 --- a/buildroot/package/python-pigpio/python-pigpio.hash +++ b/buildroot/package/python-pigpio/python-pigpio.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/pigpio/json -md5 a6817d953549c19522bae2d4f36251f4 pigpio-1.45.tar.gz -sha256 a6a8dbc19e827046bde02b4c34ab725d55093490ed7bc1e7c80277adfadc16ac pigpio-1.45.tar.gz +md5 e05e3f5cb6c50f4b3eeb4ac50627507e pigpio-1.78.tar.gz +sha256 91efa50e4990649da97408a384782d6ccf58342fc59cdfe21ed7a42911569975 pigpio-1.78.tar.gz diff --git a/buildroot/package/python-pigpio/python-pigpio.mk b/buildroot/package/python-pigpio/python-pigpio.mk index 1e18d9784..73e326cba 100644 --- a/buildroot/package/python-pigpio/python-pigpio.mk +++ b/buildroot/package/python-pigpio/python-pigpio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIGPIO_VERSION = 1.45 +PYTHON_PIGPIO_VERSION = 1.78 PYTHON_PIGPIO_SOURCE = pigpio-$(PYTHON_PIGPIO_VERSION).tar.gz -PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/33/48/db99b4ccc9f895827aa96d35404bae803b31555cdef0c1356ad3b6fca2d5 +PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/a9/4a/3ebdfd90906553fb5420e80a475eb52f0809f2a29b547ba3b260db0cbc8f PYTHON_PIGPIO_SETUP_TYPE = setuptools PYTHON_PIGPIO_LICENSE = Unlicense diff --git a/buildroot/package/python-pillow/Config.in b/buildroot/package/python-pillow/Config.in index f824d1371..f98a4a9e5 100644 --- a/buildroot/package/python-pillow/Config.in +++ b/buildroot/package/python-pillow/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/buildroot/package/python-pillow/python-pillow.hash b/buildroot/package/python-pillow/python-pillow.hash index 0d66c4bb3..f80b79fe5 100644 --- a/buildroot/package/python-pillow/python-pillow.hash +++ b/buildroot/package/python-pillow/python-pillow.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/project/Pillow/ -md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz -sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz +md5 f1f7592c51260e5080d3cd71781ea675 Pillow-7.1.2.tar.gz +sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 Pillow-7.2.0.tar.gz # Locally computed sha256 checksums -sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE +sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE diff --git a/buildroot/package/python-pillow/python-pillow.mk b/buildroot/package/python-pillow/python-pillow.mk index 5ff2dcfdb..931dce53d 100644 --- a/buildroot/package/python-pillow/python-pillow.mk +++ b/buildroot/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 7.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab +PYTHON_PILLOW_VERSION = 7.2.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pip/python-pip.hash b/buildroot/package/python-pip/python-pip.hash index 7d02a5102..58bc23915 100644 --- a/buildroot/package/python-pip/python-pip.hash +++ b/buildroot/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 1aaaf90fbafc50e7ba1e66ffceb00960 pip-19.3.1.tar.gz -sha256 21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 pip-19.3.1.tar.gz +md5 7d42ba49b809604f0df3d55df1c3fd86 pip-20.0.2.tar.gz +sha256 7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f pip-20.0.2.tar.gz # Locally computed sha256 checksums sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt diff --git a/buildroot/package/python-pip/python-pip.mk b/buildroot/package/python-pip/python-pip.mk index b8be234d2..cc40eecdf 100644 --- a/buildroot/package/python-pip/python-pip.mk +++ b/buildroot/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 19.3.1 +PYTHON_PIP_VERSION = 20.0.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/ce/ea/9b445176a65ae4ba22dce1d93e4b5fe182f953df71a145f557cffaffc1bf +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pluggy/Config.in b/buildroot/package/python-pluggy/Config.in new file mode 100644 index 000000000..7179bc427 --- /dev/null +++ b/buildroot/package/python-pluggy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PLUGGY + bool "python-pluggy" + depends on BR2_PACKAGE_PYTHON3 + help + plugin and hook calling mechanisms for python. + + https://github.com/pytest-dev/pluggy diff --git a/buildroot/package/python-pluggy/python-pluggy.hash b/buildroot/package/python-pluggy/python-pluggy.hash new file mode 100644 index 000000000..24e207bfa --- /dev/null +++ b/buildroot/package/python-pluggy/python-pluggy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pluggy/json +md5 7f610e28b8b34487336b585a3dfb803d pluggy-0.13.1.tar.gz +sha256 15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0 pluggy-0.13.1.tar.gz +# Locally computed sha256 checksums +sha256 d6b65e6c213a5d0b577911d34d6e5949b9f59d76c238c5071a2f3fc16cfb2606 LICENSE diff --git a/buildroot/package/python-pluggy/python-pluggy.mk b/buildroot/package/python-pluggy/python-pluggy.mk new file mode 100644 index 000000000..03cdecf4b --- /dev/null +++ b/buildroot/package/python-pluggy/python-pluggy.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pluggy +# +################################################################################ + +PYTHON_PLUGGY_VERSION = 0.13.1 +PYTHON_PLUGGY_SOURCE = pluggy-$(PYTHON_PLUGGY_VERSION).tar.gz +PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/f8/04/7a8542bed4b16a65c2714bf76cf5a0b026157da7f75e87cc88774aa10b14 +PYTHON_PLUGGY_SETUP_TYPE = setuptools +PYTHON_PLUGGY_LICENSE = MIT +PYTHON_PLUGGY_LICENSE_FILES = LICENSE +PYTHON_PLUGGY_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch b/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch new file mode 100644 index 000000000..1646f0808 --- /dev/null +++ b/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch @@ -0,0 +1,41 @@ +From 9f8a6ed7fda9abf474ce886dddf3ab5abc0ead0b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Sep 2020 10:52:32 +0200 +Subject: [PATCH] python/setup.py: remove unneeded wheel dependency + +wheel is required since version 3.13.0 and +https://github.com/protocolbuffers/protobuf/commit/ff92cee10bcae7533b573368f448e782fbd43f39 + +This will result in the following build failure when cross-compiling: + +Download error on https://pypi.org/simple/wheel/: unknown url type: https -- Some packages may not be found! +Couldn't find index page for 'wheel' (maybe misspelled?) +Download error on https://pypi.org/simple/: unknown url type: https -- Some packages may not be found! +No local packages or working download links found for wheel + +Remove wheel requirement from setup.py as it is only needed by +release.sh, not by setup.py + +Fixes: + - http://autobuild.buildroot.org/results/371c686a10d6870933011b46d36b1879d29046b9 + +Signed-off-by: Fabrice Fontaine +--- + python/setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/python/setup.py b/python/setup.py +index b44e88b2f..39eb18d4b 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -293,7 +293,6 @@ if __name__ == '__main__': + 'build_py': build_py, + 'test_conformance': test_conformance, + }, +- setup_requires = ['wheel'], + install_requires=install_requires, + ext_modules=ext_module_list, + ) +-- +2.28.0 + diff --git a/buildroot/package/python-protobuf/Config.in b/buildroot/package/python-protobuf/Config.in index c53ef7f82..1af82112b 100644 --- a/buildroot/package/python-protobuf/Config.in +++ b/buildroot/package/python-protobuf/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_PYTHON_PROTOBUF platform-neutral, extensible mechanism for serializing structured data. - https://github.com/protobuf-c/protobuf-c + https://developers.google.com/protocol-buffers diff --git a/buildroot/package/python-protobuf/python-protobuf.hash b/buildroot/package/python-protobuf/python-protobuf.hash index e299b8c76..4098d087a 100644 --- a/buildroot/package/python-protobuf/python-protobuf.hash +++ b/buildroot/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a5ef6dccfe29f46168af8ab5194147f24701727a84661611fe80532ba83d3edd protobuf-python-3.11.0.tar.gz -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 9c4d2ad449d27da5ac1db1ad5ecc4a642dedd6bbe59219d61d7b655b6b12be89 protobuf-python-3.13.0.tar.gz +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/buildroot/package/python-psutil/python-psutil.hash b/buildroot/package/python-psutil/python-psutil.hash index 7f3d629d6..1a053cc36 100644 --- a/buildroot/package/python-psutil/python-psutil.hash +++ b/buildroot/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz -sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz +md5 50bf39b4faa268ba1da8a9730bb38bb6 psutil-5.7.2.tar.gz +sha256 90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb psutil-5.7.2.tar.gz # Locally computed sha256 checksums -sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE +sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/buildroot/package/python-psutil/python-psutil.mk b/buildroot/package/python-psutil/python-psutil.mk index 62a94f3c4..19d97a6f9 100644 --- a/buildroot/package/python-psutil/python-psutil.mk +++ b/buildroot/package/python-psutil/python-psutil.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.6.7 +# Please keep in sync with package/python3-psutil/python3-psutil.mk +PYTHON_PSUTIL_VERSION = 5.7.2 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-psycopg2/python-psycopg2.hash b/buildroot/package/python-psycopg2/python-psycopg2.hash index 5f98e359b..bf73f8ad2 100644 --- a/buildroot/package/python-psycopg2/python-psycopg2.hash +++ b/buildroot/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 dbb5a67dd57cfa905de37ab9678a92f6 psycopg2-2.8.4.tar.gz -sha256 f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6 psycopg2-2.8.4.tar.gz +md5 c232ff3e3bfee35e1a0e15bc089cb294 psycopg2-2.8.5.tar.gz +sha256 f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818 psycopg2-2.8.5.tar.gz # Locally computed sha256 checksums -sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE +sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/buildroot/package/python-psycopg2/python-psycopg2.mk b/buildroot/package/python-psycopg2/python-psycopg2.mk index a32099e3b..b6f1f6ab7 100644 --- a/buildroot/package/python-psycopg2/python-psycopg2.mk +++ b/buildroot/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.8.4 +PYTHON_PSYCOPG2_VERSION = 2.8.5 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/84/d7/6a93c99b5ba4d4d22daa3928b983cec66df4536ca50b22ce5dcac65e4e71 +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/a8/8f/1c5690eebf148d1d1554fc00ccf9101e134636553dbb75bdfef4f85d7647 PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-py/python-py.hash b/buildroot/package/python-py/python-py.hash index f8e644633..98e16fd97 100644 --- a/buildroot/package/python-py/python-py.hash +++ b/buildroot/package/python-py/python-py.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 d9e30436ce7e79f30847f9b30b62e149 py-1.8.0.tar.gz -sha256 dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53 py-1.8.0.tar.gz +md5 b80db4e61eef724f49feb4d20b649e62 py-1.9.0.tar.gz +sha256 9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342 py-1.9.0.tar.gz # Locally computed sha256 checksums -sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE +sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/buildroot/package/python-py/python-py.mk b/buildroot/package/python-py/python-py.mk index 1592b5c6b..c75318393 100644 --- a/buildroot/package/python-py/python-py.mk +++ b/buildroot/package/python-py/python-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.8.0 +PYTHON_PY_VERSION = 1.9.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/f1/5a/87ca5909f400a2de1561f1648883af74345fe96349f34f737cdfc94eba8c +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/97/a6/ab9183fe08f69a53d06ac0ee8432bc0ffbb3989c575cc69b73a0229a9a99 PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT diff --git a/buildroot/package/python-pyalsa/Config.in b/buildroot/package/python-pyalsa/Config.in new file mode 100644 index 000000000..e91c99b40 --- /dev/null +++ b/buildroot/package/python-pyalsa/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_PYTHON_PYALSA + bool "python-pyalsa" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_HWDEP + select BR2_PACKAGE_ALSA_LIB_MIXER + select BR2_PACKAGE_ALSA_LIB_RAWMIDI + select BR2_PACKAGE_ALSA_LIB_SEQ + help + Official ALSA Python binding, including hardware + management, mixer and sequencer control. + + http://www.alsa-project.org/ + +comment "python-pyalsa needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/python-pyalsa/python-pyalsa.hash b/buildroot/package/python-pyalsa/python-pyalsa.hash new file mode 100644 index 000000000..c484313b9 --- /dev/null +++ b/buildroot/package/python-pyalsa/python-pyalsa.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 2771291a5d2cf700f0abbe6629ea37468d1463a01b2330d84ef976e1e918676c pyalsa-1.1.6.tar.bz2 diff --git a/buildroot/package/python-pyalsa/python-pyalsa.mk b/buildroot/package/python-pyalsa/python-pyalsa.mk new file mode 100644 index 000000000..74f0347d8 --- /dev/null +++ b/buildroot/package/python-pyalsa/python-pyalsa.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyalsa +# +################################################################################ + +PYTHON_PYALSA_VERSION = 1.1.6 +PYTHON_PYALSA_SOURCE = pyalsa-$(PYTHON_PYALSA_VERSION).tar.bz2 +PYTHON_PYALSA_SITE = ftp://ftp.alsa-project.org/pub/pyalsa +PYTHON_PYALSA_SETUP_TYPE = distutils +PYTHON_PYALSA_LICENSE = LGPL-2.1+ +PYTHON_PYALSA_DEPENDENCIES = alsa-lib + +$(eval $(python-package)) diff --git a/buildroot/package/python-pyasn-modules/Config.in b/buildroot/package/python-pyasn-modules/Config.in deleted file mode 100644 index cedd68b34..000000000 --- a/buildroot/package/python-pyasn-modules/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN_MODULES - bool "python-pyasn-modules" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON_PYASN # runtime - help - A collection of ASN.1-based protocols modules. - - https://pypi.python.org/pypi/pyasn1-modules - -comment "python-pyasn-modules needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash b/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash deleted file mode 100644 index e5880d24e..000000000 --- a/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81 -md5 178129bc7fbf07215c25230c5f053f81 pyasn1-modules-0.0.8.tar.gz -# Locally computed -sha256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 pyasn1-modules-0.0.8.tar.gz -sha256 8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6 LICENSE.txt diff --git a/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk b/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk deleted file mode 100644 index b5e853aa2..000000000 --- a/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn-modules -# -################################################################################ - -PYTHON_PYASN_MODULES_VERSION = 0.0.8 -PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz -PYTHON_PYASN_MODULES_SITE = https://pypi.python.org/packages/source/p/pyasn1-modules -PYTHON_PYASN_MODULES_LICENSE = BSD-2-Clause -PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt -PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/buildroot/package/python-pyasn/Config.in b/buildroot/package/python-pyasn/Config.in deleted file mode 100644 index 2396194df..000000000 --- a/buildroot/package/python-pyasn/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN - bool "python-pyasn" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - help - PyASN is a Python extension module that enables you to - perform very fast IP address to Autonomous System Number - lookups. - - https://github.com/hadiasghari/pyasn - -comment "python-pyasn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-pyasn/python-pyasn.hash b/buildroot/package/python-pyasn/python-pyasn.hash deleted file mode 100644 index c08b64dd2..000000000 --- a/buildroot/package/python-pyasn/python-pyasn.hash +++ /dev/null @@ -1,6 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f00a02a631d4016818659d1cc38d229a, sha256 locally computed -md5 f00a02a631d4016818659d1cc38d229a pyasn1-0.1.9.tar.gz -sha256 853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f pyasn1-0.1.9.tar.gz - -# Locally calculated -sha256 8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6 LICENSE.txt diff --git a/buildroot/package/python-pyasn/python-pyasn.mk b/buildroot/package/python-pyasn/python-pyasn.mk deleted file mode 100644 index f34520f83..000000000 --- a/buildroot/package/python-pyasn/python-pyasn.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn -# -################################################################################ - -PYTHON_PYASN_VERSION = 0.1.9 -PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz -PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1 -PYTHON_PYASN_LICENSE = BSD-2-Clause -PYTHON_PYASN_LICENSE_FILES = LICENSE.txt -PYTHON_PYASN_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash index 96831dc5d..230559658 100644 --- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 18c77d56abeef631d94f95ff2d652859 pyasn1-modules-0.2.7.tar.gz -sha256 0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b pyasn1-modules-0.2.7.tar.gz +md5 107e1ece7d0a41d782f69f8a95a4d9bc pyasn1-modules-0.2.8.tar.gz +sha256 905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e pyasn1-modules-0.2.8.tar.gz # Locally computed sha256 checksums -sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.txt +sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.txt diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk index afc3c363f..9933a63aa 100644 --- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.2.7 +PYTHON_PYASN1_MODULES_VERSION = 0.2.8 PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/75/93/c51104ea6a74252957c341ccd110b65efecc18edfd386b666637d67d4d10 +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/88/87/72eb9ccf8a58021c542de2588a867dbefc7556e14b2866d1e40e9e2b587e PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pyasn1/python-pyasn1.hash b/buildroot/package/python-pyasn1/python-pyasn1.hash index c6109345d..4347a43c4 100644 --- a/buildroot/package/python-pyasn1/python-pyasn1.hash +++ b/buildroot/package/python-pyasn1/python-pyasn1.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1/json -md5 50290e833395016c49903f4f9c7e47e5 pyasn1-0.4.7.tar.gz -sha256 a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604 pyasn1-0.4.7.tar.gz +md5 dffae4ff9f997a83324b3f33fe62be54 pyasn1-0.4.8.tar.gz +sha256 aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba pyasn1-0.4.8.tar.gz # Locally computed sha256 checksums -sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.rst +sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.rst diff --git a/buildroot/package/python-pyasn1/python-pyasn1.mk b/buildroot/package/python-pyasn1/python-pyasn1.mk index 50a500c74..60050bef1 100644 --- a/buildroot/package/python-pyasn1/python-pyasn1.mk +++ b/buildroot/package/python-pyasn1/python-pyasn1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_VERSION = 0.4.7 +PYTHON_PYASN1_VERSION = 0.4.8 PYTHON_PYASN1_SOURCE = pyasn1-$(PYTHON_PYASN1_VERSION).tar.gz -PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/ca/f8/2a60a2c88a97558bdd289b6dc9eb75b00bd90ff34155d681ba6dbbcb46b2 +PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/a4/db/fffec68299e6d7bad3d504147f9094830b704527a7fc098b721d38cc7fa7 PYTHON_PYASN1_SETUP_TYPE = setuptools PYTHON_PYASN1_LICENSE = BSD-2-Clause PYTHON_PYASN1_LICENSE_FILES = LICENSE.rst diff --git a/buildroot/package/python-pybind/Config.in b/buildroot/package/python-pybind/Config.in new file mode 100644 index 000000000..604cb9ee6 --- /dev/null +++ b/buildroot/package/python-pybind/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYBIND + bool "python-pybind" + help + PyBind is a lightweight header-only library that exposes C++ + types in Python and vice versa, mainly to create Python + bindings of existing C++ code. + + http://pybind11.readthedocs.org/en/master diff --git a/buildroot/package/python-pybind/python-pybind.hash b/buildroot/package/python-pybind/python-pybind.hash new file mode 100644 index 000000000..751b0bdf6 --- /dev/null +++ b/buildroot/package/python-pybind/python-pybind.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 97504db65640570f32d3fdf701c25a340c8643037c3b69aec469c10c93dc8504 python-pybind-2.5.0.tar.gz +# License files, locally calculated +sha256 9a37ea54aa3cf12c7f3292799f20822ffd4b9b7142b36a7a9997b28c39264dc9 LICENSE diff --git a/buildroot/package/python-pybind/python-pybind.mk b/buildroot/package/python-pybind/python-pybind.mk new file mode 100644 index 000000000..634e869e4 --- /dev/null +++ b/buildroot/package/python-pybind/python-pybind.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-pybind +# +################################################################################ + +PYTHON_PYBIND_VERSION = 2.5.0 +PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) +PYTHON_PYBIND_LICENSE = BSD-3-Clause +PYTHON_PYBIND_LICENSE_FILES = LICENSE +PYTHON_PYBIND_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-pycairo/Config.in b/buildroot/package/python-pycairo/Config.in index 0d8de977e..a44a0421e 100644 --- a/buildroot/package/python-pycairo/Config.in +++ b/buildroot/package/python-pycairo/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYCAIRO bool "python-pycairo" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_CAIRO help Python interface for cairo. diff --git a/buildroot/package/python-pycairo/python-pycairo.hash b/buildroot/package/python-pycairo/python-pycairo.hash index f0b76b1e3..c617d8b60 100644 --- a/buildroot/package/python-pycairo/python-pycairo.hash +++ b/buildroot/package/python-pycairo/python-pycairo.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 be2ba51f234270dec340f28f1695a95e pycairo-1.18.2.tar.gz -sha256 dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531 pycairo-1.18.2.tar.gz +md5 59bc5c5d1debc3af0f6791af9d612551 pycairo-1.19.1.tar.gz +sha256 2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84 pycairo-1.19.1.tar.gz # Locally computed sha256 checksums -sha256 22c7747e2decb1b26e395b45dbaeb627784ef7fdbf2b80ac09a26a560277e58a COPYING -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 +sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 diff --git a/buildroot/package/python-pycairo/python-pycairo.mk b/buildroot/package/python-pycairo/python-pycairo.mk index 5a48a2a29..c635498d5 100644 --- a/buildroot/package/python-pycairo/python-pycairo.mk +++ b/buildroot/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.18.2 +PYTHON_PYCAIRO_VERSION = 1.19.1 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/e8/9d/c8be300fc6b1298559d37a071c3833b0b251e0fff334d2e4c408d5789162 PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 diff --git a/buildroot/package/python-pycparser/python-pycparser.hash b/buildroot/package/python-pycparser/python-pycparser.hash index 6230f7cc8..042644439 100644 --- a/buildroot/package/python-pycparser/python-pycparser.hash +++ b/buildroot/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 76396762adc3fa769c83d8e202d36b6f pycparser-2.19.tar.gz -sha256 a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3 pycparser-2.19.tar.gz +md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz +sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE diff --git a/buildroot/package/python-pycparser/python-pycparser.mk b/buildroot/package/python-pycparser/python-pycparser.mk index c07edaaa2..8af37fce9 100644 --- a/buildroot/package/python-pycparser/python-pycparser.mk +++ b/buildroot/package/python-pycparser/python-pycparser.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCPARSER_VERSION = 2.19 +PYTHON_PYCPARSER_VERSION = 2.20 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash index 2caf97a29..df8d2a2f8 100644 --- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 ae7083008139cf9372322dcd99e92db0 pycryptodomex-3.7.1.tar.gz -sha256 4ba053bea752ddc89b94d1f9f87008ef296a644b8dec0201c021d9636c069322 pycryptodomex-3.7.1.tar.gz +md5 4cede80c602d8814bbfb24a1cdc50dc8 pycryptodomex-3.9.8.tar.gz +sha256 48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9 pycryptodomex-3.9.8.tar.gz # Locally computed sha256 checksums -sha256 d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2 LICENSE.rst -sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto +sha256 d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2 LICENSE.rst +sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk index 05239e10e..5123acb8e 100644 --- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.7.1 +# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk +PYTHON_PYCRYPTODOMEX_VERSION = 3.9.8 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f6/be/9f65b7db183628bdb36401105a3fc9f1688909f5184c115902a7bdd333bd +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f5/79/9d9206688385d1e7a5ff925e7aab1d685636256e34a409037aa7adbbe611 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/buildroot/package/python-pydal/python-pydal.hash b/buildroot/package/python-pydal/python-pydal.hash index ccc388d93..161395ac5 100644 --- a/buildroot/package/python-pydal/python-pydal.hash +++ b/buildroot/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 from https://pypi.org/project/pyDAL/#files -sha256 763ed017f431fc3d9fa9243f6be2519ff49b8a260d15763c4733762d9c086904 python-pydal-18.09.tar.gz -sha256 ae7d7b6888bb72f26af2bcbee69ae6f8a49e12f66c99e78f2a8b806effc5219d LICENSE +sha256 65bc77933eb9ac84874702629fcb167c18dc242a00cf7cc191899796761349e4 python-pydal-20200714.1.tar.gz +sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/buildroot/package/python-pydal/python-pydal.mk b/buildroot/package/python-pydal/python-pydal.mk index 8ef06bc03..2ea3790a3 100644 --- a/buildroot/package/python-pydal/python-pydal.mk +++ b/buildroot/package/python-pydal/python-pydal.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 18.09 +PYTHON_PYDAL_VERSION = 20200714.1 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause -PYTHON_PYDAL_LICENSE_FILES = LICENSE +PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-pyelftools/python-pyelftools.mk b/buildroot/package/python-pyelftools/python-pyelftools.mk index 21b9e409b..71ad49f20 100644 --- a/buildroot/package/python-pyelftools/python-pyelftools.mk +++ b/buildroot/package/python-pyelftools/python-pyelftools.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk PYTHON_PYELFTOOLS_VERSION = 0.25 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/fa/9a/0674cb1725196568bdbca98304f2efb17368b57af1a4bb3fc772c026f474 diff --git a/buildroot/package/python-pyicu/Config.in b/buildroot/package/python-pyicu/Config.in index efab0853e..93eac5338 100644 --- a/buildroot/package/python-pyicu/Config.in +++ b/buildroot/package/python-pyicu/Config.in @@ -1,15 +1,17 @@ config BR2_PACKAGE_PYTHON_PYICU bool "python-pyicu" depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help Python extension wrapping the ICU C++ API. https://github.com/ovalhub/pyicu -comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.8" +comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch b/buildroot/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch new file mode 100644 index 000000000..4f4a76ce2 --- /dev/null +++ b/buildroot/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch @@ -0,0 +1,34 @@ +From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001 +From: Scott Kitterman +Date: Tue, 26 May 2020 20:08:16 -0400 +Subject: [PATCH] Remove spurious requirement for wheel (#596) + +* Remove spurious requirement for wheel + +* Put wheel back in pyproject.toml + +Co-authored-by: Scott Kitterman +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +44fb453931c611d4822343debe902cca8e1c8afe] +--- + setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9319c1c..d82a7fe 100644 +--- a/setup.py ++++ b/setup.py +@@ -35,8 +35,7 @@ except ImportError: + + + requirements = ["six"] +-setup_requirements = ["setuptools", +- "wheel"] ++setup_requirements = ["setuptools"] + test_requirements = ["pytest>=3.2.1,!=3.3.0", + "hypothesis>=3.27.0"] + docs_requirements = ["sphinx>=1.6.5", +-- +2.25.1 + diff --git a/buildroot/package/python-pynacl/python-pynacl.hash b/buildroot/package/python-pynacl/python-pynacl.hash index 9aa8a0eef..b6ee2baf0 100644 --- a/buildroot/package/python-pynacl/python-pynacl.hash +++ b/buildroot/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 3f3b1272287bc2de8efd8a5fa18bf728 PyNaCl-1.3.0.tar.gz -sha256 0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c PyNaCl-1.3.0.tar.gz +md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz +sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz # Locally computed sha256 checksums -sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE +sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/buildroot/package/python-pynacl/python-pynacl.mk b/buildroot/package/python-pynacl/python-pynacl.mk index 679b3a779..1e4155992 100644 --- a/buildroot/package/python-pynacl/python-pynacl.mk +++ b/buildroot/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.3.0 +PYTHON_PYNACL_VERSION = 1.4.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/61/ab/2ac6dea8489fa713e2b4c6c5b549cc962dd4a842b5998d9e80cf8440b7cd +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyparted/Config.in b/buildroot/package/python-pyparted/Config.in index 6e3bde203..0ed24f883 100644 --- a/buildroot/package/python-pyparted/Config.in +++ b/buildroot/package/python-pyparted/Config.in @@ -1,14 +1,14 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_ENABLE_LOCALE # parted depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_UCLIBC # parted select BR2_PACKAGE_PARTED help Python bindings for GNU parted (libparted). https://github.com/rhinstaller/pyparted -comment "pyparted needs a glibc or musl toolchain w/ locale, wchar" - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "pyparted needs a toolchain w/ locale, wchar" + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/buildroot/package/python-pyparted/python-pyparted.hash b/buildroot/package/python-pyparted/python-pyparted.hash index 61960f469..0c3e4a15f 100644 --- a/buildroot/package/python-pyparted/python-pyparted.hash +++ b/buildroot/package/python-pyparted/python-pyparted.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a9ec181bf3c7c0635862413fc86cb0950b5af957541535f530ea86a0f9d14e73 python-pyparted-3.11.0.tar.gz +sha256 d214288ae1a70b5925861ce01b3352378eb6b1419aa3b786f509e9ef2a501c02 python-pyparted-3.11.6.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/python-pyparted/python-pyparted.mk b/buildroot/package/python-pyparted/python-pyparted.mk index c4783459a..9d48fd935 100644 --- a/buildroot/package/python-pyparted/python-pyparted.mk +++ b/buildroot/package/python-pyparted/python-pyparted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYPARTED_VERSION = 3.11.0 +PYTHON_PYPARTED_VERSION = 3.11.6 PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,v$(PYTHON_PYPARTED_VERSION)) PYTHON_PYPARTED_SETUP_TYPE = distutils PYTHON_PYPARTED_LICENSE = GPL-2.0+ diff --git a/buildroot/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk index 9b5e9089f..9285b6497 100644 --- a/buildroot/package/python-pyqt5/python-pyqt5.mk +++ b/buildroot/package/python-pyqt5/python-pyqt5.mk @@ -39,6 +39,12 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_TEST),y) PYTHON_PYQT5_MODULES += QtTest endif + +# QtSvg needs QtWidgets +ifeq ($(BR2_PACKAGE_QT5SVG),y) +PYTHON_PYQT5_DEPENDENCIES += qt5svg +PYTHON_PYQT5_MODULES += QtSvg +endif endif ifeq ($(BR2_PACKAGE_QT5CONNECTIVITY),y) @@ -88,11 +94,6 @@ PYTHON_PYQT5_DEPENDENCIES += qt5serialport PYTHON_PYQT5_MODULES += QtSerialPort endif -ifeq ($(BR2_PACKAGE_QT5SVG),y) -PYTHON_PYQT5_DEPENDENCIES += qt5svg -PYTHON_PYQT5_MODULES += QtSvg -endif - ifeq ($(BR2_PACKAGE_QT5WEBCHANNEL),y) PYTHON_PYQT5_DEPENDENCIES += qt5webchannel PYTHON_PYQT5_MODULES += QtWebChannel diff --git a/buildroot/package/python-pysftp/Config.in b/buildroot/package/python-pysftp/Config.in new file mode 100644 index 000000000..06f883f60 --- /dev/null +++ b/buildroot/package/python-pysftp/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYSFTP + bool "python-pysftp" + select BR2_PACKAGE_PYTHON_PARAMIKO # runtime + help + A friendly face on SFTP. + + https://bitbucket.org/dundeemt/pysftp diff --git a/buildroot/package/python-pysftp/python-pysftp.hash b/buildroot/package/python-pysftp/python-pysftp.hash new file mode 100644 index 000000000..75102ab8a --- /dev/null +++ b/buildroot/package/python-pysftp/python-pysftp.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pysftp/json +md5 abc55b7122de3e86f0d547301f4ddf0c pysftp-0.2.9.tar.gz +sha256 fbf55a802e74d663673400acd92d5373c1c7ee94d765b428d9f977567ac4854a pysftp-0.2.9.tar.gz +# Locally computed sha256 checksums +sha256 e648e3c7f439b52222a785a590223a0f7bad1a8a5fb89157d80d13123c7dcd25 LICENSE.txt diff --git a/buildroot/package/python-pysftp/python-pysftp.mk b/buildroot/package/python-pysftp/python-pysftp.mk new file mode 100644 index 000000000..4841afd00 --- /dev/null +++ b/buildroot/package/python-pysftp/python-pysftp.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pysftp +# +################################################################################ + +PYTHON_PYSFTP_VERSION = 0.2.9 +PYTHON_PYSFTP_SOURCE = pysftp-$(PYTHON_PYSFTP_VERSION).tar.gz +PYTHON_PYSFTP_SITE = https://files.pythonhosted.org/packages/36/60/45f30390a38b1f92e0a8cf4de178cd7c2bc3f874c85430e40ccf99df8fe7 +PYTHON_PYSFTP_SETUP_TYPE = setuptools +PYTHON_PYSFTP_LICENSE = BSD-3-Clause +PYTHON_PYSFTP_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-pysmb/Config.in b/buildroot/package/python-pysmb/Config.in index 32a6878fb..61d7c2a03 100644 --- a/buildroot/package/python-pysmb/Config.in +++ b/buildroot/package/python-pysmb/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYSMB bool "python-pysmb" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON_PYASN + select BR2_PACKAGE_PYTHON_PYASN1 help pysmb is an experimental SMB/CIFS library written in Python. It implements the client-side SMB/CIFS protocol (SMB1 and diff --git a/buildroot/package/python-pytablereader/Config.in b/buildroot/package/python-pytablereader/Config.in index 6d61208bb..e6b2a4a30 100644 --- a/buildroot/package/python-pytablereader/Config.in +++ b/buildroot/package/python-pytablereader/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER bool "python-pytablereader" - depends on BR2_PACKAGE_PYTHON3 # python-pathpy + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder, python-pathpy select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime diff --git a/buildroot/package/python-pytablewriter/Config.in b/buildroot/package/python-pytablewriter/Config.in index 9fed52c83..b95ee3577 100644 --- a/buildroot/package/python-pytablewriter/Config.in +++ b/buildroot/package/python-pytablewriter/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" + depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-mbstrdecoder select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_MSGFY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime diff --git a/buildroot/package/python-pytest/Config.in b/buildroot/package/python-pytest/Config.in new file mode 100644 index 000000000..ad57547a1 --- /dev/null +++ b/buildroot/package/python-pytest/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_PYTHON_PYTEST + bool "python-pytest" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_INICONFIG # runtime + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_PLUGGY # runtime + select BR2_PACKAGE_PYTHON_PY # runtime + select BR2_PACKAGE_PYTHON_TOML # runtime + help + pytest is a framework that makes building simple and scalable + tests easy. Tests are expressive and readable—no boilerplate + code required. + + https://docs.pytest.org/en/latest/ diff --git a/buildroot/package/python-pytest/python-pytest.hash b/buildroot/package/python-pytest/python-pytest.hash new file mode 100644 index 000000000..6f3532a59 --- /dev/null +++ b/buildroot/package/python-pytest/python-pytest.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pytest/json +md5 c3e7c811b2b74c60bb5fb951229ebce9 pytest-6.0.1.tar.gz +sha256 85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4 pytest-6.0.1.tar.gz +# Locally computer sha256 +sha256 7898b9b164d4f93fd9a562fd0f592935518b48c4745303964110eb7f7fe64faf LICENSE diff --git a/buildroot/package/python-pytest/python-pytest.mk b/buildroot/package/python-pytest/python-pytest.mk new file mode 100644 index 000000000..c17d579f8 --- /dev/null +++ b/buildroot/package/python-pytest/python-pytest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pytest +# +################################################################################ + +PYTHON_PYTEST_VERSION = 6.0.1 +PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/20/4c/d7b19b8661be78461fff0392e33943784340424921578fe1bf300ef59831 +PYTHON_PYTEST_SETUP_TYPE = setuptools +PYTHON_PYTEST_LICENSE = MIT +PYTHON_PYTEST_LICENSE_FILES = LICENSE +PYTHON_PYTEST_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch index 93b956859..67c276649 100644 --- a/buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ b/buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch @@ -11,37 +11,39 @@ Taken from pyudev issue 117 discussion: https://github.com/pyudev/pyudev/pull/117 Signed-off-by: Yegor Yefremov +[Marcin: adjust to 0.22.0] +Signed-off-by: Marcin Niestroj --- - src/pyudev/_libudev.py | 8 ++++---- + src/pyudev/_ctypeslib/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/pyudev/_libudev.py b/src/pyudev/_libudev.py -index a0de8fb..1348d17 100644 ---- a/src/pyudev/_libudev.py -+++ b/src/pyudev/_libudev.py -@@ -30,7 +30,7 @@ - from __future__ import (print_function, division, unicode_literals, - absolute_import) +diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py +index 9dffb3c..aa9942f 100644 +--- a/src/pyudev/_ctypeslib/utils.py ++++ b/src/pyudev/_ctypeslib/utils.py +@@ -28,7 +28,7 @@ + from __future__ import print_function + from __future__ import unicode_literals --from ctypes import (CDLL, Structure, POINTER, -+from ctypes import (cdll, CDLL, Structure, POINTER, - c_char, c_char_p, c_int, c_uint, c_ulonglong) +-from ctypes import CDLL ++from ctypes import cdll, CDLL from ctypes.util import find_library -@@ -265,10 +265,10 @@ def load_udev_library(): - Raise :exc:`~exceptions.ImportError`, if the udev library was not found. +@@ -50,10 +50,10 @@ def load_ctypes_library(name, signatures, error_checkers): + :rtype: ctypes.CDLL + :raises ImportError: if the library is not found """ -- udev_library_name = find_library('udev') -- if not udev_library_name: +- library_name = find_library(name) +- if not library_name: + try: -+ libudev = cdll.LoadLibrary('libudev.so') ++ lib = cdll.LoadLibrary(f'lib{name}.so') + except OSError: - raise ImportError('No library named udev') -- libudev = CDLL(udev_library_name, use_errno=True) - # context function signature - for namespace, members in SIGNATURES.items(): - for funcname in members: + raise ImportError('No library named %s' % name) +- lib = CDLL(library_name, use_errno=True) + # Add function signatures + for funcname, signature in signatures.items(): + function = getattr(lib, funcname, None) -- -2.1.4 +2.29.1 diff --git a/buildroot/package/python-pyudev/python-pyudev.hash b/buildroot/package/python-pyudev/python-pyudev.hash index 94c590731..def10542f 100644 --- a/buildroot/package/python-pyudev/python-pyudev.hash +++ b/buildroot/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=07a60f5f7a6028e83725f759a1b9490a -md5 07a60f5f7a6028e83725f759a1b9490a pyudev-0.18.tar.gz -# Locally computed -sha256 83b315f74e29c3a4aa6ea38b6cf73b0bb7e37066d7a5d70972ac418a80aed62a pyudev-0.18.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyudev/json +md5 377eda61186c91e9440f01d76dbb4206 pyudev-0.22.0.tar.gz +sha256 69bb1beb7ac52855b6d1b9fe909eefb0017f38d917cba9939602c6880035b276 pyudev-0.22.0.tar.gz +# Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/python-pyudev/python-pyudev.mk b/buildroot/package/python-pyudev/python-pyudev.mk index db941ea4d..42d5c7000 100644 --- a/buildroot/package/python-pyudev/python-pyudev.mk +++ b/buildroot/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.18 +PYTHON_PYUDEV_VERSION = 0.22.0 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://pypi.python.org/packages/source/p/pyudev +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/72/c8/4660d815a79b1d42c409012aaa10ebd6b07a47529b4cb6880f27a24bd646 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyyaml/python-pyyaml.mk b/buildroot/package/python-pyyaml/python-pyyaml.mk index 78506390a..7bbae309c 100644 --- a/buildroot/package/python-pyyaml/python-pyyaml.mk +++ b/buildroot/package/python-pyyaml/python-pyyaml.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk PYTHON_PYYAML_VERSION = 5.3.1 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c diff --git a/buildroot/package/python-pyzmq/python-pyzmq.hash b/buildroot/package/python-pyzmq/python-pyzmq.hash index 96e0ab9ff..ecf648924 100644 --- a/buildroot/package/python-pyzmq/python-pyzmq.hash +++ b/buildroot/package/python-pyzmq/python-pyzmq.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyzmq/json -md5 d850bbab7c7f558b91c95b19028ff4b8 pyzmq-18.1.1.tar.gz -sha256 8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d pyzmq-18.1.1.tar.gz -# Locally calculated -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER +md5 200abc1a75bdcfff7adf61304f46f55e pyzmq-19.0.2.tar.gz +sha256 296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438 pyzmq-19.0.2.tar.gz +# Locally computed sha256 checksums +sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD +sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER diff --git a/buildroot/package/python-pyzmq/python-pyzmq.mk b/buildroot/package/python-pyzmq/python-pyzmq.mk index 0ba0c8d98..d1f4314a1 100644 --- a/buildroot/package/python-pyzmq/python-pyzmq.mk +++ b/buildroot/package/python-pyzmq/python-pyzmq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 18.1.1 +PYTHON_PYZMQ_VERSION = 19.0.2 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3c/83/7ecbe9b762829f589fa9734026e0ccb63cb128fe5615ae1698f65df72bfe +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/05/77/7483975d84fe1fd24cc67881ba7810e0e7b3ee6c2a0e002a5d6703cca49b PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD diff --git a/buildroot/package/python-redis/python-redis.hash b/buildroot/package/python-redis/python-redis.hash index 02ec3bde5..57c71dabf 100644 --- a/buildroot/package/python-redis/python-redis.hash +++ b/buildroot/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 c2062a26ea12b69e0d39a23451c89998 redis-3.4.1.tar.gz -sha256 0dcfb335921b88a850d461dc255ff4708294943322bd55de6cfd68972490ca1f redis-3.4.1.tar.gz +md5 7a00d4540374f34e152a33faa1fcee5f redis-3.5.3.tar.gz +sha256 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2 redis-3.5.3.tar.gz # Locally computed sha256 checksums -sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE +sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/buildroot/package/python-redis/python-redis.mk b/buildroot/package/python-redis/python-redis.mk index a93ccfe02..98c1a1659 100644 --- a/buildroot/package/python-redis/python-redis.mk +++ b/buildroot/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.4.1 +PYTHON_REDIS_VERSION = 3.5.3 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-regex/Config.in b/buildroot/package/python-regex/Config.in new file mode 100644 index 000000000..5f582d085 --- /dev/null +++ b/buildroot/package/python-regex/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_REGEX + bool "python-regex" + help + Alternative regular expression module, to replace re. + + https://bitbucket.org/mrabarnett/mrab-regex diff --git a/buildroot/package/python-regex/python-regex.hash b/buildroot/package/python-regex/python-regex.hash new file mode 100644 index 000000000..9e256263a --- /dev/null +++ b/buildroot/package/python-regex/python-regex.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/regex/json +md5 ac88a9c036e626ae4d436e69f35f50cf regex-2020.2.20.tar.gz +sha256 9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5 regex-2020.2.20.tar.gz diff --git a/buildroot/package/python-regex/python-regex.mk b/buildroot/package/python-regex/python-regex.mk new file mode 100644 index 000000000..8a527c8ee --- /dev/null +++ b/buildroot/package/python-regex/python-regex.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-regex +# +################################################################################ + +# Please keep in sync with package/python3-regex/python3-regex.mk +PYTHON_REGEX_VERSION = 2020.2.20 +PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/e8/76/8ac7f467617b9cfbafcef3c76df6f22b15de654a62bea719792b00a83195 +PYTHON_REGEX_SETUP_TYPE = setuptools +PYTHON_REGEX_LICENSE = CNRI-Python + +$(eval $(python-package)) diff --git a/buildroot/package/python-remi/python-remi.hash b/buildroot/package/python-remi/python-remi.hash index 235538016..5788d7d92 100644 --- a/buildroot/package/python-remi/python-remi.hash +++ b/buildroot/package/python-remi/python-remi.hash @@ -1,3 +1,2 @@ -# Locally computed -sha256 678c9caf1ecffc03c4a3d59931906520545d77e9a8027ff1a1ca90fc580f56e2 python-remi-2019.9.tar.gz -sha256 bc198f9846c1da3a1c1b1fa2b12909b021365d1e7fe9b4039245edfcec3b7f7f LICENSE +# sha256 from https://pypi.org/pypi/remi/json +sha256 2a1953747fd01bfda25381624f6b84d83586d247f6b47282dbafff348fd05d88 remi-2020.8.6.tar.gz diff --git a/buildroot/package/python-remi/python-remi.mk b/buildroot/package/python-remi/python-remi.mk index df0e1df5a..04f2e1abe 100644 --- a/buildroot/package/python-remi/python-remi.mk +++ b/buildroot/package/python-remi/python-remi.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_REMI_VERSION = 2019.9 -PYTHON_REMI_SITE = $(call github,dddomodossola,remi,$(PYTHON_REMI_VERSION)) +PYTHON_REMI_VERSION = 2020.8.6 +PYTHON_REMI_SOURCE = remi-$(PYTHON_REMI_VERSION).tar.gz +PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/d1/74/e2a1f5df4e57170369b221017c954ce9002901b9cc136365de0cf300e72a PYTHON_REMI_LICENSE = Apache-2.0 -PYTHON_REMI_LICENSE_FILES = LICENSE PYTHON_REMI_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-requests/python-requests.hash b/buildroot/package/python-requests/python-requests.hash index 42f45d3a4..84bf2a1aa 100644 --- a/buildroot/package/python-requests/python-requests.hash +++ b/buildroot/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz -sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz +md5 b54bff26a389e5932e8b1c4983a99ce7 requests-2.24.0.tar.gz +sha256 b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b requests-2.24.0.tar.gz # Locally computed sha256 checksums -sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE +sha256 8837a2f33a61bcee175c028ff16d1c160aba48a3aebe1495ace709be4e62636b LICENSE diff --git a/buildroot/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk index e64db9452..eb3997f10 100644 --- a/buildroot/package/python-requests/python-requests.mk +++ b/buildroot/package/python-requests/python-requests.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.22.0 +# Please keep in sync with package/python3-requests/python3-requests.mk +PYTHON_REQUESTS_VERSION = 2.24.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/da/67/672b422d9daf07365259958912ba533a0ecab839d4084c487a5fe9a5405f PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch b/buildroot/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch new file mode 100644 index 000000000..95892f997 --- /dev/null +++ b/buildroot/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch @@ -0,0 +1,147 @@ +Description: This patch fixes the "multiple definition of" errors with gcc10 + +Signed-off-by: Michael Fischer + +diff -purN python-rpi-gpio.org/source/common.c python-rpi-gpio/source/common.c +--- python-rpi-gpio.org/source/common.c 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/common.c 2020-08-07 09:31:33.948575964 +0200 +@@ -28,6 +28,9 @@ + const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; + const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; + const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12, 13, -1, 19, 16, 26, 20, -1, 21 }; ++const int (*pin_to_gpio)[41]; ++int gpio_direction[54]; ++rpi_info rpiinfo; + int setup_error = 0; + int module_setup = 0; + +diff -purN python-rpi-gpio.org/source/common.h python-rpi-gpio/source/common.h +--- python-rpi-gpio.org/source/common.h 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/common.h 2020-08-07 09:31:33.948575964 +0200 +@@ -30,14 +30,14 @@ SOFTWARE. + #define I2C 42 + #define PWM 43 + +-int gpio_mode; +-const int pin_to_gpio_rev1[41]; +-const int pin_to_gpio_rev2[41]; +-const int pin_to_gpio_rev3[41]; +-const int (*pin_to_gpio)[41]; +-int gpio_direction[54]; +-rpi_info rpiinfo; +-int setup_error; +-int module_setup; ++extern int gpio_mode; ++extern const int pin_to_gpio_rev1[41]; ++extern const int pin_to_gpio_rev2[41]; ++extern const int pin_to_gpio_rev3[41]; ++extern const int (*pin_to_gpio)[41]; ++extern int gpio_direction[54]; ++extern rpi_info rpiinfo; ++extern int setup_error; ++extern int module_setup; + int check_gpio_priv(void); + int get_gpio_number(int channel, unsigned int *gpio); +diff -purN python-rpi-gpio.org/source/constants.c python-rpi-gpio/source/constants.c +--- python-rpi-gpio.org/source/constants.c 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/constants.c 2020-08-07 09:32:15.522196618 +0200 +@@ -21,6 +21,7 @@ + */ + + #include "Python.h" ++#define CONSTANTS_C + #include "constants.h" + #include "common.h" + #include "c_gpio.h" +diff -purN python-rpi-gpio.org/source/constants.h python-rpi-gpio/source/constants.h +--- python-rpi-gpio.org/source/constants.h 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/constants.h 2020-08-07 09:32:15.522196618 +0200 +@@ -23,22 +23,28 @@ SOFTWARE. + #define PY_PUD_CONST_OFFSET 20 + #define PY_EVENT_CONST_OFFSET 30 + +-PyObject *high; +-PyObject *low; +-PyObject *input; +-PyObject *output; +-PyObject *pwm; +-PyObject *serial; +-PyObject *i2c; +-PyObject *spi; +-PyObject *unknown; +-PyObject *board; +-PyObject *bcm; +-PyObject *pud_off; +-PyObject *pud_up; +-PyObject *pud_down; +-PyObject *rising_edge; +-PyObject *falling_edge; +-PyObject *both_edge; ++#ifdef CONSTANTS_C ++#define MAYBE_EXTERN ++#else ++#define MAYBE_EXTERN extern ++#endif ++ ++MAYBE_EXTERN PyObject *high; ++MAYBE_EXTERN PyObject *low; ++MAYBE_EXTERN PyObject *input; ++MAYBE_EXTERN PyObject *output; ++MAYBE_EXTERN PyObject *pwm; ++MAYBE_EXTERN PyObject *serial; ++MAYBE_EXTERN PyObject *i2c; ++MAYBE_EXTERN PyObject *spi; ++MAYBE_EXTERN PyObject *unknown; ++MAYBE_EXTERN PyObject *board; ++MAYBE_EXTERN PyObject *bcm; ++MAYBE_EXTERN PyObject *pud_off; ++MAYBE_EXTERN PyObject *pud_up; ++MAYBE_EXTERN PyObject *pud_down; ++MAYBE_EXTERN PyObject *rising_edge; ++MAYBE_EXTERN PyObject *falling_edge; ++MAYBE_EXTERN PyObject *both_edge; + + void define_constants(PyObject *module); +diff -purN python-rpi-gpio.org/source/event_gpio.c python-rpi-gpio/source/event_gpio.c +--- python-rpi-gpio.org/source/event_gpio.c 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/event_gpio.c 2020-08-07 09:42:05.564483136 +0200 +@@ -57,7 +57,7 @@ struct callback + }; + struct callback *callbacks = NULL; + +-pthread_t threads; ++static pthread_t threads; + int event_occurred[54] = { 0 }; + int thread_running = 0; + int epfd_thread = -1; +diff -purN python-rpi-gpio.org/source/py_pwm.h python-rpi-gpio/source/py_pwm.h +--- python-rpi-gpio.org/source/py_pwm.h 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/py_pwm.h 2020-08-07 09:38:49.445646807 +0200 +@@ -20,5 +20,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR + SOFTWARE. + */ + +-PyTypeObject PWMType; ++extern PyTypeObject PWMType; + PyTypeObject *PWM_init_PWMType(void); +diff -purN python-rpi-gpio.org/source/soft_pwm.c python-rpi-gpio/source/soft_pwm.c +--- python-rpi-gpio.org/source/soft_pwm.c 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/soft_pwm.c 2020-08-07 09:42:40.753160437 +0200 +@@ -25,7 +25,7 @@ SOFTWARE. + #include + #include "c_gpio.h" + #include "soft_pwm.h" +-pthread_t threads; ++static pthread_t threads; + + struct pwm + { +diff -purN python-rpi-gpio.org/source/soft_pwm.h python-rpi-gpio/source/soft_pwm.h +--- python-rpi-gpio.org/source/soft_pwm.h 2019-07-21 14:41:22.000000000 +0200 ++++ python-rpi-gpio/source/soft_pwm.h 2020-08-07 09:39:25.916811352 +0200 +@@ -26,4 +26,4 @@ void pwm_set_duty_cycle(unsigned int gpi + void pwm_set_frequency(unsigned int gpio, float freq); + void pwm_start(unsigned int gpio); + void pwm_stop(unsigned int gpio); +-int pwm_exists(unsigned int gpio); ++extern int pwm_exists(unsigned int gpio); diff --git a/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch b/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch deleted file mode 100644 index c291d4af3..000000000 --- a/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch +++ /dev/null @@ -1,83 +0,0 @@ -From aa3698d2eb38788b66b146faaa83ce4994c984e8 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Fri, 20 Sep 2019 21:07:10 +0000 -Subject: [PATCH] Fix cross-compilation - -Signed-off-by: Grzegorz Blach ---- - Makefile | 24 ------------------------ - setup.py | 21 ++++++++------------- - 2 files changed, 8 insertions(+), 37 deletions(-) - delete mode 100644 Makefile - -diff --git a/Makefile b/Makefile -deleted file mode 100644 -index b8da8f5..0000000 ---- a/Makefile -+++ /dev/null -@@ -1,24 +0,0 @@ --.PHONY: clean lib -- --SRC = lib --BUILD = lib-built --OBJECTS = $(BUILD)/ws2811.o $(BUILD)/rpihw.o $(BUILD)/pcm.o $(BUILD)/pwm.o $(BUILD)/dma.o $(BUILD)/mailbox.o --LIB = libws2811.a -- --all: $(BUILD) $(BUILD)/version.h $(BUILD)/$(LIB) -- --$(BUILD): -- mkdir -p $(BUILD) -- --$(BUILD)/version.h: -- cp version.h $(BUILD)/version.h -- --$(OBJECTS): $(BUILD)/%.o : $(SRC)/%.c -- gcc $< -o $@ -c -g -O2 -Wall -Werror -fPIC -- --$(BUILD)/$(LIB): $(OBJECTS) -- ar rc $@ $^ -- ranlib $@ -- --clean: -- -rm -f $(OBJECTS) $(BUILD)/$(LIB) $(BUILD)/version.h -diff --git a/library/setup.py b/library/setup.py -index b6785ec..1639574 100755 ---- a/setup.py -+++ b/setup.py -@@ -8,14 +8,6 @@ from setuptools import setup, find_packages, Extension - from setuptools.command.build_py import build_py - import subprocess - --class CustomInstallCommand(build_py): -- """Customized install to run library Makefile""" -- def run(self): -- print("Compiling ws281x library...") -- proc =subprocess.Popen(["make"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- print(proc.stderr.read()) -- build_py.run(self) -- - setup(name = 'rpi_ws281x', - version = '4.2.2', - author = 'Jeremy Garff , Phil Howard ', -@@ -24,10 +16,13 @@ setup(name = 'rpi_ws281x', - long_description = open('README.rst').read() + "\n" + open('CHANGELOG.txt').read(), - license = 'MIT', - url = 'https://github.com/rpi-ws281x/rpi-ws281x-python/', -- cmdclass = {'build_py':CustomInstallCommand}, - packages = ['rpi_ws281x'], - ext_modules = [Extension('_rpi_ws281x', -- sources=['rpi_ws281x_wrap.c'], -- include_dirs=['lib/'], -- library_dirs=['lib-built/'], -- libraries=['ws2811'])]) -+ include_dirs=['.'], -+ sources=['rpi_ws281x_wrap.c', -+ 'lib/dma.c', -+ 'lib/mailbox.c', -+ 'lib/pcm.c', -+ 'lib/pwm.c', -+ 'lib/rpihw.c', -+ 'lib/ws2811.c'])]) --- -2.23.0 - diff --git a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash index 5333baabb..54d91a6df 100644 --- a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash +++ b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json -md5 17a714941043621e81f592e6a137dd92 rpi_ws281x-4.2.3.tar.gz -sha256 265a395410cc7199f779c4209ca3970b7211896b86dbaa4731bdc3569d2e595f rpi_ws281x-4.2.3.tar.gz +md5 8eb175e05905ee7a00bb5fd2f1b15e40 rpi_ws281x-4.2.4.tar.gz +sha256 7175e708d6085bc02a9d0b8227797d697e34fd00787030ae5f119fe2f4f90889 rpi_ws281x-4.2.4.tar.gz # Locally computed sha256 checksums -sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE -sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk index 899ad3d1e..4af1d268a 100644 --- a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk +++ b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_WS281X_VERSION = 4.2.3 +PYTHON_RPI_WS281X_VERSION = 4.2.4 PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz -PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/03/6c/46fad1bace9d5917190fd76e1550ec6727010cff6d3e5818b8c3a5405ba3 +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/3b/99/0f74f2d303e03432d10b11dab240cb15afad1bc6ab9a1449c9bc08af2ee4 PYTHON_RPI_WS281X_SETUP_TYPE = setuptools PYTHON_RPI_WS281X_LICENSE = MIT PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE diff --git a/buildroot/package/python-s3transfer/Config.in b/buildroot/package/python-s3transfer/Config.in new file mode 100644 index 000000000..6587a5fe3 --- /dev/null +++ b/buildroot/package/python-s3transfer/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_S3TRANSFER + bool "python-s3transfer" + select BR2_PACKAGE_PYTHON_BOTOCORE # runtime + # runtime, not needed for python3: + select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON + help + An Amazon S3 Transfer Manager. + + https://github.com/boto/s3transfer diff --git a/buildroot/package/python-s3transfer/python-s3transfer.hash b/buildroot/package/python-s3transfer/python-s3transfer.hash new file mode 100644 index 000000000..6b554607d --- /dev/null +++ b/buildroot/package/python-s3transfer/python-s3transfer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/s3transfer/json +md5 8ca74015d9dc58af26c68276a8867eca s3transfer-0.2.1.tar.gz +sha256 6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d s3transfer-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac LICENSE.txt diff --git a/buildroot/package/python-s3transfer/python-s3transfer.mk b/buildroot/package/python-s3transfer/python-s3transfer.mk new file mode 100644 index 000000000..86bdc19ea --- /dev/null +++ b/buildroot/package/python-s3transfer/python-s3transfer.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-s3transfer +# +################################################################################ + +PYTHON_S3TRANSFER_VERSION = 0.2.1 +PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/39/12/150cd55c606ebca6725683642a8e7068cd6af10f837ce5419a9f16b7fb55 +PYTHON_S3TRANSFER_SETUP_TYPE = setuptools +PYTHON_S3TRANSFER_LICENSE = Apache-2.0 +PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-scapy/0001-Small-Python-2-fix.patch b/buildroot/package/python-scapy/0001-Small-Python-2-fix.patch deleted file mode 100644 index 562838d53..000000000 --- a/buildroot/package/python-scapy/0001-Small-Python-2-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0c3d5e417bbd923c4729d15572c3d693d58aff81 Mon Sep 17 00:00:00 2001 -From: Gabriel -Date: Wed, 21 Aug 2019 18:18:14 +0800 -Subject: [PATCH] Small Python 2 fix - -Signed-off-by: Peter Korsgaard ---- - scapy/tools/generate_ethertypes.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scapy/tools/generate_ethertypes.py b/scapy/tools/generate_ethertypes.py -index 5bc5cdf9..47c38c4f 100644 ---- a/scapy/tools/generate_ethertypes.py -+++ b/scapy/tools/generate_ethertypes.py -@@ -20,7 +20,7 @@ URL = "https://raw.githubusercontent.com/openbsd/src/master/sys/net/ethertypes.h - with urllib.request.urlopen(URL) as stream: - DATA = stream.read() - --reg = rb".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/" -+reg = br".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/" - COMPILED = b"""# - # Ethernet frame types - # This file describes some of the various Ethernet --- -2.20.1 - diff --git a/buildroot/package/python-scapy/python-scapy.hash b/buildroot/package/python-scapy/python-scapy.hash index df7eeb8ea..8618e54f4 100644 --- a/buildroot/package/python-scapy/python-scapy.hash +++ b/buildroot/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 469ae6f5615799a5de3f3b4eb217b18d scapy-2.4.3.tar.gz -sha256 e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 scapy-2.4.3.tar.gz +md5 01e52ff5d1f04364e17fc2d42872282e scapy-2.4.4.tar.gz +sha256 ecfd7a14cd9c3ef0eb08d28d5bb71d97219edff1454ccbdff229f676b27900ee scapy-2.4.4.tar.gz # Locally computed sha256 checksums -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/python-scapy/python-scapy.mk b/buildroot/package/python-scapy/python-scapy.mk index f6cf2a07b..3d9a4e191 100644 --- a/buildroot/package/python-scapy/python-scapy.mk +++ b/buildroot/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.3 +PYTHON_SCAPY_VERSION = 2.4.4 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/52/e7/464079606a9cf97ad04936c52a5324d14dae36215f9319bf3faa46a7907d +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/c6/8f/438d4d0bab4c8e22906a7401dd082b4c0f914daf2bbdc7e7e8390d81a5c3 PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-secretstorage/python-secretstorage.hash b/buildroot/package/python-secretstorage/python-secretstorage.hash index 3f096a396..a8e535f89 100644 --- a/buildroot/package/python-secretstorage/python-secretstorage.hash +++ b/buildroot/package/python-secretstorage/python-secretstorage.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/secretstorage/json -md5 12ea3fc6640e857331eb80ed46a7da20 SecretStorage-3.1.1.tar.gz -sha256 20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92 SecretStorage-3.1.1.tar.gz +md5 c2a8c0e08e5da198fc38c379b98c28f1 SecretStorage-3.1.2.tar.gz +sha256 15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6 SecretStorage-3.1.2.tar.gz # Locally computed sha256 checksums sha256 70f6bfca77633c35efa218328eda5486d7054c2914d61820980e378797520a25 LICENSE diff --git a/buildroot/package/python-secretstorage/python-secretstorage.mk b/buildroot/package/python-secretstorage/python-secretstorage.mk index 4a8b6ac90..4c209bf51 100644 --- a/buildroot/package/python-secretstorage/python-secretstorage.mk +++ b/buildroot/package/python-secretstorage/python-secretstorage.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SECRETSTORAGE_VERSION = 3.1.1 +PYTHON_SECRETSTORAGE_VERSION = 3.1.2 PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz -PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/a6/89/df343dbc2957a317127e7ff2983230dc5336273be34f2e1911519d85aeb5 +PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/fd/9f/36197c75d9a09b1ab63f56cb985af6cd858ca3fc41fd9cd890ce69bae5b9 PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-sentry-sdk/Config.in b/buildroot/package/python-sentry-sdk/Config.in index 5bddabe28..e8e88bac1 100644 --- a/buildroot/package/python-sentry-sdk/Config.in +++ b/buildroot/package/python-sentry-sdk/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_SENTRY_SDK bool "python-sentry-sdk" - select BR2_PACKAGE_PYTHON_URLLIB3 # runtime select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime help - Python client for Sentry (https://getsentry.com). + Python client for Sentry (https://sentry.io). https://github.com/getsentry/sentry-python diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash index e9dc46559..feade89f0 100644 --- a/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 1b22a7cb91e1f9b83acbd61709d5e71d sentry-sdk-0.13.1.tar.gz -sha256 f6e850f304382d87c5c52c01db8c0004d2ced6a0b073df2f2257168cf31b31aa sentry-sdk-0.13.1.tar.gz +md5 5d4abcc416cbd0b9443bf56588b02b55 sentry-sdk-0.17.3.tar.gz +sha256 0af429c221670e602f960fca85ca3f607c85510a91f11e8be8f742a978127f78 sentry-sdk-0.17.3.tar.gz # Locally computed sha256 checksums -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE +sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk index 2dcf4bce0..256aafa62 100644 --- a/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 0.13.1 +PYTHON_SENTRY_SDK_VERSION = 0.17.3 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/e2/5f/1f5881e98746c16464d46ae9d6ccdd6ce3c01c7e13093ea8a7d917642ee7 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/64/7e/f1725d8649ef8f7d58cbec582157c454884238e59fef00b1707d555c7bea PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-service-identity/Config.in b/buildroot/package/python-service-identity/Config.in index f1ce5312c..0260ab401 100644 --- a/buildroot/package/python-service-identity/Config.in +++ b/buildroot/package/python-service-identity/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn + depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYASN # runtime - select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime + select BR2_PACKAGE_PYTHON_PYASN1 # runtime + select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime help Service identity verification for pyOpenSSL. diff --git a/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash b/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash index 8208a9dc1..82dbf1435 100644 --- a/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 50b2199082fe808d032ec1710c9d7415 setuptools_scm-3.3.3.tar.gz -sha256 bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5 setuptools_scm-3.3.3.tar.gz +md5 86ec1eb9ec02ba018b097787e98897c5 setuptools_scm-3.5.0.tar.gz +sha256 5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87 setuptools_scm-3.5.0.tar.gz # sha256 locally computed -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk b/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk index dc9d28059..c6d30e99e 100644 --- a/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 3.3.3 +PYTHON_SETUPTOOLS_SCM_VERSION = 3.5.0 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/83/44/53cad68ce686585d12222e6769682c4bdb9686808d2739671f9175e2938b +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-setuptools/python-setuptools.hash b/buildroot/package/python-setuptools/python-setuptools.hash index cc4a831d2..769b68c35 100644 --- a/buildroot/package/python-setuptools/python-setuptools.hash +++ b/buildroot/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 89a592d733b31e180a4b6ad760c0685a setuptools-41.4.0.zip -sha256 7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d setuptools-41.4.0.zip +md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip +sha256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 setuptools-44.0.0.zip sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/buildroot/package/python-setuptools/python-setuptools.mk b/buildroot/package/python-setuptools/python-setuptools.mk index 163ba869c..2cb575ae2 100644 --- a/buildroot/package/python-setuptools/python-setuptools.mk +++ b/buildroot/package/python-setuptools/python-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 41.4.0 +PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-sh/python-sh.hash b/buildroot/package/python-sh/python-sh.hash index cc9ba214b..fffdd20c1 100644 --- a/buildroot/package/python-sh/python-sh.hash +++ b/buildroot/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/sh/json -md5 a8351aef25d25f707c17e0a7a6280251 sh-1.12.14.tar.gz +# md5, sha256 from https://pypi.org/pypi/sh/json +md5 7e3dd3a6b49c06db93746994a68cb8cf sh-1.13.1.tar.gz +sha256 97a3d2205e3c6a842d87ebbc9ae93acae5a352b1bc4609b428d0fd5bb9e286a3 sh-1.13.1.tar.gz # Locally computed -sha256 b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc sh-1.12.14.tar.gz sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/buildroot/package/python-sh/python-sh.mk b/buildroot/package/python-sh/python-sh.mk index dfe80d562..21c0fb3d7 100644 --- a/buildroot/package/python-sh/python-sh.mk +++ b/buildroot/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.12.14 +PYTHON_SH_VERSION = 1.13.1 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://pypi.python.org/packages/7c/71/199d27d3e7e78bf448bcecae0105a1d5b29173ffd2bbadaa95a74c156770 +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/c9/3b/2c9a22bf1c48ced7ff3a11d4a862682c21d825c35f9d025811ad9808d263 PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-simpleaudio/python-simpleaudio.hash b/buildroot/package/python-simpleaudio/python-simpleaudio.hash index 353fa5e36..0aac4c867 100644 --- a/buildroot/package/python-simpleaudio/python-simpleaudio.hash +++ b/buildroot/package/python-simpleaudio/python-simpleaudio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simpleaudio/json -md5 92f0a0891a198c000fedce0599b46c7b simpleaudio-1.0.2.tar.gz -sha256 4e0e4c0359f153408e9b8a65342ec0c1d014f36fbe9cdb594e9b6e5348916af8 simpleaudio-1.0.2.tar.gz +md5 8bd62157c286824e289e1f258419b98c simpleaudio-1.0.4.tar.gz +sha256 691c88649243544db717e7edf6a9831df112104e1aefb5f6038a5d071e8cf41d simpleaudio-1.0.4.tar.gz # Locally computed sha256 checksums -sha256 b4340683e83f0f25ea40f992773ceec6c749c4d64ec2c09dfa49d7f5b029adbf LICENSE.txt +sha256 b4340683e83f0f25ea40f992773ceec6c749c4d64ec2c09dfa49d7f5b029adbf LICENSE.txt diff --git a/buildroot/package/python-simpleaudio/python-simpleaudio.mk b/buildroot/package/python-simpleaudio/python-simpleaudio.mk index e23d4d026..5cdb3a82c 100644 --- a/buildroot/package/python-simpleaudio/python-simpleaudio.mk +++ b/buildroot/package/python-simpleaudio/python-simpleaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEAUDIO_VERSION = 1.0.2 +PYTHON_SIMPLEAUDIO_VERSION = 1.0.4 PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz -PYTHON_SIMPLEAUDIO_SITE = https://files.pythonhosted.org/packages/ad/39/ce09ef827887cdfc755427195d7291446c1fb34a16356d1fec920d62269d +PYTHON_SIMPLEAUDIO_SITE = https://files.pythonhosted.org/packages/94/1b/4dc29653733202b68c09d9c6ca085cf67ac54859ee860647ef21ac1ff3dc PYTHON_SIMPLEAUDIO_LICENSE = MIT PYTHON_SIMPLEAUDIO_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEAUDIO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-simplesqlite/Config.in b/buildroot/package/python-simplesqlite/Config.in index c03411b90..7e5484f49 100644 --- a/buildroot/package/python-simplesqlite/Config.in +++ b/buildroot/package/python-simplesqlite/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE bool "python-simplesqlite" + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_SQLITESCHEMA # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime diff --git a/buildroot/package/python-six/python-six.hash b/buildroot/package/python-six/python-six.hash index 0d1e75fe9..9945ffd1d 100644 --- a/buildroot/package/python-six/python-six.hash +++ b/buildroot/package/python-six/python-six.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/six/json -md5 21674588a57e649d1a6d977ec3122140 six-1.14.0.tar.gz -sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a six-1.14.0.tar.gz +md5 9f90a0eaa0ea7747fda01ca79d21ebcb six-1.15.0.tar.gz +sha256 30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 six-1.15.0.tar.gz # Locally computed sha256 checksums -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE diff --git a/buildroot/package/python-six/python-six.mk b/buildroot/package/python-six/python-six.mk index 8acc739f2..e7621f5ec 100644 --- a/buildroot/package/python-six/python-six.mk +++ b/buildroot/package/python-six/python-six.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIX_VERSION = 1.14.0 +PYTHON_SIX_VERSION = 1.15.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz -PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e +PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426 PYTHON_SIX_SETUP_TYPE = setuptools PYTHON_SIX_LICENSE = MIT PYTHON_SIX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-slob/Config.in b/buildroot/package/python-slob/Config.in index a8b6e45da..07d04d49a 100644 --- a/buildroot/package/python-slob/Config.in +++ b/buildroot/package/python-slob/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_SLOB bool "python-slob" depends on !BR2_BINFMT_FLAT # python-pyicu -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-pyicu -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYICU # runtime # although optional, it is used as default compression @@ -13,7 +14,8 @@ config BR2_PACKAGE_PYTHON_SLOB https://github.com/itkach/slob -comment "python-slob needs a toolchain w/ C++, gcc >= 4.8" +comment "python-slob needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-snappy/Config.in b/buildroot/package/python-snappy/Config.in new file mode 100644 index 000000000..fd7f84050 --- /dev/null +++ b/buildroot/package/python-snappy/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_SNAPPY + bool "python-snappy" + depends on BR2_INSTALL_LIBSTDCPP # snappy + select BR2_PACKAGE_SNAPPY + help + Python library for the snappy compression library from + Google. + + http://github.com/andrix/python-snappy + +comment "python-snappy needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-snappy/python-snappy.hash b/buildroot/package/python-snappy/python-snappy.hash new file mode 100644 index 000000000..1e0f96054 --- /dev/null +++ b/buildroot/package/python-snappy/python-snappy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-snappy/json +md5 82e09ffd44204096fc70d6de14d0ea2f python-snappy-0.5.4.tar.gz +sha256 d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2 python-snappy-0.5.4.tar.gz +# Locally computed sha256 checksums +sha256 d007cb05f143d99d16d5cd0d1bf291daf037adb36800344e440ec26edb938f9a LICENSE diff --git a/buildroot/package/python-snappy/python-snappy.mk b/buildroot/package/python-snappy/python-snappy.mk new file mode 100644 index 000000000..d087c83b1 --- /dev/null +++ b/buildroot/package/python-snappy/python-snappy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-snappy +# +################################################################################ + +PYTHON_SNAPPY_VERSION = 0.5.4 +PYTHON_SNAPPY_SITE = https://files.pythonhosted.org/packages/45/35/65d9f8cc537129894b4b32647d80212d1fa342877581c5b8a69872cea8be +PYTHON_SNAPPY_SETUP_TYPE = setuptools +PYTHON_SNAPPY_LICENSE = BSD-3-Clause +PYTHON_SNAPPY_LICENSE_FILES = LICENSE +PYTHON_SNAPPY_DEPENDENCIES = snappy + +$(eval $(python-package)) diff --git a/buildroot/package/python-spidev/python-spidev.hash b/buildroot/package/python-spidev/python-spidev.hash index d3d2b685e..13128ee3e 100644 --- a/buildroot/package/python-spidev/python-spidev.hash +++ b/buildroot/package/python-spidev/python-spidev.hash @@ -1,5 +1,5 @@ # sha256 from https://pypi.org/project/spidev -sha256 4314e52f573d95233c907f307558893313a8a606e197e77bb711526b0e179e80 spidev-3.4.tar.gz +sha256 8a7f5c289f161ea2ac4697fa8a10918232c990678dd0053084b3c43b1363910d spidev-3.5.tar.gz # locally computed sha256 153a6f02f41aebe292cf3307f973a80b4fb0c988d8d3e7d126c7a66c20b1cc27 README.md diff --git a/buildroot/package/python-spidev/python-spidev.mk b/buildroot/package/python-spidev/python-spidev.mk index 7f9bec7c9..e1065610a 100644 --- a/buildroot/package/python-spidev/python-spidev.mk +++ b/buildroot/package/python-spidev/python-spidev.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.4 +PYTHON_SPIDEV_VERSION = 3.5 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/fb/14/4c2e1640f0cb04862c76d9d76ed7c945b0f67876e503ac02f7f675fe86a0 -PYTHON_SPIDEV_SETUP_TYPE = distutils +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/62/56/de649e7d95f9fcfaf965a6eb937b4a46bc77ef21487c99cde1a7a0546040 +PYTHON_SPIDEV_SETUP_TYPE = setuptools PYTHON_SPIDEV_LICENSE = MIT PYTHON_SPIDEV_LICENSE_FILES = README.md diff --git a/buildroot/package/python-sqliteschema/Config.in b/buildroot/package/python-sqliteschema/Config.in index b9568adbe..838364712 100644 --- a/buildroot/package/python-sqliteschema/Config.in +++ b/buildroot/package/python-sqliteschema/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/buildroot/package/python-tabledata/Config.in b/buildroot/package/python-tabledata/Config.in index bd856d23e..a73207f9c 100644 --- a/buildroot/package/python-tabledata/Config.in +++ b/buildroot/package/python-tabledata/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" + depends on BR2_PACKAGE_PYTHON3 # python-dataproperty, python-typepy select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help diff --git a/buildroot/package/python-tabledata/python-tabledata.hash b/buildroot/package/python-tabledata/python-tabledata.hash index 9d8564db3..5c9a538f6 100644 --- a/buildroot/package/python-tabledata/python-tabledata.hash +++ b/buildroot/package/python-tabledata/python-tabledata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tabledata/json -md5 3a97a7bd3f2687a139578a79353a8188 tabledata-0.9.1.tar.gz -sha256 a2c59603ecb56cd2161a72978d56876377ba6a27a3e6d87e1874ba4d5ab02796 tabledata-0.9.1.tar.gz +md5 7d1ab52001d85d19d86f08a5ad8aab58 tabledata-1.1.2.tar.gz +sha256 db893596ab9066e5c4f002ae0fed70657e3b75cceb52dd1de5a0e145e338d830 tabledata-1.1.2.tar.gz # Locally computed sha256 checksums -sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE +sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/buildroot/package/python-tabledata/python-tabledata.mk b/buildroot/package/python-tabledata/python-tabledata.mk index c1381928c..c1503e69c 100644 --- a/buildroot/package/python-tabledata/python-tabledata.mk +++ b/buildroot/package/python-tabledata/python-tabledata.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 0.9.1 +PYTHON_TABLEDATA_VERSION = 1.1.2 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/7d/20/7178ce0e3e34d5aff07e2280522b7e1bc23d4f2fbb916b765bbb41b22174 +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/73/7c/67eec8e92504b8e00e5cc0053a3401bd1441eefc70cecfa4427bfcf76b89 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-tornado/python-tornado.hash b/buildroot/package/python-tornado/python-tornado.hash index 2aec0144e..e9fbbedf6 100644 --- a/buildroot/package/python-tornado/python-tornado.hash +++ b/buildroot/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 cab4b11480f6d032e46465586192d343 tornado-6.0.3.tar.gz -sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz +md5 cf39425f3d7eba9a54287f3e795a2f23 tornado-6.0.4.tar.gz +sha256 0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc tornado-6.0.4.tar.gz # Locally computed sha256 checksums -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE diff --git a/buildroot/package/python-tornado/python-tornado.mk b/buildroot/package/python-tornado/python-tornado.mk index e326fadcb..15f3b8368 100644 --- a/buildroot/package/python-tornado/python-tornado.mk +++ b/buildroot/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.0.3 +PYTHON_TORNADO_VERSION = 6.0.4 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-treq/python-treq.hash b/buildroot/package/python-treq/python-treq.hash index a2c0ea33f..288279cbd 100644 --- a/buildroot/package/python-treq/python-treq.hash +++ b/buildroot/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 a8e33a4b3259b45e08e1e0a5960f76f7 treq-18.6.0.tar.gz -sha256 91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48 treq-18.6.0.tar.gz +md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz +sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/buildroot/package/python-treq/python-treq.mk b/buildroot/package/python-treq/python-treq.mk index a79e2bac7..320f57b6f 100644 --- a/buildroot/package/python-treq/python-treq.mk +++ b/buildroot/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 18.6.0 +PYTHON_TREQ_VERSION = 20.3.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://pypi.python.org/packages/cb/c5/c83628d7e1a5d62a71eab0a5d1cdcdc53b49ead873f52975457ff2a8ae21 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch b/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch deleted file mode 100644 index 9fe15ad7b..000000000 --- a/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch +++ /dev/null @@ -1,271 +0,0 @@ -From 4a7d22e490bb8ff836892cc99a1f54b85ccb0281 Mon Sep 17 00:00:00 2001 -From: Mark Williams -Date: Sun, 16 Feb 2020 19:00:10 -0800 -Subject: [PATCH] Fix several request smuggling attacks. - -1. Requests with multiple Content-Length headers were allowed (thanks -to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; - -2. Requests with a Content-Length header and a Transfer-Encoding -header honored the first header (thanks to Jake Miller from Bishop -Fox) and now fail with a 400; - -3. Requests whose Transfer-Encoding header had a value other than -"chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail -with a 400. - -Fixes CVE-2020-10108 & CVE-2020-10109 - HTTP request splitting -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10108 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10109 - -Upstream: -https://github.com/twisted/twisted/commit/4a7d22e490bb8ff836892cc99a1f54b85ccb0281 - -Signed-off-by: Matthew Weber - - ---- - src/twisted/web/http.py | 64 +++++++--- - src/twisted/web/newsfragments/9770.bugfix | 1 + - src/twisted/web/test/test_http.py | 137 ++++++++++++++++++++++ - 3 files changed, 187 insertions(+), 15 deletions(-) - create mode 100644 src/twisted/web/newsfragments/9770.bugfix - -diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py -index f0fb05b4d69..06d830fe30f 100644 ---- a/src/twisted/web/http.py -+++ b/src/twisted/web/http.py -@@ -2171,6 +2171,51 @@ def _finishRequestBody(self, data): - self.allContentReceived() - self._dataBuffer.append(data) - -+ def _maybeChooseTransferDecoder(self, header, data): -+ """ -+ If the provided header is C{content-length} or -+ C{transfer-encoding}, choose the appropriate decoder if any. -+ -+ Returns L{True} if the request can proceed and L{False} if not. -+ """ -+ -+ def fail(): -+ self._respondToBadRequestAndDisconnect() -+ self.length = None -+ -+ # Can this header determine the length? -+ if header == b'content-length': -+ try: -+ length = int(data) -+ except ValueError: -+ fail() -+ return False -+ newTransferDecoder = _IdentityTransferDecoder( -+ length, self.requests[-1].handleContentChunk, self._finishRequestBody) -+ elif header == b'transfer-encoding': -+ # XXX Rather poorly tested code block, apparently only exercised by -+ # test_chunkedEncoding -+ if data.lower() == b'chunked': -+ length = None -+ newTransferDecoder = _ChunkedTransferDecoder( -+ self.requests[-1].handleContentChunk, self._finishRequestBody) -+ elif data.lower() == b'identity': -+ return True -+ else: -+ fail() -+ return False -+ else: -+ # It's not a length related header, so exit -+ return True -+ -+ if self._transferDecoder is not None: -+ fail() -+ return False -+ else: -+ self.length = length -+ self._transferDecoder = newTransferDecoder -+ return True -+ - - def headerReceived(self, line): - """ -@@ -2196,21 +2241,10 @@ def headerReceived(self, line): - - header = header.lower() - data = data.strip() -- if header == b'content-length': -- try: -- self.length = int(data) -- except ValueError: -- self._respondToBadRequestAndDisconnect() -- self.length = None -- return False -- self._transferDecoder = _IdentityTransferDecoder( -- self.length, self.requests[-1].handleContentChunk, self._finishRequestBody) -- elif header == b'transfer-encoding' and data.lower() == b'chunked': -- # XXX Rather poorly tested code block, apparently only exercised by -- # test_chunkedEncoding -- self.length = None -- self._transferDecoder = _ChunkedTransferDecoder( -- self.requests[-1].handleContentChunk, self._finishRequestBody) -+ -+ if not self._maybeChooseTransferDecoder(header, data): -+ return False -+ - reqHeaders = self.requests[-1].requestHeaders - values = reqHeaders.getRawHeaders(header) - if values is not None: -diff --git a/src/twisted/web/newsfragments/9770.bugfix b/src/twisted/web/newsfragments/9770.bugfix -new file mode 100644 -index 00000000000..4f1be97de8a ---- /dev/null -+++ b/src/twisted/web/newsfragments/9770.bugfix -@@ -0,0 +1 @@ -+Fix several request smuggling attacks: requests with multiple Content-Length headers were allowed (thanks to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; requests with a Content-Length header and a Transfer-Encoding header honored the first header (thanks to Jake Miller from Bishop Fox) and now fail with a 400; requests whose Transfer-Encoding header had a value other than "chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail a 400. -\ No newline at end of file -diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py -index 0a0db09b750..578cb500cda 100644 ---- a/src/twisted/web/test/test_http.py -+++ b/src/twisted/web/test/test_http.py -@@ -2252,6 +2252,143 @@ def process(self): - self.flushLoggedErrors(AttributeError) - - -+ def assertDisconnectingBadRequest(self, request): -+ """ -+ Assert that the given request bytes fail with a 400 bad -+ request without calling L{Request.process}. -+ -+ @param request: A raw HTTP request -+ @type request: L{bytes} -+ """ -+ class FailedRequest(http.Request): -+ processed = False -+ def process(self): -+ FailedRequest.processed = True -+ -+ channel = self.runRequest(request, FailedRequest, success=False) -+ self.assertFalse(FailedRequest.processed, "Request.process called") -+ self.assertEqual( -+ channel.transport.value(), -+ b"HTTP/1.1 400 Bad Request\r\n\r\n") -+ self.assertTrue(channel.transport.disconnecting) -+ -+ -+ def test_duplicateContentLengths(self): -+ """ -+ A request which includes multiple C{content-length} headers -+ fails with a 400 response without calling L{Request.process}. -+ """ -+ self.assertRequestRejected([ -+ b'GET /a HTTP/1.1', -+ b'Content-Length: 56', -+ b'Content-Length: 0', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ ]) -+ -+ -+ def test_duplicateContentLengthsWithPipelinedRequests(self): -+ """ -+ Two pipelined requests, the first of which includes multiple -+ C{content-length} headers, trigger a 400 response without -+ calling L{Request.process}. -+ """ -+ self.assertRequestRejected([ -+ b'GET /a HTTP/1.1', -+ b'Content-Length: 56', -+ b'Content-Length: 0', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ b'GET /a HTTP/1.1', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ ]) -+ -+ -+ def test_contentLengthAndTransferEncoding(self): -+ """ -+ A request that includes both C{content-length} and -+ C{transfer-encoding} headers fails with a 400 response without -+ calling L{Request.process}. -+ """ -+ self.assertRequestRejected([ -+ b'GET /a HTTP/1.1', -+ b'Transfer-Encoding: chunked', -+ b'Content-Length: 0', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ ]) -+ -+ -+ def test_contentLengthAndTransferEncodingWithPipelinedRequests(self): -+ """ -+ Two pipelined requests, the first of which includes both -+ C{content-length} and C{transfer-encoding} headers, triggers a -+ 400 response without calling L{Request.process}. -+ """ -+ self.assertRequestRejected([ -+ b'GET /a HTTP/1.1', -+ b'Transfer-Encoding: chunked', -+ b'Content-Length: 0', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ b'GET /a HTTP/1.1', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ ]) -+ -+ -+ def test_unknownTransferEncoding(self): -+ """ -+ A request whose C{transfer-encoding} header includes a value -+ other than C{chunked} or C{identity} fails with a 400 response -+ without calling L{Request.process}. -+ """ -+ self.assertRequestRejected([ -+ b'GET /a HTTP/1.1', -+ b'Transfer-Encoding: unknown', -+ b'Host: host.invalid', -+ b'', -+ b'', -+ ]) -+ -+ -+ def test_transferEncodingIdentity(self): -+ """ -+ A request with a valid C{content-length} and a -+ C{transfer-encoding} whose value is C{identity} succeeds. -+ """ -+ body = [] -+ -+ class SuccessfulRequest(http.Request): -+ processed = False -+ def process(self): -+ body.append(self.content.read()) -+ self.setHeader(b'content-length', b'0') -+ self.finish() -+ -+ request = b'''\ -+GET / HTTP/1.1 -+Host: host.invalid -+Content-Length: 2 -+Transfer-Encoding: identity -+ -+ok -+''' -+ channel = self.runRequest(request, SuccessfulRequest, False) -+ self.assertEqual(body, [b'ok']) -+ self.assertEqual( -+ channel.transport.value(), -+ b'HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n', -+ ) -+ -+ - - class QueryArgumentsTests(unittest.TestCase): - def testParseqs(self): diff --git a/buildroot/package/python-twisted/python-twisted.hash b/buildroot/package/python-twisted/python-twisted.hash index 2ce30d0fb..c633112e9 100644 --- a/buildroot/package/python-twisted/python-twisted.hash +++ b/buildroot/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 f2d70f7a66ecdf54152310164cceadfe Twisted-19.10.0.tar.bz2 -sha256 7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d Twisted-19.10.0.tar.bz2 +md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 +sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 # Locally computed sha256 -sha256 85b798413ba885b06cc1b91efe857a39f694071c29b04e80d23ea26ee271d613 LICENSE +sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE diff --git a/buildroot/package/python-twisted/python-twisted.mk b/buildroot/package/python-twisted/python-twisted.mk index 71748fc90..2478972f8 100644 --- a/buildroot/package/python-twisted/python-twisted.mk +++ b/buildroot/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 19.10.0 +PYTHON_TWISTED_VERSION = 20.3.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/0b/95/5fff90cd4093c79759d736e5f7c921c8eb7e5057a70d753cdb4e8e5895d7 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-txaio/Config.in b/buildroot/package/python-txaio/Config.in index 9d4238215..19a318a90 100644 --- a/buildroot/package/python-txaio/Config.in +++ b/buildroot/package/python-txaio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_TXAIO bool "python-txaio" - select BR2_PACKAGE_PYTHON_SIX # runtime + depends on BR2_PACKAGE_PYTHON3 help Compatibility API between asyncio/Twisted/Trollius. diff --git a/buildroot/package/python-txaio/python-txaio.hash b/buildroot/package/python-txaio/python-txaio.hash index 8b43a3dc8..15b1f5f2c 100644 --- a/buildroot/package/python-txaio/python-txaio.hash +++ b/buildroot/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 ecdd4d0f401c7f01f22830b4d2788593 txaio-18.8.1.tar.gz -sha256 67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe txaio-18.8.1.tar.gz +md5 c998be8d5837218c809266c0fce94687 txaio-20.4.1.tar.gz +sha256 17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d txaio-20.4.1.tar.gz # Locally computed sha256 checksums -sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE +sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/buildroot/package/python-txaio/python-txaio.mk b/buildroot/package/python-txaio/python-txaio.mk index 8f73f3674..2dd028f4f 100644 --- a/buildroot/package/python-txaio/python-txaio.mk +++ b/buildroot/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 18.8.1 +PYTHON_TXAIO_VERSION = 20.4.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c1/99/81de004578e9afe017bb1d4c8968088a33621c05449fe330bdd7016d5377 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/e7/dd/c0c90b080c3fad0ac8e2382eddbe86591d4fa1a5c1aea652de0adf245fc0 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-typepy/Config.in b/buildroot/package/python-typepy/Config.in index 607985707..0d58efb34 100644 --- a/buildroot/package/python-typepy/Config.in +++ b/buildroot/package/python-typepy/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_TYPEPY bool "python-typepy" + depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash index b1602350b..e29966672 100644 --- a/buildroot/package/python-urllib3/python-urllib3.hash +++ b/buildroot/package/python-urllib3/python-urllib3.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/urllib3/json -sha256 3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 urllib3-1.25.9.tar.gz +# md5, sha256 from https://pypi.org/pypi/urllib3/json +md5 d47dd21a6e66a03c3633cac468ffd010 urllib3-1.25.11.tar.gz +sha256 8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 urllib3-1.25.11.tar.gz # Locally computed sha256 checksums sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index b17a4c0cb..88e8d2097 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.25.9 +PYTHON_URLLIB3_VERSION = 1.25.11 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/05/8c/40cd6949373e23081b3ea20d5594ae523e681b6f472e600fbc95ed046a36 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/76/d9/bbbafc76b18da706451fa91bc2ebe21c0daf8868ef3c30b869ac7cb7f01d PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-validators/Config.in b/buildroot/package/python-validators/Config.in index e70036991..802b1dde5 100644 --- a/buildroot/package/python-validators/Config.in +++ b/buildroot/package/python-validators/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help diff --git a/buildroot/package/python-validators/python-validators.hash b/buildroot/package/python-validators/python-validators.hash index 1a3aa7998..2845a2e8c 100644 --- a/buildroot/package/python-validators/python-validators.hash +++ b/buildroot/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 ae3932b693452b96f037c919e1d7250f validators-0.14.2.tar.gz -sha256 b192e6bde7d617811d59f50584ed240b580375648cd032d106edeb3164099508 validators-0.14.2.tar.gz +md5 2f0446f2a15aa694be0cfd8728eb4444 validators-0.15.0.tar.gz +sha256 31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a validators-0.15.0.tar.gz # Locally computed sha256 checksums -sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE +sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/buildroot/package/python-validators/python-validators.mk b/buildroot/package/python-validators/python-validators.mk index 594c1d26e..7268b1013 100644 --- a/buildroot/package/python-validators/python-validators.mk +++ b/buildroot/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.14.2 +PYTHON_VALIDATORS_VERSION = 0.15.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/4d/56/9b48c918ef118ea12b90f227c4498ed4703b418bdd8fb49479dfcbeae4ef +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/c4/4a/4f9c892f9a9f08ee5f99c32bbd4297499099c2c5f7eff8c617a57d31a7d8 PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-wcwidth/python-wcwidth.hash b/buildroot/package/python-wcwidth/python-wcwidth.hash index 07ce8508a..ed1d2cd61 100644 --- a/buildroot/package/python-wcwidth/python-wcwidth.hash +++ b/buildroot/package/python-wcwidth/python-wcwidth.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/wcwidth/json -md5 b3b6a0a08f0c8a34d1de8cf44150a4ad wcwidth-0.1.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/wcwidth/json +md5 b32584cd6084b4a8c81df13a2a6b4351 wcwidth-0.1.9.tar.gz +sha256 ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1 wcwidth-0.1.9.tar.gz # Locally computed -sha256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e wcwidth-0.1.7.tar.gz sha256 0eddcc52cd3ef5d30798b8d43a14d3f0f1dcf0a6e4c1d0f2e177c44ce85bb69c LICENSE.txt diff --git a/buildroot/package/python-wcwidth/python-wcwidth.mk b/buildroot/package/python-wcwidth/python-wcwidth.mk index 2dd392a59..ccbd0e99c 100644 --- a/buildroot/package/python-wcwidth/python-wcwidth.mk +++ b/buildroot/package/python-wcwidth/python-wcwidth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.1.7 +PYTHON_WCWIDTH_VERSION = 0.1.9 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495 +PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT PYTHON_WCWIDTH_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch b/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch deleted file mode 100644 index d6321e559..000000000 --- a/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cf3c8e6ac8c428151dc191510554b4ee2705958d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 30 Oct 2019 10:08:35 +0100 -Subject: [PATCH] gluon/languages.py: import escape from html instead of cgi - -import escape from html and fallback on current import from cgi to fix -the following build failure with python 3.8: - -/home/buildroot/autobuild/run/instance-2/output-1/host/bin/python -c 'import os; os.chdir("/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2"); from gluon.main import save_password; save_password("web2py",8000)' -Traceback (most recent call last): - File "", line 1, in - File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/__init__.py", line 34, in - from .globals import current - File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/globals.py", line 24, in - from gluon.serializers import json, custom_json - File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/serializers.py", line 10, in - from gluon.languages import lazyT - File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/languages.py", line 19, in - from cgi import escape -ImportError: cannot import name 'escape' from 'cgi' (/home/buildroot/autobuild/run/instance-2/output-1/host/lib/python3.8/cgi.py) - -Fixes: - - http://autobuild.buildroot.org/results/fa515627ae888d08fc10074e8d9f6e9dbede91a7 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/web2py/web2py/pull/2272] ---- - gluon/languages.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gluon/languages.py b/gluon/languages.py -index 9ed60f9c..554d7339 100644 ---- a/gluon/languages.py -+++ b/gluon/languages.py -@@ -16,7 +16,10 @@ import re - import sys - import pkgutil - import logging --from cgi import escape -+try: -+ from html import escape -+except ImportError: -+ from cgi import escape - from threading import RLock - - from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin --- -2.23.0 - diff --git a/buildroot/package/python-web2py/Config.in b/buildroot/package/python-web2py/Config.in index bc2e6054e..a0452060b 100644 --- a/buildroot/package/python-web2py/Config.in +++ b/buildroot/package/python-web2py/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_PYTHON_WEB2PY bool "python-web2py" - select BR2_PACKAGE_PYTHON_PYDAL + select BR2_PACKAGE_PYTHON_PYDAL # runtime select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_YATL # runtime help web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable diff --git a/buildroot/package/python-web2py/python-web2py.hash b/buildroot/package/python-web2py/python-web2py.hash index 57ac02c2a..4ff85668a 100644 --- a/buildroot/package/python-web2py/python-web2py.hash +++ b/buildroot/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863 python-web2py-2.17.2.tar.gz +sha256 e3f05266b4b97650b76bfb85028df5e2194955674c9b98cfc065c72ed5791690 python-web2py-2.20.4.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/buildroot/package/python-web2py/python-web2py.mk b/buildroot/package/python-web2py/python-web2py.mk index 8706c8796..07251ba53 100644 --- a/buildroot/package/python-web2py/python-web2py.mk +++ b/buildroot/package/python-web2py/python-web2py.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.17.2 -PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,R-$(PYTHON_WEB2PY_VERSION)) +PYTHON_WEB2PY_VERSION = 2.20.4 +PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ - python-pydal host-python-pydal + host-python-pydal host-python-yatl PYTHON_WEB2PY_EXCLUSIONS = \ welcome.w2p \ diff --git a/buildroot/package/python-webob/python-webob.hash b/buildroot/package/python-webob/python-webob.hash index af3c7a085..aab2f1d9e 100644 --- a/buildroot/package/python-webob/python-webob.hash +++ b/buildroot/package/python-webob/python-webob.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webob/json -md5 1761f416e8cf53f6fb674149cc223bd1 WebOb-1.8.5.tar.gz -sha256 05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086 WebOb-1.8.5.tar.gz +md5 dc3cc8c317d4acd03a6fd97cb0a9121a WebOb-1.8.6.tar.gz +sha256 aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108 WebOb-1.8.6.tar.gz # Locally computed sha256 checksums -sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt +sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/buildroot/package/python-webob/python-webob.mk b/buildroot/package/python-webob/python-webob.mk index fd9b2d1b3..051c11753 100644 --- a/buildroot/package/python-webob/python-webob.mk +++ b/buildroot/package/python-webob/python-webob.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBOB_VERSION = 1.8.5 +PYTHON_WEBOB_VERSION = 1.8.6 PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz -PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532 +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/2a/32/5f3f43d0784bdd9392db0cb98434d7cd23a0d8a420c4d243ad4cb8517f2a PYTHON_WEBOB_SETUP_TYPE = setuptools PYTHON_WEBOB_LICENSE = MIT PYTHON_WEBOB_LICENSE_FILES = docs/license.txt diff --git a/buildroot/package/python-werkzeug/python-werkzeug.hash b/buildroot/package/python-werkzeug/python-werkzeug.hash index cc90fe140..1d6de8a0c 100644 --- a/buildroot/package/python-werkzeug/python-werkzeug.hash +++ b/buildroot/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/werkzeug/json -md5 5b23b4953efc4f52b1d0b33af6f7cd2d Werkzeug-0.16.0.tar.gz -sha256 7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7 Werkzeug-0.16.0.tar.gz +md5 5d499cfdd30de5d9c946994783772efd Werkzeug-1.0.1.tar.gz +sha256 6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c Werkzeug-1.0.1.tar.gz # Locally computed sha256 checksums -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/buildroot/package/python-werkzeug/python-werkzeug.mk b/buildroot/package/python-werkzeug/python-werkzeug.mk index fea25f8ee..1013f8af8 100644 --- a/buildroot/package/python-werkzeug/python-werkzeug.mk +++ b/buildroot/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 0.16.0 +PYTHON_WERKZEUG_VERSION = 1.0.1 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/5e/fd/eb19e4f6a806cd6ee34900a687f181001c7a0059ff914752091aba84681f +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/27/a33329150147594eff0ea4c33c2036c0eadd933141055be0ff911f7f8d04 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst diff --git a/buildroot/package/python-wtforms/Config.in b/buildroot/package/python-wtforms/Config.in index 96ed96da0..33a17d3d3 100644 --- a/buildroot/package/python-wtforms/Config.in +++ b/buildroot/package/python-wtforms/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WTFORMS bool "python-wtforms" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help A flexible forms validation and rendering library for Python web development. diff --git a/buildroot/package/python-wtforms/python-wtforms.hash b/buildroot/package/python-wtforms/python-wtforms.hash index 34beb0801..ed9bfd1a2 100644 --- a/buildroot/package/python-wtforms/python-wtforms.hash +++ b/buildroot/package/python-wtforms/python-wtforms.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/wtforms/json -md5 41c0008dbe7bd98892c58f7457a46a4a WTForms-2.2.1.tar.gz -sha256 0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61 WTForms-2.2.1.tar.gz +md5 2b6ea167a71c6becf20f0934417fd06c WTForms-2.3.3.tar.gz +sha256 81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c WTForms-2.3.3.tar.gz # Locally computed sha256 checksums -sha256 64cba207423f4478e3262c2e54209f8cd2057d687e200a50e0203db5659947a5 LICENSE.rst +sha256 cf40d60ff34f6b2b68a53d220f8b66567b5ac8dd1119b37b62fd15e9518fe59b LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/buildroot/package/python-wtforms/python-wtforms.mk b/buildroot/package/python-wtforms/python-wtforms.mk index 2715320d2..23280a6fe 100644 --- a/buildroot/package/python-wtforms/python-wtforms.mk +++ b/buildroot/package/python-wtforms/python-wtforms.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WTFORMS_VERSION = 2.2.1 +PYTHON_WTFORMS_VERSION = 2.3.3 PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz -PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/cd/1d/7221354ebfc32b868740d02e44225c2ce00769b0d3dc370e463e2bc4b446 +PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555 PYTHON_WTFORMS_SETUP_TYPE = setuptools PYTHON_WTFORMS_LICENSE = BSD-3-Clause -PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst +PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) diff --git a/buildroot/package/python-xlib/python-xlib.hash b/buildroot/package/python-xlib/python-xlib.hash index e51461fc2..c6a446b6b 100644 --- a/buildroot/package/python-xlib/python-xlib.hash +++ b/buildroot/package/python-xlib/python-xlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-xlib/json -md5 ded820dc8e943106bd660801ed7a82f7 python-xlib-0.25.tar.bz2 -sha256 204f280b549352af6cbdaff43405186822ae05749518dd9be209bd88a0088f99 python-xlib-0.25.tar.bz2 +md5 3a87f81bff4cb4f8a52881097ba51a49 python-xlib-0.27.tar.bz2 +sha256 a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348 python-xlib-0.27.tar.bz2 # Locally computed sha256 checksums sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/buildroot/package/python-xlib/python-xlib.mk b/buildroot/package/python-xlib/python-xlib.mk index 3ffc4e2ee..ae8ca1653 100644 --- a/buildroot/package/python-xlib/python-xlib.mk +++ b/buildroot/package/python-xlib/python-xlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.25 +PYTHON_XLIB_VERSION = 0.27 PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/3c/d9/51fc07ae57f6a44e62e2ee04bd501d763ac169ff05c838403ec7ae556992 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/e8/fa/a61ef33df117de4c57d11b4ba0b624f5352f21aa2e1eda404860155e8855 PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-xmodem/Config.in b/buildroot/package/python-xmodem/Config.in new file mode 100644 index 000000000..ef927f133 --- /dev/null +++ b/buildroot/package/python-xmodem/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_XMODEM + bool "python-xmodem" + help + XMODEM protocol implementation. + + https://github.com/tehmaze/xmodem diff --git a/buildroot/package/python-xmodem/python-xmodem.hash b/buildroot/package/python-xmodem/python-xmodem.hash new file mode 100644 index 000000000..33ddfeb59 --- /dev/null +++ b/buildroot/package/python-xmodem/python-xmodem.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/xmodem/json +md5 f876cb35caf276b61990377710a3b4c4 xmodem-0.4.6.tar.gz +sha256 089737298f5738eabc43f2519efdc80b402693768f16383f7013b9e6f8f279d7 xmodem-0.4.6.tar.gz +# locally calculated +sha256 5ddb38acab95bb77e1e92e22830e358082d879d2dd59ba05577c47791edaa78e PKG-INFO diff --git a/buildroot/package/python-xmodem/python-xmodem.mk b/buildroot/package/python-xmodem/python-xmodem.mk new file mode 100644 index 000000000..739c6154d --- /dev/null +++ b/buildroot/package/python-xmodem/python-xmodem.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-xmodem +# +################################################################################ + +PYTHON_XMODEM_VERSION = 0.4.6 +PYTHON_XMODEM_SOURCE = xmodem-$(PYTHON_XMODEM_VERSION).tar.gz +PYTHON_XMODEM_SITE = https://files.pythonhosted.org/packages/29/5d/a20d7957f207fc4c4c143881ca7b9617ab7700c153012372ef0a934c7710 +PYTHON_XMODEM_SETUP_TYPE = setuptools +PYTHON_XMODEM_LICENSE = MIT +PYTHON_XMODEM_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) diff --git a/buildroot/package/python-yarl/python-yarl.hash b/buildroot/package/python-yarl/python-yarl.hash index b3910e9af..95ee7ef88 100644 --- a/buildroot/package/python-yarl/python-yarl.hash +++ b/buildroot/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 08ba0d6e18f460b44d9e5459f3d217ba yarl-1.4.2.tar.gz -sha256 58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b yarl-1.4.2.tar.gz +md5 a9b20bf0b8a6962e1101b28908a67bf8 yarl-1.5.1.tar.gz +sha256 c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6 yarl-1.5.1.tar.gz # Locally computed sha256 checksums -sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE +sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE diff --git a/buildroot/package/python-yarl/python-yarl.mk b/buildroot/package/python-yarl/python-yarl.mk index 1f9b95a9c..0b92e6281 100644 --- a/buildroot/package/python-yarl/python-yarl.mk +++ b/buildroot/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.4.2 +PYTHON_YARL_VERSION = 1.5.1 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/67/6e2507586eb1cfa6d55540845b0cd05b4b77c414f6bca8b00b45483b976e +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/ac/dd/59768bb3fa08e8b23e91575bca3ff8d2edbfbceebec8c59eaa24c4215791 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-yatl/Config.in b/buildroot/package/python-yatl/Config.in new file mode 100644 index 000000000..88a79512f --- /dev/null +++ b/buildroot/package/python-yatl/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_YATL + bool "python-yatl" + help + Yet Another Template Language. + + https://github.com/web2py/yatl diff --git a/buildroot/package/python-yatl/python-yatl.hash b/buildroot/package/python-yatl/python-yatl.hash new file mode 100644 index 000000000..9238e71b2 --- /dev/null +++ b/buildroot/package/python-yatl/python-yatl.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/yatl/json +md5 930be78b3d6e33f3f920619d673c345a yatl-20200430.1.tar.gz +sha256 5220390b27f010046642c00aded9ffc694e383a3d7a47985c8809d8482c8478a yatl-20200430.1.tar.gz diff --git a/buildroot/package/python-yatl/python-yatl.mk b/buildroot/package/python-yatl/python-yatl.mk new file mode 100644 index 000000000..fca39bb5e --- /dev/null +++ b/buildroot/package/python-yatl/python-yatl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-yatl +# +################################################################################ + +PYTHON_YATL_VERSION = 20200430.1 +PYTHON_YATL_SOURCE = yatl-$(PYTHON_YATL_VERSION).tar.gz +PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/7f/bd/aa36c1a1d876757e3fa365e6c455097ebd3f2e8e7ded23e75901ff9c9ecf +PYTHON_YATL_SETUP_TYPE = setuptools +PYTHON_YATL_LICENSE = BSD-3-Clause + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot/package/python/Config.in b/buildroot/package/python/Config.in index a7f16450e..bded00c9e 100644 --- a/buildroot/package/python/Config.in +++ b/buildroot/package/python/Config.in @@ -39,6 +39,11 @@ menu "core python modules" comment "The following modules are unusual or require extra libraries" +config BR2_PACKAGE_PYTHON_2TO3 + bool "2to3 module" + help + code translation from python 2 to 3 + config BR2_PACKAGE_PYTHON_BZIP2 bool "bzip2 module" select BR2_PACKAGE_BZIP2 diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk index e8cad54f9..10718f435 100644 --- a/buildroot/package/python/python.mk +++ b/buildroot/package/python/python.mk @@ -118,6 +118,12 @@ HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4 PYTHON_CONF_OPTS += --enable-unicode=ucs4 endif +ifeq ($(BR2_PACKAGE_PYTHON_2TO3),y) +PYTHON_CONF_OPTS += --enable-lib2to3 +else +PYTHON_CONF_OPTS += --disable-lib2to3 +endif + ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y) PYTHON_DEPENDENCIES += bzip2 else @@ -165,7 +171,6 @@ PYTHON_CONF_OPTS += \ --with-system-ffi \ --disable-pydoc \ --disable-test-modules \ - --disable-lib2to3 \ --disable-gdbm \ --disable-tk \ --disable-nis \ @@ -258,6 +263,7 @@ define PYTHON_CREATE_PYC_FILES PYTHONPATH="$(PYTHON_PATH)" \ $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \ $(TOPDIR)/support/scripts/pycompile.py \ + $(if $(VERBOSE),--verbose) \ --strip-root $(TARGET_DIR) \ $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) endef diff --git a/buildroot/package/python3-cheetah/python3-cheetah.hash b/buildroot/package/python3-cheetah/python3-cheetah.hash new file mode 120000 index 000000000..c29a76ea8 --- /dev/null +++ b/buildroot/package/python3-cheetah/python3-cheetah.hash @@ -0,0 +1 @@ +../python-cheetah/python-cheetah.hash \ No newline at end of file diff --git a/buildroot/package/python3-cheetah/python3-cheetah.mk b/buildroot/package/python3-cheetah/python3-cheetah.mk new file mode 100644 index 000000000..8876f8d73 --- /dev/null +++ b/buildroot/package/python3-cheetah/python3-cheetah.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python3-cheetah +# +################################################################################ + +# Please keep in sync with +# package/python-cheetah/python-cheetah.mk +PYTHON3_CHEETAH_VERSION = 3.2.4 +PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz +PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/4e/72/e6a7d92279e3551db1b68fd336fd7a6e3d2f2ec742bf486486e6150d77d2 +PYTHON3_CHEETAH_LICENSE = MIT +PYTHON3_CHEETAH_LICENSE_FILES = LICENSE +PYTHON3_CHEETAH_SETUP_TYPE = setuptools +HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah +HOST_PYTHON3_CHEETAH_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-cython/python3-cython.hash b/buildroot/package/python3-cython/python3-cython.hash new file mode 120000 index 000000000..70dde6410 --- /dev/null +++ b/buildroot/package/python3-cython/python3-cython.hash @@ -0,0 +1 @@ +../python-cython/python-cython.hash \ No newline at end of file diff --git a/buildroot/package/python3-cython/python3-cython.mk b/buildroot/package/python3-cython/python3-cython.mk new file mode 100644 index 000000000..6e3bd1422 --- /dev/null +++ b/buildroot/package/python3-cython/python3-cython.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python3-cython +# +################################################################################ + +# Please keep in sync with package/python-cython/python-cython.mk +PYTHON3_CYTHON_VERSION = 0.29.21 +PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/6c/9f/f501ba9d178aeb1f5bf7da1ad5619b207c90ac235d9859961c11829d0160 +PYTHON3_CYTHON_SETUP_TYPE = setuptools +PYTHON3_CYTHON_LICENSE = Apache-2.0 +PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt +HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-decorator/python3-decorator.hash b/buildroot/package/python3-decorator/python3-decorator.hash new file mode 120000 index 000000000..f515d3133 --- /dev/null +++ b/buildroot/package/python3-decorator/python3-decorator.hash @@ -0,0 +1 @@ +../python-decorator/python-decorator.hash \ No newline at end of file diff --git a/buildroot/package/python3-decorator/python3-decorator.mk b/buildroot/package/python3-decorator/python3-decorator.mk new file mode 100644 index 000000000..c14f10fbf --- /dev/null +++ b/buildroot/package/python3-decorator/python3-decorator.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python3-decorator +# +################################################################################ + +# Please keep in sync with package/python-decorator/python-decorator.mk +PYTHON3_DECORATOR_VERSION = 4.4.1 +PYTHON3_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d +PYTHON3_DECORATOR_SOURCE = decorator-$(PYTHON3_DECORATOR_VERSION).tar.gz +PYTHON3_DECORATOR_LICENSE = BSD-2-Clause +PYTHON3_DECORATOR_LICENSE_FILES = LICENSE.txt +PYTHON3_DECORATOR_SETUP_TYPE = setuptools +HOST_PYTHON3_DECORATOR_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-mako/python3-mako.mk b/buildroot/package/python3-mako/python3-mako.mk index 31df4194e..0296c68fc 100644 --- a/buildroot/package/python3-mako/python3-mako.mk +++ b/buildroot/package/python3-mako/python3-mako.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-mako/python-mako.mk -PYTHON3_MAKO_VERSION = 1.1.0 -PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b +PYTHON3_MAKO_VERSION = 1.1.2 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON3_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/42/64/fc7c506d14d8b6ed363e7798ffec2dfe4ba21e14dda4cfab99f4430cba3a PYTHON3_MAKO_SETUP_TYPE = setuptools PYTHON3_MAKO_LICENSE = MIT PYTHON3_MAKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python3-psutil/python3-psutil.hash b/buildroot/package/python3-psutil/python3-psutil.hash new file mode 120000 index 000000000..ff688fab2 --- /dev/null +++ b/buildroot/package/python3-psutil/python3-psutil.hash @@ -0,0 +1 @@ +../python-psutil/python-psutil.hash \ No newline at end of file diff --git a/buildroot/package/python3-psutil/python3-psutil.mk b/buildroot/package/python3-psutil/python3-psutil.mk new file mode 100644 index 000000000..febf0d3ed --- /dev/null +++ b/buildroot/package/python3-psutil/python3-psutil.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python3-psutil +# +################################################################################ + +# Please keep in sync with package/python-psutil/python-psutil.mk +PYTHON3_PSUTIL_VERSION = 5.7.2 +PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz +PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1 +PYTHON3_PSUTIL_SETUP_TYPE = setuptools +PYTHON3_PSUTIL_LICENSE = BSD-3-Clause +PYTHON3_PSUTIL_LICENSE_FILES = LICENSE +HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil +HOST_PYTHON3_PSUTIL_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.hash b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.hash new file mode 120000 index 000000000..0c6761d8a --- /dev/null +++ b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.hash @@ -0,0 +1 @@ +../python-pycryptodomex/python-pycryptodomex.hash \ No newline at end of file diff --git a/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk new file mode 100644 index 000000000..92ac248d5 --- /dev/null +++ b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python3-pycryptodomex +# +################################################################################ + +# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk +PYTHON3_PYCRYPTODOMEX_VERSION = 3.9.8 +PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f5/79/9d9206688385d1e7a5ff925e7aab1d685636256e34a409037aa7adbbe611 +PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools +PYTHON3_PYCRYPTODOMEX_LICENSE = \ + BSD-2-Clause, \ + Public Domain (pycrypto original code), \ + OCB patent license (OCB mode) +PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex +HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-pyelftools/python3-pyelftools.hash b/buildroot/package/python3-pyelftools/python3-pyelftools.hash new file mode 120000 index 000000000..e8eebeda9 --- /dev/null +++ b/buildroot/package/python3-pyelftools/python3-pyelftools.hash @@ -0,0 +1 @@ +../python-pyelftools/python-pyelftools.hash \ No newline at end of file diff --git a/buildroot/package/python3-pyelftools/python3-pyelftools.mk b/buildroot/package/python3-pyelftools/python3-pyelftools.mk new file mode 100644 index 000000000..be49ca2bc --- /dev/null +++ b/buildroot/package/python3-pyelftools/python3-pyelftools.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python3-pyelftools +# +################################################################################ + +# Please keep in sync with package/python-pyelftools/python-pyelftools.mk +PYTHON3_PYELFTOOLS_VERSION = 0.25 +PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz +PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/fa/9a/0674cb1725196568bdbca98304f2efb17368b57af1a4bb3fc772c026f474 +PYTHON3_PYELFTOOLS_LICENSE = Public domain +PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE +PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools +HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools +HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-pyyaml/python3-pyyaml.hash b/buildroot/package/python3-pyyaml/python3-pyyaml.hash new file mode 120000 index 000000000..afa4932ec --- /dev/null +++ b/buildroot/package/python3-pyyaml/python3-pyyaml.hash @@ -0,0 +1 @@ +../python-pyyaml/python-pyyaml.hash \ No newline at end of file diff --git a/buildroot/package/python3-pyyaml/python3-pyyaml.mk b/buildroot/package/python3-pyyaml/python3-pyyaml.mk new file mode 100644 index 000000000..c0dcebf4f --- /dev/null +++ b/buildroot/package/python3-pyyaml/python3-pyyaml.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python3-pyyaml +# +################################################################################ + +# Please keep in sync with package/python-pyyaml/python-pyyaml.mk +PYTHON3_PYYAML_VERSION = 5.3.1 +PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz +PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c +PYTHON3_PYYAML_SETUP_TYPE = distutils +PYTHON3_PYYAML_LICENSE = MIT +PYTHON3_PYYAML_LICENSE_FILES = LICENSE +HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml +HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-regex/python3-regex.hash b/buildroot/package/python3-regex/python3-regex.hash new file mode 120000 index 000000000..274f4dc27 --- /dev/null +++ b/buildroot/package/python3-regex/python3-regex.hash @@ -0,0 +1 @@ +../python-regex/python-regex.hash \ No newline at end of file diff --git a/buildroot/package/python3-regex/python3-regex.mk b/buildroot/package/python3-regex/python3-regex.mk new file mode 100644 index 000000000..f75fb76ac --- /dev/null +++ b/buildroot/package/python3-regex/python3-regex.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python3-regex +# +################################################################################ + +# Please keep in sync with package/python-regex/python-regex.mk +PYTHON3_REGEX_VERSION = 2020.2.20 +PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz +PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/e8/76/8ac7f467617b9cfbafcef3c76df6f22b15de654a62bea719792b00a83195 +PYTHON3_REGEX_SETUP_TYPE = setuptools +PYTHON3_REGEX_LICENSE = CNRI-Python +HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex +HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-requests/python3-requests.hash b/buildroot/package/python3-requests/python3-requests.hash new file mode 120000 index 000000000..19e182d4a --- /dev/null +++ b/buildroot/package/python3-requests/python3-requests.hash @@ -0,0 +1 @@ +../python-requests/python-requests.hash \ No newline at end of file diff --git a/buildroot/package/python3-requests/python3-requests.mk b/buildroot/package/python3-requests/python3-requests.mk new file mode 100644 index 000000000..cd6a7e126 --- /dev/null +++ b/buildroot/package/python3-requests/python3-requests.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python3-requests +# +################################################################################ + +# Please keep in sync with package/python-requests/python-requests.mk +PYTHON3_REQUESTS_VERSION = 2.24.0 +PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz +PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 +PYTHON3_REQUESTS_SETUP_TYPE = setuptools +PYTHON3_REQUESTS_LICENSE = Apache-2.0 +PYTHON3_REQUESTS_LICENSE_FILES = LICENSE +HOST_PYTHON3_REQUESTS_DL_SUBDIR = python-requests +HOST_PYTHON3_REQUESTS_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-setuptools/python3-setuptools.mk b/buildroot/package/python3-setuptools/python3-setuptools.mk index 078cd9b07..3f4f1100f 100644 --- a/buildroot/package/python3-setuptools/python3-setuptools.mk +++ b/buildroot/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 41.4.0 +PYTHON3_SETUPTOOLS_VERSION = 44.0.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 1010d08d5..5eb296c6d 100644 --- a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001 +From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 502317aa0c..f9011c132a 100644 +index 77f91e72b1..0c809f3d8a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1528,6 +1528,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 502317aa0c..f9011c132a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1555,6 +1556,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 502317aa0c..f9011c132a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index a189d42c2c..4690cdba9f 100644 +index d60f05251a..1ee5a09588 100644 --- a/configure.ac +++ b/configure.ac -@@ -1091,6 +1091,12 @@ fi +@@ -1112,6 +1112,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index a189d42c2c..4690cdba9f 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index e9e5b32ca..c291d1446 100644 --- a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001 +From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4690cdba9f..ffeec102b7 100644 +index 1ee5a09588..c2445edc88 100644 --- a/configure.ac +++ b/configure.ac -@@ -4080,7 +4080,7 @@ fi +@@ -4175,7 +4175,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 4690cdba9f..ffeec102b7 100644 if test $ipv6 = yes then -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index c4620949b..b0dcce7d7 100644 --- a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001 +From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f9011c132a..e8a6bd5c03 100644 +index 0c809f3d8a..7c3dde8dd4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -205,6 +205,8 @@ FILEMODE= 644 +@@ -213,6 +213,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index f9011c132a..e8a6bd5c03 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -629,6 +631,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index f9011c132a..e8a6bd5c03 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1674,7 +1677,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index f9011c132a..e8a6bd5c03 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index ffeec102b7..7872b4dfee 100644 +index c2445edc88..73d66167de 100644 --- a/configure.ac +++ b/configure.ac -@@ -2958,6 +2958,8 @@ LIBS="$withval $LIBS" +@@ -3052,6 +3052,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,10 +88,10 @@ index ffeec102b7..7872b4dfee 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 20d7f35652..d3f2cc1b37 100644 +index 770866bca7..b6c829b3a5 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,10 @@ from distutils.spawn import find_executable +@@ -43,7 +43,10 @@ from distutils.spawn import find_executable TEST_EXTENSIONS = True # This global variable is used to hold the list of modules to be disabled. @@ -104,5 +104,5 @@ index 20d7f35652..d3f2cc1b37 100644 def get_platform(): -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 0ac511621..24f369f87 100644 --- a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001 +From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -21,7 +21,7 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 2d7cdf063f..cba150075c 100644 +index 1a9bd1200f..3cf7d6746e 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -234,7 +234,10 @@ class build_ext(Command): @@ -37,11 +37,11 @@ index 2d7cdf063f..cba150075c 100644 # building python standard extensions self.library_dirs.append('.') diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index b51629eb94..011a437bcd 100644 +index 37feae5df7..e9c3a27856 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError - from .util import get_platform, get_host_platform +@@ -17,10 +17,17 @@ import sys + from .errors import DistutilsPlatformError # These are needed in a couple of spots, so just compute them once. -PREFIX = os.path.normpath(sys.prefix) @@ -63,5 +63,5 @@ index b51629eb94..011a437bcd 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index 935e0c3b5..83c88ff39 100644 --- a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001 +From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index d3f2cc1b37..5d504d7638 100644 +index b6c829b3a5..ec3ba60607 100644 --- a/setup.py +++ b/setup.py -@@ -955,12 +955,9 @@ class PyBuildExt(build_ext): +@@ -1056,12 +1056,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index d3f2cc1b37..5d504d7638 100644 libraries=readline_libs)) else: -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch index ab1e295e7..f55238d0c 100644 --- a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001 +From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 5d504d7638..282a592dc6 100644 +index ec3ba60607..e27620035c 100644 --- a/setup.py +++ b/setup.py -@@ -654,10 +654,10 @@ class PyBuildExt(build_ext): +@@ -749,10 +749,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index 5d504d7638..282a592dc6 100644 def init_inc_lib_dirs(self): -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch index 1dcf8a017..0e96e7522 100644 --- a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch +++ b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001 +From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 282a592dc6..8fda3b4d47 100644 +index e27620035c..d3f0e663f2 100644 --- a/setup.py +++ b/setup.py -@@ -444,6 +444,7 @@ class PyBuildExt(build_ext): +@@ -539,6 +539,7 @@ class PyBuildExt(build_ext): print("Failed to build these modules:") print_three_column(failed) print() @@ -26,5 +26,5 @@ index 282a592dc6..8fda3b4d47 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0008-Serial-ioctl-workaround.patch b/buildroot/package/python3/0008-Serial-ioctl-workaround.patch index 9303e188c..df31cd622 100644 --- a/buildroot/package/python3/0008-Serial-ioctl-workaround.patch +++ b/buildroot/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001 +From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index aee7f12c57..ba2ff77d06 100644 +index 75e5e52320..eefbddfe69 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -29,5 +29,5 @@ index aee7f12c57..ba2ff77d06 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 32e3bdfea..8a77fe370 100644 --- a/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001 +From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a8ccba778..a1f9ab6cd 100644 --- a/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001 +From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 1a40b74d2..57f1bb5a2 100644 --- a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001 +From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -15,23 +15,25 @@ any system library (eg. libz, libssl, etc.) Signed-off-by: Samuel Cabrero Signed-off-by: Thomas Petazzoni +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 8fda3b4d47..bb7eb44213 100644 +index d3f0e663f2..926c16f58f 100644 --- a/setup.py +++ b/setup.py -@@ -600,7 +600,7 @@ class PyBuildExt(build_ext): +@@ -695,7 +695,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) +- ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) ++ ret = run_command('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) is_gcc = False is_clang = False in_incdirs = False -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index aacb6dca6..42dfa0d69 100644 --- a/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001 +From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,10 +25,10 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index b8ac482994..db034f605a 100644 +index 25a3f8c0e0..2cb9a9aa52 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -313,8 +313,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): a True value is the same as setting 'optimization' to the empty string while a False value is equivalent to setting 'optimization' to '1'. @@ -37,7 +37,7 @@ index b8ac482994..db034f605a 100644 """ if debug_override is not None: _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -326,10 +324,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): path = _os.fspath(path) head, tail = _path_split(path) base, sep, rest = tail.rpartition('.') @@ -49,7 +49,7 @@ index b8ac482994..db034f605a 100644 if optimization is None: if sys.flags.optimize == 0: optimization = '' -@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -366,46 +361,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): head.lstrip(path_separators), filename, ) @@ -101,5 +101,5 @@ index b8ac482994..db034f605a 100644 -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 675c2c1ab..b3380fd53 100644 --- a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001 +From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -10,16 +10,18 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- - Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++----------------- + Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++----------------- configure.ac | 5 +++++ - 2 files changed, 41 insertions(+), 18 deletions(-) + 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e8a6bd5c03..3abee36f49 100644 +index 7c3dde8dd4..204f293d53 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1317,8 +1317,28 @@ maninstall: altmaninstall +@@ -1385,8 +1385,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -43,16 +45,17 @@ index e8a6bd5c03..3abee36f49 100644 + multiprocessing multiprocessing/dummy \ + unittest \ + venv venv/scripts venv/scripts/common venv/scripts/posix \ -+ curses pydoc_data ++ curses pydoc_data \ ++ zoneinfo + +TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ + tkinter/test/test_ttk test \ test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ - test/test_importlib/zipdata01 \ +@@ -1446,28 +1467,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ + test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ - asyncio \ test/test_asyncio \ @@ -75,13 +78,15 @@ index e8a6bd5c03..3abee36f49 100644 + ctypes/test \ + idlelib/idle_test \ + distutils/tests \ + test/test_peg_generator \ + test/test_importlib test/test_importlib/builtin \ test/test_tools test/test_warnings test/test_warnings/data \ - turtledemo \ - multiprocessing multiprocessing/dummy \ - unittest unittest/test unittest/test/testmock \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data +- curses pydoc_data \ +- zoneinfo + unittest/test unittest/test/testmock + +ifeq (@TEST_MODULES@,yes) @@ -92,10 +97,10 @@ index e8a6bd5c03..3abee36f49 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 7872b4dfee..b820d18c7c 100644 +index 73d66167de..92e28d02ee 100644 --- a/configure.ac +++ b/configure.ac -@@ -3234,6 +3234,11 @@ if test "$posix_threads" = "yes"; then +@@ -3329,6 +3329,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -108,5 +113,5 @@ index 7872b4dfee..b820d18c7c 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch index a3436e31b..abb86ea07 100644 --- a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001 +From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3abee36f49..6fa0549a56 100644 +index 204f293d53..63e3df0470 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1289,7 +1289,9 @@ bininstall: altbininstall +@@ -1357,7 +1357,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,16 +30,16 @@ index 3abee36f49..6fa0549a56 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1403,7 +1405,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data -+ curses +- curses pydoc_data \ ++ curses \ + zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk test \ -@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1486,6 +1488,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 3abee36f49..6fa0549a56 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index b820d18c7c..f53cc86d89 100644 +index 92e28d02ee..174ed85a7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3234,6 +3234,12 @@ if test "$posix_threads" = "yes"; then +@@ -3329,6 +3329,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index b820d18c7c..f53cc86d89 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index bb7eb44213..748c269960 100644 +index 926c16f58f..1fc5fac90c 100644 --- a/setup.py +++ b/setup.py -@@ -2401,6 +2401,12 @@ def main(): +@@ -2586,6 +2586,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index bb7eb44213..748c269960 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2425,8 +2431,7 @@ def main(): +@@ -2610,8 +2616,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index bb7eb44213..748c269960 100644 # --install-platlib -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index 1bd1ae511..5cec11a00 100644 --- a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001 +From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6fa0549a56..3e1f130532 100644 +index 63e3df0470..8b7de12999 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes) +@@ -1361,7 +1361,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 6fa0549a56..3e1f130532 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1396,7 +1398,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 6fa0549a56..3e1f130532 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1473,9 +1474,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 6fa0549a56..3e1f130532 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1484,6 +1482,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 6fa0549a56..3e1f130532 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1584,10 +1590,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 6fa0549a56..3e1f130532 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index f53cc86d89..caa8eaf88a 100644 +index 174ed85a7c..f1f5e9a7b0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3246,6 +3246,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3341,6 +3341,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index f53cc86d89..caa8eaf88a 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 748c269960..1669797cad 100644 +index 1fc5fac90c..4063d7ffa5 100644 --- a/setup.py +++ b/setup.py -@@ -2402,10 +2402,11 @@ def main(): +@@ -2587,10 +2587,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 748c269960..1669797cad 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index 364d1b1ec..47ee112e2 100644 --- a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001 +From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3e1f130532..cf9add0bc7 100644 +index 8b7de12999..d826d8ac4b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1396,7 +1396,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 3e1f130532..cf9add0bc7 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1473,7 +1472,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 3e1f130532..cf9add0bc7 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1490,6 +1488,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 3e1f130532..cf9add0bc7 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index caa8eaf88a..79a8255f44 100644 +index f1f5e9a7b0..8b5c65974c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3234,6 +3234,15 @@ if test "$posix_threads" = "yes"; then +@@ -3329,6 +3329,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index caa8eaf88a..79a8255f44 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index eb0ad26da..132fd1738 100644 --- a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001 +From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index cf9add0bc7..5d78419fd4 100644 +index d826d8ac4b..dc84384680 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1322,7 +1322,7 @@ maninstall: altmaninstall +@@ -1390,7 +1390,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,9 +25,9 @@ index cf9add0bc7..5d78419fd4 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ - curses +@@ -1408,8 +1408,7 @@ LIBSUBDIRS= tkinter site-packages \ + curses \ + zoneinfo -TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk test \ @@ -35,7 +35,7 @@ index cf9add0bc7..5d78419fd4 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1480,6 +1479,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index cf9add0bc7..5d78419fd4 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 79a8255f44..b5922451cc 100644 +index 8b5c65974c..4c72dae960 100644 --- a/configure.ac +++ b/configure.ac -@@ -3243,6 +3243,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3338,6 +3338,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 79a8255f44..b5922451cc 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 0628669b9..d51267bbf 100644 --- a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001 +From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -8,25 +8,23 @@ Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov --- - Makefile.pre.in | 7 +++++-- + Makefile.pre.in | 5 ++++- configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5d78419fd4..660c292765 100644 +index dc84384680..2a82f3308f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \ - turtledemo \ +@@ -1405,7 +1405,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ -- venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses -+ venv venv/scripts venv/scripts/common venv/scripts/posix + venv venv/scripts venv/scripts/common venv/scripts/posix \ +- curses \ + zoneinfo TESTSUBDIRS= test \ - test/audiodata \ -@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1485,6 +1484,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -38,10 +36,10 @@ index 5d78419fd4..660c292765 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index b5922451cc..ea422a86a9 100644 +index 4c72dae960..acd98381a3 100644 --- a/configure.ac +++ b/configure.ac -@@ -3252,6 +3252,15 @@ if test "$TK" = "no"; then +@@ -3347,6 +3347,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -58,5 +56,5 @@ index b5922451cc..ea422a86a9 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch index e31f3e105..af6e1ebcc 100644 --- a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 +From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 660c292765..f49abf8395 100644 +index 2a82f3308f..e678c8817e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ +@@ -1399,7 +1399,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 660c292765..f49abf8395 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) +@@ -1488,6 +1488,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,16 +44,16 @@ index 660c292765..f49abf8395 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index ea422a86a9..3c1e2c088d 100644 +index acd98381a3..9ef0ecd42f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2961,13 +2961,21 @@ PKG_PROG_PKG_CONFIG +@@ -3055,13 +3055,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library -AC_MSG_CHECKING(for --with-system-expat) -AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), +- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), @@ -75,10 +75,10 @@ index ea422a86a9..3c1e2c088d 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 1669797cad..d2727c0da5 100644 +index 4063d7ffa5..211a160f29 100644 --- a/setup.py +++ b/setup.py -@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): +@@ -1681,7 +1681,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 1669797cad..d2727c0da5 100644 define_macros = [] extra_compile_args = [] -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index 1b18c5459..ede78c9b1 100644 --- a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001 +From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 3c1e2c088d..30a92f9c2e 100644 +index 9ef0ecd42f..18e6fd70a0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3251,6 +3251,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3346,6 +3346,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 3c1e2c088d..30a92f9c2e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch index 71645be9f..b2668c6eb 100644 --- a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001 +From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 30a92f9c2e..20f326db46 100644 +index 18e6fd70a0..46d2a8131e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3257,6 +3257,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3352,6 +3352,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 30a92f9c2e..20f326db46 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 3805e1aad..7a0157fd7 100644 --- a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001 +From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 20f326db46..99bbc37b07 100644 +index 46d2a8131e..5844e3b73f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3263,6 +3263,12 @@ AC_ARG_ENABLE(nis, +@@ -3358,6 +3358,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 20f326db46..99bbc37b07 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 3a138f966..0611e3a34 100644 --- a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001 +From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f49abf8395..bc777e6504 100644 +index e678c8817e..1148bd8708 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1287,7 +1287,9 @@ bininstall: altbininstall +@@ -1355,7 +1355,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index f49abf8395..bc777e6504 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \ +@@ -1398,7 +1400,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index f49abf8395..bc777e6504 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes) +@@ -1492,6 +1493,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index f49abf8395..bc777e6504 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 99bbc37b07..8c9706582e 100644 +index 5844e3b73f..7bd4623ccd 100644 --- a/configure.ac +++ b/configure.ac -@@ -3305,6 +3305,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3400,6 +3400,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 99bbc37b07..8c9706582e 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index d2727c0da5..9f09b3d985 100644 +index 211a160f29..c4ee989ba3 100644 --- a/setup.py +++ b/setup.py -@@ -2402,11 +2402,13 @@ def main(): +@@ -2587,11 +2587,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index d2727c0da5..9f09b3d985 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch index 5906f9d38..438b76b91 100644 --- a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001 +From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -11,22 +11,24 @@ the libmpdec builtin the Python sources, or no libmpdec at all. Signed-off-by: Thomas Petazzoni [aduskett@gmail.com: Update for python 3.7.0] Signed-off-by: Adam Duskett +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard --- configure.ac | 17 ++++++++++++----- setup.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 8c9706582e..e6255babb6 100644 +index 7bd4623ccd..e513ef6a20 100644 --- a/configure.ac +++ b/configure.ac -@@ -3012,13 +3012,20 @@ fi +@@ -3106,13 +3106,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library -AC_MSG_CHECKING(for --with-system-libmpdec) -AC_ARG_WITH(system_libmpdec, -- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]), +- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), +AC_MSG_CHECKING(for --with-libmpdec) +AC_ARG_WITH(libmpdec, + AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), @@ -47,10 +49,10 @@ index 8c9706582e..e6255babb6 100644 # Check whether _decimal should use a coroutine-local or thread-local context AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index 9f09b3d985..a7f2e23d87 100644 +index c4ee989ba3..3d0c74bb7f 100644 --- a/setup.py +++ b/setup.py -@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext): +@@ -2221,7 +2221,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -60,5 +62,5 @@ index 9f09b3d985..a7f2e23d87 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 55ba22a0e..8a792c1fa 100644 --- a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001 +From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e6255babb6..5809233aac 100644 +index e513ef6a20..c07505e89e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3042,6 +3042,12 @@ fi +@@ -3136,6 +3136,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -26,5 +26,5 @@ index e6255babb6..5809233aac 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 814ffdb56..d9e9d13f3 100644 --- a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001 +From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 5809233aac..6b09bafda4 100644 +index c07505e89e..612e32faf5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3282,6 +3282,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index 5809233aac..6b09bafda4 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 30651244f..2324ffdcf 100644 --- a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001 +From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 6b09bafda4..b64518eed5 100644 +index 612e32faf5..2a6aaeff60 100644 --- a/configure.ac +++ b/configure.ac -@@ -3288,6 +3288,12 @@ AC_ARG_ENABLE(openssl, +@@ -3383,6 +3383,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 6b09bafda4..b64518eed5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index 330b549c0..04d0ab31b 100644 --- a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001 +From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index b64518eed5..d07e371c57 100644 +index 2a6aaeff60..21479bbd7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3294,6 +3294,24 @@ AC_ARG_ENABLE(readline, +@@ -3389,6 +3389,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index b64518eed5..d07e371c57 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index f69b887c9..4478b4016 100644 --- a/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001 +From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch index d39befaf1..806801b2b 100644 --- a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch @@ -1,4 +1,4 @@ -From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001 +From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 20 Jul 2018 10:17:39 -0400 Subject: [PATCH] Fix cross compiling the uuid module @@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a7f2e23d87..b0274a3f67 100644 +index 3d0c74bb7f..c7be85f352 100644 --- a/setup.py +++ b/setup.py -@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext): +@@ -1779,7 +1779,8 @@ class PyBuildExt(build_ext): def detect_uuid(self): # Build the _uuid module if possible @@ -34,5 +34,5 @@ index a7f2e23d87..b0274a3f67 100644 if self.compiler.find_library_file(self.lib_dirs, 'uuid'): uuid_libs = ['uuid'] -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch index 6ea5f6859..6ea57d2cd 100644 --- a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001 +From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index d07e371c57..55ab6c3c26 100644 +index 21479bbd7d..615c16aced 100644 --- a/configure.ac +++ b/configure.ac -@@ -3330,6 +3330,15 @@ if test "$CURSES" = "no"; then +@@ -3425,6 +3425,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index d07e371c57..55ab6c3c26 100644 AC_ARG_ENABLE(pydoc, -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0032-fix-building-on-older-distributions.patch b/buildroot/package/python3/0032-fix-building-on-older-distributions.patch index 69998a36d..fb59e593f 100644 --- a/buildroot/package/python3/0032-fix-building-on-older-distributions.patch +++ b/buildroot/package/python3/0032-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001 +From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 2f5f7a8bf..304a595fc 100644 --- a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001 +From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -29,10 +29,10 @@ Signed-off-by: Peter Korsgaard 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 55ab6c3c26..4a6d0662ac 100644 +index 615c16aced..241298e6cf 100644 --- a/configure.ac +++ b/configure.ac -@@ -706,7 +706,9 @@ then +@@ -718,7 +718,9 @@ then fi @@ -44,5 +44,5 @@ index 55ab6c3c26..4a6d0662ac 100644 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.20.1 +2.25.1 diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash index 4c03293dd..3de1e8353 100644 --- a/buildroot/package/python3/python3.hash +++ b/buildroot/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-386/ -md5 69e73c49eeb1a853cefd26d18c9d069d Python-3.8.6.tar.xz +# From https://www.python.org/downloads/release/python-390/ +md5 6ebfe157f6e88d9eabfbaf3fa92129f6 Python-3.9.0.tar.xz # Locally computed -sha256 a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a Python-3.8.6.tar.xz +sha256 9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854 Python-3.9.0.tar.xz sha256 1dceef1677a39befa8bf0285ab2db441ba117520bb2de839547ace006a17750d LICENSE diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index 1a2edc647..d4e08e91d 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.8 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION_MAJOR = 3.9 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -280,6 +280,7 @@ define PYTHON3_CREATE_PYC_FILES PYTHONPATH="$(PYTHON3_PATH)" \ $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ $(TOPDIR)/support/scripts/pycompile.py \ + $(if $(VERBOSE),--verbose) \ --strip-root $(TARGET_DIR) \ $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) endef diff --git a/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index 157d28b11..548ec3e76 100644 --- a/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -1,4 +1,4 @@ -From d3f1e7e9ff9aae3f770b0bcb9aa3c2f787f76a1b Mon Sep 17 00:00:00 2001 +From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 May 2017 09:07:15 +0200 Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc @@ -14,14 +14,14 @@ uClibc. Signed-off-by: Thomas Petazzoni --- - user-exec.c | 2 +- + accel/tcg/user-exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 6db0758..2b3d116 100644 +index 4be78eb9b3..0a690bec55 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c -@@ -506,7 +506,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +@@ -508,7 +508,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; @@ -31,5 +31,5 @@ index 6db0758..2b3d116 100644 #else pc = uc->uc_mcontext.arm_pc; -- -2.7.4 +2.25.3 diff --git a/buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch deleted file mode 100644 index d1b9e3570..000000000 --- a/buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d82b8540ecaf3cb09a033e4971d8645d3343211e Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Wed, 16 Oct 2019 22:27:30 -0300 -Subject: [PATCH] util/cacheinfo: fix crash when compiling with uClibc - -uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE -but the corresponding sysconf calls returns -1, which is a valid result, -meaning that the limit is indeterminate. - -Handle this situation using the fallback values instead of crashing due -to an assertion failure. - -Signed-off-by: Carlos Santos ---- - util/cacheinfo.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/util/cacheinfo.c b/util/cacheinfo.c -index ea6f3e99bf..d94dc6adc8 100644 ---- a/util/cacheinfo.c -+++ b/util/cacheinfo.c -@@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize) - static void sys_cache_info(int *isize, int *dsize) - { - # ifdef _SC_LEVEL1_ICACHE_LINESIZE -- *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ if (tmp_isize > 0) { -+ *isize = tmp_isize; -+ } - # endif - # ifdef _SC_LEVEL1_DCACHE_LINESIZE -- *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ if (tmp_dsize > 0) { -+ *dsize = tmp_dsize; -+ } - # endif - } - #endif /* sys_cache_info */ --- -2.18.1 - diff --git a/buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch deleted file mode 100644 index 46652d829..000000000 --- a/buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 318f83f387678a3c0a2a729b506613011c6830b2 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Fri, 17 Jan 2020 14:09:30 +0000 -Subject: [PATCH] target/arm/arm-semi: fix SYS_OPEN to return nonzero - filehandle - -According to the specification "Semihosting for AArch32 and Aarch64", -the SYS_OPEN operation should return: - - - A nonzero handle if the call is successful - - -1 if the call is not successful - -So, it should never return 0. - -Prior to commit 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting -code hand out its own file descriptors"), the guest fd matched to the -host fd. It returned a nonzero handle on success since the fd 0 is -already used for stdin. - -Now that the guest fd is the index of guestfd_array, it starts from 0. - -I noticed this issue particularly because Trusted Firmware-A built with -PLAT=qemu is no longer working. Its io_semihosting driver only handles -a positive return value as a valid filehandle. - -Basically, there are two ways to fix this: - - - Use (guestfd - 1) as the index of guestfs_arrary. We need to insert - increment/decrement to convert the guestfd and the array index back - and forth. - - - Keep using guestfd as the index of guestfs_array. The first entry - of guestfs_array is left unused. - -I thought the latter is simpler. We end up with wasting a small piece -of memory for the unused first entry of guestfd_array, but this is -probably not a big deal. - -Fixes: 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting code hand out its own file descriptors") -Cc: qemu-stable@nongnu.org -Signed-off-by: Masahiro Yamada -Reviewed-by: Richard Henderson -Message-id: 20200109041228.10131-1-masahiroy@kernel.org -Signed-off-by: Peter Maydell - -(cherry picked from commit 21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db) -Signed-off-by: Adrien Grassein -Signed-off-by: Romain Naour ---- - target/arm/arm-semi.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c -index 6f7b6d801b..4275dfc345 100644 ---- a/target/arm/arm-semi.c -+++ b/target/arm/arm-semi.c -@@ -144,7 +144,8 @@ static int alloc_guestfd(void) - guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD)); - } - -- for (i = 0; i < guestfd_array->len; i++) { -+ /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */ -+ for (i = 1; i < guestfd_array->len; i++) { - GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i); - - if (gf->type == GuestFDUnused) { -@@ -168,7 +169,7 @@ static GuestFD *do_get_guestfd(int guestfd) - return NULL; - } - -- if (guestfd < 0 || guestfd >= guestfd_array->len) { -+ if (guestfd <= 0 || guestfd >= guestfd_array->len) { - return NULL; - } - --- -2.24.1 - diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host index 7ccf768d1..a7c0f7bf5 100644 --- a/buildroot/package/qemu/Config.in.host +++ b/buildroot/package/qemu/Config.in.host @@ -15,6 +15,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_riscv + default y if BR2_s390x default y if BR2_sh default y if BR2_sparc default y if BR2_sparc64 diff --git a/buildroot/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash index 322b4fdf1..317c0b1a4 100644 --- a/buildroot/package/qemu/qemu.hash +++ b/buildroot/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz +sha256 c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5 qemu-5.1.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk index 7fe64e360..69850ec93 100644 --- a/buildroot/package/qemu/qemu.mk +++ b/buildroot/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 4.2.0 +QEMU_VERSION = 5.1.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -98,6 +98,27 @@ else QEMU_OPTS += --disable-libusb endif +ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y) +QEMU_OPTS += \ + --enable-vnc \ + --disable-vnc-sasl +QEMU_DEPENDENCIES += libvncserver +ifeq ($(BR2_PACKAGE_LIBPNG),y) +QEMU_OPTS += --enable-vnc-png +QEMU_DEPENDENCIES += libpng +else +QEMU_OPTS += --disable-vnc-png +endif +ifeq ($(BR2_PACKAGE_JPEG),y) +QEMU_OPTS += --enable-vnc-jpeg +QEMU_DEPENDENCIES += jpeg +else +QEMU_OPTS += --disable-vnc-jpeg +endif +else +QEMU_OPTS += --disable-vnc +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) QEMU_OPTS += --enable-nettle QEMU_DEPENDENCIES += nettle @@ -112,6 +133,20 @@ else QEMU_OPTS += --disable-numa endif +ifeq ($(BR2_PACKAGE_SPICE),y) +QEMU_OPTS += --enable-spice +QEMU_DEPENDENCIES += spice +else +QEMU_OPTS += --disable-spice +endif + +ifeq ($(BR2_PACKAGE_USBREDIR),y) +QEMU_OPTS += --enable-usb-redir +QEMU_DEPENDENCIES += usbredir +else +QEMU_OPTS += --disable-usb-redir +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS @@ -131,21 +166,19 @@ define QEMU_CONFIGURE_CMDS --enable-attr \ --enable-vhost-net \ --disable-bsd-user \ + --disable-containers \ --disable-xen \ - --disable-vnc \ --disable-virtfs \ --disable-brlapi \ --disable-curses \ --disable-curl \ - --disable-bluez \ --disable-vde \ --disable-linux-aio \ + --disable-linux-io-uring \ --disable-cap-ng \ --disable-docs \ - --disable-spice \ --disable-rbd \ --disable-libiscsi \ - --disable-usb-redir \ --disable-strip \ --disable-sparse \ --disable-mpath \ @@ -264,11 +297,12 @@ HOST_QEMU_OPTS += --enable-vde HOST_QEMU_DEPENDENCIES += host-vde2 endif +# virtfs-proxy-helper is the only user of libcap-ng. ifeq ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y) -HOST_QEMU_OPTS += --enable-virtfs -HOST_QEMU_DEPENDENCIES += host-libcap +HOST_QEMU_OPTS += --enable-virtfs --enable-cap-ng +HOST_QEMU_DEPENDENCIES += host-libcap-ng else -HOST_QEMU_OPTS += --disable-virtfs +HOST_QEMU_OPTS += --disable-virtfs --disable-cap-ng endif ifeq ($(BR2_PACKAGE_HOST_QEMU_USB),y) @@ -293,8 +327,10 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --python=$(HOST_DIR)/bin/python3 \ --disable-bzip2 \ + --disable-containers \ --disable-curl \ --disable-libssh \ + --disable-linux-io-uring \ --disable-sdl \ --disable-vnc-jpeg \ --disable-vnc-png \ diff --git a/buildroot/package/qextserialport/qextserialport.mk b/buildroot/package/qextserialport/qextserialport.mk index ecaff21ef..419ea669c 100644 --- a/buildroot/package/qextserialport/qextserialport.mk +++ b/buildroot/package/qextserialport/qextserialport.mk @@ -14,26 +14,4 @@ ifeq ($(BR2_STATIC_LIBS),y) QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static endif -QEXTSERIALPORT_DEPENDENCIES = qt5base - -define QEXTSERIALPORT_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QEXTSERIALPORT_CONF_OPTS) -endef - -define QEXTSERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QEXTSERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),y) -QEXTSERIALPORT_INSTALL_TARGET = NO -else -define QEXTSERIALPORT_INSTALL_TARGET_CMDS - cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qlibc/qlibc.hash b/buildroot/package/qlibc/qlibc.hash index 616194f8d..6abb16b27 100644 --- a/buildroot/package/qlibc/qlibc.hash +++ b/buildroot/package/qlibc/qlibc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 93512e2203aaadda7aa62039b29500d9236b878e16f070328c58dc9d23da94d7 qlibc-2.4.4.tar.gz -sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE +sha256 e195c97453c260acea4421146ba992d9a4d89732eac345b3765c43cc3326d2ad qlibc-2.4.5.tar.gz +sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE diff --git a/buildroot/package/qlibc/qlibc.mk b/buildroot/package/qlibc/qlibc.mk index 1b234f7e4..6cce8201b 100644 --- a/buildroot/package/qlibc/qlibc.mk +++ b/buildroot/package/qlibc/qlibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QLIBC_VERSION = 2.4.4 +QLIBC_VERSION = 2.4.5 QLIBC_SITE = $(call github,wolkykim,qlibc,v$(QLIBC_VERSION)) QLIBC_LICENSE = BSD-2-Clause QLIBC_LICENSE_FILES = LICENSE diff --git a/buildroot/package/qprint/Config.in b/buildroot/package/qprint/Config.in new file mode 100644 index 000000000..edfb92a5f --- /dev/null +++ b/buildroot/package/qprint/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_QPRINT + bool "qprint" + help + qprint is a program that encodes and decodes binary data in + the Quoted-Printable encoding, defined as a part of the MIME + specification in RFC 1521. This encoding allows for efficient + transfer of mostly ASCII data over transports that are only + 7-bit clean, like SMTP without 8BITMIME or BINARYMIME + extensions. It also allows the transfer of long lines of text + by wrapping them every 76 characters. + + Usually, a sophisticated MUA will take care of automatically + choosing the best encodings for an e-mail. Nevertheless, this + utility may be useful when a MTA (e.g. msmtp) is used without + a MUA, or if using this encoding for other purposes is + desired. + + https://www.fourmilab.ch/webtools/qprint/ diff --git a/buildroot/package/qprint/qprint.hash b/buildroot/package/qprint/qprint.hash new file mode 100644 index 000000000..0412cf84c --- /dev/null +++ b/buildroot/package/qprint/qprint.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ffa9ca1d51c871fb3b56a4bf0165418348cf080f01ff7e59cd04511b9665019c qprint-1.1.tar.gz +sha256 3bd4089942977a357fed0d3c84b6ea877000c20c7c344c2feabf4b10db9f7495 COPYING diff --git a/buildroot/package/qprint/qprint.mk b/buildroot/package/qprint/qprint.mk new file mode 100644 index 000000000..e34fba54b --- /dev/null +++ b/buildroot/package/qprint/qprint.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qprint +# +################################################################################ + +QPRINT_VERSION = 1.1 +QPRINT_SITE = https://www.fourmilab.ch/webtools/qprint +QPRINT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-bin +QPRINT_LICENSE = Public Domain +QPRINT_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/buildroot/package/qt-webkit-kiosk/Config.in b/buildroot/package/qt-webkit-kiosk/Config.in index 46688a227..80f8e7c46 100644 --- a/buildroot/package/qt-webkit-kiosk/Config.in +++ b/buildroot/package/qt-webkit-kiosk/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK depends on BR2_PACKAGE_QT5 depends on !BR2_STATIC_LIBS # qt5webkit depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5webkit -> icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5webkit -> icu depends on !BR2_BINFMT_FLAT # qt5webkit -> icu depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit select BR2_PACKAGE_OPENSSL @@ -25,8 +26,9 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS endif -comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk index a714fca9c..cd1c21e28 100644 --- a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk +++ b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk @@ -11,13 +11,7 @@ QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0 QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html -define QT_WEBKIT_KIOSK_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QT_WEBKIT_KIOSK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QT_WEBKIT_KIOSK_CONF_OPTS = PREFIX=/usr define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \ @@ -29,4 +23,4 @@ define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound) endef -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/Config.in b/buildroot/package/qt5/Config.in index 367eb3a79..fc0e68e8b 100644 --- a/buildroot/package/qt5/Config.in +++ b/buildroot/package/qt5/Config.in @@ -11,19 +11,20 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 -comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library" +comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ # no built-in double-conversion support depends on !BR2_arc @@ -36,14 +37,8 @@ menuconfig BR2_PACKAGE_QT5 http://qt.io if BR2_PACKAGE_QT5 - -config BR2_PACKAGE_QT5_VERSION_LATEST - bool - default y - source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" -source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5charts/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" @@ -51,9 +46,12 @@ source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" +source "package/qt5/qt5quicktimeline/Config.in" +source "package/qt5/qt5remoteobjects/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" diff --git a/buildroot/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk index 28de0e5b7..0a961e612 100644 --- a/buildroot/package/qt5/qt5.mk +++ b/buildroot/package/qt5/qt5.mk @@ -4,12 +4,26 @@ # ################################################################################ -QT5_VERSION_MAJOR = 5.12 -QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_VERSION_MAJOR = 5.15 +QT5_VERSION = $(QT5_VERSION_MAJOR).1 QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +define QT5_INSTALL_QT_CONF + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT5_QT_CONF_FIXUP + $(QT5_INSTALL_QT_CONF) +endef +endif + # Variable for other Qt applications to use QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/buildroot/package/qt5/qt53d/Config.in b/buildroot/package/qt5/qt53d/Config.in index 78602a728..5126078d0 100644 --- a/buildroot/package/qt5/qt53d/Config.in +++ b/buildroot/package/qt5/qt53d/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT53D bool "qt53d" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK diff --git a/buildroot/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash index 5e7db55a5..0d66fa4db 100644 --- a/buildroot/package/qt5/qt53d/qt53d.hash +++ b/buildroot/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qt3d-everywhere-src-5.12.8.tar.xz.sha256 -sha256 066d360df173c024264c957546b8265ac14e44ef8007a181e1d723399f7c1257 qt3d-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qt3d-everywhere-src-5.15.1.tar.xz.sha256 +sha256 29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411 qt3d-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/buildroot/package/qt5/qt53d/qt53d.mk b/buildroot/package/qt5/qt53d/qt53d.mk index 7674b4455..f3eff9edf 100644 --- a/buildroot/package/qt5/qt53d/qt53d.mk +++ b/buildroot/package/qt5/qt53d/qt53d.mk @@ -7,7 +7,7 @@ QT53D_VERSION = $(QT5_VERSION) QT53D_SITE = $(QT5_SITE) QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz -QT53D_DEPENDENCIES = qt5base qt5declarative +QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) @@ -17,40 +17,4 @@ endif QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3 -define QT53D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT53D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT53D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT53D_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qt3d $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -# Available since 5.9 -define QT53D_INSTALL_TARGET_LATEST - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif -define QT53D_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml - $(QT53D_INSTALL_TARGET_LATEST) - $(QT53D_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to buildroot/package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch similarity index 59% rename from buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch rename to buildroot/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch index c91d81269..a772eb978 100644 --- a/buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch +++ b/buildroot/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch @@ -1,4 +1,4 @@ -From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001 +From a02b5e3bb41026ca6031d01942a093e9ce54edf3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Aug 2018 21:11:40 +0200 Subject: [PATCH] double-conversion: enable for microblaze @@ -6,24 +6,24 @@ Subject: [PATCH] double-conversion: enable for microblaze Signed-off-by: Peter Seiderer [Rebased for Qt5.12.0] Signed-off-by: Peter Seiderer +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer --- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 7622fe6162..d29de95094 100644 +index 70e697ca..2bb8e389 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -94,7 +94,8 @@ int main(int argc, char** argv) { - defined(_MIPS_ARCH_MIPS32R2) || \ +@@ -102,6 +102,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ -- defined(__or1k__) -+ defined(__or1k__) || \ -+ defined(__microblaze__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ ++ defined(__microblaze__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.19.2 +2.23.0 diff --git a/buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch b/buildroot/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch rename to buildroot/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch diff --git a/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch index 769a34da2..e2ead9bd2 100644 --- a/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch +++ b/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch @@ -1,27 +1,29 @@ -From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001 +From f423f160b984c47d831b10447af046bfbd6a3ba1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 10 Mar 2020 09:01:31 +0100 Subject: [PATCH] double-conversion: enable for xtensa [Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] Signed-off-by: Peter Seiderer +[Rebased for qtbase-everywhere-src-5.14.0] +Signed-off-by: Peter Seiderer --- .../double-conversion/include/double-conversion/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 55ca5bf5..95b08a4e 100644 +index 89ab1a31..001ce55f 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -96,7 +96,7 @@ int main(int argc, char** argv) { +@@ -103,7 +103,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ - defined(__or1k__) || \ -- defined(__microblaze__) -+ defined(__microblaze__) || defined(__XTENSA__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__microblaze__) || \ ++ defined(__microblaze__) || defined(__XTENSA__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.25.1 +2.26.0 diff --git a/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash b/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash deleted file mode 100644 index 70b90f09f..000000000 --- a/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash +++ /dev/null @@ -1,11 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtbase-everywhere-src-5.12.8.tar.xz.sha256 -sha256 19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8 qtbase-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/buildroot/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch b/buildroot/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch deleted file mode 100644 index f1f6d9b0b..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 -From: Julien Corjon -Date: Tue, 21 Jul 2015 09:58:14 +0200 -Subject: [PATCH] eglfs - fix rasp-pi header inclusion - -eglplateform.h include headers for low level instruction and fail on brcm -headers inclusion - For the brcm presence test we use egl pkg-config file - For the eglfs-plugin compilation we use the egl configuration - -Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 -Signed-off-by: Julien Corjon ---- - config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ - src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -index ce16a3a..192a8ad 100644 ---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -@@ -1,6 +1,8 @@ - SOURCES = eglfs-brcm.cpp - - CONFIG -= qt -+CONFIG += link_pkgconfig -+PKGCONFIG += egl - - INCLUDEPATH += $$QMAKE_INCDIR_EGL - -diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro -index 0f493fd..8479496 100644 ---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro -+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro -@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin - load(qt_plugin) - - QT += platformsupport-private eglfs_device_lib-private -+CONFIG += egl - - SOURCES += $$PWD/qeglfsmain.cpp - --- -2.1.0 - diff --git a/buildroot/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch deleted file mode 100644 index 0d0e0f922..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d69bd3fd52502c7eb2799397fea14afe350e2cbf Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu -Date: Mon, 27 Mar 2017 15:33:35 +0800 -Subject: [PATCH] qtbase: Fix build error when using EGL -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -A build error was occurring due to missing EGL configuration. - -Fixed by adding the necessary ties to the EGL pkg-config. - -Task-number: QTBUG-61712 -Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc -Upstream-Status: Pending -Signed-off-by: Gaël PORTAY ---- - mkspecs/features/egl.prf | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf -index 9fa0c9e219..85d5852ba6 100644 ---- a/mkspecs/features/egl.prf -+++ b/mkspecs/features/egl.prf -@@ -1,3 +1,9 @@ -+# egl headers need a definition -+PKG_CONFIG = $$pkgConfigExecutable() -+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) -+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) -+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS -+ - INCLUDEPATH += $$QMAKE_INCDIR_EGL - LIBS_PRIVATE += $$QMAKE_LIBS_EGL - QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL --- -2.16.1 - diff --git a/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch b/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch deleted file mode 100644 index c8fc426f7..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001 -From: James Grant -Date: Sun, 3 Mar 2019 17:29:29 +1300 -Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow - compilation. - -Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures. - -Signed-off-by: James Grant ---- - src/network/ssl/ssl.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri -index 29c47cd7..f0aad448 100644 ---- a/src/network/ssl/ssl.pri -+++ b/src/network/ssl/ssl.pri -@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp - LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE - } - -- QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -+ QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive - LIBS_PRIVATE += $$OPENSSL_LIBS - win32: LIBS_PRIVATE += -lcrypt32 - } --- -2.18.1 - diff --git a/buildroot/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch b/buildroot/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch deleted file mode 100644 index 0d166b848..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Arfrever Frehtes Taifersar Arahesis -Date: Mon, 23 Nov 2015 03:54:00 +0000 -Subject: [PATCH 1/1] When UChar is defined as char16_t in ICU, then qtbase fails to detect ICU. - -Build fails with following error: - -ICU auto-detection... () -x86_64-pc-linux-gnu-g++ -c -march=core2 -O2 -fno-ident \ - -frecord-gcc-switches -pipe -Wall -O2 -Wall -W -fPIC -I. \ - -I/var/tmp/portage/dev-qt/qtcore-5.5.1/work/qtbase-opensource-src-5.5.1/mkspecs/linux-g++ -o icu.o icu.cpp -In file included from /usr/include/unicode/utypes.h:36:0, - from icu.cpp:34: -/usr/include/unicode/umachine.h:306:13: error: 'char16_t' does not name a type - typedef char16_t UChar; - ^ -In file included from /usr/include/unicode/utypes.h:37:0, - from icu.cpp:34: -/usr/include/unicode/uversion.h:165:55: error: 'UChar' does not name a type - u_versionFromUString(UVersionInfo versionArray, const UChar *versionString); - ^ -... -Makefile:177: recipe for target 'icu.o' failed -gmake: *** [icu.o] Error 1 -ICU disabled. -The ICU library support cannot be enabled. - -This change isn't needed for new Qt versions, because c++11 is mandatory since 5.7. -Upstream desided not to merge this change into old branches, like 5.6. -Original patch was slightly modified to apply cleanly on Qt 5.6.3. - -Fetch from: https://bugreports.qt.io/secure/attachment/52478/qtbase-5.5.1-icu.patch -Signed-off-by: Arfrever Frehtes Taifersar Arahesis -Signed-off-by: Andrey Skvortsov - ---- -diff -purN qt5base-5.6.3.orig/config.tests/unix/compile.test qt5base-5.6.3/config.tests/unix/compile.test ---- qt5base-5.6.3.orig/config.tests/unix/compile.test 2019-08-11 00:35:33.181545706 +0300 -+++ qt5base-5.6.3/config.tests/unix/compile.test 2017-09-06 15:13:54.000000000 +0300 -@@ -47,7 +47,7 @@ while [ "$#" -gt 0 ]; do - INC=`echo $PARAM | sed -e 's/^-I//'` - INCLUDEPATH="$INCLUDEPATH \"$INC\"" - ;; -- -f*|-D*) -+ -f*|-D*|-std=*) - CFLAGS="$CFLAGS \"$PARAM\"" - CXXFLAGS="$CXXFLAGS \"$PARAM\"" - ;; -diff -purN qt5base-5.6.3.orig/configure qt5base-5.6.3/configure ---- qt5base-5.6.3.orig/configure 2019-08-11 00:57:45.488214036 +0300 -+++ qt5base-5.6.3/configure 2017-09-06 15:13:54.000000000 +0300 -@@ -5183,8 +5183,10 @@ fi - - # auto-detect libicu support - if [ "$CFG_ICU" != "no" ]; then -- if compileTest unix/icu "ICU"; then -+ QT_CXXFLAGS_ICU=`icu-config --cxxflags 2>/dev/null` -+ if compileTest unix/icu "ICU" $QT_CXXFLAGS_ICU; then - [ "$CFG_ICU" = "auto" ] && CFG_ICU=yes -+ QMakeVar set QT_CXXFLAGS_ICU "$QT_CXXFLAGS_ICU" - else - if [ "$CFG_ICU" = "auto" ]; then - CFG_ICU=no -diff -purN qt5base-5.6.3.orig/doc/Makefile qt5base-5.6.3/doc/Makefile -diff -purN qt5base-5.6.3.orig/src/corelib/tools/tools.pri qt5base-5.6.3/src/corelib/tools/tools.pri ---- qt5base-5.6.3.orig/src/corelib/tools/tools.pri 2019-08-11 00:45:45.073818635 +0300 -+++ qt5base-5.6.3/src/corelib/tools/tools.pri 2017-09-06 15:13:54.000000000 +0300 -@@ -169,6 +169,7 @@ contains(QT_CONFIG,icu) { - tools/qcollator_icu.cpp \ - tools/qtimezoneprivate_icu.cpp - DEFINES += QT_USE_ICU -+ QMAKE_CXXFLAGS += $$QT_CXXFLAGS_ICU - } else: win32 { - SOURCES += tools/qcollator_win.cpp - } else: macx { diff --git a/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch deleted file mode 100644 index 4acd42f00..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart -Date: Fri, 8 Nov 2019 11:30:40 +0100 -Subject: [PATCH] Do not load plugin from the $PWD - -I see no reason why this would make sense to look for plugins in the current -directory. And when there are plugins there, it may actually be wrong - -Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 -Reviewed-by: Thiago Macieira - -Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404 -Signed-off-by: Peter Seiderer ---- - src/corelib/plugin/qpluginloader.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index cadff4f32b..c2443dbdda 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) - paths.append(fileName.left(slash)); // don't include the '/' - } else { - paths = QCoreApplication::libraryPaths(); -- paths.prepend(QStringLiteral(".")); // search in current dir first - } - - for (const QString &path : qAsConst(paths)) { --- -2.25.0 - diff --git a/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash b/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash deleted file mode 100644 index 2dae2e8bf..000000000 --- a/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash +++ /dev/null @@ -1,10 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1d05f2662f0be7544c4cc238d0957d1ed5d0edc45210e9108f905df354241a0e header.BSD diff --git a/buildroot/package/qt5/qt5base/Config.in b/buildroot/package/qt5/qt5base/Config.in index 2b4ed1387..ce7230c72 100644 --- a/buildroot/package/qt5/qt5base/Config.in +++ b/buildroot/package/qt5/qt5base/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_QT5BASE bool "qt5base" select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE if BR2_PACKAGE_QT5_VERSION_5_6 - select BR2_PACKAGE_PCRE_16 if BR2_PACKAGE_QT5_VERSION_5_6 - select BR2_PACKAGE_PCRE_UTF if BR2_PACKAGE_QT5_VERSION_5_6 - select BR2_PACKAGE_PCRE2 if BR2_PACKAGE_QT5_VERSION_LATEST - select BR2_PACKAGE_PCRE2_16 if BR2_PACKAGE_QT5_VERSION_LATEST + select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_PCRE2_16 help Qt is a cross-platform application and UI framework for developers using C++. @@ -195,6 +192,7 @@ config BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_IMAGE select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_LIBXKBCOMMON @@ -276,21 +274,17 @@ config BR2_PACKAGE_QT5BASE_DBUS config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu select BR2_PACKAGE_ICU help This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. -comment "icu support needs a toolchain w/ gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9" depends on !BR2_BINFMT_FLAT - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -config BR2_PACKAGE_QT5BASE_OPENSSL - bool - # No OpenSSL 1.1.x support in Qt 5.6.x - default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL - default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 config BR2_PACKAGE_QT5BASE_TSLIB bool "Enable Tslib support" diff --git a/buildroot/package/qt5/qt5base/qt5base.hash b/buildroot/package/qt5/qt5base/qt5base.hash index 5316f03b1..91b9f1999 100644 --- a/buildroot/package/qt5/qt5base/qt5base.hash +++ b/buildroot/package/qt5/qt5base/qt5base.hash @@ -1,2 +1,11 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz.sha256 +sha256 33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c qtbase-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/buildroot/package/qt5/qt5base/qt5base.mk b/buildroot/package/qt5/qt5base/qt5base.mk index f8f50530b..ed308c1fa 100644 --- a/buildroot/package/qt5/qt5base/qt5base.mk +++ b/buildroot/package/qt5/qt5base/qt5base.mk @@ -8,7 +8,7 @@ QT5BASE_VERSION = $(QT5_VERSION) QT5BASE_SITE = $(QT5_SITE) QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz -QT5BASE_DEPENDENCIES = host-pkgconf zlib +QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES # A few comments: @@ -18,21 +18,22 @@ QT5BASE_INSTALL_STAGING = YES # want to use the Buildroot packaged zlib # * -system-pcre because pcre is mandatory to build Qt, and we # want to use the one packaged in Buildroot +# * -no-feature-relocatable to work around path mismatch +# while searching qml files and buildroot BR2_ROOTFS_MERGED_USR +# feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ -no-pch \ - -shared + -shared \ + -no-feature-relocatable # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we # want. -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_CONFIGURE_OPTS += -no-optimize-debug -endif QT5BASE_CFLAGS = $(TARGET_CFLAGS) QT5BASE_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -42,12 +43,6 @@ QT5BASE_CFLAGS += -O0 QT5BASE_CXXFLAGS += -O0 endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5BASE_DEPENDENCIES += pcre -else -QT5BASE_DEPENDENCIES += pcre2 -endif - ifeq ($(BR2_X86_CPU_HAS_SSE2),) QT5BASE_CONFIGURE_OPTS += -no-sse2 else ifeq ($(BR2_X86_CPU_HAS_SSE3),) @@ -64,7 +59,7 @@ else ifeq ($(BR2_X86_CPU_HAS_AVX2),) QT5BASE_CONFIGURE_OPTS += -no-avx2 else # no buildroot BR2_X86_CPU_HAS_AVX512 option yet for qt configure -# option '-no-avx512' (available for latest only) +# option '-no-avx512' endif ifeq ($(BR2_PACKAGE_LIBDRM),y) @@ -84,7 +79,7 @@ QT5BASE_DEPENDENCIES += gcnano-binaries else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += ti-sgx-libgbm -else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) +else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += imx-gpu-viv else @@ -97,18 +92,9 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5BASE_CONFIGURE_OPTS += -largefile -endif - QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5BASE_LICENSE += , BSD-3-Clause (examples) QT5BASE_LICENSE_FILES += header.BSD @@ -124,6 +110,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) @@ -148,7 +141,6 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y) QT5BASE_CONFIGURE_OPTS += -gui -system-freetype -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2) QT5BASE_DEPENDENCIES += freetype else QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype @@ -178,17 +170,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11 -else QT5BASE_CONFIGURE_OPTS += -xkbcommon -endif QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ + xcb-util-renderutil \ xlib_libX11 \ libxkbcommon ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) @@ -218,15 +207,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -# No OpenSSL 1.1.x support in Qt 5.6.x -# LibreSSL works with shared linkage only and -fpermissive patch -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBRESSL),openssl) -else QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) -endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) @@ -250,16 +232,6 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -# gstreamer 0.10 support is broken in qt5multimedia -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 -QT5BASE_DEPENDENCIES += gst1-plugins-base -else -QT5BASE_CONFIGURE_OPTS += -no-gstreamer -endif -endif - ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput QT5BASE_DEPENDENCIES += libinput @@ -267,7 +239,6 @@ else QT5BASE_CONFIGURE_OPTS += -no-libinput endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) # only enable gtk support if libgtk3 X11 backend is enabled ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) QT5BASE_CONFIGURE_OPTS += -gtk @@ -275,7 +246,6 @@ QT5BASE_DEPENDENCIES += libgtk3 else QT5BASE_CONFIGURE_OPTS += -no-gtk endif -endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) QT5BASE_CONFIGURE_OPTS += -journald @@ -284,34 +254,6 @@ else QT5BASE_CONFIGURE_OPTS += -no-journald endif -# Build the list of libraries to be installed on the target -QT5BASE_INSTALL_LIBS_y += Qt5Core -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport -endif -ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport -endif -else -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration -endif - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv @@ -319,7 +261,6 @@ else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif -endif ifneq ($(QT5BASE_CONFIG_FILE),) define QT5BASE_CONFIGURE_CONFIG_FILE @@ -328,7 +269,7 @@ endef endif QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) # Qt 5.8 needs atomics, which on various architectures are in -latomic define QT5BASE_CONFIGURE_ARCH_CONFIG printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE) @@ -377,63 +318,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -define QT5BASE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF -# The file "qt.conf" can be used to override the hard-coded paths that are -# compiled into the Qt library. We need it to make "qmake" relocatable. -define QT5BASE_INSTALL_QT_CONF - sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ - $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf -endef - -define QT5BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5BASE_INSTALL_QT_CONF) -endef - -define QT5BASE_INSTALL_TARGET_LIBS - for lib in $(QT5BASE_INSTALL_LIBS_y); do \ - cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib || exit 1 ; \ - done -endef - -define QT5BASE_INSTALL_TARGET_PLUGINS - if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \ - fi -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5BASE_INSTALL_TARGET_FONTS - if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ - fi -endef -endif - -define QT5BASE_INSTALL_TARGET_EXAMPLES - if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/* $(TARGET_DIR)/usr/lib/qt/examples ; \ - fi -endef - -ifeq ($(BR2_STATIC_LIBS),y) -define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_FONTS) - $(QT5BASE_INSTALL_TARGET_EXAMPLES) -endef -else -define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_LIBS) - $(QT5BASE_INSTALL_TARGET_PLUGINS) - $(QT5BASE_INSTALL_TARGET_FONTS) - $(QT5BASE_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5canvas3d/Config.in b/buildroot/package/qt5/qt5canvas3d/Config.in deleted file mode 100644 index 04c04730b..000000000 --- a/buildroot/package/qt5/qt5canvas3d/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_QT5CANVAS3D - bool "qt5canvas3d" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Canvas 3D module provides a way to make WebGL-like - 3D drawing calls from Qt Quick JavaScript. - - http://doc.qt.io/qt-5/qtcanvas3d-index.html - -comment "qt5canvas3d needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash deleted file mode 100644 index 19f9b8450..000000000 --- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ /dev/null @@ -1,14 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtcanvas3d-everywhere-src-5.12.8.tar.xz.sha256 -sha256 a30deda1021266b3be4d016474fbf4df6b40356ff870c026320204f2364d12cc qtcanvas3d-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk deleted file mode 100644 index b550ff00f..000000000 --- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# qt5canvas3d -# -################################################################################ - -QT5CANVAS3D_VERSION = $(QT5_VERSION) -QT5CANVAS3D_SITE = $(QT5_SITE) -QT5CANVAS3D_SOURCE = qtcanvas3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CANVAS3D_VERSION).tar.xz -QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative -QT5CANVAS3D_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5CANVAS3D_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) -QT5CANVAS3D_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 -else -QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0 -QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 -endif - -define QT5CANVAS3D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CANVAS3D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CANVAS3D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CANVAS3D_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/canvas3d $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5CANVAS3D_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtCanvas3D $(TARGET_DIR)/usr/qml/ - $(QT5CANVAS3D_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/qt5/qt5charts/Config.in b/buildroot/package/qt5/qt5charts/Config.in index db199922d..a72da65e3 100644 --- a/buildroot/package/qt5/qt5charts/Config.in +++ b/buildroot/package/qt5/qt5charts/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5CHARTS bool "qt5charts" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS help diff --git a/buildroot/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash index 0010d1b9f..5d81af78e 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.hash +++ b/buildroot/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist -sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtcharts-everywhere-src-5.12.8.tar.xz.sha256 -sha256 ded463b3f99bf5cc5fe39ed2d70183948c6e955430ce0b21eb235b5c13bc9d16 qtcharts-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtcharts-everywhere-src-5.15.1.tar.xz.sha256 +sha256 a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b qtcharts-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5charts/qt5charts.mk b/buildroot/package/qt5/qt5charts/qt5charts.mk index e35974750..2c40ac1c8 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.mk +++ b/buildroot/package/qt5/qt5charts/qt5charts.mk @@ -4,62 +4,16 @@ # ################################################################################ -# Qt5Charts does not follow Qt versionning for 5.6 -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CHARTS_VERSION = $(QT5_VERSION) -else -QT5CHARTS_VERSION = 2.1.3 -endif QT5CHARTS_SITE = $(QT5_SITE) QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz -QT5CHARTS_DEPENDENCIES = qt5base QT5CHARTS_INSTALL_STAGING = YES QT5CHARTS_LICENSE = GPL-3.0 -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5CHARTS_DEPENDENCIES += qt5declarative endif -define QT5CHARTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CHARTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CHARTS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5CHARTS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -# this is only built with quick support enabled -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5CHARTS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtCharts $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CHARTS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/charts* $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5CHARTS_INSTALL_TARGET_CMDS - $(QT5CHARTS_INSTALL_TARGET_LIBS) - $(QT5CHARTS_INSTALL_TARGET_QMLS) - $(QT5CHARTS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash deleted file mode 100644 index 9a00e5605..000000000 --- a/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtconnectivity-everywhere-src-5.12.8.tar.xz.sha256 -sha256 dd4d7b291e5ad88d9e9c34e9c5419923498f5264bd3deb9a5da556943f2931e3 qtconnectivity-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash deleted file mode 100644 index c1a03c5e0..000000000 --- a/buildroot/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash +++ /dev/null @@ -1,10 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/buildroot/package/qt5/qt5connectivity/Config.in b/buildroot/package/qt5/qt5connectivity/Config.in index 182fe3ea9..51e8978f1 100644 --- a/buildroot/package/qt5/qt5connectivity/Config.in +++ b/buildroot/package/qt5/qt5connectivity/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ5_UTILS - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS help diff --git a/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash index 5316f03b1..59c948320 100644 --- a/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,2 +1,9 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtconnectivity-everywhere-src-5.15.1.tar.xz.sha256 +sha256 53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016 qtconnectivity-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk b/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk index 0ade9876d..6402b505b 100644 --- a/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk @@ -7,16 +7,11 @@ QT5CONNECTIVITY_VERSION = $(QT5_VERSION) QT5CONNECTIVITY_SITE = $(QT5_SITE) QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz -QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5CONNECTIVITY_LICENSE += , BSD-3-Clause (examples) endif @@ -25,61 +20,4 @@ QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarativ QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) -define QT5CONNECTIVITY_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CONNECTIVITY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CONNECTIVITY_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ -endef -endif -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5CONNECTIVITY_INSTALL_TARGET_CMDS - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch similarity index 73% rename from buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch rename to buildroot/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch index 1c0f6eccc..b6de49e16 100644 --- a/buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch +++ b/buildroot/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch @@ -1,4 +1,4 @@ -From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001 +From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Nov 2018 23:33:10 +0100 Subject: [PATCH] qsgtexture: fix debug build with uclibc @@ -23,17 +23,19 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/qt/qtdeclarative/pull/4] +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer --- - src/quick/scenegraph/util/qsgtexture.cpp | 2 +- + src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp -index fea92a512..a26191006 100644 ---- a/src/quick/scenegraph/util/qsgtexture.cpp -+++ b/src/quick/scenegraph/util/qsgtexture.cpp -@@ -53,7 +53,7 @@ - #endif +diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp +index dfbe4d3f..6a7bc79b 100644 +--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp ++++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp +@@ -46,7 +46,7 @@ #include + #include -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__) @@ -41,5 +43,5 @@ index fea92a512..a26191006 100644 #endif -- -2.14.1 +2.23.0 diff --git a/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch b/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch deleted file mode 100644 index aeaaa9177..000000000 --- a/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 6 Apr 2017 21:53:40 +0200 -Subject: [PATCH] examples: photoviewer needs widgets support - -Fixes: - - .../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro - Project ERROR: Unknown module(s) in QT: widgets - -Signed-off-by: Peter Seiderer ---- - examples/quick/demos/demos.pro | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro -index 0644b81a2..5a6fd52ba 100644 ---- a/examples/quick/demos/demos.pro -+++ b/examples/quick/demos/demos.pro -@@ -7,5 +7,7 @@ SUBDIRS = samegame \ - photosurface \ - stocqt - --qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer -- -+qtHaveModule(xmlpatterns) { -+ SUBDIRS += rssnews -+ qtHaveModule(widgets): SUBDIRS += photoviewer -+} --- -2.11.0 - diff --git a/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch deleted file mode 100644 index 7959d3894..000000000 --- a/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b4db5c6cef877b33b5e7cd5a07fe4a7e6797dcfc Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 16 May 2017 19:47:19 +0200 -Subject: [PATCH] examples: qquickviewcomparison and quickwidget needs OpenGL - support - -Fixes: - - main.cpp:(.text._ZN11QQmlPrivate10createIntoI6FbItemEEvPv[_ZN11QQmlPrivate10createIntoI6FbItemEEvPv]+0x18): undefined reference to `QQuickFramebufferObject::QQuickFramebufferObject(QQuickItem*)' - .obj/main.o: In function `QQmlPrivate::QQmlElement::~QQmlElement()': - main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED2Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED5Ev]+0x5c): undefined reference to `vtable for QQuickFramebufferObject' - .obj/main.o: In function `QQmlPrivate::QQmlElement::~QQmlElement()': - main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev]+0x64): undefined reference to `vtable for QQuickFramebufferObject' - .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x48): undefined reference to `QQuickFramebufferObject::isTextureProvider() const' - .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x4c): undefined reference to `QQuickFramebufferObject::textureProvider() const' - .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)' - .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)' - .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xbc): undefined reference to `QQuickFramebufferObject::releaseResources()' - .obj/moc_fbitem.o: In function `FbItem::qt_metacast(char const*)': - moc_fbitem.cpp:(.text+0x70): undefined reference to `QQuickFramebufferObject::qt_metacast(char const*)' - .obj/moc_fbitem.o: In function `FbItem::qt_metacall(QMetaObject::Call, int, void**)': - moc_fbitem.cpp:(.text+0x80): undefined reference to `QQuickFramebufferObject::qt_metacall(QMetaObject::Call, int, void**)' - .obj/moc_fbitem.o: In function `FbItem::~FbItem()': - moc_fbitem.cpp:(.text._ZN6FbItemD2Ev[_ZN6FbItemD5Ev]+0x38): undefined reference to `vtable for QQuickFramebufferObject' - .obj/moc_fbitem.o: In function `FbItem::~FbItem()': - moc_fbitem.cpp:(.text._ZN6FbItemD0Ev[_ZN6FbItemD0Ev]+0x40): undefined reference to `vtable for QQuickFramebufferObject' - .obj/moc_fbitem.o:(.data.rel.ro+0x8): undefined reference to `typeinfo for QQuickFramebufferObject' - .obj/moc_fbitem.o:(.data.rel.ro+0x58): undefined reference to `QQuickFramebufferObject::isTextureProvider() const' - .obj/moc_fbitem.o:(.data.rel.ro+0x5c): undefined reference to `QQuickFramebufferObject::textureProvider() const' - .obj/moc_fbitem.o:(.data.rel.ro+0xc4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)' - .obj/moc_fbitem.o:(.data.rel.ro+0xc8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)' - .obj/moc_fbitem.o:(.data.rel.ro+0xcc): undefined reference to `QQuickFramebufferObject::releaseResources()' - .obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject' - -Signed-off-by: Peter Seiderer ---- - -Note: -An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for -backporting to this version due to license differences. - ---- - examples/quick/quick.pro | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro -index 445dfb0fa..26ca0138e 100644 ---- a/examples/quick/quick.pro -+++ b/examples/quick/quick.pro -@@ -36,7 +36,10 @@ qtConfig(opengl(es1|es2)?) { - # Widget dependent examples - qtHaveModule(widgets) { - SUBDIRS += embeddedinwidgets -- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets -+ # OpenGL Support Required -+ qtConfig(opengl(es1|es2)?) { -+ qtHaveModule(quickwidgets): SUBDIRS += quickwidgets -+ } - } - - EXAMPLE_FILES = \ --- -2.11.0 - diff --git a/buildroot/package/qt5/qt5declarative/Config.in b/buildroot/package/qt5/qt5declarative/Config.in index d85f4c713..3ba9224c2 100644 --- a/buildroot/package/qt5/qt5declarative/Config.in +++ b/buildroot/package/qt5/qt5declarative/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for @@ -15,12 +14,8 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE -comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST - config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE endif diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash index 2d4f8ebc2..9033f6a6b 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.hash +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtdeclarative-everywhere-src-5.12.8.tar.xz.sha256 -sha256 7e1059be9f3faab6fd3d40b58666798963bb9d9c5442d5d16e6870c51327160b qtdeclarative-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz.sha256 +sha256 7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 qtdeclarative-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.mk b/buildroot/package/qt5/qt5declarative/qt5declarative.mk index 200a5578f..3318cd24c 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.mk +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.mk @@ -7,60 +7,9 @@ QT5DECLARATIVE_VERSION = $(QT5_VERSION) QT5DECLARATIVE_SITE = $(QT5_SITE) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz -QT5DECLARATIVE_DEPENDENCIES = qt5base QT5DECLARATIVE_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5DECLARATIVE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5DECLARATIVE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5DECLARATIVE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib -endef -define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5DECLARATIVE_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS) -endef - -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/ - $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES) -endef -endif - -define QT5DECLARATIVE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin - cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr - $(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES) - $(QT5DECLARATIVE_INSTALL_TARGET_LIBS) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch b/buildroot/package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch new file mode 100644 index 000000000..0a3fd8072 --- /dev/null +++ b/buildroot/package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch @@ -0,0 +1,39 @@ +From ca81a62bb3f8ce67d564631bb8d4e11619acf430 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 3 Apr 2020 19:59:47 +0200 +Subject: [PATCH] Do not use deprecated QLinkedList +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Do not use (internally already by QT_NO_LINKED_LIST) deprecated QLinkeList, +use QList instead. + +Fixes: + + ../../include/Enginio/1.6.3/Enginio/private/../../../../../src/enginio_client/enginioclient_p.h:293:5: error: ‘QLinkedList’ does not name a type + +Signed-off-by: Peter Seiderer +--- + src/enginio_client/enginioclient_p.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h +index 6b5dc53..f3fe68e 100644 +--- a/src/enginio_client/enginioclient_p.h ++++ b/src/enginio_client/enginioclient_p.h +@@ -290,7 +290,11 @@ public: + QByteArray _backendId; + EnginioIdentity *_identity; + ++#if defined(QT_NO_LINKED_LIST) ++ QList _connections; ++#else + QLinkedList _connections; ++#endif + QVarLengthArray _identityConnections; + QUrl _serviceUrl; + QSharedPointer _networkManager; +-- +2.26.0 + diff --git a/buildroot/package/qt5/qt5enginio/Config.in b/buildroot/package/qt5/qt5enginio/Config.in index f84d23477..d445d91de 100644 --- a/buildroot/package/qt5/qt5enginio/Config.in +++ b/buildroot/package/qt5/qt5enginio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" - depends on BR2_PACKAGE_QT5BASE_OPENSSL + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help @@ -14,13 +14,3 @@ config BR2_PACKAGE_QT5ENGINIO 5.6 and not recommended for new design. http://doc.qt.io/archives/qt-5.5/enginio-index.html - -# When Qt 5.6 is removed, replace the depends on -# BR2_PACKAGE_QT5BASE_OPENSSL above by a select BR2_PACKAGE_OPENSSL. -comment "qt5enginio needs libressl" - depends on BR2_PACKAGE_QT5_VERSION_5_6 - depends on !BR2_PACKAGE_QT5BASE_OPENSSL - -comment "qt5enginio needs openssl" - depends on BR2_PACKAGE_QT5_VERSION_LATEST - depends on !BR2_PACKAGE_QT5BASE_OPENSSL diff --git a/buildroot/package/qt5/qt5enginio/qt5enginio.mk b/buildroot/package/qt5/qt5enginio/qt5enginio.mk index ebd99e4cb..a9572db28 100644 --- a/buildroot/package/qt5/qt5enginio/qt5enginio.mk +++ b/buildroot/package/qt5/qt5enginio/qt5enginio.mk @@ -9,7 +9,7 @@ QT5ENGINIO_VERSION = 1.6.3 QT5ENGINIO_SITE = https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz -QT5ENGINIO_DEPENDENCIES = openssl qt5base +QT5ENGINIO_DEPENDENCIES = openssl QT5ENGINIO_INSTALL_STAGING = YES QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) @@ -22,40 +22,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5ENGINIO_DEPENDENCIES += qt5declarative endif -define QT5ENGINIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5ENGINIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5ENGINIO_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5ENGINIO_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5ENGINIO_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/enginio $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5ENGINIO_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5ENGINIO_INSTALL_TARGET_CMDS - $(QT5ENGINIO_INSTALL_TARGET_LIBS) - $(QT5ENGINIO_INSTALL_TARGET_QMLS) - $(QT5ENGINIO_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 23a28c434..d2ea24d74 100644 --- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtgraphicaleffects-everywhere-src-5.12.8.tar.xz.sha256 -sha256 660acc87a084d2e404c2c5ddc0317f0d8a7b5292c889c9f37134e32ed7a33954 qtgraphicaleffects-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtgraphicaleffects-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1 qtgraphicaleffects-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index c5011a94f..a9ddff454 100644 --- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -7,31 +7,10 @@ QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz -QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative +QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5GRAPHICALEFFECTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5GRAPHICALEFFECTS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5GRAPHICALEFFECTS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtGraphicalEffects $(TARGET_DIR)/usr/qml -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5imageformats/Config.in b/buildroot/package/qt5/qt5imageformats/Config.in index 44c85c9b3..991f22f51 100644 --- a/buildroot/package/qt5/qt5imageformats/Config.in +++ b/buildroot/package/qt5/qt5imageformats/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5IMAGEFORMATS bool "qt5imageformats" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash index 238afd467..3808787cb 100644 --- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtimageformats-everywhere-src-5.12.8.tar.xz.sha256 -sha256 e176463c49762152131c93d6b02f1b1ff72fcd0aae3092c9fa05e57464d043b0 qtimageformats-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtimageformats-everywhere-src-5.15.1.tar.xz.sha256 +sha256 75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568 qtimageformats-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 @@ -10,5 +7,3 @@ sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk b/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk index fa13ebeda..ffb094d56 100644 --- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk @@ -7,33 +7,9 @@ QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) QT5IMAGEFORMATS_SITE = $(QT5_SITE) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz -QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5IMAGEFORMATS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5IMAGEFORMATS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5location/Config.in b/buildroot/package/qt5/qt5location/Config.in index 7c39979ef..c68deb100 100644 --- a/buildroot/package/qt5/qt5location/Config.in +++ b/buildroot/package/qt5/qt5location/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash index 727570a29..051b36ecd 100644 --- a/buildroot/package/qt5/qt5location/qt5location.hash +++ b/buildroot/package/qt5/qt5location/qt5location.hash @@ -1,17 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtlocation-everywhere-src-5.12.8.tar.xz.sha256 -sha256 ffe3c5183744743b476230b644c71a931e5822c5107b02607000e0e1f1a34b0a qtlocation-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlocation-everywhere-src-5.15.1.tar.xz.sha256 +sha256 093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c qtlocation-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/buildroot/package/qt5/qt5location/qt5location.mk b/buildroot/package/qt5/qt5location/qt5location.mk index a69e8f41a..ea741d0df 100644 --- a/buildroot/package/qt5/qt5location/qt5location.mk +++ b/buildroot/package/qt5/qt5location/qt5location.mk @@ -7,66 +7,13 @@ QT5LOCATION_VERSION = $(QT5_VERSION) QT5LOCATION_SITE = $(QT5_SITE) QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz -QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif -define QT5LOCATION_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5LOCATION_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5LOCATION_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5LOCATION_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtPositioning $(TARGET_DIR)/usr/qml/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtLocation $(TARGET_DIR)/usr/qml/ -endef -define QT5LOCATION_INSTALL_TARGET_LOCATION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/ -endef -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5LOCATION_INSTALL_TARGET_POSITION_QUICK - cp -dpf $(STAGING_DIR)/usr/lib/libQt5PositioningQuick.so.* $(TARGET_DIR)/usr/lib -endef -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5LOCATION_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/location $(TARGET_DIR)/usr/lib/qt/examples/ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/positioning $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5LOCATION_INSTALL_TARGET_POSITION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Positioning.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/position $(TARGET_DIR)/usr/lib/qt/plugins/ -endef - -define QT5LOCATION_INSTALL_TARGET_CMDS - $(QT5LOCATION_INSTALL_TARGET_POSITION) - $(QT5LOCATION_INSTALL_TARGET_POSITION_QUICK) - $(QT5LOCATION_INSTALL_TARGET_LOCATION) - $(QT5LOCATION_INSTALL_TARGET_QMLS) - $(QT5LOCATION_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5lottie/Config.in b/buildroot/package/qt5/qt5lottie/Config.in new file mode 100644 index 000000000..de5f16d5e --- /dev/null +++ b/buildroot/package/qt5/qt5lottie/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5LOTTIE + bool "qt5lottie" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5lottie module. + + https://doc.qt.io/qt-5/qtlottieanimation-index.html diff --git a/buildroot/package/qt5/qt5lottie/qt5lottie.hash b/buildroot/package/qt5/qt5lottie/qt5lottie.hash new file mode 100644 index 000000000..3af1c6de3 --- /dev/null +++ b/buildroot/package/qt5/qt5lottie/qt5lottie.hash @@ -0,0 +1,6 @@ +# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlottie-everywhere-src-5.15.1.tar.xz.sha256 +sha256 845987860c7990035a7cd9a0e7581d210f786e551882df8b5be69f08987f2ba0 qtlottie-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/buildroot/package/qt5/qt5lottie/qt5lottie.mk b/buildroot/package/qt5/qt5lottie/qt5lottie.mk new file mode 100644 index 000000000..1423a629b --- /dev/null +++ b/buildroot/package/qt5/qt5lottie/qt5lottie.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# qt5lottie +# +################################################################################ + +QT5LOTTIE_VERSION = $(QT5_VERSION) +QT5LOTTIE_SITE = $(QT5_SITE) +QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_DEPENDENCIES = qt5declarative +QT5LOTTIE_INSTALL_STAGING = YES + +QT5LOTTIE_LICENSE = GPL-3.0 +QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5multimedia/Config.in b/buildroot/package/qt5/qt5multimedia/Config.in index 79d602214..dd46575d9 100644 --- a/buildroot/package/qt5/qt5multimedia/Config.in +++ b/buildroot/package/qt5/qt5multimedia/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA bool "qt5multimedia" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash index aab49b6f0..2fab59d0d 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtmultimedia-everywhere-src-5.12.8.tar.xz.sha256 -sha256 26fc117f6ad012ac140353ade4371c234d6d73492f834f93b0b200b8b5552fe2 qtmultimedia-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz.sha256 +sha256 ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99 qtmultimedia-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,8 +7,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk b/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk index e598140a9..39eddc3af 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk @@ -7,16 +7,10 @@ QT5MULTIMEDIA_VERSION = $(QT5_VERSION) QT5MULTIMEDIA_SITE = $(QT5_SITE) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz -QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base @@ -34,53 +28,9 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y) QT5MULTIMEDIA_DEPENDENCIES += alsa-lib endif -define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5MULTIMEDIA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5MULTIMEDIA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools -# and is installed by the default target install step below -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy) -define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5MULTIMEDIA_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) -endef -endif # !BR2_STATIC_LIBS - -# this is only built with quick/opengl support enabled -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) -define QT5MULTIMEDIA_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ -endef -endif - ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5MULTIMEDIA_LICENSE += , LGPL-2.1+ (examples/multimedia/spectrum/3rdparty/fftreal) QT5MULTIMEDIA_LICENSE_FILES += examples/multimedia/spectrum/3rdparty/fftreal/license.txt -define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/ -endef endif -define QT5MULTIMEDIA_INSTALL_TARGET_CMDS - $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS) - $(QT5MULTIMEDIA_INSTALL_TARGET_QMLS) - $(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5quickcontrols/Config.in b/buildroot/package/qt5/qt5quickcontrols/Config.in index 59f6ca411..56fcaf705 100644 --- a/buildroot/package/qt5/qt5quickcontrols/Config.in +++ b/buildroot/package/qt5/qt5quickcontrols/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -12,7 +11,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS that can be used to build complete interfaces in Qt Quick. http://doc.qt.io/qt-5/qtquickcontrols-index.html - -comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index e8ef55145..36ec675d5 100644 --- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,13 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtquickcontrols-everywhere-src-5.12.8.tar.xz.sha256 -sha256 5d93b4107d4b14115a4d1692b533790b43d15cdf81325036ca15044592c81d38 qtquickcontrols-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols-everywhere-src-5.15.1.tar.xz.sha256 +sha256 0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e qtquickcontrols-everywhere-src-5.15.1.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 3e0c5effb..1ac8689d6 100644 --- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -7,54 +7,10 @@ QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS_SITE = $(QT5_SITE) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz -QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative +QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL -else -QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5QUICKCONTROLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5QUICKCONTROLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) -define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash deleted file mode 100644 index 9241a366f..000000000 --- a/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtquickcontrols2-everywhere-src-5.12.8.tar.xz.sha256 -sha256 a0c5646b27290cfdea6f26c58b9ddd6f177b39ac2e6d27cd7e19d8b560dc4920 qtquickcontrols2-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash deleted file mode 100644 index 01fe5dcd6..000000000 --- a/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 0ec5b37a28dd638c5c05c8cc940276e55c808353fe8d942c7f993c2c8b4cbe62 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5quickcontrols2/Config.in b/buildroot/package/qt5/qt5quickcontrols2/Config.in index d036f74ba..3f81e20d5 100644 --- a/buildroot/package/qt5/qt5quickcontrols2/Config.in +++ b/buildroot/package/qt5/qt5quickcontrols2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -14,7 +13,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 to a core module in Qt 5.7.0. https://doc.qt.io/qt-5/qtquickcontrols2-index.html - -comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 5316f03b1..ffce270c1 100644 --- a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols2-everywhere-src-5.15.1.tar.xz.sha256 +sha256 e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af qtquickcontrols2-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index c2004c2ee..2f6dcd1f2 100644 --- a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -7,48 +7,10 @@ QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS2_SITE = $(QT5_SITE) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz -QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative +QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -define QT5QUICKCONTROLS2_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5QUICKCONTROLS2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols2 $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -else -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5quicktimeline/Config.in b/buildroot/package/qt5/qt5quicktimeline/Config.in new file mode 100644 index 000000000..3c6fe3efe --- /dev/null +++ b/buildroot/package/qt5/qt5quicktimeline/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5QUICKTIMELINE + bool "qt5quicktimeline" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5quicktimeline module. + + https://doc.qt.io/qt-5/qtquicktimeline-index.html diff --git a/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash new file mode 100644 index 000000000..8318044bd --- /dev/null +++ b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -0,0 +1,5 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquicktimeline-everywhere-src-5.15.1.tar.xz.sha256 +sha256 15665d489a6a29ff406a5fe2b4ac14ab102fb6e43864e115432be065da073cca qtquicktimeline-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.mk new file mode 100644 index 000000000..ef6927f92 --- /dev/null +++ b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# qt5quicktimeline +# +################################################################################ + +QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) +QT5QUICKTIMELINE_SITE = $(QT5_SITE) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative +QT5QUICKTIMELINE_INSTALL_STAGING = YES + +QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) +QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5remoteobjects/Config.in b/buildroot/package/qt5/qt5remoteobjects/Config.in new file mode 100644 index 000000000..9d4a40a5b --- /dev/null +++ b/buildroot/package/qt5/qt5remoteobjects/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT5REMOTEOBJECTS + bool "qt5remoteobjects" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Remote Objects (QtRO) is an Inter-Process + Communication (IPC) module developed for Qt. This + module extends Qt's existing functionalities to enable + information exchange between processes or computers, + easily. + + https://doc.qt.io/qt-5/qtremoteobjects-index.html diff --git a/buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash similarity index 53% rename from buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash rename to buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 00d599d46..6575a47c3 100644 --- a/buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash +++ b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,9 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtserialport-everywhere-src-5.12.8.tar.xz.sha256 -sha256 66d989498a84313ce843095082396f279ee43e7828aef967b1b447fce68056ea qtserialport-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtremoteobjects-everywhere-src-5.15.1.tar.xz.sha256 +sha256 71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e qtremoteobjects-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.mk new file mode 100644 index 000000000..a6b5f0954 --- /dev/null +++ b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# qt5remoteobjects +# +################################################################################ + +QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) +QT5REMOTEOBJECTS_SITE = $(QT5_SITE) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_DEPENDENCIES = qt5base +QT5REMOTEOBJECTS_INSTALL_STAGING = YES +QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) +QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative +endif + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5script/Config.in b/buildroot/package/qt5/qt5script/Config.in index 034b7d2fc..1926813e9 100644 --- a/buildroot/package/qt5/qt5script/Config.in +++ b/buildroot/package/qt5/qt5script/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SCRIPT bool "qt5script" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/buildroot/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash index 88656c26d..972099ce9 100644 --- a/buildroot/package/qt5/qt5script/qt5script.hash +++ b/buildroot/package/qt5/qt5script/qt5script.hash @@ -1,16 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtscript-everywhere-src-5.12.8.tar.xz.sha256 -sha256 c8c13582bab8562792fab29f574768ef9fb2cdd232c102228cc511dbfc4b1097 qtscript-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscript-everywhere-src-5.15.1.tar.xz.sha256 +sha256 0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca qtscript-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/buildroot/package/qt5/qt5script/qt5script.mk b/buildroot/package/qt5/qt5script/qt5script.mk index a3b8cb7e3..77254fec0 100644 --- a/buildroot/package/qt5/qt5script/qt5script.mk +++ b/buildroot/package/qt5/qt5script/qt5script.mk @@ -7,53 +7,18 @@ QT5SCRIPT_VERSION = $(QT5_VERSION) QT5SCRIPT_SITE = $(QT5_SITE) QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz -QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under # LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause. # libQt5ScriptTools is under the normal Qt opensource license. -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs) # LGPL-2.1 license file is missing QT5SCRIPT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL -else -QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL -endif # License files from JavaScriptCore QT5SCRIPT_LICENSE_FILES += \ src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \ src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING -define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SCRIPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SCRIPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SCRIPT_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SCRIPT_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/script $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SCRIPT_INSTALL_TARGET_CMDS - $(QT5SCRIPT_INSTALL_TARGET_LIBS) - $(QT5SCRIPT_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5scxml/Config.in b/buildroot/package/qt5/qt5scxml/Config.in index d94b5ea1c..24fb2d9c2 100644 --- a/buildroot/package/qt5/qt5scxml/Config.in +++ b/buildroot/package/qt5/qt5scxml/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_QT5SCXML bool "qt5scxml" - depends on BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5DECLARATIVE help Qt is a cross-platform application and UI framework for @@ -12,7 +10,3 @@ config BR2_PACKAGE_QT5SCXML machines from SCXML files. https://doc.qt.io/qt-5/qtscxml-index.html - -comment "qt5scxml needs at least qt-5.9" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_VERSION_LATEST diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash index eb177f7cd..494cd525b 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.hash +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtscxml-everywhere-src-5.12.8.tar.xz.sha256 -sha256 c07020b510b20c0424a5bc58bd83337bd1c44d5fd996aa8179ad1113eb015ad2 qtscxml-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscxml-everywhere-src-5.15.1.tar.xz.sha256 +sha256 2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b qtscxml-everywhere-src-5.15.1.tar.xz # Hashes for license files: diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.mk b/buildroot/package/qt5/qt5scxml/qt5scxml.mk index c0776314d..186a2d381 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.mk +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.mk @@ -7,7 +7,7 @@ QT5SCXML_VERSION = $(QT5_VERSION) QT5SCXML_SITE = $(QT5_SITE) QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz -QT5SCXML_DEPENDENCIES = qt5base qt5declarative +QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) @@ -16,38 +16,4 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5SCXML_LICENSE += , BSD-3-Clause (examples) endif -define QT5SCXML_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SCXML_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SCXML_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SCXML_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Scxml*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5SCXML_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtScxml/ $(TARGET_DIR)/usr/qml/ -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SCXML_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SCXML_INSTALL_TARGET_CMDS - $(QT5SCXML_INSTALL_TARGET_LIBS) - $(QT5SCXML_INSTALL_TARGET_QMLS) - $(QT5SCXML_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5sensors/Config.in b/buildroot/package/qt5/qt5sensors/Config.in index 4846a3f95..5e8ee6532 100644 --- a/buildroot/package/qt5/qt5sensors/Config.in +++ b/buildroot/package/qt5/qt5sensors/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SENSORS bool "qt5sensors" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash index a2fe83cb7..9f3001d42 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.hash +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtsensors-everywhere-src-5.12.8.tar.xz.sha256 -sha256 48f3c25e32a6b19a203188d7e52ad257b3ac23781ee80bea933d721e270d297a qtsensors-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsensors-everywhere-src-5.15.1.tar.xz.sha256 +sha256 8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00 qtsensors-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.mk b/buildroot/package/qt5/qt5sensors/qt5sensors.mk index 10498a497..f928aad1c 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.mk +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.mk @@ -7,56 +7,12 @@ QT5SENSORS_VERSION = $(QT5_VERSION) QT5SENSORS_SITE = $(QT5_SITE) QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz -QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative endif -define QT5SENSORS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SENSORS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SENSORS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5SENSORS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SENSORS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/sensors $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SENSORS_INSTALL_TARGET_CMDS - $(QT5SENSORS_INSTALL_TARGET_LIBS) - $(QT5SENSORS_INSTALL_TARGET_QMLS) - $(QT5SENSORS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash deleted file mode 100644 index 2f6b5c45c..000000000 --- a/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtserialbus-everywhere-src-5.12.8.tar.xz.sha256 -sha256 77d09c99c6a15f3de442fc734d5af7452af273f5c002fc79fdaf527071abcc9c qtserialbus-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch b/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch deleted file mode 100644 index 8573e304f..000000000 --- a/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001 -From: Andre Hartmann -Date: Mon, 8 Jul 2019 21:35:12 +0200 -Subject: =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98SIOCGST?= - =?UTF-8?q?AMP=E2=80=99=20was=20not=20declared"?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: QTBUG-76957 -Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b -Reviewed-by: Alex Blasche -Reviewed-by: Denis Shienkov - -[Retrieved from: -https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482] -Signed-off-by: Fabrice Fontaine ---- - src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp -index 74b0d1d..a2da146 100644 ---- a/src/plugins/canbus/socketcan/socketcanbackend.cpp -+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp -@@ -45,6 +45,7 @@ - - #include - #include -+#include - #include - #include - #include --- -cgit v1.2.1 - diff --git a/buildroot/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash deleted file mode 100644 index 6715392eb..000000000 --- a/buildroot/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/Config.in b/buildroot/package/qt5/qt5serialbus/Config.in index 2882d5064..bcfec29b4 100644 --- a/buildroot/package/qt5/qt5serialbus/Config.in +++ b/buildroot/package/qt5/qt5serialbus/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5SERIALBUS bool "qt5serialbus" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5SERIALPORT help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash index 5316f03b1..19a9c6774 100644 --- a/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,2 +1,8 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialbus-everywhere-src-5.15.1.tar.xz.sha256 +sha256 9ee220826032ae1f8e68d9ec7dddc10ddc4c2e0a771d34009ae307b07eeca751 qtserialbus-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk b/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk index be8bb8b23..412a25561 100644 --- a/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk @@ -7,45 +7,10 @@ QT5SERIALBUS_VERSION = $(QT5_VERSION) QT5SERIALBUS_SITE = $(QT5_SITE) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz -QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport +QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -define QT5SERIALBUS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SERIALBUS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALBUS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALBUS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \ - $(TARGET_DIR)/usr/lib - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/canbus -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) -define QT5SERIALBUS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialbus $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SERIALBUS_INSTALL_TARGET_CMDS - $(QT5SERIALBUS_INSTALL_TARGET_LIBS) - $(QT5SERIALBUS_INSTALL_TARGET_EXAMPLES) - $(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \ - $(TARGET_DIR)/usr/bin/canbusutil -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5serialport/5.6.3/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.6.3/qt5serialport.hash deleted file mode 100644 index e6f46c1c5..000000000 --- a/buildroot/package/qt5/qt5serialport/5.6.3/qt5serialport.hash +++ /dev/null @@ -1,10 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialport/Config.in b/buildroot/package/qt5/qt5serialport/Config.in index 3538c5255..16c2eaa61 100644 --- a/buildroot/package/qt5/qt5serialport/Config.in +++ b/buildroot/package/qt5/qt5serialport/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SERIALPORT bool "qt5serialport" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/buildroot/package/qt5/qt5serialport/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/qt5serialport.hash index 5316f03b1..66e1a6b0b 100644 --- a/buildroot/package/qt5/qt5serialport/qt5serialport.hash +++ b/buildroot/package/qt5/qt5serialport/qt5serialport.hash @@ -1,2 +1,9 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialport-everywhere-src-5.15.1.tar.xz.sha256 +sha256 3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9 qtserialport-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialport/qt5serialport.mk b/buildroot/package/qt5/qt5serialport/qt5serialport.mk index 5c2abd82d..902967c75 100644 --- a/buildroot/package/qt5/qt5serialport/qt5serialport.mk +++ b/buildroot/package/qt5/qt5serialport/qt5serialport.mk @@ -7,44 +7,8 @@ QT5SERIALPORT_VERSION = $(QT5_VERSION) QT5SERIALPORT_SITE = $(QT5_SITE) QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz -QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5SERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALPORT_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SERIALPORT_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialport $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SERIALPORT_INSTALL_TARGET_CMDS - $(QT5SERIALPORT_INSTALL_TARGET_LIBS) - $(QT5SERIALPORT_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5svg/Config.in b/buildroot/package/qt5/qt5svg/Config.in index bc80b6267..e9284913a 100644 --- a/buildroot/package/qt5/qt5svg/Config.in +++ b/buildroot/package/qt5/qt5svg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5SVG bool "qt5svg" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash index a3af0a464..ba64d4bf3 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.hash +++ b/buildroot/package/qt5/qt5svg/qt5svg.hash @@ -1,13 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtsvg-everywhere-src-5.12.8.tar.xz.sha256 -sha256 af2aad75a48c2e4ad70aa298decceb5afc41d499aec119ad72635363a2dfbb5d qtsvg-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsvg-everywhere-src-5.15.1.tar.xz.sha256 +sha256 308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a qtsvg-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/buildroot/package/qt5/qt5svg/qt5svg.mk b/buildroot/package/qt5/qt5svg/qt5svg.mk index cb91844ef..d4b31c231 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.mk +++ b/buildroot/package/qt5/qt5svg/qt5svg.mk @@ -7,52 +7,8 @@ QT5SVG_VERSION = $(QT5_VERSION) QT5SVG_SITE = $(QT5_SITE) QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz -QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5SVG_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SVG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SVG_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) -define QT5SVG_INSTALL_ICONENGINES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/iconengines $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SVG_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/svg $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SVG_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ - $(QT5SVG_INSTALL_ICONENGINES) -endef -endif - -define QT5SVG_INSTALL_TARGET_CMDS - $(QT5SVG_INSTALL_TARGET_LIBS) - $(QT5SVG_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch b/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch new file mode 100644 index 000000000..f90952254 --- /dev/null +++ b/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch @@ -0,0 +1,51 @@ +From 34894c12122b2026aa595b42fe84a4648a6b7992 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 17 Dec 2019 11:01:59 +0100 +Subject: [PATCH] Disable designer tool (fixes configure error). + +Fixes: + + .../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro + Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer) + +Signed-off-by: Peter Seiderer +[Rebased for Qt5.15.0] +Signed-off-by: Peter Seiderer +[Rebased for Qt5.15.1] +Signed-off-by: Peter Seiderer +--- + src/linguist/linguist/linguist.pro | 2 +- + src/src.pro | 5 +---- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro +index d083896..7d74cfc 100644 +--- a/src/linguist/linguist/linguist.pro ++++ b/src/linguist/linguist/linguist.pro +@@ -1,4 +1,4 @@ +-QT += core-private gui-private widgets uitools-private printsupport ++QT += core-private gui-private widgets printsupport + + DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII + +diff --git a/src/src.pro b/src/src.pro +index 8ed567b..d784808 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -6,12 +6,9 @@ qtHaveModule(widgets) { + } else { + QT_FOR_CONFIG += widgets + qtConfig(pushbutton):qtConfig(toolbutton) { +- SUBDIRS = designer \ +- pixeltool ++ SUBDIRS = pixeltool + + !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant +- +- linguist.depends = designer + } + qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator + } +-- +2.28.0 + diff --git a/buildroot/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash index 12531a637..0aa7bd9cf 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.hash +++ b/buildroot/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qttools-everywhere-src-5.12.8.tar.xz.sha256 -sha256 21347e8e2422689d63a08195e27c637983c0d4261d5205ce6b493a2adfe826b4 qttools-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz.sha256 +sha256 c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 qttools-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 8ab0b8fe7c8e580e8c571b8fa455baf307e9394d4b3ac53ce50d8e960a8934c5 LICENSE.GPLv3 -sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5tools/qt5tools.mk b/buildroot/package/qt5/qt5tools/qt5tools.mk index 0d0002299..0543afd8f 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.mk +++ b/buildroot/package/qt5/qt5tools/qt5tools.mk @@ -8,7 +8,6 @@ QT5TOOLS_VERSION = $(QT5_VERSION) QT5TOOLS_SITE = $(QT5_SITE) QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz -QT5TOOLS_DEPENDENCIES = qt5base QT5TOOLS_INSTALL_STAGING = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), @@ -19,13 +18,8 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5TOOLS_DEPENDENCIES += qt5declarative endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ linguist/lconvert linguist/lrelease linguist/lupdate @@ -35,7 +29,7 @@ QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y) QT5TOOLS_BUILD_DIRS_y += qdoc QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc -QT5TOOLS_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5_VERSION_LATEST),host-clang) +QT5TOOLS_DEPENDENCIES += host-clang endif QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool @@ -50,10 +44,6 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo -define QT5TOOLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - define QT5TOOLS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ @@ -71,4 +61,4 @@ define QT5TOOLS_INSTALL_TARGET_CMDS $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) endef -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/buildroot/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch deleted file mode 100644 index 367cc4a1f..000000000 --- a/buildroot/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch +++ /dev/null @@ -1,38 +0,0 @@ -From aef55eb7b3470ba6dee4abc67acda1d308c90e97 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen -Date: Mon, 4 Apr 2016 14:25:54 +0200 -Subject: [PATCH 1/1] remove weird install path for example - -the deployment system on top should deal with this. - -Upstream-Status: Backport [with adaptations] -Change-Id: I1befb3e0c9bb6546afc59a40e525d1d600475a86 -Reviewed-by: Joerg Bornemann -Signed-off-by: Gaël PORTAY -[gportay: update basic.pro path] ---- - examples/virtualkeyboard/basic/basic.pro | 8 ++----- - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro -index 28cc4dc..0f71e0e 100644 ---- a/examples/virtualkeyboard/basic/basic.pro -+++ b/examples/virtualkeyboard/basic/basic.pro -@@ -7,12 +7,8 @@ static { - QT += svg - QTPLUGIN += qtvirtualkeyboardplugin - } --android-no-sdk|!isEmpty(CROSS_COMPILE) { -- TARGETPATH = /data/user/qt/virtualkeyboard/basic --} else { -- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic --} --target.path = $$TARGETPATH -+ -+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic - INSTALLS += target - - RESOURCES += \ --- -2.17.1 - diff --git a/buildroot/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash deleted file mode 100644 index 0cc4f9c82..000000000 --- a/buildroot/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz.mirrorlist -sha256 1d543a851e83fc3de40f48c2935f70278e842589b9a235c2b22f41733e561aec qtvirtualkeyboard-opensource-src-2.0.tar.xz - -# Hashes for license files: -sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt -sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE -sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE -sha256 ca3dd653e13c4a935622cfce00dc4e2d7a8295b64da99bd1d4f2a8ddb6b0956e src/virtualkeyboard/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash deleted file mode 100644 index 2a502b499..000000000 --- a/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz.sha256 -sha256 06c08200007f58cdcc0ceddd161e5d92a6f3e326d5e7c122dcc9ef9fed853c88 qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz - -# Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt -sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE -sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE -sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5virtualkeyboard/Config.in b/buildroot/package/qt5/qt5virtualkeyboard/Config.in index 8e9cacd3c..4cac6fd27 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/Config.in +++ b/buildroot/package/qt5/qt5virtualkeyboard/Config.in @@ -1,11 +1,6 @@ -comment "qt5virtualkeyboard needs an OpenGL-capable backend" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - config BR2_PACKAGE_QT5VIRTUALKEYBOARD bool "qt5virtualkeyboard" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5SVG diff --git a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 5316f03b1..5043b8052 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,2 +1,9 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz.sha256 +sha256 8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c13fa699a..3984c9866 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,21 +4,14 @@ # ################################################################################ -# Module does not follow Qt versionning for 5.6 -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -else -QT5VIRTUALKEYBOARD_VERSION = 2.0 -endif QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz -QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg +QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 -endif QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) @@ -26,99 +19,28 @@ QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LA ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/openwnn/NOTICE -else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/openwnn/3rdparty/openwnn/NOTICE endif -endif ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin) -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE -else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE endif -endif ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime) -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING -else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING endif endif -endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=handwriting QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit) -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt -else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt endif -endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=arrow-key-navigation endif -ifeq ($(QT5VIRTUALKEYBOARD_3RDPARTY_PARTS),YES) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS - cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr -endef -endif - -define QT5VIRTUALKEYBOARD_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5VIRTUALKEYBOARD_QMAKEFLAGS)) -endef - -define QT5VIRTUALKEYBOARD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML - mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ -endef -else -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML - mkdir -p $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash index 0eadb6d30..271ef2583 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.hash +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,5 @@ -# hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwayland-everywhere-src-5.12.8.tar.xz.sha256 -sha256 16dddccf0618be00f8396e6b5257e62a57022819d2db581b975258c716b9824a qtwayland-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwayland-everywhere-src-5.15.1.tar.xz.sha256 +sha256 e2ff47b874f283a952efd6a8aaf5e8cdc462b5216dda1051b60fc6e80ac657b6 qtwayland-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.mk b/buildroot/package/qt5/qt5wayland/qt5wayland.mk index 4790efc66..0076bbfe7 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.mk +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.mk @@ -7,7 +7,7 @@ QT5WAYLAND_VERSION = $(QT5_VERSION) QT5WAYLAND_SITE = $(QT5_SITE) QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz -QT5WAYLAND_DEPENDENCIES = qt5base wayland +QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) @@ -18,68 +18,11 @@ ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) QT5WAYLAND_DEPENDENCIES += libxkbcommon endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WAYLAND_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WAYLAND_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5WAYLAND_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor +QT5WAYLAND_CONF_OPTS += CONFIG+=wayland-compositor endif -define QT5WAYLAND_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) -endef - -define QT5WAYLAND_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WAYLAND_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib -endef -else -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib -endef -endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) -define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -else -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5WAYLAND_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms - $(QT5WAYLAND_INSTALL_COMPOSITOR) - $(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS) - $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5webchannel/Config.in b/buildroot/package/qt5/qt5webchannel/Config.in index e3d840584..436e3abb2 100644 --- a/buildroot/package/qt5/qt5webchannel/Config.in +++ b/buildroot/package/qt5/qt5webchannel/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBCHANNEL bool "qt5webchannel" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5WEBSOCKETS help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash index 1ea8d273e..ec3c79b87 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebchannel-everywhere-src-5.12.8.tar.xz.sha256 -sha256 8c45904dd03842c509f689d4227b025b7598b6dedd6905c01f7e562f2b18fbe9 qtwebchannel-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebchannel-everywhere-src-5.15.1.tar.xz.sha256 +sha256 7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc qtwebchannel-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 @@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk b/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk index 22523036e..176c0fd7a 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk @@ -7,16 +7,11 @@ QT5WEBCHANNEL_VERSION = $(QT5_VERSION) QT5WEBCHANNEL_SITE = $(QT5_SITE) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz -QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets +QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) endif @@ -25,53 +20,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBCHANNEL_DEPENDENCIES += qt5declarative endif -define QT5WEBCHANNEL_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBCHANNEL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBCHANNEL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT $(INSTALL) -m 0644 -D $(@D)/examples/webchannel/shared/qwebchannel.js \ $(TARGET_DIR)/var/www/qwebchannel.js endef -else -define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT - $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \ - $(TARGET_DIR)/var/www/qwebchannel.js -endef -endif +QT5WEBCHANNEL_POST_INSTALL_TARGET_HOOKS += QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBCHANNEL_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webchannel $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBCHANNEL_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebChannel.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5WEBCHANNEL_INSTALL_TARGET_CMDS - $(QT5WEBCHANNEL_INSTALL_TARGET_LIBS) - $(QT5WEBCHANNEL_INSTALL_TARGET_QMLS) - $(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT) - $(QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch b/buildroot/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch new file mode 100644 index 000000000..dff3e6c84 --- /dev/null +++ b/buildroot/package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch @@ -0,0 +1,51 @@ +From 7ae73da23ad998bd1e63ad213cf7a02e61191951 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 23 May 2020 19:01:19 +0200 +Subject: [PATCH] gn.pro: don't link statically with libstc++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While cross-compiling, qt5webengine is building a host tool but +want to link the libstdc++ statically. This requires to install +libstdc++-static package on the host (Fedora package name). + +Otherwise the link fail with: + + [185/185] LINK gn + FAILED: gn + /usr/bin/g++ -O3 -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-strip-all -Wl,--as-needed -static-libstdc++ -pthread -o gn -Wl,--start-group tools/gn/gn_main.o base.a gn_lib.a -Wl,--end-group -ldl + /usr/bin/ld : unable to find -lstdc++ + [...] + Project ERROR: GN build error! + +Add --no-static-libstdc++ argument to gn.pro to link to +libstdc++.so.6 instead of libstdc++.a. + +--no-static-libstdc++ has been added by [1] but it force +linking statically by default. + +[1] https://github.com/qt/qtwebengine-chromium/commit/cfab9198a9917f42cf08b1caf84ab9b71aac1911#diff-905c8f054808213577c0a92d1b704615 + +Signed-off-by: Romain Naour +--- + src/buildtools/gn.pro | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro +index 033202e6..5dd8e241 100644 +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -20,7 +20,8 @@ build_pass|!debug_and_release { + + gn_gen_args = --no-last-commit-position --out-path $$out_path \ + --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ +- --ld \"$$which($$QMAKE_LINK)\" ++ --ld \"$$which($$QMAKE_LINK)\" \ ++ --no-static-libstdc++ + + msvc:!clang_cl: gn_gen_args += --use-lto + +-- +2.25.4 + diff --git a/buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch deleted file mode 100644 index a0fdad4da..000000000 --- a/buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cc35cac78c053c14da01d6b1e5b05b0615360148 Mon Sep 17 00:00:00 2001 -From: Tom Anderson -Date: Thu, 2 Aug 2018 01:59:28 +0000 -Subject: [PATCH] pkg_config: Fixes when use_sysroot=false - -This CL introduces 2 changes to the behavior of pkg_config when -use_sysroot=false: - -1. The path is not made relative to the build directory. This fixes the case -where your src directory may be mounted at different locations. - -2. -I is used instead of -isystem. When -isystem is used, dep files do not -reference the system header files. This is OK when using the sysroot because -the CR_SYSROOT_HASH macro contains the sysroot revision so any source files will -be rebuilt when the sysroot updates. - -R=dpranke - -Change-Id: Ia3d7df51880205fee888923283b76078ccb3112f -Reviewed-on: https://chromium-review.googlesource.com/1159689 -Reviewed-by: Dirk Pranke -Commit-Queue: Thomas Anderson -Cr-Original-Commit-Position: refs/heads/master@{#580030} -Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src -Cr-Mirrored-Commit: a8c8396fd20d98666d517c45b358c63736e345ef -Signed-off-by: Bartosz Bilas ---- - src/3rdparty/chromium/build/config/linux/pkg_config.gni | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/3rdparty/chromium/build/config/linux/pkg_config.gni b/src/3rdparty/chromium/build/config/linux/pkg_config.gni -index 53ee353af..428e44ac0 100644 ---- a/src/3rdparty/chromium/build/config/linux/pkg_config.gni -+++ b/src/3rdparty/chromium/build/config/linux/pkg_config.gni -@@ -103,11 +103,15 @@ template("pkg_config") { - pkgresult = exec_script(pkg_config_script, args, "value") - cflags = pkgresult[1] - -- # We want the system include paths to use -isystem instead of -I to suppress -- # warnings in those headers. - foreach(include, pkgresult[0]) { -- include_relativized = rebase_path(include, root_build_dir) -- cflags += [ "-isystem$include_relativized" ] -+ if (use_sysroot) { -+ # We want the system include paths to use -isystem instead of -I to -+ # suppress warnings in those headers. -+ include_relativized = rebase_path(include, root_build_dir) -+ cflags += [ "-isystem$include_relativized" ] -+ } else { -+ cflags += [ "-I$include" ] -+ } - } - - if (!defined(invoker.ignore_libs) || !invoker.ignore_libs) { --- -2.21.0 - diff --git a/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash deleted file mode 100644 index 03d70d207..000000000 --- a/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash +++ /dev/null @@ -1,458 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebengine-everywhere-src-5.12.8.tar.xz.sha256 -sha256 cc7d1467055ca0c6b39a7d3d8f18d7f963070b456ff644bbf2ded555b8e45e94 qtwebengine-everywhere-src-5.12.8.tar.xz - -# Locally calculated -sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 d3e2f59e1d71176dfdb555ece6a41f7a5aa0f52ff21211010ace314f57695f6b src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 29028ec63522121b5545046e0c4d3ccc1e01fc8d9aaa3272554f74829cdacf84 src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE -sha256 1490793b8913f0fa78af7bf2e70076f54272748e278f065c50794529eaed8e74 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE -sha256 4165ae4c9c71da3e655a9acee8ee3368bba20f0702f4dcc994da315132ab90de src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 201d494a3f42450a28df2f0919a147e9a5296e841df5d415172a0ca8b558d0a8 src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/third_party/chromevox/LICENSE -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE -sha256 a19859c623cc60b717560cafb5fe64244735022c1200b65a649a3c2eef912fb4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE -sha256 491b4012bfc95982e66859c59641be20f4fd2c9b3bc2b6a7f26b6166e462dda1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE -sha256 e2ddad70d6b6bcfec887c32d7143a77ccbdb58e38d9c43f5b7f30f715b874b80 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE -sha256 a25dce9c94c3ad622574cffbefd4b8845b418aa65df966d97e3204ad276ed240 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE -sha256 4969b0ff94c4f2ad3f1613d95b3966cb4c3147d8b893654aced81029241de176 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE -sha256 7d043a9e52b7e1e3acab9ca3377e30ca72d25d39ad6e6c5a22b407fe39c6d703 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE -sha256 aa7c48d39d3bb837efa4fce39f971fa6ae8e5cb148724af8867a7a4a7121ad6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE -sha256 29f4d474804f60aae177d7fed67d0d613d00006640cc9cf80077eef03fb9a2cc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE -sha256 b1344bd78ebcbf8a359225ec444d038a653c6a5f9ecf405a50d4a5c11fbf27d1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE -sha256 8be44da6cc59e890c406d6d05c3ce1850f29bb2e0da2a2d686d593e5ad3ecf59 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE -sha256 4ceea53e36c7ff67a946e9905e50b41f350ef7b107c59afec9b91cbe97fbcaea src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 e8d64ff1e54883c69759db53d10adfaa8e09b6ef628788885fe8068bc1fdb1b7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE -sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE -sha256 0e356f8c0a756758ce04a143b1871585402b6bcf8f8e6a26873beb9992242e7a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE -sha256 5822e0d816e53e3537b306a4132cb7a70881897cf51bf483282148a602979076 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE -sha256 ef088ddea300fe4ea038bc47db929e320033b66981cf12a20b517d6b66a2fa3e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE -sha256 daca23d50b0f54d36d6da1b16c82dfea6461e2ae20de0e869957e44cc6d34781 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/files/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/feed/LICENSE -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE -sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 9f45b3cf29b76b5bf4ad467938b0e61a720eec6ef6c219c566f7c262b0cc7854 src/3rdparty/chromium/third_party/haha/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 4eac19453ddf356478db3be6b101a6d872d0046cdc8222df1ff5c997dd4b9fbe src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/javax_inject/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/leakcanary/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE -sha256 721cb11de618fcf9bbb7d25a389207bf2227357e6694bc326ab32a6699f9b951 src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE -sha256 fffd497be5f4ae0a10b8258e191125fb58b90250ecbf3c79398d79604dd00b7d src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 913b3eb6f19defc77c00e2bebbbce464326331b0b59eb6d1d1b23d68a8c27f6b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE -sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING -sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html -sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 e075583a46bca13a3f25af4181e2a0064f442c1f55c4312275cbcf05b892d3f4 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 b578cdd2345840ada550bd12519533812320d5f1d21cf4c1c7e1b1b0a31c98b7 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262 src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 19096ed2f05a693b92433405a6bf1018044b31ed5fa8883ab865cf2cd166f6e9 src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/LICENSE -sha256 3e3a91ec5c3fa243ad1f5a25cedee0abafd9824d061378cd3c81c541b044bf09 src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT -sha256 a012d664e4e01df52a65b2eeafdfb8aeb856fec0e6c372265d01b0109c3f5e2a src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT -sha256 0a731c5e376f4b604b9fd099d4797d64a5c0bc6e3770baf17b55988cb7737e2e src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT -sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT -sha256 9c9a05118ed1b6d96781a2e52335f7d4ec3dd6e7139340a8aa95fbf7eb4f199a src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT -sha256 b2d24d77041fbf66b93519758cd80671425c55614b2f65262046fdbe8c3247a8 src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt -sha256 c55ce1e876843853a8a2e5c936df6dc8dd3d185f83d85e6d113143b8c24f542e src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 846f295f64194ebcf615d6e35e445990645583764b52295177fc09a69051df1f src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 3ee0b54b13060355b0f5d0d1476536d25ad10552211098cc4086a46fb8c61f42 src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 efdabc1c1f655528b8c3a59b03668d446746d87273fab76f8af800b6e8891bd2 src/3rdparty/chromium/third_party/yara/src/COPYING -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 5426333ff30d2ba9127bfe11ba51ca98be02d704ddac48afd19de47dc7748ee6 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 b1b379fcaf3219593a4c433feb1b35c780bed23fafaae440b1ae2771a9521e3a src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch b/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch deleted file mode 100644 index 15cd9f87b..000000000 --- a/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fc41c0f572ff347142cca4bf5d82b87782bb5906 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Thu, 23 Nov 2017 16:18:06 -0500 -Subject: [PATCH] Change default SSL directory -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Change the default SSL directory, as buildroot ca-cert package is -installed at /etc/ssl. That way, we don't have to use the SSL_CERT_DIR -environment at runtime. - -Upstream-Status: Inappropriate -Signed-off-by: Damien Riegel -Signed-off-by: Gaël PORTAY ---- - src/core/qtwebengine_extras.gypi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi -index 229421ef..3b2386c0 100644 ---- a/src/core/qtwebengine_extras.gypi -+++ b/src/core/qtwebengine_extras.gypi -@@ -96,7 +96,7 @@ - 'GL_GLEXT_PROTOTYPES', - 'EGL_EGLEXT_PROTOTYPES', - # At runtime the env variable SSL_CERT_DIR can be used to override this -- 'OPENSSLDIR="/usr/lib/ssl"', -+ 'OPENSSLDIR="/etc/ssl"', - 'OPENSSL_LOAD_CONF', - 'EGL_API_FB=1', - 'LINUX=1', --- -2.15.0 - diff --git a/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch deleted file mode 100644 index 05ed2956d..000000000 --- a/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch +++ /dev/null @@ -1,93 +0,0 @@ -From bdfd084296681bcead17c42f1e5cf0e24ee04f65 Mon Sep 17 00:00:00 2001 -From: Viktor Engelmann -Date: Fri, 7 Jul 2017 12:56:19 +0200 -Subject: [PATCH] Load libEGL and libGLES2 symbols implicitly -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Instead of explicitly loading libraries from hard-coded locations, -we now just call dlopen(NULL, RTLD_LAZY). This returns a handle to -the host process'es context, which already contains the symbols of -both these libraries, because we link against them. -It was necessary to bypass LoadLibrary, because that expects a non-NULL -file path, so we couldn't pass NULL through that interface. - -Upstream-Status: Merged -Task-number: QTBUG-57761 -Change-Id: I29f037dfe542222b5188a33c7727c81a464a87bb -Reviewed-by: Allan Sandfeld Jensen -Reviewed-by: Michal Klocek -Signed-off-by: Gaël PORTAY -[gportay: backport from 5.9 and merge conflicts] ---- - src/core/surface_factory_qt.cpp | 40 ++++++++-------------------------------- - 1 file changed, 8 insertions(+), 32 deletions(-) - -diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp -index 48c91bfc..c6059b67 100644 ---- a/src/core/surface_factory_qt.cpp -+++ b/src/core/surface_factory_qt.cpp -@@ -51,51 +51,27 @@ - #if defined(USE_OZONE) - - #include -- --#ifndef QT_LIBDIR_EGL --#define QT_LIBDIR_EGL "/usr/lib" --#endif --#ifndef QT_LIBDIR_GLES2 --#define QT_LIBDIR_GLES2 QT_LIBDIR_EGL --#endif -+#include - - namespace QtWebEngineCore { - --base::NativeLibrary LoadLibrary(const base::FilePath& filename) { -- base::NativeLibraryLoadError error; -- base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); -- if (!library) { -- LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString(); -- return NULL; -- } -- return library; --} -- - bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) - { -- base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); -- libEGLPath = libEGLPath.Append("libEGL.so.1"); -- base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); -- if (!eglLibrary) -- return false; -- -- base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2); -- libGLES2Path = libGLES2Path.Append("libGLESv2.so.2"); -- base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path); -- if (!gles2Library) -+ base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY); -+ if (!eglgles2Library) { -+ LOG(ERROR) << "Failed to open EGL/GLES2 context " << dlerror(); - return false; -+ } - -- gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast(base::GetFunctionPointerFromNativeLibrary(eglLibrary, "eglGetProcAddress")); -+ gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast(base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress")); - if (!get_proc_address) { - LOG(ERROR) << "eglGetProcAddress not found."; -- base::UnloadNativeLibrary(eglLibrary); -- base::UnloadNativeLibrary(gles2Library); -+ base::UnloadNativeLibrary(eglgles2Library); - return false; - } - - gfx::SetGLGetProcAddressProc(get_proc_address); -- gfx::AddGLNativeLibrary(eglLibrary); -- gfx::AddGLNativeLibrary(gles2Library); -+ gfx::AddGLNativeLibrary(eglgles2Library); - return true; - } - --- -2.15.0 - diff --git a/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash deleted file mode 100644 index f062ae163..000000000 --- a/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash +++ /dev/null @@ -1,258 +0,0 @@ -# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz - -# Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 4074881f47972aedda83940935bb1d03fa74a56f94445945ce80fe952eed6834 src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE -sha256 dd6019aa7edc5b25a220306cd480da21c206964f86b30d08b8db8e4659b65c58 src/3rdparty/chromium/crypto/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 891970cf216f708de2bfd77184b3e32d5cdba8dc4c3a75e60628c0375f5657e4 src/3rdparty/chromium/sdch/open-vcdiff/COPYING -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gmock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gtest/LICENSE -sha256 77af9c9fc2710ee66b8282291a9392a9a61f1d5b3ad6e478d0b6c544de5f9aca src/3rdparty/chromium/third_party/angle/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 d8a0f4dab052ff6f56e9d6fa68efb66de8ff3956a805110930f8ee297376047f src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 fddff1da5115ebb2f735b31fd17bac3166bf0c67d941287dfd490a111bca1c52 src/3rdparty/chromium/third_party/appurify-python/LICENSE -sha256 f53f4201f4bd4b7a07b5e5830d89d75219211fa76214b761bcb181e5c95a56ce src/3rdparty/chromium/third_party/bintrees/LICENSE.txt -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 def7352915ac84bea5e2ed16f6fff712d35de519799777bf927e2a567ab53b7e src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 0af2a39b2cb31f540a1178f176367761751454779431be92a73a62f87df91440 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 d415cefbadc3a8083475e30d8690a1103a2601226f725abf43a263c516345190 src/3rdparty/chromium/third_party/cardboard-java/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 0acbdae3346bc7593c57471aaf47fb45326a26b3c29cfbbf8ce729d99a7e458a src/3rdparty/chromium/third_party/class-dump/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/cld/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/closure_linter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 8545f6c8d9497acf953ca93b9264032616e6430eb536e21142a381455c8085df src/3rdparty/chromium/third_party/drmemory/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE -sha256 e2fa3a3e38af6d7d0cb374883a89b3507fe3b053faef16485f37ff3c9d93a5d2 src/3rdparty/chromium/third_party/expat/files/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb77a08f3ee3deb5240a8b3d197436710621ee87f4f0fed03947f825e082fb28 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 0b1975de0a048180c5ea7179be1a3e751e05f79d225ac4be6481141970527e69 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 eafd0d3fac93964d4274a2f99be928d41c167a925a9ddb8621ab9aee065f8fee src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 246491bb21ec320b0396d218339305d8b7073c7cb94fa5adb77ebb9c84a87a0b src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT -sha256 32ce83e370dc31db74f20d8bb0febbb5f61b099f0e0212587e81fdc11ae7fcbc src/3rdparty/chromium/third_party/gardiner_mod/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING -sha256 1e33ef99129bb6e84b6bb84e8c9edb4c6dba9f876bc16bc143cb9a136627cdeb src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 93720ce4be6cca7dbfdd55f9cc9e1614865a4578b474612713fdbe06c3d34002 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell -sha256 dcda061adeed22b26f276c01ec374f930789ae0d684e5aa8f8be309dd680ff20 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/hwcplus/LICENSE -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 28d1d994f6f85ce2f605e214609a3a7925278039aa7a870b5cd089ef95b82445 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu/LICENSE -sha256 7d149647f825d89af1268d9a53ebb414af1354a1815e26f8e44ef99820ba21db src/3rdparty/chromium/third_party/icu/license.html -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/lcov/COPYING -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 src/3rdparty/chromium/third_party/libexif/sources/COPYING -sha256 0382f4433a2b1b0b5c0af8cc769de0c7302c1b663ea569e67c0b5452e374e142 src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING -sha256 dea8cf0d3604b861d3a89dd1d193b02404414957b6ee7ab6ebeacf47daece976 src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY -sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE -sha256 0570fc4ebfee96ed20720ed8f2cd5b928930bdd7340dfdfa96bb00e8c4f89677 src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt -sha256 5fe714f37f27dcc5d59dee2601ac3e7fe1cf2e497e5fcdba00ddb9b1297f61cb src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93 src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de src/3rdparty/chromium/third_party/libva/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 d62df95ee2ada2637151bc125cadbe2703ef07ed5d9cbe163eaa53bda3949af4 src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY -sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE -sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING -sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html -sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/mojo/LICENSE -sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 c69a473064e2246a3123066eaec702b454422b2701934187f0e433f773c57305 src/3rdparty/chromium/third_party/mt19937ar/LICENSE -sha256 7c7f6dc97beb9eac776c285bee22a58b83aba1d26e1d4e949e509717b5124540 src/3rdparty/chromium/third_party/npapi/LICENSE -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 src/3rdparty/chromium/third_party/nss/nspr/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/third_party/nss/nss/COPYING -sha256 74ab31565472f8347d36849b6b330e5f741f6e2dff5d9147b93ba0a900a4a577 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 31c7505c31a1ea8557a5362cd69946dc9f5ee80fac8fa1d1b1531c08530497b0 src/3rdparty/chromium/third_party/protobuf/COPYING.txt -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/python_gflags/COPYING -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 9b17bd282aac6d5729c700c823ddaaa6fa0e048d88e321f46252646f28791752 src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE -sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 1af74cc402d50be09edd134ed5c31ade063fc0e7546670bc23ceeecc0004c142 src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/sfntly/src/java/COPYING -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 1f04103e3a61b91343b3f9d2ed2cc8543062917e2cc7d52a739ffe6429ccaf61 src/3rdparty/chromium/third_party/skia/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 99750e3fa5e132e1b93a56538ab9c585f8fc62b9e11ab62adec0cd3803315c70 src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 5221a36a801b981fbdfda7b87db64cff231a3b88223a066c325411b539df796f src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 bd2368428b63facfc9586d4be1bd6efb6abce76a9339ba058dd9f399f3efb3b4 src/3rdparty/chromium/third_party/speech-dispatcher/COPYING -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 0cd682f22d04b97de1a6ce05c27c4ae5fddec1e330babc46f5f4f6c586c19f17 src/3rdparty/chromium/third_party/swiftshader/LICENSE -sha256 0eff14f27fd948e2382ef5751b9b6ed596fc59369260510bd9230d08f9404f3e src/3rdparty/chromium/third_party/talloc/LICENSE -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a src/3rdparty/chromium/third_party/typ/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 650cb519e09f781bf4fbd65fa6fc64449ea0d86d62d95172acdf5da74ca0eaf6 src/3rdparty/chromium/third_party/v4l2capture/LICENSE -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 778a9c936b9fa24f3842b6071e3cc5c794d3f7cc6d6fddbf356b6f2202afb6a0 src/3rdparty/chromium/third_party/wayland/LICENSE -sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/LICENSE -sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING -sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 src/3rdparty/chromium/third_party/wayland/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 7de3660b411bdcb1c690c0e0a907ed94626792a1b5139f1cedd3d919b968ecc8 src/3rdparty/chromium/third_party/WebKit/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE -sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python -sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE -sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING -sha256 32b824d99c7e31f7035b6a9b39eac8e8205bfc54cf8573cfe830a367a8735161 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/COPYING -sha256 ac611349a262c2ceab06cd7c4fa104b794986486d3898c4d234a0fbc49e9bf07 src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING -sha256 b3055a036e3bc37a1b9ff2b8316723d06df3997273aa9cb79223a85a48ad6dee src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 2feb814384635271a0a43dec65955439a8b659ddf0a5adae5b5333264dc6518a src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/chromium/third_party/webtreemap/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 1df4adc57d45b1639d3edb2127ee9e33e54b5a4b0809e9dc83ddaff5a62d9ae1 src/3rdparty/chromium/third_party/x86inc/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 9dc0f229412e40d7f1fc4d94de07fcc812a6f31e27718b4dae315305408160fa src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 282644c64aa8c4f0a4a589fd38d2213e41f37b4e0e4f639e01149d09b67117db src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 2337a9caeb13854242af8d0022f8e57389e5eae56fa3bf7887f5f38492b57199 src/3rdparty/chromium/v8/LICENSE -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/Config.in b/buildroot/package/qt5/qt5webengine/Config.in index 0e776ecb6..4e923c7f3 100644 --- a/buildroot/package/qt5/qt5webengine/Config.in +++ b/buildroot/package/qt5/qt5webengine/Config.in @@ -10,10 +10,11 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" @@ -24,7 +25,8 @@ config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs @@ -37,8 +39,9 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBNSS if !BR2_PACKAGE_QT5_VERSION_5_6 + select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX + select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX @@ -52,6 +55,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5QUICKCONTROLS select BR2_PACKAGE_QT5QUICKCONTROLS2 + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB diff --git a/buildroot/package/qt5/qt5webengine/chromium-latest.inc b/buildroot/package/qt5/qt5webengine/chromium-latest.inc index b7a195569..a10e71f12 100644 --- a/buildroot/package/qt5/qt5webengine/chromium-latest.inc +++ b/buildroot/package/qt5/qt5webengine/chromium-latest.inc @@ -4,7 +4,8 @@ # -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ # sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ + src/3rdparty/chromium/base/third_party/cityhash/COPYING \ + src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ @@ -14,47 +15,53 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/build/fuchsia/fidlgen_js/third_party/enum34/LICENSE \ src/3rdparty/chromium/buildtools/LICENSE \ src/3rdparty/chromium/LICENSE \ src/3rdparty/chromium/LICENSE.chromium_os \ src/3rdparty/chromium/mojo/public/LICENSE \ src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ src/3rdparty/chromium/net/third_party/nss/LICENSE \ + src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ + src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ src/3rdparty/chromium/third_party/angle/LICENSE \ src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ src/3rdparty/chromium/third_party/axe-core/LICENSE \ src/3rdparty/chromium/third_party/bazel/LICENSE \ src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE \ - src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ @@ -66,157 +73,628 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/brotli/LICENSE \ src/3rdparty/chromium/third_party/bspatch/LICENSE \ src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ + src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ + src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ src/3rdparty/chromium/third_party/ced/LICENSE \ src/3rdparty/chromium/third_party/ced/src/LICENSE \ src/3rdparty/chromium/third_party/chaijs/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE \ src/3rdparty/chromium/third_party/cld_3/LICENSE \ src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ + src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ + src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ + src/3rdparty/chromium/third_party/dav1d/LICENSE \ + src/3rdparty/chromium/third_party/dawn/LICENSE \ src/3rdparty/chromium/third_party/decklink/LICENSE \ src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits_worker/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ + src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/feed/LICENSE \ + src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ @@ -226,21 +704,23 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ + src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ src/3rdparty/chromium/third_party/fontconfig/LICENSE \ src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ src/3rdparty/chromium/third_party/gestures/LICENSE \ src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ src/3rdparty/chromium/third_party/glslang/LICENSE \ + src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ @@ -250,10 +730,8 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/guava/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/haha/LICENSE \ src/3rdparty/chromium/third_party/hamcrest/LICENSE \ src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ @@ -264,22 +742,31 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/icu/license.html \ src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/ink/LICENSE \ src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ src/3rdparty/chromium/third_party/intellij/LICENSE \ src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/javax_inject/LICENSE \ + src/3rdparty/chromium/third_party/jacoco/LICENSE \ + src/3rdparty/chromium/third_party/javalang/LICENSE \ src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ src/3rdparty/chromium/third_party/jstemplate/COPYING \ src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leakcanary/LICENSE \ src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ src/3rdparty/chromium/third_party/libevdev/LICENSE \ - src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ + src/3rdparty/chromium/third_party/libipp/LICENSE \ src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ src/3rdparty/chromium/third_party/libjpeg/LICENSE \ src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ @@ -304,31 +791,32 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ src/3rdparty/chromium/third_party/libxslt/src/Copyright \ src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/lottie/LICENSE \ src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/mako/LICENSE \ src/3rdparty/chromium/third_party/markupsafe/LICENSE \ src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ + src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ src/3rdparty/chromium/third_party/minigbm/LICENSE \ src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ + src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ src/3rdparty/chromium/third_party/minizip/src/LICENSE \ src/3rdparty/chromium/third_party/mocha/LICENSE \ src/3rdparty/chromium/third_party/mockito/LICENSE \ src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ + src/3rdparty/chromium/third_party/nasm/LICENSE \ src/3rdparty/chromium/third_party/netty4/LICENSE \ src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ src/3rdparty/chromium/third_party/node/LICENSE \ src/3rdparty/chromium/third_party/objenesis/LICENSE \ src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ src/3rdparty/chromium/third_party/openvr/src/LICENSE \ src/3rdparty/chromium/third_party/opus/src/COPYING \ src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ @@ -336,18 +824,25 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ src/3rdparty/chromium/third_party/pdfium/LICENSE \ src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/perfetto/LICENSE \ src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/pffft/LICENSE \ src/3rdparty/chromium/third_party/ply/LICENSE \ src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ + src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ src/3rdparty/chromium/third_party/proguard/LICENSE \ src/3rdparty/chromium/third_party/protobuf/LICENSE \ src/3rdparty/chromium/third_party/pycoverage/LICENSE \ src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ src/3rdparty/chromium/third_party/pystache/LICENSE \ @@ -355,6 +850,8 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ src/3rdparty/chromium/third_party/qcms/src/COPYING \ src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ + src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ src/3rdparty/chromium/third_party/qunit/LICENSE \ src/3rdparty/chromium/third_party/r8/LICENSE \ src/3rdparty/chromium/third_party/re2/LICENSE \ @@ -373,31 +870,31 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ + src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ src/3rdparty/chromium/third_party/smhasher/LICENSE \ src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ + src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ src/3rdparty/chromium/third_party/sqlite/LICENSE \ src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms \ src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING \ src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ src/3rdparty/chromium/third_party/test_fonts/LICENSE \ @@ -409,27 +906,39 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/usrsctp/LICENSE \ src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ src/3rdparty/chromium/third_party/wds/LICENSE \ src/3rdparty/chromium/third_party/wds/src/COPYING \ src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ src/3rdparty/chromium/third_party/webdriver/COPYING \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ src/3rdparty/chromium/third_party/webrtc/LICENSE \ src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + src/3rdparty/chromium/third_party/widevine/LICENSE \ src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/wuffs/LICENSE \ + src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yara/src/COPYING \ src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ @@ -440,12 +949,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/v8/LICENSE.strongtalk \ src/3rdparty/chromium/v8/LICENSE.v8 \ src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt \ src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ + src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ src/3rdparty/gn/base/third_party/icu/LICENSE \ src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING + src/3rdparty/ninja/COPYING \ diff --git a/buildroot/package/qt5/qt5webengine/chromium-lts.inc b/buildroot/package/qt5/qt5webengine/chromium-lts.inc deleted file mode 100644 index fbc1f9b63..000000000 --- a/buildroot/package/qt5/qt5webengine/chromium-lts.inc +++ /dev/null @@ -1,253 +0,0 @@ -# Generated with: -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \)\ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-lts.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ - src/3rdparty/chromium/testing/gmock/LICENSE \ - src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ - src/3rdparty/chromium/testing/gtest/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/appurify-python/LICENSE \ - src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/class-dump/LICENSE \ - src/3rdparty/chromium/third_party/cld/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/closure_linter/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/drmemory/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ - src/3rdparty/chromium/third_party/hwcplus/LICENSE \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/lcov/COPYING \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libexif/sources/COPYING \ - src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ - src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libva/COPYING \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/mojo/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/npapi/LICENSE \ - src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ - src/3rdparty/chromium/third_party/nss/nss/COPYING \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/python_gflags/COPYING \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE \ - src/3rdparty/chromium/third_party/talloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/wayland/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/qt5webengine.hash new file mode 100644 index 000000000..faabac39d --- /dev/null +++ b/buildroot/package/qt5/qt5webengine/qt5webengine.hash @@ -0,0 +1,969 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2 qtwebengine-everywhere-src-5.15.1.tar.xz + +# Locally calculated +sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 + +# Locally calculated with: +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/build/fuchsia/fidlgen_js/third_party/enum34/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE +sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE +sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt +sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE +sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE +sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING +sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md +sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE +sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown +sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits/lighthouse/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits_worker/lighthouse/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE +sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/LICENSE +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE +sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE +sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE +sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE +sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license +sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE +sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE +sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE +sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE +sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/LICENSE +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/LICENSE +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE +sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE +sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license +sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE +sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/LICENSE +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/LICENSE +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE +sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD +sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map +sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE +sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE +sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE +sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license +sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/LICENSE +sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/LICENSE +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/LICENSE +sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE +sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE +sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE +sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/LICENSE +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE +sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt +sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE +sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 076cab8e06ec34890bac1747d2ab00de603a4892d30ae6c2d99e50f7c2400825 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE +sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE +sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE +sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE +sha256 1b32b6e2fea50440c128c5ba482f7691367c46fd0cd573b80fc863bf07964cea src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE +sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE +sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE +sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE +sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE +sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE +sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.mk b/buildroot/package/qt5/qt5webengine/qt5webengine.mk index 898725937..64c9c96cc 100644 --- a/buildroot/package/qt5/qt5webengine/qt5webengine.mk +++ b/buildroot/package/qt5/qt5webengine/qt5webengine.mk @@ -7,39 +7,38 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \ +QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ host-pkgconf host-python QT5WEBENGINE_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) include package/qt5/qt5webengine/chromium-latest.inc -else -include package/qt5/qt5webengine/chromium-lts.inc -endif + QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +QT5WEBENGINE_DEPENDENCIES += qt5svg +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst endif -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss -endif -QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else -QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa endif # QtWebengine's build system uses python, but only supports python2. We work @@ -54,51 +53,14 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config -endif -define QT5WEBENGINE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS)) -endef +QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) +QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -define QT5WEBENGINE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBENGINE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5WEBENGINE_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebEngine $(TARGET_DIR)/usr/qml/ -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBENGINE_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webengine* $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBENGINE_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/ - cp -dpfr $(STAGING_DIR)/usr/resources/ $(TARGET_DIR)/usr/ - mkdir -p $(TARGET_DIR)/usr/translations/ - cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/ -endef -endif - -define QT5WEBENGINE_INSTALL_TARGET_CMDS - $(QT5WEBENGINE_INSTALL_TARGET_LIBS) - $(QT5WEBENGINE_INSTALL_TARGET_QMLS) - $(QT5WEBENGINE_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/buildroot/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch new file mode 100644 index 000000000..2d5e8fae9 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch @@ -0,0 +1,36 @@ +From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 28 May 2020 20:58:26 +0200 +Subject: [PATCH] Fix QPainterPath include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add missing QPainterPath (needed for Qt-5.15.0 compile). + +Fixes: + + searchlineedit.cpp:121:18: error: aggregate ‘QPainterPath myPath’ has incomplete type and cannot be defined + QPainterPath myPath; + ^~~~~~ + +Signed-off-by: Peter Seiderer +--- + examples/webkitwidgets/browser/searchlineedit.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp +index fbd73cb..7462c82 100644 +--- a/examples/webkitwidgets/browser/searchlineedit.cpp ++++ b/examples/webkitwidgets/browser/searchlineedit.cpp +@@ -34,6 +34,7 @@ + #include "searchlineedit.h" + + #include ++#include + #include + #include + #include +-- +2.26.2 + diff --git a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash index 0d48ecdff..736dbef5e 100644 --- a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz diff --git a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 94153fd65..84bc29173 100644 --- a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -4,17 +4,10 @@ # ################################################################################ -# no 5.10 package available, fall back to 5.9.1 version -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -else -QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION) -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION) -endif - QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 @@ -26,29 +19,8 @@ ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns endif -define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBKIT_EXAMPLES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -define QT5WEBKIT_EXAMPLES_INSTALL_QML - cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples -endef endif -define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/examples - cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples - $(QT5WEBKIT_EXAMPLES_INSTALL_QML) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/buildroot/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch similarity index 100% rename from buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch rename to buildroot/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/buildroot/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch similarity index 100% rename from buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch rename to buildroot/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/buildroot/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch similarity index 100% rename from buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch rename to buildroot/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch b/buildroot/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch similarity index 100% rename from buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch rename to buildroot/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch b/buildroot/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch similarity index 100% rename from buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch rename to buildroot/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch diff --git a/buildroot/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch b/buildroot/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch new file mode 100644 index 000000000..d9b94697d --- /dev/null +++ b/buildroot/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch @@ -0,0 +1,34 @@ +From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 3 Feb 2020 21:19:57 +0100 +Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) + +The optio mirclient is removed since Qt-5.14.x (see [1]) +Fixes: + + Project ERROR: Could not find feature mirclient. + +[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 + +Signed-off-by: Peter Seiderer +--- + Tools/qmake/mkspecs/features/configure.prf | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf +index 23d99040..783f6752 100644 +--- a/Tools/qmake/mkspecs/features/configure.prf ++++ b/Tools/qmake/mkspecs/features/configure.prf +@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { + addReasonForSkippingBuild("Build not supported on Android.") + } + QT_FOR_CONFIG += gui-private +- production_build:qtConfig(mirclient) { +- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") +- } + !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { + addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") + } +-- +2.25.0 + diff --git a/buildroot/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/buildroot/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch new file mode 100644 index 000000000..7bb81b125 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -0,0 +1,52 @@ +From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Tue, 4 Aug 2020 21:04:06 +0300 +Subject: [PATCH] Let Bison generate the header directly, to fix build with + Bison 3.7 + +Starting with Bison 3.7, the generated C++ file #include's the header +by default, instead of duplicating it. So we should not delete it. + +Remove the code to add #ifdef guards to the header, since Bison adds +them itself since version 2.6.3. + +[Original patch taken from +https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 +ported to qtwebkit-opensource-src-5.9.1] +Signed-off-by: Peter Seiderer +--- + Source/WebCore/css/makegrammar.pl | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl +index 4e0452ed..9ef32963 100644 +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- ++system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-- +2.28.0 + diff --git a/buildroot/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/buildroot/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch new file mode 100644 index 000000000..9deb2d8c6 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch @@ -0,0 +1,31 @@ +From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 15 Sep 2020 19:11:18 +0200 +Subject: [PATCH] let bison generate the header directly, to fix build with + bison 3.7 + +Do the same as the patch taken from [1] for the bison call in +Source/WebCore/DerivedSources.pri to fix file generation +for bison 3.7. + +Signed-off-by: Peter Seiderer +--- + Source/WebCore/DerivedSources.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri +index 57a6b0f7..e9f52614 100644 +--- a/Source/WebCore/DerivedSources.pri ++++ b/Source/WebCore/DerivedSources.pri +@@ -987,7 +987,7 @@ GENERATORS += pluginsresources + # GENERATOR 11: XPATH grammar + xpathbison.output = ${QMAKE_FILE_BASE}.cpp + xpathbison.input = XPATHBISON +-xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h ++xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp + xpathbison.depends = ${QMAKE_FILE_NAME} + GENERATORS += xpathbison + +-- +2.28.0 + diff --git a/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch deleted file mode 100644 index 14352a160..000000000 --- a/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 -From: Magnus Granberg -Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH] Remove TEXTREL tag in x86 - -Fix textrel QA warnings when building qtwebkit for x86: - - WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel] - -Patch from upstream webkit: - - https://bugs.webkit.org/show_bug.cgi?id=70610 - -Minor refresh required to apply cleanly to the older webkit sources used -by qtwebkit. Specifically, the patch needed to be modified to account -for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not -part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ). - -Upstream status [webkit] : backport -Upstream status [qtwebkit] : unclear - -Bug: https://bugs.webkit.org/show_bug.cgi?id=70610 -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0002-Remove-TEXTREL-tag-in-x86.patch - -Signed-off-by: Gary Bisson ---- - Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++ - Source/WTF/wtf/InlineASM.h | 2 ++ - 2 files changed, 26 insertions(+) - -diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -index 9684df2..8af82d8 100644 ---- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp -+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -@@ -524,6 +524,30 @@ double jsRound(double d) - } \ - static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; - -+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__) -+#define defineUnaryDoubleOpWrapper(function) \ -+ asm( \ -+ ".text\n" \ -+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \ -+ HIDE_SYMBOL(function##Thunk) "\n" \ -+ SYMBOL_STRING(function##Thunk) ":" "\n" \ -+ "pushl %ebx\n" \ -+ "subl $20, %esp\n" \ -+ "movsd %xmm0, (%esp) \n" \ -+ "call __x86.get_pc_thunk.bx\n" \ -+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \ -+ "call " GLOBAL_REFERENCE(function) "\n" \ -+ "fstpl (%esp) \n" \ -+ "movsd (%esp), %xmm0 \n" \ -+ "addl $20, %esp\n" \ -+ "popl %ebx\n" \ -+ "ret\n" \ -+ );\ -+ extern "C" { \ -+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \ -+ } \ -+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; -+ - #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX)) - #define defineUnaryDoubleOpWrapper(function) \ - asm( \ -diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h -index 0a2fe78..2dc40ef 100644 ---- a/Source/WTF/wtf/InlineASM.h -+++ b/Source/WTF/wtf/InlineASM.h -@@ -46,6 +46,8 @@ - #define GLOBAL_REFERENCE(name) #name "@plt" - #elif CPU(X86) && COMPILER(MINGW) - #define GLOBAL_REFERENCE(name) "@" #name "@4" -+#elif OS(LINUX) && CPU(X86) && defined(__PIC__) -+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" - #else - #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) - #endif --- -2.7.0 - diff --git a/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54b..000000000 --- a/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch deleted file mode 100644 index f3b590ead..000000000 --- a/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch +++ /dev/null @@ -1,93 +0,0 @@ -From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 4 May 2017 15:12:37 +0300 -Subject: [PATCH] Fix compilation with ICU 59 - -Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 - -Task-number: QTBUG-60532 -Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 -Reviewed-by: Allan Sandfeld Jensen -Signed-off-by: Peter Korsgaard ---- - Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- - Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- - Source/WTF/wtf/TypeTraits.h | 3 +++ - Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(chars, numChars).leakRef(); -+ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); - } - - JSStringRef JSStringRetain(JSStringRef string) -@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) - - const JSChar* JSStringGetCharactersPtr(JSStringRef string) - { -- return string->characters(); -+ return reinterpret_cast(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f012d..05e27338b 100644 ---- a/Source/JavaScriptCore/runtime/DateConversion.cpp -+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp -@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as - #if OS(WINDOWS) - TIME_ZONE_INFORMATION timeZoneInformation; - GetTimeZoneInformation(&timeZoneInformation); -- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ String timeZoneName(reinterpret_cast(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95cf..f5d6121fd 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; -+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) -+ template<> struct IsInteger { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger { static const bool value = true; }; - #endif -diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp -index cbac67dd8..23400a64e 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.cpp -+++ b/Source/WebKit2/Shared/API/c/WKString.cpp -@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) - size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) - { - COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); -- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) --- -2.11.0 - diff --git a/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch deleted file mode 100644 index 9c2205dd9..000000000 --- a/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 15 Aug 2017 18:28:49 -0400 -Subject: [PATCH] Detect 32-bits armv8-a architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Adds WTF platform support for the 32-bits armv8-a architectures. - -Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) -and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). - -This commit catches this new architecture (armv8a) within a #ifdef/#endif -inside the if statement dedicated for 32-bits ARM detection. - -Fixes: - - In file included from ./config.h:30:0, - from ... - ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" - # error "Not supported ARM architecture" - ^~~~~ - -Upstream-Status: Backport [with adaptations] -Signed-off-by: Gaël PORTAY ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 562840cf7..9cf656845 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -243,6 +243,10 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) -+#define WTF_ARM_ARCH_VERSION 8 -+ - /* MSVC sets _M_ARM */ - #elif defined(_M_ARM) - #define WTF_ARM_ARCH_VERSION _M_ARM --- -2.16.1 - diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa..000000000 --- a/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/buildroot/package/qt5/qt5webkit/Config.in b/buildroot/package/qt5/qt5webkit/Config.in index e071dff20..65f08d1c5 100644 --- a/buildroot/package/qt5/qt5webkit/Config.in +++ b/buildroot/package/qt5/qt5webkit/Config.in @@ -3,13 +3,13 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on BR2_INSTALL_LIBSTDCPP # leveldb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT select BR2_PACKAGE_LEVELDB - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE @@ -31,8 +31,9 @@ config BR2_PACKAGE_QT5WEBKIT http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html -comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/buildroot/package/qt5/qt5webkit/qt5webkit.hash b/buildroot/package/qt5/qt5webkit/qt5webkit.hash index 57ff2ac1b..3068ad920 100644 --- a/buildroot/package/qt5/qt5webkit/qt5webkit.hash +++ b/buildroot/package/qt5/qt5webkit/qt5webkit.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-opensource-src-5.6.3.tar.xz - # hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz diff --git a/buildroot/package/qt5/qt5webkit/qt5webkit.mk b/buildroot/package/qt5/qt5webkit/qt5webkit.mk index 25c549548..dd99661be 100644 --- a/buildroot/package/qt5/qt5webkit/qt5webkit.mk +++ b/buildroot/package/qt5/qt5webkit/qt5webkit.mk @@ -4,19 +4,12 @@ # ################################################################################ -# no 5.9.2 package available, fall back to 5.9.1 version -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBKIT_VERSION = 5.9.1 QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -else -QT5WEBKIT_VERSION = $(QT5_VERSION) -QT5WEBKIT_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION) -endif - QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python host-ruby \ - leveldb qt5base sqlite + leveldb sqlite QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -37,35 +30,20 @@ endif # QtWebkit's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) define QT5WEBKIT_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK -define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb) -endef +QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb -define QT5WEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBKIT_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ -endef -endif - -define QT5WEBKIT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib +define QT5WEBKIT_INSTALL_TARGET_EXTRAS cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef -$(eval $(generic-package)) +QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5websockets/Config.in b/buildroot/package/qt5/qt5websockets/Config.in index 0cfde91c8..678fb6fa0 100644 --- a/buildroot/package/qt5/qt5websockets/Config.in +++ b/buildroot/package/qt5/qt5websockets/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5WEBSOCKETS bool "qt5websockets" - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_NETWORK help Qt is a cross-platform application and UI framework for diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash index 5373c2af7..820950dfe 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.hash +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.hash @@ -1,15 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebsockets-everywhere-src-5.12.8.tar.xz.sha256 -sha256 aa4fe8ac7cffb86745aa4441c4dcaa8965b77a629755b430dac5a98d04be8465 qtwebsockets-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebsockets-everywhere-src-5.15.1.tar.xz.sha256 +sha256 5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e qtwebsockets-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.mk b/buildroot/package/qt5/qt5websockets/qt5websockets.mk index 6e734a3bf..a35cdc579 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.mk +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.mk @@ -7,16 +7,10 @@ QT5WEBSOCKETS_VERSION = $(QT5_VERSION) QT5WEBSOCKETS_SITE = $(QT5_SITE) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz -QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 -else -QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0 -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 -endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) endif @@ -25,41 +19,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBSOCKETS_DEPENDENCIES += qt5declarative endif -define QT5WEBSOCKETS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBSOCKETS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBSOCKETS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBSOCKETS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebSockets $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/websockets $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBSOCKETS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebSockets.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5WEBSOCKETS_INSTALL_TARGET_CMDS - $(QT5WEBSOCKETS_INSTALL_TARGET_LIBS) - $(QT5WEBSOCKETS_INSTALL_TARGET_QMLS) - $(QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5webview/qt5webview.hash b/buildroot/package/qt5/qt5webview/qt5webview.hash index 1a8adfb4b..2e23ddb0a 100644 --- a/buildroot/package/qt5/qt5webview/qt5webview.hash +++ b/buildroot/package/qt5/qt5webview/qt5webview.hash @@ -1,8 +1,5 @@ -# Hash from: https://download.qt.io/archive/qt/5.6/5.6.3/submodules/qtwebview-opensource-src-5.6.3.tar.xz.sha256 -sha256 768a456e89f0fd7cbf39ac6b282e078a098e7426651c0b3d453b10c5c44bd81c qtwebview-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebview-everywhere-src-5.12.8.tar.xz.sha256 -sha256 f6492f01c3c0b2b44ffdd9e7d55d11d39e960ea0080cd29555d0a1be43366de4 qtwebview-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebview-everywhere-src-5.15.1.tar.xz.sha256 +sha256 426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260 qtwebview-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5webview/qt5webview.mk b/buildroot/package/qt5/qt5webview/qt5webview.mk index 0a80dba61..0f37f3eb8 100644 --- a/buildroot/package/qt5/qt5webview/qt5webview.mk +++ b/buildroot/package/qt5/qt5webview/qt5webview.mk @@ -7,7 +7,7 @@ QT5WEBVIEW_VERSION = $(QT5_VERSION) QT5WEBVIEW_SITE = $(QT5_SITE) QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz -QT5WEBVIEW_DEPENDENCIES = qt5base qt5webengine +QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL @@ -16,41 +16,4 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) endif -define QT5WEBVIEW_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBVIEW_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBVIEW_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBVIEW_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebView $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBVIEW_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webview $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBVIEW_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebView.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/webview $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -define QT5WEBVIEW_INSTALL_TARGET_CMDS - $(QT5WEBVIEW_INSTALL_TARGET_LIBS) - $(QT5WEBVIEW_INSTALL_TARGET_QMLS) - $(QT5WEBVIEW_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash deleted file mode 100644 index b34c05998..000000000 --- a/buildroot/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash +++ /dev/null @@ -1,10 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz - -# Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash similarity index 65% rename from buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash rename to buildroot/package/qt5/qt5x11extras/qt5x11extras.hash index bdfec234b..e5680f55f 100644 --- a/buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash +++ b/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtx11extras-everywhere-src-5.12.8.tar.xz.sha256 -sha256 e17f41267aaea2bb182f4d7cb4f6a1a3c4865107b0c5dd715b504f4d648a0ab9 qtx11extras-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtx11extras-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f7cd7c475a41840209808bf8b1de1c6587c3c74e5ae3b0969760b9ed35159e59 qtx11extras-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk b/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk index 6acc9462c..075d36dcd 100644 --- a/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk @@ -7,33 +7,8 @@ QT5X11EXTRAS_VERSION = $(QT5_VERSION) QT5X11EXTRAS_SITE = $(QT5_SITE) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz -QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -define QT5X11EXTRAS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5X11EXTRAS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5X11EXTRAS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5X11EXTRAS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5xmlpatterns/Config.in b/buildroot/package/qt5/qt5xmlpatterns/Config.in index dd8b54eba..2f3eb24f2 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/Config.in +++ b/buildroot/package/qt5/qt5xmlpatterns/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_QT5XMLPATTERNS bool "qt5xmlpatterns" - select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 0a5d4b799..011444a27 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,16 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtxmlpatterns-everywhere-src-5.12.8.tar.xz.sha256 -sha256 10bee783e4a9fcee312cd03c7d288e5811dd9d0fe9aec828baabcd05dd47144e qtxmlpatterns-everywhere-src-5.12.8.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtxmlpatterns-everywhere-src-5.15.1.tar.xz.sha256 +sha256 6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745 qtxmlpatterns-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 5ce4064cb..684548332 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -7,58 +7,16 @@ QT5XMLPATTERNS_VERSION = $(QT5_VERSION) QT5XMLPATTERNS_SITE = $(QT5_SITE) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz -QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative endif -define QT5XMLPATTERNS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5XMLPATTERNS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5XMLPATTERNS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5XMLPATTERNS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5XMLPATTERNS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/XmlListModel $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ -endef +QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif -define QT5XMLPATTERNS_INSTALL_TARGET_CMDS - $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) - $(QT5XMLPATTERNS_INSTALL_TARGET_QMLS) - $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5cinex/qt5cinex.mk b/buildroot/package/qt5cinex/qt5cinex.mk index 89c38ee3f..70038028d 100644 --- a/buildroot/package/qt5cinex/qt5cinex.mk +++ b/buildroot/package/qt5cinex/qt5cinex.mk @@ -12,19 +12,11 @@ QT5CINEX_HD = rpi_ endif QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_HD)$(QT5CINEX_VERSION).tgz -QT5CINEX_DEPENDENCIES = qt5base qt5declarative +QT5CINEX_DEPENDENCIES = qt5declarative QT5CINEX_LICENSE = CC-BY-3.0 QT5CINEX_LICENSE_FILES = README -define QT5CINEX_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake -endef - -define QT5CINEX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - # In addition to the Cinematic Experience itself, we also install a # wrapper shell script to /usr/bin: the Cinematic Experience binary # wants its resource files to be available directly under a contents/ @@ -39,4 +31,4 @@ define QT5CINEX_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/CinematicExperience-demo endef -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch b/buildroot/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..f2fc9cc64 --- /dev/null +++ b/buildroot/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch @@ -0,0 +1,36 @@ +From 01bcd0f7411f86eea44247bf91b48882cae35519 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Sep 2020 23:12:25 +0200 +Subject: [PATCH] lib/prefix.h: fix build with gcc 10 + +Remove __packed to fix the following build failure with gcc 10 (which +defaults to -fno-common): + + CCLD libzebra.la +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: .libs/sockunion.o:(.bss+0x0): multiple definition of `__packed'; .libs/vty.o:(.bss+0x6c): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/82b15cff3f7b943eb93d8270790f1b8561d31d6a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugzilla.quagga.net/show_bug.cgi?id=1014] +--- + lib/prefix.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/prefix.h b/lib/prefix.h +index 2cf0b20b..a5306eee 100644 +--- a/lib/prefix.h ++++ b/lib/prefix.h +@@ -44,7 +44,7 @@ + */ + struct ethaddr { + u_char octet[ETHER_ADDR_LEN]; +-} __packed; ++}; + + + /* +-- +2.28.0 + diff --git a/buildroot/package/quazip/0001-fix-qztest-build-error.patch b/buildroot/package/quazip/0001-fix-qztest-build-error.patch deleted file mode 100644 index 6bbe820a0..000000000 --- a/buildroot/package/quazip/0001-fix-qztest-build-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From df8a2c4f18293cb2eafcf81e5dc169a06dccf304 Mon Sep 17 00:00:00 2001 -From: tsteven4 <13596209+tsteven4@users.noreply.github.com> -Date: Tue, 9 Jul 2019 16:42:28 -0600 -Subject: [PATCH] fix qztest build error. - -If int is bigger than quint16 then you will get the following -linker error: - -.obj/testquazip.o: In function `TestQuaZip::setOsCode()': -testquazip.cpp:(.text+0x42bd): undefined reference to `bool QTest::qCompare(int const&, unsigned short const&, char const*, char const*, char const*, int)' -collect2: error: ld returned 1 exit status - -This error indicates the two parameters of QCOMPARE do not have the same type. - -This occurs because integral promotions can be applied to fi.versionCreated. - -[Retrieved from: -https://github.com/stachenov/quazip/commit/df8a2c4f18293cb2eafcf81e5dc169a06dccf304] -Signed-off-by: Fabrice Fontaine ---- - qztest/testquazip.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qztest/testquazip.cpp b/qztest/testquazip.cpp -index 70a64fc..86f6556 100644 ---- a/qztest/testquazip.cpp -+++ b/qztest/testquazip.cpp -@@ -233,7 +233,7 @@ void TestQuaZip::setOsCode() - checkZip.goToFirstFile(); - QuaZipFileInfo64 fi; - QVERIFY(checkZip.getCurrentFileInfo(&fi)); -- QCOMPARE(fi.versionCreated >> 8, static_cast(osCode)); -+ QCOMPARE(static_cast(fi.versionCreated) >> 8, osCode); - } - - void TestQuaZip::setDataDescriptorWritingEnabled() diff --git a/buildroot/package/quazip/quazip.hash b/buildroot/package/quazip/quazip.hash index e0a8206c5..5eff5cfb3 100644 --- a/buildroot/package/quazip/quazip.hash +++ b/buildroot/package/quazip/quazip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 quazip-0.8.1.tar.gz -sha256 d2a653b46b87963f29a7f1523e7c39bafdbb3592dfa01725e61a523387148e72 COPYING +sha256 54edce9c11371762bd4f0003c2937b5d8806a2752dd9c0fd9085e90792612ad0 quazip-1.1.tar.gz +sha256 3aab586a5bdc8ffbbf033c7106550fd3e849fd8888e33cbc9bfd30a433c4b1cb COPYING diff --git a/buildroot/package/quazip/quazip.mk b/buildroot/package/quazip/quazip.mk index 53042f6c4..44645ec9b 100644 --- a/buildroot/package/quazip/quazip.mk +++ b/buildroot/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 0.8.1 +QUAZIP_VERSION = 1.1 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ @@ -13,20 +13,4 @@ QUAZIP_DEPENDENCIES = \ QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -define QUAZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QUAZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QUAZIP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) -endef - -define QUAZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/qwt/Config.in b/buildroot/package/qwt/Config.in index 2e9cec19d..736ccc2a5 100644 --- a/buildroot/package/qwt/Config.in +++ b/buildroot/package/qwt/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QWT bool "qwt" depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport select BR2_PACKAGE_QT5BASE_CONCURRENT diff --git a/buildroot/package/qwt/qwt.hash b/buildroot/package/qwt/qwt.hash index 95e910e5e..5e9a9a3d7 100644 --- a/buildroot/package/qwt/qwt.hash +++ b/buildroot/package/qwt/qwt.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.4/ -sha1 a1028cb0a33322920266fb183869023b8ed30394 qwt-6.1.4.tar.bz2 -md5 4fb1852f694420e3ab9c583526edecc5 qwt-6.1.4.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.1.5/ +sha1 07c71427f1f4bbd0354b3a98965943ce2f220766 qwt-6.1.5.tar.bz2 +md5 d65582f99312796ed42c3be3208ed3db qwt-6.1.5.tar.bz2 # Locally computed -sha256 1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9 qwt-6.1.4.tar.bz2 -sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING +sha256 4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041 qwt-6.1.5.tar.bz2 +sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/buildroot/package/qwt/qwt.mk b/buildroot/package/qwt/qwt.mk index a82c786cb..95a041e97 100644 --- a/buildroot/package/qwt/qwt.mk +++ b/buildroot/package/qwt/qwt.mk @@ -4,11 +4,10 @@ # ################################################################################ -QWT_VERSION = 6.1.4 +QWT_VERSION = 6.1.5 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES -QWT_DEPENDENCIES = qt5base QWT_LICENSE = LGPL-2.1 with exceptions QWT_LICENSE_FILES = COPYING @@ -42,14 +41,11 @@ else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/' endif -define QWT_CONFIGURE_CMDS +define QWT_TWEAK_QWTCONFIG_PRI $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef -define QWT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QWT_PRE_CONFIGURE_HOOKS += QWT_TWEAK_QWTCONFIG_PRI # After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so # that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and @@ -65,4 +61,4 @@ define QWT_INSTALL_TARGET_CMDS rm -Rf $(TARGET_DIR)/usr/mkspecs endef -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/buildroot/package/rabbitmq-server/S50rabbitmq-server b/buildroot/package/rabbitmq-server/S50rabbitmq-server index faf248ded..35f784486 100644 --- a/buildroot/package/rabbitmq-server/S50rabbitmq-server +++ b/buildroot/package/rabbitmq-server/S50rabbitmq-server @@ -5,10 +5,12 @@ INSTALLUSER=rabbitmq RUNDIR=/var/run/rabbitmq +LOGDIR=/var/log/rabbitmq case "$1" in start) install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 + install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1 printf "Starting rabbitmq-server: " su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null [ $? = 0 ] && echo "OK" || echo "FAIL" diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.hash b/buildroot/package/rabbitmq-server/rabbitmq-server.hash index 3c552820c..693ab208e 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.hash +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.hash @@ -1,18 +1,25 @@ # Locally computed -sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e rabbitmq-server-3.6.6.tar.xz -sha256 f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba LICENSE-MPL-RabbitMQ -sha256 2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985 LICENSE +sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d rabbitmq-server-3.8.2.tar.xz +sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3 LICENSE +sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a LICENSE-APACHE2 +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE-APACHE2-excanvas sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE-APL2-Rebar sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket -sha256 cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f LICENSE-BSD-base64js -sha256 2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1 LICENSE-BSD-glMatrix -sha256 a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd LICENSE-EPL-OTP +sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9 LICENSE-BSD-base64js +sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35 LICENSE-BSD-recon +sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8 LICENSE-erlcloud +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-httpc_aws +sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689 LICENSE-ISC-cowboy +sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1 LICENSE-MIT-EJS sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 -sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c LICENSE-MIT-Flot -sha256 f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b LICENSE-MIT-jQuery164 +sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4 LICENSE-MIT-Erlware-Commons +sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE-MIT-Flot +sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5 LICENSE-MIT-jQuery +sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476 LICENSE-MIT-jQuery164 sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi -sha256 363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115 LICENSE-MIT-Mochiweb +sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c LICENSE-MIT-Sammy sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 -sha256 c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f LICENSE-MIT-SockJS -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE-MPL2 +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL +sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL-RabbitMQ +sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSE-MPL2 +sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-rabbitmq_aws diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.mk b/buildroot/package/rabbitmq-server/rabbitmq-server.mk index f9c28e667..26c2fae5e 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.mk +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.mk @@ -4,20 +4,36 @@ # ################################################################################ -RABBITMQ_SERVER_VERSION = 3.6.6 -RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION) +RABBITMQ_SERVER_VERSION = 3.8.2 +RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION) RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0 -RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ - LICENSE LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js LICENSE-BSD-glMatrix \ - LICENSE-EPL-OTP LICENSE-MIT-EJS10 \ - LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ - LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ - LICENSE-MPL2 -RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt +RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC +RABBITMQ_SERVER_LICENSE_FILES = \ + LICENSE \ + LICENSE-APACHE2 \ + LICENSE-APACHE2-excanvas \ + LICENSE-APACHE2-ExplorerCanvas \ + LICENSE-APL2-Stomp-Websocket \ + LICENSE-BSD-base64js \ + LICENSE-BSD-recon \ + LICENSE-erlcloud \ + LICENSE-httpc_aws \ + LICENSE-ISC-cowboy \ + LICENSE-MIT-EJS \ + LICENSE-MIT-EJS10 \ + LICENSE-MIT-Erlware-Commons \ + LICENSE-MIT-Flot \ + LICENSE-MIT-jQuery \ + LICENSE-MIT-jQuery164 \ + LICENSE-MIT-Mochi \ + LICENSE-MIT-Sammy \ + LICENSE-MIT-Sammy060 \ + LICENSE-MPL \ + LICENSE-MPL-RabbitMQ \ + LICENSE-MPL2 \ + LICENSE-rabbitmq_aws + +RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults define RABBITMQ_SERVER_BUILD_CMDS diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.service b/buildroot/package/rabbitmq-server/rabbitmq-server.service index 268b4bdcd..f69b33d45 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.service +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.service @@ -8,6 +8,7 @@ User=rabbitmq Group=rabbitmq Environment=HOME=/var/lib/rabbitmq WorkingDirectory=/var/lib/rabbitmq +LogsDirectory=/var/log/rabbitmq ExecStart=/usr/sbin/rabbitmq-server ExecStop=/usr/sbin/rabbitmqctl stop diff --git a/buildroot/package/racehound/Config.in b/buildroot/package/racehound/Config.in index 2d1ccb838..d13f90adb 100644 --- a/buildroot/package/racehound/Config.in +++ b/buildroot/package/racehound/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RACEHOUND depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils # only x86/x86_64 supported depends on BR2_i386 || BR2_x86_64 @@ -29,7 +30,8 @@ comment "racehound needs an Linux kernel >= 3.14 to be built" depends on !BR2_LINUX_KERNEL depends on BR2_i386 || BR2_x86_64 -comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library" +comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads" depends on BR2_i386 || BR2_x86_64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/buildroot/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash index 51f37f6cb..d32712229 100644 --- a/buildroot/package/rauc/rauc.hash +++ b/buildroot/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.3/rauc-1.4.tar.xz.asc +# https://github.com/rauc/rauc/releases/download/v1.4/rauc-1.4.tar.xz.asc sha256 85aabf214cd93a37f7ad0b3aaad89eb94facf0f3ebf6e2edca945acbca9b0967 rauc-1.4.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/rcw/rcw.hash b/buildroot/package/rcw/rcw.hash index 7de1ec659..76b637394 100644 --- a/buildroot/package/rcw/rcw.hash +++ b/buildroot/package/rcw/rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1421ada9fec10b12ff21cd9ad82f0a835b191cb2dde80f03547764574b1346c3 rcw-LSDK-18.12.tar.gz +sha256 b69a6a8b187ba794e0af716a509ced2bbac83da0f6e94b5c7331a34619db21b1 rcw-LSDK-19.09.tar.gz sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE diff --git a/buildroot/package/rcw/rcw.mk b/buildroot/package/rcw/rcw.mk index dbfeae7b2..22e3be4f1 100644 --- a/buildroot/package/rcw/rcw.mk +++ b/buildroot/package/rcw/rcw.mk @@ -4,13 +4,13 @@ # ################################################################################ -RCW_VERSION = LSDK-18.12 +RCW_VERSION = LSDK-19.09 RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw RCW_SITE_METHOD = git RCW_LICENSE = BSD-3-Clause RCW_LICENSE_FILES = LICENSE -HOST_RCW_DEPENDENCIES = host-python +HOST_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH)) @@ -40,8 +40,13 @@ define HOST_RCW_ADD_CUSTOM_RCW_FILES endef HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES +# rcw.py is a python3-only script, and we can be using either the +# system-provided python3, or our own built with host-python3. +# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will +# easily find it from PATH. define HOST_RCW_BUILD_CMDS - $(HOST_DIR)/bin/python $(@D)/rcw.py \ + PATH=$(BR_PATH) \ + $(@D)/rcw.py \ -i $(@D)/custom_board/rcw/$(RCW_PROJECT) \ -I $(@D)/custom_board -o $(@D)/PBL.bin endef diff --git a/buildroot/package/rdesktop/Config.in b/buildroot/package/rdesktop/Config.in index 0335bee2a..d07a1d5c7 100644 --- a/buildroot/package/rdesktop/Config.in +++ b/buildroot/package/rdesktop/Config.in @@ -1,9 +1,15 @@ config BR2_PACKAGE_RDESKTOP bool "rdesktop" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # gnutls + depends on BR2_USE_WCHAR # gnutls depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBTASN1 + select BR2_PACKAGE_NETTLE select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XLIB_LIBXT help rdesktop is an open source client for Windows NT Terminal @@ -12,3 +18,7 @@ config BR2_PACKAGE_RDESKTOP present the user's NT desktop. http://rdesktop.sf.net/ + +comment "rdesktop needs a toolchain w/ wchar, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/buildroot/package/rdesktop/rdesktop.hash b/buildroot/package/rdesktop/rdesktop.hash index d42ab59be..f9715d2a4 100644 --- a/buildroot/package/rdesktop/rdesktop.hash +++ b/buildroot/package/rdesktop/rdesktop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ffb9f8e2f0b7a06e383e550698bdc9734ae33eb3ec971b0a094078434a4bba6d rdesktop-1.8.6.tar.gz +sha256 473c2f312391379960efe41caad37852c59312bc8f100f9b5f26609ab5704288 rdesktop-1.9.0.tar.gz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/rdesktop/rdesktop.mk b/buildroot/package/rdesktop/rdesktop.mk index f40521d2b..672d85b5c 100644 --- a/buildroot/package/rdesktop/rdesktop.mk +++ b/buildroot/package/rdesktop/rdesktop.mk @@ -4,18 +4,26 @@ # ################################################################################ -RDESKTOP_VERSION = 1.8.6 -RDESKTOP_SITE = $(call github,rdesktop,rdesktop,v$(RDESKTOP_VERSION)) -RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \ +RDESKTOP_VERSION = 1.9.0 +RDESKTOP_SITE = \ + https://github.com/rdesktop/rdesktop/releases/download/v$(RDESKTOP_VERSION) +RDESKTOP_DEPENDENCIES = \ + host-pkgconf \ + gnutls \ + libtasn1 \ + nettle \ + xlib_libX11 \ + xlib_libXcursor \ + xlib_libXt \ $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \ $(if $(BR2_PACKAGE_LIBAO),libao) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ + $(if $(BR2_PACKAGE_PULSEAUDIO),pulseaudio) \ $(if $(BR2_PACKAGE_XLIB_LIBXRANDR),xlib_libXrandr) -RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp +RDESKTOP_CONF_OPTS = --disable-credssp RDESKTOP_LICENSE = GPL-3.0+ RDESKTOP_LICENSE_FILES = COPYING -# From git -RDESKTOP_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PCSC_LITE),y) RDESKTOP_DEPENDENCIES += pcsc-lite diff --git a/buildroot/package/re2/Config.in b/buildroot/package/re2/Config.in new file mode 100644 index 000000000..64217e8aa --- /dev/null +++ b/buildroot/package/re2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_RE2 + bool "re2" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # needs C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS + help + RE2 is a fast, safe, thread-friendly alternative + to backtracking regular expression engines like + those used in PCRE, Perl, and Python. + It is a C++ library. + + https://github.com/google/re2 + +comment "re2 needs a toolchain w/ C++, threads, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/re2/re2.hash b/buildroot/package/re2/re2.hash new file mode 100644 index 000000000..b5457a59b --- /dev/null +++ b/buildroot/package/re2/re2.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 8903cc66c9d34c72e2bc91722288ebc7e3ec37787ecfef44d204b2d6281954d7 re2-2020-11-01.tar.gz +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/buildroot/package/re2/re2.mk b/buildroot/package/re2/re2.mk new file mode 100644 index 000000000..585846d57 --- /dev/null +++ b/buildroot/package/re2/re2.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# re2 +# +################################################################################ + +RE2_VERSION = 2020-11-01 +RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) +RE2_LICENSE = BSD-3-Clause +RE2_LICENSE_FILES = LICENSE +RE2_INSTALL_STAGING = YES + +RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF +HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/read-edid/0003-fix-build-with-gcc-10.patch b/buildroot/package/read-edid/0003-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..713b09aa8 --- /dev/null +++ b/buildroot/package/read-edid/0003-fix-build-with-gcc-10.patch @@ -0,0 +1,49 @@ +fix build with gcc 10 + +Define quiet as static to avoid the following build failure with gcc 10 +(which defaults to -fno-common): + +/home/naourr/work/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/get-edid.dir/i2c.c.o:(.bss+0x0): multiple definition of `quiet'; CMakeFiles/get-edid.dir/get-edid.c.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/28bde8049b6610273bceae26eca407c819a37dcd + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to pyrophobicman@gmail.com] + +diff -Nura read-edid-3.0.2.orig/get-edid/classic.c read-edid-3.0.2/get-edid/classic.c +--- read-edid-3.0.2.orig/get-edid/classic.c 2020-09-25 23:25:01.928805414 +0200 ++++ read-edid-3.0.2/get-edid/classic.c 2020-09-25 23:26:37.440807301 +0200 +@@ -26,7 +26,7 @@ + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++static int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +diff -Nura read-edid-3.0.2.orig/get-edid/get-edid.c read-edid-3.0.2/get-edid/get-edid.c +--- read-edid-3.0.2.orig/get-edid/get-edid.c 2020-09-25 23:25:01.928805414 +0200 ++++ read-edid-3.0.2/get-edid/get-edid.c 2020-09-25 23:28:20.740809341 +0200 +@@ -9,7 +9,7 @@ + #include + #include + +-int quiet=0; ++static int quiet=0; + int i2conly=0; //0=both, 1=i2conly, 2=classiconly + int i2cbus=-1; + int classmon=0; +diff -Nura read-edid-3.0.2.orig/get-edid/i2c.c read-edid-3.0.2/get-edid/i2c.c +--- read-edid-3.0.2.orig/get-edid/i2c.c 2020-09-25 23:25:01.928805414 +0200 ++++ read-edid-3.0.2/get-edid/i2c.c 2020-09-25 23:28:32.152809567 +0200 +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++static int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + diff --git a/buildroot/package/reaver/0001-fix-271.patch b/buildroot/package/reaver/0001-fix-271.patch deleted file mode 100644 index 9f6b39512..000000000 --- a/buildroot/package/reaver/0001-fix-271.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break; diff --git a/buildroot/package/reaver/Config.in b/buildroot/package/reaver/Config.in index 0fd8ab7c6..c286fa8d3 100644 --- a/buildroot/package/reaver/Config.in +++ b/buildroot/package/reaver/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins @@ -7,3 +8,6 @@ config BR2_PACKAGE_REAVER https://code.google.com/archive/p/reaver-wps/wikis/README.wiki https://github.com/t6x/reaver-wps-fork-t6x + +comment "reaver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/reaver/reaver.hash b/buildroot/package/reaver/reaver.hash index fad81fe32..780e6ac86 100644 --- a/buildroot/package/reaver/reaver.hash +++ b/buildroot/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/buildroot/package/reaver/reaver.mk b/buildroot/package/reaver/reaver.mk index 093ac935a..2b5f82960 100644 --- a/buildroot/package/reaver/reaver.mk +++ b/buildroot/package/reaver/reaver.mk @@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE diff --git a/buildroot/package/redir/Config.in b/buildroot/package/redir/Config.in new file mode 100644 index 000000000..6e51c6421 --- /dev/null +++ b/buildroot/package/redir/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_REDIR + bool "redir" + depends on BR2_USE_MMU # fork() + help + This is a TCP port redirector for UNIX. + + https://github.com/troglobit/redir diff --git a/buildroot/package/redir/redir.hash b/buildroot/package/redir/redir.hash new file mode 100644 index 000000000..8cc19f6ac --- /dev/null +++ b/buildroot/package/redir/redir.hash @@ -0,0 +1,4 @@ +# From https://github.com/troglobit/redir/releases/download/v3.3/redir-3.3.tar.xz.md5 +md5 b452e1ca6faded7bab9c76dd61d9d983 redir-3.3.tar.xz +# License files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/redir/redir.mk b/buildroot/package/redir/redir.mk new file mode 100644 index 000000000..ea02d43a1 --- /dev/null +++ b/buildroot/package/redir/redir.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# redir +# +################################################################################ + +REDIR_VERSION = 3.3 +REDIR_SOURCE = redir-$(REDIR_VERSION).tar.xz +REDIR_SITE = https://github.com/troglobit/redir/releases/download/v$(REDIR_VERSION) +REDIR_LICENSE = GPL-2.0+ +REDIR_LICENSE_FILES = COPYING +REDIR_CONF_OPTS = \ + --disable-compat \ + --enable-shaper \ + --enable-ftp + +$(eval $(autotools-package)) diff --git a/buildroot/package/redis/Config.in b/buildroot/package/redis/Config.in index 2450ccdf7..a2239b4a5 100644 --- a/buildroot/package/redis/Config.in +++ b/buildroot/package/redis/Config.in @@ -2,16 +2,21 @@ config BR2_PACKAGE_REDIS bool "redis" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() help - Redis is an open source, advanced key-value store. It is - often referred to as a data structure server since keys can - contain strings, hashes, lists, sets and sorted sets. + Redis is an open source (BSD licensed), in-memory data + structure store, used as a database, cache and message + broker. It supports data structures such as strings, + hashes, lists, sets, sorted sets with range queries, + bitmaps, hyperloglogs, geospatial indexes with radius + queries and streams. http://www.redis.io -comment "redis needs a toolchain w/ dynamic library, threads" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index 7fd6f1b0d..d686d5984 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ -# From https://github.com/antirez/redis-hashes/blob/master/README -sha256 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85 redis-5.0.9.tar.gz +# From https://github.com/redis/redis-hashes/blob/master/README +sha256 04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68 redis-6.0.8.tar.gz # Locally calculated -sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING +sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index baef2e235..c567d3200 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 5.0.9 +REDIS_VERSION = 6.0.8 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING @@ -30,6 +30,20 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +REDIS_DEPENDENCIES += systemd +REDIS_BUILDOPTS += USE_SYSTEMD=yes +else +REDIS_BUILDOPTS += USE_SYSTEMD=no +endif + +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +REDIS_DEPENDENCIES += libopenssl +REDIS_BUILDOPTS += BUILD_TLS=yes +else +REDIS_BUILDOPTS += BUILD_TLS=no +endif + define REDIS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) endef diff --git a/buildroot/package/redis/redis.service b/buildroot/package/redis/redis.service index 0a8162b8a..2cc82a198 100644 --- a/buildroot/package/redis/redis.service +++ b/buildroot/package/redis/redis.service @@ -1,13 +1,15 @@ [Unit] -Description=Advanced key-value store +Description=Redis data structure server +Documentation=https://redis.io/documentation After=network.target [Service] -Type=simple +Type=notify User=redis Group=redis -ExecStart=/usr/bin/redis-server /etc/redis.conf -ExecStop=/usr/bin/redis-cli shutdown +ExecStart=/usr/bin/redis-server --supervised systemd --daemonize no +TimeoutStartSec=5 +TimeoutStopSec=5 CapabilityBoundingSet= PrivateTmp=true PrivateDevices=true diff --git a/buildroot/package/refpolicy/Config.in b/buildroot/package/refpolicy/Config.in index b50b2f09f..c529b85e1 100644 --- a/buildroot/package/refpolicy/Config.in +++ b/buildroot/package/refpolicy/Config.in @@ -28,6 +28,41 @@ config BR2_PACKAGE_REFPOLICY if BR2_PACKAGE_REFPOLICY +choice + prompt "Refpolicy version" + default BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + +config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + bool "Upstream version" + help + Use the refpolicy as provided by Buildroot. + +config BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + bool "Custom git repository" + help + Allows to get the refpolicy from a custom git repository. + + The custom refpolicy must define the full policy explicitly, + and must be a fork of the original refpolicy, to have the + same build system. When this is selected, only the custom + policy definition are taken into account and all the modules + of the policy are built into the binary policy. + +endchoice + +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + +config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git. + E.g. a sha id, tag, branch... + +endif + choice prompt "SELinux default state" default BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE @@ -54,6 +89,28 @@ config BR2_PACKAGE_REFPOLICY_POLICY_STATE default "enforcing" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_ENFORCING default "disabled" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_DISABLED +if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + +config BR2_REFPOLICY_EXTRA_MODULES_DIRS + string "Extra modules directories" + help + Specify a space-separated list of directories containing + SELinux modules that will be built into the SELinux + policy. The modules will be automatically enabled in the + policy. + + Each of those directories must contain the SELinux policy + .fc, .if and .te files directly at the top-level, with no + sub-directories. Also, you cannot have several modules with + the same name in different directories. + +config BR2_REFPOLICY_EXTRA_MODULES + string "Extra modules to enable" + help + List of extra SELinux modules to enable in the refpolicy. + +endif + endif comment "refpolicy needs a toolchain w/ threads" diff --git a/buildroot/package/refpolicy/refpolicy.hash b/buildroot/package/refpolicy/refpolicy.hash index 0c77b626c..8605d07c0 100644 --- a/buildroot/package/refpolicy/refpolicy.hash +++ b/buildroot/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 67bd1213e9d014ada15512028bb7f35ef6610c2d209cc5117b8577474aa6147f refpolicy-2.20190609.tar.bz2 +sha256 dec854512ed00cd057408f330c2cea4de7a4405f7a147458f59c994bf578e4b0 refpolicy-2.20200229.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk index 1a5fefff0..0e94b7282 100644 --- a/buildroot/package/refpolicy/refpolicy.mk +++ b/buildroot/package/refpolicy/refpolicy.mk @@ -4,9 +4,6 @@ # ################################################################################ -REFPOLICY_VERSION = 2.20190609 -REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 -REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609 REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING REFPOLICY_INSTALL_STAGING = YES @@ -18,6 +15,17 @@ REFPOLICY_DEPENDENCIES = \ host-setools \ host-gawk +ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) +REFPOLICY_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION)) +REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) +REFPOLICY_SITE_METHOD = git +BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) +else +REFPOLICY_VERSION = 2.20200229 +REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 +REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200229 +endif + # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ @@ -29,15 +37,82 @@ REFPOLICY_POLICY_VERSION = $(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION) REFPOLICY_POLICY_STATE = \ $(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_STATE)) +ifeq ($(BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION),y) + +# Allow to provide out-of-tree SELinux modules in addition to the ones +# in the refpolicy. +REFPOLICY_EXTRA_MODULES_DIRS = \ + $(strip \ + $(call qstrip,$(BR2_REFPOLICY_EXTRA_MODULES_DIRS)) \ + $(PACKAGES_SELINUX_EXTRA_MODULES_DIRS)) +$(foreach dir,$(REFPOLICY_EXTRA_MODULES_DIRS),\ + $(if $(wildcard $(dir)),,\ + $(error BR2_REFPOLICY_EXTRA_MODULES_DIRS contains nonexistent directory $(dir)))) + +REFPOLICY_MODULES = \ + application \ + authlogin \ + getty \ + init \ + libraries \ + locallogin \ + logging \ + miscfiles \ + modutils \ + mount \ + selinuxutil \ + storage \ + sysadm \ + sysnetwork \ + unconfined \ + userdomain \ + $(PACKAGES_SELINUX_MODULES) \ + $(call qstrip,$(BR2_REFPOLICY_EXTRA_MODULES)) \ + $(foreach d,$(REFPOLICY_EXTRA_MODULES_DIRS),\ + $(basename $(notdir $(wildcard $(d)/*.te)))) + +define REFPOLICY_COPY_EXTRA_MODULES + mkdir -p $(@D)/policy/modules/buildroot + rsync -au $(addsuffix /*,$(REFPOLICY_EXTRA_MODULES_DIRS)) \ + $(@D)/policy/modules/buildroot/ + if [ ! -f $(@D)/policy/modules/buildroot/metadata.xml ]; then \ + echo "Buildroot extra modules" > \ + $(@D)/policy/modules/buildroot/metadata.xml; \ + fi +endef + +# In the context of a monolithic policy enabling a piece of the policy as +# 'base' or 'module' is equivalent, so we enable them as 'base'. +define REFPOLICY_CONFIGURE_MODULES + $(SED) "s/ = module/ = no/g" $(@D)/policy/modules.conf + $(foreach m,$(sort $(REFPOLICY_MODULES)), + $(SED) "/^$(m) =/c\$(m) = base" $(@D)/policy/modules.conf + ) +endef + +endif # BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION = y + +ifeq ($(BR2_INIT_SYSTEMD),y) +define REFPOLICY_CONFIGURE_SYSTEMD + $(SED) "/SYSTEMD/c\SYSTEMD = y" $(@D)/build.conf +endef +endif + define REFPOLICY_CONFIGURE_CMDS $(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = $(REFPOLICY_POLICY_VERSION)" \ $(@D)/build.conf $(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf $(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf + $(REFPOLICY_CONFIGURE_SYSTEMD) + $(if $(REFPOLICY_EXTRA_MODULES_DIRS), \ + $(REFPOLICY_COPY_EXTRA_MODULES) + ) + $(REFPOLICY_MAKE) -C $(@D) bare conf + $(REFPOLICY_CONFIGURE_MODULES) endef define REFPOLICY_BUILD_CMDS - $(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) bare conf + $(REFPOLICY_MAKE) -C $(@D) policy endef define REFPOLICY_INSTALL_STAGING_CMDS diff --git a/buildroot/package/resiprocate/Config.in b/buildroot/package/resiprocate/Config.in new file mode 100644 index 000000000..ed57e09c1 --- /dev/null +++ b/buildroot/package/resiprocate/Config.in @@ -0,0 +1,48 @@ +comment "resiprocate needs a toolchain w/ C++, threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +config BR2_PACKAGE_RESIPROCATE + bool "resiprocate" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_C_ARES + help + reSIProcate is a framework that aims to fully implement the + SIP protocol in first class C++. It is intended for use in + other applications, such as the repro SIP proxy. + + By default this package provides the core libraries: librutil + (utilities), libresip (SIP stack/RFC compliant message + parsing) and libdum (SIP Dialog Usage Manager, a state + machine for SIP dialogs). + + https://www.resiprocate.org/ + +if BR2_PACKAGE_RESIPROCATE + +config BR2_PACKAGE_RESIPROCATE_DTLS_SUPPORT + bool "DTLS support" + select BR2_PACKAGE_OPENSSL + help + Enable DTLS support (requires OpenSSL) + +config BR2_PACKAGE_RESIPROCATE_REND + bool "resiprocate-rend" + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_POPT + help + Rend is tool that is was created specifically to load test + gtSIP based presence servers. + +config BR2_PACKAGE_RESIPROCATE_APPS + bool "resiprocate-apps" + select BR2_PACKAGE_PCRE + help + Build apps clicktocall and sipdial + +endif # BR2_PACKAGE_RESIPROCATE diff --git a/buildroot/package/resiprocate/resiprocate.hash b/buildroot/package/resiprocate/resiprocate.hash new file mode 100644 index 000000000..03336c64a --- /dev/null +++ b/buildroot/package/resiprocate/resiprocate.hash @@ -0,0 +1,4 @@ +# http://list.resiprocate.org/pipermail/resiprocate-announce/2020-May/000000.html +sha256 046826503d3c8682ae0e42101b28f903c5f988235f1ff4a98dbfb9066d0d3d49 resiprocate-1.12.0.tar.gz +# Locally Computed +sha256 16b0fd1938a10fcd145904cc2dad74500fef9d27fc15b44cf8e8f92011f94d35 COPYING diff --git a/buildroot/package/resiprocate/resiprocate.mk b/buildroot/package/resiprocate/resiprocate.mk new file mode 100644 index 000000000..e4915eec5 --- /dev/null +++ b/buildroot/package/resiprocate/resiprocate.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# resiprocate +# +################################################################################ + +RESIPROCATE_VERSION = 1.12.0 +RESIPROCATE_SITE = https://www.resiprocate.org/files/pub/reSIProcate/releases +# For complete details see https://www.resiprocate.org/License +RESIPROCATE_LICENSE = VSL-1.0, BSD-3-Clause +RESIPROCATE_LICENSE_FILES = COPYING +RESIPROCATE_INSTALL_STAGING = YES + +# Utilize c-ares from buildroot instead built in ARES library +# NOTE: resiprocate doesn't support --without- syntax as it will try +# to build with package if specified +RESIPROCATE_DEPENDENCIES = c-ares +RESIPROCATE_CONF_OPTS = -with-c-ares \ + --with-sysroot="$(STAGING_DIR)" + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +RESIPROCATE_DEPENDENCIES += openssl host-pkgconf +RESIPROCATE_CONF_OPTS += --with-ssl +# Configure.ac does not include '-lz' when statically linking against openssl +RESIPROCATE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` +endif + +ifeq ($(BR2_PACKAGE_POPT),y) +RESIPROCATE_CONF_OPTS += --with-popt +RESIPROCATE_DEPENDENCIES += popt +endif + +ifeq ($(BR2_PACKAGE_RESIPROCATE_DTLS_SUPPORT),y) +RESIPROCATE_CONF_OPTS += --with-dtls +endif + +ifeq ($(BR2_PACKAGE_RESIPROCATE_REND),y) +RESIPROCATE_CONF_OPTS += --with-rend +RESIPROCATE_DEPENDENCIES += boost +endif + +ifeq ($(BR2_PACKAGE_RESIPROCATE_APPS),y) +RESIPROCATE_CONF_OPTS += --with-apps +RESIPROCATE_DEPENDENCIES += pcre +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/restclient-cpp/restclient-cpp.hash b/buildroot/package/restclient-cpp/restclient-cpp.hash index 428ec51f5..96c6d6c9e 100644 --- a/buildroot/package/restclient-cpp/restclient-cpp.hash +++ b/buildroot/package/restclient-cpp/restclient-cpp.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 6ae98c65333214d13d765d8fde04ec696f88ce349a419df0fbfc4564bc779df3 restclient-cpp-0.5.1.tar.gz -sha256 1c2f79e825a39eb61d8919044776627f4d079ff38975410a3bde340154fc94a4 LICENSE +sha256 d62ba618f9a938652fd53b483289e8662a99451839e59058c8beb286dfbc65ec restclient-cpp-0.5.2.tar.gz +sha256 1c2f79e825a39eb61d8919044776627f4d079ff38975410a3bde340154fc94a4 LICENSE diff --git a/buildroot/package/restclient-cpp/restclient-cpp.mk b/buildroot/package/restclient-cpp/restclient-cpp.mk index 939333309..826be870b 100644 --- a/buildroot/package/restclient-cpp/restclient-cpp.mk +++ b/buildroot/package/restclient-cpp/restclient-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTCLIENT_CPP_VERSION = 0.5.1 +RESTCLIENT_CPP_VERSION = 0.5.2 RESTCLIENT_CPP_SITE = $(call github,mrtazz,restclient-cpp,$(RESTCLIENT_CPP_VERSION)) RESTCLIENT_CPP_LICENSE = MIT RESTCLIENT_CPP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/restorecond/restorecond.hash b/buildroot/package/restorecond/restorecond.hash index 7a82bda37..e30e62a81 100644 --- a/buildroot/package/restorecond/restorecond.hash +++ b/buildroot/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 cbf9820583e641ee0462fa7bc89e6024676af281e025703e17b2d019b1a25a4f restorecond-2.9.tar.gz +sha256 82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0 restorecond-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/restorecond/restorecond.mk b/buildroot/package/restorecond/restorecond.mk index c519b5de2..7ab7e978d 100644 --- a/buildroot/package/restorecond/restorecond.mk +++ b/buildroot/package/restorecond/restorecond.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 2.9 -RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +RESTORECOND_VERSION = 3.1 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING diff --git a/buildroot/package/ripgrep/Config.in b/buildroot/package/ripgrep/Config.in index 5446ad046..0ea2902b3 100644 --- a/buildroot/package/ripgrep/Config.in +++ b/buildroot/package/ripgrep/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RIPGREP bool "ripgrep" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_CARGO + select BR2_PACKAGE_HOST_RUSTC help ripgrep is a line-oriented search tool that recursively searches your current directory diff --git a/buildroot/package/ripgrep/ripgrep.mk b/buildroot/package/ripgrep/ripgrep.mk index 1500733d0..9dd8d58de 100644 --- a/buildroot/package/ripgrep/ripgrep.mk +++ b/buildroot/package/ripgrep/ripgrep.mk @@ -9,7 +9,7 @@ RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT -RIPGREP_DEPENDENCIES = host-cargo +RIPGREP_DEPENDENCIES = host-rustc RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) diff --git a/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch b/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch new file mode 100644 index 000000000..586a44e21 --- /dev/null +++ b/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch @@ -0,0 +1,29 @@ +From 45a8c51a20a518ed78c5ea1829a307c045f737be Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 27 Mar 2020 22:19:42 +0100 +Subject: [PATCH] configure.ac: fix --with-rtlsdr option + +Add missing ',' to allow the user to explicitly disable or enable rtlsdr + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nhorman/rng-tools/pull/88] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ba796f8..1f55052 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ AC_ARG_WITH([pkcs11], + + AC_ARG_WITH([rtlsdr], + AS_HELP_STRING([--without-rtlsdr], +- [Disable rtlsdr support. ]) ++ [Disable rtlsdr support. ]), + [], + [with_rtlsdr=no] + ) +-- +2.25.1 + diff --git a/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch new file mode 100644 index 000000000..99997ce86 --- /dev/null +++ b/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch @@ -0,0 +1,53 @@ +From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nhorman/rng-tools/pull/89] +--- + 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; +-- +2.25.1 + diff --git a/buildroot/package/rng-tools/Config.in b/buildroot/package/rng-tools/Config.in index 71514260e..25b41f40d 100644 --- a/buildroot/package/rng-tools/Config.in +++ b/buildroot/package/rng-tools/Config.in @@ -1,17 +1,32 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || !(BR2_i386 || BR2_x86_64 || BR2_powerpc64le) # libgcrypt # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_JITTERENTROPY_LIBRARY - # For rdrand & darn ligcrypt is required and it's not obvious to users - select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64 || BR2_powerpc64le select BR2_PACKAGE_LIBSYSFS + select BR2_PACKAGE_OPENSSL help Daemon to use hardware random number generators. http://sourceforge.net/projects/gkernel/ +if BR2_PACKAGE_RNG_TOOLS + +config BR2_PACKAGE_RNG_TOOLS_NISTBEACON + bool "NIST Entropy Beacon support" + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + help + Enable NIST Entropy Beacon support. + + Entropy gathered from the NIST network entropy beacon. Note + that this entropy source is disabled by default as it should + never be used for cryptographic purposes, or any use case in + which random data should be known only by a single entity. + +endif + comment "rng-tools needs a toolchain w/ NPTL" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/buildroot/package/rng-tools/rng-tools.hash b/buildroot/package/rng-tools/rng-tools.hash index b5194523e..3202a88d6 100644 --- a/buildroot/package/rng-tools/rng-tools.hash +++ b/buildroot/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a57a7f51a2e3c0faa8afb979709a4c0cbea36d0b52fd835b104f8fb4fd1fa610 rng-tools-6.9.tar.gz +sha256 2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef rng-tools-6.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/rng-tools/rng-tools.mk b/buildroot/package/rng-tools/rng-tools.mk index 5338e9559..3baddb98e 100644 --- a/buildroot/package/rng-tools/rng-tools.mk +++ b/buildroot/package/rng-tools/rng-tools.mk @@ -4,17 +4,15 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.9 +RNG_TOOLS_VERSION = 6.10 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf +RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf openssl # From git RNG_TOOLS_AUTORECONF = YES -RNG_TOOLS_CONF_OPTS = \ - --without-nistbeacon \ - --without-pkcs11 +RNG_TOOLS_CONF_OPTS = --without-pkcs11 # Work around for uClibc or musl toolchains which lack argp_*() # functions. @@ -23,10 +21,18 @@ RNG_TOOLS_CONF_ENV += LIBS="-largp" RNG_TOOLS_DEPENDENCIES += argp-standalone endif -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -RNG_TOOLS_DEPENDENCIES += libgcrypt +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) +RNG_TOOLS_DEPENDENCIES += librtlsdr +RNG_TOOLS_CONF_OPTS += --with-rtlsdr else -RNG_TOOLS_CONF_OPTS += --without-libgcrypt +RNG_TOOLS_CONF_OPTS += --without-rtlsdr +endif + +ifeq ($(BR2_PACKAGE_RNG_TOOLS_NISTBEACON),y) +RNG_TOOLS_DEPENDENCIES += jansson libcurl libxml2 +RNG_TOOLS_CONF_OPTS += --with-nistbeacon +else +RNG_TOOLS_CONF_OPTS += --without-nistbeacon endif define RNG_TOOLS_INSTALL_INIT_SYSV diff --git a/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch b/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch deleted file mode 100644 index eccd27919..000000000 --- a/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch +++ /dev/null @@ -1,111 +0,0 @@ -From ad4cb0403c58430bf34a15e72f2edcf0f4317977 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Feb 2020 23:38:11 +0100 -Subject: [PATCH] Check for sys/auxv.h - -Check for sys/auxv.h and getauxval before using them as they are not -always available (for example on uclibc) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/facebook/rocksdb/pull/6359] ---- - CMakeLists.txt | 5 +++++ - build_tools/build_detect_platform | 14 ++++++++++++++ - util/crc32c.cc | 4 +++- - util/crc32c_arm64.cc | 6 ++++++ - 4 files changed, 28 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 017fe8675..32fc5cb30 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -481,6 +481,11 @@ if(HAVE_SCHED_GETCPU) - add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT) - endif() - -+check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL) -+if(HAVE_AUXV_GETAUXVAL) -+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) -+endif() -+ - include_directories(${PROJECT_SOURCE_DIR}) - include_directories(${PROJECT_SOURCE_DIR}/include) - include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.8.1/fused-src) -diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform -index 36a013f6f..2535d8124 100755 ---- a/build_tools/build_detect_platform -+++ b/build_tools/build_detect_platform -@@ -506,6 +506,20 @@ EOF - fi - fi - -+ if ! test $ROCKSDB_DISABLE_AUXV_GETAUXVAL; then -+ # Test whether getauxval is supported -+ $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null < -+ int main() { -+ uint64_t auxv = getauxval(AT_HWCAP); -+ (void)auxv; -+ } -+EOF -+ if [ "$?" = 0 ]; then -+ COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_AUXV_GETAUXVAL_PRESENT" -+ fi -+ fi -+ - if ! test $ROCKSDB_DISABLE_ALIGNED_NEW; then - # Test whether c++17 aligned-new is supported - $CXX $PLATFORM_CXXFLAGS -faligned-new -x c++ - -o /dev/null 2>/dev/null < -+#endif - - #ifndef PPC_FEATURE2_VEC_CRYPTO - #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 -@@ -451,7 +453,7 @@ uint32_t ExtendPPCImpl(uint32_t crc, const char *buf, size_t size) { - static int arch_ppc_probe(void) { - arch_ppc_crc32 = 0; - --#if defined(__powerpc64__) -+#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) - if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) arch_ppc_crc32 = 1; - #endif /* __powerpc64__ */ - -diff --git a/util/crc32c_arm64.cc b/util/crc32c_arm64.cc -index 591c623a5..61b2ccaba 100644 ---- a/util/crc32c_arm64.cc -+++ b/util/crc32c_arm64.cc -@@ -8,7 +8,9 @@ - #if defined(__linux__) && defined(HAVE_ARM64_CRC) - - #include -+#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT - #include -+#endif - #ifndef HWCAP_CRC32 - #define HWCAP_CRC32 (1 << 7) - #endif -@@ -34,8 +36,12 @@ - #endif - - uint32_t crc32c_runtime_check(void) { -+#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT - uint64_t auxv = getauxval(AT_HWCAP); - return (auxv & HWCAP_CRC32) != 0; -+#else -+ return 0; -+#endif - } - - uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data, --- -2.24.1 - diff --git a/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch b/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch similarity index 99% rename from buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch rename to buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch index 0b1118a2b..05f6bbde7 100644 --- a/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch +++ b/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch @@ -14,6 +14,7 @@ EOF /home/fabrice/buildroot/output/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: final link failed: file truncated Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/facebook/rocksdb/pull/6479] --- build_tools/build_detect_platform | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch b/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch new file mode 100644 index 000000000..f0f409736 --- /dev/null +++ b/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch @@ -0,0 +1,4058 @@ +From 085e4dcf8173e91311fbf9037d8bc9393f254c6f Mon Sep 17 00:00:00 2001 +From: Daniel Black +Date: Fri, 17 Apr 2020 18:54:37 +1000 +Subject: [PATCH] replace POWER crc32c with C implementation + +The presence of clang compile failures on POWER due to +missing ppc-asm.h prompted the replacement of the ASM +CRC32 implementation with the C implementation. + +https://github.com/antonblanchard/crc32-vpmsum/blob/master/vec_crc32.c +is used with only small include path change with the local copyright header +maintained. + +crc32c_ppc_constants.h per upstream generated, with assembler +compatible code removed. #pragma once per 64324e329eb0a9b4e77241a425a1615ff524c7f1 +removed unnecessary header wasn't used in util/crc32c.cc. + +util/crc32c.cc removes arch_ppc_crc32 which was only ever +used in a local context. Also incorporated significant advice from +tchaikov in #2869. HAVE_POWER was never passed from cmake, so replaced +with the architected _ARCH_PWR8 directive. Altivec overloading removed. + +Replaced arch_ppc_probe wrapper to used isAltivec directly. + +Corrects getauxval detection from 8bbd76edbf by including the header from the +right directory. + +From the crc32c_ppc.c (now replaced) comment: + + This wrapper function works around the fact that crc32_vpmsum + does not gracefully handle the case where the data pointer is NULL. There + may be room for performance improvement here. + +This isn't applicable provided the length is 0. Added test case for +this. + +[Retrieved from: +https://github.com/facebook/rocksdb/commit/085e4dcf8173e91311fbf9037d8bc9393f254c6f] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 19 +- + Makefile | 44 +- + util/crc32c.cc | 59 +- + util/crc32c_ppc.c | 679 ++++++++- + util/crc32c_ppc_asm.S | 752 ---------- + util/crc32c_ppc_clang_workaround.h | 93 ++ + util/crc32c_ppc_constants.h | 2084 ++++++++++++++++------------ + util/crc32c_test.cc | 3 + + 8 files changed, 1943 insertions(+), 1790 deletions(-) + delete mode 100644 util/crc32c_ppc_asm.S + create mode 100644 util/crc32c_ppc_clang_workaround.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a9bc71f80..5f8b226d51 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ include(ReadVersion) + get_rocksdb_version(rocksdb_VERSION) + project(rocksdb + VERSION ${rocksdb_VERSION} +- LANGUAGES CXX C ASM) ++ LANGUAGES CXX C) + + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) +@@ -215,12 +215,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8 -mtune=power8") + endif(HAS_POWER8) + endif(HAS_POWER9) +- CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC) +- if(HAS_ALTIVEC) +- message(STATUS " HAS_ALTIVEC yes") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec") +- endif(HAS_ALTIVEC) + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + + if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") +@@ -490,7 +484,7 @@ if(HAVE_SCHED_GETCPU) + add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT) + endif() + +-check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL) ++check_cxx_symbol_exists(getauxval sys/auxv.h HAVE_AUXV_GETAUXVAL) + if(HAVE_AUXV_GETAUXVAL) + add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) + endif() +@@ -761,11 +755,14 @@ if(HAVE_SSE42 AND NOT MSVC) + PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul") + endif() + +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++if(HAS_POWER8) + list(APPEND SOURCES ++ util/crc32c_ppc.c) ++ set_source_files_properties( + util/crc32c_ppc.c +- util/crc32c_ppc_asm.S) +-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++ PROPERTIES COMPILE_FLAGS "-maltivec" ++ COMPILE_DEFINITIONS "CRC32_FUNCTION=crc32c_ppc;CRC32_CONSTANTS_HEADER=\"crc32c_ppc_constants.h\"") ++endif(HAS_POWER8) + + if(HAS_ARMV8_CRC) + list(APPEND SOURCES +diff --git a/Makefile b/Makefile +index a258819f82..0249ce84bc 100644 +--- a/Makefile ++++ b/Makefile +@@ -132,16 +132,9 @@ OPT += -momit-leaf-frame-pointer + endif + endif + +-ifeq (,$(shell $(CXX) -fsyntax-only -maltivec -xc /dev/null 2>&1)) +-CXXFLAGS += -DHAS_ALTIVEC +-CFLAGS += -DHAS_ALTIVEC +-HAS_ALTIVEC=1 +-endif +- + ifeq (,$(shell $(CXX) -fsyntax-only -mcpu=power8 -xc /dev/null 2>&1)) +-CXXFLAGS += -DHAVE_POWER8 +-CFLAGS += -DHAVE_POWER8 + HAVE_POWER8=1 ++POWER8_CFLAGS=-maltivec -DCRC32_CONSTANTS_HEADER='"crc32c_ppc_constants.h"' -DCRC32_FUNCTION=crc32c_ppc + endif + + ifeq (,$(shell $(CXX) -fsyntax-only -march=armv8-a+crc+crypto -xc /dev/null 2>&1)) +@@ -418,7 +411,6 @@ LIBOBJECTS = $(LIB_SOURCES:.cc=.o) + ifeq ($(HAVE_POWER8),1) + LIB_CC_OBJECTS = $(LIB_SOURCES:.cc=.o) + LIBOBJECTS += $(LIB_SOURCES_C:.c=.o) +-LIBOBJECTS += $(LIB_SOURCES_ASM:.S=.o) + else + LIB_CC_OBJECTS = $(LIB_SOURCES:.cc=.o) + endif +@@ -730,9 +722,7 @@ $(SHARED3): $(SHARED4) + endif + ifeq ($(HAVE_POWER8),1) + SHARED_C_OBJECTS = $(LIB_SOURCES_C:.c=.o) +-SHARED_ASM_OBJECTS = $(LIB_SOURCES_ASM:.S=.o) + SHARED_C_LIBOBJECTS = $(patsubst %.o,shared-objects/%.o,$(SHARED_C_OBJECTS)) +-SHARED_ASM_LIBOBJECTS = $(patsubst %.o,shared-objects/%.o,$(SHARED_ASM_OBJECTS)) + shared_libobjects = $(patsubst %,shared-objects/%,$(LIB_CC_OBJECTS)) + else + shared_libobjects = $(patsubst %,shared-objects/%,$(LIBOBJECTS)) +@@ -742,13 +732,10 @@ CLEAN_FILES += shared-objects + shared_all_libobjects = $(shared_libobjects) + + ifeq ($(HAVE_POWER8),1) +-shared-ppc-objects = $(SHARED_C_LIBOBJECTS) $(SHARED_ASM_LIBOBJECTS) ++shared-ppc-objects = $(SHARED_C_LIBOBJECTS) + + shared-objects/util/crc32c_ppc.o: util/crc32c_ppc.c +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ +- +-shared-objects/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ ++ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ + endif + $(shared_libobjects): shared-objects/%.o: %.cc + $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ +@@ -1981,15 +1968,11 @@ JAVA_STATIC_INCLUDES = -I./zlib-$(ZLIB_VER) -I./bzip2-$(BZIP2_VER) -I./snappy-$( + + ifeq ($(HAVE_POWER8),1) + JAVA_STATIC_C_LIBOBJECTS = $(patsubst %.c.o,jls/%.c.o,$(LIB_SOURCES_C:.c=.o)) +-JAVA_STATIC_ASM_LIBOBJECTS = $(patsubst %.S.o,jls/%.S.o,$(LIB_SOURCES_ASM:.S=.o)) + +-java_static_ppc_libobjects = $(JAVA_STATIC_C_LIBOBJECTS) $(JAVA_STATIC_ASM_LIBOBJECTS) ++java_static_ppc_libobjects = $(JAVA_STATIC_C_LIBOBJECTS) + + jls/util/crc32c_ppc.o: util/crc32c_ppc.c +- $(AM_V_CC)$(CC) $(CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ +- +-jls/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +- $(AM_V_CC)$(CC) $(CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ ++ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ + + java_static_all_libobjects += $(java_static_ppc_libobjects) + endif +@@ -2075,10 +2058,8 @@ rocksdbjavastaticpublishcentral: + ifeq ($(HAVE_POWER8),1) + JAVA_CC_OBJECTS = $(SHARED_CC_OBJECTS) + JAVA_C_OBJECTS = $(SHARED_C_OBJECTS) +-JAVA_ASM_OBJECTS = $(SHARED_ASM_OBJECTS) + + JAVA_C_LIBOBJECTS = $(patsubst %.c.o,jl/%.c.o,$(JAVA_C_OBJECTS)) +-JAVA_ASM_LIBOBJECTS = $(patsubst %.S.o,jl/%.S.o,$(JAVA_ASM_OBJECTS)) + endif + + java_libobjects = $(patsubst %,jl/%,$(LIB_CC_OBJECTS)) +@@ -2086,13 +2067,11 @@ CLEAN_FILES += jl + java_all_libobjects = $(java_libobjects) + + ifeq ($(HAVE_POWER8),1) +-java_ppc_libobjects = $(JAVA_C_LIBOBJECTS) $(JAVA_ASM_LIBOBJECTS) ++java_ppc_libobjects = $(JAVA_C_LIBOBJECTS) + + jl/crc32c_ppc.o: util/crc32c_ppc.c +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ ++ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ + +-jl/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ + java_all_libobjects += $(java_ppc_libobjects) + endif + +@@ -2160,10 +2139,7 @@ IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBu + else + ifeq ($(HAVE_POWER8),1) + util/crc32c_ppc.o: util/crc32c_ppc.c +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ +- +-util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ ++ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ + endif + .cc.o: + $(AM_V_CC)$(CXX) $(CXXFLAGS) -c $< -o $@ $(COVERAGEFLAGS) +@@ -2200,7 +2176,6 @@ endif + + ifeq ($(HAVE_POWER8),1) + DEPFILES_C = $(LIB_SOURCES_C:.c=.c.d) +-DEPFILES_ASM = $(LIB_SOURCES_ASM:.S=.S.d) + + %.c.d: %.c + @$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) \ +@@ -2212,8 +2187,7 @@ DEPFILES_ASM = $(LIB_SOURCES_ASM:.S=.S.d) + + $(DEPFILES_C): %.c.d + +-$(DEPFILES_ASM): %.S.d +-depend: $(DEPFILES) $(DEPFILES_C) $(DEPFILES_ASM) ++depend: $(DEPFILES) $(DEPFILES_C) + else + depend: $(DEPFILES) + endif +diff --git a/util/crc32c.cc b/util/crc32c.cc +index fa70d23ff5..ce16cb777e 100644 +--- a/util/crc32c.cc ++++ b/util/crc32c.cc +@@ -20,15 +20,12 @@ + + #include "util/crc32c_arm64.h" + +-#ifdef __powerpc64__ +-#include "util/crc32c_ppc.h" +-#include "util/crc32c_ppc_constants.h" +- +-#if __linux__ + #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT + #include + #endif + ++#ifdef __powerpc64__ ++#include "util/crc32c_ppc.h" + #ifndef PPC_FEATURE2_VEC_CRYPTO + #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 + #endif +@@ -37,19 +34,11 @@ + #define AT_HWCAP2 26 + #endif + +-#endif /* __linux__ */ +- + #endif + + namespace ROCKSDB_NAMESPACE { + namespace crc32c { + +-#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) +-#ifdef __powerpc64__ +-static int arch_ppc_crc32 = 0; +-#endif /* __powerpc64__ */ +-#endif +- + static const uint32_t table0_[256] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, + 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, +@@ -342,6 +331,7 @@ static inline void Slow_CRC32(uint64_t* l, uint8_t const **p) { + table0_[c >> 24]; + } + ++#ifndef _ARCH_PWR8 + static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { + #ifndef HAVE_SSE42 + Slow_CRC32(l, p); +@@ -355,6 +345,7 @@ static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { + *p += 4; + #endif + } ++#endif + + template + uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { +@@ -403,7 +394,7 @@ uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { + // Detect if ARM64 CRC or not. + #ifndef HAVE_ARM64_CRC + // Detect if SS42 or not. +-#ifndef HAVE_POWER8 ++#ifndef _ARCH_PWR8 + + static bool isSSE42() { + #ifndef HAVE_SSE42 +@@ -439,36 +430,23 @@ static bool isPCLMULQDQ() { + #endif + } + +-#endif // HAVE_POWER8 ++#endif // _ARCH_PWR8 + #endif // HAVE_ARM64_CRC + + typedef uint32_t (*Function)(uint32_t, const char*, size_t); + +-#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) ++#if defined(__powerpc64__) + uint32_t ExtendPPCImpl(uint32_t crc, const char *buf, size_t size) { + return crc32c_ppc(crc, (const unsigned char *)buf, size); + } + +-#if __linux__ +-static int arch_ppc_probe(void) { +- arch_ppc_crc32 = 0; +- +-#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) +- if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) arch_ppc_crc32 = 1; +-#endif /* __powerpc64__ */ +- +- return arch_ppc_crc32; +-} +-#endif // __linux__ +- + static bool isAltiVec() { +- if (arch_ppc_probe()) { +- return true; +- } else { +- return false; +- } +-} ++#if defined(__linux__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) ++ if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) return true; + #endif ++ return false; ++} ++#endif // __power64__ + + #if defined(__linux__) && defined(HAVE_ARM64_CRC) + uint32_t ExtendARMImpl(uint32_t crc, const char *buf, size_t size) { +@@ -480,16 +458,9 @@ std::string IsFastCrc32Supported() { + bool has_fast_crc = false; + std::string fast_zero_msg; + std::string arch; +-#ifdef HAVE_POWER8 +-#ifdef HAS_ALTIVEC +- if (arch_ppc_probe()) { +- has_fast_crc = true; +- arch = "PPC"; +- } +-#else +- has_fast_crc = false; ++#ifdef __powerpc64__ ++ has_fast_crc = isAltiVec(); + arch = "PPC"; +-#endif + #elif defined(__linux__) && defined(HAVE_ARM64_CRC) + if (crc32c_runtime_check()) { + has_fast_crc = true; +@@ -1220,7 +1191,7 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, size_t len) { + #endif //HAVE_SSE42 && HAVE_PCLMUL + + static inline Function Choose_Extend() { +-#ifdef HAVE_POWER8 ++#ifdef __powerpc64__ + return isAltiVec() ? ExtendPPCImpl : ExtendImpl; + #elif defined(__linux__) && defined(HAVE_ARM64_CRC) + if(crc32c_runtime_check()) { +diff --git a/util/crc32c_ppc.c b/util/crc32c_ppc.c +index 888a4943ea..a8914e8fbd 100644 +--- a/util/crc32c_ppc.c ++++ b/util/crc32c_ppc.c +@@ -4,91 +4,648 @@ + // This source code is licensed under both the GPLv2 (found in the + // COPYING file in the root directory) and Apache 2.0 License + // (found in the LICENSE.Apache file in the root directory). ++// From: https://github.com/antonblanchard/crc32-vpmsum/blob/master/vec_crc32.c + ++#include ++ ++#define POWER8_INTRINSICS + #define CRC_TABLE +-#include +-#include +-#include +-#include "util/crc32c_ppc_constants.h" + +-#define VMX_ALIGN 16 +-#define VMX_ALIGN_MASK (VMX_ALIGN - 1) ++#ifdef CRC32_CONSTANTS_HEADER ++#include CRC32_CONSTANTS_HEADER ++#else ++#include "crc32_constants.h" ++#endif ++ ++#define VMX_ALIGN 16 ++#define VMX_ALIGN_MASK (VMX_ALIGN-1) + + #ifdef REFLECT +-static unsigned int crc32_align(unsigned int crc, unsigned char const *p, +- unsigned long len) { +- while (len--) crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); +- return crc; ++static unsigned int crc32_align(unsigned int crc, const unsigned char *p, ++ unsigned long len) ++{ ++ while (len--) ++ crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); ++ return crc; ++} ++#else ++static unsigned int crc32_align(unsigned int crc, const unsigned char *p, ++ unsigned long len) ++{ ++ while (len--) ++ crc = crc_table[((crc >> 24) ^ *p++) & 0xff] ^ (crc << 8); ++ return crc; + } + #endif + +-#ifdef HAVE_POWER8 +-unsigned int __crc32_vpmsum(unsigned int crc, unsigned char const *p, +- unsigned long len); ++static unsigned int __attribute__ ((aligned (32))) ++__crc32_vpmsum(unsigned int crc, const void* p, unsigned long len); + +-static uint32_t crc32_vpmsum(uint32_t crc, unsigned char const *data, +- unsigned len) { +- unsigned int prealign; +- unsigned int tail; ++#ifndef CRC32_FUNCTION ++#define CRC32_FUNCTION crc32_vpmsum ++#endif ++ ++unsigned int CRC32_FUNCTION(unsigned int crc, const unsigned char *p, ++ unsigned long len) ++{ ++ unsigned int prealign; ++ unsigned int tail; + + #ifdef CRC_XOR +- crc ^= 0xffffffff; ++ crc ^= 0xffffffff; + #endif + +- if (len < VMX_ALIGN + VMX_ALIGN_MASK) { +- crc = crc32_align(crc, data, (unsigned long)len); +- goto out; +- } ++ if (len < VMX_ALIGN + VMX_ALIGN_MASK) { ++ crc = crc32_align(crc, p, len); ++ goto out; ++ } + +- if ((unsigned long)data & VMX_ALIGN_MASK) { +- prealign = VMX_ALIGN - ((unsigned long)data & VMX_ALIGN_MASK); +- crc = crc32_align(crc, data, prealign); +- len -= prealign; +- data += prealign; +- } ++ if ((unsigned long)p & VMX_ALIGN_MASK) { ++ prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK); ++ crc = crc32_align(crc, p, prealign); ++ len -= prealign; ++ p += prealign; ++ } + +- crc = __crc32_vpmsum(crc, data, (unsigned long)len & ~VMX_ALIGN_MASK); ++ crc = __crc32_vpmsum(crc, p, len & ~VMX_ALIGN_MASK); + +- tail = len & VMX_ALIGN_MASK; +- if (tail) { +- data += len & ~VMX_ALIGN_MASK; +- crc = crc32_align(crc, data, tail); +- } ++ tail = len & VMX_ALIGN_MASK; ++ if (tail) { ++ p += len & ~VMX_ALIGN_MASK; ++ crc = crc32_align(crc, p, tail); ++ } + + out: + #ifdef CRC_XOR +- crc ^= 0xffffffff; ++ crc ^= 0xffffffff; + #endif + +- return crc; ++ return crc; + } + +-/* This wrapper function works around the fact that crc32_vpmsum +- * does not gracefully handle the case where the data pointer is NULL. There +- * may be room for performance improvement here. ++#if defined (__clang__) ++#include "crc32c_ppc_clang_workaround.h" ++#else ++#define __builtin_pack_vector(a, b) __builtin_pack_vector_int128 ((a), (b)) ++#define __builtin_unpack_vector_0(a) __builtin_unpack_vector_int128 ((vector __int128_t)(a), 0) ++#define __builtin_unpack_vector_1(a) __builtin_unpack_vector_int128 ((vector __int128_t)(a), 1) ++#endif ++ ++/* When we have a load-store in a single-dispatch group and address overlap ++ * such that foward is not allowed (load-hit-store) the group must be flushed. ++ * A group ending NOP prevents the flush. + */ +-uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { +- unsigned char *buf2; +- +- if (!data) { +- buf2 = (unsigned char *)malloc(len); +- bzero(buf2, len); +- crc = crc32_vpmsum(crc, buf2, len); +- free(buf2); +- } else { +- crc = crc32_vpmsum(crc, data, (unsigned long)len); +- } +- return crc; +-} ++#define GROUP_ENDING_NOP asm("ori 2,2,0" ::: "memory") + +-#else /* HAVE_POWER8 */ ++#if defined(__BIG_ENDIAN__) && defined (REFLECT) ++#define BYTESWAP_DATA ++#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) ++#define BYTESWAP_DATA ++#endif + +-/* This symbol has to exist on non-ppc architectures (and on legacy +- * ppc systems using power7 or below) in order to compile properly +- * there, even though it won't be called. +- */ +-uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { +- return 0; +-} ++#ifdef BYTESWAP_DATA ++#define VEC_PERM(vr, va, vb, vc) vr = vec_perm(va, vb,\ ++ (__vector unsigned char) vc) ++#if defined(__LITTLE_ENDIAN__) ++/* Byte reverse permute constant LE. */ ++static const __vector unsigned long long vperm_const ++ __attribute__ ((aligned(16))) = { 0x08090A0B0C0D0E0FUL, ++ 0x0001020304050607UL }; ++#else ++static const __vector unsigned long long vperm_const ++ __attribute__ ((aligned(16))) = { 0x0F0E0D0C0B0A0908UL, ++ 0X0706050403020100UL }; ++#endif ++#else ++#define VEC_PERM(vr, va, vb, vc) ++#endif ++ ++static unsigned int __attribute__ ((aligned (32))) ++__crc32_vpmsum(unsigned int crc, const void* p, unsigned long len) { ++ ++ const __vector unsigned long long vzero = {0,0}; ++ const __vector unsigned long long vones = {0xffffffffffffffffUL, ++ 0xffffffffffffffffUL}; ++ ++#ifdef REFLECT ++ const __vector unsigned long long vmask_32bit = ++ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, ++ (__vector unsigned char)vones, 4); ++#endif ++ ++ const __vector unsigned long long vmask_64bit = ++ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, ++ (__vector unsigned char)vones, 8); ++ ++ __vector unsigned long long vcrc; ++ ++ __vector unsigned long long vconst1, vconst2; ++ ++ /* vdata0-vdata7 will contain our data (p). */ ++ __vector unsigned long long vdata0, vdata1, vdata2, vdata3, vdata4, ++ vdata5, vdata6, vdata7; ++ ++ /* v0-v7 will contain our checksums */ ++ __vector unsigned long long v0 = {0,0}; ++ __vector unsigned long long v1 = {0,0}; ++ __vector unsigned long long v2 = {0,0}; ++ __vector unsigned long long v3 = {0,0}; ++ __vector unsigned long long v4 = {0,0}; ++ __vector unsigned long long v5 = {0,0}; ++ __vector unsigned long long v6 = {0,0}; ++ __vector unsigned long long v7 = {0,0}; ++ ++ ++ /* Vector auxiliary variables. */ ++ __vector unsigned long long va0, va1, va2, va3, va4, va5, va6, va7; ++ ++ unsigned int result = 0; ++ unsigned int offset; /* Constant table offset. */ ++ ++ unsigned long i; /* Counter. */ ++ unsigned long chunks; ++ ++ unsigned long block_size; ++ int next_block = 0; ++ ++ /* Align by 128 bits. The last 128 bit block will be processed at end. */ ++ unsigned long length = len & 0xFFFFFFFFFFFFFF80UL; ++ ++#ifdef REFLECT ++ vcrc = (__vector unsigned long long)__builtin_pack_vector(0UL, crc); ++#else ++ vcrc = (__vector unsigned long long)__builtin_pack_vector(crc, 0UL); ++ ++ /* Shift into top 32 bits */ ++ vcrc = (__vector unsigned long long)vec_sld((__vector unsigned char)vcrc, ++ (__vector unsigned char)vzero, 4); ++#endif ++ ++ /* Short version. */ ++ if (len < 256) { ++ /* Calculate where in the constant table we need to start. */ ++ offset = 256 - len; ++ ++ vconst1 = vec_ld(offset, vcrc_short_const); ++ vdata0 = vec_ld(0, (__vector unsigned long long*) p); ++ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); ++ ++ /* xor initial value*/ ++ vdata0 = vec_xor(vdata0, vcrc); ++ ++ vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw ++ ((__vector unsigned int)vdata0, (__vector unsigned int)vconst1); ++ v0 = vec_xor(v0, vdata0); ++ ++ for (i = 16; i < len; i += 16) { ++ vconst1 = vec_ld(offset + i, vcrc_short_const); ++ vdata0 = vec_ld(i, (__vector unsigned long long*) p); ++ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); ++ vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw ++ ((__vector unsigned int)vdata0, (__vector unsigned int)vconst1); ++ v0 = vec_xor(v0, vdata0); ++ } ++ } else { ++ ++ /* Load initial values. */ ++ vdata0 = vec_ld(0, (__vector unsigned long long*) p); ++ vdata1 = vec_ld(16, (__vector unsigned long long*) p); ++ ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ ++ vdata2 = vec_ld(32, (__vector unsigned long long*) p); ++ vdata3 = vec_ld(48, (__vector unsigned long long*) p); ++ ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vdata4 = vec_ld(64, (__vector unsigned long long*) p); ++ vdata5 = vec_ld(80, (__vector unsigned long long*) p); ++ ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ ++ vdata6 = vec_ld(96, (__vector unsigned long long*) p); ++ vdata7 = vec_ld(112, (__vector unsigned long long*) p); ++ ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ /* xor in initial value */ ++ vdata0 = vec_xor(vdata0, vcrc); ++ ++ p = (char *)p + 128; ++ ++ do { ++ /* Checksum in blocks of MAX_SIZE. */ ++ block_size = length; ++ if (block_size > MAX_SIZE) { ++ block_size = MAX_SIZE; ++ } ++ ++ length = length - block_size; ++ ++ /* ++ * Work out the offset into the constants table to start at. Each ++ * constant is 16 bytes, and it is used against 128 bytes of input ++ * data - 128 / 16 = 8 ++ */ ++ offset = (MAX_SIZE/8) - (block_size/8); ++ /* We reduce our final 128 bytes in a separate step */ ++ chunks = (block_size/128)-1; ++ ++ vconst1 = vec_ld(offset, vcrc_const); ++ ++ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata0, ++ (__vector unsigned long long)vconst1); ++ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata1, ++ (__vector unsigned long long)vconst1); ++ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata2, ++ (__vector unsigned long long)vconst1); ++ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata3, ++ (__vector unsigned long long)vconst1); ++ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata4, ++ (__vector unsigned long long)vconst1); ++ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata5, ++ (__vector unsigned long long)vconst1); ++ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata6, ++ (__vector unsigned long long)vconst1); ++ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata7, ++ (__vector unsigned long long)vconst1); ++ ++ if (chunks > 1) { ++ offset += 16; ++ vconst2 = vec_ld(offset, vcrc_const); ++ GROUP_ENDING_NOP; ++ ++ vdata0 = vec_ld(0, (__vector unsigned long long*) p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ ++ vdata1 = vec_ld(16, (__vector unsigned long long*) p); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ ++ vdata2 = vec_ld(32, (__vector unsigned long long*) p); ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ ++ vdata3 = vec_ld(48, (__vector unsigned long long*) p); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vdata4 = vec_ld(64, (__vector unsigned long long*) p); ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ ++ vdata5 = vec_ld(80, (__vector unsigned long long*) p); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ ++ vdata6 = vec_ld(96, (__vector unsigned long long*) p); ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ ++ vdata7 = vec_ld(112, (__vector unsigned long long*) p); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ p = (char *)p + 128; + +-#endif /* HAVE_POWER8 */ ++ /* ++ * main loop. We modulo schedule it such that it takes three ++ * iterations to complete - first iteration load, second ++ * iteration vpmsum, third iteration xor. ++ */ ++ for (i = 0; i < chunks-2; i++) { ++ vconst1 = vec_ld(offset, vcrc_const); ++ offset += 16; ++ GROUP_ENDING_NOP; ++ ++ v0 = vec_xor(v0, va0); ++ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata0, (__vector unsigned long long)vconst2); ++ vdata0 = vec_ld(0, (__vector unsigned long long*) p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v1 = vec_xor(v1, va1); ++ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata1, (__vector unsigned long long)vconst2); ++ vdata1 = vec_ld(16, (__vector unsigned long long*) p); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v2 = vec_xor(v2, va2); ++ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata2, (__vector unsigned long long)vconst2); ++ vdata2 = vec_ld(32, (__vector unsigned long long*) p); ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v3 = vec_xor(v3, va3); ++ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata3, (__vector unsigned long long)vconst2); ++ vdata3 = vec_ld(48, (__vector unsigned long long*) p); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vconst2 = vec_ld(offset, vcrc_const); ++ GROUP_ENDING_NOP; ++ ++ v4 = vec_xor(v4, va4); ++ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata4, (__vector unsigned long long)vconst1); ++ vdata4 = vec_ld(64, (__vector unsigned long long*) p); ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v5 = vec_xor(v5, va5); ++ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata5, (__vector unsigned long long)vconst1); ++ vdata5 = vec_ld(80, (__vector unsigned long long*) p); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v6 = vec_xor(v6, va6); ++ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata6, (__vector unsigned long long)vconst1); ++ vdata6 = vec_ld(96, (__vector unsigned long long*) p); ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v7 = vec_xor(v7, va7); ++ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata7, (__vector unsigned long long)vconst1); ++ vdata7 = vec_ld(112, (__vector unsigned long long*) p); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ p = (char *)p + 128; ++ } ++ ++ /* First cool down*/ ++ vconst1 = vec_ld(offset, vcrc_const); ++ offset += 16; ++ ++ v0 = vec_xor(v0, va0); ++ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata0, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v1 = vec_xor(v1, va1); ++ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata1, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v2 = vec_xor(v2, va2); ++ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata2, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v3 = vec_xor(v3, va3); ++ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata3, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v4 = vec_xor(v4, va4); ++ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata4, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v5 = vec_xor(v5, va5); ++ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata5, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v6 = vec_xor(v6, va6); ++ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata6, (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v7 = vec_xor(v7, va7); ++ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long ++ long)vdata7, (__vector unsigned long long)vconst1); ++ }/* else */ ++ ++ /* Second cool down. */ ++ v0 = vec_xor(v0, va0); ++ v1 = vec_xor(v1, va1); ++ v2 = vec_xor(v2, va2); ++ v3 = vec_xor(v3, va3); ++ v4 = vec_xor(v4, va4); ++ v5 = vec_xor(v5, va5); ++ v6 = vec_xor(v6, va6); ++ v7 = vec_xor(v7, va7); ++ ++#ifdef REFLECT ++ /* ++ * vpmsumd produces a 96 bit result in the least significant bits ++ * of the register. Since we are bit reflected we have to shift it ++ * left 32 bits so it occupies the least significant bits in the ++ * bit reflected domain. ++ */ ++ v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, ++ (__vector unsigned char)vzero, 4); ++ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v1, ++ (__vector unsigned char)vzero, 4); ++ v2 = (__vector unsigned long long)vec_sld((__vector unsigned char)v2, ++ (__vector unsigned char)vzero, 4); ++ v3 = (__vector unsigned long long)vec_sld((__vector unsigned char)v3, ++ (__vector unsigned char)vzero, 4); ++ v4 = (__vector unsigned long long)vec_sld((__vector unsigned char)v4, ++ (__vector unsigned char)vzero, 4); ++ v5 = (__vector unsigned long long)vec_sld((__vector unsigned char)v5, ++ (__vector unsigned char)vzero, 4); ++ v6 = (__vector unsigned long long)vec_sld((__vector unsigned char)v6, ++ (__vector unsigned char)vzero, 4); ++ v7 = (__vector unsigned long long)vec_sld((__vector unsigned char)v7, ++ (__vector unsigned char)vzero, 4); ++#endif ++ ++ /* xor with the last 1024 bits. */ ++ va0 = vec_ld(0, (__vector unsigned long long*) p); ++ VEC_PERM(va0, va0, va0, vperm_const); ++ ++ va1 = vec_ld(16, (__vector unsigned long long*) p); ++ VEC_PERM(va1, va1, va1, vperm_const); ++ ++ va2 = vec_ld(32, (__vector unsigned long long*) p); ++ VEC_PERM(va2, va2, va2, vperm_const); ++ ++ va3 = vec_ld(48, (__vector unsigned long long*) p); ++ VEC_PERM(va3, va3, va3, vperm_const); ++ ++ va4 = vec_ld(64, (__vector unsigned long long*) p); ++ VEC_PERM(va4, va4, va4, vperm_const); ++ ++ va5 = vec_ld(80, (__vector unsigned long long*) p); ++ VEC_PERM(va5, va5, va5, vperm_const); ++ ++ va6 = vec_ld(96, (__vector unsigned long long*) p); ++ VEC_PERM(va6, va6, va6, vperm_const); ++ ++ va7 = vec_ld(112, (__vector unsigned long long*) p); ++ VEC_PERM(va7, va7, va7, vperm_const); ++ ++ p = (char *)p + 128; ++ ++ vdata0 = vec_xor(v0, va0); ++ vdata1 = vec_xor(v1, va1); ++ vdata2 = vec_xor(v2, va2); ++ vdata3 = vec_xor(v3, va3); ++ vdata4 = vec_xor(v4, va4); ++ vdata5 = vec_xor(v5, va5); ++ vdata6 = vec_xor(v6, va6); ++ vdata7 = vec_xor(v7, va7); ++ ++ /* Check if we have more blocks to process */ ++ next_block = 0; ++ if (length != 0) { ++ next_block = 1; ++ ++ /* zero v0-v7 */ ++ v0 = vec_xor(v0, v0); ++ v1 = vec_xor(v1, v1); ++ v2 = vec_xor(v2, v2); ++ v3 = vec_xor(v3, v3); ++ v4 = vec_xor(v4, v4); ++ v5 = vec_xor(v5, v5); ++ v6 = vec_xor(v6, v6); ++ v7 = vec_xor(v7, v7); ++ } ++ length = length + 128; ++ ++ } while (next_block); ++ ++ /* Calculate how many bytes we have left. */ ++ length = (len & 127); ++ ++ /* Calculate where in (short) constant table we need to start. */ ++ offset = 128 - length; ++ ++ v0 = vec_ld(offset, vcrc_short_const); ++ v1 = vec_ld(offset + 16, vcrc_short_const); ++ v2 = vec_ld(offset + 32, vcrc_short_const); ++ v3 = vec_ld(offset + 48, vcrc_short_const); ++ v4 = vec_ld(offset + 64, vcrc_short_const); ++ v5 = vec_ld(offset + 80, vcrc_short_const); ++ v6 = vec_ld(offset + 96, vcrc_short_const); ++ v7 = vec_ld(offset + 112, vcrc_short_const); ++ ++ offset += 128; ++ ++ v0 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata0,(__vector unsigned int)v0); ++ v1 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata1,(__vector unsigned int)v1); ++ v2 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata2,(__vector unsigned int)v2); ++ v3 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata3,(__vector unsigned int)v3); ++ v4 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata4,(__vector unsigned int)v4); ++ v5 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata5,(__vector unsigned int)v5); ++ v6 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata6,(__vector unsigned int)v6); ++ v7 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata7,(__vector unsigned int)v7); ++ ++ /* Now reduce the tail (0-112 bytes). */ ++ for (i = 0; i < length; i+=16) { ++ vdata0 = vec_ld(i,(__vector unsigned long long*)p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ va0 = vec_ld(offset + i,vcrc_short_const); ++ va0 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( ++ (__vector unsigned int)vdata0,(__vector unsigned int)va0); ++ v0 = vec_xor(v0, va0); ++ } ++ ++ /* xor all parallel chunks together. */ ++ v0 = vec_xor(v0, v1); ++ v2 = vec_xor(v2, v3); ++ v4 = vec_xor(v4, v5); ++ v6 = vec_xor(v6, v7); ++ ++ v0 = vec_xor(v0, v2); ++ v4 = vec_xor(v4, v6); ++ ++ v0 = vec_xor(v0, v4); ++ } ++ ++ /* Barrett Reduction */ ++ vconst1 = vec_ld(0, v_Barrett_const); ++ vconst2 = vec_ld(16, v_Barrett_const); ++ ++ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, ++ (__vector unsigned char)v0, 8); ++ v0 = vec_xor(v1,v0); ++ ++#ifdef REFLECT ++ /* shift left one bit */ ++ __vector unsigned char vsht_splat = vec_splat_u8 (1); ++ v0 = (__vector unsigned long long)vec_sll ((__vector unsigned char)v0, ++ vsht_splat); ++#endif ++ ++ v0 = vec_and(v0, vmask_64bit); ++ ++#ifndef REFLECT ++ ++ /* ++ * Now for the actual algorithm. The idea is to calculate q, ++ * the multiple of our polynomial that we need to subtract. By ++ * doing the computation 2x bits higher (ie 64 bits) and shifting the ++ * result back down 2x bits, we round down to the nearest multiple. ++ */ ++ ++ /* ma */ ++ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v0, ++ (__vector unsigned long long)vconst1); ++ /* q = floor(ma/(2^64)) */ ++ v1 = (__vector unsigned long long)vec_sld ((__vector unsigned char)vzero, ++ (__vector unsigned char)v1, 8); ++ /* qn */ ++ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst2); ++ /* a - qn, subtraction is xor in GF(2) */ ++ v0 = vec_xor (v0, v1); ++ /* ++ * Get the result into r3. We need to shift it left 8 bytes: ++ * V0 [ 0 1 2 X ] ++ * V0 [ 0 X 2 3 ] ++ */ ++ result = __builtin_unpack_vector_1 (v0); ++#else ++ ++ /* ++ * The reflected version of Barrett reduction. Instead of bit ++ * reflecting our data (which is expensive to do), we bit reflect our ++ * constants and our algorithm, which means the intermediate data in ++ * our vector registers goes from 0-63 instead of 63-0. We can reflect ++ * the algorithm because we don't carry in mod 2 arithmetic. ++ */ ++ ++ /* bottom 32 bits of a */ ++ v1 = vec_and(v0, vmask_32bit); ++ ++ /* ma */ ++ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst1); ++ ++ /* bottom 32bits of ma */ ++ v1 = vec_and(v1, vmask_32bit); ++ /* qn */ ++ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst2); ++ /* a - qn, subtraction is xor in GF(2) */ ++ v0 = vec_xor (v0, v1); ++ ++ /* ++ * Since we are bit reflected, the result (ie the low 32 bits) is in ++ * the high 32 bits. We just need to shift it left 4 bytes ++ * V0 [ 0 1 X 3 ] ++ * V0 [ 0 X 2 3 ] ++ */ ++ ++ /* shift result into top 64 bits of */ ++ v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, ++ (__vector unsigned char)vzero, 4); ++ ++ result = __builtin_unpack_vector_0 (v0); ++#endif ++ ++ return result; ++} +diff --git a/util/crc32c_ppc_asm.S b/util/crc32c_ppc_asm.S +deleted file mode 100644 +index a317bf96b8..0000000000 +--- a/util/crc32c_ppc_asm.S ++++ /dev/null +@@ -1,752 +0,0 @@ +-// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +-// Copyright (c) 2015 Anton Blanchard , IBM +-// Copyright (c) 2017 International Business Machines Corp. +-// All rights reserved. +-// This source code is licensed under both the GPLv2 (found in the +-// COPYING file in the root directory) and Apache 2.0 License +-// (found in the LICENSE.Apache file in the root directory). +- +-#include +-#include "ppc-opcode.h" +- +-#undef toc +- +-#ifndef r1 +-#define r1 1 +-#endif +- +-#ifndef r2 +-#define r2 2 +-#endif +- +- .section .rodata +-.balign 16 +- +-.byteswap_constant: +- /* byte reverse permute constant */ +- .octa 0x0F0E0D0C0B0A09080706050403020100 +- +-#define __ASSEMBLY__ +-#include "crc32c_ppc_constants.h" +- +- .text +- +-#if defined(__BIG_ENDIAN__) && defined(REFLECT) +-#define BYTESWAP_DATA +-#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) +-#define BYTESWAP_DATA +-#else +-#undef BYTESWAP_DATA +-#endif +- +-#define off16 r25 +-#define off32 r26 +-#define off48 r27 +-#define off64 r28 +-#define off80 r29 +-#define off96 r30 +-#define off112 r31 +- +-#define const1 v24 +-#define const2 v25 +- +-#define byteswap v26 +-#define mask_32bit v27 +-#define mask_64bit v28 +-#define zeroes v29 +- +-#ifdef BYTESWAP_DATA +-#define VPERM(A, B, C, D) vperm A, B, C, D +-#else +-#define VPERM(A, B, C, D) +-#endif +- +-/* unsigned int __crc32_vpmsum(unsigned int crc, void *p, unsigned long len) */ +-FUNC_START(__crc32_vpmsum) +- std r31,-8(r1) +- std r30,-16(r1) +- std r29,-24(r1) +- std r28,-32(r1) +- std r27,-40(r1) +- std r26,-48(r1) +- std r25,-56(r1) +- +- li off16,16 +- li off32,32 +- li off48,48 +- li off64,64 +- li off80,80 +- li off96,96 +- li off112,112 +- li r0,0 +- +- /* Enough room for saving 10 non volatile VMX registers */ +- subi r6,r1,56+10*16 +- subi r7,r1,56+2*16 +- +- stvx v20,0,r6 +- stvx v21,off16,r6 +- stvx v22,off32,r6 +- stvx v23,off48,r6 +- stvx v24,off64,r6 +- stvx v25,off80,r6 +- stvx v26,off96,r6 +- stvx v27,off112,r6 +- stvx v28,0,r7 +- stvx v29,off16,r7 +- +- mr r10,r3 +- +- vxor zeroes,zeroes,zeroes +- vspltisw v0,-1 +- +- vsldoi mask_32bit,zeroes,v0,4 +- vsldoi mask_64bit,zeroes,v0,8 +- +- /* Get the initial value into v8 */ +- vxor v8,v8,v8 +- MTVRD(v8, r3) +-#ifdef REFLECT +- vsldoi v8,zeroes,v8,8 /* shift into bottom 32 bits */ +-#else +- vsldoi v8,v8,zeroes,4 /* shift into top 32 bits */ +-#endif +- +-#ifdef BYTESWAP_DATA +- addis r3,r2,.byteswap_constant@toc@ha +- addi r3,r3,.byteswap_constant@toc@l +- +- lvx byteswap,0,r3 +- addi r3,r3,16 +-#endif +- +- cmpdi r5,256 +- blt .Lshort +- +- rldicr r6,r5,0,56 +- +- /* Checksum in blocks of MAX_SIZE */ +-1: lis r7,MAX_SIZE@h +- ori r7,r7,MAX_SIZE@l +- mr r9,r7 +- cmpd r6,r7 +- bgt 2f +- mr r7,r6 +-2: subf r6,r7,r6 +- +- /* our main loop does 128 bytes at a time */ +- srdi r7,r7,7 +- +- /* +- * Work out the offset into the constants table to start at. Each +- * constant is 16 bytes, and it is used against 128 bytes of input +- * data - 128 / 16 = 8 +- */ +- sldi r8,r7,4 +- srdi r9,r9,3 +- subf r8,r8,r9 +- +- /* We reduce our final 128 bytes in a separate step */ +- addi r7,r7,-1 +- mtctr r7 +- +- addis r3,r2,.constants@toc@ha +- addi r3,r3,.constants@toc@l +- +- /* Find the start of our constants */ +- add r3,r3,r8 +- +- /* zero v0-v7 which will contain our checksums */ +- vxor v0,v0,v0 +- vxor v1,v1,v1 +- vxor v2,v2,v2 +- vxor v3,v3,v3 +- vxor v4,v4,v4 +- vxor v5,v5,v5 +- vxor v6,v6,v6 +- vxor v7,v7,v7 +- +- lvx const1,0,r3 +- +- /* +- * If we are looping back to consume more data we use the values +- * already in v16-v23. +- */ +- cmpdi r0,1 +- beq 2f +- +- /* First warm up pass */ +- lvx v16,0,r4 +- lvx v17,off16,r4 +- VPERM(v16,v16,v16,byteswap) +- VPERM(v17,v17,v17,byteswap) +- lvx v18,off32,r4 +- lvx v19,off48,r4 +- VPERM(v18,v18,v18,byteswap) +- VPERM(v19,v19,v19,byteswap) +- lvx v20,off64,r4 +- lvx v21,off80,r4 +- VPERM(v20,v20,v20,byteswap) +- VPERM(v21,v21,v21,byteswap) +- lvx v22,off96,r4 +- lvx v23,off112,r4 +- VPERM(v22,v22,v22,byteswap) +- VPERM(v23,v23,v23,byteswap) +- addi r4,r4,8*16 +- +- /* xor in initial value */ +- vxor v16,v16,v8 +- +-2: bdz .Lfirst_warm_up_done +- +- addi r3,r3,16 +- lvx const2,0,r3 +- +- /* Second warm up pass */ +- VPMSUMD(v8,v16,const1) +- lvx v16,0,r4 +- VPERM(v16,v16,v16,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v9,v17,const1) +- lvx v17,off16,r4 +- VPERM(v17,v17,v17,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v10,v18,const1) +- lvx v18,off32,r4 +- VPERM(v18,v18,v18,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v11,v19,const1) +- lvx v19,off48,r4 +- VPERM(v19,v19,v19,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v12,v20,const1) +- lvx v20,off64,r4 +- VPERM(v20,v20,v20,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v13,v21,const1) +- lvx v21,off80,r4 +- VPERM(v21,v21,v21,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v14,v22,const1) +- lvx v22,off96,r4 +- VPERM(v22,v22,v22,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v15,v23,const1) +- lvx v23,off112,r4 +- VPERM(v23,v23,v23,byteswap) +- +- addi r4,r4,8*16 +- +- bdz .Lfirst_cool_down +- +- /* +- * main loop. We modulo schedule it such that it takes three iterations +- * to complete - first iteration load, second iteration vpmsum, third +- * iteration xor. +- */ +- .balign 16 +-4: lvx const1,0,r3 +- addi r3,r3,16 +- ori r2,r2,0 +- +- vxor v0,v0,v8 +- VPMSUMD(v8,v16,const2) +- lvx v16,0,r4 +- VPERM(v16,v16,v16,byteswap) +- ori r2,r2,0 +- +- vxor v1,v1,v9 +- VPMSUMD(v9,v17,const2) +- lvx v17,off16,r4 +- VPERM(v17,v17,v17,byteswap) +- ori r2,r2,0 +- +- vxor v2,v2,v10 +- VPMSUMD(v10,v18,const2) +- lvx v18,off32,r4 +- VPERM(v18,v18,v18,byteswap) +- ori r2,r2,0 +- +- vxor v3,v3,v11 +- VPMSUMD(v11,v19,const2) +- lvx v19,off48,r4 +- VPERM(v19,v19,v19,byteswap) +- lvx const2,0,r3 +- ori r2,r2,0 +- +- vxor v4,v4,v12 +- VPMSUMD(v12,v20,const1) +- lvx v20,off64,r4 +- VPERM(v20,v20,v20,byteswap) +- ori r2,r2,0 +- +- vxor v5,v5,v13 +- VPMSUMD(v13,v21,const1) +- lvx v21,off80,r4 +- VPERM(v21,v21,v21,byteswap) +- ori r2,r2,0 +- +- vxor v6,v6,v14 +- VPMSUMD(v14,v22,const1) +- lvx v22,off96,r4 +- VPERM(v22,v22,v22,byteswap) +- ori r2,r2,0 +- +- vxor v7,v7,v15 +- VPMSUMD(v15,v23,const1) +- lvx v23,off112,r4 +- VPERM(v23,v23,v23,byteswap) +- +- addi r4,r4,8*16 +- +- bdnz 4b +- +-.Lfirst_cool_down: +- /* First cool down pass */ +- lvx const1,0,r3 +- addi r3,r3,16 +- +- vxor v0,v0,v8 +- VPMSUMD(v8,v16,const1) +- ori r2,r2,0 +- +- vxor v1,v1,v9 +- VPMSUMD(v9,v17,const1) +- ori r2,r2,0 +- +- vxor v2,v2,v10 +- VPMSUMD(v10,v18,const1) +- ori r2,r2,0 +- +- vxor v3,v3,v11 +- VPMSUMD(v11,v19,const1) +- ori r2,r2,0 +- +- vxor v4,v4,v12 +- VPMSUMD(v12,v20,const1) +- ori r2,r2,0 +- +- vxor v5,v5,v13 +- VPMSUMD(v13,v21,const1) +- ori r2,r2,0 +- +- vxor v6,v6,v14 +- VPMSUMD(v14,v22,const1) +- ori r2,r2,0 +- +- vxor v7,v7,v15 +- VPMSUMD(v15,v23,const1) +- ori r2,r2,0 +- +-.Lsecond_cool_down: +- /* Second cool down pass */ +- vxor v0,v0,v8 +- vxor v1,v1,v9 +- vxor v2,v2,v10 +- vxor v3,v3,v11 +- vxor v4,v4,v12 +- vxor v5,v5,v13 +- vxor v6,v6,v14 +- vxor v7,v7,v15 +- +-#ifdef REFLECT +- /* +- * vpmsumd produces a 96 bit result in the least significant bits +- * of the register. Since we are bit reflected we have to shift it +- * left 32 bits so it occupies the least significant bits in the +- * bit reflected domain. +- */ +- vsldoi v0,v0,zeroes,4 +- vsldoi v1,v1,zeroes,4 +- vsldoi v2,v2,zeroes,4 +- vsldoi v3,v3,zeroes,4 +- vsldoi v4,v4,zeroes,4 +- vsldoi v5,v5,zeroes,4 +- vsldoi v6,v6,zeroes,4 +- vsldoi v7,v7,zeroes,4 +-#endif +- +- /* xor with last 1024 bits */ +- lvx v8,0,r4 +- lvx v9,off16,r4 +- VPERM(v8,v8,v8,byteswap) +- VPERM(v9,v9,v9,byteswap) +- lvx v10,off32,r4 +- lvx v11,off48,r4 +- VPERM(v10,v10,v10,byteswap) +- VPERM(v11,v11,v11,byteswap) +- lvx v12,off64,r4 +- lvx v13,off80,r4 +- VPERM(v12,v12,v12,byteswap) +- VPERM(v13,v13,v13,byteswap) +- lvx v14,off96,r4 +- lvx v15,off112,r4 +- VPERM(v14,v14,v14,byteswap) +- VPERM(v15,v15,v15,byteswap) +- +- addi r4,r4,8*16 +- +- vxor v16,v0,v8 +- vxor v17,v1,v9 +- vxor v18,v2,v10 +- vxor v19,v3,v11 +- vxor v20,v4,v12 +- vxor v21,v5,v13 +- vxor v22,v6,v14 +- vxor v23,v7,v15 +- +- li r0,1 +- cmpdi r6,0 +- addi r6,r6,128 +- bne 1b +- +- /* Work out how many bytes we have left */ +- andi. r5,r5,127 +- +- /* Calculate where in the constant table we need to start */ +- subfic r6,r5,128 +- add r3,r3,r6 +- +- /* How many 16 byte chunks are in the tail */ +- srdi r7,r5,4 +- mtctr r7 +- +- /* +- * Reduce the previously calculated 1024 bits to 64 bits, shifting +- * 32 bits to include the trailing 32 bits of zeros +- */ +- lvx v0,0,r3 +- lvx v1,off16,r3 +- lvx v2,off32,r3 +- lvx v3,off48,r3 +- lvx v4,off64,r3 +- lvx v5,off80,r3 +- lvx v6,off96,r3 +- lvx v7,off112,r3 +- addi r3,r3,8*16 +- +- VPMSUMW(v0,v16,v0) +- VPMSUMW(v1,v17,v1) +- VPMSUMW(v2,v18,v2) +- VPMSUMW(v3,v19,v3) +- VPMSUMW(v4,v20,v4) +- VPMSUMW(v5,v21,v5) +- VPMSUMW(v6,v22,v6) +- VPMSUMW(v7,v23,v7) +- +- /* Now reduce the tail (0 - 112 bytes) */ +- cmpdi r7,0 +- beq 1f +- +- lvx v16,0,r4 +- lvx v17,0,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off16,r4 +- lvx v17,off16,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off32,r4 +- lvx v17,off32,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off48,r4 +- lvx v17,off48,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off64,r4 +- lvx v17,off64,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off80,r4 +- lvx v17,off80,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off96,r4 +- lvx v17,off96,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- +- /* Now xor all the parallel chunks together */ +-1: vxor v0,v0,v1 +- vxor v2,v2,v3 +- vxor v4,v4,v5 +- vxor v6,v6,v7 +- +- vxor v0,v0,v2 +- vxor v4,v4,v6 +- +- vxor v0,v0,v4 +- +-.Lbarrett_reduction: +- /* Barrett constants */ +- addis r3,r2,.barrett_constants@toc@ha +- addi r3,r3,.barrett_constants@toc@l +- +- lvx const1,0,r3 +- lvx const2,off16,r3 +- +- vsldoi v1,v0,v0,8 +- vxor v0,v0,v1 /* xor two 64 bit results together */ +- +-#ifdef REFLECT +- /* shift left one bit */ +- vspltisb v1,1 +- vsl v0,v0,v1 +-#endif +- +- vand v0,v0,mask_64bit +- +-#ifndef REFLECT +- /* +- * Now for the Barrett reduction algorithm. The idea is to calculate q, +- * the multiple of our polynomial that we need to subtract. By +- * doing the computation 2x bits higher (ie 64 bits) and shifting the +- * result back down 2x bits, we round down to the nearest multiple. +- */ +- VPMSUMD(v1,v0,const1) /* ma */ +- vsldoi v1,zeroes,v1,8 /* q = floor(ma/(2^64)) */ +- VPMSUMD(v1,v1,const2) /* qn */ +- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ +- +- /* +- * Get the result into r3. We need to shift it left 8 bytes: +- * V0 [ 0 1 2 X ] +- * V0 [ 0 X 2 3 ] +- */ +- vsldoi v0,v0,zeroes,8 /* shift result into top 64 bits */ +-#else +- /* +- * The reflected version of Barrett reduction. Instead of bit +- * reflecting our data (which is expensive to do), we bit reflect our +- * constants and our algorithm, which means the intermediate data in +- * our vector registers goes from 0-63 instead of 63-0. We can reflect +- * the algorithm because we don't carry in mod 2 arithmetic. +- */ +- vand v1,v0,mask_32bit /* bottom 32 bits of a */ +- VPMSUMD(v1,v1,const1) /* ma */ +- vand v1,v1,mask_32bit /* bottom 32bits of ma */ +- VPMSUMD(v1,v1,const2) /* qn */ +- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ +- +- /* +- * Since we are bit reflected, the result (ie the low 32 bits) is in +- * the high 32 bits. We just need to shift it left 4 bytes +- * V0 [ 0 1 X 3 ] +- * V0 [ 0 X 2 3 ] +- */ +- vsldoi v0,v0,zeroes,4 /* shift result into top 64 bits of */ +-#endif +- +- /* Get it into r3 */ +- MFVRD(r3, v0) +- +-.Lout: +- subi r6,r1,56+10*16 +- subi r7,r1,56+2*16 +- +- lvx v20,0,r6 +- lvx v21,off16,r6 +- lvx v22,off32,r6 +- lvx v23,off48,r6 +- lvx v24,off64,r6 +- lvx v25,off80,r6 +- lvx v26,off96,r6 +- lvx v27,off112,r6 +- lvx v28,0,r7 +- lvx v29,off16,r7 +- +- ld r31,-8(r1) +- ld r30,-16(r1) +- ld r29,-24(r1) +- ld r28,-32(r1) +- ld r27,-40(r1) +- ld r26,-48(r1) +- ld r25,-56(r1) +- +- blr +- +-.Lfirst_warm_up_done: +- lvx const1,0,r3 +- addi r3,r3,16 +- +- VPMSUMD(v8,v16,const1) +- VPMSUMD(v9,v17,const1) +- VPMSUMD(v10,v18,const1) +- VPMSUMD(v11,v19,const1) +- VPMSUMD(v12,v20,const1) +- VPMSUMD(v13,v21,const1) +- VPMSUMD(v14,v22,const1) +- VPMSUMD(v15,v23,const1) +- +- b .Lsecond_cool_down +- +-.Lshort: +- cmpdi r5,0 +- beq .Lzero +- +- addis r3,r2,.short_constants@toc@ha +- addi r3,r3,.short_constants@toc@l +- +- /* Calculate where in the constant table we need to start */ +- subfic r6,r5,256 +- add r3,r3,r6 +- +- /* How many 16 byte chunks? */ +- srdi r7,r5,4 +- mtctr r7 +- +- vxor v19,v19,v19 +- vxor v20,v20,v20 +- +- lvx v0,0,r4 +- lvx v16,0,r3 +- VPERM(v0,v0,v16,byteswap) +- vxor v0,v0,v8 /* xor in initial value */ +- VPMSUMW(v0,v0,v16) +- bdz .Lv0 +- +- lvx v1,off16,r4 +- lvx v17,off16,r3 +- VPERM(v1,v1,v17,byteswap) +- VPMSUMW(v1,v1,v17) +- bdz .Lv1 +- +- lvx v2,off32,r4 +- lvx v16,off32,r3 +- VPERM(v2,v2,v16,byteswap) +- VPMSUMW(v2,v2,v16) +- bdz .Lv2 +- +- lvx v3,off48,r4 +- lvx v17,off48,r3 +- VPERM(v3,v3,v17,byteswap) +- VPMSUMW(v3,v3,v17) +- bdz .Lv3 +- +- lvx v4,off64,r4 +- lvx v16,off64,r3 +- VPERM(v4,v4,v16,byteswap) +- VPMSUMW(v4,v4,v16) +- bdz .Lv4 +- +- lvx v5,off80,r4 +- lvx v17,off80,r3 +- VPERM(v5,v5,v17,byteswap) +- VPMSUMW(v5,v5,v17) +- bdz .Lv5 +- +- lvx v6,off96,r4 +- lvx v16,off96,r3 +- VPERM(v6,v6,v16,byteswap) +- VPMSUMW(v6,v6,v16) +- bdz .Lv6 +- +- lvx v7,off112,r4 +- lvx v17,off112,r3 +- VPERM(v7,v7,v17,byteswap) +- VPMSUMW(v7,v7,v17) +- bdz .Lv7 +- +- addi r3,r3,128 +- addi r4,r4,128 +- +- lvx v8,0,r4 +- lvx v16,0,r3 +- VPERM(v8,v8,v16,byteswap) +- VPMSUMW(v8,v8,v16) +- bdz .Lv8 +- +- lvx v9,off16,r4 +- lvx v17,off16,r3 +- VPERM(v9,v9,v17,byteswap) +- VPMSUMW(v9,v9,v17) +- bdz .Lv9 +- +- lvx v10,off32,r4 +- lvx v16,off32,r3 +- VPERM(v10,v10,v16,byteswap) +- VPMSUMW(v10,v10,v16) +- bdz .Lv10 +- +- lvx v11,off48,r4 +- lvx v17,off48,r3 +- VPERM(v11,v11,v17,byteswap) +- VPMSUMW(v11,v11,v17) +- bdz .Lv11 +- +- lvx v12,off64,r4 +- lvx v16,off64,r3 +- VPERM(v12,v12,v16,byteswap) +- VPMSUMW(v12,v12,v16) +- bdz .Lv12 +- +- lvx v13,off80,r4 +- lvx v17,off80,r3 +- VPERM(v13,v13,v17,byteswap) +- VPMSUMW(v13,v13,v17) +- bdz .Lv13 +- +- lvx v14,off96,r4 +- lvx v16,off96,r3 +- VPERM(v14,v14,v16,byteswap) +- VPMSUMW(v14,v14,v16) +- bdz .Lv14 +- +- lvx v15,off112,r4 +- lvx v17,off112,r3 +- VPERM(v15,v15,v17,byteswap) +- VPMSUMW(v15,v15,v17) +- +-.Lv15: vxor v19,v19,v15 +-.Lv14: vxor v20,v20,v14 +-.Lv13: vxor v19,v19,v13 +-.Lv12: vxor v20,v20,v12 +-.Lv11: vxor v19,v19,v11 +-.Lv10: vxor v20,v20,v10 +-.Lv9: vxor v19,v19,v9 +-.Lv8: vxor v20,v20,v8 +-.Lv7: vxor v19,v19,v7 +-.Lv6: vxor v20,v20,v6 +-.Lv5: vxor v19,v19,v5 +-.Lv4: vxor v20,v20,v4 +-.Lv3: vxor v19,v19,v3 +-.Lv2: vxor v20,v20,v2 +-.Lv1: vxor v19,v19,v1 +-.Lv0: vxor v20,v20,v0 +- +- vxor v0,v19,v20 +- +- b .Lbarrett_reduction +- +-.Lzero: +- mr r3,r10 +- b .Lout +- +-FUNC_END(__crc32_vpmsum) +diff --git a/util/crc32c_ppc_clang_workaround.h b/util/crc32c_ppc_clang_workaround.h +new file mode 100644 +index 0000000000..fc4391a603 +--- /dev/null ++++ b/util/crc32c_ppc_clang_workaround.h +@@ -0,0 +1,93 @@ ++// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. ++// Copyright (C) 2015, 2017 International Business Machines Corp. ++// All rights reserved. ++// This source code is licensed under both the GPLv2 (found in the ++// COPYING file in the root directory) and Apache 2.0 License ++// (found in the LICENSE.Apache file in the root directory). ++#ifndef CLANG_WORKAROUND_H ++#define CLANG_WORKAROUND_H ++ ++/* ++ * These stubs fix clang incompatibilities with GCC builtins. ++ */ ++ ++#ifndef __builtin_crypto_vpmsumw ++#define __builtin_crypto_vpmsumw __builtin_crypto_vpmsumb ++#endif ++#ifndef __builtin_crypto_vpmsumd ++#define __builtin_crypto_vpmsumd __builtin_crypto_vpmsumb ++#endif ++ ++static inline ++__vector unsigned long long __attribute__((overloadable)) ++vec_ld(int __a, const __vector unsigned long long* __b) ++{ ++ return (__vector unsigned long long)__builtin_altivec_lvx(__a, __b); ++} ++ ++/* ++ * GCC __builtin_pack_vector_int128 returns a vector __int128_t but Clang ++ * does not recognize this type. On GCC this builtin is translated to a ++ * xxpermdi instruction that only moves the registers __a, __b instead generates ++ * a load. ++ * ++ * Clang has vec_xxpermdi intrinsics. It was implemented in 4.0.0. ++ */ ++static inline ++__vector unsigned long long __builtin_pack_vector (unsigned long __a, ++ unsigned long __b) ++{ ++ #if defined(__BIG_ENDIAN__) ++ __vector unsigned long long __v = {__a, __b}; ++ #else ++ __vector unsigned long long __v = {__b, __a}; ++ #endif ++ return __v; ++} ++ ++/* ++ * Clang 7 changed the behavior of vec_xxpermdi in order to provide the same ++ * behavior of GCC. That means code adapted to Clang >= 7 does not work on ++ * Clang <= 6. So, fallback to __builtin_unpack_vector() on Clang <= 6. ++ */ ++#if !defined vec_xxpermdi || __clang_major__ <= 6 ++ ++static inline ++unsigned long __builtin_unpack_vector (__vector unsigned long long __v, ++ int __o) ++{ ++ return __v[__o]; ++} ++ ++#if defined(__BIG_ENDIAN__) ++#define __builtin_unpack_vector_0(a) __builtin_unpack_vector ((a), 0) ++#define __builtin_unpack_vector_1(a) __builtin_unpack_vector ((a), 1) ++#else ++#define __builtin_unpack_vector_0(a) __builtin_unpack_vector ((a), 1) ++#define __builtin_unpack_vector_1(a) __builtin_unpack_vector ((a), 0) ++#endif ++ ++#else ++ ++static inline ++unsigned long __builtin_unpack_vector_0 (__vector unsigned long long __v) ++{ ++ #if defined(__BIG_ENDIAN__) ++ return vec_xxpermdi(__v, __v, 0x0)[0]; ++ #else ++ return vec_xxpermdi(__v, __v, 0x3)[0]; ++ #endif ++} ++ ++static inline ++unsigned long __builtin_unpack_vector_1 (__vector unsigned long long __v) ++{ ++ #if defined(__BIG_ENDIAN__) ++ return vec_xxpermdi(__v, __v, 0x3)[0]; ++ #else ++ return vec_xxpermdi(__v, __v, 0x0)[0]; ++ #endif ++} ++#endif /* vec_xxpermdi */ ++ ++#endif +diff --git a/util/crc32c_ppc_constants.h b/util/crc32c_ppc_constants.h +index f6494cd01c..b558d46777 100644 +--- a/util/crc32c_ppc_constants.h ++++ b/util/crc32c_ppc_constants.h +@@ -5,896 +5,1206 @@ + // COPYING file in the root directory) and Apache 2.0 License + // (found in the LICENSE.Apache file in the root directory). + +-#pragma once ++/* ++* ++* THIS FILE IS GENERATED WITH ++./crc32_constants -r -x 0x1edc6f41 ++ ++* This is from https://github.com/antonblanchard/crc32-vpmsum/ ++* DO NOT MODIFY IT MANUALLY! ++* ++*/ + + #define CRC 0x1edc6f41 +-#define REFLECT + #define CRC_XOR ++#define REFLECT ++#define MAX_SIZE 32768 + +-#ifndef __ASSEMBLY__ + #ifdef CRC_TABLE + static const unsigned int crc_table[] = { +- 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, +- 0x26a1e7e8, 0xd4ca64eb, 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, +- 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, 0x105ec76f, 0xe235446c, +- 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, +- 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, +- 0xbc267848, 0x4e4dfb4b, 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, +- 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, 0xaa64d611, 0x580f5512, +- 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, +- 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, +- 0x1642ae59, 0xe4292d5a, 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, +- 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, 0x417b1dbc, 0xb3109ebf, +- 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, +- 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, +- 0xed03a29b, 0x1f682198, 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, +- 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, 0xdbfc821c, 0x2997011f, +- 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, +- 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, +- 0x4767748a, 0xb50cf789, 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, +- 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, 0x7198540d, 0x83f3d70e, +- 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, +- 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, +- 0xdde0eb2a, 0x2f8b6829, 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, +- 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, 0x082f63b7, 0xfa44e0b4, +- 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, +- 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, +- 0xb4091bff, 0x466298fc, 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, +- 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, 0xa24bb5a6, 0x502036a5, +- 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, +- 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, +- 0x0e330a81, 0xfc588982, 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, +- 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, 0x38cc2a06, 0xcaa7a905, +- 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, +- 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, +- 0xe52cc12c, 0x1747422f, 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, +- 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, 0xd3d3e1ab, 0x21b862a8, +- 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, +- 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, +- 0x7fab5e8c, 0x8dc0dd8f, 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, +- 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, 0x69e9f0d5, 0x9b8273d6, +- 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, +- 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, +- 0xd5cf889d, 0x27a40b9e, 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, +- 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351, +-}; +- +-#endif +- +-#else +-#define MAX_SIZE 32768 +-.constants : +- +- /* Reduce 262144 kbits to 1024 bits */ +- /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ +- .octa 0x00000000b6ca9e20000000009c37c408 +- +- /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ +- .octa 0x00000000350249a800000001b51df26c +- +- /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ +- .octa 0x00000001862dac54000000000724b9d0 +- +- /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ +- .octa 0x00000001d87fb48c00000001c00532fe +- +- /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ +- .octa 0x00000001f39b699e00000000f05a9362 +- +- /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ +- .octa 0x0000000101da11b400000001e1007970 +- +- /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ +- .octa 0x00000001cab571e000000000a57366ee +- +- /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ +- .octa 0x00000000c7020cfe0000000192011284 +- +- /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ +- .octa 0x00000000cdaed1ae0000000162716d9a +- +- /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ +- .octa 0x00000001e804effc00000000cd97ecde +- +- /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ +- .octa 0x0000000077c3ea3a0000000058812bc0 +- +- /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ +- .octa 0x0000000068df31b40000000088b8c12e +- +- /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ +- .octa 0x00000000b059b6c200000001230b234c +- +- /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ +- .octa 0x0000000145fb8ed800000001120b416e +- +- /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ +- .octa 0x00000000cbc0916800000001974aecb0 +- +- /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ +- .octa 0x000000005ceeedc2000000008ee3f226 +- +- /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ +- .octa 0x0000000047d74e8600000001089aba9a +- +- /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ +- .octa 0x00000001407e9e220000000065113872 +- +- /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ +- .octa 0x00000001da967bda000000005c07ec10 +- +- /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ +- .octa 0x000000006c8983680000000187590924 +- +- /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ +- .octa 0x00000000f2d14c9800000000e35da7c6 +- +- /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ +- .octa 0x00000001993c6ad4000000000415855a +- +- /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ +- .octa 0x000000014683d1ac0000000073617758 +- +- /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ +- .octa 0x00000001a7c93e6c0000000176021d28 +- +- /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ +- .octa 0x000000010211e90a00000001c358fd0a +- +- /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ +- .octa 0x000000001119403e00000001ff7a2c18 +- +- /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ +- .octa 0x000000001c3261aa00000000f2d9f7e4 +- +- /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ +- .octa 0x000000014e37a634000000016cf1f9c8 +- +- /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ +- .octa 0x0000000073786c0c000000010af9279a +- +- /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ +- .octa 0x000000011dc037f80000000004f101e8 +- +- /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ +- .octa 0x0000000031433dfc0000000070bcf184 +- +- /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ +- .octa 0x000000009cde8348000000000a8de642 +- +- /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ +- .octa 0x0000000038d3c2a60000000062ea130c +- +- /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ +- .octa 0x000000011b25f26000000001eb31cbb2 +- +- /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ +- .octa 0x000000001629e6f00000000170783448 +- +- /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ +- .octa 0x0000000160838b4c00000001a684b4c6 +- +- /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ +- .octa 0x000000007a44011c00000000253ca5b4 +- +- /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ +- .octa 0x00000000226f417a0000000057b4b1e2 +- +- /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ +- .octa 0x0000000045eb2eb400000000b6bd084c +- +- /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ +- .octa 0x000000014459d70c0000000123c2d592 +- +- /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ +- .octa 0x00000001d406ed8200000000159dafce +- +- /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ +- .octa 0x0000000160c8e1a80000000127e1a64e +- +- /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ +- .octa 0x0000000027ba80980000000056860754 +- +- /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ +- .octa 0x000000006d92d01800000001e661aae8 +- +- /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ +- .octa 0x000000012ed7e3f200000000f82c6166 +- +- /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ +- .octa 0x000000002dc8778800000000c4f9c7ae +- +- /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ +- .octa 0x0000000018240bb80000000074203d20 +- +- /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ +- .octa 0x000000001ad381580000000198173052 +- +- /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ +- .octa 0x00000001396b78f200000001ce8aba54 +- +- /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ +- .octa 0x000000011a68133400000001850d5d94 +- +- /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ +- .octa 0x000000012104732e00000001d609239c +- +- /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ +- .octa 0x00000000a140d90c000000001595f048 +- +- /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ +- .octa 0x00000001b7215eda0000000042ccee08 +- +- /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ +- .octa 0x00000001aaf1df3c000000010a389d74 +- +- /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ +- .octa 0x0000000029d15b8a000000012a840da6 +- +- /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ +- .octa 0x00000000f1a96922000000001d181c0c +- +- /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ +- .octa 0x00000001ac80d03c0000000068b7d1f6 +- +- /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ +- .octa 0x000000000f11d56a000000005b0f14fc +- +- /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ +- .octa 0x00000001f1c022a20000000179e9e730 +- +- /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ +- .octa 0x0000000173d00ae200000001ce1368d6 +- +- /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ +- .octa 0x00000001d4ffe4ac0000000112c3a84c +- +- /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ +- .octa 0x000000016edc5ae400000000de940fee +- +- /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ +- .octa 0x00000001f1a0214000000000fe896b7e +- +- /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ +- .octa 0x00000000ca0b28a000000001f797431c +- +- /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ +- .octa 0x00000001928e30a20000000053e989ba +- +- /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ +- .octa 0x0000000097b1b002000000003920cd16 +- +- /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ +- .octa 0x00000000b15bf90600000001e6f579b8 +- +- /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ +- .octa 0x00000000411c5d52000000007493cb0a +- +- /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ +- .octa 0x00000001c36f330000000001bdd376d8 +- +- /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ +- .octa 0x00000001119227e0000000016badfee6 +- +- /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ +- .octa 0x00000000114d47020000000071de5c58 +- +- /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ +- .octa 0x00000000458b5b9800000000453f317c +- +- /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ +- .octa 0x000000012e31fb8e0000000121675cce +- +- /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ +- .octa 0x000000005cf619d800000001f409ee92 +- +- /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ +- .octa 0x0000000063f4d8b200000000f36b9c88 +- +- /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ +- .octa 0x000000004138dc8a0000000036b398f4 +- +- /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ +- .octa 0x00000001d29ee8e000000001748f9adc +- +- /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ +- .octa 0x000000006a08ace800000001be94ec00 +- +- /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ +- .octa 0x0000000127d4201000000000b74370d6 +- +- /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ +- .octa 0x0000000019d76b6200000001174d0b98 +- +- /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ +- .octa 0x00000001b1471f6e00000000befc06a4 +- +- /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ +- .octa 0x00000001f64c19cc00000001ae125288 +- +- /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ +- .octa 0x00000000003c0ea00000000095c19b34 +- +- /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ +- .octa 0x000000014d73abf600000001a78496f2 +- +- /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ +- .octa 0x00000001620eb84400000001ac5390a0 +- +- /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ +- .octa 0x0000000147655048000000002a80ed6e +- +- /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ +- .octa 0x0000000067b5077e00000001fa9b0128 +- +- /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ +- .octa 0x0000000010ffe20600000001ea94929e +- +- /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ +- .octa 0x000000000fee8f1e0000000125f4305c +- +- /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ +- .octa 0x00000001da26fbae00000001471e2002 +- +- /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ +- .octa 0x00000001b3a8bd880000000132d2253a +- +- /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ +- .octa 0x00000000e8f3898e00000000f26b3592 +- +- /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ +- .octa 0x00000000b0d0d28c00000000bc8b67b0 +- +- /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ +- .octa 0x0000000030f2a798000000013a826ef2 +- +- /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ +- .octa 0x000000000fba10020000000081482c84 +- +- /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ +- .octa 0x00000000bdb9bd7200000000e77307c2 +- +- /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ +- .octa 0x0000000075d3bf5a00000000d4a07ec8 +- +- /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ +- .octa 0x00000000ef1f98a00000000017102100 +- +- /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ +- .octa 0x00000000689c760200000000db406486 +- +- /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ +- .octa 0x000000016d5fa5fe0000000192db7f88 +- +- /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ +- .octa 0x00000001d0d2b9ca000000018bf67b1e +- +- /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ +- .octa 0x0000000041e7b470000000007c09163e +- +- /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ +- .octa 0x00000001cbb6495e000000000adac060 +- +- /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ +- .octa 0x000000010052a0b000000000bd8316ae +- +- /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ +- .octa 0x00000001d8effb5c000000019f09ab54 +- +- /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ +- .octa 0x00000001d969853c0000000125155542 +- +- /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ +- .octa 0x00000000523ccce2000000018fdb5882 +- +- /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ +- .octa 0x000000001e2436bc00000000e794b3f4 +- +- /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ +- .octa 0x00000000ddd1c3a2000000016f9bb022 +- +- /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ +- .octa 0x0000000019fcfe3800000000290c9978 +- +- /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ +- .octa 0x00000001ce95db640000000083c0f350 +- +- /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ +- .octa 0x00000000af5828060000000173ea6628 +- +- /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ +- .octa 0x00000001006388f600000001c8b4e00a +- +- /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ +- .octa 0x0000000179eca00a00000000de95d6aa +- +- /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ +- .octa 0x0000000122410a6a000000010b7f7248 +- +- /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ +- .octa 0x000000004288e87c00000001326e3a06 +- +- /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ +- .octa 0x000000016c5490da00000000bb62c2e6 +- +- /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ +- .octa 0x00000000d1c71f6e0000000156a4b2c2 +- +- /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ +- .octa 0x00000001b4ce08a6000000011dfe763a +- +- /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ +- .octa 0x00000001466ba60c000000007bcca8e2 +- +- /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ +- .octa 0x00000001f6c488a40000000186118faa +- +- /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ +- .octa 0x000000013bfb06820000000111a65a88 +- +- /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ +- .octa 0x00000000690e9e54000000003565e1c4 +- +- /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ +- .octa 0x00000000281346b6000000012ed02a82 +- +- /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ +- .octa 0x000000015646402400000000c486ecfc +- +- /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ +- .octa 0x000000016063a8dc0000000001b951b2 +- +- /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ +- .octa 0x0000000116a663620000000048143916 +- +- /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ +- .octa 0x000000017e8aa4d200000001dc2ae124 +- +- /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ +- .octa 0x00000001728eb10c00000001416c58d6 +- +- /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ +- .octa 0x00000001b08fd7fa00000000a479744a +- +- /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ +- .octa 0x00000001092a16e80000000096ca3a26 +- +- /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ +- .octa 0x00000000a505637c00000000ff223d4e +- +- /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ +- .octa 0x00000000d94869b2000000010e84da42 +- +- /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ +- .octa 0x00000001c8b203ae00000001b61ba3d0 +- +- /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ +- .octa 0x000000005704aea000000000680f2de8 +- +- /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ +- .octa 0x000000012e295fa2000000008772a9a8 +- +- /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ +- .octa 0x000000011d0908bc0000000155f295bc +- +- /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ +- .octa 0x0000000193ed97ea00000000595f9282 +- +- /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ +- .octa 0x000000013a0f1c520000000164b1c25a +- +- /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ +- .octa 0x000000010c2c40c000000000fbd67c50 +- +- /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ +- .octa 0x00000000ff6fac3e0000000096076268 +- +- /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ +- .octa 0x000000017b3609c000000001d288e4cc +- +- /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ +- .octa 0x0000000088c8c92200000001eaac1bdc +- +- /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ +- .octa 0x00000001751baae600000001f1ea39e2 +- +- /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ +- .octa 0x000000010795297200000001eb6506fc +- +- /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ +- .octa 0x0000000162b00abe000000010f806ffe +- +- /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ +- .octa 0x000000000d7b404c000000010408481e +- +- /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ +- .octa 0x00000000763b13d40000000188260534 +- +- /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ +- .octa 0x00000000f6dc22d80000000058fc73e0 +- +- /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ +- .octa 0x000000007daae06000000000391c59b8 +- +- /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ +- .octa 0x000000013359ab7c000000018b638400 +- +- /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ +- .octa 0x000000008add438a000000011738f5c4 +- +- /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ +- .octa 0x00000001edbefdea000000008cf7c6da +- +- /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ +- .octa 0x000000004104e0f800000001ef97fb16 +- +- /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ +- .octa 0x00000000b48a82220000000102130e20 +- +- /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ +- .octa 0x00000001bcb4684400000000db968898 +- +- /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ +- .octa 0x000000013293ce0a00000000b5047b5e +- +- /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ +- .octa 0x00000001710d0844000000010b90fdb2 +- +- /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ +- .octa 0x0000000117907f6e000000004834a32e +- +- /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ +- .octa 0x0000000087ddf93e0000000059c8f2b0 +- +- /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ +- .octa 0x000000005970e9b00000000122cec508 +- +- /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ +- .octa 0x0000000185b2b7d0000000000a330cda +- +- /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ +- .octa 0x00000001dcee0efc000000014a47148c +- +- /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ +- .octa 0x0000000030da27220000000042c61cb8 +- +- /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ +- .octa 0x000000012f925a180000000012fe6960 +- +- /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ +- .octa 0x00000000dd2e357c00000000dbda2c20 +- +- /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ +- .octa 0x00000000071c80de000000011122410c +- +- /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ +- .octa 0x000000011513140a00000000977b2070 +- +- /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ +- .octa 0x00000001df876e8e000000014050438e +- +- /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ +- .octa 0x000000015f81d6ce0000000147c840e8 +- +- /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ +- .octa 0x000000019dd94dbe00000001cc7c88ce +- +- /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ +- .octa 0x00000001373d206e00000001476b35a4 +- +- /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ +- .octa 0x00000000668ccade000000013d52d508 +- +- /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ +- .octa 0x00000001b192d268000000008e4be32e +- +- /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ +- .octa 0x00000000e30f3a7800000000024120fe +- +- /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ +- .octa 0x000000010ef1f7bc00000000ddecddb4 +- +- /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ +- .octa 0x00000001f5ac738000000000d4d403bc +- +- /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ +- .octa 0x000000011822ea7000000001734b89aa +- +- /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ +- .octa 0x00000000c3a33848000000010e7a58d6 +- +- /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ +- .octa 0x00000001bd151c2400000001f9f04e9c +- +- /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ +- .octa 0x0000000056002d7600000000b692225e +- +- /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ +- .octa 0x000000014657c4f4000000019b8d3f3e +- +- /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ +- .octa 0x0000000113742d7c00000001a874f11e +- +- /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ +- .octa 0x000000019c5920ba000000010d5a4254 +- +- /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ +- .octa 0x000000005216d2d600000000bbb2f5d6 +- +- /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ +- .octa 0x0000000136f5ad8a0000000179cc0e36 +- +- /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ +- .octa 0x000000018b07beb600000001dca1da4a +- +- /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ +- .octa 0x00000000db1e93b000000000feb1a192 +- +- /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ +- .octa 0x000000000b96fa3a00000000d1eeedd6 +- +- /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ +- .octa 0x00000001d9968af0000000008fad9bb4 +- +- /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ +- .octa 0x000000000e4a77a200000001884938e4 +- +- /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ +- .octa 0x00000000508c2ac800000001bc2e9bc0 +- +- /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ +- .octa 0x0000000021572a8000000001f9658a68 +- +- /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ +- .octa 0x00000001b859daf2000000001b9224fc +- +- /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ +- .octa 0x000000016f7884740000000055b2fb84 +- +- /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ +- .octa 0x00000001b438810e000000018b090348 +- +- /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ +- .octa 0x0000000095ddc6f2000000011ccbd5ea +- +- /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ +- .octa 0x00000001d977c20c0000000007ae47f8 +- +- /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ +- .octa 0x00000000ebedb99a0000000172acbec0 +- +- /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ +- .octa 0x00000001df9e9e9200000001c6e3ff20 +- +- /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ +- .octa 0x00000001a4a3f95200000000e1b38744 +- +- /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ +- .octa 0x00000000e2f5122000000000791585b2 +- +- /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ +- .octa 0x000000004aa01f3e00000000ac53b894 +- +- /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ +- .octa 0x00000000b3e90a5800000001ed5f2cf4 +- +- /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ +- .octa 0x000000000c9ca2aa00000001df48b2e0 +- +- /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ +- .octa 0x000000015168231600000000049c1c62 +- +- /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ +- .octa 0x0000000036fce78c000000017c460c12 +- +- /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ +- .octa 0x000000009037dc10000000015be4da7e +- +- /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ +- .octa 0x00000000d3298582000000010f38f668 +- +- /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ +- .octa 0x00000001b42e8ad60000000039f40a00 +- +- /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ +- .octa 0x00000000142a983800000000bd4c10c4 +- +- /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ +- .octa 0x0000000109c7f1900000000042db1d98 +- +- /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ +- .octa 0x0000000056ff931000000001c905bae6 +- +- /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ +- .octa 0x00000001594513aa00000000069d40ea +- +- /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ +- .octa 0x00000001e3b5b1e8000000008e4fbad0 +- +- /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ +- .octa 0x000000011dd5fc080000000047bedd46 +- +- /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ +- .octa 0x00000001675f0cc20000000026396bf8 +- +- /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ +- .octa 0x00000000d1c8dd4400000000379beb92 +- +- /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ +- .octa 0x0000000115ebd3d8000000000abae54a +- +- /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ +- .octa 0x00000001ecbd0dac0000000007e6a128 +- +- /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ +- .octa 0x00000000cdf67af2000000000ade29d2 +- +- /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ +- .octa 0x000000004c01ff4c00000000f974c45c +- +- /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ +- .octa 0x00000000f2d8657e00000000e77ac60a +- +- /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ +- .octa 0x000000006bae74c40000000145895816 +- +- /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ +- .octa 0x0000000152af8aa00000000038e362be +- +- /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ +- .octa 0x0000000004663802000000007f991a64 +- +- /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ +- .octa 0x00000001ab2f5afc00000000fa366d3a +- +- /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ +- .octa 0x0000000074a4ebd400000001a2bb34f0 +- +- /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ +- .octa 0x00000001d7ab3a4c0000000028a9981e +- +- /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ +- .octa 0x00000001a8da60c600000001dbc672be +- +- /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ +- .octa 0x000000013cf6382000000000b04d77f6 +- +- /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ +- .octa 0x00000000bec12e1e0000000124400d96 +- +- /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ +- .octa 0x00000001c6368010000000014ca4b414 +- +- /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ +- .octa 0x00000001e6e78758000000012fe2c938 +- +- /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ +- .octa 0x000000008d7f2b3c00000001faed01e6 +- +- /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ +- .octa 0x000000016b4a156e000000007e80ecfe +- +- /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ +- .octa 0x00000001c63cfeb60000000098daee94 +- +- /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ +- .octa 0x000000015f902670000000010a04edea +- +- /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ +- .octa 0x00000001cd5de11e00000001c00b4524 +- +- /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ +- .octa 0x000000001acaec540000000170296550 +- +- /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ +- .octa 0x000000002bd0ca780000000181afaa48 +- +- /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ +- .octa 0x0000000032d63d5c0000000185a31ffa +- +- /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ +- .octa 0x000000001c6d4e4c000000002469f608 +- +- /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ +- .octa 0x0000000106a60b92000000006980102a +- +- /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ +- .octa 0x00000000d3855e120000000111ea9ca8 +- +- /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ +- .octa 0x00000000e312563600000001bd1d29ce +- +- /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ +- .octa 0x000000009e8f7ea400000001b34b9580 +- +- /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ +- .octa 0x00000001c82e562c000000003076054e +- +- /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ +- .octa 0x00000000ca9f09ce000000012a608ea4 +- +- /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ +- .octa 0x00000000c63764e600000000784d05fe +- +- /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ +- .octa 0x0000000168d2e49e000000016ef0d82a +- +- /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ +- .octa 0x00000000e986c1480000000075bda454 +- +- /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ +- .octa 0x00000000cfb65894000000003dc0a1c4 +- +- /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ +- .octa 0x0000000111cadee400000000e9a5d8be +- +- /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ +- .octa 0x0000000171fb63ce00000001609bc4b4 +- +- .short_constants : +- +- /* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include +- the trailing 32 bits of zeros */ +- /* x^1952 mod p(x)`, x^1984 mod p(x)`, x^2016 mod p(x)`, x^2048 mod +- p(x)` */ +- .octa 0x7fec2963e5bf80485cf015c388e56f72 +- +- /* x^1824 mod p(x)`, x^1856 mod p(x)`, x^1888 mod p(x)`, x^1920 mod +- p(x)` */ +- .octa 0x38e888d4844752a9963a18920246e2e6 +- +- /* x^1696 mod p(x)`, x^1728 mod p(x)`, x^1760 mod p(x)`, x^1792 mod +- p(x)` */ +- .octa 0x42316c00730206ad419a441956993a31 +- +- /* x^1568 mod p(x)`, x^1600 mod p(x)`, x^1632 mod p(x)`, x^1664 mod +- p(x)` */ +- .octa 0x543d5c543e65ddf9924752ba2b830011 +- +- /* x^1440 mod p(x)`, x^1472 mod p(x)`, x^1504 mod p(x)`, x^1536 mod +- p(x)` */ +- .octa 0x78e87aaf56767c9255bd7f9518e4a304 +- +- /* x^1312 mod p(x)`, x^1344 mod p(x)`, x^1376 mod p(x)`, x^1408 mod +- p(x)` */ +- .octa 0x8f68fcec1903da7f6d76739fe0553f1e +- +- /* x^1184 mod p(x)`, x^1216 mod p(x)`, x^1248 mod p(x)`, x^1280 mod +- p(x)` */ +- .octa 0x3f4840246791d588c133722b1fe0b5c3 +- +- /* x^1056 mod p(x)`, x^1088 mod p(x)`, x^1120 mod p(x)`, x^1152 mod +- p(x)` */ +- .octa 0x34c96751b04de25a64b67ee0e55ef1f3 +- +- /* x^928 mod p(x)`, x^960 mod p(x)`, x^992 mod p(x)`, x^1024 mod p(x)` +- */ +- .octa 0x156c8e180b4a395b069db049b8fdb1e7 +- +- /* x^800 mod p(x)`, x^832 mod p(x)`, x^864 mod p(x)`, x^896 mod p(x)` */ +- .octa 0xe0b99ccbe661f7bea11bfaf3c9e90b9e +- +- /* x^672 mod p(x)`, x^704 mod p(x)`, x^736 mod p(x)`, x^768 mod p(x)` */ +- .octa 0x041d37768cd75659817cdc5119b29a35 +- +- /* x^544 mod p(x)`, x^576 mod p(x)`, x^608 mod p(x)`, x^640 mod p(x)` */ +- .octa 0x3a0777818cfaa9651ce9d94b36c41f1c +- +- /* x^416 mod p(x)`, x^448 mod p(x)`, x^480 mod p(x)`, x^512 mod p(x)` */ +- .octa 0x0e148e8252377a554f256efcb82be955 +- +- /* x^288 mod p(x)`, x^320 mod p(x)`, x^352 mod p(x)`, x^384 mod p(x)` */ +- .octa 0x9c25531d19e65ddeec1631edb2dea967 +- +- /* x^160 mod p(x)`, x^192 mod p(x)`, x^224 mod p(x)`, x^256 mod p(x)` */ +- .octa 0x790606ff9957c0a65d27e147510ac59a +- +- /* x^32 mod p(x)`, x^64 mod p(x)`, x^96 mod p(x)`, x^128 mod p(x)` */ +- .octa 0x82f63b786ea2d55ca66805eb18b8ea18 +- +- .barrett_constants : +- /* 33 bit reflected Barrett constant m - (4^32)/n */ +- .octa 0x000000000000000000000000dea713f1 /* x^64 div p(x)` */ +- /* 33 bit reflected Barrett constant n */ +- .octa 0x00000000000000000000000105ec76f1 +-#endif ++ 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, ++ 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, ++ 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, ++ 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, ++ 0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, ++ 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, ++ 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, ++ 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, ++ 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, ++ 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, ++ 0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, ++ 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, ++ 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, ++ 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, ++ 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, ++ 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, ++ 0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, ++ 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, ++ 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, ++ 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, ++ 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, ++ 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, ++ 0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, ++ 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, ++ 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, ++ 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, ++ 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, ++ 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, ++ 0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, ++ 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, ++ 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, ++ 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, ++ 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, ++ 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, ++ 0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, ++ 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, ++ 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, ++ 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, ++ 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, ++ 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, ++ 0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, ++ 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, ++ 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, ++ 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, ++ 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, ++ 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, ++ 0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, ++ 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, ++ 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, ++ 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, ++ 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, ++ 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, ++ 0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, ++ 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, ++ 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, ++ 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, ++ 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, ++ 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, ++ 0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, ++ 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, ++ 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, ++ 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, ++ 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, ++ 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351,}; ++ ++#endif /* CRC_TABLE */ ++#ifdef POWER8_INTRINSICS ++ ++/* Constants */ ++ ++/* Reduce 262144 kbits to 1024 bits */ ++static const __vector unsigned long long vcrc_const[255] ++ __attribute__((aligned (16))) = { ++#ifdef __LITTLE_ENDIAN__ ++ /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ ++ { 0x000000009c37c408, 0x00000000b6ca9e20 }, ++ /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ ++ { 0x00000001b51df26c, 0x00000000350249a8 }, ++ /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ ++ { 0x000000000724b9d0, 0x00000001862dac54 }, ++ /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ ++ { 0x00000001c00532fe, 0x00000001d87fb48c }, ++ /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ ++ { 0x00000000f05a9362, 0x00000001f39b699e }, ++ /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ ++ { 0x00000001e1007970, 0x0000000101da11b4 }, ++ /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ ++ { 0x00000000a57366ee, 0x00000001cab571e0 }, ++ /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ ++ { 0x0000000192011284, 0x00000000c7020cfe }, ++ /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ ++ { 0x0000000162716d9a, 0x00000000cdaed1ae }, ++ /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ ++ { 0x00000000cd97ecde, 0x00000001e804effc }, ++ /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ ++ { 0x0000000058812bc0, 0x0000000077c3ea3a }, ++ /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ ++ { 0x0000000088b8c12e, 0x0000000068df31b4 }, ++ /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ ++ { 0x00000001230b234c, 0x00000000b059b6c2 }, ++ /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ ++ { 0x00000001120b416e, 0x0000000145fb8ed8 }, ++ /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ ++ { 0x00000001974aecb0, 0x00000000cbc09168 }, ++ /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ ++ { 0x000000008ee3f226, 0x000000005ceeedc2 }, ++ /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ ++ { 0x00000001089aba9a, 0x0000000047d74e86 }, ++ /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ ++ { 0x0000000065113872, 0x00000001407e9e22 }, ++ /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ ++ { 0x000000005c07ec10, 0x00000001da967bda }, ++ /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ ++ { 0x0000000187590924, 0x000000006c898368 }, ++ /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ ++ { 0x00000000e35da7c6, 0x00000000f2d14c98 }, ++ /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ ++ { 0x000000000415855a, 0x00000001993c6ad4 }, ++ /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ ++ { 0x0000000073617758, 0x000000014683d1ac }, ++ /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ ++ { 0x0000000176021d28, 0x00000001a7c93e6c }, ++ /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ ++ { 0x00000001c358fd0a, 0x000000010211e90a }, ++ /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ ++ { 0x00000001ff7a2c18, 0x000000001119403e }, ++ /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ ++ { 0x00000000f2d9f7e4, 0x000000001c3261aa }, ++ /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ ++ { 0x000000016cf1f9c8, 0x000000014e37a634 }, ++ /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ ++ { 0x000000010af9279a, 0x0000000073786c0c }, ++ /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ ++ { 0x0000000004f101e8, 0x000000011dc037f8 }, ++ /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ ++ { 0x0000000070bcf184, 0x0000000031433dfc }, ++ /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ ++ { 0x000000000a8de642, 0x000000009cde8348 }, ++ /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ ++ { 0x0000000062ea130c, 0x0000000038d3c2a6 }, ++ /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ ++ { 0x00000001eb31cbb2, 0x000000011b25f260 }, ++ /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ ++ { 0x0000000170783448, 0x000000001629e6f0 }, ++ /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ ++ { 0x00000001a684b4c6, 0x0000000160838b4c }, ++ /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ ++ { 0x00000000253ca5b4, 0x000000007a44011c }, ++ /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ ++ { 0x0000000057b4b1e2, 0x00000000226f417a }, ++ /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ ++ { 0x00000000b6bd084c, 0x0000000045eb2eb4 }, ++ /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ ++ { 0x0000000123c2d592, 0x000000014459d70c }, ++ /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ ++ { 0x00000000159dafce, 0x00000001d406ed82 }, ++ /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ ++ { 0x0000000127e1a64e, 0x0000000160c8e1a8 }, ++ /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ ++ { 0x0000000056860754, 0x0000000027ba8098 }, ++ /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ ++ { 0x00000001e661aae8, 0x000000006d92d018 }, ++ /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ ++ { 0x00000000f82c6166, 0x000000012ed7e3f2 }, ++ /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ ++ { 0x00000000c4f9c7ae, 0x000000002dc87788 }, ++ /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ ++ { 0x0000000074203d20, 0x0000000018240bb8 }, ++ /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ ++ { 0x0000000198173052, 0x000000001ad38158 }, ++ /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ ++ { 0x00000001ce8aba54, 0x00000001396b78f2 }, ++ /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ ++ { 0x00000001850d5d94, 0x000000011a681334 }, ++ /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ ++ { 0x00000001d609239c, 0x000000012104732e }, ++ /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ ++ { 0x000000001595f048, 0x00000000a140d90c }, ++ /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ ++ { 0x0000000042ccee08, 0x00000001b7215eda }, ++ /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ ++ { 0x000000010a389d74, 0x00000001aaf1df3c }, ++ /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ ++ { 0x000000012a840da6, 0x0000000029d15b8a }, ++ /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ ++ { 0x000000001d181c0c, 0x00000000f1a96922 }, ++ /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ ++ { 0x0000000068b7d1f6, 0x00000001ac80d03c }, ++ /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ ++ { 0x000000005b0f14fc, 0x000000000f11d56a }, ++ /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ ++ { 0x0000000179e9e730, 0x00000001f1c022a2 }, ++ /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ ++ { 0x00000001ce1368d6, 0x0000000173d00ae2 }, ++ /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ ++ { 0x0000000112c3a84c, 0x00000001d4ffe4ac }, ++ /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ ++ { 0x00000000de940fee, 0x000000016edc5ae4 }, ++ /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ ++ { 0x00000000fe896b7e, 0x00000001f1a02140 }, ++ /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ ++ { 0x00000001f797431c, 0x00000000ca0b28a0 }, ++ /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ ++ { 0x0000000053e989ba, 0x00000001928e30a2 }, ++ /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ ++ { 0x000000003920cd16, 0x0000000097b1b002 }, ++ /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ ++ { 0x00000001e6f579b8, 0x00000000b15bf906 }, ++ /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ ++ { 0x000000007493cb0a, 0x00000000411c5d52 }, ++ /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ ++ { 0x00000001bdd376d8, 0x00000001c36f3300 }, ++ /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ ++ { 0x000000016badfee6, 0x00000001119227e0 }, ++ /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ ++ { 0x0000000071de5c58, 0x00000000114d4702 }, ++ /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ ++ { 0x00000000453f317c, 0x00000000458b5b98 }, ++ /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ ++ { 0x0000000121675cce, 0x000000012e31fb8e }, ++ /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ ++ { 0x00000001f409ee92, 0x000000005cf619d8 }, ++ /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ ++ { 0x00000000f36b9c88, 0x0000000063f4d8b2 }, ++ /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ ++ { 0x0000000036b398f4, 0x000000004138dc8a }, ++ /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ ++ { 0x00000001748f9adc, 0x00000001d29ee8e0 }, ++ /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ ++ { 0x00000001be94ec00, 0x000000006a08ace8 }, ++ /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ ++ { 0x00000000b74370d6, 0x0000000127d42010 }, ++ /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ ++ { 0x00000001174d0b98, 0x0000000019d76b62 }, ++ /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ ++ { 0x00000000befc06a4, 0x00000001b1471f6e }, ++ /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ ++ { 0x00000001ae125288, 0x00000001f64c19cc }, ++ /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ ++ { 0x0000000095c19b34, 0x00000000003c0ea0 }, ++ /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ ++ { 0x00000001a78496f2, 0x000000014d73abf6 }, ++ /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ ++ { 0x00000001ac5390a0, 0x00000001620eb844 }, ++ /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ ++ { 0x000000002a80ed6e, 0x0000000147655048 }, ++ /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ ++ { 0x00000001fa9b0128, 0x0000000067b5077e }, ++ /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ ++ { 0x00000001ea94929e, 0x0000000010ffe206 }, ++ /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ ++ { 0x0000000125f4305c, 0x000000000fee8f1e }, ++ /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ ++ { 0x00000001471e2002, 0x00000001da26fbae }, ++ /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ ++ { 0x0000000132d2253a, 0x00000001b3a8bd88 }, ++ /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ ++ { 0x00000000f26b3592, 0x00000000e8f3898e }, ++ /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ ++ { 0x00000000bc8b67b0, 0x00000000b0d0d28c }, ++ /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ ++ { 0x000000013a826ef2, 0x0000000030f2a798 }, ++ /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ ++ { 0x0000000081482c84, 0x000000000fba1002 }, ++ /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ ++ { 0x00000000e77307c2, 0x00000000bdb9bd72 }, ++ /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ ++ { 0x00000000d4a07ec8, 0x0000000075d3bf5a }, ++ /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ ++ { 0x0000000017102100, 0x00000000ef1f98a0 }, ++ /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ ++ { 0x00000000db406486, 0x00000000689c7602 }, ++ /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ ++ { 0x0000000192db7f88, 0x000000016d5fa5fe }, ++ /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ ++ { 0x000000018bf67b1e, 0x00000001d0d2b9ca }, ++ /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ ++ { 0x000000007c09163e, 0x0000000041e7b470 }, ++ /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ ++ { 0x000000000adac060, 0x00000001cbb6495e }, ++ /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ ++ { 0x00000000bd8316ae, 0x000000010052a0b0 }, ++ /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ ++ { 0x000000019f09ab54, 0x00000001d8effb5c }, ++ /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ ++ { 0x0000000125155542, 0x00000001d969853c }, ++ /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ ++ { 0x000000018fdb5882, 0x00000000523ccce2 }, ++ /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ ++ { 0x00000000e794b3f4, 0x000000001e2436bc }, ++ /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ ++ { 0x000000016f9bb022, 0x00000000ddd1c3a2 }, ++ /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ ++ { 0x00000000290c9978, 0x0000000019fcfe38 }, ++ /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ ++ { 0x0000000083c0f350, 0x00000001ce95db64 }, ++ /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ ++ { 0x0000000173ea6628, 0x00000000af582806 }, ++ /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ ++ { 0x00000001c8b4e00a, 0x00000001006388f6 }, ++ /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ ++ { 0x00000000de95d6aa, 0x0000000179eca00a }, ++ /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ ++ { 0x000000010b7f7248, 0x0000000122410a6a }, ++ /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ ++ { 0x00000001326e3a06, 0x000000004288e87c }, ++ /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ ++ { 0x00000000bb62c2e6, 0x000000016c5490da }, ++ /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ ++ { 0x0000000156a4b2c2, 0x00000000d1c71f6e }, ++ /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ ++ { 0x000000011dfe763a, 0x00000001b4ce08a6 }, ++ /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ ++ { 0x000000007bcca8e2, 0x00000001466ba60c }, ++ /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ ++ { 0x0000000186118faa, 0x00000001f6c488a4 }, ++ /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ ++ { 0x0000000111a65a88, 0x000000013bfb0682 }, ++ /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ ++ { 0x000000003565e1c4, 0x00000000690e9e54 }, ++ /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ ++ { 0x000000012ed02a82, 0x00000000281346b6 }, ++ /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ ++ { 0x00000000c486ecfc, 0x0000000156464024 }, ++ /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ ++ { 0x0000000001b951b2, 0x000000016063a8dc }, ++ /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ ++ { 0x0000000048143916, 0x0000000116a66362 }, ++ /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ ++ { 0x00000001dc2ae124, 0x000000017e8aa4d2 }, ++ /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ ++ { 0x00000001416c58d6, 0x00000001728eb10c }, ++ /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ ++ { 0x00000000a479744a, 0x00000001b08fd7fa }, ++ /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ ++ { 0x0000000096ca3a26, 0x00000001092a16e8 }, ++ /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ ++ { 0x00000000ff223d4e, 0x00000000a505637c }, ++ /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ ++ { 0x000000010e84da42, 0x00000000d94869b2 }, ++ /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ ++ { 0x00000001b61ba3d0, 0x00000001c8b203ae }, ++ /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ ++ { 0x00000000680f2de8, 0x000000005704aea0 }, ++ /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ ++ { 0x000000008772a9a8, 0x000000012e295fa2 }, ++ /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ ++ { 0x0000000155f295bc, 0x000000011d0908bc }, ++ /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ ++ { 0x00000000595f9282, 0x0000000193ed97ea }, ++ /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ ++ { 0x0000000164b1c25a, 0x000000013a0f1c52 }, ++ /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ ++ { 0x00000000fbd67c50, 0x000000010c2c40c0 }, ++ /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ ++ { 0x0000000096076268, 0x00000000ff6fac3e }, ++ /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ ++ { 0x00000001d288e4cc, 0x000000017b3609c0 }, ++ /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ ++ { 0x00000001eaac1bdc, 0x0000000088c8c922 }, ++ /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ ++ { 0x00000001f1ea39e2, 0x00000001751baae6 }, ++ /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ ++ { 0x00000001eb6506fc, 0x0000000107952972 }, ++ /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ ++ { 0x000000010f806ffe, 0x0000000162b00abe }, ++ /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ ++ { 0x000000010408481e, 0x000000000d7b404c }, ++ /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ ++ { 0x0000000188260534, 0x00000000763b13d4 }, ++ /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ ++ { 0x0000000058fc73e0, 0x00000000f6dc22d8 }, ++ /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ ++ { 0x00000000391c59b8, 0x000000007daae060 }, ++ /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ ++ { 0x000000018b638400, 0x000000013359ab7c }, ++ /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ ++ { 0x000000011738f5c4, 0x000000008add438a }, ++ /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ ++ { 0x000000008cf7c6da, 0x00000001edbefdea }, ++ /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ ++ { 0x00000001ef97fb16, 0x000000004104e0f8 }, ++ /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ ++ { 0x0000000102130e20, 0x00000000b48a8222 }, ++ /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ ++ { 0x00000000db968898, 0x00000001bcb46844 }, ++ /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ ++ { 0x00000000b5047b5e, 0x000000013293ce0a }, ++ /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ ++ { 0x000000010b90fdb2, 0x00000001710d0844 }, ++ /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ ++ { 0x000000004834a32e, 0x0000000117907f6e }, ++ /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ ++ { 0x0000000059c8f2b0, 0x0000000087ddf93e }, ++ /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ ++ { 0x0000000122cec508, 0x000000005970e9b0 }, ++ /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ ++ { 0x000000000a330cda, 0x0000000185b2b7d0 }, ++ /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ ++ { 0x000000014a47148c, 0x00000001dcee0efc }, ++ /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ ++ { 0x0000000042c61cb8, 0x0000000030da2722 }, ++ /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ ++ { 0x0000000012fe6960, 0x000000012f925a18 }, ++ /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ ++ { 0x00000000dbda2c20, 0x00000000dd2e357c }, ++ /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ ++ { 0x000000011122410c, 0x00000000071c80de }, ++ /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ ++ { 0x00000000977b2070, 0x000000011513140a }, ++ /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ ++ { 0x000000014050438e, 0x00000001df876e8e }, ++ /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ ++ { 0x0000000147c840e8, 0x000000015f81d6ce }, ++ /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ ++ { 0x00000001cc7c88ce, 0x000000019dd94dbe }, ++ /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ ++ { 0x00000001476b35a4, 0x00000001373d206e }, ++ /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ ++ { 0x000000013d52d508, 0x00000000668ccade }, ++ /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ ++ { 0x000000008e4be32e, 0x00000001b192d268 }, ++ /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ ++ { 0x00000000024120fe, 0x00000000e30f3a78 }, ++ /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ ++ { 0x00000000ddecddb4, 0x000000010ef1f7bc }, ++ /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ ++ { 0x00000000d4d403bc, 0x00000001f5ac7380 }, ++ /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ ++ { 0x00000001734b89aa, 0x000000011822ea70 }, ++ /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ ++ { 0x000000010e7a58d6, 0x00000000c3a33848 }, ++ /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ ++ { 0x00000001f9f04e9c, 0x00000001bd151c24 }, ++ /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ ++ { 0x00000000b692225e, 0x0000000056002d76 }, ++ /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ ++ { 0x000000019b8d3f3e, 0x000000014657c4f4 }, ++ /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ ++ { 0x00000001a874f11e, 0x0000000113742d7c }, ++ /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ ++ { 0x000000010d5a4254, 0x000000019c5920ba }, ++ /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ ++ { 0x00000000bbb2f5d6, 0x000000005216d2d6 }, ++ /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ ++ { 0x0000000179cc0e36, 0x0000000136f5ad8a }, ++ /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ ++ { 0x00000001dca1da4a, 0x000000018b07beb6 }, ++ /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ ++ { 0x00000000feb1a192, 0x00000000db1e93b0 }, ++ /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ ++ { 0x00000000d1eeedd6, 0x000000000b96fa3a }, ++ /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ ++ { 0x000000008fad9bb4, 0x00000001d9968af0 }, ++ /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ ++ { 0x00000001884938e4, 0x000000000e4a77a2 }, ++ /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ ++ { 0x00000001bc2e9bc0, 0x00000000508c2ac8 }, ++ /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ ++ { 0x00000001f9658a68, 0x0000000021572a80 }, ++ /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ ++ { 0x000000001b9224fc, 0x00000001b859daf2 }, ++ /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ ++ { 0x0000000055b2fb84, 0x000000016f788474 }, ++ /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ ++ { 0x000000018b090348, 0x00000001b438810e }, ++ /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ ++ { 0x000000011ccbd5ea, 0x0000000095ddc6f2 }, ++ /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ ++ { 0x0000000007ae47f8, 0x00000001d977c20c }, ++ /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ ++ { 0x0000000172acbec0, 0x00000000ebedb99a }, ++ /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ ++ { 0x00000001c6e3ff20, 0x00000001df9e9e92 }, ++ /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ ++ { 0x00000000e1b38744, 0x00000001a4a3f952 }, ++ /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ ++ { 0x00000000791585b2, 0x00000000e2f51220 }, ++ /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ ++ { 0x00000000ac53b894, 0x000000004aa01f3e }, ++ /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ ++ { 0x00000001ed5f2cf4, 0x00000000b3e90a58 }, ++ /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ ++ { 0x00000001df48b2e0, 0x000000000c9ca2aa }, ++ /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ ++ { 0x00000000049c1c62, 0x0000000151682316 }, ++ /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ ++ { 0x000000017c460c12, 0x0000000036fce78c }, ++ /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ ++ { 0x000000015be4da7e, 0x000000009037dc10 }, ++ /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ ++ { 0x000000010f38f668, 0x00000000d3298582 }, ++ /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ ++ { 0x0000000039f40a00, 0x00000001b42e8ad6 }, ++ /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ ++ { 0x00000000bd4c10c4, 0x00000000142a9838 }, ++ /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ ++ { 0x0000000042db1d98, 0x0000000109c7f190 }, ++ /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ ++ { 0x00000001c905bae6, 0x0000000056ff9310 }, ++ /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ ++ { 0x00000000069d40ea, 0x00000001594513aa }, ++ /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ ++ { 0x000000008e4fbad0, 0x00000001e3b5b1e8 }, ++ /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ ++ { 0x0000000047bedd46, 0x000000011dd5fc08 }, ++ /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ ++ { 0x0000000026396bf8, 0x00000001675f0cc2 }, ++ /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ ++ { 0x00000000379beb92, 0x00000000d1c8dd44 }, ++ /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ ++ { 0x000000000abae54a, 0x0000000115ebd3d8 }, ++ /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ ++ { 0x0000000007e6a128, 0x00000001ecbd0dac }, ++ /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ ++ { 0x000000000ade29d2, 0x00000000cdf67af2 }, ++ /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ ++ { 0x00000000f974c45c, 0x000000004c01ff4c }, ++ /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ ++ { 0x00000000e77ac60a, 0x00000000f2d8657e }, ++ /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ ++ { 0x0000000145895816, 0x000000006bae74c4 }, ++ /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ ++ { 0x0000000038e362be, 0x0000000152af8aa0 }, ++ /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ ++ { 0x000000007f991a64, 0x0000000004663802 }, ++ /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ ++ { 0x00000000fa366d3a, 0x00000001ab2f5afc }, ++ /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ ++ { 0x00000001a2bb34f0, 0x0000000074a4ebd4 }, ++ /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ ++ { 0x0000000028a9981e, 0x00000001d7ab3a4c }, ++ /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ ++ { 0x00000001dbc672be, 0x00000001a8da60c6 }, ++ /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ ++ { 0x00000000b04d77f6, 0x000000013cf63820 }, ++ /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ ++ { 0x0000000124400d96, 0x00000000bec12e1e }, ++ /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ ++ { 0x000000014ca4b414, 0x00000001c6368010 }, ++ /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ ++ { 0x000000012fe2c938, 0x00000001e6e78758 }, ++ /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ ++ { 0x00000001faed01e6, 0x000000008d7f2b3c }, ++ /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ ++ { 0x000000007e80ecfe, 0x000000016b4a156e }, ++ /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ ++ { 0x0000000098daee94, 0x00000001c63cfeb6 }, ++ /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ ++ { 0x000000010a04edea, 0x000000015f902670 }, ++ /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ ++ { 0x00000001c00b4524, 0x00000001cd5de11e }, ++ /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ ++ { 0x0000000170296550, 0x000000001acaec54 }, ++ /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ ++ { 0x0000000181afaa48, 0x000000002bd0ca78 }, ++ /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ ++ { 0x0000000185a31ffa, 0x0000000032d63d5c }, ++ /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ ++ { 0x000000002469f608, 0x000000001c6d4e4c }, ++ /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ ++ { 0x000000006980102a, 0x0000000106a60b92 }, ++ /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ ++ { 0x0000000111ea9ca8, 0x00000000d3855e12 }, ++ /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ ++ { 0x00000001bd1d29ce, 0x00000000e3125636 }, ++ /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ ++ { 0x00000001b34b9580, 0x000000009e8f7ea4 }, ++ /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ ++ { 0x000000003076054e, 0x00000001c82e562c }, ++ /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ ++ { 0x000000012a608ea4, 0x00000000ca9f09ce }, ++ /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ ++ { 0x00000000784d05fe, 0x00000000c63764e6 }, ++ /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ ++ { 0x000000016ef0d82a, 0x0000000168d2e49e }, ++ /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ ++ { 0x0000000075bda454, 0x00000000e986c148 }, ++ /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ ++ { 0x000000003dc0a1c4, 0x00000000cfb65894 }, ++ /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ ++ { 0x00000000e9a5d8be, 0x0000000111cadee4 }, ++ /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ ++ { 0x00000001609bc4b4, 0x0000000171fb63ce } ++#else /* __LITTLE_ENDIAN__ */ ++ /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ ++ { 0x00000000b6ca9e20, 0x000000009c37c408 }, ++ /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ ++ { 0x00000000350249a8, 0x00000001b51df26c }, ++ /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ ++ { 0x00000001862dac54, 0x000000000724b9d0 }, ++ /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ ++ { 0x00000001d87fb48c, 0x00000001c00532fe }, ++ /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ ++ { 0x00000001f39b699e, 0x00000000f05a9362 }, ++ /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ ++ { 0x0000000101da11b4, 0x00000001e1007970 }, ++ /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ ++ { 0x00000001cab571e0, 0x00000000a57366ee }, ++ /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ ++ { 0x00000000c7020cfe, 0x0000000192011284 }, ++ /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ ++ { 0x00000000cdaed1ae, 0x0000000162716d9a }, ++ /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ ++ { 0x00000001e804effc, 0x00000000cd97ecde }, ++ /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ ++ { 0x0000000077c3ea3a, 0x0000000058812bc0 }, ++ /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ ++ { 0x0000000068df31b4, 0x0000000088b8c12e }, ++ /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ ++ { 0x00000000b059b6c2, 0x00000001230b234c }, ++ /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ ++ { 0x0000000145fb8ed8, 0x00000001120b416e }, ++ /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ ++ { 0x00000000cbc09168, 0x00000001974aecb0 }, ++ /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ ++ { 0x000000005ceeedc2, 0x000000008ee3f226 }, ++ /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ ++ { 0x0000000047d74e86, 0x00000001089aba9a }, ++ /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ ++ { 0x00000001407e9e22, 0x0000000065113872 }, ++ /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ ++ { 0x00000001da967bda, 0x000000005c07ec10 }, ++ /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ ++ { 0x000000006c898368, 0x0000000187590924 }, ++ /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ ++ { 0x00000000f2d14c98, 0x00000000e35da7c6 }, ++ /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ ++ { 0x00000001993c6ad4, 0x000000000415855a }, ++ /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ ++ { 0x000000014683d1ac, 0x0000000073617758 }, ++ /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ ++ { 0x00000001a7c93e6c, 0x0000000176021d28 }, ++ /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ ++ { 0x000000010211e90a, 0x00000001c358fd0a }, ++ /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ ++ { 0x000000001119403e, 0x00000001ff7a2c18 }, ++ /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ ++ { 0x000000001c3261aa, 0x00000000f2d9f7e4 }, ++ /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ ++ { 0x000000014e37a634, 0x000000016cf1f9c8 }, ++ /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ ++ { 0x0000000073786c0c, 0x000000010af9279a }, ++ /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ ++ { 0x000000011dc037f8, 0x0000000004f101e8 }, ++ /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ ++ { 0x0000000031433dfc, 0x0000000070bcf184 }, ++ /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ ++ { 0x000000009cde8348, 0x000000000a8de642 }, ++ /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ ++ { 0x0000000038d3c2a6, 0x0000000062ea130c }, ++ /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ ++ { 0x000000011b25f260, 0x00000001eb31cbb2 }, ++ /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ ++ { 0x000000001629e6f0, 0x0000000170783448 }, ++ /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ ++ { 0x0000000160838b4c, 0x00000001a684b4c6 }, ++ /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ ++ { 0x000000007a44011c, 0x00000000253ca5b4 }, ++ /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ ++ { 0x00000000226f417a, 0x0000000057b4b1e2 }, ++ /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ ++ { 0x0000000045eb2eb4, 0x00000000b6bd084c }, ++ /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ ++ { 0x000000014459d70c, 0x0000000123c2d592 }, ++ /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ ++ { 0x00000001d406ed82, 0x00000000159dafce }, ++ /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ ++ { 0x0000000160c8e1a8, 0x0000000127e1a64e }, ++ /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ ++ { 0x0000000027ba8098, 0x0000000056860754 }, ++ /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ ++ { 0x000000006d92d018, 0x00000001e661aae8 }, ++ /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ ++ { 0x000000012ed7e3f2, 0x00000000f82c6166 }, ++ /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ ++ { 0x000000002dc87788, 0x00000000c4f9c7ae }, ++ /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ ++ { 0x0000000018240bb8, 0x0000000074203d20 }, ++ /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ ++ { 0x000000001ad38158, 0x0000000198173052 }, ++ /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ ++ { 0x00000001396b78f2, 0x00000001ce8aba54 }, ++ /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ ++ { 0x000000011a681334, 0x00000001850d5d94 }, ++ /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ ++ { 0x000000012104732e, 0x00000001d609239c }, ++ /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ ++ { 0x00000000a140d90c, 0x000000001595f048 }, ++ /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ ++ { 0x00000001b7215eda, 0x0000000042ccee08 }, ++ /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ ++ { 0x00000001aaf1df3c, 0x000000010a389d74 }, ++ /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ ++ { 0x0000000029d15b8a, 0x000000012a840da6 }, ++ /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ ++ { 0x00000000f1a96922, 0x000000001d181c0c }, ++ /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ ++ { 0x00000001ac80d03c, 0x0000000068b7d1f6 }, ++ /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ ++ { 0x000000000f11d56a, 0x000000005b0f14fc }, ++ /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ ++ { 0x00000001f1c022a2, 0x0000000179e9e730 }, ++ /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ ++ { 0x0000000173d00ae2, 0x00000001ce1368d6 }, ++ /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ ++ { 0x00000001d4ffe4ac, 0x0000000112c3a84c }, ++ /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ ++ { 0x000000016edc5ae4, 0x00000000de940fee }, ++ /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ ++ { 0x00000001f1a02140, 0x00000000fe896b7e }, ++ /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ ++ { 0x00000000ca0b28a0, 0x00000001f797431c }, ++ /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ ++ { 0x00000001928e30a2, 0x0000000053e989ba }, ++ /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ ++ { 0x0000000097b1b002, 0x000000003920cd16 }, ++ /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ ++ { 0x00000000b15bf906, 0x00000001e6f579b8 }, ++ /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ ++ { 0x00000000411c5d52, 0x000000007493cb0a }, ++ /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ ++ { 0x00000001c36f3300, 0x00000001bdd376d8 }, ++ /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ ++ { 0x00000001119227e0, 0x000000016badfee6 }, ++ /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ ++ { 0x00000000114d4702, 0x0000000071de5c58 }, ++ /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ ++ { 0x00000000458b5b98, 0x00000000453f317c }, ++ /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ ++ { 0x000000012e31fb8e, 0x0000000121675cce }, ++ /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ ++ { 0x000000005cf619d8, 0x00000001f409ee92 }, ++ /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ ++ { 0x0000000063f4d8b2, 0x00000000f36b9c88 }, ++ /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ ++ { 0x000000004138dc8a, 0x0000000036b398f4 }, ++ /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ ++ { 0x00000001d29ee8e0, 0x00000001748f9adc }, ++ /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ ++ { 0x000000006a08ace8, 0x00000001be94ec00 }, ++ /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ ++ { 0x0000000127d42010, 0x00000000b74370d6 }, ++ /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ ++ { 0x0000000019d76b62, 0x00000001174d0b98 }, ++ /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ ++ { 0x00000001b1471f6e, 0x00000000befc06a4 }, ++ /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ ++ { 0x00000001f64c19cc, 0x00000001ae125288 }, ++ /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ ++ { 0x00000000003c0ea0, 0x0000000095c19b34 }, ++ /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ ++ { 0x000000014d73abf6, 0x00000001a78496f2 }, ++ /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ ++ { 0x00000001620eb844, 0x00000001ac5390a0 }, ++ /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ ++ { 0x0000000147655048, 0x000000002a80ed6e }, ++ /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ ++ { 0x0000000067b5077e, 0x00000001fa9b0128 }, ++ /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ ++ { 0x0000000010ffe206, 0x00000001ea94929e }, ++ /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ ++ { 0x000000000fee8f1e, 0x0000000125f4305c }, ++ /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ ++ { 0x00000001da26fbae, 0x00000001471e2002 }, ++ /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ ++ { 0x00000001b3a8bd88, 0x0000000132d2253a }, ++ /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ ++ { 0x00000000e8f3898e, 0x00000000f26b3592 }, ++ /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ ++ { 0x00000000b0d0d28c, 0x00000000bc8b67b0 }, ++ /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ ++ { 0x0000000030f2a798, 0x000000013a826ef2 }, ++ /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ ++ { 0x000000000fba1002, 0x0000000081482c84 }, ++ /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ ++ { 0x00000000bdb9bd72, 0x00000000e77307c2 }, ++ /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ ++ { 0x0000000075d3bf5a, 0x00000000d4a07ec8 }, ++ /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ ++ { 0x00000000ef1f98a0, 0x0000000017102100 }, ++ /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ ++ { 0x00000000689c7602, 0x00000000db406486 }, ++ /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ ++ { 0x000000016d5fa5fe, 0x0000000192db7f88 }, ++ /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ ++ { 0x00000001d0d2b9ca, 0x000000018bf67b1e }, ++ /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ ++ { 0x0000000041e7b470, 0x000000007c09163e }, ++ /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ ++ { 0x00000001cbb6495e, 0x000000000adac060 }, ++ /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ ++ { 0x000000010052a0b0, 0x00000000bd8316ae }, ++ /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ ++ { 0x00000001d8effb5c, 0x000000019f09ab54 }, ++ /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ ++ { 0x00000001d969853c, 0x0000000125155542 }, ++ /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ ++ { 0x00000000523ccce2, 0x000000018fdb5882 }, ++ /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ ++ { 0x000000001e2436bc, 0x00000000e794b3f4 }, ++ /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ ++ { 0x00000000ddd1c3a2, 0x000000016f9bb022 }, ++ /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ ++ { 0x0000000019fcfe38, 0x00000000290c9978 }, ++ /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ ++ { 0x00000001ce95db64, 0x0000000083c0f350 }, ++ /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ ++ { 0x00000000af582806, 0x0000000173ea6628 }, ++ /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ ++ { 0x00000001006388f6, 0x00000001c8b4e00a }, ++ /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ ++ { 0x0000000179eca00a, 0x00000000de95d6aa }, ++ /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ ++ { 0x0000000122410a6a, 0x000000010b7f7248 }, ++ /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ ++ { 0x000000004288e87c, 0x00000001326e3a06 }, ++ /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ ++ { 0x000000016c5490da, 0x00000000bb62c2e6 }, ++ /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ ++ { 0x00000000d1c71f6e, 0x0000000156a4b2c2 }, ++ /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ ++ { 0x00000001b4ce08a6, 0x000000011dfe763a }, ++ /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ ++ { 0x00000001466ba60c, 0x000000007bcca8e2 }, ++ /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ ++ { 0x00000001f6c488a4, 0x0000000186118faa }, ++ /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ ++ { 0x000000013bfb0682, 0x0000000111a65a88 }, ++ /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ ++ { 0x00000000690e9e54, 0x000000003565e1c4 }, ++ /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ ++ { 0x00000000281346b6, 0x000000012ed02a82 }, ++ /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ ++ { 0x0000000156464024, 0x00000000c486ecfc }, ++ /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ ++ { 0x000000016063a8dc, 0x0000000001b951b2 }, ++ /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ ++ { 0x0000000116a66362, 0x0000000048143916 }, ++ /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ ++ { 0x000000017e8aa4d2, 0x00000001dc2ae124 }, ++ /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ ++ { 0x00000001728eb10c, 0x00000001416c58d6 }, ++ /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ ++ { 0x00000001b08fd7fa, 0x00000000a479744a }, ++ /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ ++ { 0x00000001092a16e8, 0x0000000096ca3a26 }, ++ /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ ++ { 0x00000000a505637c, 0x00000000ff223d4e }, ++ /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ ++ { 0x00000000d94869b2, 0x000000010e84da42 }, ++ /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ ++ { 0x00000001c8b203ae, 0x00000001b61ba3d0 }, ++ /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ ++ { 0x000000005704aea0, 0x00000000680f2de8 }, ++ /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ ++ { 0x000000012e295fa2, 0x000000008772a9a8 }, ++ /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ ++ { 0x000000011d0908bc, 0x0000000155f295bc }, ++ /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ ++ { 0x0000000193ed97ea, 0x00000000595f9282 }, ++ /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ ++ { 0x000000013a0f1c52, 0x0000000164b1c25a }, ++ /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ ++ { 0x000000010c2c40c0, 0x00000000fbd67c50 }, ++ /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ ++ { 0x00000000ff6fac3e, 0x0000000096076268 }, ++ /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ ++ { 0x000000017b3609c0, 0x00000001d288e4cc }, ++ /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ ++ { 0x0000000088c8c922, 0x00000001eaac1bdc }, ++ /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ ++ { 0x00000001751baae6, 0x00000001f1ea39e2 }, ++ /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ ++ { 0x0000000107952972, 0x00000001eb6506fc }, ++ /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ ++ { 0x0000000162b00abe, 0x000000010f806ffe }, ++ /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ ++ { 0x000000000d7b404c, 0x000000010408481e }, ++ /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ ++ { 0x00000000763b13d4, 0x0000000188260534 }, ++ /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ ++ { 0x00000000f6dc22d8, 0x0000000058fc73e0 }, ++ /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ ++ { 0x000000007daae060, 0x00000000391c59b8 }, ++ /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ ++ { 0x000000013359ab7c, 0x000000018b638400 }, ++ /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ ++ { 0x000000008add438a, 0x000000011738f5c4 }, ++ /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ ++ { 0x00000001edbefdea, 0x000000008cf7c6da }, ++ /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ ++ { 0x000000004104e0f8, 0x00000001ef97fb16 }, ++ /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ ++ { 0x00000000b48a8222, 0x0000000102130e20 }, ++ /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ ++ { 0x00000001bcb46844, 0x00000000db968898 }, ++ /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ ++ { 0x000000013293ce0a, 0x00000000b5047b5e }, ++ /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ ++ { 0x00000001710d0844, 0x000000010b90fdb2 }, ++ /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ ++ { 0x0000000117907f6e, 0x000000004834a32e }, ++ /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ ++ { 0x0000000087ddf93e, 0x0000000059c8f2b0 }, ++ /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ ++ { 0x000000005970e9b0, 0x0000000122cec508 }, ++ /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ ++ { 0x0000000185b2b7d0, 0x000000000a330cda }, ++ /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ ++ { 0x00000001dcee0efc, 0x000000014a47148c }, ++ /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ ++ { 0x0000000030da2722, 0x0000000042c61cb8 }, ++ /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ ++ { 0x000000012f925a18, 0x0000000012fe6960 }, ++ /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ ++ { 0x00000000dd2e357c, 0x00000000dbda2c20 }, ++ /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ ++ { 0x00000000071c80de, 0x000000011122410c }, ++ /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ ++ { 0x000000011513140a, 0x00000000977b2070 }, ++ /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ ++ { 0x00000001df876e8e, 0x000000014050438e }, ++ /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ ++ { 0x000000015f81d6ce, 0x0000000147c840e8 }, ++ /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ ++ { 0x000000019dd94dbe, 0x00000001cc7c88ce }, ++ /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ ++ { 0x00000001373d206e, 0x00000001476b35a4 }, ++ /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ ++ { 0x00000000668ccade, 0x000000013d52d508 }, ++ /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ ++ { 0x00000001b192d268, 0x000000008e4be32e }, ++ /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ ++ { 0x00000000e30f3a78, 0x00000000024120fe }, ++ /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ ++ { 0x000000010ef1f7bc, 0x00000000ddecddb4 }, ++ /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ ++ { 0x00000001f5ac7380, 0x00000000d4d403bc }, ++ /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ ++ { 0x000000011822ea70, 0x00000001734b89aa }, ++ /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ ++ { 0x00000000c3a33848, 0x000000010e7a58d6 }, ++ /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ ++ { 0x00000001bd151c24, 0x00000001f9f04e9c }, ++ /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ ++ { 0x0000000056002d76, 0x00000000b692225e }, ++ /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ ++ { 0x000000014657c4f4, 0x000000019b8d3f3e }, ++ /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ ++ { 0x0000000113742d7c, 0x00000001a874f11e }, ++ /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ ++ { 0x000000019c5920ba, 0x000000010d5a4254 }, ++ /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ ++ { 0x000000005216d2d6, 0x00000000bbb2f5d6 }, ++ /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ ++ { 0x0000000136f5ad8a, 0x0000000179cc0e36 }, ++ /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ ++ { 0x000000018b07beb6, 0x00000001dca1da4a }, ++ /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ ++ { 0x00000000db1e93b0, 0x00000000feb1a192 }, ++ /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ ++ { 0x000000000b96fa3a, 0x00000000d1eeedd6 }, ++ /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ ++ { 0x00000001d9968af0, 0x000000008fad9bb4 }, ++ /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ ++ { 0x000000000e4a77a2, 0x00000001884938e4 }, ++ /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ ++ { 0x00000000508c2ac8, 0x00000001bc2e9bc0 }, ++ /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ ++ { 0x0000000021572a80, 0x00000001f9658a68 }, ++ /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ ++ { 0x00000001b859daf2, 0x000000001b9224fc }, ++ /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ ++ { 0x000000016f788474, 0x0000000055b2fb84 }, ++ /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ ++ { 0x00000001b438810e, 0x000000018b090348 }, ++ /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ ++ { 0x0000000095ddc6f2, 0x000000011ccbd5ea }, ++ /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ ++ { 0x00000001d977c20c, 0x0000000007ae47f8 }, ++ /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ ++ { 0x00000000ebedb99a, 0x0000000172acbec0 }, ++ /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ ++ { 0x00000001df9e9e92, 0x00000001c6e3ff20 }, ++ /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ ++ { 0x00000001a4a3f952, 0x00000000e1b38744 }, ++ /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ ++ { 0x00000000e2f51220, 0x00000000791585b2 }, ++ /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ ++ { 0x000000004aa01f3e, 0x00000000ac53b894 }, ++ /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ ++ { 0x00000000b3e90a58, 0x00000001ed5f2cf4 }, ++ /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ ++ { 0x000000000c9ca2aa, 0x00000001df48b2e0 }, ++ /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ ++ { 0x0000000151682316, 0x00000000049c1c62 }, ++ /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ ++ { 0x0000000036fce78c, 0x000000017c460c12 }, ++ /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ ++ { 0x000000009037dc10, 0x000000015be4da7e }, ++ /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ ++ { 0x00000000d3298582, 0x000000010f38f668 }, ++ /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ ++ { 0x00000001b42e8ad6, 0x0000000039f40a00 }, ++ /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ ++ { 0x00000000142a9838, 0x00000000bd4c10c4 }, ++ /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ ++ { 0x0000000109c7f190, 0x0000000042db1d98 }, ++ /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ ++ { 0x0000000056ff9310, 0x00000001c905bae6 }, ++ /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ ++ { 0x00000001594513aa, 0x00000000069d40ea }, ++ /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ ++ { 0x00000001e3b5b1e8, 0x000000008e4fbad0 }, ++ /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ ++ { 0x000000011dd5fc08, 0x0000000047bedd46 }, ++ /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ ++ { 0x00000001675f0cc2, 0x0000000026396bf8 }, ++ /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ ++ { 0x00000000d1c8dd44, 0x00000000379beb92 }, ++ /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ ++ { 0x0000000115ebd3d8, 0x000000000abae54a }, ++ /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ ++ { 0x00000001ecbd0dac, 0x0000000007e6a128 }, ++ /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ ++ { 0x00000000cdf67af2, 0x000000000ade29d2 }, ++ /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ ++ { 0x000000004c01ff4c, 0x00000000f974c45c }, ++ /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ ++ { 0x00000000f2d8657e, 0x00000000e77ac60a }, ++ /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ ++ { 0x000000006bae74c4, 0x0000000145895816 }, ++ /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ ++ { 0x0000000152af8aa0, 0x0000000038e362be }, ++ /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ ++ { 0x0000000004663802, 0x000000007f991a64 }, ++ /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ ++ { 0x00000001ab2f5afc, 0x00000000fa366d3a }, ++ /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ ++ { 0x0000000074a4ebd4, 0x00000001a2bb34f0 }, ++ /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ ++ { 0x00000001d7ab3a4c, 0x0000000028a9981e }, ++ /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ ++ { 0x00000001a8da60c6, 0x00000001dbc672be }, ++ /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ ++ { 0x000000013cf63820, 0x00000000b04d77f6 }, ++ /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ ++ { 0x00000000bec12e1e, 0x0000000124400d96 }, ++ /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ ++ { 0x00000001c6368010, 0x000000014ca4b414 }, ++ /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ ++ { 0x00000001e6e78758, 0x000000012fe2c938 }, ++ /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ ++ { 0x000000008d7f2b3c, 0x00000001faed01e6 }, ++ /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ ++ { 0x000000016b4a156e, 0x000000007e80ecfe }, ++ /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ ++ { 0x00000001c63cfeb6, 0x0000000098daee94 }, ++ /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ ++ { 0x000000015f902670, 0x000000010a04edea }, ++ /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ ++ { 0x00000001cd5de11e, 0x00000001c00b4524 }, ++ /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ ++ { 0x000000001acaec54, 0x0000000170296550 }, ++ /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ ++ { 0x000000002bd0ca78, 0x0000000181afaa48 }, ++ /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ ++ { 0x0000000032d63d5c, 0x0000000185a31ffa }, ++ /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ ++ { 0x000000001c6d4e4c, 0x000000002469f608 }, ++ /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ ++ { 0x0000000106a60b92, 0x000000006980102a }, ++ /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ ++ { 0x00000000d3855e12, 0x0000000111ea9ca8 }, ++ /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ ++ { 0x00000000e3125636, 0x00000001bd1d29ce }, ++ /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ ++ { 0x000000009e8f7ea4, 0x00000001b34b9580 }, ++ /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ ++ { 0x00000001c82e562c, 0x000000003076054e }, ++ /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ ++ { 0x00000000ca9f09ce, 0x000000012a608ea4 }, ++ /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ ++ { 0x00000000c63764e6, 0x00000000784d05fe }, ++ /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ ++ { 0x0000000168d2e49e, 0x000000016ef0d82a }, ++ /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ ++ { 0x00000000e986c148, 0x0000000075bda454 }, ++ /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ ++ { 0x00000000cfb65894, 0x000000003dc0a1c4 }, ++ /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ ++ { 0x0000000111cadee4, 0x00000000e9a5d8be }, ++ /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ ++ { 0x0000000171fb63ce, 0x00000001609bc4b4 } ++#endif /* __LITTLE_ENDIAN__ */ ++ }; ++ ++/* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros */ ++ ++static const __vector unsigned long long vcrc_short_const[16] ++ __attribute__((aligned (16))) = { ++#ifdef __LITTLE_ENDIAN__ ++ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ ++ { 0x5cf015c388e56f72, 0x7fec2963e5bf8048 }, ++ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ ++ { 0x963a18920246e2e6, 0x38e888d4844752a9 }, ++ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ ++ { 0x419a441956993a31, 0x42316c00730206ad }, ++ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ ++ { 0x924752ba2b830011, 0x543d5c543e65ddf9 }, ++ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ ++ { 0x55bd7f9518e4a304, 0x78e87aaf56767c92 }, ++ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ ++ { 0x6d76739fe0553f1e, 0x8f68fcec1903da7f }, ++ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ ++ { 0xc133722b1fe0b5c3, 0x3f4840246791d588 }, ++ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ ++ { 0x64b67ee0e55ef1f3, 0x34c96751b04de25a }, ++ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ ++ { 0x069db049b8fdb1e7, 0x156c8e180b4a395b }, ++ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ ++ { 0xa11bfaf3c9e90b9e, 0xe0b99ccbe661f7be }, ++ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ ++ { 0x817cdc5119b29a35, 0x041d37768cd75659 }, ++ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ ++ { 0x1ce9d94b36c41f1c, 0x3a0777818cfaa965 }, ++ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ ++ { 0x4f256efcb82be955, 0x0e148e8252377a55 }, ++ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ ++ { 0xec1631edb2dea967, 0x9c25531d19e65dde }, ++ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ ++ { 0x5d27e147510ac59a, 0x790606ff9957c0a6 }, ++ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ ++ { 0xa66805eb18b8ea18, 0x82f63b786ea2d55c } ++#else /* __LITTLE_ENDIAN__ */ ++ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ ++ { 0x7fec2963e5bf8048, 0x5cf015c388e56f72 }, ++ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ ++ { 0x38e888d4844752a9, 0x963a18920246e2e6 }, ++ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ ++ { 0x42316c00730206ad, 0x419a441956993a31 }, ++ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ ++ { 0x543d5c543e65ddf9, 0x924752ba2b830011 }, ++ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ ++ { 0x78e87aaf56767c92, 0x55bd7f9518e4a304 }, ++ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ ++ { 0x8f68fcec1903da7f, 0x6d76739fe0553f1e }, ++ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ ++ { 0x3f4840246791d588, 0xc133722b1fe0b5c3 }, ++ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ ++ { 0x34c96751b04de25a, 0x64b67ee0e55ef1f3 }, ++ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ ++ { 0x156c8e180b4a395b, 0x069db049b8fdb1e7 }, ++ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ ++ { 0xe0b99ccbe661f7be, 0xa11bfaf3c9e90b9e }, ++ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ ++ { 0x041d37768cd75659, 0x817cdc5119b29a35 }, ++ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ ++ { 0x3a0777818cfaa965, 0x1ce9d94b36c41f1c }, ++ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ ++ { 0x0e148e8252377a55, 0x4f256efcb82be955 }, ++ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ ++ { 0x9c25531d19e65dde, 0xec1631edb2dea967 }, ++ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ ++ { 0x790606ff9957c0a6, 0x5d27e147510ac59a }, ++ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ ++ { 0x82f63b786ea2d55c, 0xa66805eb18b8ea18 } ++#endif /* __LITTLE_ENDIAN__ */ ++ }; ++ ++/* Barrett constants */ ++/* 33 bit reflected Barrett constant m - (4^32)/n */ ++ ++static const __vector unsigned long long v_Barrett_const[2] ++ __attribute__((aligned (16))) = { ++ /* x^64 div p(x) */ ++#ifdef __LITTLE_ENDIAN__ ++ { 0x00000000dea713f1, 0x0000000000000000 }, ++ { 0x0000000105ec76f1, 0x0000000000000000 } ++#else /* __LITTLE_ENDIAN__ */ ++ { 0x0000000000000000, 0x00000000dea713f1 }, ++ { 0x0000000000000000, 0x0000000105ec76f1 } ++#endif /* __LITTLE_ENDIAN__ */ ++ }; ++#endif /* POWER8_INTRINSICS */ +diff --git a/util/crc32c_test.cc b/util/crc32c_test.cc +index 3e4f7396e7..6fd7d34876 100644 +--- a/util/crc32c_test.cc ++++ b/util/crc32c_test.cc +@@ -108,6 +108,9 @@ TEST(CRC, StandardResults) { + EXPECT_EQ(~expected.crc32c, result); + } + ++ // NULL buffer ++ EXPECT_EQ((uint32_t) 0, Value(NULL, 0)); ++ + // Test 2: stitching two computations + for (auto expected : expectedResults) { + size_t partialLength = expected.length / 2; diff --git a/buildroot/package/rocksdb/rocksdb.hash b/buildroot/package/rocksdb/rocksdb.hash index 2e4071298..d40448832 100644 --- a/buildroot/package/rocksdb/rocksdb.hash +++ b/buildroot/package/rocksdb/rocksdb.hash @@ -1,8 +1,8 @@ # Locally computed: -sha256 feab859ee355fbe7beffd7085904b63f560417f450f83cc34310e6dadff936f6 rocksdb-6.6.4.tar.gz +sha256 d573d2f15cdda883714f7e0bc87b814a8d4a53a82edde558f08f940e905541ee rocksdb-6.10.1.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache -sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb -sha256 112d88749baec5ddecba47057216465e91e22352aac7677c50bd237a27614083 README.md +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache +sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb +sha256 054f4b04473dd7003fcd9e48b75c61fd257e50beb418c501099c651c0356a556 README.md diff --git a/buildroot/package/rocksdb/rocksdb.mk b/buildroot/package/rocksdb/rocksdb.mk index 31a9f98b5..2288c406a 100644 --- a/buildroot/package/rocksdb/rocksdb.mk +++ b/buildroot/package/rocksdb/rocksdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -ROCKSDB_VERSION = 6.6.4 +ROCKSDB_VERSION = 6.10.1 ROCKSDB_SITE = $(call github,facebook,rocksdb,v$(ROCKSDB_VERSION)) ROCKSDB_LICENSE = GPL-2.0 or Apache-2.0 ROCKSDB_LICENSE_FILES = COPYING LICENSE.Apache LICENSE.leveldb README.md diff --git a/buildroot/package/rp-pppoe/0002-krn-plugin.patch b/buildroot/package/rp-pppoe/0001-krn-plugin.patch similarity index 79% rename from buildroot/package/rp-pppoe/0002-krn-plugin.patch rename to buildroot/package/rp-pppoe/0001-krn-plugin.patch index d364e8684..c386e85f2 100644 --- a/buildroot/package/rp-pppoe/0002-krn-plugin.patch +++ b/buildroot/package/rp-pppoe/0001-krn-plugin.patch @@ -1,3 +1,5 @@ +[Fabrice: update patch for 3.14] +Signed-off-by: Fabrice Fontaine diff -Nura rp-pppoe-3.11.orig/src/configure rp-pppoe-3.11/src/configure --- rp-pppoe-3.11.orig/src/configure 2012-08-21 10:01:10.536440032 -0300 +++ rp-pppoe-3.11/src/configure 2012-08-21 10:01:45.353442397 -0300 @@ -5,8 +7,8 @@ diff -Nura rp-pppoe-3.11.orig/src/configure rp-pppoe-3.11/src/configure modprobe pppoe > /dev/null 2>&1 fi if test "$cross_compiling" = yes; then : -- ac_cv_linux_kernel_pppoe=no; $ECHO "cross-compiling, default: " -+ ac_cv_linux_kernel_pppoe=yes; $ECHO "cross-compiling, default: " +- ac_cv_linux_kernel_pppoe=no; echo "cross-compiling, default: " ++ ac_cv_linux_kernel_pppoe=yes; echo "cross-compiling, default: " else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/buildroot/package/rp-pppoe/rp-pppoe.hash b/buildroot/package/rp-pppoe/rp-pppoe.hash index 3f7af6055..806bab1b0 100644 --- a/buildroot/package/rp-pppoe/rp-pppoe.hash +++ b/buildroot/package/rp-pppoe/rp-pppoe.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 rp-pppoe-3.12.tar.gz +sha256 7825232f64ab4d618ef074d62d145ae43d6edc91b9a718c6130a4742bac40e2a rp-pppoe-3.14.tar.gz # Locally computed sha256 464006ba771074f4022db14f58a29a0b447b6fdde9529cf0331be396b6279162 doc/LICENSE diff --git a/buildroot/package/rp-pppoe/rp-pppoe.mk b/buildroot/package/rp-pppoe/rp-pppoe.mk index 4214df929..2f0073b6c 100644 --- a/buildroot/package/rp-pppoe/rp-pppoe.mk +++ b/buildroot/package/rp-pppoe/rp-pppoe.mk @@ -4,8 +4,8 @@ # ################################################################################ -RP_PPPOE_VERSION = 3.12 -RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download +RP_PPPOE_VERSION = 3.14 +RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE RP_PPPOE_DEPENDENCIES = pppd diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash index a3c7281d7..6e8855254 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk index 23923453c..785f007cc 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash index 0b9bb7c67..49a600903 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.hash +++ b/buildroot/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz -sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom +sha256 30e91cc1b502bb1a8aeddf49e7d9dd3fb4a8c2f3b9154a2fea9ecc9071f54bc7 rpi-firmware-2ba11f2a07760588546821aed578010252c9ecb3.tar.gz +sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/buildroot/package/rpi-userland/rpi-userland.hash b/buildroot/package/rpi-userland/rpi-userland.hash index b6d9b99b3..83d7fce54 100644 --- a/buildroot/package/rpi-userland/rpi-userland.hash +++ b/buildroot/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 rpi-userland-06bc6daa02137ca72b7a2104afad81e82a44de17.tar.gz -sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE +sha256 024cafd2f4428e96bff1d29a782db1d484d4f1835f64097ca1bd0dc38f75e84f rpi-userland-f73fca015d421b763936667a0b58fe5024d59921.tar.gz +sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk index 7dd29e88e..4cfd5cb83 100644 --- a/buildroot/package/rpi-userland/rpi-userland.mk +++ b/buildroot/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 06bc6daa02137ca72b7a2104afad81e82a44de17 +RPI_USERLAND_VERSION = f73fca015d421b763936667a0b58fe5024d59921 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE diff --git a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 90aa03218..68e33debb 100644 --- a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch b/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch deleted file mode 100644 index 035fe154d..000000000 --- a/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 22ed98efe3d5198e4141948af7569cfa10d9d25f Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 20 Nov 2019 13:06:51 +0000 -Subject: [PATCH] configure.ac: prefer pkg-config to find libgcrypt - -libgcrypt from 1.8.5 provides a pkg-config file as well as the traditional -libgcrypt-config script. As pkg-config is more resiliant in the face of -complicated build environments (for example cross-compilation and sysroots) -prefer the pkg-config file, falling back to libgcrypt-config if that doesn't -exist. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rpm-software-management/rpm/commit/22ed98efe3d5198e4141948af7569cfa10d9d25f] ---- - configure.ac | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0a3a9bbf4..6a3ea3615 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -395,14 +395,21 @@ AC_SUBST(WITH_OPENSSL_LIB) - WITH_LIBGCRYPT_INCLUDE= - WITH_LIBGCRYPT_LIB= - if test "$with_crypto" = libgcrypt ; then --AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, notfound) --if test notfound != "$LIBGCRYPT_CONFIG" ; then --WITH_LIBGCRYPT_INCLUDE=`$LIBGCRYPT_CONFIG --cflags` --WITH_LIBGCRYPT_LIB=`$LIBGCRYPT_CONFIG --libs` --fi --if test -z "$WITH_LIBGCRYPT_LIB" ; then --AC_MSG_ERROR([libgcrypt not found]) --fi -+ # libgcrypt 1.8.5 onwards ships a pkg-config file so prefer that -+ PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt], [have_libgcrypt=yes], [have_libgcrypt=no]) -+ if test "$have_libgcrypt" = "yes"; then -+ WITH_LIBGCRYPT_INCLUDE="$LIBGCRYPT_CFLAGS" -+ WITH_LIBGCRYPT_LIB="$LIBGCRYPT_LIBS" -+ else -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, notfound) -+ if test notfound != "$LIBGCRYPT_CONFIG" ; then -+ WITH_LIBGCRYPT_INCLUDE=`$LIBGCRYPT_CONFIG --cflags` -+ WITH_LIBGCRYPT_LIB=`$LIBGCRYPT_CONFIG --libs` -+ fi -+ if test -z "$WITH_LIBGCRYPT_LIB" ; then -+ AC_MSG_ERROR([libgcrypt not found]) -+ fi -+ fi - fi - - AM_CONDITIONAL([WITH_LIBGCRYPT],[test "$with_crypto" = libgcrypt]) diff --git a/buildroot/package/rpm/0001-lib-rpmdb-c-include-fcntl-h-for-O_.patch b/buildroot/package/rpm/0001-lib-rpmdb-c-include-fcntl-h-for-O_.patch new file mode 100644 index 000000000..1c0aa51ba --- /dev/null +++ b/buildroot/package/rpm/0001-lib-rpmdb-c-include-fcntl-h-for-O_.patch @@ -0,0 +1,29 @@ +From 9395bdc64459357631111842e7a28304b4d76301 Mon Sep 17 00:00:00 2001 +From: Leo +Date: Wed, 30 Sep 2020 08:36:03 -0300 +Subject: [PATCH] lib/rpmdb.c: include fcntl.h for O_* + +Fixes compilation on musl, otherwise it fails with undefined references +to various O_* symbols as mentioned here: + +https://www.man7.org/linux/man-pages/man0/fcntl.h.0p.html + +[Retrieved from: +https://github.com/rpm-software-management/rpm/commit/9395bdc64459357631111842e7a28304b4d76301] +Signed-off-by: Fabrice Fontaine +--- + lib/rpmdb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rpmdb.c b/lib/rpmdb.c +index 4c101569f..73187630b 100644 +--- a/lib/rpmdb.c ++++ b/lib/rpmdb.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #ifndef DYING /* XXX already in "system.h" */ + #include diff --git a/buildroot/package/rpm/0002-lib-rpmrc.c-include-fcntl.h-for-O_.patch b/buildroot/package/rpm/0002-lib-rpmrc.c-include-fcntl.h-for-O_.patch new file mode 100644 index 000000000..c5db7f0a6 --- /dev/null +++ b/buildroot/package/rpm/0002-lib-rpmrc.c-include-fcntl.h-for-O_.patch @@ -0,0 +1,31 @@ +From 8d446d33a705cb37420e1fda18379d7439ee841f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Oct 2020 15:04:56 +0100 +Subject: [PATCH 2/2] lib/rpmrc.c: include fcntl.h for O_* + +Fixes compilation on musl, otherwise it fails with undefined references +to various O_* symbols as mentioned here: + +https://www.man7.org/linux/man-pages/man0/fcntl.h.0p.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/rpm-software-management/rpm/pull/1413] +--- + lib/rpmrc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rpmrc.c b/lib/rpmrc.c +index 78c4a6d42..8bfe7a0ab 100644 +--- a/lib/rpmrc.c ++++ b/lib/rpmrc.c +@@ -1,5 +1,6 @@ + #include "system.h" + ++#include + #include + #include + +-- +2.28.0 + diff --git a/buildroot/package/rpm/Config.in b/buildroot/package/rpm/Config.in index fc702c309..ac979fdba 100644 --- a/buildroot/package/rpm/Config.in +++ b/buildroot/package/rpm/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_RPM depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBNSS && !BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_FILE select BR2_PACKAGE_POPT select BR2_PACKAGE_ZLIB diff --git a/buildroot/package/rpm/rpm.hash b/buildroot/package/rpm/rpm.hash index cdb20e3b8..7b2bd56d0 100644 --- a/buildroot/package/rpm/rpm.hash +++ b/buildroot/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.15.1.html -sha256 ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230 rpm-4.15.1.tar.bz2 +# From https://rpm.org/wiki/Releases/4.16.0.html +sha256 ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411 rpm-4.16.0.tar.bz2 # Hash for license file -sha256 d56f4f1f290f6920cb053aef0dbcd0b853cda289e2568b364ddbfce220a6f3e0 COPYING +sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/buildroot/package/rpm/rpm.mk b/buildroot/package/rpm/rpm.mk index d29c3feba..661409294 100644 --- a/buildroot/package/rpm/rpm.mk +++ b/buildroot/package/rpm/rpm.mk @@ -4,13 +4,12 @@ # ################################################################################ -RPM_VERSION_MAJOR = 4.15 -RPM_VERSION = $(RPM_VERSION_MAJOR).1 +RPM_VERSION_MAJOR = 4.16 +RPM_VERSION = $(RPM_VERSION_MAJOR).0 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ host-pkgconf \ - berkeleydb \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \ $(if $(BR2_PACKAGE_ELFUTILS),elfutils) \ file \ @@ -20,8 +19,6 @@ RPM_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING -# We're patching configure.ac -RPM_AUTORECONF = YES RPM_CONF_OPTS = \ --disable-python \ @@ -38,6 +35,13 @@ else RPM_CONF_OPTS += --without-acl endif +ifeq ($(BR2_PACKAGE_BERKELEYDB),y) +RPM_DEPENDENCIES += berkeleydb +RPM_CONF_OPTS += --enable-bdb +else +RPM_CONF_OPTS += --disable-bdb +endif + ifeq ($(BR2_PACKAGE_DBUS),y) RPM_DEPENDENCIES += dbus RPM_CONF_OPTS += --enable-plugins @@ -88,6 +92,13 @@ else RPM_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_SQLITE),y) +RPM_DEPENDENCIES += sqlite +RPM_CONF_OPTS += --enable-sqlite +else +RPM_CONF_OPTS += --disable-sqlite +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) RPM_DEPENDENCIES += zstd RPM_CONF_OPTS += --enable-zstd diff --git a/buildroot/package/rsh-redone/Config.in b/buildroot/package/rsh-redone/Config.in index 1335c8573..53ff2bea7 100644 --- a/buildroot/package/rsh-redone/Config.in +++ b/buildroot/package/rsh-redone/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_RSH_REDONE_RLOGIND bool "rlogind" depends on !BR2_STATIC_LIBS depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM @@ -32,12 +32,11 @@ config BR2_PACKAGE_RSH_REDONE_RSHD bool "rshd" depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM -comment "rshd needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "rshd needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS endif diff --git a/buildroot/package/rsyslog/rsyslog.hash b/buildroot/package/rsyslog/rsyslog.hash index 22372a92a..50edaa64c 100644 --- a/buildroot/package/rsyslog/rsyslog.hash +++ b/buildroot/package/rsyslog/rsyslog.hash @@ -1,7 +1,7 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104 rsyslog-8.1911.0.tar.gz +sha256 5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9 rsyslog-8.2004.0.tar.gz # Locally calculated -sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING -sha256 8743ad560dea1229d4f46cd603e10874db41a27f3c74f64e958ef123f3943fab COPYING.ASL20 -sha256 4038442ca5bde8ffd243cfc235cb4455e7d618d47558ea3d8284733f71d904ed COPYING.LESSER +sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING +sha256 8743ad560dea1229d4f46cd603e10874db41a27f3c74f64e958ef123f3943fab COPYING.ASL20 +sha256 4038442ca5bde8ffd243cfc235cb4455e7d618d47558ea3d8284733f71d904ed COPYING.LESSER diff --git a/buildroot/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk index c4446c210..50f332849 100644 --- a/buildroot/package/rsyslog/rsyslog.mk +++ b/buildroot/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.1911.0 +RSYSLOG_VERSION = 8.2004.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 @@ -14,6 +14,12 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \ mail omprog omruleset omstdout omuxsock \ pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare + +ifeq ($(BR2_PACKAGE_LIBRELP),y) +RSYSLOG_DEPENDENCIES += librelp +RSYSLOG_PLUGINS += relp +endif + RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) diff --git a/buildroot/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch b/buildroot/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch similarity index 100% rename from buildroot/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch rename to buildroot/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch diff --git a/buildroot/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch b/buildroot/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch deleted file mode 100644 index 157514a8e..000000000 --- a/buildroot/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eb47c07e9d20e0b1a6cc4b0df26f24f22f024f1c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Mon, 10 Nov 2014 11:44:55 +0300 -Subject: [PATCH] Fix various minor issues with rt-tests build system - -The issues fixed are : - - * Remove the automatic NUMA detection from the host - architecture. This is broken when doing cross-compilation. One can - still set NUMA=1 if NUMA support is desired. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Alexey Brodkin -Cc: Peter Korsgaard -[Romain: - rebase on v1.0 - Remove HASPYTHON since PYLIB can be overriden from the environment] -Signed-off-by: Romain Naour ---- - Makefile | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/Makefile b/Makefile -index a54d82b..0946f93 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,25 +38,6 @@ else - CFLAGS += -O0 -g - endif - --# We make some gueses on how to compile rt-tests based on the machine type --# and the ostype. These can often be overridden. --dumpmachine := $(shell $(CC) -dumpmachine) -- --# The ostype is typically something like linux or android --ostype := $(lastword $(subst -, ,$(dumpmachine))) -- --machinetype := $(shell echo $(dumpmachine)| \ -- sed -e 's/-.*//' -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/') -- --# The default is to assume you have libnuma installed, which is fine to do --# even on non-numa machines. If you don't want to install the numa libs, for --# example, they might not be available in an embedded environment, then --# compile with --# make NUMA=0 --ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),) --NUMA := 1 --endif -- - # The default is to assume that you have numa_parse_cpustring_all - # If you have an older version of libnuma that only has numa_parse_cpustring - # then compile with --- -2.5.5 - diff --git a/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch b/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch new file mode 100644 index 000000000..96b36d60d --- /dev/null +++ b/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch @@ -0,0 +1,52 @@ +From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001 +From: Peter Xu +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. + +Signed-off-by: Peter Xu +Signed-off-by: John Kacur + +[Taken from: +https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/src/oslat/oslat.c?h=unstable/devel/latest&id=165b597e3003c6870f5980e8902014d9344e6cf3] +Signed-off-by: Heiko Thiery +--- + 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.20.1 + diff --git a/buildroot/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch b/buildroot/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch deleted file mode 100644 index 9d606a4df..000000000 --- a/buildroot/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53c7e8bc75f0f27752309ddae49e8d3b867a7681 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 15 Aug 2016 18:20:47 +0200 -Subject: [PATCH] Add syscall-number for sched_(gs)etattr() for SH4 - -Signed-off-by: Romain Naour ---- - src/include/rt-sched.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h -index 679c4bd..83394c6 100644 ---- a/src/include/rt-sched.h -+++ b/src/include/rt-sched.h -@@ -51,6 +51,16 @@ - #endif - #endif - -+/* SCHED_DEADLINE available on sh4 since kernel 4.8 */ -+#ifdef __SH4__ -+#ifndef __NR_sched_setattr -+#define __NR_sched_setattr 370 -+#endif -+#ifndef __NR_sched_getattr -+#define __NR_sched_getattr 369 -+#endif -+#endif -+ - #ifdef __tilegx__ - #define __NR_sched_setattr 274 - #define __NR_sched_getattr 275 --- -2.5.5 - diff --git a/buildroot/package/rt-tests/Config.in b/buildroot/package/rt-tests/Config.in index 23e911b9f..cc9b14dcc 100644 --- a/buildroot/package/rt-tests/Config.in +++ b/buildroot/package/rt-tests/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_RT_TESTS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest + depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS + select BR2_PACKAGE_NUMACTL help Set of utilities for testing the real-time behaviour of a Linux system. @@ -21,7 +23,7 @@ config BR2_PACKAGE_RT_TESTS case with uClibc toolchains, since the thread implementation is configurable). - http://rt.wiki.kernel.org + https://wiki.linuxfoundation.org/realtime/documentation/howto/tools/rt-tests comment "rt-tests may not work on MIPS with an external uClibc toolchain" depends on BR2_PACKAGE_RT_TESTS @@ -32,3 +34,4 @@ comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dy depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 depends on BR2_USE_MMU + depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS diff --git a/buildroot/package/rt-tests/rt-tests.hash b/buildroot/package/rt-tests/rt-tests.hash index 7da6ed2c3..66834006d 100644 --- a/buildroot/package/rt-tests/rt-tests.hash +++ b/buildroot/package/rt-tests/rt-tests.hash @@ -1,3 +1,4 @@ +# From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc +sha256 611c5a2b02964ab778e037ae16402e8d1cb8456628c7ca38d85a7548f33e52e3 rt-tests-1.9.tar.xz # locally computed hash -sha256 bcb94448324116f29c248b14a6051c7ab72a0135234e714685a2a3a3e7d531f8 rt-tests-1.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/rt-tests/rt-tests.mk b/buildroot/package/rt-tests/rt-tests.mk index abc32f4fb..26c257213 100644 --- a/buildroot/package/rt-tests/rt-tests.mk +++ b/buildroot/package/rt-tests/rt-tests.mk @@ -6,13 +6,10 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 1.6 +RT_TESTS_VERSION = 1.9 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -RT_TESTS_DEPENDENCIES = python3 -endif +RT_TESTS_DEPENDENCIES = numactl define RT_TESTS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ diff --git a/buildroot/package/rtl8723bu/rtl8723bu.hash b/buildroot/package/rtl8723bu/rtl8723bu.hash index ef4eddaa6..0d06fff22 100644 --- a/buildroot/package/rtl8723bu/rtl8723bu.hash +++ b/buildroot/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 da04cffc306d9738abdc67d234b8948db6ca97ed77760c68d99d18817839a513 rtl8723bu-b922079a090dcaad58179d478442ff97f18521c9.tar.gz +sha256 19dae2b8b2c14b1f428c34ddb343fa41ddf9ae79bdefcb7c5baa65d357ca5a45 rtl8723bu-c9549d172a4f9d6ccf6d528682640246a41c2f0c.tar.gz diff --git a/buildroot/package/rtl8723bu/rtl8723bu.mk b/buildroot/package/rtl8723bu/rtl8723bu.mk index 942b13bbf..c54b2ef0d 100644 --- a/buildroot/package/rtl8723bu/rtl8723bu.mk +++ b/buildroot/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = b922079a090dcaad58179d478442ff97f18521c9 +RTL8723BU_VERSION = c9549d172a4f9d6ccf6d528682640246a41c2f0c RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) diff --git a/buildroot/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch b/buildroot/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch new file mode 100644 index 000000000..41cee2b24 --- /dev/null +++ b/buildroot/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch @@ -0,0 +1,79 @@ +From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 +From: youcai +Date: Tue, 18 Aug 2020 00:43:16 +0800 +Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name + conflict with crypto + +[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] +Signed-off-by: Coleman +Signed-off-by: Christian Stewart +--- + core/rtw_security.c | 10 +++++----- + include/rtw_security.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/core/rtw_security.c b/core/rtw_security.c +index d54e6af..de2d91f 100644 +--- a/core/rtw_security.c ++++ b/core/rtw_security.c +@@ -2200,7 +2200,7 @@ BIP_exit: + + #ifndef PLATFORM_FREEBSD + /* compress 512-bits */ +-static int sha256_compress(struct sha256_state *md, unsigned char *buf) ++static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) + { + u32 S[8], W[64], t0, t1; + u32 t; +@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) + } + + /* Initialize the hash state */ +-static void sha256_init(struct sha256_state *md) ++static void sha256_init(struct rtl_sha256_state *md) + { + md->curlen = 0; + md->length = 0; +@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) + @param inlen The length of the data (octets) + @return CRYPT_OK if successful + */ +-static int sha256_process(struct sha256_state *md, unsigned char *in, ++static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, + unsigned long inlen) + { + unsigned long n; +@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, + @param out [out] The destination of the hash (32 bytes) + @return CRYPT_OK if successful + */ +-static int sha256_done(struct sha256_state *md, unsigned char *out) ++static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) + { + int i; + +@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) + static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, + u8 *mac) + { +- struct sha256_state ctx; ++ struct rtl_sha256_state ctx; + size_t i; + + sha256_init(&ctx); +diff --git a/include/rtw_security.h b/include/rtw_security.h +index d41014e..98feb69 100644 +--- a/include/rtw_security.h ++++ b/include/rtw_security.h +@@ -233,7 +233,7 @@ struct security_priv { + #endif /* DBG_SW_SEC_CNT */ + }; + +-struct sha256_state { ++struct rtl_sha256_state { + u64 length; + u32 state[8], curlen; + u8 buf[64]; +-- +2.28.0 + diff --git a/buildroot/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch b/buildroot/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch new file mode 100644 index 000000000..6d09153b8 --- /dev/null +++ b/buildroot/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch @@ -0,0 +1,47 @@ +From 9421b0763e5f20babb2c0fd437979a71fbac1739 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Tue, 8 Sep 2020 22:46:45 -0700 +Subject: [PATCH] disable rtw_mgmt_frame_register on kernel 5.8.0 + +rtl8812au: fix build for kernel 5.8 + +[Source: https://github.com/lwfinger/rtl8812au/commit/ec1591b90dd323185717fa42887f96444cca5921.patch] +Signed-off-by: Larry Finger +Signed-off-by: Christian Stewart +--- + os_dep/linux/ioctl_cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 019daf9..13238cb 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -5177,6 +5177,7 @@ exit: + return ret; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) + struct wireless_dev *wdev, +@@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + exit: + return; + } ++#endif + + #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) + static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, +@@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) + .mgmt_tx = cfg80211_rtw_mgmt_tx, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, ++#endif + #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) + .action = cfg80211_rtw_mgmt_tx, + #endif +-- +2.28.0 + diff --git a/buildroot/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch b/buildroot/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch new file mode 100644 index 000000000..30595ec69 --- /dev/null +++ b/buildroot/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch @@ -0,0 +1,110 @@ +From e0ed05200e6e4b86e26e092dc1f16fc8fc1e2b67 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Tue, 8 Sep 2020 23:08:39 -0700 +Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x + compat + +Signed-off-by: Christian Stewart +[Fix < 5.6.x compile - missing semicolon] +Signed-off-by: Peter Seiderer +--- + os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 38 insertions(+), 2 deletions(-) + +diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c +index 048080a..6295f66 100644 +--- a/os_dep/linux/rtw_proc.c ++++ b/os_dep/linux/rtw_proc.c +@@ -65,9 +65,15 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_ + } + + inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, +- const struct file_operations *fops, void * data) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) ++ const struct file_operations *fops, ++ #else ++ const struct proc_ops *fops, ++ #endif ++ void * data ++ ) + { +- struct proc_dir_entry *entry; ++ struct proc_dir_entry *entry; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) + entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data); +@@ -167,6 +173,7 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_drv_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_drv_proc_open, +@@ -175,6 +182,15 @@ static const struct file_operations rtw_drv_proc_fops = { + .release = single_release, + .write = rtw_drv_proc_write, + }; ++#else ++static const struct proc_ops rtw_drv_proc_fops = { ++ .proc_open = rtw_drv_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++ .proc_write = rtw_drv_proc_write, ++}; ++#endif + + int rtw_drv_proc_init(void) + { +@@ -776,6 +792,7 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_adapter_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_adapter_proc_open, +@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = { + .release = single_release, + .write = rtw_adapter_proc_write, + }; ++#else ++static const struct proc_ops rtw_adapter_proc_fops = { ++ .proc_open = rtw_adapter_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++ .proc_write = rtw_adapter_proc_write, ++}; ++#endif + + int proc_get_odm_dbg_comp(struct seq_file *m, void *v) + { +@@ -1030,6 +1056,7 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_odm_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_odm_proc_open, +@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = { + .release = single_release, + .write = rtw_odm_proc_write, + }; ++#else ++static const struct proc_ops rtw_odm_proc_fops = { ++ .proc_open = rtw_odm_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++ .proc_write = rtw_odm_proc_write, ++}; ++#endif + + struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) + { +-- +2.29.0 + diff --git a/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch b/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch new file mode 100644 index 000000000..b7275462a --- /dev/null +++ b/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch @@ -0,0 +1,47 @@ +From 0982308255dd3fd70e7b93aa88a8f3c5b9c1b845 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 30 Aug 2020 21:15:06 +0200 +Subject: [PATCH] src/CMakeLists.txt: fix build with mbedtls but without zlib + +Building with mbedtls but without zlib will result in the following +build failure: + +-- Found MbedTLS: /home/peko/autobuild/instance-0/output-1/per-package/rtty/host/powerpc64-buildroot-linux-gnu/sysroot/usr/lib/libmbedtls.so (found version "2.16.7") +-- Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +-- Select MbedTLS(PolarSSL) as the SSL backend +CMake Error: The following variables are used in this project, but they are set to NOTFOUND. +Please set them or make sure they are set and tested correctly in the CMake files: +ZLIB_LIBRARY + linked by target "rtty" in directory /home/peko/autobuild/instance-0/output-1/build/rtty-7.1.4/src + +-- Configuring incomplete, errors occurred! + +Fixes: + - http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/rtty/pull/77] +--- + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 10f6626..d09e848 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -77,7 +77,11 @@ else() + elseif(RTTY_USE_MBEDTLS) + set(SSL_NAME "MbedTLS(PolarSSL)") + set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) +- set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) ++ if(ZLIB_FOUND) ++ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) ++ else() ++ set(SSL_LIB ${MBEDTLS_LIBRARIES}) ++ endif() + set(RTTY_HAVE_MBEDTLS_CONFIG 1) + endif() + +-- +2.28.0 + diff --git a/buildroot/package/rtty/Config.in b/buildroot/package/rtty/Config.in new file mode 100644 index 000000000..198d46571 --- /dev/null +++ b/buildroot/package/rtty/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_RTTY + bool "rtty" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBEV + help + Access your device's terminal from anywhere via the web. + + https://github.com/zhaojh329/rtty diff --git a/buildroot/package/rtty/rtty.hash b/buildroot/package/rtty/rtty.hash new file mode 100644 index 000000000..b49004ca1 --- /dev/null +++ b/buildroot/package/rtty/rtty.hash @@ -0,0 +1,2 @@ +sha256 f0b8cf4c4d3d4b34d10097fe430d32ab1576edbf41131d27b6b964e078be1716 rtty-7.1.4.tar.gz +sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/buildroot/package/rtty/rtty.mk b/buildroot/package/rtty/rtty.mk new file mode 100644 index 000000000..b0efda047 --- /dev/null +++ b/buildroot/package/rtty/rtty.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# rtty +# +################################################################################ + +RTTY_VERSION = 7.1.4 +RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) +RTTY_LICENSE = MIT +RTTY_LICENSE_FILES = LICENSE +RTTY_DEPENDENCIES = libev + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +RTTY_DEPENDENCIES += mbedtls +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=ON \ + -DRTTY_USE_OPENSSL=OFF \ + -DRTTY_USE_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +RTTY_DEPENDENCIES += host-pkgconf openssl +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=OFF \ + -DRTTY_USE_OPENSSL=ON \ + -DRTTY_USE_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +RTTY_DEPENDENCIES += wolfssl +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=OFF \ + -DRTTY_USE_OPENSSL=OFF \ + -DRTTY_USE_WOLFSSL=ON +else +RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/ruby/0001-fix-default-coroutine-selection.patch b/buildroot/package/ruby/0001-fix-default-coroutine-selection.patch new file mode 100644 index 000000000..79dbd692e --- /dev/null +++ b/buildroot/package/ruby/0001-fix-default-coroutine-selection.patch @@ -0,0 +1,35 @@ +fixed default coroutine selection for musl/uclibc + +https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur ruby-2.7.1.orig/configure.ac ruby-2.7.1/configure.ac +--- ruby-2.7.1.orig/configure.ac 2020-03-31 12:44:55.000000000 +0200 ++++ ruby-2.7.1/configure.ac 2020-10-01 00:03:53.130462286 +0200 +@@ -2344,8 +2344,12 @@ + rb_cv_coroutine=copy + ], + [*], [ +- rb_cv_coroutine=ucontext ++ AC_CHECK_FUNCS([getcontext swapcontext makecontext], ++ [rb_cv_coroutine=ucontext], ++ [rb_cv_coroutine=copy; break] ++ ) + ] ++ + ) + AC_MSG_RESULT(${rb_cv_coroutine}) + ]) +diff -Nur ruby-2.7.1.orig/coroutine/copy/Context.c ruby-2.7.1/coroutine/copy/Context.c +--- ruby-2.7.1.orig/coroutine/copy/Context.c 2020-03-31 12:44:55.000000000 +0200 ++++ ruby-2.7.1/coroutine/copy/Context.c 2020-10-01 00:04:59.414670705 +0200 +@@ -5,6 +5,8 @@ + * Copyright, 2019, by Samuel Williams. All rights reserved. + */ + ++#include ++ + #include "Context.h" + + // http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html diff --git a/buildroot/package/ruby/ruby.hash b/buildroot/package/ruby/ruby.hash index 89cab3fcd..80ffb00c0 100644 --- a/buildroot/package/ruby/ruby.hash +++ b/buildroot/package/ruby/ruby.hash @@ -1,6 +1,6 @@ -# https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-4-10-released/ -sha256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ruby-2.4.10.tar.xz +# https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/ +sha256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 ruby-2.7.2.tar.xz # License files, Locally calculated -sha256 609292a6d848ab223073944fc2d844449391a5ba2055a8b5baf1726bc13b39cb LEGAL -sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 COPYING -sha256 a5e3042dacb53eebda91f3b1caefbfec8307711df8c4ed1ed20e4e97c43307a4 BSDL +sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL +sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING +sha256 a5e3042dacb53eebda91f3b1caefbfec8307711df8c4ed1ed20e4e97c43307a4 BSDL diff --git a/buildroot/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk index 6f8cb319c..341943c4a 100644 --- a/buildroot/package/ruby/ruby.mk +++ b/buildroot/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).10 -RUBY_VERSION_EXT = 2.4.0 +RUBY_VERSION_MAJOR = 2.7 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION_EXT = 2.7.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz RUBY_DEPENDENCIES = host-pkgconf host-ruby @@ -19,15 +19,8 @@ HOST_RUBY_CONF_OPTS = \ --without-gmp RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others RUBY_LICENSE_FILES = LEGAL COPYING BSDL - -RUBY_CFLAGS = $(TARGET_CFLAGS) -# With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to -# build with 'pcrel too far'. This seems to be caused by the -Os option we pass -# by default. To fix the problem, use standard -O2 optimization instead. -ifeq ($(BR2_sh),y) -RUBY_CFLAGS += -O2 -endif -RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)" +# 0001-fix-default-coroutine-selection.patch +RUBY_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # On uClibc, finite, isinf and isnan are not directly implemented as @@ -79,13 +72,6 @@ else RUBY_CONF_OPTS += --without-gmp endif -# workaround for amazing build failure, see -# http://lists.busybox.net/pipermail/buildroot/2014-December/114273.html -define RUBY_REMOVE_VERCONF_H - rm -f $(@D)/verconf.h -endef -RUBY_POST_CONFIGURE_HOOKS += RUBY_REMOVE_VERCONF_H - # Remove rubygems and friends, as they need extensions that aren't # built and a target compiler. RUBY_EXTENSIONS_REMOVE = rake* rdoc* rubygems* diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index 2e0c332fc..d9e953c64 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -9,10 +9,7 @@ RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_WORKSPACE = Godeps/_workspace - RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - RUNC_TAGS = cgo static_build apparmor ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) diff --git a/buildroot/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash index 96d81a347..dd81edd58 100644 --- a/buildroot/package/rust-bin/rust-bin.hash +++ b/buildroot/package/rust-bin/rust-bin.hash @@ -1,48 +1,48 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127 rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0 rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564 rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6 rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06 rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.45.2-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.45.2-i686-unknown-linux-gnu.tar.xz.asc +sha256 42c25bea5c6dc35e89c65217477880aa52ee95b85271192f7e6833c80f3761f0 rust-1.45.2-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 39455d1ebd6f386e50748f566e1b37780f236c1f3cbc869690653662beca1ea9 rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 d0006b1ec413cd0f698195584cc478d3ceb44ea4232fe1971970be22f1470e1d rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 68ec96eadf94aa409a74e1ac1cf56c578c539cae8c238664b1805374037ac1b3 rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 63d539b8ec09d6f555106a41278456dc443a88259eb4693f1c834b3dc2529616 rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 f60ddfcbc6e7292b1b2a5145c93463cdc0e0811c95e3b426f629fcab9e24588b rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz.asc +sha256 05474dbec0385c8dcfd940e6f8954d4f8284745a4fbcf57932022b1593829463 rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz.asc +sha256 6add56f405fac0306b7d966b842dfe6d6beb4eaa93492eac7ac74015ceaeba7e rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 107931f34646486211dcc582b6c4c58b17379025969b4d0f17c52d219483e66f rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6f7dbbc7098c1a5af5e6490c8335eb8f8b8a53de9773199ac65c02e099956d58 rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 6e7638cd370e0e5aa455d325a5f66b20c677fa3abb24bbf2519fc97ba3ac78ba rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 c6ad70fc0b052ceba0f886d2431dbd23fd444ad307c0f2f4932ccc7af246bd73 rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 11edc189ea6544018ee74df7996d2ee8877a0d8b719a31b7e7a33d71bba9013c rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 0a000c2e047c675bee27c2287b2e03fe21148ead95c35b884846a8dc7c3c162d rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust-bin/rust-bin.mk b/buildroot/package/rust-bin/rust-bin.mk index a374215e2..36557048c 100644 --- a/buildroot/package/rust-bin/rust-bin.mk +++ b/buildroot/package/rust-bin/rust-bin.mk @@ -4,23 +4,20 @@ # ################################################################################ -RUST_BIN_VERSION = 1.33.0 +RUST_BIN_VERSION = 1.45.2 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc -HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz - -HOST_RUST_BIN_EXTRA_DOWNLOADS = \ - rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz +HOST_RUST_BIN_SOURCE = rust-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) HOST_RUST_BIN_EXTRA_DOWNLOADS += rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz endif -HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME) +HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUSTC_HOST_NAME) define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std @@ -30,36 +27,36 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT ) mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ - ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . + ln -sf ../../../../../$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT -HOST_RUST_BIN_INSTALL_OPTS = \ +HOST_RUST_BIN_INSTALL_COMMON_OPTS = \ --prefix=$(HOST_DIR) \ --disable-ldconfig +HOST_RUST_BIN_INSTALL_OPTS = \ + $(HOST_RUST_BIN_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + define HOST_RUST_BIN_INSTALL_RUSTC (cd $(@D); \ ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) endef -define HOST_RUST_BIN_INSTALL_LIBSTD_HOST - (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) -endef - ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) + ./install.sh $(HOST_RUST_BIN_INSTALL_COMMON_OPTS)) endef endif define HOST_RUST_BIN_INSTALL_CMDS $(HOST_RUST_BIN_INSTALL_RUSTC) - $(HOST_RUST_BIN_INSTALL_LIBSTD_HOST) $(HOST_RUST_BIN_INSTALL_LIBSTD_TARGET) endef +HOST_RUST_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG + $(eval $(host-generic-package)) diff --git a/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch b/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch deleted file mode 100644 index 0c756e302..000000000 --- a/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Mon, 21 Jan 2019 17:47:57 -0700 -Subject: [PATCH] Workaround presence of LLVM library in stage0/lib - -This commit works around the newly-introduced LLVM shared library. - -This is needed such that llvm-config run from -librustc_llvm's build script can correctly locate it's own LLVM, not the -one in stage0/lib. The LLVM build system uses the DT_RUNPATH/RUNPATH -header within the llvm-config binary, which we want to use, but because -Cargo always adds the host compiler's "libdir" (stage0/lib in our -case) to the dynamic linker's search path, we weren't properly finding -the freshly-built LLVM in llvm/lib. By restoring the environment -variable setting the search path to what bootstrap sees, the problem is -resolved and librustc_llvm correctly links and finds the appropriate -LLVM. - -Several run-make-fulldeps tests are also updated with similar handling. - -Signed-off-by: Eric Le Bihan ---- - src/bootstrap/builder.rs | 9 ++++++++- - src/bootstrap/compile.rs | 1 + - src/bootstrap/util.rs | 6 +++++- - src/build_helper/lib.rs | 19 +++++++++++++++++++ - src/librustc_asan/build.rs | 2 ++ - src/librustc_llvm/build.rs | 2 ++ - src/librustc_lsan/build.rs | 2 ++ - src/librustc_msan/build.rs | 2 ++ - src/librustc_tsan/build.rs | 2 ++ - .../cross-lang-lto-upstream-rlibs/Makefile | 4 ++-- - .../run-make-fulldeps/cross-lang-lto/Makefile | 19 ++++++++++--------- - 11 files changed, 55 insertions(+), 13 deletions(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index a69ba20749..f742bce180 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -21,7 +21,7 @@ use crate::install; - use crate::native; - use crate::test; - use crate::tool; --use crate::util::{add_lib_path, exe, libdir}; -+use crate::util::{self, add_lib_path, exe, libdir}; - use crate::{Build, DocTests, Mode, GitRepo}; - - pub use crate::Compiler; -@@ -791,6 +791,13 @@ impl<'a> Builder<'a> { - .env("CARGO_TARGET_DIR", out_dir) - .arg(cmd); - -+ // See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config -+ // needs to not accidentally link to libLLVM in stage0/lib. -+ cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var()); -+ if let Some(e) = env::var_os(util::dylib_path_var()) { -+ cargo.env("REAL_LIBRARY_PATH", e); -+ } -+ - if cmd != "install" { - cargo.arg("--target") - .arg(target); -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index b581271663..ec04dee6c3 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -712,6 +712,7 @@ pub fn build_codegen_backend(builder: &Builder, - if builder.is_rust_llvm(target) && backend != "emscripten" { - cargo.env("LLVM_RUSTLLVM", "1"); - } -+ - cargo.env("LLVM_CONFIG", &llvm_config); - if backend != "emscripten" { - let target_config = builder.config.target_config.get(&target); -diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs -index 2880f1a084..37c6c040da 100644 ---- a/src/bootstrap/util.rs -+++ b/src/bootstrap/util.rs -@@ -70,7 +70,11 @@ pub fn dylib_path_var() -> &'static str { - /// Parses the `dylib_path_var()` environment variable, returning a list of - /// paths that are members of this lookup path. - pub fn dylib_path() -> Vec { -- env::split_paths(&env::var_os(dylib_path_var()).unwrap_or_default()).collect() -+ let var = match env::var_os(dylib_path_var()) { -+ Some(v) => v, -+ None => return vec![], -+ }; -+ env::split_paths(&var).collect() - } - - /// `push` all components to `buf`. On windows, append `.exe` to the last component. -diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs -index 5a704e5577..c66c5c9249 100644 ---- a/src/build_helper/lib.rs -+++ b/src/build_helper/lib.rs -@@ -23,6 +23,25 @@ macro_rules! t { - }; - } - -+// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may -+// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM -+// shared library, which means that when our freshly built llvm-config goes to load it's -+// associated LLVM, it actually loads the compiler's LLVM. In particular when building the first -+// compiler (i.e., in stage 0) that's a problem, as the compiler's LLVM is likely different from -+// the one we want to use. As such, we restore the environment to what bootstrap saw. This isn't -+// perfect -- we might actually want to see something from Cargo's added library paths -- but -+// for now it works. -+pub fn restore_library_path() { -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR"); -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH"); -+ let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR"); -+ if let Some(env) = env::var_os("REAL_LIBRARY_PATH") { -+ env::set_var(&key, &env); -+ } else { -+ env::remove_var(&key); -+ } -+} -+ - pub fn run(cmd: &mut Command) { - println!("running: {:?}", cmd); - run_silent(cmd); -diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs -index 2d921b6669..b42d775deb 100644 ---- a/src/librustc_asan/build.rs -+++ b/src/librustc_asan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("asan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs -index ec3dff783c..cd91fcb299 100644 ---- a/src/librustc_llvm/build.rs -+++ b/src/librustc_llvm/build.rs -@@ -24,6 +24,8 @@ fn main() { - return; - } - -+ build_helper::restore_library_path(); -+ - let target = env::var("TARGET").expect("TARGET was not set"); - let llvm_config = env::var_os("LLVM_CONFIG") - .map(PathBuf::from) -diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs -index 470f2bb3e5..ad528bb039 100644 ---- a/src/librustc_lsan/build.rs -+++ b/src/librustc_lsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("lsan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs -index e1140278f2..085514b5a0 100644 ---- a/src/librustc_msan/build.rs -+++ b/src/librustc_msan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("msan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs -index f63bb46b87..0db3db392d 100644 ---- a/src/librustc_tsan/build.rs -+++ b/src/librustc_tsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("tsan") { - Ok(native) => native, - _ => return, -diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -index 0a6f226a02..6992dab1a1 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -@@ -9,7 +9,7 @@ all: staticlib.rs upstream.rs - - # Check No LTO - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - # Make sure the upstream object file was included - ls $(TMPDIR)/upstream.*.rcgu.o - -@@ -19,5 +19,5 @@ all: staticlib.rs upstream.rs - # Check ThinLTO - $(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - ls $(TMPDIR)/upstream.*.rcgu.o -diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -index 1d072e03de..4d1fb7b953 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -@@ -5,8 +5,9 @@ - # LLVM bitcode files (as used by linker LTO plugins) when compiling with - # -Z cross-lang-lto. - --ASSERT_IS_BITCODE_OBJ=llvm-bcanalyzer # this only succeeds for bitcode files --EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; llvm-ar x $(1)) -+# this only succeeds for bitcode files -+ASSERT_IS_BITCODE_OBJ=($(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-bcanalyzer $(1)) -+EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x $(1)) - - BUILD_LIB=$(RUSTC) lib.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 - BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 --emit=obj -@@ -16,31 +17,31 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib - staticlib: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a - $(call EXTRACT_OBJS, liblib.a) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-fat-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat - $(call EXTRACT_OBJS, liblib-fat-lto.a) -- for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-thin-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin - $(call EXTRACT_OBJS, liblib-thin-lto.a) -- for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - rlib: lib.rs - $(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib - $(call EXTRACT_OBJS, liblib.rlib) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - cdylib: lib.rs - $(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/cdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/cdylib.o) - - rdylib: lib.rs - $(BUILD_LIB) --crate-type=dylib --emit=obj -o $(TMPDIR)/rdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/rdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/rdylib.o) - - exe: lib.rs - $(BUILD_EXE) -o $(TMPDIR)/exe.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/exe.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o) --- -2.17.2 - diff --git a/buildroot/package/rust/rust.hash b/buildroot/package/rust/rust.hash index 62e2e1855..e2d3a48e4 100644 --- a/buildroot/package/rust/rust.hash +++ b/buildroot/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc -sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 rustc-1.33.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz.asc +sha256 f8412adac2f5d974b2f06c5bd4be7361084d18a678d098bf05de5ccfa57b74a9 rustc-1.45.2-src.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust/rust.mk b/buildroot/package/rust/rust.mk index 5d14fc668..d62f7b7be 100644 --- a/buildroot/package/rust/rust.mk +++ b/buildroot/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.33.0 +RUST_VERSION = 1.45.2 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -15,11 +15,17 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ host-rust-bin \ - host-cargo-bin \ host-openssl \ - host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python3 +else +HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python +endif + HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -42,31 +48,33 @@ define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ - echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ + echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python2"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ + echo 'extended = true'; \ + echo 'tools = ["cargo"]'; \ echo 'compiler-docs = false'; \ echo 'docs = false'; \ echo 'verbose = $(HOST_RUST_VERBOSITY)'; \ echo '[install]'; \ echo 'prefix = "$(HOST_DIR)"'; \ + echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ - echo $(HOST_RUST_JEMALLOC_CONF); \ ) > $(@D)/config.toml endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install endef $(eval $(host-generic-package)) diff --git a/buildroot/package/cargo/config.in b/buildroot/package/rustc/cargo-config.in similarity index 100% rename from buildroot/package/cargo/config.in rename to buildroot/package/rustc/cargo-config.in diff --git a/buildroot/package/rustc/rustc.mk b/buildroot/package/rustc/rustc.mk index 6eea9b4fc..35ffc3610 100644 --- a/buildroot/package/rustc/rustc.mk +++ b/buildroot/package/rustc/rustc.mk @@ -20,3 +20,15 @@ endif RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define RUSTC_INSTALL_CARGO_CONFIG + mkdir -p $(HOST_DIR)/share/cargo + sed -e 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ + -e 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ + package/rustc/cargo-config.in \ + > $(HOST_DIR)/share/cargo/config +endef +# check-package disable TypoInPackageVariable - TOOLCHAIN intended +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += RUSTC_INSTALL_CARGO_CONFIG +endif diff --git a/buildroot/package/rygel/rygel.hash b/buildroot/package/rygel/rygel.hash index 0d8c95a69..33b44aecc 100644 --- a/buildroot/package/rygel/rygel.hash +++ b/buildroot/package/rygel/rygel.hash @@ -1,6 +1,6 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.36/rygel-0.36.2.sha256sum: -sha256 d332c76c76716de1e5085f0ca0c152174352efd652a80e5b94ec7df797f92244 rygel-0.36.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.38/rygel-0.38.3.sha256sum: +sha256 08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00 rygel-0.38.3.tar.xz # Locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING -sha256 c7d881be8ae01162510e982a32001446c6d6d18a9cecc89cc41a28bd215a0262 COPYING.logo +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 c7d881be8ae01162510e982a32001446c6d6d18a9cecc89cc41a28bd215a0262 COPYING.logo diff --git a/buildroot/package/rygel/rygel.mk b/buildroot/package/rygel/rygel.mk index d87beda8c..21c8ebee6 100644 --- a/buildroot/package/rygel/rygel.mk +++ b/buildroot/package/rygel/rygel.mk @@ -4,8 +4,8 @@ # ################################################################################ -RYGEL_VERSION_MAJOR = 0.36 -RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).2 +RYGEL_VERSION_MAJOR = 0.38 +RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).3 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR) RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) @@ -33,6 +33,13 @@ ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) RYGEL_DEPENDENCIES += gdk-pixbuf endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +RYGEL_CONF_OPTS += --enable-introspection +RYGEL_DEPENDENCIES += gobject-introspection +else +RYGEL_CONF_OPTS += --disable-introspection +endif + ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) RYGEL_CONF_OPTS += \ --with-media-engine=gstreamer \ diff --git a/buildroot/package/s390-tools/Config.in b/buildroot/package/s390-tools/Config.in new file mode 100644 index 000000000..4aede4e26 --- /dev/null +++ b/buildroot/package/s390-tools/Config.in @@ -0,0 +1,14 @@ +comment "s390-tools needs a glibc toolchain w/ C++, wchar, dynamic library" + depends on BR2_s390x + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_S390_TOOLS + bool "s390-tools" + depends on BR2_s390x + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_ZLIB + help + Tools for use with the s390 Linux kernel and device drivers. + + https://github.com/ibm-s390-tools/s390-tools diff --git a/buildroot/package/s390-tools/s390-tools.hash b/buildroot/package/s390-tools/s390-tools.hash new file mode 100644 index 000000000..4f60b22b0 --- /dev/null +++ b/buildroot/package/s390-tools/s390-tools.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 8dc1180031018756ccd5acf6c26c4175bcac79e512e8a2ea8569fdf5d3f9bd6c s390-tools-2.15.1.tar.gz +sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 COPYING diff --git a/buildroot/package/s390-tools/s390-tools.mk b/buildroot/package/s390-tools/s390-tools.mk new file mode 100644 index 000000000..5a3bcffba --- /dev/null +++ b/buildroot/package/s390-tools/s390-tools.mk @@ -0,0 +1,92 @@ +################################################################################ +# +# s390-tools +# +################################################################################ + +S390_TOOLS_VERSION = 2.15.1 +S390_TOOLS_SITE = $(call github,ibm-s390-tools,s390-tools,v$(S390_TOOLS_VERSION)) +S390_TOOLS_LICENSE = MIT +S390_TOOLS_LICENSE_FILES = LICENSE +S390_TOOLS_DEPENDENCIES = zlib + +S390_TOOLS_MAKE_OPTS = \ + ARCH=$(BR2_ARCH) \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + LINK="$(TARGET_CC)" \ + LINKXX="$(TARGET_CXX)" + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +S390_TOOLS_DEPENDENCIES += libcurl +S390_TOOLS_MAKE_OPTS += HAVE_CURL=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_CURL=0 +endif + +ifeq ($(BR2_PACKAGE_JSON_C),y) +S390_TOOLS_DEPENDENCIES += json-c +S390_TOOLS_MAKE_OPTS += HAVE_JSONC=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_JSONC=0 +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +S390_TOOLS_DEPENDENCIES += openssl +S390_TOOLS_MAKE_OPTS += HAVE_OPENSSL=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_OPENSSL=0 +endif + +ifeq ($(BR2_PACKAGE_CRYPTSETUP),y) +S390_TOOLS_DEPENDENCIES += cryptsetup +S390_TOOLS_MAKE_OPTS += HAVE_CRYPTSETUP2=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_CRYPTSETUP2=0 +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +S390_TOOLS_DEPENDENCIES += libglib2 +S390_TOOLS_MAKE_OPTS += HAVE_GLIB2=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_GLIB2=0 +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +S390_TOOLS_DEPENDENCIES += ncurses +S390_TOOLS_MAKE_OPTS += HAVE_NCURSES=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_NCURSES=0 +endif + +ifeq ($(BR2_PACKAGE_LIBPFM4),y) +S390_TOOLS_DEPENDENCIES += libpfm4 +S390_TOOLS_MAKE_OPTS += HAVE_PFM=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_PFM=0 +endif + +ifeq ($(BR2_PACKAGE_LIBFUSE),y) +S390_TOOLS_DEPENDENCIES += libfuse +S390_TOOLS_MAKE_OPTS += HAVE_FUSE=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_FUSE=0 +endif + +ifeq ($(BR2_PACKAGE_PERL_NET_SNMP),y) +S390_TOOLS_DEPENDENCIES += perl-net-snmp +S390_TOOLS_MAKE_OPTS += HAVE_SNMP=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_SNMP=0 +endif + +define S390_TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(S390_TOOLS_MAKE_OPTS) +endef + +define S390_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + $(S390_TOOLS_MAKE_OPTS) DESTDIR="$(TARGET_DIR)" +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/sam-ba/Config.in.host b/buildroot/package/sam-ba/Config.in.host index 6093865e4..2236b5f48 100644 --- a/buildroot/package/sam-ba/Config.in.host +++ b/buildroot/package/sam-ba/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_SAM_BA bool "host sam-ba" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_HOSTARCH = "x86_64" select BR2_HOSTARCH_NEEDS_IA32_LIBS help Atmel SAM-BA software provides an open set of tools for diff --git a/buildroot/package/sam-ba/sam-ba.hash b/buildroot/package/sam-ba/sam-ba.hash index ae1fb5eec..1bc14f3fd 100644 --- a/buildroot/package/sam-ba/sam-ba.hash +++ b/buildroot/package/sam-ba/sam-ba.hash @@ -1,5 +1,3 @@ # sha256 locally computed -sha256 40d5e66b77261d83780fe2b38633b8d9f5c9a26718c2b9de1d5877e853e35e96 sam-ba_cdc_linux.zip -sha256 f9cac240acadbfd8f4f1c0d65132f85427384697bd6337da6444c531138d56ee doc/license.txt -sha256 255564ff8953ea95c11a4ab1d56f1edf332298faad209ca80daf745c7ed95124 tcl_lib/boards.tcl -sha256 74ae62858139cb4e18acc3448483be80ea6b36fdb87260b665f43762ca354ede applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h +sha256 dc32c49688bbfab5aa687042caae5f611fe3d9e722098a561f8f5d2fbc57249d sam-ba_3.3.1-linux_x86_64.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/buildroot/package/sam-ba/sam-ba.mk b/buildroot/package/sam-ba/sam-ba.mk index 49505589d..3082d4919 100644 --- a/buildroot/package/sam-ba/sam-ba.mk +++ b/buildroot/package/sam-ba/sam-ba.mk @@ -4,36 +4,22 @@ # ################################################################################ -SAM_BA_SITE = http://ww1.microchip.com/downloads/en/DeviceDoc -SAM_BA_VERSION = 2.18 -SAM_BA_SOURCE = sam-ba_cdc_linux.zip -SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \ - BSD-2-Clause like, BSD-4-Clause (TCL and applets code) -SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ - applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h - -define HOST_SAM_BA_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(HOST_SAM_BA_DL_DIR)/$(SAM_BA_SOURCE) - mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D) - rmdir $(BUILD_DIR)/sam-ba_cdc_linux/ -endef +SAM_BA_VERSION = 3.3.1 +SAM_BA_SITE = https://github.com/atmelcorp/sam-ba/releases/download/v$(SAM_BA_VERSION) +SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)-linux_x86_64.tar.gz +SAM_BA_LICENSE = GPLv2 +SAM_BA_LICENSE_FILES = LICENSE.txt # Since it's a prebuilt application and it does not conform to the # usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and # then create a symbolic link from $(HOST_DIR)/bin to the # application binary, for easier usage. -ifeq ($(HOSTARCH),x86_64) -SAM_BA_BIN_NAME = sam-ba_64 -else -SAM_BA_BIN_NAME = sam-ba -endif - define HOST_SAM_BA_INSTALL_CMDS mkdir -p $(HOST_DIR)/opt/sam-ba/ cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ mkdir -p $(HOST_DIR)/bin/ - ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba + ln -sf ../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba endef $(eval $(host-generic-package)) diff --git a/buildroot/package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch b/buildroot/package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch new file mode 100644 index 000000000..e63f43c29 --- /dev/null +++ b/buildroot/package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch @@ -0,0 +1,40 @@ +From b2ea5dc3639d68b878c6534f4992da446dbbf2d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 16 May 2020 18:15:38 +0200 +Subject: [PATCH] ldap_message_test.c: include stdint.h before cmoka.h + +This fix the following build failure on uclibc: + +In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0, + from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:27, + from ../../lib/replace/../replace/replace.h:64, + from ../../source4/include/includes.h:23, + from ../../libcli/ldap/tests/ldap_message_test.c:41: +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' + typedef unsigned long int uintptr_t; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + libcli/ldap/tests/ldap_message_test.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libcli/ldap/tests/ldap_message_test.c b/libcli/ldap/tests/ldap_message_test.c +index c5aacd4bc6b..51331e5c600 100644 +--- a/libcli/ldap/tests/ldap_message_test.c ++++ b/libcli/ldap/tests/ldap_message_test.c +@@ -34,6 +34,7 @@ + */ + #include + #include ++#include + #include + #include + +-- +2.26.2 + diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 4d47871fc..0ce22a852 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.11.13.tar.asc -sha256 e71ed29ae01c5ce7be8cee1f53e0530db86dd19b911accb08fae60224e686ba1 samba-4.11.13.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.11.15.tar.asc +sha256 922d461bb2e6e490cf7708b297a9312ea6cda1edc7bdfea4ee665f45ff99038a samba-4.11.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index 48ac48c18..51ee2c9c3 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.13 +SAMBA4_VERSION = 4.11.15 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES diff --git a/buildroot/package/scrypt/scrypt.hash b/buildroot/package/scrypt/scrypt.hash index 8a20d42be..4004b8973 100644 --- a/buildroot/package/scrypt/scrypt.hash +++ b/buildroot/package/scrypt/scrypt.hash @@ -1,4 +1,4 @@ -# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.2.0.asc -sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz +# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.1.asc +sha256 df2f23197c9589963267f85f9c5307ecf2b35a98b83a551bf1b1fb7a4d06d4c2 scrypt-1.3.1.tgz # Locally computed -sha256 e9d3ce691acc974c05d54bdea919fa03018fcdb5abd82eab5cdb78f07c451e0a main.c +sha256 1fb4da0e9000287414066a238f378528d5652f89b72b4a1d6b89fdd20031b22d COPYRIGHT diff --git a/buildroot/package/scrypt/scrypt.mk b/buildroot/package/scrypt/scrypt.mk index ae5a64e71..fb305faf4 100644 --- a/buildroot/package/scrypt/scrypt.mk +++ b/buildroot/package/scrypt/scrypt.mk @@ -4,11 +4,11 @@ # ################################################################################ -SCRYPT_VERSION = 1.2.0 +SCRYPT_VERSION = 1.3.1 SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz SCRYPT_SITE = http://www.tarsnap.com/scrypt SCRYPT_LICENSE = BSD-2-Clause -SCRYPT_LICENSE_FILES = main.c +SCRYPT_LICENSE_FILES = COPYRIGHT SCRYPT_DEPENDENCIES = openssl SCRYPT_INSTALL_STAGING = YES diff --git a/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch b/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch deleted file mode 100644 index 1165edc66..000000000 --- a/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cb51ec369186628e016a10ccf25b2b26d5d2ef85 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 10 Feb 2020 21:31:36 +0100 -Subject: [PATCH] src/core/linux/SDL_threadprio.c: fix build without threads - -Add an include on SDL_error.h to avoid the following build failure -without threads: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: build/.libs/SDL_threadprio.o: in function `SDL_LinuxSetThreadPriority_REAL': -SDL_threadprio.c:(.text+0x0): undefined reference to `SDL_Unsupported' - -Fixes: - - http://autobuild.buildroot.org/results/7f7712c5bd47de4a3fcec1e0d0526fd5a3ecd532 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugzilla.libsdl.org/show_bug.cgi?id=4971] ---- - src/core/linux/SDL_threadprio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/linux/SDL_threadprio.c b/src/core/linux/SDL_threadprio.c -index 162b1a3f1..2cbc4cb48 100644 ---- a/src/core/linux/SDL_threadprio.c -+++ b/src/core/linux/SDL_threadprio.c -@@ -22,6 +22,7 @@ - - #ifdef __LINUX__ - -+#include "SDL_error.h" - #include "SDL_stdinc.h" - - #if !SDL_THREADS_DISABLED --- -2.24.1 - diff --git a/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch b/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch new file mode 100644 index 000000000..2fbad9740 --- /dev/null +++ b/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch @@ -0,0 +1,46 @@ +From 7c6d466d98910a2896680351cc5cea1b7fb37ab9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Mar 2020 13:33:40 +0100 +Subject: [PATCH] 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 +[Retrieved from: https://hg.libsdl.org/SDL/rev/769f80095217] +--- + src/video/directfb/SDL_DirectFB_render.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c +index 618009850..cc31fb8f4 100644 +--- a/src/video/directfb/SDL_DirectFB_render.c ++++ b/src/video/directfb/SDL_DirectFB_render.c +@@ -198,11 +198,10 @@ SetBlendMode(DirectFB_RenderData * data, int blendMode, + 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; +-- +2.25.1 + diff --git a/buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch b/buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch deleted file mode 100644 index e335f95b7..000000000 --- a/buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# HG changeset patch -# User Paul Cercueil -# Date 1576820863 28800 -# Node ID 4f5bef55183c677d12a7da8f3392879ed50670a3 -# Parent 01f16d7f36cb9f4fa02016e57fbe915fdea71cc8 -kmsdrm: Fix busy-loop within libc's dlopen() -For some obscure reason, the order in which the libdrm/libgbm libraries -are loaded matters. - -Without this fix, the first call to check_modesetting() will work and -load then unload all symbols properly, but the second call to this -function will lock up as soon as dlopen() is called on libdrm. - -Swapping the order in which the libdrm and libgbm libraries are loaded -is enough to fix (or work around?) this issue. - -Fixes #4891: -https://bugzilla.libsdl.org/show_bug.cgi?id=4891 - -Upstream: https://hg.libsdl.org/SDL/rev/4f5bef55183c - -Signed-off-by: Paul Cercueil -[yann.morin.1998@free.fr: add upstream commit URL] -Signed-off-by: Yann E. MORIN - -diff -r 01f16d7f36cb -r 4f5bef55183c src/video/kmsdrm/SDL_kmsdrmdyn.c ---- a/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:45:44 2019 -0800 -+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:47:43 2019 -0800 -@@ -50,8 +50,8 @@ - #endif - - static kmsdrmdynlib kmsdrmlibs[] = { -- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC}, -- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM} -+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM}, -+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC} - }; - - static void * - diff --git a/buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch b/buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch new file mode 100644 index 000000000..89ca220ad --- /dev/null +++ b/buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch @@ -0,0 +1,39 @@ +From d265b1ee94aa4faf5fa405f14cc731a25d7a00ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Mar 2020 14:11:14 +0100 +Subject: [PATCH] src/video/kmsdrm/SDL_kmsdrmvideo.c: fix build + +Build is broken without EGL since version 2.0.12 and +https://hg.libsdl.org/SDL/rev/9761858bd6a3: + +/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c: In function 'KMSDRM_CreateSurfaces': +/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c:394:5: error: unknown type name 'EGLContext' + EGLContext egl_context; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/fafd20a01591032662f9ca025fcea3478239cf3c + +Signed-off-by: Fabrice Fontaine +[Upstream: https://hg.libsdl.org/SDL/rev/389ce8cfa2a3] +--- + src/video/kmsdrm/SDL_kmsdrmvideo.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c +index 216c45dab..459f96537 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c ++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c +@@ -391,7 +391,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) + Uint32 height = dispdata->mode.vdisplay; + Uint32 surface_fmt = GBM_FORMAT_XRGB8888; + Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; ++#if SDL_VIDEO_OPENGL_EGL + EGLContext egl_context; ++#endif + + if (!KMSDRM_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) { + SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway."); +-- +2.25.1 + diff --git a/buildroot/package/sdl2/sdl2.hash b/buildroot/package/sdl2/sdl2.hash index 9e968e0af..b72ae4bfc 100644 --- a/buildroot/package/sdl2/sdl2.hash +++ b/buildroot/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.10.tar.gz.sig -sha256 b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 SDL2-2.0.10.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.12.tar.gz.sig +sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 SDL2-2.0.12.tar.gz # Locally calculated -sha256 a7c8d0b3167c502921192585a582eb8477ad9862330f4d8b9e4a8bb4c1a9d29e COPYING.txt +sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk index 9ef721d28..6ef530fb4 100644 --- a/buildroot/package/sdl2/sdl2.mk +++ b/buildroot/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.10 +SDL2_VERSION = 2.0.12 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib diff --git a/buildroot/package/sdl_image/sdl_image.mk b/buildroot/package/sdl_image/sdl_image.mk index ee0712cc2..95a03a395 100644 --- a/buildroot/package/sdl_image/sdl_image.mk +++ b/buildroot/package/sdl_image/sdl_image.mk @@ -16,6 +16,10 @@ SDL_IMAGE_CONF_OPTS = \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ --disable-sdltest \ --disable-static \ + --disable-jpg-shared \ + --disable-png-shared \ + --disable-tif-shared \ + --disable-webp-shared \ --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \ --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \ --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \ @@ -43,7 +47,8 @@ HOST_SDL_IMAGE_CONF_OPTS = \ --disable-static \ --disable-jpg-shared \ --disable-png-shared \ - --disable-tif-shared + --disable-tif-shared \ + --disable-webp-shared HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl diff --git a/buildroot/package/sdl_mixer/Config.in b/buildroot/package/sdl_mixer/Config.in index 42dfe63c0..a886b7c1a 100644 --- a/buildroot/package/sdl_mixer/Config.in +++ b/buildroot/package/sdl_mixer/Config.in @@ -9,3 +9,13 @@ config BR2_PACKAGE_SDL_MIXER SMPEG MP3 libraries. http://www.libsdl.org/projects/SDL_mixer/ + +if BR2_PACKAGE_SDL_MIXER + +config BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY + bool "MIDI support with built-in Timidity synth" + help + Support MIDI audio using the built-in synth based on Timidity. + You will need MIDI instruments installed in the filesystem. + +endif diff --git a/buildroot/package/sdl_mixer/sdl_mixer.mk b/buildroot/package/sdl_mixer/sdl_mixer.mk index 73eb821ff..9636c228a 100644 --- a/buildroot/package/sdl_mixer/sdl_mixer.mk +++ b/buildroot/package/sdl_mixer/sdl_mixer.mk @@ -22,11 +22,29 @@ SDL_MIXER_AUTORECONF = YES SDL_MIXER_CONF_OPTS = \ --without-x \ --with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-music-midi \ --disable-music-mod \ --disable-music-mp3 \ --disable-music-flac # configure script fails when cross compiling +ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) +SDL_MIXER_DEPENDENCIES += fluidsynth +SDL_MIXER_CONF_OPTS += \ + --enable-music-midi \ + --enable-music-fluidsynth-midi +SDL_MIXER_HAS_MIDI = YES +endif + +ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y) +SDL_MIXER_CONF_OPTS += \ + --enable-music-midi \ + --enable-music-timidity-midi +SDL_MIXER_HAS_MIDI = YES +endif + +ifneq ($(SDL_MIXER_HAS_MIDI),YES) +SDL_MIXER_CONF_OPTS += --disable-music-midi +endif + ifeq ($(BR2_PACKAGE_LIBMAD),y) SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl SDL_MIXER_DEPENDENCIES += libmad diff --git a/buildroot/package/sed/sed.hash b/buildroot/package/sed/sed.hash index cc3bebafe..bb4812852 100644 --- a/buildroot/package/sed/sed.hash +++ b/buildroot/package/sed/sed.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/sed/sed-4.7.tar.xz.sig +# https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz.sig # with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a sed-4.7.tar.xz +sha256 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 sed-4.8.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/buildroot/package/sed/sed.mk b/buildroot/package/sed/sed.mk index 6fee598f6..6bb322055 100644 --- a/buildroot/package/sed/sed.mk +++ b/buildroot/package/sed/sed.mk @@ -4,7 +4,7 @@ # ################################################################################ -SED_VERSION = 4.7 +SED_VERSION = 4.8 SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 diff --git a/buildroot/package/selinux-python/Config.in b/buildroot/package/selinux-python/Config.in index 5b6cbc80e..0f1c28177 100644 --- a/buildroot/package/selinux-python/Config.in +++ b/buildroot/package/selinux-python/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" + depends on !BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3 help A set of SELinux tools written in python that help with managing a system with SELinux enabled. If no packages are @@ -37,6 +38,10 @@ config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN endif +comment "selinux-python needs python3" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_PYTHON + comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/buildroot/package/selinux-python/selinux-python.hash b/buildroot/package/selinux-python/selinux-python.hash index 8cbac3701..f896168f7 100644 --- a/buildroot/package/selinux-python/selinux-python.hash +++ b/buildroot/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde selinux-python-2.9.tar.gz +sha256 f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02 selinux-python-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/selinux-python/selinux-python.mk b/buildroot/package/selinux-python/selinux-python.mk index 978bee7c8..3b1e15bdf 100644 --- a/buildroot/package/selinux-python/selinux-python.mk +++ b/buildroot/package/selinux-python/selinux-python.mk @@ -4,25 +4,17 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 2.9 -SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SELINUX_PYTHON_VERSION = 3.1 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING +SELINUX_PYTHON_DEPENDENCIES = python3 SELINUX_PYTHON_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ ARCH="$(BR2_ARCH)" \ - LIBDIR="$(STAGING_DIR)/usr/lib" - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SELINUX_PYTHON_DEPENDENCIES += python3 -SELINUX_PYTHON_MAKE_OPTS += \ + LIBDIR="$(STAGING_DIR)/usr/lib" \ PYTHONLIBDIR="usr/lib/python$(PYTHON3_VERSION_MAJOR)" -else -SELINUX_PYTHON_DEPENDENCIES += python -SELINUX_PYTHON_MAKE_OPTS += \ - PYTHONLIBDIR="usr/lib/python$(PYTHON_VERSION_MAJOR)" -endif ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW),y) SELINUX_PYTHON_DEPENDENCIES += checkpolicy diff --git a/buildroot/package/semodule-utils/semodule-utils.hash b/buildroot/package/semodule-utils/semodule-utils.hash index 386b44261..d015205d5 100644 --- a/buildroot/package/semodule-utils/semodule-utils.hash +++ b/buildroot/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8083679ee634570f6e9a18632f2c2862b9134fa308b689b2e1952a369ae5d907 semodule-utils-2.9.tar.gz +sha256 0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853 semodule-utils-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/semodule-utils/semodule-utils.mk b/buildroot/package/semodule-utils/semodule-utils.mk index 7102dbc5e..c89f28d60 100644 --- a/buildroot/package/semodule-utils/semodule-utils.mk +++ b/buildroot/package/semodule-utils/semodule-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 2.9 -SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SEMODULE_UTILS_VERSION = 3.1 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol diff --git a/buildroot/package/sentry-cli/Config.in.host b/buildroot/package/sentry-cli/Config.in.host new file mode 100644 index 000000000..312401536 --- /dev/null +++ b/buildroot/package/sentry-cli/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SENTRY_CLI + bool "host sentry-cli" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Official Sentry command line interface + + For managing debug information files and source maps. + + https://docs.sentry.io/cli/ diff --git a/buildroot/package/sentry-cli/sentry-cli.hash b/buildroot/package/sentry-cli/sentry-cli.hash new file mode 100644 index 000000000..3b0733a27 --- /dev/null +++ b/buildroot/package/sentry-cli/sentry-cli.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 5d0f7acf6a139d1c1716b9a8ff76c8bfaab09104ba663c957bb9a5dba2ffbabd sentry-cli-1.57.0.tar.gz +sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/buildroot/package/sentry-cli/sentry-cli.mk b/buildroot/package/sentry-cli/sentry-cli.mk new file mode 100644 index 000000000..7e53f1602 --- /dev/null +++ b/buildroot/package/sentry-cli/sentry-cli.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# sentry-cli +# +################################################################################ + +SENTRY_CLI_VERSION = 1.57.0 +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) +SENTRY_CLI_LICENSE = BSD-3-clause +SENTRY_CLI_LICENSE_FILES = LICENSE + +HOST_SENTRY_CLI_DEPENDENCIES = host-rustc host-zlib + +HOST_SENTRY_CLI_CARGO_ENV = \ + CARGO_HOME=$(HOST_DIR)/share/cargo \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" + +HOST_SENTRY_CLI_CARGO_OPTS = \ + --release \ + --manifest-path=$(@D)/Cargo.toml + +define HOST_SENTRY_CLI_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_SENTRY_CLI_CARGO_ENV) \ + cargo build $(HOST_SENTRY_CLI_CARGO_OPTS) +endef + +define HOST_SENTRY_CLI_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/target/release/sentry-cli \ + $(HOST_DIR)/bin/sentry-cli +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/sentry-native/0001-sentry.h-include-ucontext.h.patch b/buildroot/package/sentry-native/0001-sentry.h-include-ucontext.h.patch new file mode 100644 index 000000000..108f38928 --- /dev/null +++ b/buildroot/package/sentry-native/0001-sentry.h-include-ucontext.h.patch @@ -0,0 +1,27 @@ +From 6a3b7b28f34c91c72d8b849903d93de2997b82f1 Mon Sep 17 00:00:00 2001 +From: Joseph Kogut +Date: Tue, 8 Sep 2020 11:40:01 -0700 +Subject: [PATCH] sentry.h: include ucontext.h + +This is included by signal.h in newer versions of glibc, but results +in an unknown type name error in older versions. + +Signed-off-by: Joseph Kogut +--- + include/sentry.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/sentry.h b/include/sentry.h +index 25754d9..a55cc00 100644 +--- a/include/sentry.h ++++ b/include/sentry.h +@@ -78,6 +78,7 @@ extern "C" { + # include + #else + # include ++# include + #endif + + /** +-- +2.28.0 diff --git a/buildroot/package/sentry-native/Config.in b/buildroot/package/sentry-native/Config.in new file mode 100644 index 000000000..7a3cbd36a --- /dev/null +++ b/buildroot/package/sentry-native/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_SENTRY_NATIVE + bool "sentry-native" + depends on BR2_INSTALL_LIBSTDCPP # google-breakpad + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # google-breakpad + depends on BR2_USE_WCHAR # google-breakpad + depends on BR2_TOOLCHAIN_HAS_THREADS # google-breakpad + # google-breakpad is restricted to glibc or uClibc, but + # sentry-native needs , so it restricts further to + # just glibc. + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS # google-breakpad + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS # google-breakpad + select BR2_PACKAGE_GOOGLE_BREAKPAD + select BR2_PACKAGE_LIBCURL + help + The Sentry Native SDK is an error and crash + reporting client for native applications, + optimized for C and C++. + + https://github.com/getsentry/sentry-native + +comment "sentry-native needs a glibc toolchain with w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/sentry-native/sentry-native.hash b/buildroot/package/sentry-native/sentry-native.hash new file mode 100644 index 000000000..dffc7aeca --- /dev/null +++ b/buildroot/package/sentry-native/sentry-native.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 a7d04fe9b9175c30a58ce20ae23b510595045a66884a447dd21ff2d0c749751b sentry-native-0.4.1.tar.gz +sha256 5ef07a3d95f1f779c1597c0fbaecbb7ba242128ff0587ed1e3214c7ac6154523 LICENSE diff --git a/buildroot/package/sentry-native/sentry-native.mk b/buildroot/package/sentry-native/sentry-native.mk new file mode 100644 index 000000000..f07438897 --- /dev/null +++ b/buildroot/package/sentry-native/sentry-native.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# sentry-native +# +################################################################################ + +SENTRY_NATIVE_VERSION = 0.4.1 +SENTRY_NATIVE_SITE = $(call github,getsentry,sentry-native,$(SENTRY_NATIVE_VERSION)) +SENTRY_NATIVE_LICENSE = MIT +SENTRY_NATIVE_LICENSE_FILES = LICENSE +SENTRY_NATIVE_DEPENDENCIES = libcurl google-breakpad +SENTRY_NATIVE_INSTALL_STAGING = YES + +# Use the built system breakpad client instead of bundling +SENTRY_NATIVE_CONF_OPTS += -DSENTRY_BREAKPAD_SYSTEM=ON + +$(eval $(cmake-package)) diff --git a/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch b/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch new file mode 100644 index 000000000..daf537243 --- /dev/null +++ b/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch @@ -0,0 +1,39 @@ +From 021543b02b6fdb78c9217757736eabac90a647eb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 26 Sep 2020 12:37:38 +0200 +Subject: [PATCH] port.h: include + +Include to avoid the following build failure on musl: + +port.h:361:29: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + const char *str, struct timeval *tv, + ^~~~~~~ +portconfig.c: In function 'myconfig': +portconfig.c:586:9: error: variable 'tv' has initializer but incomplete type + struct timeval tv = { 0, 0 }; + ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/4c0b238186cb2fb2d81807ce006945594f92b2cd + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/cminyard/ser2net/pull/34] +--- + port.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/port.h b/port.h +index 048c5bd..86c3b1d 100644 +--- a/port.h ++++ b/port.h +@@ -9,6 +9,7 @@ + #define PORT + + #include ++#include + #include "gbuf.h" + #include "absout.h" + +-- +2.28.0 + diff --git a/buildroot/package/ser2net/ser2net.hash b/buildroot/package/ser2net/ser2net.hash index 5bd927d7d..fd2761075 100644 --- a/buildroot/package/ser2net/ser2net.hash +++ b/buildroot/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 44a69f573677d9f2bde87b3611db5817 ser2net-4.1.1.tar.gz -sha1 502e11c3bee429de6550db459d83c9a0991cfc5c ser2net-4.1.1.tar.gz +md5 7c0a47bd9b405aedac136c4e290ebfeb ser2net-4.2.2.tar.gz +sha1 64e77d3194bbbac6e7e9d5810d06b6ade7bfdcf4 ser2net-4.2.2.tar.gz # Locally computed: -sha256 ad6c8fb34d01be177570323899d840a44c8774399d594595393708162fc61e22 ser2net-4.1.1.tar.gz -sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING +sha256 60e2aab04c4a346447a7e58e308a830fb74bac208a021229c113fc8ccc7bdfe6 ser2net-4.2.2.tar.gz +sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/buildroot/package/ser2net/ser2net.mk b/buildroot/package/ser2net/ser2net.mk index 94035b218..868d7f3a1 100644 --- a/buildroot/package/ser2net/ser2net.mk +++ b/buildroot/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 4.1.1 +SER2NET_VERSION = 4.2.2 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING diff --git a/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch b/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch index 4f6d2efb9..0ab400666 100644 --- a/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch +++ b/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch @@ -1,4 +1,4 @@ -From b2fe84bfd00117d4897f1f2e8f83d3410eb188b8 Mon Sep 17 00:00:00 2001 +From 8ab5a49247d870d92a8287db6134877ebf7a4379 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 12 Oct 2017 22:04:58 -0400 Subject: [PATCH] remove werror flag from setup @@ -6,24 +6,26 @@ Subject: [PATCH] remove werror flag from setup Compilers older than gcc6 will generate uninitialized variable warnings which will cause compiling to fail. +Signed-off-by: Antoine Tenart +[Refreshed for 4.3.0] Signed-off-by: Adam Duskett --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 2ca44c9..9319bf6 100644 +index 457c83049ca5..4dcb30196abf 100644 --- a/setup.py +++ b/setup.py -@@ -146,7 +146,7 @@ ext_py_mods = [Extension('setools.policyrep._qpol', - 'libqpol/policy_scan.c', - 'libqpol/xen_query.c'], - include_dirs=include_dirs, +@@ -106,7 +106,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'], + libraries=['selinux', 'sepol'], + library_dirs=lib_dirs, + define_macros=macros, - extra_compile_args=['-Werror', '-Wextra', + extra_compile_args=['-Wextra', '-Waggregate-return', '-Wfloat-equal', '-Wformat', '-Wformat=2', -- -2.13.6 +2.26.2 diff --git a/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 508087ff2..f9519a079 100644 --- a/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -1,4 +1,4 @@ -From 2512c3ba608077db3a5e0286b976fadc8a04a5c4 Mon Sep 17 00:00:00 2001 +From ae84e5ef59bb24d5b8fd17e6756952f42c2d5c36 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Thu, 23 Feb 2017 08:17:07 +0100 Subject: [PATCH] Do not export/use setools.InfoFlowAnalysis and @@ -12,30 +12,32 @@ Therefore it's better to use setools.infoflow.InfoFlowAnalysis and setools.dta.DomainTransitionAnalysis and let the package containing sedta and seinfoflow to require python3-networkx +Signed-off-by: Antoine Tenart +[Refreshed for 4.3.0] Signed-off-by: Adam Duskett --- sedta | 3 ++- - seinfoflow | 3 ++- + seinfoflow | 5 +++-- setools/__init__.py | 4 ++-- setoolsgui/apol/dta.py | 2 +- setoolsgui/apol/infoflow.py | 2 +- - tests/dta.py | 3 ++- - tests/infoflow.py | 3 ++- - 7 files changed, 12 insertions(+), 8 deletions(-) + tests/dta.py | 2 +- + tests/infoflow.py | 2 +- + 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sedta b/sedta -index 1c76ebb..255ad49 100755 +index 60861ca630a5..0056172a55e5 100755 --- a/sedta +++ b/sedta -@@ -23,6 +23,7 @@ import argparse - import logging +@@ -23,6 +23,7 @@ import logging + import signal import setools +import setools.dta def print_transition(trans): -@@ -111,7 +112,7 @@ else: +@@ -114,7 +115,7 @@ else: try: p = setools.SELinuxPolicy(args.policy) @@ -45,31 +47,33 @@ index 1c76ebb..255ad49 100755 if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/seinfoflow b/seinfoflow -index b287921..d53bdef 100755 +index f10c39de4d8e..fe733bbd0787 100755 --- a/seinfoflow +++ b/seinfoflow -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ + # - from __future__ import print_function import setools +import setools.infoflow import argparse import sys import logging -@@ -79,7 +80,7 @@ else: +@@ -101,8 +102,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) -- g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude) -+ g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude) +- g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude, +- booleans=booleans) ++ g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude, ++ booleans=booleans) if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/setools/__init__.py b/setools/__init__.py -index a84c846..a53c5a7 100644 +index 26fa5aa34a19..9e9058a6bf90 100644 --- a/setools/__init__.py +++ b/setools/__init__.py -@@ -74,11 +74,11 @@ from .pcideviceconquery import PcideviceconQuery +@@ -75,11 +75,11 @@ from .pcideviceconquery import PcideviceconQuery from .devicetreeconquery import DevicetreeconQuery # Information Flow Analysis @@ -84,59 +88,57 @@ index a84c846..a53c5a7 100644 # Policy difference from .diff import PolicyDifference diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py -index 0aaf13f..5b1ea20 100644 +index 4608b9dbf34e..2cde44c142e9 100644 --- a/setoolsgui/apol/dta.py +++ b/setoolsgui/apol/dta.py @@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem + QTreeWidgetItem -from setools import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis from ..logtosignal import LogHandlerToSignal from .analysistab import AnalysisTab diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py -index 1ae16de..fdf8f7b 100644 +index 7bca299d23fc..7fee2778f35f 100644 --- a/setoolsgui/apol/infoflow.py +++ b/setoolsgui/apol/infoflow.py -@@ -25,7 +25,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread +@@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem + QTreeWidgetItem -from setools import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis from setools.exception import UnmappedClass, UnmappedPermission from ..logtosignal import LogHandlerToSignal diff --git a/tests/dta.py b/tests/dta.py -index 32b9271..2bdd052 100644 +index a0cc9381469c..177e6fb0b961 100644 --- a/tests/dta.py +++ b/tests/dta.py -@@ -17,7 +17,8 @@ - # +@@ -18,7 +18,7 @@ + import os import unittest --from setools import SELinuxPolicy, DomainTransitionAnalysis -+from setools import SELinuxPolicy +-from setools import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis from setools import TERuletype as TERT - from setools.policyrep.exception import InvalidType - from setools.policyrep.typeattr import Type + from setools.exception import InvalidType + from setools.policyrep import Type diff --git a/tests/infoflow.py b/tests/infoflow.py -index 7751dda..a21c683 100644 +index aa0e44a7e4f8..fca2848aeca5 100644 --- a/tests/infoflow.py +++ b/tests/infoflow.py -@@ -17,7 +17,8 @@ - # +@@ -18,7 +18,7 @@ + import os import unittest --from setools import SELinuxPolicy, InfoFlowAnalysis -+from setools import SELinuxPolicy +-from setools import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis from setools import TERuletype as TERT + from setools.exception import InvalidType from setools.permmap import PermissionMap - from setools.policyrep.exception import InvalidType -- -2.9.3 +2.26.2 diff --git a/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch deleted file mode 100644 index 63344506b..000000000 --- a/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Wed, 28 Nov 2018 20:49:00 -0600 -Subject: [PATCH] setup.py: drop path prefix from man install - -If the directory is a relative path, it is interpreted relative to the -installation prefix (Python's sys.prefix for pure-Python packages, -sys.exec_prefix for packages that contain extension modules). -So the sys.prefix should not be joined because the correct one will be -added regardless. The reason why a relative path is going to work is -because the installation path is built internally joining python root -with python prefix, thus forming the correct path $(TARGET_DIR)/usr. -(https://docs.python.org/3/distutils/setupscript.html#installing-additional-files) - -For this man file install scenario, joining the sys.prefix makes the -path absolute (this was previously working by accident). - -Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7 - -Cc: Angelo Compagnucci -Cc: Arnout Vandecappelle -Signed-off-by: Matthew Weber ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3767fbc..80e0400 100644 ---- a/setup.py -+++ b/setup.py -@@ -136,7 +136,7 @@ setup(name='setools', - cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, - packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], - scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], -- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], -+ data_files=[('share/man/man1', glob.glob("man/*.1"))], - package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, - ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], - annotate=cython_annotate, --- -1.9.1 - diff --git a/buildroot/package/setools/Config.in b/buildroot/package/setools/Config.in index 56a85b01c..3ab7f5594 100644 --- a/buildroot/package/setools/Config.in +++ b/buildroot/package/setools/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR depends on BR2_USE_MMU - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -18,9 +17,13 @@ config BR2_PACKAGE_SETOOLS * seinfoflow - information flow analysis for SELinux * sesearch - Search rules (allow, type_transition, etc.) - https://github.com/TresysTechnology/setools + https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + !BR2_USE_WCHAR + +comment "setools needs python3" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/setools/setools.hash b/buildroot/package/setools/setools.hash index 872929706..689b20a35 100644 --- a/buildroot/package/setools/setools.hash +++ b/buildroot/package/setools/setools.hash @@ -1,7 +1,5 @@ -# From https://github.com/TresysTechnology/setools3/wiki/Download -md5 d68d0d4e4da0f01da0f208782ff04b91 setools-4.1.1.tar.bz2 # Locally computed -sha256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 setools-4.1.1.tar.gz +sha256 da2c1d23edd24c4aa17d01d78e86c9e5fb5bf3aa38c71d5d63f41c750f6ef26c setools-4.3.0.tar.gz sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/buildroot/package/setools/setools.mk b/buildroot/package/setools/setools.mk index 63ca3651e..c1a3a909c 100644 --- a/buildroot/package/setools/setools.mk +++ b/buildroot/package/setools/setools.mk @@ -4,27 +4,20 @@ # ################################################################################ -SETOOLS_VERSION = 4.1.1 -SETOOLS_SITE = $(call github,TresysTechnology,setools,$(SETOOLS_VERSION)) -SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-swig +SETOOLS_VERSION = 4.3.0 +SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) +SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -SETOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -SETOOLS_DEPENDENCIES += python-enum34 -HOST_SETOOLS_DEPENDENCIES += host-python-enum34 -endif +HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the staging directory. - $(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ + $(SED) "s@lib_dirs =.*@lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ $(@D)/setup.py endef SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP @@ -32,7 +25,7 @@ SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP define HOST_SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the host directory. - $(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(HOST_DIR)/lib']@g" \ + $(SED) "s@lib_dirs =.*@lib_dirs = ['$(HOST_DIR)/lib']@g" \ $(@D)/setup.py endef HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP @@ -43,7 +36,7 @@ HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP ifeq ($(BR2_PACKAGE_PYTHON_PYQT5),) define SETOOLS_REMOVE_QT_SCRIPTS $(RM) $(TARGET_DIR)/usr/bin/apol - $(RM) -r $(TARGET_DIR)/lib/$(SETOOLS_PYLIBVER)/site-packages/setoolsgui/ + $(RM) -r $(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/setoolsgui/ endef SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS endif diff --git a/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch b/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch deleted file mode 100644 index 34a4e114e..000000000 --- a/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 68b0591cf37760e09e358533bbcecf36eddfceed Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 10 Feb 2019 14:46:41 +0100 -Subject: [PATCH] src/Makefile.am: add missing @RT_LIB@ for sg_turs - -The sg_turs program uses clock_gettime(), so it should link against -librt, as provided by @RT_LIB@. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 881cf29..0eba680 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -170,7 +170,7 @@ sg_test_rwbuf_LDADD = ../lib/libsgutils2.la - - sg_timestamp_LDADD = ../lib/libsgutils2.la - --sg_turs_LDADD = ../lib/libsgutils2.la -+sg_turs_LDADD = ../lib/libsgutils2.la @RT_LIB@ - - sg_unmap_LDADD = ../lib/libsgutils2.la - --- -2.20.1 - diff --git a/buildroot/package/sg3_utils/sg3_utils.hash b/buildroot/package/sg3_utils/sg3_utils.hash index 14b94947d..d6c7f03ab 100644 --- a/buildroot/package/sg3_utils/sg3_utils.hash +++ b/buildroot/package/sg3_utils/sg3_utils.hash @@ -1,6 +1,6 @@ # Locally calculated from download (no sig, hash) -sha256 ca94ac106510742cd8ff5ead4a7e5c89d410653291401daf4632d2bef2a35b05 sg3_utils-1.44.tar.xz +sha256 c7dab547dc37381fa50e482d9da680fe64b88cfe0e3d79b61e478de14f58b2ee sg3_utils-1.45.tar.xz # Hash for license files -sha256 d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc COPYING -sha256 31f6d59679e0fb21c9358f22484e6e3c53e20ef08c0950fd38a4a867cb55edc9 BSD_LICENSE +sha256 d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc COPYING +sha256 8ddd1d82f2be2f5cbd5b5c3b5c2ee94a90d2ca7112958448da74dd78384fd96a BSD_LICENSE diff --git a/buildroot/package/sg3_utils/sg3_utils.mk b/buildroot/package/sg3_utils/sg3_utils.mk index 7070d6f83..11b3691ff 100644 --- a/buildroot/package/sg3_utils/sg3_utils.mk +++ b/buildroot/package/sg3_utils/sg3_utils.mk @@ -4,13 +4,13 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.44 +SG3_UTILS_VERSION = 1.45 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p -SG3_UTILS_LICENSE = BSD-3-Clause (library) +SG3_UTILS_LICENSE = BSD-2-Clause (library) # Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y) -SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-3-Clause (programs) +SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-2-Clause (programs) endif SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE @@ -20,6 +20,11 @@ SG3_UTILS_AUTORECONF = YES # install the libsgutils2 library SG3_UTILS_INSTALL_STAGING = YES +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SG3_UTILS_CONF_ENV += LIBS="-latomic" +endif + ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) define SG3_UTILS_REMOVE_PROGS for prog in \ diff --git a/buildroot/package/shairport-sync/shairport-sync.hash b/buildroot/package/shairport-sync/shairport-sync.hash index b072fad04..280090cc4 100644 --- a/buildroot/package/shairport-sync/shairport-sync.hash +++ b/buildroot/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459 shairport-sync-3.3.5.tar.gz +sha256 a8382affd25c473fa38ead5690148c6c3902098f359f9c881eefe139e1f49f49 shairport-sync-3.3.6.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/buildroot/package/shairport-sync/shairport-sync.mk b/buildroot/package/shairport-sync/shairport-sync.mk index 880a05890..10348d7b5 100644 --- a/buildroot/package/shairport-sync/shairport-sync.mk +++ b/buildroot/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.5 +SHAIRPORT_SYNC_VERSION = 3.3.6 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause diff --git a/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch b/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..69dc31e35 --- /dev/null +++ b/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,56 @@ +From 3ccbb67c71aa13b9a37a58363d37a18b8fdbf300 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 29 Oct 2020 13:36:00 +0100 +Subject: [PATCH] src/schedule.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8: + +schedule.c:19:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (int i = 0; i < 4; ++i) { + ^ +schedule.c:19:2: note: use option -std=c99 or -std=gnu99 to compile your code +schedule.c: In function 'pms2_read_block': +schedule.c:39:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (int i = 0; i < 4; ++i) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/079f1454121d38a83c49529c0f6cc8ed61fd5abb + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/sispmctl/git/merge-requests/1] +--- + src/schedule.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/schedule.c b/src/schedule.c +index 4dd908d..1725421 100644 +--- a/src/schedule.c ++++ b/src/schedule.c +@@ -15,8 +15,9 @@ + static unsigned char + *pms2_write_block(uint8_t action, uint32_t time, unsigned char *ptr) + { ++ int i; + *ptr++ = action; +- for (int i = 0; i < 4; ++i) { ++ for (i = 0; i < 4; ++i) { + *ptr++ = (uint8_t)time; + time >>= 8; + } +@@ -34,9 +35,10 @@ static unsigned char + static const unsigned char + *pms2_read_block(uint8_t *action, uint32_t *time, const unsigned char *ptr) + { ++ int i; + *action = *ptr++; + *time = 0; +- for (int i = 0; i < 4; ++i) { ++ for (i = 0; i < 4; ++i) { + *time >>= 8; + *time += (uint32_t)*ptr++ << 24; + } +-- +2.28.0 + diff --git a/buildroot/package/sispmctl/sispmctl.hash b/buildroot/package/sispmctl/sispmctl.hash index f1090c4b8..95129cec0 100644 --- a/buildroot/package/sispmctl/sispmctl.hash +++ b/buildroot/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 bf5177e085cb0168e18e4cfb69645c3095da149ed46f5659d6e757bde3548e40 sispmctl-4.1.tar.gz +sha256 0f8391f7e95cbf1fb96a68686a1dcf1e16747b050ae1b8ff90653c99976068db sispmctl-4.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sispmctl/sispmctl.mk b/buildroot/package/sispmctl/sispmctl.mk index 93e7de769..3e4252a8d 100644 --- a/buildroot/package/sispmctl/sispmctl.mk +++ b/buildroot/package/sispmctl/sispmctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SISPMCTL_VERSION = 4.1 +SISPMCTL_VERSION = 4.8 SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING diff --git a/buildroot/package/skalibs/skalibs.hash b/buildroot/package/skalibs/skalibs.hash index bb5a60212..6736dd844 100644 --- a/buildroot/package/skalibs/skalibs.hash +++ b/buildroot/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 d3b204afc462b9659e0c16f6df1c796e7612534f537eec053529f67ddcd086a5 skalibs-2.9.1.0.tar.gz -sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING +sha256 250b99b53dd413172db944b31c1b930aa145ac79fe6c5d7e6869ef804228c539 skalibs-2.9.2.1.tar.gz +sha256 5443ac67e8d74ac614ced7bc64211ce90ccedb7778a68bfe9e68a8b234c9503e COPYING diff --git a/buildroot/package/skalibs/skalibs.mk b/buildroot/package/skalibs/skalibs.mk index 8b995f796..1c73f26fe 100644 --- a/buildroot/package/skalibs/skalibs.mk +++ b/buildroot/package/skalibs/skalibs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SKALIBS_VERSION = 2.9.1.0 +SKALIBS_VERSION = 2.9.2.1 SKALIBS_SITE = http://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING diff --git a/buildroot/package/smack/smack.mk b/buildroot/package/smack/smack.mk index d2ac005ab..b7b656e64 100644 --- a/buildroot/package/smack/smack.mk +++ b/buildroot/package/smack/smack.mk @@ -14,4 +14,10 @@ SMACK_DEPENDENCIES = host-pkgconf # Sources from GitHub, no configure script included. SMACK_AUTORECONF = YES +define SMAKE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK) +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch b/buildroot/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch new file mode 100644 index 000000000..63f51fc9b --- /dev/null +++ b/buildroot/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch @@ -0,0 +1,38 @@ +From 6bd18b0b7b4d916e474ba84707eb784a643b3e71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 23 Feb 2020 16:23:20 +0100 +Subject: [PATCH] configure.ac: fix stack-protector detection + +Use AC_LINK_IFELSE instead of AC_COMPILE_IFELSE to check for +stack-protector availability as some compilers could missed the needed +library (-lssp or -lssp_nonshared) at linking step: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wformat=2 -fstack-protector-strong -o smartctl smartctl.o atacmdnames.o atacmds.o ataidentify.o ataprint.o dev_ata_cmd_set.o dev_intelliprop.o dev_interface.o dev_jmb39x_raid.o json.o knowndrives.o nvmecmds.o nvmeprint.o scsicmds.o scsiata.o scsinvme.o scsiprint.o utility.o os_linux.o cciss.o dev_areca.o -lselinux +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp + +Fixes: + - http://autobuild.buildroot.org/results/0de9f2a69fa2a39164211299f8a429d2fec6935a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://www.smartmontools.org/ticket/1302] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 87470d8a..ccb457e1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -770,7 +770,7 @@ if test "$GXX" = "yes"; then + AC_MSG_CHECKING([whether $CXX supports $option]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $option" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS]) + AC_MSG_RESULT([$res]) + done + else +-- +2.25.0 + diff --git a/buildroot/package/smartmontools/smartmontools.hash b/buildroot/package/smartmontools/smartmontools.hash index ffa1e8f97..bec007aab 100644 --- a/buildroot/package/smartmontools/smartmontools.hash +++ b/buildroot/package/smartmontools/smartmontools.hash @@ -1,5 +1,7 @@ -# From http://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/ -md5 093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz -sha1 7e788b429534a4ae627858fbcc826b93402cee7e smartmontools-6.5.tar.gz +# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.1/ +md5 430cd5f64caa4524018b536e5ecd9c29 smartmontools-7.1.tar.gz +sha1 207dc2b50cab1c6fba7bc248665fbbe3189374e1 smartmontools-7.1.tar.gz + # Locally computed +sha256 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846 smartmontools-7.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/smartmontools/smartmontools.mk b/buildroot/package/smartmontools/smartmontools.mk index bad7da2d1..9dc2f789c 100644 --- a/buildroot/package/smartmontools/smartmontools.mk +++ b/buildroot/package/smartmontools/smartmontools.mk @@ -4,10 +4,12 @@ # ################################################################################ -SMARTMONTOOLS_VERSION = 6.5 +SMARTMONTOOLS_VERSION = 7.1 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING +# We're patching configure.ac +SMARTMONTOOLS_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) SMARTMONTOOLS_CONF_OPTS += --with-libcap-ng @@ -23,4 +25,11 @@ else SMARTMONTOOLS_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SMARTMONTOOLS_CONF_OPTS += --with-libsystemd +SMARTMONTOOLS_DEPENDENCIES += systemd +else +SMARTMONTOOLS_CONF_OPTS += --without-libsystemd +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/smstools3/0001-fix-Makefile.patch b/buildroot/package/smstools3/0001-fix-Makefile.patch index 584235745..338a53e74 100644 --- a/buildroot/package/smstools3/0001-fix-Makefile.patch +++ b/buildroot/package/smstools3/0001-fix-Makefile.patch @@ -7,6 +7,8 @@ Although make-3.81 is happy about it, make-4.0 (and probably 3.82 too) do whine loudly. Signed-off-by: "Yann E. MORIN" +[Fabrice: update for 3.1.21] +Signed-off-by: Fabrice Fontaine diff -durN smstools3-3.1.15.orig/src/Makefile smstools3-3.1.15/src/Makefile --- smstools3-3.1.15.orig/src/Makefile 2010-09-21 13:29:14.000000000 +0200 @@ -15,15 +17,15 @@ diff -durN smstools3-3.1.15.orig/src/Makefile smstools3-3.1.15/src/Makefile all: smsd --smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o +-smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o charshift.o - ifneq (,$(findstring SOLARIS,$(CFLAGS))) ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) - override LFLAGS += -lsocket -lnsl + override LFLAGS += -lsocket -lnsl endif endif -+smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o ++smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o charshift.o ifneq (,$(findstring NOSTATS,$(CFLAGS))) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) else diff --git a/buildroot/package/smstools3/0002-fix-build-with-gcc-10.x.patch b/buildroot/package/smstools3/0002-fix-build-with-gcc-10.x.patch new file mode 100644 index 000000000..3242c1406 --- /dev/null +++ b/buildroot/package/smstools3/0002-fix-build-with-gcc-10.x.patch @@ -0,0 +1,753 @@ +Description: fix of FTBFS with gcc10 +Author: Thorsten Alteholz + +Fetch from: + +Signed-off-by: Michael Fischer + +Index: smstools/src/smsd_cfg.h +=================================================================== +--- smstools.orig/src/smsd_cfg.h 2020-08-05 19:02:50.536596441 +0000 ++++ smstools/src/smsd_cfg.h 2020-08-05 19:33:22.915005150 +0000 +@@ -126,17 +126,17 @@ + #define ALPHABET_UNKNOWN 4 + #define ALPHABET_DEFAULT 0 + +-char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. +-int process_id; // -1 for main task, all modems have numbers starting with 0. ++extern char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. ++extern int process_id; // -1 for main task, all modems have numbers starting with 0. + // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS. + +-time_t process_start_time; ++extern time_t process_start_time; + +-int modem_handle; // Handle for modem. ++extern int modem_handle; // Handle for modem. + +-int put_command_timeouts; +-unsigned long long put_command_sent; // 3.1.16beta. +-char tmpdir[PATH_MAX]; // 3.1.16beta. ++extern int put_command_timeouts; ++extern unsigned long long put_command_sent; // 3.1.16beta. ++extern char tmpdir[PATH_MAX]; // 3.1.16beta. + + typedef struct + { +@@ -284,204 +284,204 @@ + + // NOTE for regular run intervals: effective value is at least delaytime. + +-char configfile[PATH_MAX]; // Path to config file +-char d_spool[PATH_MAX]; // Spool directory +-char d_failed[PATH_MAX]; // Failed spool directory +-char d_failed_copy[PATH_MAX]; // 3.1.17. +-char d_incoming[PATH_MAX]; // Incoming spool directory +-char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. +-char d_report[PATH_MAX]; // Incoming report spool directory +-char d_report_copy[PATH_MAX]; // 3.1.17. +-char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory +-char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. +-char d_sent[PATH_MAX]; // Sent spool directory +-char d_sent_copy[PATH_MAX]; // 3.1.17. +-char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) +-char eventhandler[PATH_MAX]; // Global event handler program or script +-char alarmhandler[PATH_MAX]; // Global alarm handler program or script +-char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. +-int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. +-char logfile[PATH_MAX]; // Name or Handle of Log File +-int loglevel; // Log Level (9=highest). Verbosity of log file. +-_queue queues[NUMBER_OF_MODEMS]; // Queues +-_device devices[NUMBER_OF_MODEMS]; // Modem devices +-int delaytime; // sleep-time after workless +-int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. +-int blocktime; // sleep-time after multiple errors +-int blockafter; // Block modem after n errors +-int errorsleeptime; // sleep-time after each error +-int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH +-int receive_before_send; // if 1 smsd tries to receive one message before sending +-int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all +-int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all +-int validity_period; // Validity period for messages. +-int decode_unicode_text; // 1 if unicode text is decoded internally. +-int internal_combine; // 1 if multipart message is combined internally. +-int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. +-int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. +-int store_original_filename; // 1 if an original filename is saved to message file when it's moved from +- // outgoing directory to spooler. Works together with keep_filename. +-int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. +-char regular_run[PATH_MAX]; // Script/program which is run regularly. +-int regular_run_interval; // Number of seconds between running a regular_run script/progdam. +-char admin_to[SIZE_TO]; // Destination number for administrative messages. +-int filename_preview; // Number of chars of message text to concatenate to filename. +-int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. +-int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. +-int log_charconv; // 1 if character set conversion is logged. +-int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. +-int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. +-int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. +-char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. +-int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes +-int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. +-int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. +-int ic_purge_interval; // +-char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh +-char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. +-int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. +-int status_signal_quality; // 1 = signal quality is written to status file. +-int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. +-int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. +-int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. +-int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. +-int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. ++extern char configfile[PATH_MAX]; // Path to config file ++extern char d_spool[PATH_MAX]; // Spool directory ++extern char d_failed[PATH_MAX]; // Failed spool directory ++extern char d_failed_copy[PATH_MAX]; // 3.1.17. ++extern char d_incoming[PATH_MAX]; // Incoming spool directory ++extern char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. ++extern char d_report[PATH_MAX]; // Incoming report spool directory ++extern char d_report_copy[PATH_MAX]; // 3.1.17. ++extern char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory ++extern char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. ++extern char d_sent[PATH_MAX]; // Sent spool directory ++extern char d_sent_copy[PATH_MAX]; // 3.1.17. ++extern char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) ++extern char eventhandler[PATH_MAX]; // Global event handler program or script ++extern char alarmhandler[PATH_MAX]; // Global alarm handler program or script ++extern char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. ++extern int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. ++extern char logfile[PATH_MAX]; // Name or Handle of Log File ++extern int loglevel; // Log Level (9=highest). Verbosity of log file. ++extern _queue queues[NUMBER_OF_MODEMS]; // Queues ++extern _device devices[NUMBER_OF_MODEMS]; // Modem devices ++extern int delaytime; // sleep-time after workless ++extern int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. ++extern int blocktime; // sleep-time after multiple errors ++extern int blockafter; // Block modem after n errors ++extern int errorsleeptime; // sleep-time after each error ++extern int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH ++extern int receive_before_send; // if 1 smsd tries to receive one message before sending ++extern int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all ++extern int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all ++extern int validity_period; // Validity period for messages. ++extern int decode_unicode_text; // 1 if unicode text is decoded internally. ++extern int internal_combine; // 1 if multipart message is combined internally. ++extern int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. ++extern int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. ++extern int store_original_filename; // 1 if an original filename is saved to message file when it's moved from ++// outgoing directory to spooler. Works together with keep_filename. ++extern int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. ++extern char regular_run[PATH_MAX]; // Script/program which is run regularly. ++extern int regular_run_interval; // Number of seconds between running a regular_run script/progdam. ++extern char admin_to[SIZE_TO]; // Destination number for administrative messages. ++extern int filename_preview; // Number of chars of message text to concatenate to filename. ++extern int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. ++extern int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. ++extern int log_charconv; // 1 if character set conversion is logged. ++extern int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. ++extern int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. ++extern int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. ++extern char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. ++extern int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes ++extern int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. ++extern int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. ++extern int ic_purge_interval; // ++extern char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh ++extern char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. ++extern int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. ++extern int status_signal_quality; // 1 = signal quality is written to status file. ++extern int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. ++extern int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. ++extern int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. ++extern int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. ++extern int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. + + // 3.1.5: +-int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. ++extern int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. + + // 3.1.5: +-int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. ++extern int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. + + // 3.1.7: +-int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. ++extern int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. + + // 3.1.7: +-mode_t conf_umask; // File mode creation mask for smsd and modem processes. ++extern mode_t conf_umask; // File mode creation mask for smsd and modem processes. + + // 3.1.7: +-int trim_text; // 1 = trailing whitespaces are removed from text: ++extern int trim_text; // 1 = trailing whitespaces are removed from text: + + // 3.1.7: +-int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. ++extern int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. + + // 3.1.7: +-int log_unmodified; ++extern int log_unmodified; + + // 3.1.7: +-char suspend_filename[PATH_MAX]; ++extern char suspend_filename[PATH_MAX]; + + // 3.1.9: +-int spool_directory_order; ++extern int spool_directory_order; + + // 3.1.9: 1 if read_from_modem is logged. +-int log_read_from_modem; ++extern int log_read_from_modem; + + // 3.1.16beta2: log_read_timing for performance tuning. +-int log_read_timing; ++extern int log_read_timing; + + // 3.1.16beta: +-int log_response_time; ++extern int log_response_time; + + // 3.1.16beta2: +-int default_alphabet; ++extern int default_alphabet; + + // 3.1.17: Child process for the mainprocess: +-char mainprocess_child[PATH_MAX]; +-char mainprocess_child_args[PATH_MAX]; ++extern char mainprocess_child[PATH_MAX]; ++extern char mainprocess_child_args[PATH_MAX]; + + // 3.1.17: Notifier for the mainprocess: +-int mainprocess_notifier; ++extern int mainprocess_notifier; + + // 3.1.17: If *_copy was made, evenhandler can use it instead of original file: +-int eventhandler_use_copy; ++extern int eventhandler_use_copy; + + // 3.1.17: This defines how long to sleep while looping: +-int sleeptime_mainprocess; ++extern int sleeptime_mainprocess; + + // 3.1.17: Defines how often PID is checked to detect if another smsd is running: +-int check_pid_interval; ++extern int check_pid_interval; + + // 3.1.18: start script/program for mainprocess: +-char mainprocess_start[PATH_MAX]; +-char mainprocess_start_args[PATH_MAX]; ++extern char mainprocess_start[PATH_MAX]; ++extern char mainprocess_start_args[PATH_MAX]; + +-int message_count; // Counter for sent messages. Multipart message is one message. ++extern int message_count; // Counter for sent messages. Multipart message is one message. + +-volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. +-volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. ++extern volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. ++extern volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. + +-char username[65]; // user and group name which are used to run. +-char groupname[65]; // (max length is just a guess) ++extern char username[65]; // user and group name which are used to run. ++extern char groupname[65]; // (max length is just a guess) + +-char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. +-char pidfile[PATH_MAX]; // File where a process id is stored. ++extern char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. ++extern char pidfile[PATH_MAX]; // File where a process id is stored. + + // Command line arguments: +-char arg_username[65]; +-char arg_groupname[65]; +-char arg_infofile[PATH_MAX]; +-char arg_pidfile[PATH_MAX]; +-char arg_logfile[PATH_MAX]; +-int arg_terminal; ++extern char arg_username[65]; ++extern char arg_groupname[65]; ++extern char arg_infofile[PATH_MAX]; ++extern char arg_pidfile[PATH_MAX]; ++extern char arg_logfile[PATH_MAX]; ++extern int arg_terminal; + // 3.1.7: +-char arg_7bit_packed[512]; +-int do_encode_decode_arg_7bit_packed; ++extern char arg_7bit_packed[512]; ++extern int do_encode_decode_arg_7bit_packed; + +-int terminal; // 1 if smsd is communicating with terminal. +-pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. +-char run_info[PATH_MAX]; // Information about external script/program execution. ++extern int terminal; // 1 if smsd is communicating with terminal. ++extern pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. ++extern char run_info[PATH_MAX]; // Information about external script/program execution. + +-char communicate[32]; // Device name for terminal communication mode. ++extern char communicate[32]; // Device name for terminal communication mode. + +-char international_prefixes[PATH_MAX +1]; +-char national_prefixes[PATH_MAX +1]; ++extern char international_prefixes[PATH_MAX +1]; ++extern char national_prefixes[PATH_MAX +1]; + + // Storage for startup errors: +-char *startup_err_str; +-int startup_err_count; ++extern char *startup_err_str; ++extern int startup_err_count; + + // Storage for PDU's: +-char *incoming_pdu_store; +-char *outgoing_pdu_store; +-char *routed_pdu_store; ++extern char *incoming_pdu_store; ++extern char *outgoing_pdu_store; ++extern char *routed_pdu_store; + + // Storage for getfile errors: +-char *getfile_err_store; ++extern char *getfile_err_store; + + // Text buffer for error messages: +-char tb[SIZE_TB]; ++extern char tb[SIZE_TB]; + + // Buffer for SIM memory checking: +-char *check_memory_buffer; +-size_t check_memory_buffer_size; ++extern char *check_memory_buffer; ++extern size_t check_memory_buffer_size; + +-int os_cygwin; // 1 if we are on Cygwin. ++extern int os_cygwin; // 1 if we are on Cygwin. + +-char language_file[PATH_MAX]; // File name of translated headers. +-char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. +-char no_chars[SIZE_HEADER]; // See details inside read_translation() function. +-char yes_word[SIZE_HEADER]; // "yes" printed as an output. +-char no_word[SIZE_HEADER]; // "no" +-char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). +-char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps +-char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename +-int translate_incoming; // 0 if incoming message headers are NOT transtaled. ++extern char language_file[PATH_MAX]; // File name of translated headers. ++extern char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. ++extern char no_chars[SIZE_HEADER]; // See details inside read_translation() function. ++extern char yes_word[SIZE_HEADER]; // "yes" printed as an output. ++extern char no_word[SIZE_HEADER]; // "no" ++extern char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). ++extern char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps ++extern char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename ++extern int translate_incoming; // 0 if incoming message headers are NOT transtaled. + + // 3.1.14: +-int logtime_us; +-int logtime_ms; ++extern int logtime_us; ++extern int logtime_ms; + + // 3.1.14: +-int shell_test; ++extern int shell_test; + + // Next two are for debugging purposes: +-int enable_smsd_debug; +-char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. ++extern int enable_smsd_debug; ++extern char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. + + // 3.1.20: Alt keys in communication mode: + #define COMMUNICATE_A_KEY_COUNT 10 +-char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; ++extern char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; + + /* initialize all variable with default values */ + +Index: smstools/src/smsd_cfg.c +=================================================================== +--- smstools.orig/src/smsd_cfg.c 2020-07-27 19:00:41.616207603 +0000 ++++ smstools/src/smsd_cfg.c 2020-08-05 19:17:41.595712888 +0000 +@@ -38,6 +38,221 @@ + #include "modeminit.h" + #include "charshift.h" + ++ ++/* global variables */ ++char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. ++int process_id; // -1 for main task, all modems have numbers starting with 0. ++ // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS. ++ ++time_t process_start_time; ++ ++int modem_handle; // Handle for modem. ++ ++int put_command_timeouts; ++unsigned long long put_command_sent; // 3.1.16beta. ++char tmpdir[PATH_MAX]; // 3.1.16beta. ++ ++// NOTE for regular run intervals: effective value is at least delaytime. ++ ++char configfile[PATH_MAX]; // Path to config file ++char d_spool[PATH_MAX]; // Spool directory ++char d_failed[PATH_MAX]; // Failed spool directory ++char d_failed_copy[PATH_MAX]; // 3.1.17. ++char d_incoming[PATH_MAX]; // Incoming spool directory ++char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. ++char d_report[PATH_MAX]; // Incoming report spool directory ++char d_report_copy[PATH_MAX]; // 3.1.17. ++char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory ++char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. ++char d_sent[PATH_MAX]; // Sent spool directory ++char d_sent_copy[PATH_MAX]; // 3.1.17. ++char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) ++char eventhandler[PATH_MAX]; // Global event handler program or script ++char alarmhandler[PATH_MAX]; // Global alarm handler program or script ++char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. ++int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. ++char logfile[PATH_MAX]; // Name or Handle of Log File ++int loglevel; // Log Level (9=highest). Verbosity of log file. ++_queue queues[NUMBER_OF_MODEMS]; // Queues ++_device devices[NUMBER_OF_MODEMS]; // Modem devices ++int delaytime; // sleep-time after workless ++int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. ++int blocktime; // sleep-time after multiple errors ++int blockafter; // Block modem after n errors ++int errorsleeptime; // sleep-time after each error ++int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH ++int receive_before_send; // if 1 smsd tries to receive one message before sending ++int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all ++int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all ++int validity_period; // Validity period for messages. ++int decode_unicode_text; // 1 if unicode text is decoded internally. ++int internal_combine; // 1 if multipart message is combined internally. ++int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. ++int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. ++int store_original_filename; // 1 if an original filename is saved to message file when it's moved from ++ // outgoing directory to spooler. Works together with keep_filename. ++int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. ++char regular_run[PATH_MAX]; // Script/program which is run regularly. ++int regular_run_interval; // Number of seconds between running a regular_run script/progdam. ++char admin_to[SIZE_TO]; // Destination number for administrative messages. ++int filename_preview; // Number of chars of message text to concatenate to filename. ++int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. ++int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. ++int log_charconv; // 1 if character set conversion is logged. ++int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. ++int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. ++int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. ++char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. ++int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes ++int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. ++int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. ++int ic_purge_interval; // ++char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh ++char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. ++int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. ++int status_signal_quality; // 1 = signal quality is written to status file. ++int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. ++int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. ++int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. ++int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. ++int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. ++ ++// 3.1.5: ++int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. ++ ++// 3.1.5: ++int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. ++ ++// 3.1.7: ++int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. ++ ++// 3.1.7: ++mode_t conf_umask; // File mode creation mask for smsd and modem processes. ++ ++// 3.1.7: ++int trim_text; // 1 = trailing whitespaces are removed from text: ++ ++// 3.1.7: ++int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. ++ ++// 3.1.7: ++int log_unmodified; ++ ++// 3.1.7: ++char suspend_filename[PATH_MAX]; ++ ++// 3.1.9: ++int spool_directory_order; ++ ++// 3.1.9: 1 if read_from_modem is logged. ++int log_read_from_modem; ++ ++// 3.1.16beta2: log_read_timing for performance tuning. ++int log_read_timing; ++ ++// 3.1.16beta: ++int log_response_time; ++ ++// 3.1.16beta2: ++int default_alphabet; ++ ++// 3.1.17: Child process for the mainprocess: ++char mainprocess_child[PATH_MAX]; ++char mainprocess_child_args[PATH_MAX]; ++ ++// 3.1.17: Notifier for the mainprocess: ++int mainprocess_notifier; ++ ++// 3.1.17: If *_copy was made, evenhandler can use it instead of original file: ++int eventhandler_use_copy; ++ ++// 3.1.17: This defines how long to sleep while looping: ++int sleeptime_mainprocess; ++ ++// 3.1.17: Defines how often PID is checked to detect if another smsd is running: ++int check_pid_interval; ++ ++// 3.1.18: start script/program for mainprocess: ++char mainprocess_start[PATH_MAX]; ++char mainprocess_start_args[PATH_MAX]; ++ ++int message_count; // Counter for sent messages. Multipart message is one message. ++ ++volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. ++volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. ++ ++char username[65]; // user and group name which are used to run. ++char groupname[65]; // (max length is just a guess) ++ ++char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. ++char pidfile[PATH_MAX]; // File where a process id is stored. ++ ++// Command line arguments: ++char arg_username[65]; ++char arg_groupname[65]; ++char arg_infofile[PATH_MAX]; ++char arg_pidfile[PATH_MAX]; ++char arg_logfile[PATH_MAX]; ++int arg_terminal; ++// 3.1.7: ++char arg_7bit_packed[512]; ++int do_encode_decode_arg_7bit_packed; ++ ++int terminal; // 1 if smsd is communicating with terminal. ++pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. ++char run_info[PATH_MAX]; // Information about external script/program execution. ++ ++char communicate[32]; // Device name for terminal communication mode. ++ ++char international_prefixes[PATH_MAX +1]; ++char national_prefixes[PATH_MAX +1]; ++ ++// Storage for startup errors: ++char *startup_err_str; ++int startup_err_count; ++ ++// Storage for PDU's: ++char *incoming_pdu_store; ++char *outgoing_pdu_store; ++char *routed_pdu_store; ++ ++// Storage for getfile errors: ++char *getfile_err_store; ++ ++// Text buffer for error messages: ++char tb[SIZE_TB]; ++ ++// Buffer for SIM memory checking: ++char *check_memory_buffer; ++size_t check_memory_buffer_size; ++ ++int os_cygwin; // 1 if we are on Cygwin. ++ ++char language_file[PATH_MAX]; // File name of translated headers. ++char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. ++char no_chars[SIZE_HEADER]; // See details inside read_translation() function. ++char yes_word[SIZE_HEADER]; // "yes" printed as an output. ++char no_word[SIZE_HEADER]; // "no" ++char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). ++char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps ++char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename ++int translate_incoming; // 0 if incoming message headers are NOT transtaled. ++ ++// 3.1.14: ++int logtime_us; ++int logtime_ms; ++ ++// 3.1.14: ++int shell_test; ++ ++// Next two are for debugging purposes: ++int enable_smsd_debug; ++char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. ++ ++// 3.1.20: Alt keys in communication mode: ++#define COMMUNICATE_A_KEY_COUNT 10 ++char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; ++ + char *msg_dir = "%s directory %s cannot be opened."; + char *msg_file = "%s directory %s is not writable."; + char *msg_not_executable = "is not executable for smsd."; +Index: smstools/src/logging.c +=================================================================== +--- smstools.orig/src/logging.c 2020-07-27 19:00:41.612207583 +0000 ++++ smstools/src/logging.c 2020-08-05 19:27:38.373800111 +0000 +@@ -25,6 +25,16 @@ + #include "smsd_cfg.h" + #include "stats.h" + ++ ++// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c: ++char logch_buffer[8192]; ++ ++char prch(char ch); ++ ++// 3.1.16beta: changed type: ++//int trouble_logging_started; ++time_t trouble_logging_started; ++ + int Filehandle = -1; + int Level; + int SavedLevel; +Index: smstools/src/logging.h +=================================================================== +--- smstools.orig/src/logging.h 2020-07-27 19:00:41.612207583 +0000 ++++ smstools/src/logging.h 2020-08-05 19:27:52.077848035 +0000 +@@ -18,7 +18,7 @@ + #include + + // 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c: +-char logch_buffer[8192]; ++extern char logch_buffer[8192]; + + #ifdef __GNUC__ + void logch(char* format, ...) __attribute__ ((format(printf, 1, 2))); +@@ -26,11 +26,11 @@ + void logch(char* format, ...); + #endif + +-char prch(char ch); ++extern char prch(char ch); + + // 3.1.16beta: changed type: + //int trouble_logging_started; +-time_t trouble_logging_started; ++extern time_t trouble_logging_started; + + int change_loglevel(int new_level); + void restore_loglevel(); +Index: smstools/src/stats.c +=================================================================== +--- smstools.orig/src/stats.c 2020-07-27 19:00:41.616207603 +0000 ++++ smstools/src/stats.c 2020-08-05 19:28:58.094078936 +0000 +@@ -29,6 +29,20 @@ + #include + #endif + ++ ++_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) ++int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue ++time_t start_time; // Start time of smsd, allows statistic functions ++int printstatus; // if 1 smsd outputs status on stdout ++time_t last_stats; // time when the last stats file was created ++char d_stats[PATH_MAX]; // path to statistic files ++int stats_interval; // time between statistic files in seconds. ++int stats_no_zeroes; // Suppress files that contain only zeroes ++int status_interval; // time between updating status file in seconds ++ ++char *shared_buffer; ++ ++ + char newstatus[NUMBER_OF_MODEMS +1] = {0}; + char oldstatus[NUMBER_OF_MODEMS +1] = {0}; + +Index: smstools/src/stats.h +=================================================================== +--- smstools.orig/src/stats.h 2020-07-27 19:00:41.616207603 +0000 ++++ smstools/src/stats.h 2020-08-05 19:29:14.750137182 +0000 +@@ -33,17 +33,17 @@ + int ber; + } _stats; + +-_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) +-int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue +-time_t start_time; // Start time of smsd, allows statistic functions +-int printstatus; // if 1 smsd outputs status on stdout +-time_t last_stats; // time when the last stats file was created +-char d_stats[PATH_MAX]; // path to statistic files +-int stats_interval; // time between statistic files in seconds. +-int stats_no_zeroes; // Suppress files that contain only zeroes +-int status_interval; // time between updating status file in seconds ++extern _stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) ++extern int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue ++extern time_t start_time; // Start time of smsd, allows statistic functions ++extern int printstatus; // if 1 smsd outputs status on stdout ++extern time_t last_stats; // time when the last stats file was created ++extern char d_stats[PATH_MAX]; // path to statistic files ++extern int stats_interval; // time between statistic files in seconds. ++extern int stats_no_zeroes; // Suppress files that contain only zeroes ++extern int status_interval; // time between updating status file in seconds + +-char *shared_buffer; ++extern char *shared_buffer; + + /* Creates shared memory variables for statistic data */ + +Index: smstools/src/blacklist.c +=================================================================== +--- smstools.orig/src/blacklist.c 2020-07-27 19:00:41.612207583 +0000 ++++ smstools/src/blacklist.c 2020-08-05 19:34:13.903183463 +0000 +@@ -23,6 +23,8 @@ + #include "alarm.h" + #include "smsd_cfg.h" + ++char blacklist[256]; // Filename of the black-list ++ + int inblacklist(char* msisdn) + { + FILE* file; +Index: smstools/src/blacklist.h +=================================================================== +--- smstools.orig/src/blacklist.h 2020-07-27 19:00:41.612207583 +0000 ++++ smstools/src/blacklist.h 2020-08-05 19:34:04.903151994 +0000 +@@ -15,7 +15,7 @@ + #ifndef BLACK_H + #define BLACK_H + +-char blacklist[256]; // Filename of the black-list ++extern char blacklist[256]; // Filename of the black-list + + int inblacklist(char* msisdn); + +Index: smstools/src/whitelist.c +=================================================================== +--- smstools.orig/src/whitelist.c 2020-07-27 19:00:41.616207603 +0000 ++++ smstools/src/whitelist.c 2020-08-05 19:39:23.436266057 +0000 +@@ -23,6 +23,8 @@ + #include "alarm.h" + #include "smsd_cfg.h" + ++char whitelist[256]; // Filename of the white-list ++ + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename) + { +Index: smstools/src/whitelist.h +=================================================================== +--- smstools.orig/src/whitelist.h 2020-07-27 19:00:41.616207603 +0000 ++++ smstools/src/whitelist.h 2020-08-05 19:34:29.959239624 +0000 +@@ -15,7 +15,7 @@ + #ifndef WHITE_H + #define WHITE_H + +-char whitelist[256]; // Filename of the white-list ++extern char whitelist[256]; // Filename of the white-list + + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename); diff --git a/buildroot/package/smstools3/smstools3.hash b/buildroot/package/smstools3/smstools3.hash index 9eb73e938..27eda2af9 100644 --- a/buildroot/package/smstools3/smstools3.hash +++ b/buildroot/package/smstools3/smstools3.hash @@ -1,4 +1,7 @@ -# Locally calculated -sha256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 smstools3-3.1.15.tar.gz -sha256 61ae4d83c30236cc7df40b1ccbbe6be07d334f9579b8d0facecc34334fe15b61 doc/license.html +# From http://smstools3.kekekasvi.com/packages/ +md5 6a9f038fb38a49cc3a4f8f14a88fb8af smstools-3.1.21.tar.gz +sha256 a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084 smstools3-3.1.21.tar.gz + +# Hash for license files +sha256 884d8f0377259f291432f4fa31d5a9720eefa0e0d797652ae686b6325a434624 doc/license.html sha256 786b4da4dd900cad87a7dc17769458607bdeae575d62e6e98ad7144e9225f8d3 LICENSE diff --git a/buildroot/package/smstools3/smstools3.mk b/buildroot/package/smstools3/smstools3.mk index 2dfd11b8c..87d189baa 100644 --- a/buildroot/package/smstools3/smstools3.mk +++ b/buildroot/package/smstools3/smstools3.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMSTOOLS3_VERSION = 3.1.15 +SMSTOOLS3_VERSION = 3.1.21 SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages SMSTOOLS3_LICENSE = GPL-2.0+ SMSTOOLS3_LICENSE_FILES = doc/license.html LICENSE diff --git a/buildroot/package/snappy/snappy.hash b/buildroot/package/snappy/snappy.hash index e9ac4324c..c08c5b7fe 100644 --- a/buildroot/package/snappy/snappy.hash +++ b/buildroot/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 snappy-1.1.7.tar.gz +sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/buildroot/package/snappy/snappy.mk b/buildroot/package/snappy/snappy.mk index 74d398de8..b764a0e4d 100644 --- a/buildroot/package/snappy/snappy.mk +++ b/buildroot/package/snappy/snappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.7 +SNAPPY_VERSION = 1.1.8 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING diff --git a/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch b/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch deleted file mode 100644 index ec8a0f5dc..000000000 --- a/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 604f6d0ce2ec42ac494d76c95e68850ea6e7da8f Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper -Date: Sun, 4 Nov 2018 16:58:00 +0100 -Subject: [PATCH] capture: fix typo in FILE object - -FILE *fstdin is defined, but when calling freopen() stdin is used instead -of fstdin. - -This causes the compile to fail: - - CC sngrep-capture.o -capture.c: In function 'capture_offline': -capture.c:194:21: error: assignment of read-only variable 'stdin' - if (!(stdin = freopen("/dev/tty", "r", stdin))) { - ^ -make[5]: *** [Makefile:519: sngrep-capture.o] Error 1 - -This commit fixes the typo. - -Signed-off-by: Sebastian Kemper -Signed-off-by: Baruch Siach ---- -Upstream status: commit 604f6d0ce2ec - - src/capture.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/capture.c b/src/capture.c -index 911c35f43a35..a799413e2b0e 100644 ---- a/src/capture.c -+++ b/src/capture.c -@@ -191,7 +191,7 @@ capture_offline(const char *infile, const char *outfile) - - // Reopen tty for ncurses after pcap have used stdin - if (!strncmp(infile, "/dev/stdin", 10)) { -- if (!(stdin = freopen("/dev/tty", "r", stdin))) { -+ if (!(fstdin = freopen("/dev/tty", "r", stdin))) { - fprintf(stderr, "Failed to reopen tty while using stdin for capture."); - return 1; - } --- -2.19.2 - diff --git a/buildroot/package/sngrep/sngrep.hash b/buildroot/package/sngrep/sngrep.hash index a751d9539..33fa91ef5 100644 --- a/buildroot/package/sngrep/sngrep.hash +++ b/buildroot/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz.md5sum -md5 094e76786b118258bac69e1514aac826 sngrep-1.4.6.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz.md5sum +md5 78fe753e24f36ddaf627bc2b734f45ba sngrep-1.4.7.tar.gz # Locally computed -sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-1.4.6.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +sha256 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b sngrep-1.4.7.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/sngrep/sngrep.mk b/buildroot/package/sngrep/sngrep.mk index 1cb3814c9..841a7bb99 100644 --- a/buildroot/package/sngrep/sngrep.mk +++ b/buildroot/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = 1.4.6 +SNGREP_VERSION = 1.4.7 SNGREP_SITE = $(call github,irontec,sngrep,v$(SNGREP_VERSION)) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/snmppp/Config.in b/buildroot/package/snmppp/Config.in index 8d284673b..de1a09ca4 100644 --- a/buildroot/package/snmppp/Config.in +++ b/buildroot/package/snmppp/Config.in @@ -21,10 +21,14 @@ config BR2_PACKAGE_SNMPPP_LOGGING config BR2_PACKAGE_SNMPPP_SNMPV3 bool "enable SNMPv3" default y + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 select BR2_PACKAGE_OPENSSL help Enable optional support for SNMP++. This selects OpenSSL. +comment "SNMPv3 needs a toolchain w/ gcc >= 4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "snmp++ needs a toolchain w/ threads, C++, dynamic library" diff --git a/buildroot/package/snmppp/snmppp.hash b/buildroot/package/snmppp/snmppp.hash index bc54d8c6b..2dcf836fc 100644 --- a/buildroot/package/snmppp/snmppp.hash +++ b/buildroot/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 06a2af44b2976b61667756e3f74604820fce0ef8bfc7f31280308f1eeb7633f3 snmp++-3.3.11a.tar.gz -sha256 5538f9efc2559a35025df5d6bf19dc85c2bfe54dca6e8409d5690d4f7c69166a src/v3.cpp +sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz +sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp diff --git a/buildroot/package/snmppp/snmppp.mk b/buildroot/package/snmppp/snmppp.mk index 0e862faa4..601e28e20 100644 --- a/buildroot/package/snmppp/snmppp.mk +++ b/buildroot/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.3.11a +SNMPPP_VERSION = 3.4.2 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf @@ -14,6 +14,7 @@ SNMPPP_LICENSE = SNMP++ SNMPPP_LICENSE_FILES = src/v3.cpp ifeq ($(BR2_PACKAGE_SNMPPP_SNMPV3),y) +SNMPPP_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" SNMPPP_CONF_OPTS += --enable-snmpv3 SNMPPP_DEPENDENCIES += openssl else diff --git a/buildroot/package/snort/snort.hash b/buildroot/package/snort/snort.hash index 7364df133..733cf605a 100644 --- a/buildroot/package/snort/snort.hash +++ b/buildroot/package/snort/snort.hash @@ -1,6 +1,9 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ec148a494cde9095fb590a51efa306de snort-2.9.16.1.tar.gz + # Locally computed: -sha256 2cccfc1d1a706586cd47ae9f085a7d5e4e36390b8e9c28cd2020b4b5b587f6c3 snort-2.9.15.1.tar.gz +sha256 e3ac45a1a3cc2c997d52d19cd92f1adf5641c3a919387adab47a4d13a9dc9f8e snort-2.9.16.1.tar.gz # Hash for license files: -sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE -sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING +sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE +sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/buildroot/package/snort/snort.mk b/buildroot/package/snort/snort.mk index 0f1d6b13d..794bd1f67 100644 --- a/buildroot/package/snort/snort.mk +++ b/buildroot/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.15.1 +SNORT_VERSION = 2.9.16.1 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING diff --git a/buildroot/package/socketcand/0001-Fix-GCC10-build-failure.patch b/buildroot/package/socketcand/0001-Fix-GCC10-build-failure.patch new file mode 100644 index 000000000..057cd4065 --- /dev/null +++ b/buildroot/package/socketcand/0001-Fix-GCC10-build-failure.patch @@ -0,0 +1,113 @@ +From ae0af080058a576d62c72ffc011d644d0b4dcb98 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Tue, 7 Jul 2020 19:39:41 +0200 +Subject: [PATCH] Fix GCC10 build failure (#17) + +GCC10 breaks on multiple definitions: + +ld: /tmp/ccFiGYO7.o:(.bss+0x114): multiple definition of `tv'; /tmp/cc7f6J5h.o:(.bss+0x80): first defined here + +Change the scope of the related variables. + +Signed-off-by: Yegor Yefremov + +[Retrieved from: +https://github.com/linux-can/socketcand/commit/ae0af080058a576d62c72ffc011d644d0b4dcb98] +Signed-off-by: Fabrice Fontaine +--- + socketcand.c | 3 ++- + state_bcm.c | 4 ++-- + state_isotp.c | 2 +- + state_raw.c | 2 +- + 4 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/socketcand.c b/socketcand.c +index 8d84754..6125be9 100644 +--- a/socketcand.c ++++ b/socketcand.c +@@ -102,7 +102,6 @@ socklen_t unaddrlen; + struct sockaddr_un remote_unaddr; + socklen_t remote_unaddrlen; + char* interface_string; +-struct ifreq ifr, ifr_brd; + + int state_changed(char *buf, int current_state) + { +@@ -666,6 +665,8 @@ int receive_command(int socket, char *buffer) { + } + + void determine_adress() { ++ struct ifreq ifr, ifr_brd; ++ + int probe_socket = socket(AF_INET, SOCK_DGRAM, 0); + + if(probe_socket < 0) { +diff --git a/state_bcm.c b/state_bcm.c +index cfaa8ed..05a5f7c 100644 +--- a/state_bcm.c ++++ b/state_bcm.c +@@ -28,8 +28,6 @@ + #define RXLEN 128 + + int sc = -1; +-fd_set readfds; +-struct timeval tv; + + void state_bcm() { + int i, j, ret; +@@ -38,6 +36,7 @@ void state_bcm() { + struct ifreq ifr; + char rxmsg[RXLEN]; + char buf[MAXLEN]; ++ fd_set readfds; + + struct { + struct bcm_msg_head msg_head; +@@ -91,6 +90,7 @@ void state_bcm() { + } + + if (FD_ISSET(sc, &readfds)) { ++ struct timeval tv; + + ret = recvfrom(sc, &msg, sizeof(msg), 0, + (struct sockaddr*)&caddr, &caddrlen); +diff --git a/state_isotp.c b/state_isotp.c +index 5c671f9..e1b944b 100644 +--- a/state_isotp.c ++++ b/state_isotp.c +@@ -25,7 +25,6 @@ + #include + + int si = -1; +-fd_set readfds; + + void state_isotp() { + int i, items, ret; +@@ -39,6 +38,7 @@ void state_isotp() { + char buf[MAXLEN]; /* inet commands to can */ + unsigned char isobuf[ISOTPLEN+1]; /* binary buffer for isotp socket */ + unsigned char tmp; ++ fd_set readfds; + + while(previous_state != STATE_ISOTP) { + +diff --git a/state_raw.c b/state_raw.c +index e83e6ec..2c49975 100644 +--- a/state_raw.c ++++ b/state_raw.c +@@ -25,7 +25,6 @@ + int raw_socket; + struct ifreq ifr; + struct sockaddr_can addr; +-fd_set readfds; + struct msghdr msg; + struct can_frame frame; + struct iovec iov; +@@ -36,6 +35,7 @@ struct cmsghdr *cmsg; + void state_raw() { + char buf[MAXLEN]; + int i, ret, items; ++ fd_set readfds; + + if(previous_state != STATE_RAW) { + diff --git a/buildroot/package/socketcand/socketcand.hash b/buildroot/package/socketcand/socketcand.hash index 6ee0c314a..713939897 100644 --- a/buildroot/package/socketcand/socketcand.hash +++ b/buildroot/package/socketcand/socketcand.hash @@ -1,3 +1,3 @@ # Locally computed sha256 3c5cc7af4ff707ac344e62d2e37a74b59aeccd14b88e837cc142c52b69d64a39 socketcand-69e2201222f015a1abe7a58ecf61325012cd91b1.tar.gz -sha256 b32028a4080be38208ee951c6e8afc6f3bfb3d5496559b260ab0dce9472740f6 socketcand.c +sha256 18bda0db4e3c56cefdb1b9b01b7eada7764c0746f6321378c30d78f5ee81cfee socketcand.c diff --git a/buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch b/buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch index 2d5234861..57c0bfe25 100644 --- a/buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch +++ b/buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch @@ -4,6 +4,10 @@ Date: Thu, 24 Mar 2011 14:45:21 +0200 Subject: [PATCH] soa_tag.h: reintroduce soatag_local_sdp_str_ref Thanks to Erik Habicht for spotting it + +Signed-off-by: Bernd Kuhls +[rebased for sofia-sip 1.13.1-d10a3d268c, patch sent upstream + https://github.com/freeswitch/sofia-sip/pull/23] --- libsofia-sip-ua/soa/sofia-sip/soa_tag.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) @@ -12,7 +16,7 @@ diff --git a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h b/libsofia-sip-ua/soa/sofia index 723ca02..d9448d6 100644 --- a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h +++ b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -@@ -118,7 +118,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; +@@ -130,7 +130,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str; #define SOATAG_LOCAL_SDP_STR_REF(x) \ soatag_local_sdp_str_ref, tag_str_vr(&(x)) diff --git a/buildroot/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch b/buildroot/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch new file mode 100644 index 000000000..a2cc41284 --- /dev/null +++ b/buildroot/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch @@ -0,0 +1,38 @@ +From d66a2e55daf223737c07c59b1be45a2d91212ef6 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 26 Jul 2020 13:47:16 +0200 +Subject: [PATCH] [sofia-sip] fix s2tcase.c + +Fixes build error with recent libcheck: +https://github.com/freeswitch/sofia-sip/issues/22 + +Signed-off-by: Bernd Kuhls +--- + s2check/s2tcase.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c +index 382aaa3ad7..d67694c2ce 100644 +--- a/s2check/s2tcase.c ++++ b/s2check/s2tcase.c +@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + if (strcmp(*patterns, "*")) { + printf("%s: selected\n", name); + } +- _tcase_add_test(tc, tf, name, signo, 0, start, end); ++ _tcase_add_test(tc, tf, name, signo, start, end); + return; + } + } +@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + if (strcmp(*patterns, "*")) { + printf("%s: selected\n", name); + } +- _tcase_add_test(tc, tf, name, signo, 0, start, end); ++ _tcase_add_test(tc, tf, name, signo, start, end); + return; + } + } +-- +2.27.0 + diff --git a/buildroot/package/sofia-sip/Config.in b/buildroot/package/sofia-sip/Config.in index 24e2148ab..2ad194083 100644 --- a/buildroot/package/sofia-sip/Config.in +++ b/buildroot/package/sofia-sip/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_SOFIA_SIP client software for uses such as VoIP, IM, and many other real-time and person-to-person communication services. - http://sofia-sip.sourceforge.net/ + https://github.com/freeswitch/sofia-sip comment "sofia-sip needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/sofia-sip/sofia-sip.hash b/buildroot/package/sofia-sip/sofia-sip.hash index 6e81ec878..99b315e27 100644 --- a/buildroot/package/sofia-sip/sofia-sip.hash +++ b/buildroot/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz +sha256 4cf0de1aaa1e1737db5a8fe4104021a8e60a148a4534f92b5affdd9782e404aa sofia-sip-1.13.1-d10a3d268c.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/buildroot/package/sofia-sip/sofia-sip.mk b/buildroot/package/sofia-sip/sofia-sip.mk index 831b9ea54..ef1b35fa2 100644 --- a/buildroot/package/sofia-sip/sofia-sip.mk +++ b/buildroot/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.12.11 -SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION) +SOFIA_SIP_VERSION = 1.13.1-d10a3d268c +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ @@ -20,10 +20,14 @@ SOFIA_SIP_CONF_OPTS += --without-glib endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -SOFIA_SIP_CONF_OPTS += --with-openssl +SOFIA_SIP_CONF_OPTS += \ + --enable-nth \ + --with-openssl=pkg-config SOFIA_SIP_DEPENDENCIES += openssl else -SOFIA_SIP_CONF_OPTS += --without-openssl +SOFIA_SIP_CONF_OPTS += \ + --disable-nth \ + --without-openssl endif ifeq ($(BR2_ENABLE_DEBUG),y) diff --git a/buildroot/package/solarus/Config.in b/buildroot/package/solarus/Config.in index 6bed38a6f..b0f4121f6 100644 --- a/buildroot/package/solarus/Config.in +++ b/buildroot/package/solarus/Config.in @@ -1,17 +1,17 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on !BR2_STATIC_LIBS # SDL2 depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM select BR2_PACKAGE_LIBMODPLUG select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1 select BR2_PACKAGE_OPENAL select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2 @@ -25,9 +25,9 @@ config BR2_PACKAGE_SOLARUS http://www.solarus-games.org https://github.com/solarus-games/solarus -comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1 +comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1" + depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/solarus/solarus.hash b/buildroot/package/solarus/solarus.hash index 3092b1350..8400bfd13 100644 --- a/buildroot/package/solarus/solarus.hash +++ b/buildroot/package/solarus/solarus.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2 +sha256 b2e00a7df8953903ba022a8f392038e86f675cee714da19cf9a5f8535c42f349 solarus-v1.6.4.tar.bz2 -sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt +sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt diff --git a/buildroot/package/solarus/solarus.mk b/buildroot/package/solarus/solarus.mk index 6f5853e90..92e849ef0 100644 --- a/buildroot/package/solarus/solarus.mk +++ b/buildroot/package/solarus/solarus.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOLARUS_VERSION = 1.6.2 +SOLARUS_VERSION = 1.6.4 SOLARUS_SITE = \ https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION) SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2 @@ -16,8 +16,8 @@ SOLARUS_LICENSE_FILES = license.txt # Install libsolarus.so SOLARUS_INSTALL_STAGING = YES -SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ - sdl2_image sdl2_ttf +SOLARUS_DEPENDENCIES = glm libgl libmodplug libogg libvorbis openal physfs \ + sdl2 sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) SOLARUS_CONF_OPTS = \ diff --git a/buildroot/package/spandsp/Config.in b/buildroot/package/spandsp/Config.in index a2d5b85d7..c64eee8ac 100644 --- a/buildroot/package/spandsp/Config.in +++ b/buildroot/package/spandsp/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_SPANDSP bool "spandsp" select BR2_PACKAGE_TIFF + select BR2_PACKAGE_TIFF_JPEG help Spandsp is a library of many DSP functions for telephony. These range from simple modules, such as DTMF detection, to a complete software FAX machine. - http://www.soft-switch.org/ + https://github.com/freeswitch/spandsp diff --git a/buildroot/package/spandsp/spandsp.hash b/buildroot/package/spandsp/spandsp.hash index 1123e29c1..d38b06919 100644 --- a/buildroot/package/spandsp/spandsp.hash +++ b/buildroot/package/spandsp/spandsp.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 0fcdda74bd9703dd66c3e9721bf2d81bd7c185c539d1887768c2b332ab703d51 spandsp-20180108.tar.gz -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING +sha256 a11beed46b488a4cac3b0c42042ad28448bcee4c0027a82d5449180bbb178836 spandsp-3.0.0-6ec23e5a7e.tar.gz +sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING diff --git a/buildroot/package/spandsp/spandsp.mk b/buildroot/package/spandsp/spandsp.mk index e02c15a77..42c0e3bb6 100644 --- a/buildroot/package/spandsp/spandsp.mk +++ b/buildroot/package/spandsp/spandsp.mk @@ -4,9 +4,8 @@ # ################################################################################ -SPANDSP_VERSION = 20180108 -SPANDSP_SITE = https://www.soft-switch.org/downloads/spandsp/snapshots - +SPANDSP_VERSION = 3.0.0-6ec23e5a7e +SPANDSP_SITE = https://files.freeswitch.org/downloads/libs SPANDSP_LICENSE = LGPL-2.1 (library), GPL-2.0 (test suite) SPANDSP_LICENSE_FILES = COPYING diff --git a/buildroot/package/spdlog/spdlog.hash b/buildroot/package/spdlog/spdlog.hash index 2b51877aa..68dd7f197 100644 --- a/buildroot/package/spdlog/spdlog.hash +++ b/buildroot/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a spdlog-1.5.0.tar.gz -sha256 7d40b1967fca203d22b0eaf75f54566167ded823863abedf4de869fcea057038 LICENSE +sha256 1e68e9b40cf63bb022a4b18cdc1c9d88eb5d97e4fd64fa981950a9cacf57a4bf spdlog-1.8.0.tar.gz +sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/buildroot/package/spdlog/spdlog.mk b/buildroot/package/spdlog/spdlog.mk index f8eb9bc0f..8d8c3888b 100644 --- a/buildroot/package/spdlog/spdlog.mk +++ b/buildroot/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.5.0 +SPDLOG_VERSION = 1.8.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE diff --git a/buildroot/package/spi-tools/spi-tools.hash b/buildroot/package/spi-tools/spi-tools.hash index eb8073f78..8b7590b33 100644 --- a/buildroot/package/spi-tools/spi-tools.hash +++ b/buildroot/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 201ffcb53e64f28a05aa0a8de5686f7ac644268da1305c0d5f70a3d96b4a22ce spi-tools-0.8.4.tar.gz -sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE +sha256 a1846bf3b4d38fc419f8efe4555242aa581358fdca28452b3ca11f74e3572e33 spi-tools-0.8.5.tar.gz +sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/buildroot/package/spi-tools/spi-tools.mk b/buildroot/package/spi-tools/spi-tools.mk index c25521a07..1af74c7a1 100644 --- a/buildroot/package/spi-tools/spi-tools.mk +++ b/buildroot/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 0.8.4 +SPI_TOOLS_VERSION = 0.8.5 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES diff --git a/buildroot/package/spice-protocol/spice-protocol.hash b/buildroot/package/spice-protocol/spice-protocol.hash index c23135141..f02cf7f0e 100644 --- a/buildroot/package/spice-protocol/spice-protocol.hash +++ b/buildroot/package/spice-protocol/spice-protocol.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 b6a4aa1ca32668790b45a494bbd000e9d05797b391d5a5d4b91adf1118216eac spice-protocol-0.14.0.tar.bz2 +# From https://www.spice-space.org/download/releases/spice-protocol-0.14.3.tar.xz.sha256sum +sha256 f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a spice-protocol-0.14.3.tar.xz # Hash for license file -sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING +sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING diff --git a/buildroot/package/spice-protocol/spice-protocol.mk b/buildroot/package/spice-protocol/spice-protocol.mk index f8c55c7b0..172d45687 100644 --- a/buildroot/package/spice-protocol/spice-protocol.mk +++ b/buildroot/package/spice-protocol/spice-protocol.mk @@ -4,11 +4,11 @@ # ################################################################################ -SPICE_PROTOCOL_VERSION = 0.14.0 -SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2 +SPICE_PROTOCOL_VERSION = 0.14.3 +SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.xz SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases SPICE_PROTOCOL_LICENSE = BSD-3-Clause SPICE_PROTOCOL_LICENSE_FILES = COPYING SPICE_PROTOCOL_INSTALL_STAGING = YES -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/spice/0001-configure.ac-add-enable-tests.patch b/buildroot/package/spice/0001-configure.ac-add-enable-tests.patch deleted file mode 100644 index 668dea1ca..000000000 --- a/buildroot/package/spice/0001-configure.ac-add-enable-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1b6eaf5589a14763452cbe53382cc699cdeca141 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 15 Nov 2019 11:36:14 +0100 -Subject: [PATCH] configure.ac: add --enable-tests - -Allow the user to disable tests through --disable-tests, this is -especially useful for example to disable gdk-pixbuf dependency - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/spice-common/merge_requests/6] ---- - Makefile.am | 6 +++++- - configure.ac | 7 +++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/subprojects/spice-common/Makefile.am b/subprojects/spice-common/Makefile.am -index 5402499..00623a1 100644 ---- a/subprojects/spice-common/Makefile.am -+++ b/subprojects/spice-common/Makefile.am -@@ -1,7 +1,11 @@ - NULL = - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = python_modules common tests docs -+SUBDIRS = python_modules common docs -+ -+if ENABLE_TESTS -+SUBDIRS += tests -+endif - - EXTRA_DIST = \ - meson.build \ -diff --git a/subprojects/spice-common/configure.ac b/subprojects/spice-common/configure.ac -index 9d10287..2dba7c8 100644 ---- a/subprojects/spice-common/configure.ac -+++ b/subprojects/spice-common/configure.ac -@@ -33,6 +33,13 @@ AC_SEARCH_LIBS(regcomp, [regex rx]) - SPICE_CHECK_SYSDEPS - SPICE_EXTRA_CHECKS - -+AC_ARG_ENABLE([tests], -+ AS_HELP_STRING([--enable-tests], -+ [Enable tests @<:@default=yes@:>@]), -+ [], -+ enable_tests="yes") -+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes") -+ - AC_ARG_ENABLE([alignment-checks], - AS_HELP_STRING([--enable-alignment-checks], - [Enable runtime checks for cast alignment @<:@default=no@:>@]), --- -2.23.0 - diff --git a/buildroot/package/spice/spice.hash b/buildroot/package/spice/spice.hash index 424324412..8f84c2321 100644 --- a/buildroot/package/spice/spice.hash +++ b/buildroot/package/spice/spice.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7 spice-0.14.2.tar.bz2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114 spice-0.14.3.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/spice/spice.mk b/buildroot/package/spice/spice.mk index bed6931c2..78d397bdc 100644 --- a/buildroot/package/spice/spice.mk +++ b/buildroot/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.14.2 +SPICE_VERSION = 0.14.3 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ @@ -17,8 +17,6 @@ SPICE_DEPENDENCIES = \ openssl \ pixman \ spice-protocol -# We're patching subprojects/spice-common/configure.ac -SPICE_AUTORECONF = YES # We disable everything for now, because the dependency tree can become # quite deep if we try to enable some features, and I have not tested that. diff --git a/buildroot/package/squeezelite/squeezelite.mk b/buildroot/package/squeezelite/squeezelite.mk index 2ed3d8b76..b0347c4df 100644 --- a/buildroot/package/squeezelite/squeezelite.mk +++ b/buildroot/package/squeezelite/squeezelite.mk @@ -40,11 +40,6 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_VISEXPORT),y) SQUEEZELITE_MAKE_OPTS += -DVISEXPORT endif -ifeq ($(BR2_PACKAGE_WIRINGPI),y) -SQUEEZELITE_DEPENDENCIES += wiringpi -SQUEEZELITE_MAKE_OPTS += -DRPI -endif - define SQUEEZELITE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ OPTS="$(SQUEEZELITE_MAKE_OPTS)" -C $(@D) all diff --git a/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch b/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..312985d8d --- /dev/null +++ b/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,47 @@ +From 35ff9ed71b89f34e5462de1ee63f88edf98aeb69 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Oct 2020 21:08:53 +0100 +Subject: [PATCH] sshfs.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8: + +../sshfs.c:1092:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (int i = 0; i < sshfs.max_conns; i++) { + ^ + +This build failure has been added with +https://github.com/libfuse/sshfs/commit/8822b60d9dbd9907065e7999f616b11ddce6d584 + +Fixes: + - http://autobuild.buildroot.org/results/2dbdc579c55543175716d5f739cabe2ad0864ed6 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libfuse/sshfs/pull/233] +--- + sshfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sshfs.c b/sshfs.c +index d5f2ff7..2c2db42 100644 +--- a/sshfs.c ++++ b/sshfs.c +@@ -1068,6 +1068,7 @@ static struct conn* get_conn(const struct sshfs_file *sf, + const char *path) + { + struct conntab_entry *ce; ++ int i; + + if (sshfs.max_conns == 1) + return &sshfs.conns[0]; +@@ -1089,7 +1090,7 @@ static struct conn* get_conn(const struct sshfs_file *sf, + + int best_index = 0; + uint64_t best_score = ~0ULL; /* smaller is better */ +- for (int i = 0; i < sshfs.max_conns; i++) { ++ for (i = 0; i < sshfs.max_conns; i++) { + uint64_t score = ((uint64_t) sshfs.conns[i].req_count << 43) + + ((uint64_t) sshfs.conns[i].dir_count << 22) + + ((uint64_t) sshfs.conns[i].file_count << 1) + +-- +2.28.0 + diff --git a/buildroot/package/sshfs/Config.in b/buildroot/package/sshfs/Config.in index 7383b6094..bc54b698d 100644 --- a/buildroot/package/sshfs/Config.in +++ b/buildroot/package/sshfs/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_SSHFS bool "sshfs (FUSE)" depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse, glib2 - depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse3, glib2 + depends on BR2_USE_MMU # libfuse3, glib2 + depends on !BR2_STATIC_LIBS # libfuse3 + select BR2_PACKAGE_LIBFUSE3 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSH diff --git a/buildroot/package/sshfs/sshfs.hash b/buildroot/package/sshfs/sshfs.hash index a8878e693..b8488013a 100644 --- a/buildroot/package/sshfs/sshfs.hash +++ b/buildroot/package/sshfs/sshfs.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz +sha256 6e7e86831f3066b356e7f16e22f1b8a8f177fda05146f6a5eb821c2fd0541c34 sshfs-3.7.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sshfs/sshfs.mk b/buildroot/package/sshfs/sshfs.mk index ee96ad67e..70e7feab1 100644 --- a/buildroot/package/sshfs/sshfs.mk +++ b/buildroot/package/sshfs/sshfs.mk @@ -4,13 +4,14 @@ # ################################################################################ -SSHFS_VERSION = 2.8 -SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION) +SSHFS_VERSION = 3.7.0 +SSHFS_SOURCE = sshfs-$(SSHFS_VERSION).tar.xz +SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(SSHFS_VERSION) SSHFS_LICENSE = GPL-2.0 SSHFS_LICENSE_FILES = COPYING SSHFS_DEPENDENCIES = \ - libglib2 libfuse openssh \ + libglib2 libfuse3 openssh \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_ENABLE_LOCALE),,libiconv) -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/sshguard/sshguard.hash b/buildroot/package/sshguard/sshguard.hash index beb77a4d6..9bbb41336 100644 --- a/buildroot/package/sshguard/sshguard.hash +++ b/buildroot/package/sshguard/sshguard.hash @@ -1,4 +1,4 @@ -# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.0/sshguard-2.4.0.sha256 -sha256 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0 sshguard-2.4.0.tar.gz +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.1/sshguard-2.4.1.sha256 +sha256 875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67 sshguard-2.4.1.tar.gz # Locally calculated sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/buildroot/package/sshguard/sshguard.mk b/buildroot/package/sshguard/sshguard.mk index ceff52069..3616fba78 100644 --- a/buildroot/package/sshguard/sshguard.mk +++ b/buildroot/package/sshguard/sshguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHGUARD_VERSION = 2.4.0 +SSHGUARD_VERSION = 2.4.1 SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) SSHGUARD_LICENSE_FILES = COPYING diff --git a/buildroot/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch b/buildroot/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch new file mode 100644 index 000000000..5fc3296da --- /dev/null +++ b/buildroot/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch @@ -0,0 +1,41 @@ +From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Oct 2020 07:58:05 +0200 +Subject: [PATCH] Makefile: fix static linking with pcre + +Static build with pcre is broken since version 1.19b and +https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4 +because -lpcre has been replaced by -lpcreposix which will result in +the following static build failure: + +/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap +/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree': +pcreposix.c:(.text+0x120): undefined reference to `pcre_free' + +So append -lpcre after -lpcreposix + +Fixes: + - http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/yrutschle/sslh/pull/280] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 986cf1c..ecadc22 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ endif + + ifneq ($(strip $(USELIBPCRE)),) + CPPFLAGS+=-DLIBPCRE +- LIBS:=$(LIBS) -lpcreposix ++ LIBS:=$(LIBS) -lpcreposix -lpcre + endif + + ifneq ($(strip $(USELIBCONFIG)),) +-- +2.28.0 + diff --git a/buildroot/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch b/buildroot/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch deleted file mode 100644 index d23bc9fae..000000000 --- a/buildroot/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0c39699da9a3d6534b6d26e7c9686ee76d81b64a Mon Sep 17 00:00:00 2001 -From: David Bachelart -Date: Thu, 26 Jan 2017 10:07:47 +0100 -Subject: [PATCH] fix version extraction when building in a larger git tree - -sslh uses host git to extract its own version number. In buildroot, this -is an issue since extracted information is conflicting with buildroot git -status if we use git as VCS for buildroot. - -Since these git calls are legitimate only if git is used for the sslh -subtree only, this patch adds a check : a .git directory has to exist at -the root of the project to enable git-extracted version string. - -Signed-off-by: David Bachelart -[yann.morin.1998@free.fr: fix troll character U+c2a0] -Signed-off-by: "Yann E. MORIN" ---- - genver.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/genver.sh b/genver.sh -index 79fd0a0..051e57b 100755 ---- a/genver.sh -+++ b/genver.sh -@@ -7,7 +7,7 @@ else - QUIET=0 - fi - --if ! `(git status | grep -q "On branch") 2> /dev/null`; then -+if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then - # If we don't have git, we can't work out what - # version this is. It must have been downloaded as a - # zip file. -@@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then - fi - fi - --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - # generate the version info based on the tag - release=`(git describe --tags || git --describe || git describe --all --long) \ - 2>/dev/null | tr -d '\n'` --- -2.1.4 - diff --git a/buildroot/package/sslh/Config.in b/buildroot/package/sslh/Config.in index 21bd65f16..e608586c2 100644 --- a/buildroot/package/sslh/Config.in +++ b/buildroot/package/sslh/Config.in @@ -1,14 +1,8 @@ config BR2_PACKAGE_SSLH bool "sslh" - depends on BR2_INSTALL_LIBSTDCPP # uses fork() depends on BR2_USE_MMU - select BR2_PACKAGE_LIBCONFIG help Applicative protocol multiplexer http://www.rutschle.net/tech/sslh.shtml - -comment "sslh needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/sslh/sslh.hash b/buildroot/package/sslh/sslh.hash index c25b37b8a..00e5c12d7 100644 --- a/buildroot/package/sslh/sslh.hash +++ b/buildroot/package/sslh/sslh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116 sslh-v1.20.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sslh/sslh.mk b/buildroot/package/sslh/sslh.mk index ba91f8c4d..4bde143cd 100644 --- a/buildroot/package/sslh/sslh.mk +++ b/buildroot/package/sslh/sslh.mk @@ -4,16 +4,21 @@ # ################################################################################ -SSLH_VERSION = 1.20 +SSLH_VERSION = 1.21c SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING -SSLH_DEPENDENCIES = libconfig - SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +ifeq ($(BR2_PACKAGE_LIBBSD),y) +SSLH_DEPENDENCIES += libbsd +SSLH_MAKE_OPTS += USELIBBSD=1 +else +SSLH_MAKE_OPTS += USELIBBSD= +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) SSLH_DEPENDENCIES += libcap SSLH_MAKE_OPTS += USELIBCAP=1 @@ -21,6 +26,13 @@ else SSLH_MAKE_OPTS += USELIBCAP= endif +ifeq ($(BR2_PACKAGE_LIBCONFIG),y) +SSLH_DEPENDENCIES += libconfig +SSLH_MAKE_OPTS += USELIBCONFIG=1 +else +SSLH_MAKE_OPTS += USELIBCONFIG= +endif + ifeq ($(BR2_PACKAGE_PCRE),y) SSLH_DEPENDENCIES += pcre SSLH_MAKE_OPTS += USELIBPCRE=1 diff --git a/buildroot/package/stella/0001-Add-cross-compilation-support.patch b/buildroot/package/stella/0001-Add-cross-compilation-support.patch deleted file mode 100644 index 1aefd86cf..000000000 --- a/buildroot/package/stella/0001-Add-cross-compilation-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ef1cffc526d3cf9562d50efbf8addc2aa4c06b52 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sun, 30 Jul 2017 18:23:23 -0300 -Subject: [PATCH 1/2] Add cross-compilation support - -Signed-off-by: Sergio Prado ---- - configure | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index c2f304729651..b05321aac3da 100755 ---- a/configure -+++ b/configure -@@ -499,8 +499,9 @@ if test -n "$_host"; then - _host_os=win32 - ;; - *) -- echo "Cross-compiling to unknown target, please add your target to configure." -- exit 1 -+ echo "Cross-compiling to $_host target" -+ DEFINES="$DEFINES -DUNIX" -+ _host_os=unix - ;; - esac - --- -1.9.1 - diff --git a/buildroot/package/stella/0002-Do-not-strip-when-installing.patch b/buildroot/package/stella/0002-Do-not-strip-when-installing.patch deleted file mode 100644 index 8a95a81a5..000000000 --- a/buildroot/package/stella/0002-Do-not-strip-when-installing.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d506a586b299682a425d3c3de68baefb7221fa9a Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sun, 30 Jul 2017 18:25:12 -0300 -Subject: [PATCH 2/2] Do not strip when installing - -Signed-off-by: Sergio Prado ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 346640e53bea..fedaed05a4d6 100644 ---- a/Makefile -+++ b/Makefile -@@ -173,7 +173,7 @@ config.mak: $(srcdir)/configure - - install: all - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" -+ $(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)" - $(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics" --- -1.9.1 - diff --git a/buildroot/package/stella/0003-undef-PAGE_SIZE.patch b/buildroot/package/stella/0003-undef-PAGE_SIZE.patch deleted file mode 100644 index f5c60fa3b..000000000 --- a/buildroot/package/stella/0003-undef-PAGE_SIZE.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Mar 2019 20:47:27 +0100 -Subject: [PATCH] undef PAGE_SIZE - -PAGE_SIZE is sometimes already defined by the toolchain so undef it: - -/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o -In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0, - from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42, - from src/common/bspf.hxx:28, - from src/debugger/CartDebug.cxx:18: -src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant - static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT); - -Fixes: - - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 - -Signed-off-by: Fabrice Fontaine ---- - src/emucore/MT24LC256.hxx | 2 ++ - src/emucore/System.hxx | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx -index fc5d6a49..bb7468b4 100644 ---- a/src/emucore/MT24LC256.hxx -+++ b/src/emucore/MT24LC256.hxx -@@ -23,6 +23,8 @@ class System; - #include "Control.hxx" - #include "bspf.hxx" - -+#undef PAGE_SIZE -+ - /** - Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically - Erasable PROM accessed using the I2C protocol. Thanks to J. Payson -diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx -index e31202df..85a54f28 100644 ---- a/src/emucore/System.hxx -+++ b/src/emucore/System.hxx -@@ -30,6 +30,8 @@ class NullDevice; - #include "Random.hxx" - #include "Serializable.hxx" - -+#undef PAGE_SIZE -+ - /** - This class represents a system consisting of a 6502 microprocessor - and a set of devices. The devices are mapped into an addressing --- -2.20.1 - diff --git a/buildroot/package/stella/Config.in b/buildroot/package/stella/Config.in index 709da9815..c14f48572 100644 --- a/buildroot/package/stella/Config.in +++ b/buildroot/package/stella/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_STELLA depends on !BR2_STATIC_LIBS # sdl2 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_SDL2 select BR2_PACKAGE_LIBPNG @@ -13,10 +13,10 @@ config BR2_PACKAGE_STELLA https://stella-emu.github.io/ -comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 5" +comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 comment "stella needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/stella/stella.hash b/buildroot/package/stella/stella.hash index 395ee18d3..18e325b1e 100644 --- a/buildroot/package/stella/stella.hash +++ b/buildroot/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 bcbd82294f97d00457fdb727e9b08ff73b685dc7f77704cea1eceb58d8967387 stella-6.0.2-src.tar.xz -sha256 062e708b8b88ea911b5c08000f1c4a5588235aa0c303bc893b5d92fb45cafd04 Copyright.txt -sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt +sha256 59ee35a3e49f52e64fa15e0217ecda90ccb768dcb075d997e72d5e5a3198f82e stella-6.3-src.tar.xz +sha256 d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35 Copyright.txt +sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/buildroot/package/stella/stella.mk b/buildroot/package/stella/stella.mk index 1295b7527..1e2cbaf9f 100644 --- a/buildroot/package/stella/stella.mk +++ b/buildroot/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.0.2 +STELLA_VERSION = 6.3 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ diff --git a/buildroot/package/stellarium/stellarium.hash b/buildroot/package/stellarium/stellarium.hash index ea1256df1..4f0ee7e12 100644 --- a/buildroot/package/stellarium/stellarium.hash +++ b/buildroot/package/stellarium/stellarium.hash @@ -1,6 +1,5 @@ # From https://github.com/Stellarium/stellarium/releases -md5 2de84da8a2256f3239174e3ad8f83a5b stellarium-0.19.3.tar.gz -sha1 a82cfa21c8dcfbd0a0cf4e30c4ea017ceb2f87a5 stellarium-0.19.3.tar.gz +sha1 a3de40d74b2dcf8c9a7c6220de3d9e951e5b06c8 stellarium-0.20.3.tar.gz +sha256 2781a364d14c203c21a11ef528d541559ed749e1b6c3dbc1187410a6c23ab97c stellarium-0.20.3.tar.gz # Locally computed -sha256 176e15d8d18340cf8c8cfed14f364cbda345d94e77cc97589c163c45d9cb225d stellarium-0.19.3.tar.gz -sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING +sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/buildroot/package/stellarium/stellarium.mk b/buildroot/package/stellarium/stellarium.mk index ff1eb2701..d9ba29c8b 100644 --- a/buildroot/package/stellarium/stellarium.mk +++ b/buildroot/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 0.19.3 +STELLARIUM_VERSION = 0.20.3 STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING diff --git a/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch b/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch deleted file mode 100644 index 27f6d1490..000000000 --- a/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fb4fdb83be36ff5e71426d2bdea81d035cdbd0b8 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 13 Jan 2020 14:54:15 +0200 -Subject: [PATCH] filter_seccomp: fix no-MMU build - -Move the declaration of filter_generators out of HAVE_FORK ifdef to fix -build for no-MMU targets: - -filter_seccomp.c: In function ‘check_seccomp_filter_properties’: -filter_seccomp.c:608:42: error: ‘filter_generators’ undeclared (first use in this function); did you mean ‘linear_filter_generator’? - for (unsigned int i = 0; i < ARRAY_SIZE(filter_generators); ++i) { - ^~~~~~~~~~~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://lists.strace.io/pipermail/strace-devel/2020-January/thread.html - - - filter_seccomp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/filter_seccomp.c b/filter_seccomp.c -index 91f6bc42bce3..da1abc713dfc 100644 ---- a/filter_seccomp.c -+++ b/filter_seccomp.c -@@ -68,8 +68,6 @@ static const struct audit_arch_t audit_arch_vec[SUPPORTED_PERSONALITIES] = { - # endif - }; - --# ifdef HAVE_FORK -- - typedef unsigned short (*filter_generator_t)(struct sock_filter *, - bool *overflow); - static unsigned short linear_filter_generator(struct sock_filter *, -@@ -92,6 +90,8 @@ static struct sock_fprog bpf_prog = { - .filter = NULL, - }; - -+# ifdef HAVE_FORK -+ - static void ATTRIBUTE_NORETURN - check_seccomp_order_do_child(void) - { --- -2.24.1 - diff --git a/buildroot/package/strace/strace.hash b/buildroot/package/strace/strace.hash index dfc2143d6..58df21fdd 100644 --- a/buildroot/package/strace/strace.hash +++ b/buildroot/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.4/strace-5.4.tar.xz.asc -sha256 f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741 strace-5.4.tar.xz -sha256 739b2725197137a04ab48ee6b19da3fdf7e497249e0dedd9f51c11a570401ede COPYING -sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later +# https://strace.io/files/5.9/strace-5.9.tar.xz.asc +sha256 39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 strace-5.9.tar.xz +sha256 6370eb67db918210944a8511a6995ebe9567852f26b4f15a01e5c8cf2aef7c46 COPYING +sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/buildroot/package/strace/strace.mk b/buildroot/package/strace/strace.mk index 3dd650f01..0bc97b404 100644 --- a/buildroot/package/strace/strace.mk +++ b/buildroot/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.4 +STRACE_VERSION = 5.9 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/stress-ng/Config.in b/buildroot/package/stress-ng/Config.in index 4fcfa3554..64b473b75 100644 --- a/buildroot/package/stress-ng/Config.in +++ b/buildroot/package/stress-ng/Config.in @@ -1,16 +1,11 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() - # disabled on musl: stress-malloc.c needs mallopt() and M_MMAP_THRESHOLD - depends on !BR2_TOOLCHAIN_USES_MUSL # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 depends on !BR2_arc - depends on !BR2_STATIC_LIBS # keyutils - select BR2_PACKAGE_KEYUTILS # stress-key.c needs keyutils.h - select BR2_PACKAGE_ATTR # stress-xattr.c needs xattr.h help stress-ng will stress test a computer system in various selectable ways. It was designed to exercise various physical @@ -19,8 +14,7 @@ config BR2_PACKAGE_STRESS_NG http://kernel.ubuntu.com/~cking/stress-ng/ -comment "stress-ng needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.3" +comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \ - || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/buildroot/package/stress-ng/stress-ng.hash b/buildroot/package/stress-ng/stress-ng.hash index a2b9b9ef9..5250a2247 100644 --- a/buildroot/package/stress-ng/stress-ng.hash +++ b/buildroot/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85ae86587f605225cc736e1ddba6cc5fd129dfbba0f7d94df755e2e6ac5230e6 stress-ng-0.10.07.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 860291dd3a18b985b3483190a627bbede2b5c52113766c1921001b3fb4b83af0 stress-ng-0.11.17.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/stress-ng/stress-ng.mk b/buildroot/package/stress-ng/stress-ng.mk index 55e3d297b..57464e9bb 100644 --- a/buildroot/package/stress-ng/stress-ng.mk +++ b/buildroot/package/stress-ng/stress-ng.mk @@ -4,18 +4,20 @@ # ################################################################################ -STRESS_NG_VERSION = 0.10.07 +STRESS_NG_VERSION = 0.11.17 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING -STRESS_NG_DEPENDENCIES = attr keyutils - ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif +ifeq ($(BR2_PACKAGE_KEYUTILS),y) +STRESS_NG_DEPENDENCIES += keyutils +endif + define STRESS_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef diff --git a/buildroot/package/strongswan/Config.in b/buildroot/package/strongswan/Config.in index 0438eeced..47c7107f5 100644 --- a/buildroot/package/strongswan/Config.in +++ b/buildroot/package/strongswan/Config.in @@ -44,6 +44,10 @@ config BR2_PACKAGE_STRONGSWAN_GMP bool "GNU MP (libgmp)" select BR2_PACKAGE_GMP +config BR2_PACKAGE_STRONGSWAN_WOLFSSL + bool "wolfssl" + select BR2_PACKAGE_WOLFSSL + endchoice config BR2_PACKAGE_STRONGSWAN_AF_ALG diff --git a/buildroot/package/strongswan/strongswan.hash b/buildroot/package/strongswan/strongswan.hash index 4d1a593a5..aa25d81f4 100644 --- a/buildroot/package/strongswan/strongswan.hash +++ b/buildroot/package/strongswan/strongswan.hash @@ -1,9 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5 -md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.0.tar.bz2.md5 +md5 705628cddd5b7683ef8a688acd9514d8 strongswan-5.9.0.tar.bz2 # Calculated based on the hash above -sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 +sha256 72b47a385da5d1532b816d9fe04c50d074c29ed42ea3f0878fbd66335917bb66 strongswan-5.9.0.tar.bz2 # Locally calculated -sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch -sha256 415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263 strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/buildroot/package/strongswan/strongswan.mk b/buildroot/package/strongswan/strongswan.mk index 7f1752ce5..a0290c5bf 100644 --- a/buildroot/package/strongswan/strongswan.mk +++ b/buildroot/package/strongswan/strongswan.mk @@ -4,12 +4,9 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.6.3 +STRONGSWAN_VERSION = 5.9.0 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org -STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \ - $(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf @@ -38,16 +35,12 @@ STRONGSWAN_CONF_OPTS += \ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ + --enable-wolfssl=$(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),yes,no) \ --with-ipseclibdir=/usr/lib \ --with-plugindir=/usr/lib/ipsec/plugins \ --with-imcvdir=/usr/lib/ipsec/imcvs \ --with-dev-headers=/usr/include -# strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch -STRONGSWAN_IGNORE_CVES += CVE-2018-16151 CVE-2018-16152 -# strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch -STRONGSWAN_IGNORE_CVES += CVE-2018-17540 - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) STRONGSWAN_CONF_ENV += LIBS='-latomic' endif @@ -80,7 +73,8 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ - $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) + $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) \ + $(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \ diff --git a/buildroot/package/stunnel/stunnel.hash b/buildroot/package/stunnel/stunnel.hash index b741b0e81..67d06a4d7 100644 --- a/buildroot/package/stunnel/stunnel.hash +++ b/buildroot/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.56.tar.gz.sha256 -sha256 7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22 stunnel-5.56.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.57.tar.gz.sha256 +sha256 af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1 stunnel-5.57.tar.gz # Locally calculated -sha256 f46e2613769e23e23348b6eb667dc85309da2252c8cc2016db92ad93d743aea4 COPYING.md -sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md +sha256 d3055d327fd4daa5895fcf8fc4ebe993d06f40f2841ac995c6a69988d19bac4b COPYING.md +sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/buildroot/package/stunnel/stunnel.mk b/buildroot/package/stunnel/stunnel.mk index f8265c4cf..e0cc5630e 100644 --- a/buildroot/package/stunnel/stunnel.mk +++ b/buildroot/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).56 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).57 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ diff --git a/buildroot/package/subversion/0001-dont-mangle-cflags.patch b/buildroot/package/subversion/0001-dont-mangle-cflags.patch deleted file mode 100644 index adb8b8e93..000000000 --- a/buildroot/package/subversion/0001-dont-mangle-cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] configure.ac: don't mangle CFLAGS - -Ensure that the sed expression to strip debugging options from CFLAGS -doesn't mangle flags like -mfloat-gprs=double, breaking the build. - -[Vincent: adapt to 1.9.2 and patch configure.ac instead of configure] - -Signed-off-by: Peter Korsgaard -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2015-07-27 00:03:10.000000000 +0100 -+++ b/configure.ac 2015-09-28 10:33:39.175048493 +0100 -@@ -1110,8 +1110,8 @@ if test "$enable_debugging" = "yes" ; th - CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG" - elif test "$enable_debugging" = "no" ; then - AC_MSG_NOTICE([Disabling debugging]) -- CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -- CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] -+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] - dnl Compile with NDEBUG to get rid of assertions - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" diff --git a/buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch b/buildroot/package/subversion/0001-workaround-ac-run-ifelse.patch similarity index 100% rename from buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch rename to buildroot/package/subversion/0001-workaround-ac-run-ifelse.patch diff --git a/buildroot/package/subversion/subversion.hash b/buildroot/package/subversion/subversion.hash index 581834f98..da0fe9118 100644 --- a/buildroot/package/subversion/subversion.hash +++ b/buildroot/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.12.2.tar.bz2.sha512 -sha512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.sha512 +sha512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b subversion-1.14.0.tar.bz2 # Locally calculated -sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE +sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/buildroot/package/subversion/subversion.mk b/buildroot/package/subversion/subversion.mk index 2044a6420..83a359b96 100644 --- a/buildroot/package/subversion/subversion.mk +++ b/buildroot/package/subversion/subversion.mk @@ -4,9 +4,9 @@ # ################################################################################ -SUBVERSION_VERSION = 1.12.2 +SUBVERSION_VERSION = 1.14.0 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 -SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion +SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 SUBVERSION_LICENSE_FILES = LICENSE SUBVERSION_DEPENDENCIES = \ diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash index 7c01d07d2..9f4b1a669 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98abeb8ff2e7e824ec89c7be9984ff298db1f35e48d79092238799ff5a239e91 sunxi-mali-mainline-driver-ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 a2bb43ed2e64cb081e3bc814941c4de02e785f9984783061cf486d2b0b92407b sunxi-mali-mainline-driver-a588b22f6b3d40ad18070c699f90f36ed21c9f7d.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index 0edcdee4d..3bb899041 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2 +SUNXI_MALI_MAINLINE_DRIVER_VERSION = a588b22f6b3d40ad18070c699f90f36ed21c9f7d SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 @@ -32,4 +32,9 @@ define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i endef +define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) +endef + $(eval $(generic-package)) diff --git a/buildroot/package/sunxi-tools/sunxi-tools.hash b/buildroot/package/sunxi-tools/sunxi-tools.hash index 2de26c418..84acc2c76 100644 --- a/buildroot/package/sunxi-tools/sunxi-tools.hash +++ b/buildroot/package/sunxi-tools/sunxi-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-1.4.1.tar.gz +sha256 81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822 sunxi-tools-1.4.2.tar.gz sha256 2b0d4dda4bf8034e1506507a67f80f982131137afe62bf144d248f9faea31da4 LICENSE.md diff --git a/buildroot/package/sunxi-tools/sunxi-tools.mk b/buildroot/package/sunxi-tools/sunxi-tools.mk index 35254263c..c2913ee8f 100644 --- a/buildroot/package/sunxi-tools/sunxi-tools.mk +++ b/buildroot/package/sunxi-tools/sunxi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = 1.4.1 +SUNXI_TOOLS_VERSION = 1.4.2 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/supertux/0002-Fix-build-with-boost-1-73.patch b/buildroot/package/supertux/0002-Fix-build-with-boost-1-73.patch new file mode 100644 index 000000000..000e5abca --- /dev/null +++ b/buildroot/package/supertux/0002-Fix-build-with-boost-1-73.patch @@ -0,0 +1,25 @@ +From 4221d54385b69d6c40eff2c67bc6bad7ed165a44 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Sat, 9 May 2020 03:04:02 +0200 +Subject: [PATCH] Fix build with boost-1.73 + +[Retrieved from: +https://github.com/SuperTux/supertux/commit/4221d54385b69d6c40eff2c67bc6bad7ed165a44] +Signed-off-by: Fabrice Fontaine +--- + src/editor/object_settings.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp +index bc9049a94e..15b77b1e46 100644 +--- a/src/editor/object_settings.hpp ++++ b/src/editor/object_settings.hpp +@@ -22,6 +22,8 @@ + + #include "editor/object_option.hpp" + ++#include ++ + class Color; + enum class Direction; + enum class WalkMode; diff --git a/buildroot/package/supertux/Config.in b/buildroot/package/supertux/Config.in index c77d1ae2b..5cacdd658 100644 --- a/buildroot/package/supertux/Config.in +++ b/buildroot/package/supertux/Config.in @@ -17,7 +17,6 @@ config BR2_PACKAGE_SUPERTUX select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGLEW - select BR2_PACKAGE_LIBGLU # GL/glu.h select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBVORBIS diff --git a/buildroot/package/supertux/supertux.mk b/buildroot/package/supertux/supertux.mk index 5842b17ba..e4a463091 100644 --- a/buildroot/package/supertux/supertux.mk +++ b/buildroot/package/supertux/supertux.mk @@ -15,7 +15,7 @@ SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS # Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in # the CMake build system. -SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu \ +SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew \ libogg libpng libvorbis openal physfs sdl2 sdl2_image # CMAKE_BUILD_TYPE=Release: disable profiling code (-pg) @@ -30,6 +30,7 @@ SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu # ENABLE_OPENGLES2=OFF: Disable opengles2 for now. SUPERTUX_CONF_OPTS += \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DGLEW_NO_GLU" \ -DENABLE_BOOST_STATIC_LIBS=OFF \ -DBUILD_DOCUMENTATION=OFF \ -DENABLE_OPENGL=ON \ diff --git a/buildroot/package/supertuxkart/Config.in b/buildroot/package/supertuxkart/Config.in index fcb27445d..99f2310d8 100644 --- a/buildroot/package/supertuxkart/Config.in +++ b/buildroot/package/supertuxkart/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS # openal depends on BR2_PACKAGE_HAS_LIBGL @@ -16,7 +17,6 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBGLEW - select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBSQUISH @@ -33,7 +33,7 @@ config BR2_PACKAGE_SUPERTUXKART http://supertuxkart.sourceforge.net/Main_Page -comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++" +comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++, gcc >= 4.9" depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU @@ -41,5 +41,6 @@ comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NP depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_PACKAGE_HAS_LIBGL \ || BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/supertuxkart/supertuxkart.mk b/buildroot/package/supertuxkart/supertuxkart.mk index 4427ddd1e..97cd2a40b 100644 --- a/buildroot/package/supertuxkart/supertuxkart.mk +++ b/buildroot/package/supertuxkart/supertuxkart.mk @@ -24,7 +24,6 @@ SUPERTUXKART_DEPENDENCIES = \ libfribidi \ libgl \ libglew \ - libglu \ libogg \ libpng \ libsquish \ diff --git a/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch b/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch index 4be591be3..424b30d31 100644 --- a/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch +++ b/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch @@ -18,6 +18,8 @@ executable. - provide proper commit log ] Signed-off-by: Yann E. MORIN +[Fabrice: update for 6.0.0] +Signed-off-by: Fabrice Fontaine --- python/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -27,16 +29,16 @@ index 59d195f29..a41604f72 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -6,11 +6,11 @@ EXTRA_DIST = setup.py \ - if HAVE_PYTHON + if HAVE_PYTHON_DISTUTILS all-local: cd $(srcdir) && \ -- $(HAVE_PYTHON) setup.py build --build-base $(abs_builddir) -+ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base $(abs_builddir) +- $(HAVE_PYTHON) setup.py build --build-base "$(abs_builddir)" ++ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base "$(abs_builddir)" install-exec-local: cd $(srcdir) && \ -- $(HAVE_PYTHON) setup.py build --build-base $(abs_builddir) \ -+ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base $(abs_builddir) \ +- $(HAVE_PYTHON) setup.py build --build-base "$(abs_builddir)" \ ++ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base "$(abs_builddir)" \ install --prefix $(DESTDIR)$(prefix) uninstall-local: diff --git a/buildroot/package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch b/buildroot/package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch new file mode 100644 index 000000000..ec876a685 --- /dev/null +++ b/buildroot/package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch @@ -0,0 +1,35 @@ +From 7ab4d5eb55e1d3900390b76e5f46e80e22d4e80e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Oct 2020 21:34:21 +0200 +Subject: [PATCH] configure.ac: allow the user to override RUST_TARGET + +When cross-compiling, RUST_TARGET is not always equal to host_triplet +(e.g. buildroot) so allow the user to override this default value +through RUST_TARGET environment variable + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 32c230209..7d7c9373f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2489,7 +2489,12 @@ fi + have_rust_vendor="no" + + if test "x$cross_compiling" = "xyes"; then +- RUST_SURICATA_LIB_XC_DIR="${host_alias}/" ++ if test "x$RUST_TARGET" != "x"; then ++ RUST_SURICATA_LIB_XC_DIR="$RUST_TARGET/" ++ AC_SUBST([RUST_TARGET],["--target $RUST_TARGET"]) ++ else ++ RUST_SURICATA_LIB_XC_DIR="${host_alias}/" ++ fi + else + if test "x$CARGO_BUILD_TARGET" = "x"; then + RUST_SURICATA_LIB_XC_DIR= +-- +2.28.0 + diff --git a/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch b/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch deleted file mode 100644 index 5c13ac7be..000000000 --- a/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8db38c21b525327305778fcaa232b2a797ffcb82 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 7 May 2020 19:05:23 +0200 -Subject: [PATCH] configure.ac: fix cross-compilation with lua - -lua integer size is detected through AC_RUN_IFELSE since -https://github.com/OISF/suricata/commit/2abcd5d27f29ca37ae31108cc0ea0143fa25d0a1 - -This breaks cross-compilation and is needed only for rust so disable it -if rust is not wanted - -Signed-off-by: Fabrice Fontaine -[Upstream status: not submitted yet] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 127848234..f5f33d42d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2225,7 +2225,7 @@ return 0; - AM_CONDITIONAL([HAVE_LUA], [test "x$enable_lua" != "xno"]) - - # If Lua is enabled, test the integer size. -- if test "x$enable_lua" = "xyes"; then -+ if test "x$enable_lua" = "xyes" && test "x$enable_rust" = "xyes"; then - TMPLIBS="$LIBS" - LIBS="" - --- -2.26.2 - diff --git a/buildroot/package/suricata/Config.in b/buildroot/package/suricata/Config.in index 2add34956..5f7eb21da 100644 --- a/buildroot/package/suricata/Config.in +++ b/buildroot/package/suricata/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_SURICATA bool "suricata" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_JANSSON select BR2_PACKAGE_LIBHTP select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBYAML @@ -18,5 +21,6 @@ config BR2_PACKAGE_SURICATA https://suricata-ids.org comment "suricata needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash index 9e79f3a96..a6cf43fb6 100644 --- a/buildroot/package/suricata/suricata.hash +++ b/buildroot/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 3440cd1065b1b3999dc101a37c49321fab2791b38f16e2f7fe27369dd007eea7 suricata-4.1.9.tar.gz +sha256 3c175a6dee9071141391f64828502cfb6e48dc1a20833e1411fb45be5368923b suricata-6.0.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk index d6ae48c1f..f131fad1b 100644 --- a/buildroot/package/suricata/suricata.mk +++ b/buildroot/package/suricata/suricata.mk @@ -4,16 +4,18 @@ # ################################################################################ -SURICATA_VERSION = 4.1.9 +SURICATA_VERSION = 6.0.0 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE -# We're patching python/Makefile.am +# 0001-python-ensure-proper-shabang-on-python-scripts.patch +# 0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch SURICATA_AUTORECONF = YES SURICATA_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_JANSSON),jansson) \ + host-rustc \ + jansson \ $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) \ $(if $(BR2_PACKAGE_LIBEVENT),libevent) \ libhtp \ @@ -24,12 +26,14 @@ SURICATA_DEPENDENCIES = \ pcre \ $(if $(BR2_PACKAGE_XZ),xz) -SURICATA_CONF_ENV = ac_cv_path_HAVE_SPHINXBUILD=no +SURICATA_CONF_ENV = \ + ac_cv_path_HAVE_SPHINXBUILD=no \ + CARGO_HOME=$(HOST_DIR)/share/cargo \ + RUST_TARGET=$(RUSTC_TARGET_NAME) SURICATA_CONF_OPTS = \ --disable-gccprotect \ --disable-pie \ - --disable-rust \ --disable-suricata-update \ --enable-non-bundled-htp @@ -46,19 +50,9 @@ else SURICATA_CONF_OPTS += --disable-libmagic endif -# --disable-libgeoip disables libgeoip when --enable-geoip is requested. -# This allows libmaxminddb to be picked up instead of libgeoip when both are -# installed on the system. ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) SURICATA_DEPENDENCIES += libmaxminddb -SURICATA_CONF_OPTS += \ - --enable-geoip \ - --disable-libgeoip -else ifeq ($(BR2_PACKAGE_GEOIP),y) -SURICATA_DEPENDENCIES += geoip -SURICATA_CONF_OPTS += \ - --enable-geoip \ - --enable-libgeoip +SURICATA_CONF_OPTS += --enable-geoip else SURICATA_CONF_OPTS += --disable-geoip endif diff --git a/buildroot/package/swig/swig.hash b/buildroot/package/swig/swig.hash index fdc57129b..08b2b5a1e 100644 --- a/buildroot/package/swig/swig.hash +++ b/buildroot/package/swig/swig.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9 swig-4.0.1.tar.gz +sha256 d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc swig-4.0.2.tar.gz sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/buildroot/package/swig/swig.mk b/buildroot/package/swig/swig.mk index 5881a0e42..437cf448b 100644 --- a/buildroot/package/swig/swig.mk +++ b/buildroot/package/swig/swig.mk @@ -5,7 +5,7 @@ ################################################################################ SWIG_VERSION_MAJOR = 4.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).2 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) HOST_SWIG_DEPENDENCIES = host-bison host-pcre HOST_SWIG_CONF_OPTS = \ diff --git a/buildroot/package/swupdate/0001-diskpart-force-kernel-to-reread-partition-table.patch b/buildroot/package/swupdate/0001-diskpart-force-kernel-to-reread-partition-table.patch new file mode 100644 index 000000000..5964d1b96 --- /dev/null +++ b/buildroot/package/swupdate/0001-diskpart-force-kernel-to-reread-partition-table.patch @@ -0,0 +1,32 @@ +From 305a7a5a74a612801d9df2b2efc86dd952b8c4e7 Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Tue, 9 Jun 2020 13:58:06 +0000 +Subject: [PATCH] diskpart: force kernel to reread partition table + +After writing a partition table to disk, the kernel should be informed +(like the partconf tool does), else it is not possible to install images +in the new created partitions. + +Signed-off-by: Stefano Babic +Signed-off-by: Joris Offouga +--- + handlers/diskpart_handler.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c +index 16adc17..372412b 100644 +--- a/handlers/diskpart_handler.c ++++ b/handlers/diskpart_handler.c +@@ -273,7 +273,8 @@ static int diskpart(struct img_type *img, + /* + * Everything done, write into disk + */ +- ret = fdisk_write_disklabel(cxt); ++ ret = fdisk_write_disklabel(cxt) | ++ fdisk_reread_partition_table(cxt); + + handler_exit: + if (fdisk_deassign_device(cxt, 0)) +-- +2.25.1 + diff --git a/buildroot/package/swupdate/0002-Shellscript-stops-before-completing.patch b/buildroot/package/swupdate/0002-Shellscript-stops-before-completing.patch new file mode 100644 index 000000000..d91438893 --- /dev/null +++ b/buildroot/package/swupdate/0002-Shellscript-stops-before-completing.patch @@ -0,0 +1,52 @@ +From bd08e45d7b25f06da2fc6dc824146b471db5f1f4 Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Tue, 16 Jun 2020 10:29:55 +0200 +Subject: [PATCH] Shellscript stops before completing + +Commit 8fb94d7 reworks the way shell script are called, redirecting +stdout and stderr to SWUpdate. A shell script runs then in a child +process. Under some circumstances, SWUpdate closes the forked process +before the child process completes. + +Be sure that the child process has terminated before to go on. + +Signed-off-by: Stefano Babic +Reported-by: Piotr Piwko +Tested-by: Piotr Piwko +Signed-off-by: Joris Offouga +--- + core/pctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/pctl.c b/core/pctl.c +index 8b1c667..01ad540 100644 +--- a/core/pctl.c ++++ b/core/pctl.c +@@ -263,6 +263,7 @@ int run_system_cmd(const char *cmd) + } + } else { + int fds[2]; ++ pid_t w; + + close(stdoutpipe[PIPE_WRITE]); + close(stderrpipe[PIPE_WRITE]); +@@ -276,7 +277,6 @@ int run_system_cmd(const char *cmd) + * and from stderr (of the child process) as ERROR + */ + do { +- pid_t w; + int n1 = 0; + struct timeval tv; + fd_set readfds; +@@ -373,7 +373,7 @@ int run_system_cmd(const char *cmd) + } + } + } while (ret > 0 && n1 > 0); +- } while (!WIFEXITED(wstatus)); ++ } while (w != process_id); + + close(stdoutpipe[PIPE_READ]); + close(stderrpipe[PIPE_READ]); +-- +2.25.1 + diff --git a/buildroot/package/swupdate/Config.in b/buildroot/package/swupdate/Config.in index c0081032b..e87f69586 100644 --- a/buildroot/package/swupdate/Config.in +++ b/buildroot/package/swupdate/Config.in @@ -32,14 +32,12 @@ config BR2_PACKAGE_SWUPDATE compressed archives. * Select BR2_PACKAGE_ZSTD if you want to deal with zstd compressed archives. - * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add - support for setting the U-Boot environment. * Select BR2_PACKAGE_ZEROMQ to add support for using a remote handler. * Select BR2_PACKAGE_LIBRSYNC to add support for using rdiff handler. * Select BR2_PACKAGE_LIBUBOOTENV to add support for setting - the U-Boot environment with the new API. + the U-Boot environment. * Select BR2_PACKAGE_LIBGPIOD to add support for microcontroller firmware update. * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot diff --git a/buildroot/package/swupdate/S80swupdate b/buildroot/package/swupdate/S80swupdate new file mode 100644 index 000000000..4421084b6 --- /dev/null +++ b/buildroot/package/swupdate/S80swupdate @@ -0,0 +1,47 @@ +#!/bin/sh + +DAEMON="swupdate" +DAEMON_WRAPPER="/usr/lib/swupdate/swupdate.sh" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -b -m -p "$PIDFILE" -x $DAEMON_WRAPPER + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature (does not + # reconfigure/restart on SIGHUP, just closes all open files). + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/swupdate/swupdate.config b/buildroot/package/swupdate/swupdate.config index 9d255c8ee..a6b7a7494 100644 --- a/buildroot/package/swupdate/swupdate.config +++ b/buildroot/package/swupdate/swupdate.config @@ -14,6 +14,7 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_CURL is not set # CONFIG_CURL_SSL is not set # CONFIG_SYSTEMD is not set +CONFIG_DEFAULT_CONFIG_FILE="/etc/swupdate.cfg" CONFIG_SCRIPTS=y # CONFIG_HW_COMPATIBILITY is not set CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" @@ -82,7 +83,7 @@ CONFIG_MONGOOSE=y CONFIG_MONGOOSEIPV6=y # -# SSL support needs libcrypto, libssl +# SSL support needs an SSL implementation # # @@ -103,6 +104,7 @@ CONFIG_PARSERROOT="" # # ubivol support needs libubi # +# CONFIG_DISKPART is not set CONFIG_RAW=y # CONFIG_RDIFFHANDLER is not set # CONFIG_SHELLSCRIPTHANDLER is not set diff --git a/buildroot/package/swupdate/swupdate.hash b/buildroot/package/swupdate/swupdate.hash index 3de8d25f4..40f978d22 100644 --- a/buildroot/package/swupdate/swupdate.hash +++ b/buildroot/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 31b2561c9c91ab1e8b6f73704f9a3560816961c2cade4f5d5fc15f55c77ec819 swupdate-2019.11.tar.gz +sha256 132df2ff1ad41c7aabd0fbef6a23d28607cbd5cad52aab050c4822977a107486 swupdate-2020.04.tar.gz sha256 43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478 Licenses/Exceptions sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/buildroot/package/swupdate/swupdate.mk b/buildroot/package/swupdate/swupdate.mk index 2b51edb66..d96a0c2e0 100644 --- a/buildroot/package/swupdate/swupdate.mk +++ b/buildroot/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2019.11 +SWUPDATE_VERSION = 2020.04 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \ @@ -15,7 +15,7 @@ SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \ # TARGET_CC is used for both. SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" -# swupdate bundles its own version of mongoose (version 6.11) +# swupdate bundles its own version of mongoose (version 6.16) ifeq ($(BR2_PACKAGE_EFIBOOTMGR),y) SWUPDATE_DEPENDENCIES += efibootmgr @@ -77,7 +77,7 @@ ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:) SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf # defines the base name for the pkg-config file ("lua" or "luajit") define SWUPDATE_SET_LUA_VERSION - $(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER),$(SWUPDATE_BUILD_CONFIG)) + $(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) endef SWUPDATE_MAKE_ENV += HAVE_LUA=y else @@ -114,10 +114,7 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) SWUPDATE_DEPENDENCIES += systemd endif -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS),y) -SWUPDATE_DEPENDENCIES += uboot-tools -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y -else ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) SWUPDATE_DEPENDENCIES += libubootenv SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y else @@ -156,7 +153,7 @@ SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig ifeq ($(BR2_STATIC_LIBS),y) define SWUPDATE_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(SWUPDATE_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC) endef endif @@ -189,4 +186,23 @@ $(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDAT endif endif +ifeq ($(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE),y) +define SWUPDATE_INSTALL_COMMON + mkdir -p $(TARGET_DIR)/etc/swupdate/conf.d \ + $(TARGET_DIR)/usr/lib/swupdate/conf.d + $(INSTALL) -D -m 755 package/swupdate/swupdate.sh \ + $(TARGET_DIR)/usr/lib/swupdate/swupdate.sh +endef +define SWUPDATE_INSTALL_INIT_SYSTEMD + $(SWUPDATE_INSTALL_COMMON) + $(INSTALL) -D -m 644 package/swupdate/swupdate.service \ + $(TARGET_DIR)/usr/lib/systemd/system/swupdate.service +endef +define SWUPDATE_INSTALL_INIT_SYSV + $(SWUPDATE_INSTALL_COMMON) + $(INSTALL) -D -m 755 package/swupdate/S80swupdate \ + $(TARGET_DIR)/etc/init.d/S80swupdate +endef +endif + $(eval $(kconfig-package)) diff --git a/buildroot/package/swupdate/swupdate.service b/buildroot/package/swupdate/swupdate.service new file mode 100644 index 000000000..a3d8d1939 --- /dev/null +++ b/buildroot/package/swupdate/swupdate.service @@ -0,0 +1,11 @@ +[Unit] +Description=SWUpdate daemon +Documentation=https://github.com/sbabic/swupdate +Documentation=https://sbabic.github.io/swupdate + +[Service] +ExecStart=/usr/lib/swupdate/swupdate.sh +KillMode=mixed + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/swupdate/swupdate.sh b/buildroot/package/swupdate/swupdate.sh new file mode 100644 index 000000000..17d99ef0d --- /dev/null +++ b/buildroot/package/swupdate/swupdate.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# Based on example script created by Adrian Freihofer +# https://github.com/sbabic/meta-swupdate/blob/master/recipes-support/swupdate/swupdate/swupdate.sh + +# Override these variables in sourced script(s) located +# in /usr/lib/swupdate/conf.d or /etc/swupdate/conf.d +SWUPDATE_ARGS="-v ${SWUPDATE_EXTRA_ARGS}" +SWUPDATE_WEBSERVER_ARGS="" +SWUPDATE_SURICATTA_ARGS="" + +# source all files from /etc/swupdate/conf.d and /usr/lib/swupdate/conf.d/ +# A file found in /etc replaces the same file in /usr +for f in `(test -d /usr/lib/swupdate/conf.d/ && ls -1 /usr/lib/swupdate/conf.d/; test -d /etc/swupdate/conf.d && ls -1 /etc/swupdate/conf.d) | sort -u`; do + if [ -f /etc/swupdate/conf.d/$f ]; then + . /etc/swupdate/conf.d/$f + else + . /usr/lib/swupdate/conf.d/$f + fi +done + +if [ "$SWUPDATE_WEBSERVER_ARGS" != "" -a "$SWUPDATE_SURICATTA_ARGS" != "" ]; then + exec /usr/bin/swupdate $SWUPDATE_ARGS -w "$SWUPDATE_WEBSERVER_ARGS" -u "$SWUPDATE_SURICATTA_ARGS" +elif [ "$SWUPDATE_WEBSERVER_ARGS" != "" ]; then + exec /usr/bin/swupdate $SWUPDATE_ARGS -w "$SWUPDATE_WEBSERVER_ARGS" +elif [ "$SWUPDATE_SURICATTA_ARGS" != "" ]; then + exec /usr/bin/swupdate $SWUPDATE_ARGS -u "$SWUPDATE_SURICATTA_ARGS" +else + exec /usr/bin/swupdate $SWUPDATE_ARGS +fi diff --git a/buildroot/package/sysdig/Config.in b/buildroot/package/sysdig/Config.in index ee53b4fa2..7d3c57039 100644 --- a/buildroot/package/sysdig/Config.in +++ b/buildroot/package/sysdig/Config.in @@ -2,18 +2,17 @@ config BR2_PACKAGE_SYSDIG bool "sysdig" depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # libjson - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HAS_THREADS # jq - depends on !BR2_STATIC_LIBS # luajit, elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, jq + depends on !BR2_STATIC_LIBS # elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_JQ select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBB64 select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB @@ -26,9 +25,9 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library and a Linux kernel to be built" +comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 diff --git a/buildroot/package/sysdig/sysdig.mk b/buildroot/package/sysdig/sysdig.mk index c604032cf..bcbb5ce01 100644 --- a/buildroot/package/sysdig/sysdig.mk +++ b/buildroot/package/sysdig/sysdig.mk @@ -9,9 +9,19 @@ SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = GPL-2.0 SYSDIG_LICENSE_FILES = COPYING SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF -SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO +SYSDIG_DEPENDENCIES = \ + elfutils \ + jq \ + jsoncpp \ + libb64 \ + libcurl \ + luainterpreter \ + ncurses \ + openssl \ + zlib + # sysdig creates the module Makefile from a template, which contains a # single place-holder, KBUILD_FLAGS, wich is only replaced with two # things: diff --git a/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch b/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch deleted file mode 100644 index f5b2a39bb..000000000 --- a/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 39ab118a7e79b223941b50b372c8ed51f0e21f4b Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Mon, 16 Mar 2020 15:41:03 +0100 -Subject: [PATCH] configure.ac: fix --with-netsnmp - -The option '--with-net-snmp' did not work, because later checks were using -the variable '$with_netsnmp' rather than '$with_net_snmp'. - -There are two possible solutions: -- make the option '--with-netsnmp' -- change the internal variables - -Taking into account that latest upstream has moved away from autotools and -towards cmake, we opt for the first option that has the least amount of -changes. - -Signed-off-by: Thomas De Schampheleire -Upstream-status: not applicable (latest upstream moved to cmake) - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bfc85c32d..392ab8bf3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -148,8 +148,8 @@ AC_ARG_WITH(libnet, - , - [with_libnet=""]) - --AC_ARG_WITH(net-snmp, -- [ --with-net-snmp=path use path to net-snmp-config script], -+AC_ARG_WITH(netsnmp, -+ [ --with-netsnmp=path use path to net-snmp-config script], - , - [with_netsnmp=""]) - --- -2.24.1 - diff --git a/buildroot/package/syslog-ng/syslog-ng.conf b/buildroot/package/syslog-ng/syslog-ng.conf index e8b9f1fba..99f4ea9d6 100644 --- a/buildroot/package/syslog-ng/syslog-ng.conf +++ b/buildroot/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.24 +@version: 3.29 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/buildroot/package/syslog-ng/syslog-ng.hash b/buildroot/package/syslog-ng/syslog-ng.hash index 62bc48a7a..e4c8f26f8 100644 --- a/buildroot/package/syslog-ng/syslog-ng.hash +++ b/buildroot/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d syslog-ng-3.24.1.tar.gz -sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607 COPYING -sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt +sha256 5cd6b65466671ec5b793fc703a515e07e0da39b79190b2a3c89af176d07e89fd syslog-ng-3.29.1.tar.gz +sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING +sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/buildroot/package/syslog-ng/syslog-ng.mk b/buildroot/package/syslog-ng/syslog-ng.mk index ed8f0c712..7c2368efb 100644 --- a/buildroot/package/syslog-ng/syslog-ng.mk +++ b/buildroot/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.24.1 +SYSLOG_NG_VERSION = 3.29.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt @@ -100,7 +100,7 @@ endif ifeq ($(BR2_PACKAGE_NETSNMP),y) SYSLOG_NG_DEPENDENCIES += netsnmp SYSLOG_NG_CONF_OPTS += --enable-snmp-dest -SYSLOG_NG_CONF_OPTS += --with-netsnmp="$(STAGING_DIR)/usr/bin" +SYSLOG_NG_CONF_OPTS += --with-net-snmp="$(STAGING_DIR)/usr/bin" else SYSLOG_NG_CONF_OPTS += --disable-snmp-dest endif diff --git a/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch b/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch deleted file mode 100644 index 31d27f508..000000000 --- a/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 28c27e2001b709a9cae1db0aba2185ec86ba0454 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Thu, 19 Dec 2019 14:01:00 +0100 -Subject: [PATCH 1/9] sysrepo-plugind CHANGE create plugins dir if it does not - exist - -Fixes #1719 - -[Patch from https://github.com/sysrepo/sysrepo/commit/28c27e2001b709a9cae1db0aba2185ec86ba0454] - -Signed-off-by: Heiko Thiery ---- - src/executables/sysrepo-plugind.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/executables/sysrepo-plugind.c b/src/executables/sysrepo-plugind.c -index 6b11bad6..ddb41c26 100644 ---- a/src/executables/sysrepo-plugind.c -+++ b/src/executables/sysrepo-plugind.c -@@ -225,6 +225,18 @@ load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) - plugins_dir = SRPD_PLUGINS_PATH; - } - -+ /* create the directory if it does not exist */ -+ if (access(plugins_dir, F_OK) == -1) { -+ if (errno != ENOENT) { -+ error_print(0, "Checking plugins dir existence failed (%s).", strerror(errno)); -+ return -1; -+ } -+ if (mkdir(plugins_dir, 00777) == -1) { -+ error_print(0, "Creating plugins dir \"%s\" failed (%s).", plugins_dir, strerror(errno)); -+ return -1; -+ } -+ } -+ - dir = opendir(plugins_dir); - if (!dir) { - error_print(0, "Opening \"%s\" directory failed (%s).", plugins_dir, strerror(errno)); --- -2.20.1 - diff --git a/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch b/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch deleted file mode 100644 index 9b9734f22..000000000 --- a/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 353faffe13852c4204f158b5d4301405bd222c44 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Fri, 20 Dec 2019 13:40:35 +0100 -Subject: [PATCH 9/9] sysrpeo-plugind BUGFIX create plugins dir recursively - -Refs #1719 - -[Patch from https://github.com/sysrepo/sysrepo/commit/353faffe13852c4204f158b5d4301405bd222c44] - -Signed-off-by: Heiko Thiery ---- - src/executables/sysrepo-plugind.c | 30 +++++++++++++++++++++++++++++- - 1 file changed, 29 insertions(+), 1 deletion(-) - -diff --git a/src/executables/sysrepo-plugind.c b/src/executables/sysrepo-plugind.c -index ddb41c26..ca22140e 100644 ---- a/src/executables/sysrepo-plugind.c -+++ b/src/executables/sysrepo-plugind.c -@@ -206,6 +206,34 @@ daemon_init(int debug, sr_log_level_t log_level) - sr_log_syslog("sysrepo-plugind", log_level); - } - -+/* from src/common.c */ -+int -+sr_mkpath(const char *path, mode_t mode) -+{ -+ char *p, *dup; -+ -+ dup = strdup(path); -+ for (p = strchr(dup + 1, '/'); p; p = strchr(p + 1, '/')) { -+ *p = '\0'; -+ if (mkdir(dup, mode) == -1) { -+ if (errno != EEXIST) { -+ *p = '/'; -+ return -1; -+ } -+ } -+ *p = '/'; -+ } -+ free(dup); -+ -+ if (mkdir(path, mode) == -1) { -+ if (errno != EEXIST) { -+ return -1; -+ } -+ } -+ -+ return 0; -+} -+ - static int - load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) - { -@@ -231,7 +259,7 @@ load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) - error_print(0, "Checking plugins dir existence failed (%s).", strerror(errno)); - return -1; - } -- if (mkdir(plugins_dir, 00777) == -1) { -+ if (sr_mkpath(plugins_dir, 00777) == -1) { - error_print(0, "Creating plugins dir \"%s\" failed (%s).", plugins_dir, strerror(errno)); - return -1; - } --- -2.20.1 - diff --git a/buildroot/package/sysrepo/Config.in b/buildroot/package/sysrepo/Config.in index 31f817faa..8de141efc 100644 --- a/buildroot/package/sysrepo/Config.in +++ b/buildroot/package/sysrepo/Config.in @@ -5,13 +5,9 @@ config BR2_PACKAGE_SYSREPO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # host-protobuf - select BR2_PACKAGE_LIBAVL - select BR2_PACKAGE_LIBEV select BR2_PACKAGE_LIBYANG select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PROTOBUF_C help Sysrepo is an YANG-based configuration and operational state data store for Unix/Linux applications. @@ -31,4 +27,3 @@ comment "sysrepo needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/buildroot/package/sysrepo/sysrepo.hash b/buildroot/package/sysrepo/sysrepo.hash index ff2e1166b..cdd2f7e47 100644 --- a/buildroot/package/sysrepo/sysrepo.hash +++ b/buildroot/package/sysrepo/sysrepo.hash @@ -1,2 +1,3 @@ -sha256 be405a33b1713d1114f3c092a6349b25a2de2a0f43a15dc6984c029f70230b3b sysrepo-1.3.21.tar.gz -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE +# Locally calculated +sha256 f0f894d4ed98ce9d20fda219378b844731d796e95115c07f4c067d853e20ca36 sysrepo-1.4.70.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/buildroot/package/sysrepo/sysrepo.mk b/buildroot/package/sysrepo/sysrepo.mk index 5f87ac38a..8a2e56bd6 100644 --- a/buildroot/package/sysrepo/sysrepo.mk +++ b/buildroot/package/sysrepo/sysrepo.mk @@ -4,13 +4,13 @@ # ################################################################################ -SYSREPO_VERSION = 1.3.21 +SYSREPO_VERSION = 1.4.70 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = Apache-2.0 SYSREPO_LICENSE_FILES = LICENSE -SYSREPO_DEPENDENCIES = libev libavl libyang pcre protobuf-c host-sysrepo -HOST_SYSREPO_DEPENDENCIES = host-libev host-libavl host-libyang host-pcre host-protobuf-c +SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo +HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre SYSREPO_CONF_OPTS = \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/buildroot/package/sysstat/sysstat.hash b/buildroot/package/sysstat/sysstat.hash index 3bbefac18..57fc8f181 100644 --- a/buildroot/package/sysstat/sysstat.hash +++ b/buildroot/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 5300345489e455ac62547b072bb8531414758fdf sysstat-11.6.3.tar.xz +sha1 4da5a48d0152eba5b34d94bf28dcb08fc48fb32b sysstat-12.2.1.tar.xz # Locally calculated -sha256 54b306a1634e39710767936d4d1be17e8b65062aa04c837b41479c4b28b511bd sysstat-11.6.3.tar.xz -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING +sha256 8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732 sysstat-12.2.1.tar.xz +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/buildroot/package/sysstat/sysstat.mk b/buildroot/package/sysstat/sysstat.mk index 490e8f1b2..f994ad6e3 100644 --- a/buildroot/package/sysstat/sysstat.mk +++ b/buildroot/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 11.6.3 +SYSSTAT_VERSION = 12.2.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in index c727082a1..ec34478e3 100644 --- a/buildroot/package/systemd/Config.in +++ b/buildroot/package/systemd/Config.in @@ -12,23 +12,27 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS default y if BR2_riscv default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" depends on BR2_INIT_SYSTEMD + depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # kmod - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus - depends on BR2_USE_MMU # dbus + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_SSP + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools @@ -107,35 +111,55 @@ config BR2_PACKAGE_SYSTEMD_BOOT https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/ +config BR2_PACKAGE_SYSTEMD_INITRD + bool "Services for booting from initrd" + help + Install various services that are only useful if systemd is + run from an initrd. + +config BR2_PACKAGE_SYSTEMD_KERNELINSTALL + bool "install kernel-install and related files" + help + kernel-install is used to install and remove kernel and + initramfs images to and from the boot loader partition. + The boot loader partition will usually be one of + /boot, /efi, or /boot/efi. + +config BR2_PACKAGE_SYSTEMD_ANALYZE + bool "systemd-analyze" + help + systemd-analyze may be used to determine system boot-up + performance statistics and retrieve other state and tracing + information from the system and service manager, and to + verify the correctness of unit files. + It is also used to access special functions useful for + advanced system manager debugging. + config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH string default "ia32" if BR2_i386 default "x64" if BR2_x86_64 depends on BR2_PACKAGE_SYSTEMD_BOOT -config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - bool "HTTP server for journal events" +config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + bool "enable journal remote tools" + select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMICROHTTPD help + journal remote functionality adds three tools: + systemd-journal-gatewayd serves journal events over the - network. Clients must connect using HTTP. The server - listens on port 19531 by default. + network. - http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html - -config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE - bool "enable systemd-journal-remote" - depends on BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - select BR2_PACKAGE_LIBCURL - help systemd-journal-remote is a command to receive serialized - journal events and store them to journal files. Input - streams are in the Journal Export Format[1], i.e. like the - output from journalctl --output=export. For transport over - the network, this serialized stream is usually carried over - an HTTPS connection. + journal events and store them to journal files. + systemd-journal-upload will upload journal entries to the + URL specified with --url=. + + https://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.service.html + https://www.freedesktop.org/software/systemd/man/systemd-journal-upload.html config BR2_PACKAGE_SYSTEMD_BACKLIGHT bool "enable backlight support" @@ -182,12 +206,35 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" + select BR2_PACKAGE_SYSTEMD_INITRD help When this features is enabled, additional tools and services are built to support suspending and resuming the system. http://www.freedesktop.org/software/systemd/man/systemd-sleep.html +config BR2_PACKAGE_SYSTEMD_HOMED + bool "enable home daemon" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2 + depends on BR2_USE_MMU # cryptsetup -> lvm2 + depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key + select BR2_PACKAGE_CRYPTSETUP + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-homed is a system service that may be used to create, + remove, change or inspect home directories. + + https://www.freedesktop.org/software/systemd/man/systemd-homed.service.html + +comment "homed support needs a toolchain w/ threads, dynamic library, kernel headers >= 4.12" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_SYSTEMD_HOSTNAMED bool "enable hostname daemon" default y @@ -213,8 +260,6 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LZ4 select BR2_PACKAGE_XZ select BR2_PACKAGE_ZLIB help @@ -318,6 +363,16 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html +config BR2_PACKAGE_SYSTEMD_REPART + bool "enable repart support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-repart grows and adds partitions to a partition table, + based on the configuration files described in repart.d. + + https://www.freedesktop.org/software/systemd/man/systemd-repart.html + config BR2_PACKAGE_SYSTEMD_RESOLVED bool "enable resolve daemon" default y @@ -393,6 +448,18 @@ config BR2_PACKAGE_SYSTEMD_TMPFILES http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html +config BR2_PACKAGE_SYSTEMD_USERDB + bool "enable userdb daemon" + help + systemd-userdbd is a system service that multiplexes + user/group lookups to all local services that provide JSON + user/group record definitions to the system. In addition it + synthesizes JSON user/group records from classic UNIX/glibc + NSS user/group records in order to provide full backwards + compatibility. + + https://www.freedesktop.org/software/systemd/man/systemd-userdbd.service.html + config BR2_PACKAGE_SYSTEMD_VCONSOLE bool "enable vconsole tool" default y diff --git a/buildroot/package/systemd/Config.in.host b/buildroot/package/systemd/Config.in.host index 219f24239..8e00bcf5c 100644 --- a/buildroot/package/systemd/Config.in.host +++ b/buildroot/package/systemd/Config.in.host @@ -1,3 +1,4 @@ # Select this if you need host systemd tools (e.g. systemctl) config BR2_PACKAGE_HOST_SYSTEMD bool + depends on BR2_HOST_GCC_AT_LEAST_5 diff --git a/buildroot/package/systemd/systemd.hash b/buildroot/package/systemd/systemd.hash index db8f0193b..cad249199 100644 --- a/buildroot/package/systemd/systemd.hash +++ b/buildroot/package/systemd/systemd.hash @@ -1,6 +1,6 @@ # sha256 locally computed -sha256 d526f217450f98c695d0a20285436e48f1f1b3f31fe76aa4d6211ec60fee33c4 systemd-244.5.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE +sha256 f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178 systemd-246.5.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 +sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index c01e8c9a3..cb12f667d 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 244.5 +SYSTEMD_VERSION = 246.5 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE @@ -15,33 +15,40 @@ SYSTEMD_DEPENDENCIES = \ host-gperf \ kmod \ libcap \ - util-linux \ + util-linux-libs \ $(TARGET_NLS_DEPENDENCIES) +SYSTEMD_SELINUX_MODULES = systemd udev + SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ - -Drootlibdir='/usr/lib' \ - -Dblkid=true \ - -Dman=false \ - -Dima=false \ - -Dldconfig=false \ - -Ddefault-dnssec=no \ -Ddefault-hierarchy=hybrid \ - -Dtests=false \ + -Didn=true \ + -Dima=false \ + -Dkexec-path=/usr/sbin/kexec \ + -Dkmod-path=/usr/bin/kmod \ + -Dldconfig=false \ + -Dloadkeys-path=/usr/bin/loadkeys \ + -Dman=false \ + -Dmount-path=/usr/bin/mount \ + -Dnss-systemd=true \ + -Dportabled=false \ + -Dquotacheck-path=/usr/sbin/quotacheck \ + -Dquotaon-path=/usr/sbin/quotaon \ + -Drootlibdir='/usr/lib' \ + -Dsetfont-path=/usr/bin/setfont \ -Dsplit-bin=true \ -Dsplit-usr=false \ - -Dsystem-uid-max=999 \ - -Dsystem-gid-max=999 \ - -Dtelinit-path=$(TARGET_DIR)/sbin/telinit \ - -Dkmod-path=/usr/bin/kmod \ - -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ - -Dmount-path=/usr/bin/mount \ + -Dsystem-gid-max=999 \ + -Dsystem-uid-max=999 \ + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ + -Dtelinit-path= \ + -Dtests=false \ -Dumount-path=/usr/bin/umount \ - -Dnobody-group=nogroup \ - -Didn=true \ - -Dnss-systemd=true + -Dutmp=false ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl @@ -50,6 +57,13 @@ else SYSTEMD_CONF_OPTS += -Dacl=false endif +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +SYSTEMD_DEPENDENCIES += libapparmor +SYSTEMD_CONF_OPTS += -Dapparmor=true +else +SYSTEMD_CONF_OPTS += -Dapparmor=false +endif + ifeq ($(BR2_PACKAGE_AUDIT),y) SYSTEMD_DEPENDENCIES += audit SYSTEMD_CONF_OPTS += -Daudit=true @@ -71,6 +85,13 @@ else SYSTEMD_CONF_OPTS += -Delfutils=false endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +SYSTEMD_DEPENDENCIES += gnutls +SYSTEMD_CONF_OPTS += -Dgnutls=true +else +SYSTEMD_CONF_OPTS += -Dgnutls=false +endif + ifeq ($(BR2_PACKAGE_IPTABLES),y) SYSTEMD_DEPENDENCIES += iptables SYSTEMD_CONF_OPTS += -Dlibiptc=true @@ -110,6 +131,13 @@ else SYSTEMD_CONF_OPTS += -Dbzip2=false endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +SYSTEMD_DEPENDENCIES += zstd +SYSTEMD_CONF_OPTS += -Dzstd=true +else +SYSTEMD_CONF_OPTS += -Dzstd=false +endif + ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 SYSTEMD_CONF_OPTS += -Dlz4=true @@ -124,6 +152,12 @@ else SYSTEMD_CONF_OPTS += -Dpam=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),y) +SYSTEMD_CONF_OPTS += -Dfdisk=true +else +SYSTEMD_CONF_OPTS += -Dfdisk=false +endif + ifeq ($(BR2_PACKAGE_VALGRIND),y) SYSTEMD_DEPENDENCIES += valgrind SYSTEMD_CONF_OPTS += -Dvalgrind=true @@ -154,9 +188,23 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_P11_KIT),y) +SYSTEMD_DEPENDENCIES += p11-kit +SYSTEMD_CONF_OPTS += -Dp11kit=true +else +SYSTEMD_CONF_OPTS += -Dp11kit=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SYSTEMD_DEPENDENCIES += openssl +SYSTEMD_CONF_OPTS += -Dopenssl=true +else +SYSTEMD_CONF_OPTS += -Dopenssl=false endif ifeq ($(BR2_PACKAGE_PCRE2),y) @@ -166,23 +214,50 @@ else SYSTEMD_CONF_OPTS += -Dpcre2=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) -SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += -Dmicrohttpd=true -ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) -SYSTEMD_CONF_OPTS += -Dqrencode=true -SYSTEMD_DEPENDENCIES += libqrencode +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +SYSTEMD_CONF_OPTS += -Dblkid=true else -SYSTEMD_CONF_OPTS += -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dblkid=false endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) +SYSTEMD_CONF_OPTS += -Dnologin-path=/sbin/nologin else -SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dnologin-path=/bin/false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) +SYSTEMD_CONF_OPTS += -Dinitrd=true +else +SYSTEMD_CONF_OPTS += -Dinitrd=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_KERNELINSTALL),y) +SYSTEMD_CONF_OPTS += -Dkernel-install=true +else +SYSTEMD_CONF_OPTS += -Dkernel-install=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_ANALYZE),y) +SYSTEMD_CONF_OPTS += -Danalyze=true +else +SYSTEMD_CONF_OPTS += -Danalyze=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) -SYSTEMD_CONF_OPTS += -Dremote=true +# remote also depends on libcurl, this is already added above. +SYSTEMD_DEPENDENCIES += libmicrohttpd +SYSTEMD_CONF_OPTS += -Dremote=true -Dmicrohttpd=true +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else -SYSTEMD_CONF_OPTS += -Dremote=false +SYSTEMD_CONF_OPTS += -Dremote=false -Dmicrohttpd=false +endif + +ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) +SYSTEMD_DEPENDENCIES += libqrencode +SYSTEMD_CONF_OPTS += -Dqrencode=true +else +SYSTEMD_CONF_OPTS += -Dqrencode=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) @@ -267,9 +342,9 @@ SYSTEMD_CONF_OPTS += -Dlogind=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) -SYSTEMD_CONF_OPTS += -Dmachined=true +SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true else -SYSTEMD_CONF_OPTS += -Dmachined=false +SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_IMPORTD),y) @@ -278,6 +353,13 @@ else SYSTEMD_CONF_OPTS += -Dimportd=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) +SYSTEMD_CONF_OPTS += -Dhomed=true +SYSTEMD_DEPENDENCIES += cryptsetup openssl +else +SYSTEMD_CONF_OPTS += -Dhomed=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HOSTNAMED),y) SYSTEMD_CONF_OPTS += -Dhostnamed=true else @@ -302,9 +384,22 @@ else SYSTEMD_CONF_OPTS += -Dlocaled=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y) +SYSTEMD_CONF_OPTS += -Drepart=true +SYSTEMD_DEPENDENCIES += openssl +else +SYSTEMD_CONF_OPTS += -Drepart=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_USERDB),y) +SYSTEMD_CONF_OPTS += -Duserdb=true +else +SYSTEMD_CONF_OPTS += -Duserdb=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper +SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -324,7 +419,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager +SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -342,15 +437,25 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK ln -sf ../run/systemd/resolve/resolv.conf \ $(TARGET_DIR)/etc/resolv.conf endef -SYSTEMD_CONF_OPTS += -Dresolve=true -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager +SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true +SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver else -SYSTEMD_CONF_OPTS += -Dresolve=false +SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +SYSTEMD_CONF_OPTS += -Ddns-over-tls=gnutls -Ddefault-dns-over-tls=opportunistic +SYSTEMD_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +SYSTEMD_CONF_OPTS += -Ddns-over-tls=openssl -Ddefault-dns-over-tls=opportunistic +SYSTEMD_DEPENDENCIES += openssl +else +SYSTEMD_CONF_OPTS += -Ddns-over-tls=false -Ddefault-dns-over-tls=no endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization +SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -419,20 +524,33 @@ define SYSTEMD_INSTALL_IMAGES_CMDS endef define SYSTEMD_USERS - - - input -1 * - - - Input device group + # udev user groups + # systemd user groups - - systemd-journal -1 * - - - Journal - - - render -1 * - - - DRI rendering nodes - - - kvm -1 * - - - kvm nodes - systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus - systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway - systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote - systemd-journal-upload -1 systemd-journal-upload -1 * - - - Journal Upload + $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) endef +define SYSTEMD_INSTALL_NSSCONFIG_HOOK + $(SED) '/^passwd:/ {/systemd/! s/$$/ systemd/}' \ + -e '/^group:/ {/systemd/! s/$$/ [SUCCESS=merge] systemd/}' \ + $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ + -e '/^hosts:/ s/[[:space:]]*mymachines//' \ + -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ + $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ + -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ + $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ + -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ + -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ + -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ + $(TARGET_DIR)/etc/nsswitch.conf +endef + +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_INSTALL_NSSCONFIG_HOOK + ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd provides multiple units to autospawn getty as neede # * getty@.service to start a getty on normal TTY @@ -503,6 +621,20 @@ SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) +define SYSTEMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) + $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_SIGNALFD) + $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERFD) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) + $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_SYSFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) + $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) +endef + # We need a very minimal host variant, so we disable as much as possible. HOST_SYSTEMD_CONF_OPTS = \ -Dsplit-bin=true \ @@ -519,6 +651,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dtpm=false \ -Denvironment-d=false \ -Dbinfmt=false \ + -Drepart=false \ -Dcoredump=false \ -Dpstore=false \ -Dlogind=false \ @@ -526,6 +659,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dlocaled=false \ -Dmachined=false \ -Dportabled=false \ + -Duserdb=false \ + -Dhomed=false \ -Dnetworkd=false \ -Dtimedated=false \ -Dtimesyncd=false \ @@ -559,7 +694,14 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dtests=false \ -Dglib=false \ -Dacl=false \ - -Dsysvinit-path='' + -Dsysvinit-path='' \ + -Dinitrd=false \ + -Dxdg-autostart=false \ + -Dkernel-install=false \ + -Dsystemd-analyze=false \ + -Dlibcryptsetup=false \ + -Daudit=false \ + -Dzstd=false HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/buildroot/package/terminology/terminology.hash b/buildroot/package/terminology/terminology.hash index ed386fb7b..5dee767db 100644 --- a/buildroot/package/terminology/terminology.hash +++ b/buildroot/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz.sha256sum -sha256 b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 terminology-1.6.0.tar.xz -sha256 a907d434f4691990ed8f2826ff7546672e9934a26c798351da12ed544dadc628 COPYING +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.1.tar.xz.sha256sum +sha256 04a69ac8ade443cba7dae20f82bbaa431fd155cec60c133b263d82f18e93b8bb terminology-1.8.1.tar.xz +sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/buildroot/package/terminology/terminology.mk b/buildroot/package/terminology/terminology.mk index add80825a..d93e34878 100644 --- a/buildroot/package/terminology/terminology.mk +++ b/buildroot/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.6.0 +TERMINOLOGY_VERSION = 1.8.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause diff --git a/buildroot/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch b/buildroot/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch new file mode 100644 index 000000000..c96455534 --- /dev/null +++ b/buildroot/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch @@ -0,0 +1,29 @@ +From 6f994166d8571961a08479736ae86c5baa2bb47f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 7 Aug 2020 12:07:45 +0200 +Subject: [PATCH] Use "extern" qualifier to fix gcc 10.x build + +Patch from +https://src.fedoraproject.org/rpms/tftp/raw/master/f/tftp-hpa-5.2-gcc10.patch. + +Signed-off-by: Thomas Petazzoni +--- + tftp/tftp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tftp/tftp.c b/tftp/tftp.c +index d15da22..d067f96 100644 +--- a/tftp/tftp.c ++++ b/tftp/tftp.c +@@ -48,7 +48,7 @@ extern int maxtimeout; + #define PKTSIZE SEGSIZE+4 + char ackbuf[PKTSIZE]; + int timeout; +-sigjmp_buf toplevel; ++extern sigjmp_buf toplevel; + sigjmp_buf timeoutbuf; + + static void nak(int, const char *); +-- +2.26.2 + diff --git a/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch b/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch deleted file mode 100644 index 92c55d05a..000000000 --- a/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f87ae3963e651fe9f4b3125192c77aae86c007e0 Mon Sep 17 00:00:00 2001 -From: Patrick Havelange -Date: Mon, 21 Jan 2019 09:49:23 +0100 -Subject: [PATCH] Force to keep TPipedTransport::peek() to avoid linker error. - -Otherwise got the "defined in discarded section" linker error -with x86-64-musl toolchain. This is probably a toolchain issue - the -compiler shouldn't remove that function. - -Signed-off-by: Patrick Havelange -Upstream-status: Not Applicable ---- - lib/cpp/src/thrift/transport/TTransportUtils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/cpp/src/thrift/transport/TTransportUtils.h b/lib/cpp/src/thrift/transport/TTransportUtils.h -index f3b4c5a..7589182 100644 ---- a/lib/cpp/src/thrift/transport/TTransportUtils.h -+++ b/lib/cpp/src/thrift/transport/TTransportUtils.h -@@ -114,7 +114,7 @@ public: - - bool isOpen() { return srcTrans_->isOpen(); } - -- bool peek() { -+ bool __attribute__ ((used)) peek() { - if (rPos_ >= rLen_) { - // Double the size of the underlying buffer if it is full - if (rLen_ == rBufSize_) { --- -2.17.1 - diff --git a/buildroot/package/thrift/thrift.hash b/buildroot/package/thrift/thrift.hash index 7aca8b5a7..f342dc348 100644 --- a/buildroot/package/thrift/thrift.hash +++ b/buildroot/package/thrift/thrift.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz.sha256 -sha256 c336099532b765a6815173f62df0ed897528a9d551837d627c1f87fadad90428 thrift-0.12.0.tar.gz +# From https://www.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz.sha256 +sha256 7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 thrift-0.13.0.tar.gz # License files, locally calculated -sha256 23df881cec3192d1f4474633c14eb2ec30a45b84f8daeb82b9de5d2bd3ac8218 LICENSE +sha256 23df881cec3192d1f4474633c14eb2ec30a45b84f8daeb82b9de5d2bd3ac8218 LICENSE diff --git a/buildroot/package/thrift/thrift.mk b/buildroot/package/thrift/thrift.mk index 4260fe7e1..8ad37b6b2 100644 --- a/buildroot/package/thrift/thrift.mk +++ b/buildroot/package/thrift/thrift.mk @@ -4,7 +4,7 @@ # ################################################################################ -THRIFT_VERSION = 0.12.0 +THRIFT_VERSION = 0.13.0 THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) THRIFT_LICENSE = Apache-2.0 THRIFT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch b/buildroot/package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..e36b735e8 --- /dev/null +++ b/buildroot/package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch @@ -0,0 +1,35 @@ +From 9ed1946cef876acd5346ae806eecd7fc2e1e5341 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 3 Oct 2020 10:32:48 +0200 +Subject: [PATCH] plt.h: fix build with gcc 10 + +Drop EFUSE_PARAMETER_TYPE_ENM to avoid the following build failure with +gcc 10 (which defaults to -fno-common): + +/home/naourr/work/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: misc_cmds.o:(.bss+0x0): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/e96c70910544085dc5299fa59f80ab9c5922fde2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/gxk/ti-utils/pull/2] +--- + plt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plt.h b/plt.h +index 523fded..8ba01c9 100644 +--- a/plt.h ++++ b/plt.h +@@ -363,7 +363,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT { + TX_BIP_PD_BUFFER_VBIAS_ERROR_E, + EFUSE_NUMBER_OF_PARAMETERS_E, + EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1) +-} EFUSE_PARAMETER_TYPE_ENM; ++}; + + int get_mac_addr(int ifc_num, unsigned char *mac_addr); + +-- +2.28.0 + diff --git a/buildroot/package/timescaledb/Config.in b/buildroot/package/timescaledb/Config.in new file mode 100644 index 000000000..af4a86852 --- /dev/null +++ b/buildroot/package/timescaledb/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TIMESCALEDB + bool "timescaledb" + depends on BR2_PACKAGE_POSTGRESQL + help + TimescaleDB is an open-source database designed + to make SQL scalable for time-series data. + It is engineered up from PostgreSQL and packaged + as a PostgreSQL extension, providing automatic + partitioning across time and space (partitioning key), + as well as full SQL support. + + https://www.timescale.com/ diff --git a/buildroot/package/timescaledb/timescaledb.hash b/buildroot/package/timescaledb/timescaledb.hash new file mode 100644 index 000000000..452e2efc8 --- /dev/null +++ b/buildroot/package/timescaledb/timescaledb.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d0b7a153ff3e02ecf033a869ecdf4286f8610ea76140baa84928fc3a80223e99 timescaledb-1.7.4.tar.gz +sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/buildroot/package/timescaledb/timescaledb.mk b/buildroot/package/timescaledb/timescaledb.mk new file mode 100644 index 000000000..ee58c692b --- /dev/null +++ b/buildroot/package/timescaledb/timescaledb.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# timescaledb +# +################################################################################ + +TIMESCALEDB_VERSION = 1.7.4 +TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) +TIMESCALEDB_LICENSE = Apache-2.0 +TIMESCALEDB_LICENSE_FILES = LICENSE + +TIMESCALEDB_DEPENDENCIES = postgresql + +# The PG_CPPFLAGS, PG_CFLAGS, PG_LDFLAGS and PG_LIBS variables must be +# non-empty, otherwise CMake will call the pg_config script, and our +# pg_config replacement doesn't implement --cppflags --cflags +# --ldflags and --libs. +TIMESCALEDB_CONF_OPTS = \ + -DREGRESS_CHECKS=OFF \ + -DPG_PKGLIBDIR=lib/postgresql \ + -DPG_SHAREDIR=share/postgresql \ + -DPG_BINDIR=bin \ + -DPG_CPPFLAGS="$(TARGET_CPPFLAGS) " \ + -DPG_CFLAGS="$(TARGET_CFLAGS) " \ + -DPG_LDFLAGS="$(TARGET_LDFLAGS) " \ + -DPG_LIBS=" " + +# There's no dependency on the OpenSSL package, because USE_OPENSSL +# only tells if postgresql was built with OpenSSL support or not. +ifeq ($(BR2_PACKAGE_OPENSSL),y) +TIMESCALEDB_CONF_OPTS += -DUSE_OPENSSL=1 +else +TIMESCALEDB_CONF_OPTS += -DUSE_OPENSSL=0 +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/tini/tini.hash b/buildroot/package/tini/tini.hash index 7c548183b..83a97a40a 100644 --- a/buildroot/package/tini/tini.hash +++ b/buildroot/package/tini/tini.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE -sha256 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2 tini-0.18.0.tar.gz +sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE +sha256 0fd35a7030052acd9f58948d1d900fe1e432ee37103c5561554408bdac6bbf0d tini-0.19.0.tar.gz diff --git a/buildroot/package/tini/tini.mk b/buildroot/package/tini/tini.mk index 986e612a8..157477f8d 100644 --- a/buildroot/package/tini/tini.mk +++ b/buildroot/package/tini/tini.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINI_VERSION = 0.18.0 +TINI_VERSION = 0.19.0 TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tinydtls/tinydtls.mk b/buildroot/package/tinydtls/tinydtls.mk index e683dea1a..b4fd06ff7 100644 --- a/buildroot/package/tinydtls/tinydtls.mk +++ b/buildroot/package/tinydtls/tinydtls.mk @@ -9,6 +9,7 @@ TINYDTLS_SITE = $(call github,eclipse,tinydtls,v$(TINYDTLS_VERSION)) TINYDTLS_LICENSE = EPL-1.0 or EDL-1.0 TINYDTLS_LICENSE_FILES = LICENSE TINYDTLS_INSTALL_STAGING = YES +TINYDTLS_DEPENDENCIES = host-pkgconf # From git TINYDTLS_AUTORECONF = YES # use inttypes.h data types instead of u_intXX_t for musl compatibility diff --git a/buildroot/package/tinyhttpd/0001-misc-fixes.patch b/buildroot/package/tinyhttpd/0001-misc-fixes.patch deleted file mode 100644 index 05d6e50a7..000000000 --- a/buildroot/package/tinyhttpd/0001-misc-fixes.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur tinyhttpd-0.1.0/httpd.c tinyhttpd-0.1.0-patched/httpd.c ---- tinyhttpd-0.1.0/httpd.c 2001-04-21 19:13:13.000000000 -0500 -+++ tinyhttpd-0.1.0-patched/httpd.c 2007-07-02 09:19:27.000000000 -0500 -@@ -4,14 +4,6 @@ - * CSE 4344 (Network concepts), Prof. Zeigler - * University of Texas at Arlington - */ --/* This program compiles for Sparc Solaris 2.6. -- * To compile for Linux: -- * 1) Comment out the #include line. -- * 2) Comment out the line that defines the variable newthread. -- * 3) Comment out the two lines that run pthread_create(). -- * 4) Uncomment the line that runs accept_request(). -- * 5) Remove -lsocket from the Makefile. -- */ - #include - #include - #include -@@ -22,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -30,7 +21,6 @@ - - #define SERVER_STRING "Server: jdbhttpd/0.1.0\r\n" - --void accept_request(int); - void bad_request(int); - void cat(int, FILE *); - void cannot_execute(int); -@@ -102,7 +92,7 @@ - } - } - -- sprintf(path, "htdocs%s", url); -+ sprintf(path, "/var/www%s", url); - if (path[strlen(path) - 1] == '/') - strcat(path, "index.html"); - if (stat(path, &st) == -1) { -@@ -475,11 +465,10 @@ - int main(void) - { - int server_sock = -1; -- u_short port = 0; -+ u_short port = 80; - int client_sock = -1; - struct sockaddr_in client_name; - int client_name_len = sizeof(client_name); -- pthread_t newthread; - - server_sock = startup(&port); - printf("httpd running on port %d\n", port); -@@ -491,9 +480,7 @@ - &client_name_len); - if (client_sock == -1) - error_die("accept"); -- /* accept_request(client_sock); */ -- if (pthread_create(&newthread , NULL, accept_request, client_sock) != 0) -- perror("pthread_create"); -+ accept_request(client_sock); - } - - close(server_sock); -diff -ur tinyhttpd-0.1.0/Makefile tinyhttpd-0.1.0-patched/Makefile ---- tinyhttpd-0.1.0/Makefile 2001-04-21 17:03:39.000000000 -0500 -+++ tinyhttpd-0.1.0-patched/Makefile 2007-07-02 10:29:41.000000000 -0500 -@@ -1,7 +1,7 @@ - all: httpd - - httpd: httpd.c -- gcc -W -Wall -lsocket -lpthread -o httpd httpd.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -W -Wall -o httpd httpd.c - - clean: -- rm httpd -+ rm -f httpd diff --git a/buildroot/package/tinyhttpd/Config.in b/buildroot/package/tinyhttpd/Config.in deleted file mode 100644 index f648bcd36..000000000 --- a/buildroot/package/tinyhttpd/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_TINYHTTPD - bool "tinyhttpd" - depends on BR2_USE_MMU # fork() - help - A relatively simple webserver written as a school - project. It is exceedingly simple, threaded and handles - basic CGI scripts. - - http://sourceforge.net/projects/tinyhttpd/ diff --git a/buildroot/package/tinyhttpd/S85tinyhttpd b/buildroot/package/tinyhttpd/S85tinyhttpd deleted file mode 100644 index f3f1de69b..000000000 --- a/buildroot/package/tinyhttpd/S85tinyhttpd +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -NAME=tinyhttpd - -mkdir -p /var/www - -case "$1" in - start) - printf "Starting $NAME: " - $NAME > /dev/null & - echo "done" - ;; - stop) - printf "Stopping $NAME: " - killall -9 $NAME - echo "done" - ;; - restart) - printf "Restarting $NAME: " - killall -9 $NAME - sleep 1 - $NAME > /dev/null & - echo "done" - ;; - *) - echo "Usage: /etc/init.d/S85tinyhttpd {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/buildroot/package/tinyhttpd/tinyhttpd.hash b/buildroot/package/tinyhttpd/tinyhttpd.hash deleted file mode 100644 index fc8ff4ee2..000000000 --- a/buildroot/package/tinyhttpd/tinyhttpd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 56609b82869c80ba71b2a2af166a0bcaffe21e7412f4594e04b9a5abf733435a tinyhttpd-0.1.0.tar.gz -sha256 4289e6d4f7ba72672dbd45ab78a8e02babf3d6e0577eeac5b2ef6926da6f4a87 README diff --git a/buildroot/package/tinyhttpd/tinyhttpd.mk b/buildroot/package/tinyhttpd/tinyhttpd.mk deleted file mode 100644 index 6b3ba5f30..000000000 --- a/buildroot/package/tinyhttpd/tinyhttpd.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# tinyhttpd -# -################################################################################ - -TINYHTTPD_VERSION = 0.1.0 -TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION) -TINYHTTPD_LICENSE = GPL -TINYHTTPD_LICENSE_FILES = README - -define TINYHTTPD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -define TINYHTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd - mkdir -p $(TARGET_DIR)/var/www -endef - -define TINYHTTPD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \ - $(TARGET_DIR)/etc/init.d/S85tinyhttpd -endef - -define TINYHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/tinyproxy/Config.in b/buildroot/package/tinyproxy/Config.in new file mode 100644 index 000000000..aec2ab81a --- /dev/null +++ b/buildroot/package/tinyproxy/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_TINYPROXY + bool "tinyproxy" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + help + Tinyproxy is a small, efficient HTTP/SSL proxy daemon released + under the GNU General Public License. Tinyproxy is very + useful in a small network setting, where a larger proxy would + be too resource intensive. + + https://tinyproxy.github.io + +comment "tinyproxy needs a toolchain w/ threads, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on BR2_USE_MMU diff --git a/buildroot/package/tinyproxy/tinyproxy.hash b/buildroot/package/tinyproxy/tinyproxy.hash new file mode 100644 index 000000000..099c97488 --- /dev/null +++ b/buildroot/package/tinyproxy/tinyproxy.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2 diff --git a/buildroot/package/tinyproxy/tinyproxy.mk b/buildroot/package/tinyproxy/tinyproxy.mk new file mode 100644 index 000000000..6120d183c --- /dev/null +++ b/buildroot/package/tinyproxy/tinyproxy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# tinyproxy +# +################################################################################ + +TINYPROXY_VERSION = 1.10.0 +TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION) +TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.bz2 +TINYPROXY_LICENSE = GPL-2.0+ +TINYPROXY_LICENSE_FILES = COPYING +TINYPROXY_CONF_ENV = ac_cv_path_A2X=no + +$(eval $(autotools-package)) diff --git a/buildroot/package/tinyxml2/tinyxml2.hash b/buildroot/package/tinyxml2/tinyxml2.hash index bb0f8108f..3c59d159b 100644 --- a/buildroot/package/tinyxml2/tinyxml2.hash +++ b/buildroot/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3 tinyxml2-7.1.0.tar.gz -sha256 beed3466425970b9d970e573947f1fe7d3cbe41ed7e2c39b0daf45f7de053c43 readme.md +sha256 6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c tinyxml2-8.0.0.tar.gz +sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt diff --git a/buildroot/package/tinyxml2/tinyxml2.mk b/buildroot/package/tinyxml2/tinyxml2.mk index 67f626428..b06d849b2 100644 --- a/buildroot/package/tinyxml2/tinyxml2.mk +++ b/buildroot/package/tinyxml2/tinyxml2.mk @@ -4,10 +4,10 @@ # ################################################################################ -TINYXML2_VERSION = 7.1.0 +TINYXML2_VERSION = 8.0.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib -TINYXML2_LICENSE_FILES = readme.md +TINYXML2_LICENSE_FILES = LICENSE.txt TINYXML2_INSTALL_STAGING = YES ifeq ($(BR2_STATIC_LIBS),y) diff --git a/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch index e4cd24e13..128b6ed0c 100644 --- a/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch +++ b/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch @@ -8,8 +8,8 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10 & - 0.3.4.8, 0.3.5.7] +[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, + 0.3.4.8, 0.3.5.7 & 0.4.4.5] [Fabrice: fix detection of openssl functions in 0.3.5.8] Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls @@ -38,7 +38,7 @@ diff --git a/configure.ac b/configure.ac index 05e1392cf..580befa6b 100644 --- a/configure.ac +++ b/configure.ac -@@ -885,7 +885,7 @@ AC_ARG_WITH(ssl-dir, +@@ -973,7 +973,7 @@ AC_ARG_WITH(ssl-dir, ]) AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) @@ -47,7 +47,7 @@ index 05e1392cf..580befa6b 100644 [#include char *getenv(const char *);], [struct ssl_cipher_st; -@@ -919,7 +919,7 @@ dnl Now check for particular openssl functions. +@@ -1005,7 +1005,7 @@ dnl Now check for particular openssl functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" @@ -60,7 +60,7 @@ diff --git a/src/test/include.am b/src/test/include.am index ecb768957..39a622e88 100644 --- a/src/test/include.am +++ b/src/test/include.am -@@ -317,8 +317,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) +@@ -400,8 +400,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_ntor_cl_LDADD = \ $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @@ -71,7 +71,7 @@ index ecb768957..39a622e88 100644 @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) -@@ -327,8 +327,8 @@ src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c +@@ -410,8 +410,8 @@ src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_hs_ntor_cl_LDADD = \ $(TOR_INTERNAL_LIBS) \ @@ -86,7 +86,7 @@ diff --git a/src/tools/include.am b/src/tools/include.am index f7aa7e0d1..4c4e8aa7a 100644 --- a/src/tools/include.am +++ b/src/tools/include.am -@@ -30,7 +30,7 @@ src_tools_tor_gencert_LDADD = \ +@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ @@ -95,7 +95,7 @@ index f7aa7e0d1..4c4e8aa7a 100644 @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ endif -@@ -40,7 +40,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ +@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ src/trunnel/libor-trunnel.a \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ diff --git a/buildroot/package/tor/tor.hash b/buildroot/package/tor/tor.hash index e55f3ea3c..ddf1a880f 100644 --- a/buildroot/package/tor/tor.hash +++ b/buildroot/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06a1d835ddf382f6bca40a62e8fb40b71b2f73d56f0d53523c8bd5caf9b3026d tor-0.4.2.7.tar.gz +sha256 a45ca00afe765e3baa839767c9dd6ac9a46dd01720a3a8ff4d86558c12359926 tor-0.4.4.5.tar.gz sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE diff --git a/buildroot/package/tor/tor.mk b/buildroot/package/tor/tor.mk index 09f780d3f..fe9b52670 100644 --- a/buildroot/package/tor/tor.mk +++ b/buildroot/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.2.7 +TOR_VERSION = 0.4.4.5 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch index b2a9cb4f7..812c753ff 100644 --- a/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch +++ b/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch @@ -1,4 +1,4 @@ -From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From 7dc753ad27a8cd14c9b00be94ca89b847cf05ce9 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 23 Dec 2019 08:02:19 -0300 Subject: [PATCH] Temporary fix for build without C++ @@ -28,17 +28,17 @@ Signed-off-by: Carlos Santos 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cd50451d..a3bd7144 100644 +index ff59dd7c..3e4028fb 100755 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,6 @@ AC_CANONICAL_HOST - AX_IS_RELEASE(dash-version) +@@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version) AX_CHECK_ENABLE_DEBUG([info]) --AC_PROG_CXX AC_PROG_CC +-AC_PROG_CXX AC_PROG_LN_S AC_USE_SYSTEM_EXTENSIONS + LT_INIT() -- -2.18.1 +2.26.2 diff --git a/buildroot/package/tpm2-tss/Config.in b/buildroot/package/tpm2-tss/Config.in index 2d619750f..2fc56dbd7 100644 --- a/buildroot/package/tpm2-tss/Config.in +++ b/buildroot/package/tpm2-tss/Config.in @@ -33,5 +33,26 @@ config BR2_PACKAGE_TPM2_TSS https://github.com/tpm2-software/tpm2-tss +if BR2_PACKAGE_TPM2_TSS + +config BR2_PACKAGE_TPM2_TSS_FAPI + bool "fapi support" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBCURL + help + This option allows to enable Feature API (FAPI). Feature + API (FAPI) as described in the "TSS 2.0 Feature API + Specification" along with "TSS 2.0 JSON Data Types and + Policy Language Specification" This API is designed to be + very high-level API, intended to make programming with the + TPM as simple as possible. The API functions are exposed + through a single library: libtss2-fapi. + + https://trustedcomputinggroup.org/wp-content/uploads/TSS_FAPI_v0.94_r04_pubrev.pdf + https://trustedcomputinggroup.org/wp-content/uploads/TSS_JSON_Policy_v0.7_r04_pubrev.pdf + +endif + comment "tpm2-tss needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/buildroot/package/tpm2-tss/tpm2-tss.hash b/buildroot/package/tpm2-tss/tpm2-tss.hash index 3b778d4f1..49432314d 100644 --- a/buildroot/package/tpm2-tss/tpm2-tss.hash +++ b/buildroot/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz -sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE +sha256 2432533a1cac0f0d15d0337d2f0a23591a50b36aad68ab72412ce694818b7e76 tpm2-tss-3.0.1.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/buildroot/package/tpm2-tss/tpm2-tss.mk b/buildroot/package/tpm2-tss/tpm2-tss.mk index 470020857..70e39bc2b 100644 --- a/buildroot/package/tpm2-tss/tpm2-tss.mk +++ b/buildroot/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 2.3.3 +TPM2_TSS_VERSION = 3.0.1 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE @@ -17,13 +17,11 @@ TPM2_TSS_AUTORECONF = YES # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am -# with content from a fuzz testing run rather than an empty file, -# confusing autoreconf with -# 0001-configure-Only-use-CXX-when-fuzzing.patch -define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM - truncate -s 0 $(@D)/Makefile-fuzz-generated.am -endef -TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM +ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) +TPM2_TSS_DEPENDENCIES += json-c libcurl +TPM2_TSS_CONF_OPTS += --enable-fapi +else +TPM2_TSS_CONF_OPTS += --disable-fapi +endif $(eval $(autotools-package)) diff --git a/buildroot/package/transmission/0001-fix-utypes.patch b/buildroot/package/transmission/0001-fix-utypes.patch index 96403a6c3..81efa884a 100644 --- a/buildroot/package/transmission/0001-fix-utypes.patch +++ b/buildroot/package/transmission/0001-fix-utypes.patch @@ -6,25 +6,25 @@ The corresponding upstream bug report (unfixed) can be found here: https://trac.transmissionbt.com/ticket/5232 Signed-off-by: Bernd Kuhls +[Fabrice: adapt to 3.00, which always uses stdbool.h] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: + - don't comment-out dropped code, just drop it + - use CR-LF in replacement code, as used by upstream +] +Signed-off-by: Yann E. MORIN --- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200 +++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100 -@@ -35,8 +35,15 @@ +@@ -35,8 +35,8 @@ typedef const char * cstr; typedef char * str; -#ifndef __cplusplus -typedef uint8 bool; -#endif -+//#ifndef __cplusplus -+//typedef uint8 bool; -+//#endif -+#ifndef __cplusplus -+#ifdef HAVE_STDBOOL_H -+#include -+#else -+typedef uint8 bool; -+#endif -+#endif ++#ifndef __cplusplus ++#include ++#endif #endif //__UTYPES_H__ diff --git a/buildroot/package/transmission/0003-fix-utp-include.patch b/buildroot/package/transmission/0002-fix-utp-include.patch similarity index 100% rename from buildroot/package/transmission/0003-fix-utp-include.patch rename to buildroot/package/transmission/0002-fix-utp-include.patch diff --git a/buildroot/package/transmission/0002-musl-missing-header.patch b/buildroot/package/transmission/0002-musl-missing-header.patch deleted file mode 100644 index ebb74cbff..000000000 --- a/buildroot/package/transmission/0002-musl-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix musl build - -Downloaded from -https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch - -Signed-off-by: Bernd Kuhls - - -libtransmission/transmission.h: add missing - -transmission.h and several files including it, like bitfield.c and fdlimits.h -make reference to ssize_t, off_t and other types defined in but -never include the header. By including in transmission.h, the -required type definitions are propagated to all files that need them. - -Not including on glibc and uClibc systems does not pose a problem -because of the way the headers stack in those C Standard Libraries, but on musl -excluding leads to compile time failure. - -For the POSIX specs, see - -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html - -Signed-of-by: Anthony G. Basile - -diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h ---- transmission-2.84.orig/libtransmission/transmission.h 2014-07-01 13:09:01.682910744 -0400 -+++ transmission-2.84/libtransmission/transmission.h 2015-07-19 03:11:07.379219181 -0400 -@@ -28,6 +28,7 @@ - - #include /* uintN_t */ - #include /* time_t */ -+#include - - #ifdef WIN32 - #define __USE_MINGW_ANSI_STDIO 1 diff --git a/buildroot/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/buildroot/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch deleted file mode 100644 index 91a962a6d..000000000 --- a/buildroot/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8682fe1bad44acc06154003ca9c9163b917bf4e3 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 29 Sep 2016 19:52:49 +0200 -Subject: [PATCH] uClibc-ng since 1.0.18 has sys/quota.h synced with GNU libc - -Signed-off-by: Waldemar Brodkorb - -Pull Request: -https://github.com/transmission/transmission/pull/42 ---- - libtransmission/platform-quota.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c -index 58c518a..57377ef 100644 ---- a/libtransmission/platform-quota.c -+++ b/libtransmission/platform-quota.c -@@ -284,7 +284,7 @@ getquota (const char * device) - spaceused = (int64_t) dq.dqb_curblocks >> 1; - #elif defined(__APPLE__) - spaceused = (int64_t) dq.dqb_curbytes; --#elif defined(__UCLIBC__) -+#elif defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0 || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_SUBLEVEL__ <= 17)) - spaceused = (int64_t) btodb(dq.dqb_curblocks); - #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2) - spaceused = (int64_t) dq.dqb_curblocks >> 1; --- -2.1.4 - diff --git a/buildroot/package/transmission/0005-libsystemd.patch b/buildroot/package/transmission/0005-libsystemd.patch deleted file mode 100644 index b32aff211..000000000 --- a/buildroot/package/transmission/0005-libsystemd.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 0862099d0bf5a3ec8b2e9d538458d612897741a2 Mon Sep 17 00:00:00 2001 -From: Mike Gelfand -Date: Sat, 23 Apr 2016 16:13:25 +0000 -Subject: [PATCH] #5921: Use libsystemd instead of libsystemd-daemon (original - patches by Sandro Tosi and Mike Gilbert) - -In systemd v209, released over two years ago, the various libsystemd-* -libraries (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, -libsystemd-id128.so) were merged into a single libsystemd.so library to -reduce code duplication and avoid cyclic dependencies. - -Downloaded from upstream commit: -https://github.com/transmission/transmission/commit/0862099d0bf5a3ec8b2e9d538458d612897741a2 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 4 ++-- - configure.ac | 16 ++++++++-------- - daemon/CMakeLists.txt | 8 ++++---- - daemon/Makefile.am | 4 ++-- - daemon/daemon.c | 2 +- - 5 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b324dc..356fc2f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -398,9 +398,9 @@ endif() - if(WITH_SYSTEMD) - tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED) - -- pkg_check_modules(SYSTEMD_DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon) -+ pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd) - -- tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_DAEMON_FOUND SYSTEMD_IS_REQUIRED) -+ tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED) - endif() - - include_directories(${CMAKE_BINARY_DIR}) -diff --git a/configure.ac b/configure.ac -index 92e4372..b64f2a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -240,15 +240,15 @@ dnl - dnl file monitoring for the daemon - - # Check whether to enable systemd startup notification. --# This requires libsystemd-daemon. --AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], -+# This requires libsystemd. -+AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd], - [Add support for systemd startup notification (default is autodetected)]), -- [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) --AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ -- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], -- [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], -- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] -+ [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto]) -+AS_IF([test "x$USE_SYSTEMD" != "xno"], [ -+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], -+ [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])], -+ [AS_IF([test "x$USE_SYSTEMD" = "xyes"], -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] - )] - ) - ]) -diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt -index e8f8b34..8ec3b95 100644 ---- a/daemon/CMakeLists.txt -+++ b/daemon/CMakeLists.txt -@@ -1,7 +1,7 @@ - project(trdaemon) - - if(WITH_SYSTEMD) -- add_definitions(-DUSE_SYSTEMD_DAEMON) -+ add_definitions(-DUSE_SYSTEMD) - endif() - - include_directories( -@@ -37,14 +37,14 @@ add_executable(${TR_NAME}-daemon - ${${PROJECT_NAME}_WIN32_RC_FILE}) - - set_target_properties(${TR_NAME}-daemon PROPERTIES -- COMPILE_FLAGS "${SYSTEMD_DAEMON_CFLAGS}" -- LINK_FLAGS "${SYSTEMD_DAEMON_LDFLAGS}" -+ COMPILE_FLAGS "${SYSTEMD_CFLAGS}" -+ LINK_FLAGS "${SYSTEMD_LDFLAGS}" - ) - - target_link_libraries(${TR_NAME}-daemon - ${TR_NAME} - ${EVENT2_LIBRARIES} -- ${SYSTEMD_DAEMON_LIBRARIES} -+ ${SYSTEMD_LIBRARIES} - ) - - tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 677f765..34d7076 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I@top_srcdir@ -DEMBEDDED - AM_CFLAGS = \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ -- @SYSTEMD_DAEMON_CFLAGS@ \ -+ @SYSTEMD_CFLAGS@ \ - @ZLIB_CFLAGS@ \ - @PTHREAD_CFLAGS@ - -@@ -29,7 +29,7 @@ LDADD = \ - @LIBCURL_LIBS@ \ - @CRYPTO_LIBS@ \ - @INTLLIBS@ \ -- @SYSTEMD_DAEMON_LIBS@ \ -+ @SYSTEMD_LIBS@ \ - @ZLIB_LIBS@ \ - @PTHREAD_LIBS@ \ - ${LIBM} -diff --git a/daemon/daemon.c b/daemon/daemon.c -index 40ac5a6..62ac715 100644 ---- a/daemon/daemon.c -+++ b/daemon/daemon.c -@@ -33,7 +33,7 @@ - #include - #include - --#ifdef USE_SYSTEMD_DAEMON -+#ifdef USE_SYSTEMD - #include - #else - static void sd_notify (int status UNUSED, const char * str UNUSED) { } diff --git a/buildroot/package/transmission/transmission.hash b/buildroot/package/transmission/transmission.hash index 0d2af32f4..13cbc969d 100644 --- a/buildroot/package/transmission/transmission.hash +++ b/buildroot/package/transmission/transmission.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d transmission-2.94.tar.xz -sha256 20801783bf59e27d03ed6aab625b32a34e221ae95bf801db87827c8023398495 COPYING +sha256 9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2 transmission-3.00.tar.xz +sha256 2b16da5bd02790d1e4d332cfd42b9dfd7d1b0ed3a16a75dc7e76b6ed239fdba9 COPYING diff --git a/buildroot/package/transmission/transmission.mk b/buildroot/package/transmission/transmission.mk index 8fbda5eea..ff3b41c32 100644 --- a/buildroot/package/transmission/transmission.mk +++ b/buildroot/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 2.94 +TRANSMISSION_VERSION = 3.00 TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_DEPENDENCIES = \ diff --git a/buildroot/package/trinity/0001-Fix-build-with-GCC-10.patch b/buildroot/package/trinity/0001-Fix-build-with-GCC-10.patch new file mode 100644 index 000000000..5ae3735db --- /dev/null +++ b/buildroot/package/trinity/0001-Fix-build-with-GCC-10.patch @@ -0,0 +1,38 @@ +From e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8 Mon Sep 17 00:00:00 2001 +From: Vinson Lee +Date: Thu, 30 Jan 2020 22:09:45 -0800 +Subject: [PATCH] Fix build with GCC 10. + + CC trinity +/usr/bin/ld: debug.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: log-files.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: log.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: main.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: output.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: params.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: shm.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here +/usr/bin/ld: trinity.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here + +Fixes: 13856316c259 ("reinstate the log-to-file code for now.") +Signed-off-by: Vinson Lee + +[Retrieved from: +https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8] +Signed-off-by: Fabrice Fontaine +--- + include/logfile.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/logfile.h b/include/logfile.h +index 90ea8b23..2305ac15 100644 +--- a/include/logfile.h ++++ b/include/logfile.h +@@ -5,7 +5,7 @@ + FILE *find_logfile_handle(void); + void synclogs(void); + +-FILE *mainlogfile; ++extern FILE *mainlogfile; + void open_main_logfile(void); + void close_logfile(FILE **handle); + diff --git a/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch b/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch new file mode 100644 index 000000000..ea054ab2c --- /dev/null +++ b/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch @@ -0,0 +1,41 @@ +From c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar +Date: Wed, 18 Mar 2020 14:10:35 -0700 +Subject: [PATCH] trousers: resolve build failure + +The global variables tcsd_sa_chld and tcsd_sa_int in tcsd.h are +causing build failures in latest Fedora release: + +/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:169: multiple definition of `tcsd_sa_chld'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:169: first defined here +/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:168: multiple definition of `tcsd_sa_int'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:168: first defined here + +They are no longer used since 9b40e581470b ("Improved daemon's signal +handling") so just remove them. + +Signed-off-by: Jerry Snitselaar +Signed-off-by: Debora Velarde Babb +[Retrieved from: +https://sourceforge.net/p/trousers/trousers/ci/c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc] +Signed-off-by: Fabrice Fontaine +--- + src/include/tcsd.h | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/include/tcsd.h b/src/include/tcsd.h +index 5b9462b..f5c286e 100644 +--- a/src/include/tcsd.h ++++ b/src/include/tcsd.h +@@ -164,10 +164,4 @@ TSS_RESULT tcsd_thread_create(int, char *); + void *tcsd_thread_run(void *); + void thread_signal_init(); + +-/* signal handling */ +-#ifndef __APPLE__ +-struct sigaction tcsd_sa_int; +-struct sigaction tcsd_sa_chld; +-#endif +- + #endif +-- +2.28.0 + diff --git a/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index 70a3f25f5..000000000 --- a/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,386 +0,0 @@ -From 09eeff8c90a82e7aa9ff215320d558c1147982f6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 19:59:29 -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 - -Signed-off-by: Khem Raj -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/libts/tslib/commit/a7a39a67f9a7f7fab9765d412ab42869a5c5c858] ---- - plugins/input-raw.c | 59 +++++++++++++++++++++++++++------------- - tools/ts_uinput.c | 66 ++++++++++++++++++++++++++++++--------------- - 2 files changed, 85 insertions(+), 40 deletions(-) - -diff --git a/plugins/input-raw.c b/plugins/input-raw.c -index 64f0156..f030836 100644 ---- a/plugins/input-raw.c -+++ b/plugins/input-raw.c -@@ -40,6 +40,11 @@ - # include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #ifndef EV_SYN /* 2.4 kernel headers */ - # define EV_SYN 0x00 - #endif -@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->y = i->current_y; - samp->pressure = i->current_p; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, - "RAW---------------------> %d %d %d %ld.%ld\n", -@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->pressure = i->current_p = ev.value; - break; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, - "RAW---------------------------> %d %d %d\n", -@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->x = 0; - samp->y = 0; - samp->pressure = 0; -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - samp++; - total++; - } -@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - switch (i->ev[it].code) { - case BTN_TOUCH: - i->buf[total][i->slot].pen_down = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == 0) - pen_up = 1; -@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_POSITION_X: - i->buf[total][i->slot].x = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_Y: -@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_POSITION_Y: - i->buf[total][i->slot].y = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_PRESSURE: -@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_PRESSURE: - i->buf[total][i->slot].pressure = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOOL_X: - i->buf[total][i->slot].tool_x = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_TOOL_Y: - i->buf[total][i->slot].tool_y = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_TOOL_TYPE: - i->buf[total][i->slot].tool_type = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_ORIENTATION: - i->buf[total][i->slot].orientation = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_DISTANCE: - i->buf[total][i->slot].distance = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - - if (i->special_device == EGALAX_VERSION_210) { -@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_BLOB_ID: - i->buf[total][i->slot].blob_id = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOUCH_MAJOR: - i->buf[total][i->slot].touch_major = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == 0) - i->buf[total][i->slot].pressure = 0; - break; - case ABS_MT_WIDTH_MAJOR: - i->buf[total][i->slot].width_major = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOUCH_MINOR: - i->buf[total][i->slot].touch_minor = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_WIDTH_MINOR: - i->buf[total][i->slot].width_minor = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TRACKING_ID: - i->buf[total][i->slot].tracking_id = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == -1) - i->buf[total][i->slot].pressure = 0; -diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c -index 6ca4c3d..1832a07 100644 ---- a/tools/ts_uinput.c -+++ b/tools/ts_uinput.c -@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - continue; - - if (s[j][i].pen_down == 1) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_KEY; - data->ev[c].code = BTN_TOUCH; - data->ev[c].value = s[j][i].pen_down; - c++; - } - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_SLOT; - data->ev[c].value = s[j][i].slot; -@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - * we should use slot 1 and so on. - */ - if (i == 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_X; - data->ev[c].value = s[j][i].x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_Y; - data->ev[c].value = s[j][i].y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_PRESSURE; - data->ev[c].value = s[j][i].pressure; - c++; - } - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_POSITION_X; - data->ev[c].value = s[j][i].x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_POSITION_Y; - data->ev[c].value = s[j][i].y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_PRESSURE; - data->ev[c].value = s[j][i].pressure; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOUCH_MAJOR; - data->ev[c].value = s[j][i].touch_major; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_WIDTH_MAJOR; - data->ev[c].value = s[j][i].width_major; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOUCH_MINOR; - data->ev[c].value = s[j][i].touch_minor; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_WIDTH_MINOR; - data->ev[c].value = s[j][i].width_minor; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_TYPE; - data->ev[c].value = s[j][i].tool_type; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_X; - data->ev[c].value = s[j][i].tool_x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_Y; - data->ev[c].value = s[j][i].tool_y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_ORIENTATION; - data->ev[c].value = s[j][i].orientation; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_DISTANCE; - data->ev[c].value = s[j][i].distance; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_BLOB_ID; - data->ev[c].value = s[j][i].blob_id; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TRACKING_ID; - data->ev[c].value = s[j][i].tracking_id; - c++; - - if (data->mt_type_a == 1) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_SYN; - data->ev[c].code = SYN_MT_REPORT; - data->ev[c].value = 0; -@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - } - - if (s[j][i].pen_down == 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_KEY; - data->ev[c].code = BTN_TOUCH; - data->ev[c].value = s[j][i].pen_down; -@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - } - - if (c > 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_SYN; - data->ev[c].code = SYN_REPORT; - data->ev[c].value = 0; diff --git a/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch deleted file mode 100644 index 5dca3a009..000000000 --- a/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001 -From: Evan Harvey -Date: Thu, 19 Mar 2020 01:32:03 -0700 -Subject: [PATCH] Fix build error with input_event_sec for old kernel - -[Retrieved from: -https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4] -Signed-off-by: Fabrice Fontaine ---- - tools/ts_uinput.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c -index 1832a07..9c40bb3 100644 ---- a/tools/ts_uinput.c -+++ b/tools/ts_uinput.c -@@ -51,6 +51,11 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #define RESET "\033[0m" - #define RED "\033[31m" - #define GREEN "\033[32m" diff --git a/buildroot/package/tslib/tslib.hash b/buildroot/package/tslib/tslib.hash index 521e6c94b..762fbebb2 100644 --- a/buildroot/package/tslib/tslib.hash +++ b/buildroot/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.21/tslib-1.21.tar.xz.sha256 -sha256 d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56 tslib-1.21.tar.xz +# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 +sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/buildroot/package/tslib/tslib.mk b/buildroot/package/tslib/tslib.mk index 3a1b7a218..45e29808b 100644 --- a/buildroot/package/tslib/tslib.mk +++ b/buildroot/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.21 +TSLIB_VERSION = 1.22 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) diff --git a/buildroot/package/ttyd/Config.in b/buildroot/package/ttyd/Config.in new file mode 100644 index 000000000..df710fbac --- /dev/null +++ b/buildroot/package/ttyd/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_TTYD + bool "ttyd" + depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv, json-c + depends on BR2_USE_MMU # libuv + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_LIBWEBSOCKETS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB + help + ttyd is a simple command-line tool for sharing terminal + over the web. + + https://github.com/tsl0922/ttyd + +comment "ttyd needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/buildroot/package/ttyd/ttyd.hash b/buildroot/package/ttyd/ttyd.hash new file mode 100644 index 000000000..881028261 --- /dev/null +++ b/buildroot/package/ttyd/ttyd.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 d72dcca3dec00cda87b80a0a25ae4fee2f8b9098c1cdb558508dcb14fbb6fafc ttyd-1.6.1.tar.gz +sha256 711762f081c180ade3d09d7b0b7537eaf35eca8d1671e47bc66eaa39376edb12 LICENSE diff --git a/buildroot/package/ttyd/ttyd.mk b/buildroot/package/ttyd/ttyd.mk new file mode 100644 index 000000000..91b650c49 --- /dev/null +++ b/buildroot/package/ttyd/ttyd.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# ttyd +# +################################################################################ + +TTYD_VERSION = 1.6.1 +TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) +TTYD_LICENSE = MIT +TTYD_LICENSE_FILES = LICENSE +TTYD_DEPENDENCIES = json-c libuv libwebsockets openssl zlib + +$(eval $(cmake-package)) diff --git a/buildroot/package/tvheadend/tvheadend.hash b/buildroot/package/tvheadend/tvheadend.hash index 92dc92182..d4dbc4006 100644 --- a/buildroot/package/tvheadend/tvheadend.hash +++ b/buildroot/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13 tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz -sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md +sha256 28cae1960135f9485907a5bea857963d5625fc374371d12320353f824ce70a06 tvheadend-6b8f014c39703640a1fe8af9c2b7663588ed2b56.tar.gz +sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/buildroot/package/tvheadend/tvheadend.mk b/buildroot/package/tvheadend/tvheadend.mk index df7fd7fd9..de1de4af8 100644 --- a/buildroot/package/tvheadend/tvheadend.mk +++ b/buildroot/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5 +TVHEADEND_VERSION = 6b8f014c39703640a1fe8af9c2b7663588ed2b56 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/uacme/uacme.hash b/buildroot/package/uacme/uacme.hash index b3ec7ed6f..d0277c732 100644 --- a/buildroot/package/uacme/uacme.hash +++ b/buildroot/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7757883ffc305018d3d181a26d0b82a8a0c1f1d5eea21a14979b2c69750b595e uacme-1.2.4.tar.gz +sha256 3f3de5f456907558c4aa0db5654c618becb1b3e057ad217e180c8f72360e7841 uacme-1.4.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/uacme/uacme.mk b/buildroot/package/uacme/uacme.mk index be2aa6081..975a965dd 100644 --- a/buildroot/package/uacme/uacme.mk +++ b/buildroot/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.2.4 +UACME_VERSION = 1.4.1 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version diff --git a/buildroot/package/uboot-tools/0004-tools-env-fw_env.h-remove-env.h.patch b/buildroot/package/uboot-tools/0004-tools-env-fw_env.h-remove-env.h.patch new file mode 100644 index 000000000..f5d9c2b2c --- /dev/null +++ b/buildroot/package/uboot-tools/0004-tools-env-fw_env.h-remove-env.h.patch @@ -0,0 +1,52 @@ +From 664ef61e19d6261d8984493b5f22127ec2ad44fc Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 10 May 2020 23:15:32 +0200 +Subject: [PATCH] tools/env/fw_env.h: remove env.h + +As reported by Nicolas Carrier on the Buildroot mailing list [1], +there is a new build issue while building a program which interacts with +the u-boot environment. This program uses the headers of the ubootenv +library provided by uboot-tools. + +This is an upstream change from uboot [2] adding "#include " to +fw_env.h. Adding env.h require a board configuration to build. + +But only fw_env.h header is installed in the staging directory by +uboot-tools package, but since it now include env.h the build is broken +because env.h is missing from the staging directory. + +It's seems an upstream bug since env_set() is not used in fw_env tool. + +Adding env.h is an error since it also include compiler.h (and others +uboot internal includes). + +Nicolas removed env.h from fw_env tool and fixed it's build issue. + +This problem is present since uboot v2019.10, so the uboot version +present in Buildroot 2020.02 is affected. + +[1] http://lists.busybox.net/pipermail/buildroot/2020-April/280307.html +[2] https://gitlab.denx.de/u-boot/u-boot/-/commit/9fb625ce05539fe6876a59ce1dcadb76b33c6f6e + +Reported-by: Nicolas Carrier +Signed-off-by: Romain Naour +Upstream: https://gitlab.denx.de/u-boot/u-boot/-/commit/2aca8804d8d5f84d2d661e76e8d232c5c12445b5 +--- + tools/env/fw_env.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h +index b60fbfc8f8..78c803c944 100644 +--- a/tools/env/fw_env.h ++++ b/tools/env/fw_env.h +@@ -4,7 +4,6 @@ + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +-#include + #include + + /* +-- +2.25.4 + diff --git a/buildroot/package/uboot-tools/Config.in.host b/buildroot/package/uboot-tools/Config.in.host index 52a4c2ec3..431cc8631 100644 --- a/buildroot/package/uboot-tools/Config.in.host +++ b/buildroot/package/uboot-tools/Config.in.host @@ -37,6 +37,75 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT public key is stored in a non-volatile place, any image can be verified in this way. -endif +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT -endif +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + bool "Environment image" + help + Generate a valid binary environment image from a text file + describing the key=value pairs of the environment. + + This option can be useful to build enviornment configurations + as part of a Linux / rootfs only defconfig instead of using + post scripts. This supports a hardware use case of a single + bootloader only defconfig but multiple Linux / rootfs + defconfigs with different boot environments. + + The environment image will be called uboot-env.bin. + +if BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE + string "Source files for environment" + default BR2_TARGET_UBOOT_ENVIMAGE_SOURCE if BR2_TARGET_UBOOT_ENVIMAGE_SOURCE != "" # legacy + help + Text files describing the environment. Files should have + lines of the form var=value, one per line. Blank lines and + lines starting with a # are ignored. + + Multiple source files are concatenated in the order listed. + + Leave empty to generate image from compiled-in env if a U-boot + target build is configured (BR2_TARGET_UBOOT) + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE + string "Size of environment" + default BR2_TARGET_UBOOT_ENVIMAGE_SIZE if BR2_TARGET_UBOOT_ENVIMAGE_SIZE != "" # legacy + help + Size of envronment, can be prefixed with 0x for hexadecimal + values. + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT + bool "Environment has two copies" + help + Some platforms define in their U-Boot configuration that the + U-Boot environment should be duplicated in two locations (for + extra safety). Check your U-Boot configuration for the + CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to + see if this is the case for your platform. + + If it is the case, then you should enable this option to + ensure that the U-Boot environment image generated by + Buildroot is compatible with the "redundant environment" + mechanism of U-Boot. + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + bool "Generate a U-Boot boot script" + help + Generate a U-Boot boot script, given a file listing U-Boot + commands to be executed at boot time. The generated boot + script will be called 'boot.scr'. + +if BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + +config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE + string "U-Boot boot script source" + default BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE if BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE != "" # legacy + help + Source file to generate the U-Boot boot script. + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + +endif # BR2_PACKAGE_HOST_UBOOT_TOOLS diff --git a/buildroot/package/uboot-tools/uboot-tools.hash b/buildroot/package/uboot-tools/uboot-tools.hash index 6c17ef02b..8274246cf 100644 --- a/buildroot/package/uboot-tools/uboot-tools.hash +++ b/buildroot/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 u-boot-2020.04.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/package/uboot-tools/uboot-tools.mk b/buildroot/package/uboot-tools/uboot-tools.mk index 8cafc084e..6aa7cba2d 100644 --- a/buildroot/package/uboot-tools/uboot-tools.mk +++ b/buildroot/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2020.01 +UBOOT_TOOLS_VERSION = 2020.04 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ @@ -110,10 +110,61 @@ define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only endef +ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE),y) + +UBOOT_TOOLS_GENERATE_ENV_FILE = $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE)) +ifeq ($(UBOOT_TOOLS_GENERATE_ENV_FILE):$(BR2_TARGET_UBOOT),:y) +UBOOT_TOOLS_GENERATE_ENV_FILE = $(@D)/boot-env-defaults.txt +define HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS + CROSS_COMPILE="$(TARGET_CROSS)" \ + $(UBOOT_SRCDIR)/scripts/get_default_envs.sh \ + $(UBOOT_SRCDIR) \ + > $(UBOOT_TOOLS_GENERATE_ENV_FILE) +endef +HOST_UBOOT_TOOLS_DEPENDENCIES += uboot +endif + +define HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE + $(HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS) + $(HOST_DIR)/bin/mkenvimage -s $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE) \ + $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT),-r) \ + $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ + -o $(BINARIES_DIR)/uboot-env.bin \ + $(UBOOT_TOOLS_GENERATE_ENV_FILE) +endef + +ifeq ($(BR_BUILDING),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE)),) +$(error Please provide U-Boot environment size (BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE setting)) +endif +# If U-Boot is available, ENVIMAGE_SOURCE is optional because the default can +# be taken from U-Boot. +ifeq ($(BR2_TARGET_UBOOT),) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE),) +$(error Please provide U-Boot environment file BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE setting)) +endif +endif #BR2_TARGET_UBOOT +endif #BR_BUILDING + +endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE + +ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT),y) +ifeq ($(BR_BUILDING),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)),) +$(error Please define a source file for U-Boot boot script (BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE setting)) +endif +endif #BR_BUILDING +endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT + define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE) + $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT), + $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ + -d $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)) \ + $(BINARIES_DIR)/boot.scr) endef $(eval $(generic-package)) diff --git a/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch b/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch deleted file mode 100644 index ca433261b..000000000 --- a/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9a09c89fdd0e0cebec48d1bb7bc187bf92ae361c Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 13 Mar 2018 12:58:59 +0200 -Subject: [PATCH] misc/tst-syscall6: fix build with musl and older kenrel - headers - -The RWF_DSYNC and RWF_HIPRI macros were introduced in kernel version 4.6 -with the preadv2/pwritev2 system calls. musl libc provides its own -syscall definitions, even when the kernel headers are older. This leads -to the following build failure: - -tst-syscall6.c: In function 'main': -tst-syscall6.c:32:48: error: 'RWF_DSYNC' undeclared (first use in this function) - nio = syscall(SYS_pwritev2, fd, iov, 2, 0, 0, RWF_DSYNC); - ^~~~~~~~~ -tst-syscall6.c:32:48: note: each undeclared identifier is reported only once for each function it appears in -tst-syscall6.c:42:58: error: 'RWF_HIPRI' undeclared (first use in this function) - nio = syscall(SYS_preadv2, fd, iov, 1, strlen(str0), 0, RWF_HIPRI); - ^~~~~~~~~ - -Make the code depend also on RWF_HIPRI to fix this failure. - -Signed-off-by: Baruch Siach ---- -Upstream status: patch sent to Waldemar Brodkorb - - test/misc/tst-syscall6.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/misc/tst-syscall6.c b/test/misc/tst-syscall6.c -index fa51c275e4a5..9ad2ddac2b8f 100644 ---- a/test/misc/tst-syscall6.c -+++ b/test/misc/tst-syscall6.c -@@ -9,7 +9,7 @@ - - int main() - { --#if defined SYS_preadv2 && defined SYS_pwritev2 -+#if defined SYS_preadv2 && defined SYS_pwritev2 && defined RWF_HIPRI - char tmp[] = "/tmp/tst-preadv2-XXXXXX"; - int fd; - struct iovec iov[2]; --- -2.16.1 - diff --git a/buildroot/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch b/buildroot/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch deleted file mode 100644 index 34760f3df..000000000 --- a/buildroot/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 164b1b5592ef6ad9fceba06bdfa31787e9c0329d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 14 Nov 2018 21:26:54 +0100 -Subject: [PATCH] Add NO_CRYPT to fix build with glibc 2.28 - -Since glibc 2.28 -(https://savannah.gnu.org/forum/forum.php?forum_id=9205), the obsolete -functions encrypt, encrypt_r, setkey, setkey_r, cbc_crypt, ecb_crypt, -and des_setparity are no longer available to newly linked binaries, and -the headers and are no longer -installed. These functions encrypted and decrypted data with the DES -block cipher, which is no longer considered secure. Software that still -uses these functions should switch to a modern cryptography library, -such as libgcrypt. - -So add a NO_CRYPT variable to disable test/crypt - -Fixes: - - http://autobuild.buildroot.org/results/158438debb0ce313b012b871e199bed42ba38294 - -Signed-off-by: Fabrice Fontaine ---- - test/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test/Makefile b/test/Makefile -index 5a136ea..6690d25 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -39,6 +39,10 @@ ifeq ($(NO_MATH),1) - DIRS := $(filter-out math,$(DIRS)) - endif - -+ifeq ($(NO_CRYPT),1) -+DIRS := $(filter-out crypt,$(DIRS)) -+endif -+ - test check all: run - - run: subdirs_run --- -2.14.1 - diff --git a/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch deleted file mode 100644 index 2c45aeee6..000000000 --- a/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From de742f52d46d82db1fe1b0f3255043d48843901d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 29 Oct 2019 11:14:35 +0100 -Subject: [PATCH] test/misc/test-nftw.c: fix build with latest glibc - -Fix the following error with latest glibc: - -In function 'open', - inlined from 'do_test' at tst-nftw.c:38:10, - inlined from 'main' at ../test-skeleton.c:318:12: -/home/mark/buildroot-test/instance-0/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/bits/fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments - __open_missing_mode (); - ^~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.net/results/f370abcc8dc12975d96a46c34db978554f8c21db - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/wbx-github/uclibc-ng-test/pull/1] ---- - test/misc/tst-nftw.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/misc/tst-nftw.c b/test/misc/tst-nftw.c -index 970dfc2..7a08c78 100644 ---- a/test/misc/tst-nftw.c -+++ b/test/misc/tst-nftw.c -@@ -35,9 +35,9 @@ do_test(void) - perror("Creating path"); - if ((mkdir(subpath, 0700)) < 0) - perror("Creating subpath"); -- if ((open(filepath, O_CREAT)) < 0) -+ if ((open(filepath, O_CREAT, 0600)) < 0) - perror("Opening filepath"); -- if ((open(filesubpath, O_CREAT)) < 0) -+ if ((open(filesubpath, O_CREAT, 0600)) < 0) - perror("Opening filesubpath"); - - if (nftw(path, process_one_entry, 100, (FTW_CHDIR|FTW_DEPTH|FTW_PHYS)) < 0) --- -2.23.0 - diff --git a/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch deleted file mode 100644 index 374427d96..000000000 --- a/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 04052336f84a84811dd03bfed4cfcb4fe7b424cc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 29 Oct 2019 11:21:47 +0100 -Subject: [PATCH] test/nptl/tst-mqueue4.c: fix build with latest glibc - -Fix the following error with latest glibc: - -In file included from /home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/mqueue.h:93:0, - from tst-mqueue4.c:22: -In function 'mq_open', - inlined from 'do_test' at tst-mqueue4.c:174:6: -/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/bits/mqueue2.h:41:5: error: call to '__mq_open_wrong_number_of_args' declared with attribute error: mq_open can be called either with 2 or 4 arguments - __mq_open_wrong_number_of_args (); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.net/results/f370abcc8dc12975d96a46c34db978554f8c21db - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/wbx-github/uclibc-ng-test/pull/1] ---- - test/nptl/tst-mqueue4.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/nptl/tst-mqueue4.c b/test/nptl/tst-mqueue4.c -index 87ef0c3..1fbecc5 100644 ---- a/test/nptl/tst-mqueue4.c -+++ b/test/nptl/tst-mqueue4.c -@@ -171,14 +171,14 @@ do_test (void) - result = 1; - } - -- q2 = mq_open (name, O_RDONLY, 0600); -+ q2 = mq_open (name, O_RDONLY, 0600, &attr); - if (q2 == (mqd_t) -1) - { - printf ("mq_open without O_CREAT failed with %m\n"); - result = 1; - } - -- mqd_t q3 = mq_open (name, O_RDONLY, 0600); -+ mqd_t q3 = mq_open (name, O_RDONLY, 0600, &attr); - if (q3 == (mqd_t) -1) - { - printf ("mq_open without O_CREAT failed with %m\n"); --- -2.23.0 - diff --git a/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk b/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk index aeea799d8..9f866f5d7 100644 --- a/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = c6d62cbc60504c7f6867b486248b0ef7cc2da554 +UCLIBC_NG_TEST_VERSION = c64d6ac77f0e745c70e76024212c72e4bbe2091a UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPL-2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB @@ -38,6 +38,10 @@ endif ifeq ($(BR2_STATIC_LIBS),y) UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 NO_DL=1 endif +# no TLS macros available +ifeq ($(BR2_nds32)$(BR2_s390x),y) +UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 +endif # to execute tests in a deterministic order, call test_gen separately define UCLIBC_NG_TEST_BUILD_CMDS diff --git a/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch deleted file mode 100644 index 5557a9c1e..000000000 --- a/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch +++ /dev/null @@ -1,72 +0,0 @@ -From d1a3ca7ca56630fddde7311a0474eed4a21335a7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 3 Feb 2020 13:57:32 -0800 -Subject: [PATCH] include/ctype.h: drop is*_l macro definitions - -ctype locale-specific macro definitions are broken because they result -in dereference of pointer to structure of incomplete type. -Drop these macros since they are optional and let applications use -functions with the same names. - -This change fixes parted-3.3 build with uClibc-ng: - http://autobuild.buildroot.net/results/b7ba1210d5aa184b133f0171da621d2b0083ec39/build-end.log - -Signed-off-by: Max Filippov ---- - include/ctype.h | 33 --------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/include/ctype.h b/include/ctype.h -index ecd5e730886a..e934cf3321a6 100644 ---- a/include/ctype.h -+++ b/include/ctype.h -@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l) - /* Return the uppercase version of C. */ - extern int toupper_l (int __c, __locale_t __l) __THROW; - --# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus --# define tolower_l(c, locale) __tobody(c, tolower_l, (locale)->__ctype_tolower, (c, locale)) --# define toupper_l(c, locale) __tobody(c, toupper_l, (locale)->__ctype_toupper, (c, locale)) --# endif /* Optimizing gcc */ -- -- --# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type) - # ifndef __NO_CTYPE --# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l)) --# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l)) --# define __iscntrl_l(c,l) __isctype_l((c), _IScntrl, (l)) --# define __isdigit_l(c,l) __isctype_l((c), _ISdigit, (l)) --# define __islower_l(c,l) __isctype_l((c), _ISlower, (l)) --# define __isgraph_l(c,l) __isctype_l((c), _ISgraph, (l)) --# define __isprint_l(c,l) __isctype_l((c), _ISprint, (l)) --# define __ispunct_l(c,l) __isctype_l((c), _ISpunct, (l)) --# define __isspace_l(c,l) __isctype_l((c), _ISspace, (l)) --# define __isupper_l(c,l) __isctype_l((c), _ISupper, (l)) --# define __isxdigit_l(c,l) __isctype_l((c), _ISxdigit, (l)) --# define __isblank_l(c,l) __isctype_l((c), _ISblank, (l)) -- - # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ - && defined __UCLIBC_SUSV4_LEGACY__ - # define __isascii_l(c,l) ((l), __isascii (c)) - # define __toascii_l(c,l) ((l), __toascii (c)) - # endif - --# define isalnum_l(c,l) __isalnum_l ((c), (l)) --# define isalpha_l(c,l) __isalpha_l ((c), (l)) --# define iscntrl_l(c,l) __iscntrl_l ((c), (l)) --# define isdigit_l(c,l) __isdigit_l ((c), (l)) --# define islower_l(c,l) __islower_l ((c), (l)) --# define isgraph_l(c,l) __isgraph_l ((c), (l)) --# define isprint_l(c,l) __isprint_l ((c), (l)) --# define ispunct_l(c,l) __ispunct_l ((c), (l)) --# define isspace_l(c,l) __isspace_l ((c), (l)) --# define isupper_l(c,l) __isupper_l ((c), (l)) --# define isxdigit_l(c,l) __isxdigit_l ((c), (l)) --# define isblank_l(c,l) __isblank_l ((c), (l)) -- - # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ - && defined __UCLIBC_SUSV4_LEGACY__ - # define isascii_l(c,l) __isascii_l ((c), (l)) --- -2.20.1 - diff --git a/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch b/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch deleted file mode 100644 index a0e115c76..000000000 --- a/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7a9a3e4b36955e8530756823d3443f6822562c56 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 9 Feb 2020 22:29:53 +0100 -Subject: [PATCH] include/ctype.h: restore __isctype_l definition - -Recent is*_l fix broke uclibc build because removed __isctype_l -definition was used in libc/misc/ctype/ctype.c. Restore it. - -Fixes: d1a3ca7ca566 ("include/ctype.h: drop is*_l macro definitions") -Signed-off-by: Max Filippov ---- -Upstream status: -https://mailman.uclibc-ng.org/pipermail/devel/2020-February/001940.html ---- - include/ctype.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/ctype.h b/include/ctype.h -index e934cf332..05f21c553 100644 ---- a/include/ctype.h -+++ b/include/ctype.h -@@ -350,6 +350,7 @@ libc_hidden_proto(tolower_l) - /* Return the uppercase version of C. */ - extern int toupper_l (int __c, __locale_t __l) __THROW; - -+# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type) - # ifndef __NO_CTYPE - # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ - && defined __UCLIBC_SUSV4_LEGACY__ --- -2.20.1 - diff --git a/buildroot/package/uclibc/Config.in b/buildroot/package/uclibc/Config.in index de2885bc9..494758bd9 100644 --- a/buildroot/package/uclibc/Config.in +++ b/buildroot/package/uclibc/Config.in @@ -106,6 +106,8 @@ config BR2_UCLIBC_TARGET_ARCH default "xtensa" if BR2_xtensa default "i386" if BR2_i386 default "x86_64" if BR2_x86_64 + default "riscv64" if BR2_RISCV_64 + default "riscv32" if BR2_RISCV_32 config BR2_UCLIBC_MIPS_ABI string diff --git a/buildroot/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash index c1f161fa1..7319a70c8 100644 --- a/buildroot/package/uclibc/uclibc.hash +++ b/buildroot/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256 -sha256 891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370 uClibc-ng-1.0.32.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.36/uClibc-ng-1.0.36.tar.xz.sha256 +sha256 010f40841669809422e01b47e7169d49c61bf3382f493c2571a8a96634ed300c uClibc-ng-1.0.36.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk index 7df446194..524fc98d2 100644 --- a/buildroot/package/uclibc/uclibc.mk +++ b/buildroot/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.32 +UCLIBC_VERSION = 1.0.36 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ @@ -59,18 +59,18 @@ endif # noMMU binary formats ifeq ($(BR2_BINFMT_FLAT_ONE),y) define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF) endef endif ifeq ($(BR2_BINFMT_FLAT_SHARED),y) define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA) + $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF) endef endif @@ -82,12 +82,12 @@ ifeq ($(UCLIBC_TARGET_ARCH),arc) UCLIBC_ARC_PAGE_SIZE = CONFIG_ARC_PAGE_SIZE_$(call qstrip,$(BR2_ARC_PAGE_SIZE)) define UCLIBC_ARC_PAGE_SIZE_CONFIG $(SED) '/CONFIG_ARC_PAGE_SIZE_*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE)) endef ifeq ($(BR2_ARC_ATOMIC_EXT),) define UCLIBC_ARC_ATOMICS_CONFIG - $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS) endef endif @@ -100,12 +100,12 @@ endif # arc ifeq ($(UCLIBC_TARGET_ARCH),arm) define UCLIBC_ARM_ABI_CONFIG $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI) endef ifeq ($(BR2_BINFMT_FLAT),y) define UCLIBC_ARM_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,DOPIC) endef endif @@ -115,7 +115,7 @@ endif # support the ARM instructions. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB2):$(BR2_ARM_CPU_HAS_ARM),y:) define UCLIBC_ARM_NO_CONTEXT_FUNCS - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS) endef endif @@ -130,7 +130,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),m68k) # disable DOPIC for flat without separate data ifeq ($(BR2_BINFMT_FLAT_ONE),y) define UCLIBC_M68K_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,DOPIC) endef endif @@ -144,13 +144,13 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips) UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI define UCLIBC_MIPS_ABI_CONFIG $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI)) endef UCLIBC_MIPS_NAN = CONFIG_MIPS_NAN_$(call qstrip,$(BR2_UCLIBC_MIPS_NAN)) define UCLIBC_MIPS_NAN_CONFIG $(SED) '/CONFIG_MIPS_NAN_.*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN)) endef endif # mips @@ -162,7 +162,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh) UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE)) define UCLIBC_SH_TYPE_CONFIG $(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE)) endef endif # sh @@ -175,7 +175,7 @@ UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE)) define UCLIBC_SPARC_TYPE_CONFIG $(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \ $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE)) endef endif # sparc @@ -186,9 +186,9 @@ endif # sparc ifeq ($(UCLIBC_TARGET_ARCH),powerpc) UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE)) define UCLIBC_POWERPC_TYPE_CONFIG - $(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_E500,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE),$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC) + $(call KCONFIG_DISABLE_OPT,CONFIG_E500) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE)) endef endif # powerpc @@ -198,7 +198,7 @@ endif # powerpc ifeq ($(UCLIBC_TARGET_ARCH),i386) UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE)) define UCLIBC_X86_TYPE_CONFIG - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE),$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE)) endef endif @@ -207,7 +207,7 @@ endif # ifeq ($(BR2_ENABLE_DEBUG),y) define UCLIBC_DEBUG_CONFIG - $(call KCONFIG_ENABLE_OPT,DODEBUG,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,DODEBUG) endef endif @@ -217,17 +217,17 @@ endif ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN) + $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN) endef else define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN) + $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN) + $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN) endef endif @@ -237,13 +237,13 @@ endif ifeq ($(BR2_USE_MMU),y) define UCLIBC_MMU_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU) + $(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU) endef else define UCLIBC_MMU_CONFIG - $(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU) + $(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU) endef endif @@ -251,7 +251,7 @@ endif # IPv6 # -UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) +UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6) # # soft-float @@ -259,14 +259,14 @@ UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) ifeq ($(BR2_SOFT_FLOAT),y) define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,DO_C99_MATH,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS) + $(call KCONFIG_ENABLE_OPT,DO_C99_MATH) endef else define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS) endef endif @@ -275,13 +275,13 @@ endif # ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y) define UCLIBC_SSP_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP) + $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP) endef else define UCLIBC_SSP_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP) + $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP) endef endif @@ -290,21 +290,21 @@ endif # ifeq ($(BR2_PTHREADS_NONE),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef else ifeq ($(BR2_PTHREADS),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef else ifeq ($(BR2_PTHREADS_NATIVE),y) define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE) endef endif @@ -313,9 +313,9 @@ endif # ifeq ($(BR2_PTHREAD_DEBUG),y) -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) +UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT) else -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) +UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT) endif # @@ -324,18 +324,18 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y) define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE,$(@D)/.config) - $(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE) + $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE) + $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE) + $(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)") + $(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA) + $(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA) + $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING) endef else define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE) endef endif @@ -344,9 +344,9 @@ endif # ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y) -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) +UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR) else -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) +UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR) endif # @@ -354,9 +354,9 @@ endif # ifeq ($(BR2_STATIC_LIBS),y) -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config) +UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED) else -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config) +UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED) endif # @@ -370,13 +370,13 @@ UCLIBC_MAKE_FLAGS = \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS - $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config) - $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config) - $(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D)/.config) - $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/",$(@D)/.config) - $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config) - $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config) + $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)") + $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH)) + $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)") + $(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include") + $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") + $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") + $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) diff --git a/buildroot/package/udev-gentoo-scripts/Config.in b/buildroot/package/udev-gentoo-scripts/Config.in new file mode 100644 index 000000000..9d6944354 --- /dev/null +++ b/buildroot/package/udev-gentoo-scripts/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_UDEV_GENTOO_SCRIPTS + bool + depends on BR2_PACKAGE_EUDEV + depends on BR2_INIT_OPENRC + help + Init scripts for eudev. diff --git a/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.hash b/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.hash new file mode 100644 index 000000000..60563baae --- /dev/null +++ b/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b206f72c93cd2e51ed59061931918a9c23c3c1f7e6caffacc9d4f8915a42c30a udev-gentoo-scripts-33.tar.bz2 +sha256 329f95829088b95650b9012ae688f09baa1637985425a7964d33683363f48702 init.d/udev-settle diff --git a/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.mk b/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.mk new file mode 100644 index 000000000..a0598bcad --- /dev/null +++ b/buildroot/package/udev-gentoo-scripts/udev-gentoo-scripts.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# udev-gentoo-scripts +# +################################################################################ + +UDEV_GENTOO_SCRIPTS_VERSION = 33 +UDEV_GENTOO_SCRIPTS_SOURCE = udev-gentoo-scripts-$(UDEV_GENTOO_SCRIPTS_VERSION).tar.bz2 +UDEV_GENTOO_SCRIPTS_SITE = https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot +UDEV_GENTOO_SCRIPTS_LICENSE = GPL-2.0 +UDEV_GENTOO_SCRIPTS_LICENSE_FILES = init.d/udev-settle + +# We don't need to symlink /etc/init.d/udev to /etc/runlevels/sysinit, since +# it's in the udev-settle and udev-trigger "need" lists. +define UDEV_GENTOO_SCRIPTS_INSTALL_INIT_OPENRC + $(MAKE1) -C $(@D) install DESTDIR=$(TARGET_DIR) + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/runlevels/sysinit + ln -s -f /etc/init.d/udev-settle /etc/init.d/udev-trigger \ + $(TARGET_DIR)/etc/runlevels/sysinit +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/udev/udev.mk b/buildroot/package/udev/udev.mk index cc4a6e3a2..05b35b21f 100644 --- a/buildroot/package/udev/udev.mk +++ b/buildroot/package/udev/udev.mk @@ -4,4 +4,11 @@ # ################################################################################ +# Required by default rules for input devices +define UDEV_USERS + - - input -1 * - - - Input device group + - - render -1 * - - - DRI rendering nodes + - - kvm -1 * - - - kvm nodes +endef + $(eval $(virtual-package)) diff --git a/buildroot/package/udisks/Config.in b/buildroot/package/udisks/Config.in index 04a632dd8..efd3b619b 100644 --- a/buildroot/package/udisks/Config.in +++ b/buildroot/package/udisks/Config.in @@ -9,16 +9,16 @@ config BR2_PACKAGE_UDISKS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit depends on BR2_USE_MMU # lvm2 depends on BR2_USE_WCHAR # dbus-glib -> glib2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted + depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2 depends on !BR2_STATIC_LIBS # lvm2, spidermonkey select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_SG3_UTILS - select BR2_PACKAGE_POLKIT - select BR2_PACKAGE_PARTED - select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LIBATASMART select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_POLKIT + select BR2_PACKAGE_SG3_UTILS help The udisks project provides diff --git a/buildroot/package/udisks/udisks.mk b/buildroot/package/udisks/udisks.mk index fe8932a92..c6119a8b8 100644 --- a/buildroot/package/udisks/udisks.mk +++ b/buildroot/package/udisks/udisks.mk @@ -12,16 +12,16 @@ UDISKS_LICENSE_FILES = COPYING UDISKS_AUTORECONF = YES UDISKS_DEPENDENCIES = \ - sg3_utils \ host-pkgconf \ - udev \ dbus \ dbus-glib \ - polkit \ - parted \ - lvm2 \ libatasmart \ - libgudev + libgudev \ + lvm2 \ + parted \ + polkit \ + sg3_utils \ + udev UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages diff --git a/buildroot/package/udpcast/0001-select-h.patch b/buildroot/package/udpcast/0001-select-h.patch deleted file mode 100644 index 9a8cfc9d5..000000000 --- a/buildroot/package/udpcast/0001-select-h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- udpcast-20120424/console.h 2005-12-22 22:59:18.000000000 +0000 -+++ udpcast-20120424.mod/console.h 2013-05-22 22:22:19.835474140 +0100 -@@ -6,6 +6,8 @@ - #include - #endif /* __MINGW32__ */ - -+#include -+ - #define prepareConsole udpc_prepareConsole - #define getConsoleFd udpc_getConsoleFd - #define restoreConsole udpc_restoreConsole diff --git a/buildroot/package/udpcast/udpcast.hash b/buildroot/package/udpcast/udpcast.hash index a70aa7198..9cdce0a28 100644 --- a/buildroot/package/udpcast/udpcast.hash +++ b/buildroot/package/udpcast/udpcast.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ce9090ef80b6035a744a9b5ac335e61c99baa92c39ff53277266fbfcb836445a udpcast-20120424.tar.gz +sha256 9c19eebaa6e2f78127f0d59e95d0ce003b687d61e283b5963a1da6b8ac41f21a udpcast-20200328.tar.gz sha256 422befd3503b1f39a6027017f639874c1f274e37ec60ba3174894646b584ccbc COPYING diff --git a/buildroot/package/udpcast/udpcast.mk b/buildroot/package/udpcast/udpcast.mk index e9116d2de..34ebddd2d 100644 --- a/buildroot/package/udpcast/udpcast.mk +++ b/buildroot/package/udpcast/udpcast.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDPCAST_VERSION = 20120424 +UDPCAST_VERSION = 20200328 UDPCAST_SITE = http://www.udpcast.linux.lu/download UDPCAST_DEPENDENCIES = host-m4 UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+ diff --git a/buildroot/package/uftp/uftp.hash b/buildroot/package/uftp/uftp.hash index 149743001..aaebcad01 100644 --- a/buildroot/package/uftp/uftp.hash +++ b/buildroot/package/uftp/uftp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 -sha256 91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292 uftp-4.10.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt +sha256 562f71ea5a24b615eb491f5744bad01e9c2e58244c1d6252d5ae98d320d308e0 uftp-5.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/buildroot/package/uftp/uftp.mk b/buildroot/package/uftp/uftp.mk index cfef1f9e3..1c36cb0ce 100644 --- a/buildroot/package/uftp/uftp.mk +++ b/buildroot/package/uftp/uftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -UFTP_VERSION = 4.10 +UFTP_VERSION = 5.0 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch b/buildroot/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch new file mode 100644 index 000000000..a79b650be --- /dev/null +++ b/buildroot/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch @@ -0,0 +1,40 @@ +From 881705ec581ab7cd61c8e4fe134db8854a83ec4e Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Tue, 28 Apr 2020 16:56:29 +0200 +Subject: [PATCH] host: CMakeLists: add boost unit_test_framework required only + when ENABLE_TESTS=ON + +By default, boost unit_test_framework is always required, but only use +when ENABLE_TESTS=ON. +This PR suppress unit_test_framework to the default list and append +UHD_BOOST_REQUIRED_COMPONENTS when this library is needed + +[backported from https://github.com/EttusResearch/uhd/pull/341] +Signed-off-by: Gwenhael Goavec-Merou +--- + host/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt +index 8f72ece76..a7731ffbd 100644 +--- a/host/CMakeLists.txt ++++ b/host/CMakeLists.txt +@@ -291,10 +291,14 @@ set(UHD_BOOST_REQUIRED_COMPONENTS + filesystem + program_options + system +- unit_test_framework + serialization + thread + ) ++ ++if(ENABLE_TESTS) ++ list(APPEND UHD_BOOST_REQUIRED_COMPONENTS unit_test_framework) ++endif(ENABLE_TESTS) ++ + include(UHDBoost) + + include_directories(${Boost_INCLUDE_DIRS}) +-- +2.26.2 + diff --git a/buildroot/package/uhd/0002-host-fix-build-boost-173.patch b/buildroot/package/uhd/0002-host-fix-build-boost-173.patch new file mode 100644 index 000000000..b685b5f8a --- /dev/null +++ b/buildroot/package/uhd/0002-host-fix-build-boost-173.patch @@ -0,0 +1,577 @@ +From 13caaf001061db3c01082c4574a5e326c4969ab6 Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Thu, 16 Jul 2020 13:07:34 +0200 +Subject: [PATCH] boost: Include bind.hpp where used, add + BOOST_BIND_GLOBAL_PLACEHOLDERS + +Consists of two changes: +- Grepped for files that use boost::bind, but don't include + boost/bind.hpp. Changed all of those to include bind.hpp +- Add BOOST_BIND_GLOBAL_PLACEHOLDERS so that Boost doesn't complain + about using bind placeholders in the global namespace. + +Background: boost/bind.hpp is a convenience header that pulls the Boost +bind placeholders into the global namespace, but that's deprecated +behaviour. For UHD 3.15, we'll keep the deprecated behaviour (modern UHD +no longer uses Boost.Bind), so this fixes build failures with modern +Boost, and related warnings. + +Patch retrieved from +https://github.com/EttusResearch/uhd/commit/13caaf001061db3c01082c4574a5e326c4969ab6 + +Signed-off-by: Martin Braun +Signed-off-by: Gwenhael Goavec-Merou +--- + host/cmake/Modules/UHDBoost.cmake | 3 +++ + host/examples/network_relay.cpp | 1 + + host/examples/rfnoc_rx_to_file.cpp | 1 + + host/examples/test_clock_synch.cpp | 1 + + host/examples/txrx_loopback_to_file.cpp | 1 + + host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp | 1 + + host/lib/rfnoc/legacy_compat.cpp | 1 + + host/lib/transport/xport_benchmarker.cpp | 1 + + host/lib/usrp/b100/b100_impl.cpp | 1 + + host/lib/usrp/b200/b200_iface.cpp | 1 + + host/lib/usrp/b200/b200_impl.cpp | 1 + + host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 + + host/lib/usrp/cores/tx_dsp_core_3000.cpp | 1 + + host/lib/usrp/dboard/db_cbx.cpp | 1 + + host/lib/usrp/dboard/db_dbsrx.cpp | 1 + + host/lib/usrp/dboard/db_dbsrx2.cpp | 1 + + host/lib/usrp/dboard/db_sbx_common.cpp | 1 + + host/lib/usrp/dboard/db_sbx_version3.cpp | 1 + + host/lib/usrp/dboard/db_sbx_version4.cpp | 1 + + host/lib/usrp/dboard/db_tvrx.cpp | 1 + + host/lib/usrp/dboard/db_tvrx2.cpp | 1 + + host/lib/usrp/dboard/db_twinrx.cpp | 1 + + host/lib/usrp/dboard/db_ubx.cpp | 1 + + host/lib/usrp/dboard/db_wbx_common.cpp | 1 + + host/lib/usrp/dboard/db_wbx_simple.cpp | 1 + + host/lib/usrp/dboard/db_wbx_version2.cpp | 1 + + host/lib/usrp/dboard/db_wbx_version3.cpp | 1 + + host/lib/usrp/dboard/db_wbx_version4.cpp | 1 + + host/lib/usrp/dboard/db_xcvr2450.cpp | 1 + + host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 1 + + host/lib/usrp/multi_usrp.cpp | 1 + + host/lib/usrp/n230/n230_resource_manager.cpp | 1 + + host/lib/usrp/n230/n230_uart.cpp | 1 + + host/lib/usrp/usrp1/soft_time_ctrl.cpp | 1 + + host/lib/usrp/usrp1/usrp1_impl.cpp | 1 + + host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 1 + + host/lib/usrp_clock/octoclock/octoclock_impl.cpp | 1 + + host/lib/utils/ihex.cpp | 1 + + host/lib/utils/tasks.cpp | 1 + + host/utils/uhd_cal_rx_iq_balance.cpp | 1 + + host/utils/uhd_cal_tx_dc_offset.cpp | 1 + + host/utils/uhd_cal_tx_iq_balance.cpp | 1 + + 42 files changed, 44 insertions(+) + +diff --git a/host/cmake/Modules/UHDBoost.cmake b/host/cmake/Modules/UHDBoost.cmake +index 5ebb4acef..e3ee42b50 100644 +--- a/host/cmake/Modules/UHDBoost.cmake ++++ b/host/cmake/Modules/UHDBoost.cmake +@@ -259,6 +259,9 @@ else() + # disable Boost's use of std::experimental::string_view + # works for Boost 1.67.0 and newer & doesn't hurt older + add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) ++ # UHD 3.15 still uses global placeholders (_1, _2, ...) from Boost which ++ # need to be enabled explicitly for some Boost versions ++ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) + + # Boost 1.70.0's find cmake scripts don't always set the expected + # return variables. Replicate the commit that fixes that issue here: +diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp +index bf2ac9255..9a9f56eb5 100644 +--- a/host/examples/network_relay.cpp ++++ b/host/examples/network_relay.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/examples/rfnoc_rx_to_file.cpp b/host/examples/rfnoc_rx_to_file.cpp +index 5bb9985ae..cbd35cbe8 100644 +--- a/host/examples/rfnoc_rx_to_file.cpp ++++ b/host/examples/rfnoc_rx_to_file.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/examples/test_clock_synch.cpp b/host/examples/test_clock_synch.cpp +index 8556063d7..ec071f7c7 100644 +--- a/host/examples/test_clock_synch.cpp ++++ b/host/examples/test_clock_synch.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp +index 271d249f6..a2f0427c9 100644 +--- a/host/examples/txrx_loopback_to_file.cpp ++++ b/host/examples/txrx_loopback_to_file.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp +index a80e2ef53..b78635002 100644 +--- a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp ++++ b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/rfnoc/legacy_compat.cpp b/host/lib/rfnoc/legacy_compat.cpp +index 91de361df..f93fe871a 100644 +--- a/host/lib/rfnoc/legacy_compat.cpp ++++ b/host/lib/rfnoc/legacy_compat.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/host/lib/transport/xport_benchmarker.cpp b/host/lib/transport/xport_benchmarker.cpp +index 67582ff2c..7abd4c5fd 100644 +--- a/host/lib/transport/xport_benchmarker.cpp ++++ b/host/lib/transport/xport_benchmarker.cpp +@@ -6,6 +6,7 @@ + // + + #include "xport_benchmarker.hpp" ++#include + #include + #include + +diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp +index cd4319803..08006ae32 100644 +--- a/host/lib/usrp/b100/b100_impl.cpp ++++ b/host/lib/usrp/b100/b100_impl.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp +index 082be071c..cdf88f69b 100644 +--- a/host/lib/usrp/b200/b200_iface.cpp ++++ b/host/lib/usrp/b200/b200_iface.cpp +@@ -12,6 +12,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp +index 1be8c263b..c0f8ee1ac 100644 +--- a/host/lib/usrp/b200/b200_impl.cpp ++++ b/host/lib/usrp/b200/b200_impl.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp +index 46fce3f69..ff7caf105 100644 +--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp ++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include //thread sleep + #include +diff --git a/host/lib/usrp/cores/tx_dsp_core_3000.cpp b/host/lib/usrp/cores/tx_dsp_core_3000.cpp +index be7593841..b76a74b1c 100644 +--- a/host/lib/usrp/cores/tx_dsp_core_3000.cpp ++++ b/host/lib/usrp/cores/tx_dsp_core_3000.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include //sleep + #include +diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp +index dd0640d00..f5c7f2399 100644 +--- a/host/lib/usrp/dboard/db_cbx.cpp ++++ b/host/lib/usrp/dboard/db_cbx.cpp +@@ -7,6 +7,7 @@ + + #include "db_sbx_common.hpp" + #include ++#include + #include + + using namespace uhd; +diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp +index 587158470..dc82b60f9 100644 +--- a/host/lib/usrp/dboard/db_dbsrx.cpp ++++ b/host/lib/usrp/dboard/db_dbsrx.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp +index e2505dfd7..da4da4148 100644 +--- a/host/lib/usrp/dboard/db_dbsrx2.cpp ++++ b/host/lib/usrp/dboard/db_dbsrx2.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_sbx_common.cpp b/host/lib/usrp/dboard/db_sbx_common.cpp +index b6eaedc3d..95aff96b4 100644 +--- a/host/lib/usrp/dboard/db_sbx_common.cpp ++++ b/host/lib/usrp/dboard/db_sbx_common.cpp +@@ -6,6 +6,7 @@ + // + + #include "db_sbx_common.hpp" ++#include + + using namespace uhd; + using namespace uhd::usrp; +diff --git a/host/lib/usrp/dboard/db_sbx_version3.cpp b/host/lib/usrp/dboard/db_sbx_version3.cpp +index 369315b2e..fb829cf34 100644 +--- a/host/lib/usrp/dboard/db_sbx_version3.cpp ++++ b/host/lib/usrp/dboard/db_sbx_version3.cpp +@@ -9,6 +9,7 @@ + #include "db_sbx_common.hpp" + #include + #include ++#include + + using namespace uhd; + using namespace uhd::usrp; +diff --git a/host/lib/usrp/dboard/db_sbx_version4.cpp b/host/lib/usrp/dboard/db_sbx_version4.cpp +index d1c76287b..e1adebf99 100644 +--- a/host/lib/usrp/dboard/db_sbx_version4.cpp ++++ b/host/lib/usrp/dboard/db_sbx_version4.cpp +@@ -9,6 +9,7 @@ + #include "db_sbx_common.hpp" + #include + #include ++#include + + using namespace uhd; + using namespace uhd::usrp; +diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp +index 8bf377c4d..5fbbf5bee 100644 +--- a/host/lib/usrp/dboard/db_tvrx.cpp ++++ b/host/lib/usrp/dboard/db_tvrx.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp +index 5dba83551..e1623487d 100644 +--- a/host/lib/usrp/dboard/db_tvrx2.cpp ++++ b/host/lib/usrp/dboard/db_tvrx2.cpp +@@ -55,6 +55,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp +index de1cd3f33..aa9da8adf 100644 +--- a/host/lib/usrp/dboard/db_twinrx.cpp ++++ b/host/lib/usrp/dboard/db_twinrx.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include "dboard_ctor_args.hpp" ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp +index 305a69c52..e78f9db75 100644 +--- a/host/lib/usrp/dboard/db_ubx.cpp ++++ b/host/lib/usrp/dboard/db_ubx.cpp +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_wbx_common.cpp b/host/lib/usrp/dboard/db_wbx_common.cpp +index 41f323d19..fd7b2481a 100644 +--- a/host/lib/usrp/dboard/db_wbx_common.cpp ++++ b/host/lib/usrp/dboard/db_wbx_common.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + using namespace uhd; + using namespace uhd::usrp; +diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp +index 390c5c47a..e3a5667c7 100644 +--- a/host/lib/usrp/dboard/db_wbx_simple.cpp ++++ b/host/lib/usrp/dboard/db_wbx_simple.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + using namespace uhd; + using namespace uhd::usrp; +diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp +index 775ee4467..f1bf7dacc 100644 +--- a/host/lib/usrp/dboard/db_wbx_version2.cpp ++++ b/host/lib/usrp/dboard/db_wbx_version2.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp +index 41979f8ef..b755d09a2 100644 +--- a/host/lib/usrp/dboard/db_wbx_version3.cpp ++++ b/host/lib/usrp/dboard/db_wbx_version3.cpp +@@ -15,6 +15,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp +index 8b3d13b37..f2976d3a7 100644 +--- a/host/lib/usrp/dboard/db_wbx_version4.cpp ++++ b/host/lib/usrp/dboard/db_wbx_version4.cpp +@@ -15,6 +15,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp +index 9e1c9f2b0..8f95dbb1c 100644 +--- a/host/lib/usrp/dboard/db_xcvr2450.cpp ++++ b/host/lib/usrp/dboard/db_xcvr2450.cpp +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp +index 73851656b..717fa144f 100644 +--- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp +index 49ffec698..13cb03cf9 100644 +--- a/host/lib/usrp/multi_usrp.cpp ++++ b/host/lib/usrp/multi_usrp.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp +index 22f8ddedb..df3c9fb15 100644 +--- a/host/lib/usrp/n230/n230_resource_manager.cpp ++++ b/host/lib/usrp/n230/n230_resource_manager.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/n230/n230_uart.cpp b/host/lib/usrp/n230/n230_uart.cpp +index 8689335c8..26fafde94 100644 +--- a/host/lib/usrp/n230/n230_uart.cpp ++++ b/host/lib/usrp/n230/n230_uart.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + using namespace uhd; + using namespace uhd::transport; +diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp +index 7f39caf8a..9a84ee188 100644 +--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp ++++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp +@@ -8,6 +8,7 @@ + #include "soft_time_ctrl.hpp" + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp +index 2134f8182..1e83ce3fc 100644 +--- a/host/lib/usrp/usrp1/usrp1_impl.cpp ++++ b/host/lib/usrp/usrp1/usrp1_impl.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +index 8d967ae15..de36379ea 100644 +--- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp ++++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp +index f3cf3f4ea..4c11788d2 100644 +--- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp ++++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/utils/ihex.cpp b/host/lib/utils/ihex.cpp +index 6bb0ba9d4..7fb605627 100644 +--- a/host/lib/utils/ihex.cpp ++++ b/host/lib/utils/ihex.cpp +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/lib/utils/tasks.cpp b/host/lib/utils/tasks.cpp +index 888a5a8f1..e5195fcf1 100644 +--- a/host/lib/utils/tasks.cpp ++++ b/host/lib/utils/tasks.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp +index c68c96173..3f5fa1788 100644 +--- a/host/utils/uhd_cal_rx_iq_balance.cpp ++++ b/host/utils/uhd_cal_rx_iq_balance.cpp +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp +index f47b5e913..2cb65d3f5 100644 +--- a/host/utils/uhd_cal_tx_dc_offset.cpp ++++ b/host/utils/uhd_cal_tx_dc_offset.cpp +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp +index 2e7229fd3..ace93462e 100644 +--- a/host/utils/uhd_cal_tx_iq_balance.cpp ++++ b/host/utils/uhd_cal_tx_iq_balance.cpp +@@ -8,6 +8,7 @@ + #include "usrp_cal_utils.hpp" + #include + #include ++#include + #include + #include + #include +-- +2.26.2 + diff --git a/buildroot/package/uhd/Config.in b/buildroot/package/uhd/Config.in new file mode 100644 index 000000000..32cb4cf89 --- /dev/null +++ b/buildroot/package/uhd/Config.in @@ -0,0 +1,79 @@ +comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + +comment "uhd needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +config BR2_PACKAGE_UHD + bool "uhd" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # use fork() + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_ATOMIC + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_BOOST_REGEX + select BR2_PACKAGE_BOOST_SERIALIZATION + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD + help + Universal Software Radio Peripheral (USRP) Hardware Driver + + https://kb.etthus.com + +if BR2_PACKAGE_UHD + +config BR2_PACKAGE_UHD_B100 + bool "b100 support" + select BR2_PACKAGE_UHD_USB + help + enable B100 support + +config BR2_PACKAGE_UHD_B200 + bool "b200 support" + select BR2_PACKAGE_UHD_USB + help + enable B200 support + +config BR2_PACKAGE_UHD_E300 + bool "E300 support" + select BR2_PACKAGE_UHD_MPMD + help + enable E300 support + +config BR2_PACKAGE_UHD_E320 + bool "E320 support" + select BR2_PACKAGE_UHD_MPMD + help + enable E320 support + +config BR2_PACKAGE_UHD_EXAMPLES + bool "uhd-examples" + help + Examples + +config BR2_PACKAGE_UHD_MPMD + bool "MPMD support" + help + enable MPMD support + +config BR2_PACKAGE_UHD_RFNOC + bool "RFNoC support" + help + enable RFNoC support + +config BR2_PACKAGE_UHD_USB + bool "USB support" + select BR2_PACKAGE_LIBUSB + help + enable UHD USB support + +endif diff --git a/buildroot/package/uhd/uhd.hash b/buildroot/package/uhd/uhd.hash new file mode 100644 index 000000000..cfd1f3f64 --- /dev/null +++ b/buildroot/package/uhd/uhd.hash @@ -0,0 +1,4 @@ +# Locally calculated: +sha256 eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd uhd-3.15.0.0.tar.gz +sha256 8fc99820c2419d0de6bbbd319ff935d54960b37b716d0b4bb1c75de493f3e1fd LICENSE.md +sha256 70bf7e79c8cd73a81f97ce81745ea0719a617eebe299a61868165daeae71fff2 host/LICENSE diff --git a/buildroot/package/uhd/uhd.mk b/buildroot/package/uhd/uhd.mk new file mode 100644 index 000000000..adb757901 --- /dev/null +++ b/buildroot/package/uhd/uhd.mk @@ -0,0 +1,105 @@ +################################################################################ +# +# uhd +# +################################################################################ + +UHD_VERSION = 3.15.0.0 +UHD_SITE = $(call github,EttusResearch,uhd,v$(UHD_VERSION)) +UHD_LICENSE = GPL-3.0+ +UHD_LICENSE_FILES = LICENSE.md host/LICENSE + +UHD_SUPPORTS_IN_SOURCE_BUILD = NO +UHD_SUBDIR = host +UHD_INSTALL_STAGING = YES + +UHD_DEPENDENCIES = \ + boost \ + $(if $(BR2_PACKAGE_PYTHON),host-python,host-python3) \ + host-python-mako + +UHD_CONF_OPTS = \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DRUNTIME_PYTHON_EXECUTABLE=/usr/bin/python \ + -DENABLE_C_API=ON \ + -DENABLE_DOXYGEN=OFF \ + -DENABLE_DPKD=OFF \ + -DENABLE_LIBUHD=ON \ + -DENABLE_N230=OFF \ + -DENABLE_N300=OFF \ + -DENABLE_N320=OFF \ + -DENABLE_MANUAL=OFF \ + -DENABLE_MAN_PAGES=OFF \ + -DENABLE_OCTOCLOCK=OFF \ + -DENABLE_PYTHON_API=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_USRP1=OFF \ + -DENABLE_USRP2=OFF \ + -DENABLE_UTILS=OFF \ + -DENABLE_X300=OFF + +# As soon as architecture is ARM, uhd will try to use NEON. +# But not all ARM cores have NEON support. +# When CPU support NEON -mfpu=neon must be added to CXX_FLAGS +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +UHD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -mfpu=neon" +UHD_CONF_OPTS += -DNEON_SIMD_ENABLE=ON +else +UHD_CONF_OPTS += -Dhave_mfpu_neon=0 +UHD_CONF_OPTS += -DNEON_SIMD_ENABLE=OFF +endif + +ifeq ($(BR2_PACKAGE_ORC),y) +UHD_DEPENDENCIES += orc +endif + +ifeq ($(BR2_PACKAGE_UHD_B100),y) +UHD_CONF_OPTS += -DENABLE_B100=ON +else +UHD_CONF_OPTS += -DENABLE_B100=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_B200),y) +UHD_CONF_OPTS += -DENABLE_B200=ON +else +UHD_CONF_OPTS += -DENABLE_B200=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_E300),y) +UHD_CONF_OPTS += -DENABLE_E300=ON +else +UHD_CONF_OPTS += -DENABLE_E300=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_E320),y) +UHD_CONF_OPTS += -DENABLE_E320=ON +else +UHD_CONF_OPTS += -DENABLE_E320=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_EXAMPLES),y) +UHD_CONF_OPTS += -DENABLE_EXAMPLES=ON +else +UHD_CONF_OPTS += -DENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_MPMD),y) +UHD_CONF_OPTS += -DENABLE_MPMD=ON +else +UHD_CONF_OPTS += -DENABLE_MPMD=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_RFNOC),y) +UHD_CONF_OPTS += -DENABLE_RFNOC=ON +else +UHD_CONF_OPTS += -DENABLE_RFNOC=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_USB),y) +UHD_DEPENDENCIES += libusb +UHD_CONF_OPTS += -DENABLE_USB=ON +else +UHD_CONF_OPTS += -DENABLE_USB=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/uhubctl/uhubctl.hash b/buildroot/package/uhubctl/uhubctl.hash index 255f7aa11..c477301c7 100644 --- a/buildroot/package/uhubctl/uhubctl.hash +++ b/buildroot/package/uhubctl/uhubctl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b uhubctl-2.1.0.tar.gz -sha256 05d376f74b3b539e2758d2b8a4bef5b15e567350d19c8581b5344bf4ce84414a LICENSE +sha256 e5a722cb41967903bedbab4eea566ab332241a7f05fc7bc9c386b9a5e1762d8b uhubctl-2.2.0.tar.gz +sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE diff --git a/buildroot/package/uhubctl/uhubctl.mk b/buildroot/package/uhubctl/uhubctl.mk index da217a7bd..0633152cc 100644 --- a/buildroot/package/uhubctl/uhubctl.mk +++ b/buildroot/package/uhubctl/uhubctl.mk @@ -4,14 +4,14 @@ # ################################################################################ -UHUBCTL_VERSION = 2.1.0 +UHUBCTL_VERSION = 2.2.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE UHUBCTL_DEPENDENCIES = libusb define UHUBCTL_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) GIT_VERSION=v$(UHUBCTL_VERSION) -C $(@D) endef define UHUBCTL_INSTALL_TARGET_CMDS diff --git a/buildroot/package/umtprd/umtprd.hash b/buildroot/package/umtprd/umtprd.hash index 168b19e95..170837d84 100644 --- a/buildroot/package/umtprd/umtprd.hash +++ b/buildroot/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1301bdd89170cc2c679446c1cc5873feaacd061bf0ab547fc0a11670bae9163 umtprd-1.0.0.tar.gz +sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/umtprd/umtprd.mk b/buildroot/package/umtprd/umtprd.mk index 63faae43b..f1a4e66cf 100644 --- a/buildroot/package/umtprd/umtprd.mk +++ b/buildroot/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.0.0 +UMTPRD_VERSION = 1.3.10 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/unbound/Config.in b/buildroot/package/unbound/Config.in new file mode 100644 index 000000000..ae2ebfd97 --- /dev/null +++ b/buildroot/package/unbound/Config.in @@ -0,0 +1,38 @@ +config BR2_PACKAGE_UNBOUND + bool "unbound" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_OPENSSL + help + Unbound is a validating, recursive, and caching DNS resolver. + It supports DNSSEC, QNAME minimisation, DNS-over-TLS and + DNSCrypt. + + https://www.unbound.net + +if BR2_PACKAGE_UNBOUND +config BR2_PACKAGE_UNBOUND_DNSCRYPT + bool "enable DNSCrypt" + select BR2_PACKAGE_LIBSODIUM + help + DNSCrypt wraps unmodified DNS queries between a client and + a DNS resolver. Default port used is 443 and like with + normal unencrypted DNS, it uses UDP first and falling back + to TCP if response too large. + + There is also DNS-over-TLS, a TCP only version + of proposed standard for DNS encryption (RFC 7858). + Default port for DNS-over-TLS is 853 and Unbound has + built-in support for it. + + https://tools.ietf.org/html/rfc7858 + + Note: Neither DNSCrypt or DNS-over-TLS encrypt the SNI. + Here is some suggestions how to handle SNI encryption: + + https://tools.ietf.org/html/draft-ietf-tls-sni-encryption-00 +endif + +comment "unbound needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/unbound/S70unbound b/buildroot/package/unbound/S70unbound new file mode 100644 index 000000000..cb722ce28 --- /dev/null +++ b/buildroot/package/unbound/S70unbound @@ -0,0 +1,52 @@ +#!/bin/sh + +DAEMON="unbound" +PIDFILE="/var/run/$DAEMON.pid" + +UNBOUND_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $UNBOUND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/unbound/unbound.hash b/buildroot/package/unbound/unbound.hash new file mode 100644 index 000000000..c2c6ab7ff --- /dev/null +++ b/buildroot/package/unbound/unbound.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5b9253a97812f24419bf2e6b3ad28c69287261cf8c8fa79e3e9f6d3bf7ef5835 unbound-1.12.0.tar.gz +sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/buildroot/package/unbound/unbound.mk b/buildroot/package/unbound/unbound.mk new file mode 100644 index 000000000..d60180b6c --- /dev/null +++ b/buildroot/package/unbound/unbound.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# unbound +# +################################################################################ + +UNBOUND_VERSION = 1.12.0 +UNBOUND_SITE = https://www.unbound.net/downloads +UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl +UNBOUND_LICENSE = BSD-3-Clause +UNBOUND_LICENSE_FILES = LICENSE +UNBOUND_CONF_OPTS = \ + --disable-rpath \ + --disable-debug \ + --with-conf-file=/etc/unbound/unbound.conf \ + --with-pidfile=/var/run/unbound.pid \ + --with-rootkey-file=/etc/unbound/root.key \ + --enable-tfo-server \ + --with-libexpat=$(STAGING_DIR)/usr \ + --with-ssl=$(STAGING_DIR)/usr + +# uClibc-ng does not have MSG_FASTOPEN +# so TCP Fast Open client mode disabled for it +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +UNBOUND_CONF_OPTS += --disable-tfo-client +else +UNBOUND_CONF_OPTS += --enable-tfo-client +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +UNBOUND_CONF_OPTS += --with-pthreads +else +UNBOUND_CONF_OPTS += --without-pthreads +endif + +ifeq ($(BR2_GCC_ENABLE_LTO),y) +UNBOUND_CONF_OPTS += --enable-flto +else +UNBOUND_CONF_OPTS += --disable-flto +endif + +ifeq ($(BR2_PACKAGE_UNBOUND_DNSCRYPT),y) +UNBOUND_CONF_OPTS += --enable-dnscrypt +UNBOUND_DEPENDENCIES += libsodium +else +UNBOUND_CONF_OPTS += --disable-dnscrypt +endif + +define UNBOUND_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/unbound/S70unbound \ + $(TARGET_DIR)/etc/init.d/S70unbound +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/unclutter-xfixes/Config.in b/buildroot/package/unclutter-xfixes/Config.in new file mode 100644 index 000000000..852a8cfda --- /dev/null +++ b/buildroot/package/unclutter-xfixes/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_UNCLUTTER_XFIXES + bool "unclutter-xfixes" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXI + help + Remove idle cursor image from screen. + + A rewrite of unclutter using the x11-xfixes extension. + + https://github.com/Airblader/unclutter-xfixes diff --git a/buildroot/package/unclutter-xfixes/unclutter-xfixes.hash b/buildroot/package/unclutter-xfixes/unclutter-xfixes.hash new file mode 100644 index 000000000..785825da7 --- /dev/null +++ b/buildroot/package/unclutter-xfixes/unclutter-xfixes.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/buildroot/package/unclutter-xfixes/unclutter-xfixes.mk b/buildroot/package/unclutter-xfixes/unclutter-xfixes.mk new file mode 100644 index 000000000..713a84bca --- /dev/null +++ b/buildroot/package/unclutter-xfixes/unclutter-xfixes.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# unclutter-xfixes +# +################################################################################ + +UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) +UNCLUTTER_XFIXES_LICENSE = MIT +UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE +UNCLUTTER_XFIXES_DEPENDENCIES = libev xlib_libX11 xlib_libXfixes xlib_libXi host-pkgconf + +define UNCLUTTER_XFIXES_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) unclutter CC="$(TARGET_CC)" +endef + +define UNCLUTTER_XFIXES_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/unclutter $(TARGET_DIR)/usr/bin/unclutter +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch b/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch deleted file mode 100644 index f3d8fa15a..000000000 --- a/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d33635fe940ff898e026d3fb77446e52f8f2bd3f Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 16 Feb 2017 14:59:30 -0300 -Subject: [PATCH] include asm/ioctl.h for _IOC_SIZE - -Signed-off-by: Gustavo Zacarias ---- - src/unionfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unionfs.c b/src/unionfs.c -index 5aed5ce..f6cd368 100644 ---- a/src/unionfs.c -+++ b/src/unionfs.c -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #ifdef linux - #include --- -2.10.2 - diff --git a/buildroot/package/unionfs/unionfs.hash b/buildroot/package/unionfs/unionfs.hash index f4310b023..7c4a9f4ff 100644 --- a/buildroot/package/unionfs/unionfs.hash +++ b/buildroot/package/unionfs/unionfs.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz -sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch sha256 f56a5579d670e18e0667700bc599acbc0b8217ca1f76b2adb3dad7d2953c4049 LICENSE +sha256 c705072a33a18cbc73ffe799331d43410b6deef5d6f2042038f8fd3ab17b6e2e unionfs-2.1.tar.gz diff --git a/buildroot/package/unionfs/unionfs.mk b/buildroot/package/unionfs/unionfs.mk index e8b295335..12cd368fe 100644 --- a/buildroot/package/unionfs/unionfs.mk +++ b/buildroot/package/unionfs/unionfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIONFS_VERSION = 2.0 +UNIONFS_VERSION = 2.1 UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) UNIONFS_DEPENDENCIES = libfuse host-pkgconf UNIONFS_LICENSE = BSD-3-Clause diff --git a/buildroot/package/unixodbc/0001-fix-nopthread.patch b/buildroot/package/unixodbc/0001-fix-nopthread.patch deleted file mode 100644 index 45933e54d..000000000 --- a/buildroot/package/unixodbc/0001-fix-nopthread.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix pthread detection - -configure.in always calls AC_CHECK_COMP_OPT(pthread) which succeeds with the -toolchain used although it does not contain thread support: - -checking for mutex_lock in -lthread ... no -checking for pthread_mutex_lock in -lpthread... no -checking for pthread_mutex_lock in -lc... no -checking if compiler accepts -pthread... yes -checking for pthread_mutex_lock in -lc... no -checking for pthread_mutex_lock in -lpthread... no - -This positive configure check leads to - - CFLAGS="$CFLAGS -pthread" - -in ./configure, line 15757 which causes a compilation bug -/home/br/br4/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.8.3/../../../../arm-buildroot-linux-uclibcgnueab - -using this defconfig -http://autobuild.buildroot.net/results/e86/e86e97ff7887f1bdc6bf913498392ff50f56ea88/defconfig - -This patch disables the freebsd-only code path. Patching configure directly -prevents the need for autoreconf. - -Signed-off-by: Bernd Kuhls - -diff -uNr unixODBC-2.3.2.org/configure unixODBC-2.3.2/configure ---- unixODBC-2.3.2.org/configure 2013-10-08 10:56:03.000000000 +0200 -+++ unixODBC-2.3.2/configure 2015-03-13 21:19:59.210429211 +0100 -@@ -15746,7 +15746,7 @@ - - fi - -- if test "x$gotthread" = "xno"; then -+ if test "x$gotthread" = "xnot_needed_for_buildroot"; then - if test "x$ac_cv_c_compiler_gnu" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 - $as_echo_n "checking if compiler accepts -pthread... " >&6; } diff --git a/buildroot/package/unixodbc/unixodbc.hash b/buildroot/package/unixodbc/unixodbc.hash index 4d0ad191d..ba094f762 100644 --- a/buildroot/package/unixodbc/unixodbc.hash +++ b/buildroot/package/unixodbc/unixodbc.hash @@ -1,6 +1,6 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz.md5 -md5 274a711b0c77394e052db6493840c6f9 unixODBC-2.3.7.tar.gz +# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz.md5 +md5 06f76e034bb41df5233554abe961a16f unixODBC-2.3.9.tar.gz # Locally computed -sha256 45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 unixODBC-2.3.7.tar.gz -sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING -sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING +sha256 52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 unixODBC-2.3.9.tar.gz +sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING +sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/buildroot/package/unixodbc/unixodbc.mk b/buildroot/package/unixodbc/unixodbc.mk index 2c936fe9d..cdc4e69a7 100644 --- a/buildroot/package/unixodbc/unixodbc.mk +++ b/buildroot/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.7 +UNIXODBC_VERSION = 2.3.9 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC UNIXODBC_INSTALL_STAGING = YES @@ -13,6 +13,13 @@ UNIXODBC_LICENSE_FILES = COPYING exe/COPYING UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +UNIXODBC_CONF_OPTS += --enable-editline +UNIXODBC_DEPENDENCIES += libedit +else +UNIXODBC_CONF_OPTS += --disable-editline +endif + ifeq ($(BR2_PACKAGE_LIBICONV),y) UNIXODBC_CONF_OPTS += --enable-iconv UNIXODBC_DEPENDENCIES += libiconv @@ -34,4 +41,10 @@ else UNIXODBC_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +UNIXODBC_CONF_OPTS += --enable-threads +else +UNIXODBC_CONF_OPTS += --disable-threads +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/unrar/unrar.hash b/buildroot/package/unrar/unrar.hash index f688a4e36..7900c44d1 100644 --- a/buildroot/package/unrar/unrar.hash +++ b/buildroot/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6 unrarsrc-5.8.3.tar.gz -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt +sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/buildroot/package/unrar/unrar.mk b/buildroot/package/unrar/unrar.mk index cdaff2698..ab8d9228c 100644 --- a/buildroot/package/unrar/unrar.mk +++ b/buildroot/package/unrar/unrar.mk @@ -4,9 +4,9 @@ # ################################################################################ -UNRAR_VERSION = 5.8.3 +UNRAR_VERSION = 5.9.4 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz -UNRAR_SITE = http://www.rarlab.com/rar +UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar UNRAR_LICENSE_FILES = license.txt diff --git a/buildroot/package/unscd/unscd.hash b/buildroot/package/unscd/unscd.hash index 671149fda..9ed698fd2 100644 --- a/buildroot/package/unscd/unscd.hash +++ b/buildroot/package/unscd/unscd.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 9078255b2b9c344d9a0c3333ce23dda9d745f158dde0ea2244a8c56ba93f7a40 nscd-0.53.c +sha256 90e12c71732474cac4d055bf9d104e599178b4e1ecb6d3b8c556eaa11f8f6447 nscd-0.54.c diff --git a/buildroot/package/unscd/unscd.mk b/buildroot/package/unscd/unscd.mk index c79ec4400..94b46460f 100644 --- a/buildroot/package/unscd/unscd.mk +++ b/buildroot/package/unscd/unscd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNSCD_VERSION = 0.53 +UNSCD_VERSION = 0.54 UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c UNSCD_SITE = http://busybox.net/~vda/unscd UNSCD_LICENSE = GPL-2.0 diff --git a/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch b/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch deleted file mode 100644 index 55c691b86..000000000 --- a/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 4fd8a07b560dcd4ad5706684d512d33707de3da0 Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Fri, 3 Jul 2020 19:26:37 +0200 -Subject: [PATCH] Adapt streamproxy to newer microhttpd where results are now - an enum - -Signed-off-by: Bernd Kuhls -[downloaded from upstream commit - https://framagit.org/medoc92/upmpdcli/-/commit/4fd8a07b560dcd4ad5706684d512d33707de3da0] ---- - src/mediaserver/cdplugins/streamproxy.cpp | 23 ++++++++++++++--------- - 1 file changed, 14 insertions(+), 9 deletions(-) - -diff --git a/src/mediaserver/cdplugins/streamproxy.cpp b/src/mediaserver/cdplugins/streamproxy.cpp -index abc57915..8d283834 100644 ---- a/src/mediaserver/cdplugins/streamproxy.cpp -+++ b/src/mediaserver/cdplugins/streamproxy.cpp -@@ -28,6 +28,11 @@ - #include - #include - -+ -+#if MHD_VERSION < 0x00097002 -+typedef int MHD_Result; -+#endif -+ - #include - #include - #include -@@ -155,7 +160,7 @@ public: - ~Internal(); - bool startMHD(); - -- int answerConn( -+ MHD_Result answerConn( - struct MHD_Connection *connection, const char *url, - const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, -@@ -202,7 +207,7 @@ StreamProxy::Internal::Internal(int _listenport, UrlTransFunc _urltrans) - } - - --static int answer_to_connection( -+static MHD_Result answer_to_connection( - void *cls, struct MHD_Connection *conn, - const char *url, const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, -@@ -214,7 +219,7 @@ static int answer_to_connection( - return internal->answerConn( - conn, url, method, version, upload_data, upload_data_size, con_cls); - } else { -- return -1; -+ return MHD_NO; - } - } - -@@ -238,8 +243,8 @@ static int print_out_key (void *cls, enum MHD_ValueKind kind, - } - #endif /* PRINT_KEYS */ - --static int mapvalues_cb(void *cls, enum MHD_ValueKind kind, -- const char *key, const char *value) -+static MHD_Result mapvalues_cb(void *cls, enum MHD_ValueKind kind, -+ const char *key, const char *value) - { - unordered_map *mp = (unordered_map *)cls; - if (mp) { -@@ -307,7 +312,7 @@ static bool processRange(struct MHD_Connection *mhdconn, uint64_t& offset) - return true; - } - --int StreamProxy::Internal::answerConn( -+MHD_Result StreamProxy::Internal::answerConn( - struct MHD_Connection *mhdconn, const char *_url, - const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, -@@ -352,7 +357,7 @@ int StreamProxy::Internal::answerConn( - return MHD_NO; - } - MHD_add_response_header (response, "Location", url.c_str()); -- int ret = MHD_queue_response(mhdconn, 302, response); -+ MHD_Result ret = MHD_queue_response(mhdconn, 302, response); - MHD_destroy_response(response); - return ret; - } -@@ -393,7 +398,7 @@ int StreamProxy::Internal::answerConn( - int code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR; - struct MHD_Response *response = - MHD_create_response_from_buffer(0, 0, MHD_RESPMEM_PERSISTENT); -- int ret = MHD_queue_response(mhdconn, code, response); -+ MHD_Result ret = MHD_queue_response(mhdconn, code, response); - MHD_destroy_response(response); - LOGINF("StreamProxy::answerConn (1): return with http code: " << - code << endl); -@@ -434,7 +439,7 @@ int StreamProxy::Internal::answerConn( - if (reader->fetcher->fetchDone(&fetchcode, &httpcode)) { - code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR; - } -- int ret = MHD_queue_response(mhdconn, code, response); -+ MHD_Result ret = MHD_queue_response(mhdconn, code, response); - MHD_destroy_response(response); - return ret; - } --- -GitLab - diff --git a/buildroot/package/upmpdcli/upmpdcli.hash b/buildroot/package/upmpdcli/upmpdcli.hash index 33003a406..68ea707e5 100644 --- a/buildroot/package/upmpdcli/upmpdcli.hash +++ b/buildroot/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.5.tar.gz.sha256: -sha256 af0c13b6ab8720d98451307010c33462e9a3f50178bae82c593fd2dd12e31b0e upmpdcli-1.4.5.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.14.tar.gz.sha256: +sha256 e3d90dedee6a942acc049324ca81b7f008d217d386a3e2590a2ca5670cc9df05 upmpdcli-1.4.14.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/upmpdcli/upmpdcli.mk b/buildroot/package/upmpdcli/upmpdcli.mk index 290cdcb1f..6531b90ee 100644 --- a/buildroot/package/upmpdcli/upmpdcli.mk +++ b/buildroot/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.5 +UPMPDCLI_VERSION = 1.4.14 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING diff --git a/buildroot/package/urandom-scripts/Config.in b/buildroot/package/urandom-scripts/Config.in new file mode 100644 index 000000000..987e442e2 --- /dev/null +++ b/buildroot/package/urandom-scripts/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_URANDOM_SCRIPTS + bool "urandom-initscripts" + default y if BR2_PACKAGE_INITSCRIPTS + depends on !BR2_PACKAGE_SYSTEMD + help + Initscript to preserve the random seed between reboots. + + WARNING: this is a poor fit to try and get high-quality + entropy at boot. There are better ways, like haveged, or + rng-tools. diff --git a/buildroot/package/initscripts/init.d/S20urandom b/buildroot/package/urandom-scripts/S20urandom similarity index 100% rename from buildroot/package/initscripts/init.d/S20urandom rename to buildroot/package/urandom-scripts/S20urandom diff --git a/buildroot/package/urandom-scripts/urandom-scripts.mk b/buildroot/package/urandom-scripts/urandom-scripts.mk new file mode 100644 index 000000000..2c09728c4 --- /dev/null +++ b/buildroot/package/urandom-scripts/urandom-scripts.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# urandom-scripts +# +################################################################################ + +define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ + $(TARGET_DIR)/etc/init.d/S20urandom +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/uredir/Config.in b/buildroot/package/uredir/Config.in new file mode 100644 index 000000000..99206cfe4 --- /dev/null +++ b/buildroot/package/uredir/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_UREDIR + bool "uredir" + select BR2_PACKAGE_LIBUEV + help + A small Linux daemon to redirect UDP connections. It can be + used to forward connections on small and embedded systems that + do not have (or want to use) iptables. + + https://github.com/troglobit/uredir diff --git a/buildroot/package/uredir/uredir.hash b/buildroot/package/uredir/uredir.hash new file mode 100644 index 000000000..00c816c2d --- /dev/null +++ b/buildroot/package/uredir/uredir.hash @@ -0,0 +1,4 @@ +# From https://github.com/troglobit/uredir/releases/download/v3.3/uredir-3.3.tar.gz.md5 +md5 a42ee27e84de2e08e35ee733508bb6ea uredir-3.3.tar.gz +# License files +sha256 e4b8fd3375ce44e5e03be199724a8785510ea5fa58ed92a7a34fd0ccbd35db10 LICENSE diff --git a/buildroot/package/uredir/uredir.mk b/buildroot/package/uredir/uredir.mk new file mode 100644 index 000000000..22ffaa742 --- /dev/null +++ b/buildroot/package/uredir/uredir.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# uredir +# +################################################################################ + +UREDIR_VERSION = 3.3 +UREDIR_SITE = https://github.com/troglobit/uredir/releases/download/v$(UREDIR_VERSION) +UREDIR_LICENSE = ISC +UREDIR_LICENSE_FILES = LICENSE +UREDIR_DEPENDENCIES = host-pkgconf libuev + +$(eval $(autotools-package)) diff --git a/buildroot/package/utf8proc/utf8proc.hash b/buildroot/package/utf8proc/utf8proc.hash index da85a3c7c..f7b8776a5 100644 --- a/buildroot/package/utf8proc/utf8proc.hash +++ b/buildroot/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfbd7 utf8proc-2.4.0.tar.gz -sha256 6acb7a86aca74317c6b4dddc2eadeb53bededb95a94a48c3fcd517f4473a653d LICENSE.md +sha256 d4e8dfc898cfd062493cb7f42d95d70ccdd3a4cd4d90bec0c71b47cca688f1be utf8proc-2.5.0.tar.gz +sha256 fbc720fcc90fb44396985646f67e4d19be03e0c0539f7138ed9dc6efba49dc49 LICENSE.md diff --git a/buildroot/package/utf8proc/utf8proc.mk b/buildroot/package/utf8proc/utf8proc.mk index 2d60387e7..2bb193991 100644 --- a/buildroot/package/utf8proc/utf8proc.mk +++ b/buildroot/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.4.0 +UTF8PROC_VERSION = 2.5.0 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch b/buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch deleted file mode 100644 index 0ecb86702..000000000 --- a/buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 34fed3ff1740aded9c2aae6b5d67a4eb696f738e Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 9 Jan 2020 11:03:51 +0100 -Subject: [PATCH] blkdiscard: use O_EXCL, add --force - -Let's make it more robust and safe. O_EXCL is an elegant way how to avoid -unwanted discard on mounted device. - -Addresses: https://github.com/karelzak/util-linux/issues/915 -Signed-off-by: Karel Zak -Signed-off-by: Carlos Santos ---- - sys-utils/blkdiscard.8 | 5 +++++ - sys-utils/blkdiscard.c | 11 ++++++++--- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/blkdiscard.8 b/sys-utils/blkdiscard.8 -index 1f3a32be9..98c6f36a9 100644 ---- a/sys-utils/blkdiscard.8 -+++ b/sys-utils/blkdiscard.8 -@@ -36,6 +36,11 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB (the "iB" is - optional, e.g., "K" has the same meaning as "KiB") or the suffixes - KB (=1000), MB (=1000*1000), and so on for GB, TB, PB, EB, ZB and YB. - .TP -+.BR \-f , " \-\-force" -+Disable all checking. Since v2.36 the block device is open in exclusive mode (O_EXCL) -+by default to avoid collision with mounted filesystem or another kernel subsystem. -+The force option disables the exclusive access mode. -+.TP - .BR \-o , " \-\-offset \fIoffset" - Byte offset into the device from which to start discarding. The provided value - will be aligned to the device sector size. The default value is zero. -diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c -index f9ba5e468..589974f9c 100644 ---- a/sys-utils/blkdiscard.c -+++ b/sys-utils/blkdiscard.c -@@ -88,6 +88,7 @@ static void __attribute__((__noreturn__)) usage(void) - fputs(_("Discard the content of sectors on a device.\n"), out); - - fputs(USAGE_OPTIONS, out); -+ fputs(_(" -f, --force disable all checking\n"), out); - fputs(_(" -o, --offset offset in bytes to discard from\n"), out); - fputs(_(" -l, --length length of bytes to discard from the offset\n"), out); - fputs(_(" -p, --step size of the discard iterations within the offset\n"), out); -@@ -106,7 +107,7 @@ static void __attribute__((__noreturn__)) usage(void) - int main(int argc, char **argv) - { - char *path; -- int c, fd, verbose = 0, secsize; -+ int c, fd, verbose = 0, secsize, force = 0; - uint64_t end, blksize, step, range[2], stats[2]; - struct stat sb; - struct timeval now, last; -@@ -116,6 +117,7 @@ int main(int argc, char **argv) - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'V' }, - { "offset", required_argument, NULL, 'o' }, -+ { "force", no_argument, NULL, 'f' }, - { "length", required_argument, NULL, 'l' }, - { "step", required_argument, NULL, 'p' }, - { "secure", no_argument, NULL, 's' }, -@@ -133,8 +135,11 @@ int main(int argc, char **argv) - range[1] = ULLONG_MAX; - step = 0; - -- while ((c = getopt_long(argc, argv, "hVsvo:l:p:z", longopts, NULL)) != -1) { -+ while ((c = getopt_long(argc, argv, "hfVsvo:l:p:z", longopts, NULL)) != -1) { - switch(c) { -+ case 'f': -+ force = 1; -+ break; - case 'l': - range[1] = strtosize_or_err(optarg, - _("failed to parse length")); -@@ -176,7 +181,7 @@ int main(int argc, char **argv) - errtryhelp(EXIT_FAILURE); - } - -- fd = open(path, O_WRONLY); -+ fd = open(path, O_WRONLY | (force ? 0 : O_EXCL)); - if (fd < 0) - err(EXIT_FAILURE, _("cannot open %s"), path); - --- -2.18.2 - diff --git a/buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch b/buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch deleted file mode 100644 index eb28ae328..000000000 --- a/buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch +++ /dev/null @@ -1,195 +0,0 @@ -From e5f31446166de7212213c62a019945afb8e197ef Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 14 Jan 2020 11:43:24 +0100 -Subject: [PATCH] libfdisk: add fdisk_set_disklabel_id_from_string() - -We have fdisk_set_disklabel_id(), but it's old ask-API based function. -It's not comfortable if you want to avoid dialog or template. - -Addresses: https://github.com/karelzak/util-linux/issues/916 -Signed-off-by: Karel Zak -Signed-off-by: Carlos Santos ---- - libfdisk/docs/libfdisk-sections.txt | 1 + - libfdisk/src/dos.c | 29 ++++++++++++++++++----------- - libfdisk/src/fdiskP.h | 2 +- - libfdisk/src/gpt.c | 18 ++++++++++-------- - libfdisk/src/label.c | 19 ++++++++++++++++++- - libfdisk/src/libfdisk.h.in | 1 + - libfdisk/src/libfdisk.sym | 3 +++ - 7 files changed, 52 insertions(+), 21 deletions(-) - -diff --git a/libfdisk/docs/libfdisk-sections.txt b/libfdisk/docs/libfdisk-sections.txt -index f148da527..6675c1100 100644 ---- a/libfdisk/docs/libfdisk-sections.txt -+++ b/libfdisk/docs/libfdisk-sections.txt -@@ -81,6 +81,7 @@ fdisk_list_disklabel - fdisk_locate_disklabel - fdisk_reorder_partitions - fdisk_set_disklabel_id -+fdisk_set_disklabel_id_from_string - fdisk_set_partition_type - fdisk_toggle_partition_flag - fdisk_verify_disklabel -diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c -index 53713ec5f..98314dfa6 100644 ---- a/libfdisk/src/dos.c -+++ b/libfdisk/src/dos.c -@@ -707,12 +707,12 @@ static int dos_create_disklabel(struct fdisk_context *cxt) - return 0; - } - --static int dos_set_disklabel_id(struct fdisk_context *cxt) -+static int dos_set_disklabel_id(struct fdisk_context *cxt, const char *str) - { -- char *end = NULL, *str = NULL; -+ char *str0 = str; - unsigned int id, old; - struct fdisk_dos_label *l; -- int rc; -+ int rc = 0; - - assert(cxt); - assert(cxt->label); -@@ -722,18 +722,25 @@ static int dos_set_disklabel_id(struct fdisk_context *cxt) - - l = self_label(cxt); - old = mbr_get_id(cxt->firstsector); -- rc = fdisk_ask_string(cxt, -+ -+ if (!str) -+ rc = fdisk_ask_string(cxt, - _("Enter the new disk identifier"), &str); -- if (rc) -- return rc; -+ if (!rc) { -+ char *end = NULL; - -- errno = 0; -- id = strtoul(str, &end, 0); -- if (errno || str == end || (end && *end)) { -- fdisk_warnx(cxt, _("Incorrect value.")); -- return -EINVAL; -+ errno = 0; -+ id = strtoul(str, &end, 0); -+ if (errno || str == end || (end && *end)) { -+ fdisk_warnx(cxt, _("Incorrect value.")); -+ rc = -EINVAL; -+ } - } - -+ if (!str0) -+ free(str); -+ if (rc) -+ return -EINVAL; - - mbr_set_id(cxt->firstsector, id); - l->non_pt_changed = 1; -diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h -index fefebae2a..0487466e3 100644 ---- a/libfdisk/src/fdiskP.h -+++ b/libfdisk/src/fdiskP.h -@@ -220,7 +220,7 @@ struct fdisk_label_operations { - /* get details from label */ - int (*get_item)(struct fdisk_context *cxt, struct fdisk_labelitem *item); - /* set disk label ID */ -- int (*set_id)(struct fdisk_context *cxt); -+ int (*set_id)(struct fdisk_context *cxt, const char *str); - - - /* new partition */ -diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c -index f50bb4441..9608053a2 100644 ---- a/libfdisk/src/gpt.c -+++ b/libfdisk/src/gpt.c -@@ -2502,11 +2502,11 @@ done: - return rc; - } - --static int gpt_set_disklabel_id(struct fdisk_context *cxt) -+static int gpt_set_disklabel_id(struct fdisk_context *cxt, const char *str) - { - struct fdisk_gpt_label *gpt; - struct gpt_guid uuid; -- char *str, *old, *new; -+ char *old, *new; - int rc; - - assert(cxt); -@@ -2514,12 +2514,14 @@ static int gpt_set_disklabel_id(struct fdisk_context *cxt) - assert(fdisk_is_label(cxt, GPT)); - - gpt = self_label(cxt); -- if (fdisk_ask_string(cxt, -- _("Enter new disk UUID (in 8-4-4-4-12 format)"), &str)) -- return -EINVAL; -- -- rc = string_to_guid(str, &uuid); -- free(str); -+ if (!str) { -+ if (fdisk_ask_string(cxt, -+ _("Enter new disk UUID (in 8-4-4-4-12 format)"), &str)) -+ return -EINVAL; -+ rc = string_to_guid(str, &uuid); -+ free(str); -+ } else -+ rc = string_to_guid(str, &uuid); - - if (rc) { - fdisk_warnx(cxt, _("Failed to parse your UUID.")); -diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c -index a18cdeaff..fd4555de2 100644 ---- a/libfdisk/src/label.c -+++ b/libfdisk/src/label.c -@@ -481,7 +481,24 @@ int fdisk_set_disklabel_id(struct fdisk_context *cxt) - return -ENOSYS; - - DBG(CXT, ul_debugobj(cxt, "setting %s disk ID", cxt->label->name)); -- return cxt->label->op->set_id(cxt); -+ return cxt->label->op->set_id(cxt, NULL); -+} -+ -+/** -+ * fdisk_set_disklabel_id_from_string -+ * @cxt: fdisk context -+ * -+ * Returns: 0 on success, otherwise, a corresponding error. -+ */ -+int fdisk_set_disklabel_id_from_string(struct fdisk_context *cxt, const char *str) -+{ -+ if (!cxt || !cxt->label || !str) -+ return -EINVAL; -+ if (!cxt->label->op->set_id) -+ return -ENOSYS; -+ -+ DBG(CXT, ul_debugobj(cxt, "setting %s disk ID from '%s'", cxt->label->name, str)); -+ return cxt->label->op->set_id(cxt, str); - } - - /** -diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in -index 0669c0a7c..2ba34dc0a 100644 ---- a/libfdisk/src/libfdisk.h.in -+++ b/libfdisk/src/libfdisk.h.in -@@ -399,6 +399,7 @@ extern int fdisk_get_disklabel_item(struct fdisk_context *cxt, int id, struct fd - - extern int fdisk_get_disklabel_id(struct fdisk_context *cxt, char **id); - extern int fdisk_set_disklabel_id(struct fdisk_context *cxt); -+extern int fdisk_set_disklabel_id_from_string(struct fdisk_context *cxt, const char *str); - - extern int fdisk_get_partition(struct fdisk_context *cxt, size_t partno, struct fdisk_partition **pa); - extern int fdisk_set_partition(struct fdisk_context *cxt, size_t partno, struct fdisk_partition *pa); -diff --git a/libfdisk/src/libfdisk.sym b/libfdisk/src/libfdisk.sym -index 96fcadd71..eee2d6bda 100644 ---- a/libfdisk/src/libfdisk.sym -+++ b/libfdisk/src/libfdisk.sym -@@ -308,3 +308,6 @@ FDISK_2.35 { - fdisk_script_set_table; - fdisk_assign_device_by_fd; - } FDISK_2.33; -+FDISK_2.36 { -+ fdisk_set_disklabel_id_from_string; -+} FDISK_2.35; --- -2.18.2 - diff --git a/buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch b/buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch deleted file mode 100644 index fe435018f..000000000 --- a/buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 65e27d545cb54ac63536a8b6e7d5def180ddb5b7 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 14 Jan 2020 11:50:46 +0100 -Subject: [PATCH] sfdisk: add --disk-id to change disk UUID/ID - -Addresses: https://github.com/karelzak/util-linux/issues/916 -Signed-off-by: Karel Zak -Signed-off-by: Carlos Santos ---- - disk-utils/sfdisk.8 | 5 +++++ - disk-utils/sfdisk.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+) - -diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8 -index 3ff5dd4e6..9ee71e81a 100644 ---- a/disk-utils/sfdisk.8 -+++ b/disk-utils/sfdisk.8 -@@ -152,6 +152,11 @@ or a GUID for GPT. For backward compatibility the options \fB\-c\fR and - Change the GPT partition UUID. If \fIuuid\fR is not specified, - then print the current partition UUID. - .TP -+.BR "\-\-disk\-id \fIdevice " [ \fIid ] -+Change the disk identifier. If \fIid\fR is not specified, -+then print the current identifier. The identifier is UUID for GPT -+or unsigned integer for MBR. -+.TP - .BR \-r , " \-\-reorder " \fIdevice - Renumber the partitions, ordering them by their start offset. - .TP -diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c -index bb6e1c6df..0db797b2d 100644 ---- a/disk-utils/sfdisk.c -+++ b/disk-utils/sfdisk.c -@@ -86,6 +86,7 @@ enum { - ACT_PARTUUID, - ACT_PARTLABEL, - ACT_PARTATTRS, -+ ACT_DISKID, - ACT_DELETE - }; - -@@ -1327,6 +1328,46 @@ static int command_partattrs(struct sfdisk *sf, int argc, char **argv) - return write_changes(sf); - } - -+/* -+ * sfdisk --disk-id [] -+ */ -+static int command_diskid(struct sfdisk *sf, int argc, char **argv) -+{ -+ const char *devname = NULL; -+ char *str = NULL; -+ -+ if (!argc) -+ errx(EXIT_FAILURE, _("no disk device specified")); -+ devname = argv[0]; -+ -+ if (argc == 2) -+ str = argv[1]; -+ else if (argc > 2) -+ errx(EXIT_FAILURE, _("unexpected arguments")); -+ -+ if (fdisk_assign_device(sf->cxt, devname, !str) != 0) -+ err(EXIT_FAILURE, _("cannot open %s"), devname); -+ -+ /* print */ -+ if (!str) { -+ fdisk_get_disklabel_id(sf->cxt, &str); -+ if (str) -+ printf("%s\n", str); -+ free(str); -+ fdisk_deassign_device(sf->cxt, 1); -+ return 0; -+ } -+ -+ /* change */ -+ if (sf->backup) -+ backup_partition_table(sf, devname); -+ -+ if (fdisk_set_disklabel_id_from_string(sf->cxt, str) != 0) -+ errx(EXIT_FAILURE, _("%s: failed to set disklabel ID"), devname); -+ -+ return write_changes(sf); -+} -+ - static void sfdisk_print_partition(struct sfdisk *sf, size_t n) - { - struct fdisk_partition *pa = NULL; -@@ -1941,6 +1982,9 @@ static void __attribute__((__noreturn__)) usage(void) - fputs(_(" --part-uuid [] print or change partition uuid\n"), out); - fputs(_(" --part-attrs [] print or change partition attributes\n"), out); - -+ fputs(USAGE_SEPARATOR, out); -+ fputs(_(" --disk-id [] print or change disk label ID (UUID)\n"), out); -+ - fputs(USAGE_SEPARATOR, out); - fputs(_(" device (usually disk) path\n"), out); - fputs(_(" partition number\n"), out); -@@ -2007,6 +2051,7 @@ int main(int argc, char *argv[]) - OPT_PARTLABEL, - OPT_PARTTYPE, - OPT_PARTATTRS, -+ OPT_DISKID, - OPT_BYTES, - OPT_COLOR, - OPT_MOVEDATA, -@@ -2052,6 +2097,8 @@ int main(int argc, char *argv[]) - { "part-type", no_argument, NULL, OPT_PARTTYPE }, - { "part-attrs", no_argument, NULL, OPT_PARTATTRS }, - -+ { "disk-id", no_argument, NULL, OPT_DISKID }, -+ - { "show-pt-geometry", no_argument, NULL, 'G' }, /* deprecated */ - { "unit", required_argument, NULL, 'u' }, /* deprecated */ - { "Linux", no_argument, NULL, 'L' }, /* deprecated */ -@@ -2192,6 +2239,9 @@ int main(int argc, char *argv[]) - case OPT_PARTATTRS: - sf->act = ACT_PARTATTRS; - break; -+ case OPT_DISKID: -+ sf->act = ACT_DISKID; -+ break; - case OPT_NOREREAD: - sf->noreread = 1; - break; -@@ -2296,6 +2346,10 @@ int main(int argc, char *argv[]) - rc = command_partattrs(sf, argc - optind, argv + optind); - break; - -+ case ACT_DISKID: -+ rc = command_diskid(sf, argc - optind, argv + optind); -+ break; -+ - case ACT_REORDER: - rc = command_reorder(sf, argc - optind, argv + optind); - break; --- -2.18.2 - diff --git a/buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch b/buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch deleted file mode 100644 index 183b725a3..000000000 --- a/buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001 -From: Sami Kerola -Date: Sat, 15 Feb 2020 21:12:50 +0000 -Subject: [PATCH] kill: include sys/types.h before checking - SYS_pidfd_send_signal - -Including sys/types.h must happen before SYS_pidfd_send_signal is checked, -because that header defines variable in normal conditions. When sys/types.h -does not have SYS_pidfd_send_signal then fallback is defined in config.h -that is included by default, and has therefore worked fine before and after -this change. - -Signed-off-by: Sami Kerola -Signed-off-by: Carlos Santos ---- - include/pidfd-utils.h | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index 593346576..0baedd2c9 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -1,26 +1,28 @@ - #ifndef UTIL_LINUX_PIDFD_UTILS - #define UTIL_LINUX_PIDFD_UTILS - --#if defined(__linux__) && defined(SYS_pidfd_send_signal) --# include -+#if defined(__linux__) - # include -+# if defined(SYS_pidfd_send_signal) -+# include - --# ifndef HAVE_PIDFD_OPEN -+# ifndef HAVE_PIDFD_OPEN - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) - { - return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags); - } --# endif -+# endif - --# ifndef HAVE_PIDFD_SEND_SIGNAL -+# ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_open(pid_t pid, unsigned int flags) - { - return syscall(SYS_pidfd_open, pid, flags); - } --# endif -+# endif - --# define UL_HAVE_PIDFD 1 -+# define UL_HAVE_PIDFD 1 - --#endif /* __linux__ && SYS_pidfd_send_signal */ -+# endif /* SYS_pidfd_send_signal */ -+#endif /* __linux__ */ - #endif /* UTIL_LINUX_PIDFD_UTILS */ --- -2.18.2 - diff --git a/buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch b/buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch deleted file mode 100644 index 73f3118b0..000000000 --- a/buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 10 Mar 2020 11:43:16 +0100 -Subject: [PATCH] include: cleanup pidfd inckudes - -Signed-off-by: Karel Zak -Signed-off-by: Carlos Santos ---- - include/pidfd-utils.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index 0baedd2c9..4a6c3a604 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -3,10 +3,10 @@ - - #if defined(__linux__) - # include --# if defined(SYS_pidfd_send_signal) -+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) - # include - --# ifndef HAVE_PIDFD_OPEN -+# ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) - { -@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - } - # endif - --# ifndef HAVE_PIDFD_SEND_SIGNAL -+# ifndef HAVE_PIDFD_OPEN - static inline int pidfd_open(pid_t pid, unsigned int flags) - { - return syscall(SYS_pidfd_open, pid, flags); --- -2.18.2 - diff --git a/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch b/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch deleted file mode 100644 index d592a9dc1..000000000 --- a/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch +++ /dev/null @@ -1,138 +0,0 @@ -From d8c68b52cc939a16f04ec976648a37f5f5de718c Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 4 Feb 2020 15:11:19 +0100 -Subject: libfdisk: (script) accept sector-size, ignore unknown headers - -- add sector-size between supported headers (already in --dump output) - -- report unknown headers by -ENOTSUP - -- ignore ENOTSUP in sfdisk (but print warning) and in fdisk_script_read_file() - -Addresses: https://github.com/karelzak/util-linux/issues/949 -Signed-off-by: Karel Zak - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=d8c68b52cc939a16f04ec976648a37f5f5de718c] ---- - disk-utils/sfdisk.c | 6 +++++- - libfdisk/src/script.c | 49 ++++++++++++++++++++++++++----------------------- - 2 files changed, 31 insertions(+), 24 deletions(-) - -diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c -index 0db797b2d..e08862aa8 100644 ---- a/disk-utils/sfdisk.c -+++ b/disk-utils/sfdisk.c -@@ -1823,7 +1823,11 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) - } - - rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); -- if (rc < 0) { -+ if (rc == -ENOTSUP) { -+ buf[sizeof(buf) - 1] = '\0'; -+ fdisk_warnx(sf->cxt, _("Unknown script header '%s' -- ignore."), buf); -+ continue; -+ } else if (rc < 0) { - DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); - buf[sizeof(buf) - 1] = '\0'; - rc = loop_control_commands(sf, dp, buf); -diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c -index a21771b6a..d3e67fa9c 100644 ---- a/libfdisk/src/script.c -+++ b/libfdisk/src/script.c -@@ -805,8 +805,12 @@ static inline int is_header_line(const char *s) - /* parses ": value", note modifies @s*/ - static int parse_line_header(struct fdisk_script *dp, char *s) - { -- int rc = -EINVAL; -+ size_t i; - char *name, *value; -+ static const char *supported[] = { -+ "label", "unit", "label-id", "device", "grain", -+ "first-lba", "last-lba", "table-length", "sector-size" -+ }; - - DBG(SCRIPT, ul_debugobj(dp, " parse header '%s'", s)); - -@@ -816,7 +820,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) - name = s; - value = strchr(s, ':'); - if (!value) -- goto done; -+ return -EINVAL; - *value = '\0'; - value++; - -@@ -825,32 +829,30 @@ static int parse_line_header(struct fdisk_script *dp, char *s) - ltrim_whitespace((unsigned char *) value); - rtrim_whitespace((unsigned char *) value); - -+ if (!*name || !*value) -+ return -EINVAL; -+ -+ /* check header name */ -+ for (i = 0; i < ARRAY_SIZE(supported); i++) { -+ if (strcmp(name, supported[i]) == 0) -+ break; -+ } -+ if (i == ARRAY_SIZE(supported)) -+ return -ENOTSUP; -+ -+ /* header specific actions */ - if (strcmp(name, "label") == 0) { - if (dp->cxt && !fdisk_get_label(dp->cxt, value)) -- goto done; /* unknown label name */ -+ return -EINVAL; /* unknown label name */ - dp->force_label = 1; -+ - } else if (strcmp(name, "unit") == 0) { - if (strcmp(value, "sectors") != 0) -- goto done; /* only "sectors" supported */ -- } else if (strcmp(name, "label-id") == 0 -- || strcmp(name, "device") == 0 -- || strcmp(name, "grain") == 0 -- || strcmp(name, "first-lba") == 0 -- || strcmp(name, "last-lba") == 0 -- || strcmp(name, "table-length") == 0) { -- ; /* whatever is possible */ -- } else -- goto done; /* unknown header */ -+ return -EINVAL; /* only "sectors" supported */ - -- if (*name && *value) -- rc = fdisk_script_set_header(dp, name, value); --done: -- if (rc) -- DBG(SCRIPT, ul_debugobj(dp, "header parse error: " -- "[rc=%d, name='%s', value='%s']", -- rc, name, value)); -- return rc; -+ } - -+ return fdisk_script_set_header(dp, name, value); - } - - /* returns zero terminated string with next token and @str is updated */ -@@ -1363,7 +1365,8 @@ int fdisk_script_set_fgets(struct fdisk_script *dp, - * - * Reads next line into dump. - * -- * Returns: 0 on success, <0 on error, 1 when nothing to read. -+ * Returns: 0 on success, <0 on error, 1 when nothing to read. For unknown headers -+ * returns -ENOTSUP, it's usually safe to ignore this error. - */ - int fdisk_script_read_line(struct fdisk_script *dp, FILE *f, char *buf, size_t bufsz) - { -@@ -1428,7 +1431,7 @@ int fdisk_script_read_file(struct fdisk_script *dp, FILE *f) - - while (!feof(f)) { - rc = fdisk_script_read_line(dp, f, buf, sizeof(buf)); -- if (rc) -+ if (rc && rc != -ENOTSUP) - break; - } - --- -cgit 1.2-0.3.lf.el7 - diff --git a/buildroot/package/util-linux/Config.in b/buildroot/package/util-linux/Config.in index 996f0cd7f..1f33eb551 100644 --- a/buildroot/package/util-linux/Config.in +++ b/buildroot/package/util-linux/Config.in @@ -9,6 +9,9 @@ menuconfig BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX +config BR2_PACKAGE_UTIL_LINUX_LIBS + bool + config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" depends on BR2_USE_MMU # fork() @@ -84,15 +87,14 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH bool "chfn/chsh" depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM help Change login shell, real user name and information -comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" diff --git a/buildroot/package/util-linux/util-linux-libs/util-linux-libs.hash b/buildroot/package/util-linux/util-linux-libs/util-linux-libs.hash new file mode 120000 index 000000000..dc1b2f866 --- /dev/null +++ b/buildroot/package/util-linux/util-linux-libs/util-linux-libs.hash @@ -0,0 +1 @@ +../util-linux.hash \ No newline at end of file diff --git a/buildroot/package/util-linux/util-linux-libs/util-linux-libs.mk b/buildroot/package/util-linux/util-linux-libs/util-linux-libs.mk new file mode 100644 index 000000000..3a3a655e6 --- /dev/null +++ b/buildroot/package/util-linux/util-linux-libs/util-linux-libs.mk @@ -0,0 +1,89 @@ +################################################################################ +# +# util-linux-libs +# +################################################################################ + +# Please keep this file as similar as possible to util-linux.mk + +UTIL_LINUX_LIBS_VERSION = $(UTIL_LINUX_VERSION) +UTIL_LINUX_LIBS_SOURCE = $(UTIL_LINUX_SOURCE) +UTIL_LINUX_LIBS_SITE = $(UTIL_LINUX_SITE) +UTIL_LINUX_LIBS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR) + +# README.licensing claims that some files are GPL-2.0 only, but this is not +# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock +# (but we disable that option). rfkill uses an ISC-style license. +UTIL_LINUX_LIBS_LICENSE = LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) +UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-3-Clause \ + Documentation/licenses/COPYING.LGPL-2.1-or-later + +UTIL_LINUX_LIBS_INSTALL_STAGING = YES +UTIL_LINUX_LIBS_DEPENDENCIES = \ + host-pkgconf \ + $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_LIBS_CONF_OPTS += \ + --disable-rpath \ + --disable-makeinstall-chown + +UTIL_LINUX_LIBS_LINK_LIBS = $(TARGET_NLS_LIBS) + +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_LIBS_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + +# systemd depends on util-linux-libs so we disable systemd support +UTIL_LINUX_LIBS_CONF_OPTS += \ + --without-systemd \ + --with-systemdsystemunitdir=no + +# systemd/eudev depend on util-linux-libs so we disable udev support +UTIL_LINUX_LIBS_CONF_OPTS += --without-udev + +# No libs use wchar +UTIL_LINUX_LIBS_CONF_OPTS += --disable-widechar + +# No libs use ncurses +UTIL_LINUX_LIBS_CONF_OPTS += --without-ncursesw --without-ncurses + +# Unfortunately, the util-linux does LIBS="" at the end of its +# configure script. So we have to pass the proper LIBS value when +# calling the configure script to make configure tests pass properly, +# and then pass it again at build time. +UTIL_LINUX_LIBS_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" +UTIL_LINUX_LIBS_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" + +# libmount optionally uses selinux +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_LIBSELINUX),yy) +UTIL_LINUX_LIBS_DEPENDENCIES += libselinux +UTIL_LINUX_LIBS_CONF_OPTS += --with-selinux +else +UTIL_LINUX_LIBS_CONF_OPTS += --without-selinux +endif + +# Disable utilities +UTIL_LINUX_LIBS_CONF_OPTS += \ + --disable-all-programs \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) + +# libmount python bindings are separate, will be installed by full util-linux +UTIL_LINUX_LIBS_CONF_OPTS += --without-python --disable-pylibmount + +# No libs use readline +UTIL_LINUX_LIBS_CONF_OPTS += --without-readline + +# No libs use audit +UTIL_LINUX_LIBS_CONF_OPTS += --without-audit + +# No libs use libmagic +UTIL_LINUX_LIBS_CONF_OPTS += --without-libmagic + +$(eval $(autotools-package)) diff --git a/buildroot/package/util-linux/util-linux.hash b/buildroot/package/util-linux/util-linux.hash index f9a3d1e86..fce97c489 100644 --- a/buildroot/package/util-linux/util-linux.hash +++ b/buildroot/package/util-linux/util-linux.hash @@ -1,9 +1,9 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.35/sha256sums.asc -sha256 d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 util-linux-2.35.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.36/sha256sums.asc +sha256 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1 util-linux-2.36.tar.xz # License files, locally calculated -sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing -sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause -sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later -sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later +sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing +sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause +sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later +sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later diff --git a/buildroot/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk index b6ccaaa78..0b29ef4d6 100644 --- a/buildroot/package/util-linux/util-linux.mk +++ b/buildroot/package/util-linux/util-linux.mk @@ -4,9 +4,11 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.35 -UTIL_LINUX_VERSION_MINOR = 1 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR) +# When making changes to this file, please check if +# util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. + +UTIL_LINUX_VERSION_MAJOR = 2.36 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -22,18 +24,15 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.LGPL-2.1-or-later UTIL_LINUX_INSTALL_STAGING = YES -UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ + $(TARGET_NLS_DEPENDENCIES) UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown -UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) - -# system depends on util-linux so we enable systemd support -# (which needs systemd to be installed) -UTIL_LINUX_CONF_OPTS += \ - --without-systemd \ - --with-systemdsystemunitdir=no +UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -43,6 +42,10 @@ HOST_UTIL_LINUX_CONF_OPTS = \ --with-systemdsystemunitdir=no \ --without-python +ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),) +UTIL_LINUX_SELINUX_MODULES = fstools +endif + # Prevent the installation from attempting to move shared libraries from # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are # the same when merged usr is in use. @@ -50,6 +53,20 @@ ifeq ($(BR2_ROOTFS_MERGED_USR),y) UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +UTIL_LINUX_CONF_OPTS += --with-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system +UTIL_LINUX_DEPENDENCIES += systemd +else +UTIL_LINUX_CONF_OPTS += --without-systemd --with-systemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +UTIL_LINUX_CONF_OPTS += --with-udev +UTIL_LINUX_DEPENDENCIES += udev +else +UTIL_LINUX_CONF_OPTS += --without-udev +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -68,16 +85,12 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_DEPENDENCIES += libcap-ng -endif - # Unfortunately, the util-linux does LIBS="" at the end of its # configure script. So we have to pass the proper LIBS value when # calling the configure script to make configure tests pass properly, # and then pass it again at build time. -UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" -UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" +UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LINK_LIBS)" +UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LINK_LIBS)" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) UTIL_LINUX_DEPENDENCIES += libselinux @@ -92,6 +105,9 @@ define UTIL_LINUX_SELINUX_PAMFILES_TWEAK endef endif +# Used by setpriv +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) @@ -172,6 +188,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --enable-libblkid \ --enable-libmount \ --enable-libuuid \ + --without-libmagic \ --without-ncurses \ --without-ncursesw \ --without-tinfo @@ -228,7 +245,7 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) UTIL_LINUX_CONF_OPTS += --with-readline -UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) +UTIL_LINUX_LINK_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) UTIL_LINUX_DEPENDENCIES += readline else UTIL_LINUX_CONF_OPTS += --without-readline @@ -241,6 +258,13 @@ else UTIL_LINUX_CONF_OPTS += --without-audit endif +ifeq ($(BR2_PACKAGE_FILE),y) +UTIL_LINUX_CONF_OPTS += --with-libmagic +UTIL_LINUX_DEPENDENCIES += file +else +UTIL_LINUX_CONF_OPTS += --without-libmagic +endif + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) define UTIL_LINUX_INSTALL_PAMFILES @@ -266,3 +290,7 @@ UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK $(eval $(autotools-package)) $(eval $(host-autotools-package)) + +# Must be included after the autotools-package call, to make sure all variables +# are available +include package/util-linux/util-linux-libs/util-linux-libs.mk diff --git a/buildroot/package/uvw/uvw.hash b/buildroot/package/uvw/uvw.hash index c74db9b91..f842345ea 100644 --- a/buildroot/package/uvw/uvw.hash +++ b/buildroot/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 578179ee76d010c5c9fb180a1b60e45e9f04968718d62c51ec0f71b43564bab9 uvw-2.3.1_libuv-v1.34.tar.gz +sha256 2695276bb4b154174ac0a6401bde5c0768bca99a43c9a469af67526f7e2e9410 uvw-2.6.0_libuv-v1.38.tar.gz sha256 755b2f245af22830c15b60c54469c0d92fbed42009b0d0074cec4b3959905757 LICENSE diff --git a/buildroot/package/uvw/uvw.mk b/buildroot/package/uvw/uvw.mk index 71b23b2ac..dd9b6b27d 100644 --- a/buildroot/package/uvw/uvw.mk +++ b/buildroot/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.3.1_libuv-v1.34 +UVW_VERSION = 2.6.0_libuv-v1.38 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO diff --git a/buildroot/package/v4l2loopback/v4l2loopback.hash b/buildroot/package/v4l2loopback/v4l2loopback.hash index b9d65c821..f4491e02d 100644 --- a/buildroot/package/v4l2loopback/v4l2loopback.hash +++ b/buildroot/package/v4l2loopback/v4l2loopback.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3f6bb14b80865ec8df557c26fd2c5ba91d726580773a75a62aa2959864ef70ba v4l2loopback-0.12.3.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 e152cd6df6a8add172fb74aca3a9188264823efa5a2317fe960d45880b9406ae v4l2loopback-0.12.5.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/v4l2loopback/v4l2loopback.mk b/buildroot/package/v4l2loopback/v4l2loopback.mk index 8fa070498..7701bc3a3 100644 --- a/buildroot/package/v4l2loopback/v4l2loopback.mk +++ b/buildroot/package/v4l2loopback/v4l2loopback.mk @@ -4,7 +4,7 @@ # ################################################################################ -V4L2LOOPBACK_VERSION = 0.12.3 +V4L2LOOPBACK_VERSION = 0.12.5 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING diff --git a/buildroot/package/vala/vala.hash b/buildroot/package/vala/vala.hash index 7b3f0c9f7..319c7ef2f 100644 --- a/buildroot/package/vala/vala.hash +++ b/buildroot/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.7.sha256sum -sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa vala-0.34.7.tar.xz +# From https://download.gnome.org/sources/vala/0.46/vala-0.46.6.sha256sum +sha256 ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a vala-0.46.6.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/vala/vala.mk b/buildroot/package/vala/vala.mk index ad0a5650f..95365faf1 100644 --- a/buildroot/package/vala/vala.mk +++ b/buildroot/package/vala/vala.mk @@ -4,8 +4,8 @@ # ################################################################################ -VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).7 +VALA_VERSION_MAJOR = 0.46 +VALA_VERSION = $(VALA_VERSION_MAJOR).6 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ @@ -15,17 +15,21 @@ HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not # available". HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: +HOST_VALA_CONF_OPTS += --disable-valadoc -# We wrap vala & valac to point to the proper gir and vapi data dirs +# We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs # Otherwise we'll get host directory data which isn't enough define HOST_VALA_INSTALL_WRAPPER $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ $(HOST_DIR)/bin/vala $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ $(HOST_DIR)/bin/valac + $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ + $(HOST_DIR)/bin/vapigen $(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \ $(HOST_DIR)/bin/vala \ - $(HOST_DIR)/bin/valac + $(HOST_DIR)/bin/valac \ + $(HOST_DIR)/bin/vapigen endef HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER diff --git a/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch b/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch deleted file mode 100644 index da8c655f0..000000000 --- a/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 50dd9600ab1ad8933704ee85289191d9c65ba444 Mon Sep 17 00:00:00 2001 -From: Petar Jovanovic -Date: Fri, 19 Apr 2019 14:04:26 +0000 -Subject: [PATCH] mips: fix mips32r6 and mips64r6 compilation issue - -Add missing variable declarations. -Modify local_sys_write_stderr to use movn if available, and use -seleqz/selnez instructions otherwise. - -Backported from upstream commit -50dd9600ab1ad8933704ee85289191d9c65ba444. - -Signed-off-by: Stefan Maksimovic ---- - VEX/priv/guest_mips_toIR.c | 1 + - coregrind/m_debuglog.c | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/VEX/priv/guest_mips_toIR.c b/VEX/priv/guest_mips_toIR.c -index eb437ec..6e91329 100755 ---- a/VEX/priv/guest_mips_toIR.c -+++ b/VEX/priv/guest_mips_toIR.c -@@ -20241,6 +20241,7 @@ static UInt disInstr_MIPS_WRK_00(UInt cins, const VexArchInfo* archinfo, - #elif defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev >= 6)) - - case 0x08: { /* BEQZALC, BEQC, BOVC */ -+ IRTemp t1, t2, t3, t4; - if (rs == 0) { /* BEQZALC */ - DIP("beqzalc r%u, %u", rt, imm); - -diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c -index 456a711..289f275 100644 ---- a/coregrind/m_debuglog.c -+++ b/coregrind/m_debuglog.c -@@ -452,7 +452,13 @@ static UInt local_sys_write_stderr ( const HChar* buf, Int n ) - __asm__ volatile ( - "syscall \n\t" - "addiu $4, $0, -1 \n\t" -+ #if ((defined(__mips_isa_rev) && __mips_isa_rev >= 6)) -+ "selnez $4, $4, $7 \n\t" -+ "seleqz $2, $2, $7 \n\t" -+ "or $2, $2, $4 \n\t" -+ #else - "movn $2, $4, $7 \n\t" -+ #endif - : "+d" (v0), "+d" (a0), "+d" (a1), "+d" (a2) - : - : "$1", "$3", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", --- -2.7.4 - diff --git a/buildroot/package/valgrind/valgrind.hash b/buildroot/package/valgrind/valgrind.hash index 3c7b98ef2..2b24ac44b 100644 --- a/buildroot/package/valgrind/valgrind.hash +++ b/buildroot/package/valgrind/valgrind.hash @@ -1,6 +1,6 @@ -# From http://valgrind.org/downloads/current.html -md5 46e5fbdcbc3502a5976a317a0860a975 valgrind-3.15.0.tar.bz2 +# From https://valgrind.org/downloads/current.html +md5 d1b153f1ab17cf1f311705e7a83ef589 valgrind-3.16.1.tar.bz2 # License files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS diff --git a/buildroot/package/valgrind/valgrind.mk b/buildroot/package/valgrind/valgrind.mk index 41b262519..7fd327861 100644 --- a/buildroot/package/valgrind/valgrind.mk +++ b/buildroot/package/valgrind/valgrind.mk @@ -4,8 +4,8 @@ # ################################################################################ -VALGRIND_VERSION = 3.15.0 -VALGRIND_SITE = ftp://sourceware.org/pub/valgrind +VALGRIND_VERSION = 3.16.1 +VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS diff --git a/buildroot/package/valijson/valijson.hash b/buildroot/package/valijson/valijson.hash index 6f1100066..e184ccb7c 100644 --- a/buildroot/package/valijson/valijson.hash +++ b/buildroot/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 77dbebb40dab2e834557c2fcc39122cdb2d0fe26bf591c2b3e0df5a316a45592 valijson-0.2.tar.gz +sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/buildroot/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk index 31efeede3..b38c6319a 100644 --- a/buildroot/package/valijson/valijson.mk +++ b/buildroot/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.2 +VALIJSON_VERSION = 0.3 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE diff --git a/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch b/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch new file mode 100644 index 000000000..32c0e97ac --- /dev/null +++ b/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch @@ -0,0 +1,27 @@ +From 930c2cd2eb8947413e88404fa94c66e4e1db5ad6 Mon Sep 17 00:00:00 2001 +From: Klaus Schmidinger +Date: Mon, 4 May 2020 12:28:31 +0200 +Subject: Fixed compatibility with current versions of glibc + +[Retrieved (and updated to remove CONTRIBUTORS and HISTORY) from: +https://projects.vdr-developer.org/git/vdr.git/commit?id=930c2cd2eb8947413e88404fa94c66e4e1db5ad6] +Signed-off-by: Fabrice Fontaine + +diff --git a/eit.c b/eit.c +index 72a45e5..d437b44 100644 +--- a/eit.c ++++ b/eit.c +@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- if (stime(&dvbtim) == 0) ++ timespec ts = { 0 }; ++ ts.tv_sec = dvbtim; ++ if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + else + esyslog("ERROR while setting system time: %m"); +-- +cgit v0.10.2 + diff --git a/buildroot/package/vim/vim.hash b/buildroot/package/vim/vim.hash index 6c68b1bc2..eb5928e91 100644 --- a/buildroot/package/vim/vim.hash +++ b/buildroot/package/vim/vim.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4b7359a58a75c29d4a8fc7fcbb2ccab1d1dc0ede1c4c689b27cc049c17920278 vim-8.1.1929.tar.gz -sha256 70ab7f93197b29d47bfe4371774c8d904f7842d4843c257d21c29b7ac38d6406 README.txt +sha256 8a72323817210daf40abe545bdf7637591b9b541a0fb3560baed76e436132dba vim-8.2.0000.tar.gz +sha256 accdbd6761e7dd7e580545fe30f3a5a7707d50073aec4b8afef85c30fc9c031b README.txt diff --git a/buildroot/package/vim/vim.mk b/buildroot/package/vim/vim.mk index 5cb4e1b4c..1fbb6a6b8 100644 --- a/buildroot/package/vim/vim.mk +++ b/buildroot/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.1.1929 +VIM_VERSION = 8.2.0000 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src diff --git a/buildroot/package/vlc/0011-qt-fix-missing-header-when-compiling-with-Qt-5.15.patch b/buildroot/package/vlc/0011-qt-fix-missing-header-when-compiling-with-Qt-5.15.patch new file mode 100644 index 000000000..169351193 --- /dev/null +++ b/buildroot/package/vlc/0011-qt-fix-missing-header-when-compiling-with-Qt-5.15.patch @@ -0,0 +1,56 @@ +From a44d2f3aa6075fb6e63da75f84a257294d21d161 Mon Sep 17 00:00:00 2001 +From: Pierre Lamot +Date: Wed, 27 May 2020 11:05:53 +0200 +Subject: [PATCH] qt: fix missing header when compiling with Qt 5.15 + +Upstream bug report: https://trac.videolan.org/vlc/ticket/24882 + +Signed-off-by: Bernd Kuhls +[backported upstream commit for modules/gui/qt/dialogs/plugins.cpp + http://git.videolan.org/?p=vlc.git;a=patch;h=0e88143ed2fe8eedfa4d3afdafcd0df901644c1d + the other two patches were proposed on the upstream bugtracker] +--- + modules/gui/qt/components/playlist/views.cpp | 1 + + modules/gui/qt/dialogs/plugins.cpp | 1 + + modules/gui/qt/util/timetooltip.hpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp +index ecc6b9918d..d3fd76da1a 100644 +--- a/modules/gui/qt/components/playlist/views.cpp ++++ b/modules/gui/qt/components/playlist/views.cpp +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp +index 93c92b9fa6..e05ec0594a 100644 +--- a/modules/gui/qt/dialogs/plugins.cpp ++++ b/modules/gui/qt/dialogs/plugins.cpp +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + //match the image source (width/height) + #define SCORE_ICON_WIDTH_SCALE 4 +diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp +index b6d7c646c9..f213eac459 100644 +--- a/modules/gui/qt/util/timetooltip.hpp ++++ b/modules/gui/qt/util/timetooltip.hpp +@@ -25,6 +25,7 @@ + #include "qt.hpp" + + #include ++#include + + class TimeTooltip : public QWidget + { +-- +2.27.0 + diff --git a/buildroot/package/vlc/Config.in b/buildroot/package/vlc/Config.in index 70e1ca41a..96ff8f2fc 100644 --- a/buildroot/package/vlc/Config.in +++ b/buildroot/package/vlc/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_VLC depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS - select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB help @@ -18,11 +17,6 @@ config BR2_PACKAGE_VLC http://www.videolan.org/vlc/ -config BR2_PACKAGE_VLC_OPENCV_BACKEND - bool - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - config BR2_PACKAGE_VLC_OPENCV3_BACKEND bool select BR2_PACKAGE_OPENCV3_LIB_IMGPROC diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index ccaaa6cd6..23dcc5d46 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -209,13 +209,9 @@ else VLC_CONF_OPTS += --disable-gles2 endif -ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) VLC_CONF_OPTS += --enable-opencv -ifeq ($(BR2_PACKAGE_OPENCV),y) -VLC_DEPENDENCIES += opencv -else VLC_DEPENDENCIES += opencv3 -endif else VLC_CONF_OPTS += --disable-opencv endif diff --git a/buildroot/package/vpnc/vpnc.hash b/buildroot/package/vpnc/vpnc.hash index f512a7779..a1b3b3b20 100644 --- a/buildroot/package/vpnc/vpnc.hash +++ b/buildroot/package/vpnc/vpnc.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz +sha256 5929d3b7f72970c8f7850e0daba0d9d05aaaa1281c69f58ac8647be11385ede5 vpnc-0.5.3r550-2jnpr1.tar.gz sha256 bf3ec1bd1dec31a6ab8980bfd04569f506432f35ee01e88a3910847784bc2de1 COPYING diff --git a/buildroot/package/vpnc/vpnc.mk b/buildroot/package/vpnc/vpnc.mk index 81cd830ea..8db5e766c 100644 --- a/buildroot/package/vpnc/vpnc.mk +++ b/buildroot/package/vpnc/vpnc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740 +VPNC_VERSION = 0.5.3r550-2jnpr1 VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION)) VPNC_LICENSE = GPL-2.0+ VPNC_LICENSE_FILES = COPYING diff --git a/buildroot/package/vsftpd/vsftpd.mk b/buildroot/package/vsftpd/vsftpd.mk index 2f86d91ba..8a9aac2d2 100644 --- a/buildroot/package/vsftpd/vsftpd.mk +++ b/buildroot/package/vsftpd/vsftpd.mk @@ -47,6 +47,11 @@ define VSFTPD_USERS ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User endef +define VSFTPD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/vsftpd/vsftpd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/vsftpd.service +endef + define VSFTPD_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd endef diff --git a/buildroot/package/vsftpd/vsftpd.service b/buildroot/package/vsftpd/vsftpd.service new file mode 100644 index 000000000..eba61adda --- /dev/null +++ b/buildroot/package/vsftpd/vsftpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=vsftpd FTP server +After=network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/vsftpd /etc/vsftpd.conf +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/vte/Config.in b/buildroot/package/vte/Config.in index fa29de8c7..96de3d38c 100644 --- a/buildroot/package/vte/Config.in +++ b/buildroot/package/vte/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_VTE bool "vte" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libgtk3 -> host-libgtk3 -> host-librsvg depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU @@ -22,6 +23,7 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ @@ -29,6 +31,7 @@ comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ diff --git a/buildroot/package/vte/vte.mk b/buildroot/package/vte/vte.mk index 0d5db34b6..6c8d1433f 100644 --- a/buildroot/package/vte/vte.mk +++ b/buildroot/package/vte/vte.mk @@ -10,7 +10,14 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 VTE_LICENSE = LGPL-2.1+ VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-introspection --disable-vala +VTE_CONF_OPTS += --disable-vala + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +VTE_CONF_OPTS += --enable-introspection +VTE_DEPENDENCIES += gobject-introspection +else +VTE_CONF_OPTS += --disable-introspection +endif ifeq ($(BR2_PACKAGE_GNUTLS),y) VTE_CONF_OPTS += --with-gnutls diff --git a/buildroot/package/vuejs/Config.in b/buildroot/package/vuejs/Config.in new file mode 100644 index 000000000..6456d288f --- /dev/null +++ b/buildroot/package/vuejs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_VUEJS + bool "vuejs" + help + VueJS web application framework. + + http://vuejs.org diff --git a/buildroot/package/vuejs/vuejs.hash b/buildroot/package/vuejs/vuejs.hash new file mode 100644 index 000000000..d2b30b8d3 --- /dev/null +++ b/buildroot/package/vuejs/vuejs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 7ee4d5e4ec7d44fb9918ecb074ad7701eb0bcb3a840cee3c2924734ef3fd888a v2.6.11.tar.gz +sha256 17fb24bc303763f3fe1911ee24e5225c7ad59f0e3a5d8123e9b730c100a306a6 LICENSE diff --git a/buildroot/package/vuejs/vuejs.mk b/buildroot/package/vuejs/vuejs.mk new file mode 100644 index 000000000..f7e197c4a --- /dev/null +++ b/buildroot/package/vuejs/vuejs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# vuejs +# +################################################################################ + +VUEJS_VERSION = 2.6.11 +VUEJS_SOURCE = v$(VUEJS_VERSION).tar.gz +VUEJS_SITE = https://github.com/vuejs/vue/archive +VUEJS_LICENSE = MIT +VUEJS_LICENSE_FILES = LICENSE + +# Install .min.js as .js +define VUEJS_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/vue.min.js \ + $(TARGET_DIR)/var/www/vue.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch b/buildroot/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..50d248819 --- /dev/null +++ b/buildroot/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch @@ -0,0 +1,37 @@ +si_types.h: fix build with gcc 10 + +Drop service_t, p_service_t, transponder_t and p_transponder_t to avoid +the following build failure with gcc 10 (which defaults to -fno-common): + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -lrt -o w_scan atsc_psip_section.o countries.o descriptors.o diseqc.o dump-dvbscan.o dump-vdr.o dump-xine.o dump-mplayer.o dump-vlc-m3u.o dvbscan.o lnb.o parse-dvbscan.o satellites.o scan.o section.o tools.o emulate.o dump-xml.o iconv_codes.o char-coding.o +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x404): multiple definition of `p_transponder_t'; countries.o:(.bss+0x0): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x408): multiple definition of `transponder_t'; countries.o:(.bss+0x4): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x480): multiple definition of `p_service_t'; countries.o:(.bss+0x7c): first defined here +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x484): multiple definition of `service_t'; countries.o:(.bss+0x80): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/5640442cb4ba06bcbcf31540a64f5665862d39f7 + +Signed-off-by: Fabrice Fontaine + +diff -Nura w_scan-20170107.orig/si_types.h w_scan-20170107/si_types.h +--- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200 ++++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200 +@@ -114,7 +114,7 @@ + uint32_t logical_channel_number; + uint8_t running; + void * priv; +-} service_t, * p_service_t; ++}; + + /******************************************************************************* + /* transponder type. +@@ -201,7 +201,7 @@ + /*----------------------------*/ + char * network_name; + network_change_t network_change; +-} __attribute__((packed)) transponder_t, * p_transponder_t; ++} __attribute__((packed)); + + /******************************************************************************* + /* satellite channel routing type. diff --git a/buildroot/package/waf/waf.hash b/buildroot/package/waf/waf.hash index 572562cf9..15db32f38 100644 --- a/buildroot/package/waf/waf.hash +++ b/buildroot/package/waf/waf.hash @@ -1,3 +1,3 @@ # Locally computed -sha1 d857c29d49848e0fc42e69daa25e0ec2e732ac17 waf-2.0.19 -sha256 ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef waf-2.0.19 +sha1 92212071a63ce38fdfd69fb8332f04e84d1f6635 waf-2.0.20 +sha256 bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f waf-2.0.20 diff --git a/buildroot/package/waf/waf.mk b/buildroot/package/waf/waf.mk index ae3eb0f1e..56b6d9e03 100644 --- a/buildroot/package/waf/waf.mk +++ b/buildroot/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.19 +WAF_VERSION = 2.0.20 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io diff --git a/buildroot/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/buildroot/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch similarity index 79% rename from buildroot/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch rename to buildroot/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch index ffc1b5b8b..126aa9330 100644 --- a/buildroot/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch +++ b/buildroot/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch @@ -4,12 +4,12 @@ Date: Sun, 24 Dec 2017 00:11:45 +0100 Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags When building mesa egl without x11 and gles2 the headers need a -MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers. +EGL_NO_X11 define to avoid including X11 headers. -This define MESA_EGL_NO_X11_HEADERS is lost while building waffle -since CGLAGS defined by pc files are not used. +This define EGL_NO_X11 is lost while building waffle +since CFLAGS defined by pc files are not used. -MESA_EGL_NO_X11_HEADERS is defined in CFLAGS from egl.pc. +EGL_NO_X11 is defined in CFLAGS from egl.pc. Signed-off-by: Romain Naour --- diff --git a/buildroot/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/buildroot/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch deleted file mode 100644 index ef54953e3..000000000 --- a/buildroot/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 117456752cf9ac1f24d3cfd917ad34f670c244b8 Mon Sep 17 00:00:00 2001 -From: Emil Velikov -Date: Thu, 19 Mar 2015 22:26:11 +0000 -Subject: [PATCH] third_party/threads: Use PTHREAD_MUTEX_RECURSIVE by default - -PTHREAD_MUTEX_RECURSIVE_NP was used for compatibility with old glibc. -Although due to the_GNU_SOURCES define the portable, -PTHREAD_MUTEX_RECURSIVE will be available for Linuxes since at least -1998. Simplify things giving us compatibility with musl which -apparently does not provide the non-portable define. - -Inspired by almost identical commit in mesa aead7fe2e2b(c11/threads: Use -PTHREAD_MUTEX_RECURSIVE by default) by Felix Janda. - -Signed-off-by: Emil Velikov -Reviewed-by: Chad Versace -(Romain: cherry picked from commit 3b9b8f5f6d1b99af43e95ec0868404e552a85b73) -Signed-off-by: Romain Naour ---- - third_party/threads/threads_posix.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c -index 5835e43..e122bf9 100644 ---- a/third_party/threads/threads_posix.c -+++ b/third_party/threads/threads_posix.c -@@ -26,6 +26,9 @@ - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+ -+#define _GNU_SOURCE -+ - #include - #ifndef assert - #include -@@ -150,13 +153,8 @@ int mtx_init(mtx_t *mtx, int type) - && type != (mtx_try|mtx_recursive)) - return thrd_error; - pthread_mutexattr_init(&attr); -- if ((type & mtx_recursive) != 0) { --#if defined(__linux__) || defined(__linux) -- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); --#else -+ if ((type & mtx_recursive) != 0) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); --#endif -- } - pthread_mutex_init(mtx, &attr); - pthread_mutexattr_destroy(&attr); - return thrd_success; --- -2.14.3 - diff --git a/buildroot/package/waffle/waffle.hash b/buildroot/package/waffle/waffle.hash index f496927e3..84821312c 100644 --- a/buildroot/package/waffle/waffle.hash +++ b/buildroot/package/waffle/waffle.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-1.5.2.tar.gz -sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt +sha256 234e65bdd2dd8f7d3bc8e9ad1a7cc80fce78a1deed3a04fe7f1d2c2edac0cd8a waffle-v1.6.1.tar.bz2 +sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/buildroot/package/waffle/waffle.mk b/buildroot/package/waffle/waffle.mk index 280e295cb..3340dc1c6 100644 --- a/buildroot/package/waffle/waffle.mk +++ b/buildroot/package/waffle/waffle.mk @@ -4,8 +4,9 @@ # ################################################################################ -WAFFLE_VERSION = 1.5.2 -WAFFLE_SITE = $(call github,waffle-gl,waffle,v$(WAFFLE_VERSION)) +WAFFLE_VERSION = 1.6.1 +WAFFLE_SOURCE = waffle-v$(WAFFLE_VERSION).tar.bz2 +WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/-/archive/v$(WAFFLE_VERSION) WAFFLE_INSTALL_STAGING = YES WAFFLE_LICENSE = BSD-2-Clause WAFFLE_LICENSE_FILES = LICENSE.txt @@ -15,7 +16,8 @@ WAFFLE_DEPENDENCIES = host-pkgconf WAFFLE_CONF_OPTS = -Dwaffle_build_tests=OFF \ -Dwaffle_build_examples=OFF \ -Dwaffle_build_manpages=OFF \ - -Dwaffle_build_htmldocs=OFF + -Dwaffle_build_htmldocs=OFF \ + -Dwaffle_has_nacl=OFF ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND),y) WAFFLE_DEPENDENCIES += libegl wayland @@ -45,4 +47,15 @@ else WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF endif +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +WAFFLE_DEPENDENCIES += bash-completion +endif + +ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) +WAFFLE_DEPENDENCIES += mesa3d +WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch b/buildroot/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch new file mode 100644 index 000000000..c7b8c7860 --- /dev/null +++ b/buildroot/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch @@ -0,0 +1,38 @@ +From 9c2559434b752df3dc8460ee242d321670a40847 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 1 Jun 2020 11:41:54 +0200 +Subject: [PATCH] include/wampcc/platform.h: fix build with musl 1.2.0 + +Fix the following build failure on musl 1.2.0 due to time_t being on 64 +bits: + +/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc: In function 'std::__cxx11::string wampcc::local_timestamp()': +/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc:205:15: error: cannot convert 'wampcc::time_val::type_type*' {aka 'long int*'} to 'const time_t*' {aka 'const long long int*'} + localtime_r(&now.sec, &parts); + ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da996e189220499b85efbdb541a891ac18db38c6 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/darrenjs/wampcc/pull/62] +--- + include/wampcc/platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/wampcc/platform.h b/include/wampcc/platform.h +index 24d0868..aebf950 100644 +--- a/include/wampcc/platform.h ++++ b/include/wampcc/platform.h +@@ -27,7 +27,7 @@ namespace wampcc + struct time_val + { + #ifndef _WIN32 +- typedef long type_type; ++ typedef time_t type_type; + #else + typedef __time64_t type_type; + #endif +-- +2.26.2 + diff --git a/buildroot/package/wampcc/0003-Broken-build-on-Windows.patch b/buildroot/package/wampcc/0003-Broken-build-on-Windows.patch new file mode 100644 index 000000000..3c528cd88 --- /dev/null +++ b/buildroot/package/wampcc/0003-Broken-build-on-Windows.patch @@ -0,0 +1,27 @@ +From eaa70a289288db1e8d90a2a9bcde435a8975fe74 Mon Sep 17 00:00:00 2001 +From: Sergey Lukashevich +Date: Fri, 26 Jul 2019 21:58:34 +0300 +Subject: [PATCH] Broken build on Windows: "http_parser.h(66,18): error C2039: + 'runtime_error': is not a member of 'std'" + +Add missing include. + +[Retrieved from: +https://github.com/darrenjs/wampcc/commit/eaa70a289288db1e8d90a2a9bcde435a8975fe74] +Signed-off-by: Fabrice Fontaine +--- + include/wampcc/http_parser.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/wampcc/http_parser.h b/include/wampcc/http_parser.h +index a9405dd..4c20417 100644 +--- a/include/wampcc/http_parser.h ++++ b/include/wampcc/http_parser.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + // types brought in from nodejs http-parser project + struct http_parser; diff --git a/buildroot/package/watchdog/Config.in b/buildroot/package/watchdog/Config.in new file mode 100644 index 000000000..bf485034d --- /dev/null +++ b/buildroot/package/watchdog/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_WATCHDOG + bool "watchdog" + depends on BR2_USE_MMU + help + Watchdog is a daemon that periodically pets a watchdog device + if the configured system status checks pass. If they do not, + the daemon may execute repair commands, shutdown the system or + reboot it. + + https://sourceforge.net/projects/watchdog/ diff --git a/buildroot/package/watchdog/watchdog.hash b/buildroot/package/watchdog/watchdog.hash new file mode 100644 index 000000000..7366c1b5e --- /dev/null +++ b/buildroot/package/watchdog/watchdog.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d watchdog-5.16.tar.gz +sha256 af7f3f94e85080204b37f7c53717a2c94c6b54d7fa516ebd74e008cb4c0391bd COPYING diff --git a/buildroot/package/watchdog/watchdog.mk b/buildroot/package/watchdog/watchdog.mk new file mode 100644 index 000000000..2699fb474 --- /dev/null +++ b/buildroot/package/watchdog/watchdog.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# watchdog +# +################################################################################ + +WATCHDOG_VERSION = 5.16 +WATCHDOG_SITE = http://downloads.sourceforge.net/sourceforge/watchdog +WATCHDOG_LICENSE = GPL-2.0+ +WATCHDOG_LICENSE_FILES = COPYING +# By default installs binaries in /usr/sbin/, but we want them in +# /sbin/ so that they fall at the same place as Busybox counterparts +WATCHDOG_CONF_OPTS = --sbindir=/sbin + +$(eval $(autotools-package)) diff --git a/buildroot/package/wavpack/wavpack.hash b/buildroot/package/wavpack/wavpack.hash index 6b1f90a1f..eeef73032 100644 --- a/buildroot/package/wavpack/wavpack.hash +++ b/buildroot/package/wavpack/wavpack.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 77e5b1cfa26e387e4275b362f0c3fb9a27106447d9bce00f9f794f30badb77e3 wavpack-5.2.0.tar.xz -sha256 2ab58075e26305cc16920e9867c1d43f46ce81adab2051100dd316a3a93a2619 COPYING +sha256 b444379a0bee0330f137cb3e9a100e6a12a63a6d01987ba66b3729f85e282307 wavpack-5.3.0.tar.xz +sha256 a0bbe245dfe263f73946b72306e8336818009ff1e52b119784c288f2785fc260 COPYING diff --git a/buildroot/package/wavpack/wavpack.mk b/buildroot/package/wavpack/wavpack.mk index 8cb7754b2..6403f93ac 100644 --- a/buildroot/package/wavpack/wavpack.mk +++ b/buildroot/package/wavpack/wavpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVPACK_VERSION = 5.2.0 +WAVPACK_VERSION = 5.3.0 WAVPACK_SITE = \ https://github.com/dbry/WavPack/releases/download/$(WAVPACK_VERSION) WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.xz diff --git a/buildroot/package/wayland-protocols/wayland-protocols.hash b/buildroot/package/wayland-protocols/wayland-protocols.hash index a27ff9e52..321fc62de 100644 --- a/buildroot/package/wayland-protocols/wayland-protocols.hash +++ b/buildroot/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-July/040756.html -md5 af38f22d8e233c2f2e00ddc8dcc94694 wayland-protocols-1.18.tar.xz -sha1 aa2f132c082f3c790bd046283b3ef7ce3fb11370 wayland-protocols-1.18.tar.xz -sha256 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 wayland-protocols-1.18.tar.xz -sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING +# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html +md5 b0836533a3f2dc6585b1dae00341157f wayland-protocols-1.20.tar.xz +sha1 e78c739a3a85477ed524b81e8bb75efe7f8bf4df wayland-protocols-1.20.tar.xz +sha256 9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7 wayland-protocols-1.20.tar.xz +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/buildroot/package/wayland-protocols/wayland-protocols.mk b/buildroot/package/wayland-protocols/wayland-protocols.mk index 20a933087..84028b97d 100644 --- a/buildroot/package/wayland-protocols/wayland-protocols.mk +++ b/buildroot/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.18 +WAYLAND_PROTOCOLS_VERSION = 1.20 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT diff --git a/buildroot/package/wayland-utils/Config.in b/buildroot/package/wayland-utils/Config.in new file mode 100644 index 000000000..d7842e614 --- /dev/null +++ b/buildroot/package/wayland-utils/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_WAYLAND_UTILS + bool "wayland-utils" + depends on BR2_PACKAGE_WAYLAND # wayland-client, wayland-server + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + Wayland utils (wayland-info). + + https://gitlab.freedesktop.org/ofourdan/wayland-utils diff --git a/buildroot/package/wayland-utils/wayland-utils.hash b/buildroot/package/wayland-utils/wayland-utils.hash new file mode 100644 index 000000000..00b6da403 --- /dev/null +++ b/buildroot/package/wayland-utils/wayland-utils.hash @@ -0,0 +1,6 @@ +# From https://lists.freedesktop.org/archives/wayland-devel/2020-July/041565.html +md5 714875aefb10e7f683cde24e58d033ad wayland-utils-1.0.0.tar.xz +sha1 b5b8d498a892866d56ffbe862039d7c97acbe7bc wayland-utils-1.0.0.tar.xz +sha256 64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0 wayland-utils-1.0.0.tar.xz +sha512 4c6f1822435b36b3acd361c0c54e56150e8a2697a9c4b2c20a149fcfaafe237e45807df3471884ddf594d89558001099e2d938e3f48988ba6950a0f1e3538db2 wayland-utils-1.0.0.tar.xz +sha256 1eba39c11640014a5841dd3017e5245fc31f47e1cf43a3287a286dd6a8de8a1a COPYING diff --git a/buildroot/package/wayland-utils/wayland-utils.mk b/buildroot/package/wayland-utils/wayland-utils.mk new file mode 100644 index 000000000..30a33b61d --- /dev/null +++ b/buildroot/package/wayland-utils/wayland-utils.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# wayland-utils +# +################################################################################ + +WAYLAND_UTILS_VERSION = 1.0.0 +WAYLAND_UTILS_SITE = https://wayland.freedesktop.org/releases +WAYLAND_UTILS_SOURCE = wayland-utils-$(WAYLAND_UTILS_VERSION).tar.xz +WAYLAND_UTILS_LICENSE = MIT +WAYLAND_UTILS_LICENSE_FILES = COPYING +WAYLAND_UTILS_DEPENDENCIES = host-pkgconf wayland wayland-protocols + +$(eval $(meson-package)) diff --git a/buildroot/package/wayland/0001-build-add-option-to-disable-tests.patch b/buildroot/package/wayland/0001-build-add-option-to-disable-tests.patch new file mode 100644 index 000000000..6ab695e90 --- /dev/null +++ b/buildroot/package/wayland/0001-build-add-option-to-disable-tests.patch @@ -0,0 +1,104 @@ +From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 3 Mar 2020 15:27:51 -0700 +Subject: [PATCH] build: add option to disable tests + +When building for a product, tests are not needed. + +Besides, one test requires a C++ compiler, which is not always +available. + +So, add an option to configure to disable building tests altogether. + +Signed-off-by: "Yann E. MORIN" +Signed-off-by: Alexey Brodkin +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] +--- + Makefile.am | 2 ++ + configure.ac | 9 +++++++++ + meson.build | 4 +++- + meson_options.txt | 4 ++++ + 4 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cc87392..d5d43e3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc + include_HEADERS += egl/wayland-egl-backend.h + pkgconfig_DATA += egl/wayland-egl-backend.pc + ++if ENABLE_TESTS + built_test_programs = \ + array-test \ + client-test \ +@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la + + exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c + exec_fd_leak_checker_LDADD = libtest-helpers.la ++endif + + EXTRA_DIST += tests/scanner-test.sh \ + protocol/tests.xml \ +diff --git a/configure.ac b/configure.ac +index dda5e48..99b7c96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries], + [], + [enable_libraries=yes]) + ++AC_ARG_ENABLE([tests], ++ [AC_HELP_STRING([--disable-tests], ++ [Disable compilation of test programs])], ++ [], ++ [enable_tests=yes]) ++ ++ + AC_ARG_WITH([host-scanner], + [AC_HELP_STRING([--with-host-scanner], + [Use installed wayland-scanner from host PATH during build])], +@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) + + AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) + ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) ++ + AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], + [ ICONDIR=$withval], + [ ICONDIR=${datadir}/icons]) +diff --git a/meson.build b/meson.build +index 5632f4e..b37bb7a 100644 +--- a/meson.build ++++ b/meson.build +@@ -83,7 +83,9 @@ subdir('src') + if get_option('libraries') + subdir('cursor') + subdir('egl') +- subdir('tests') ++ if get_option('tests') ++ subdir('tests') ++ endif + endif + + if get_option('documentation') +diff --git a/meson_options.txt b/meson_options.txt +index 76314f7..ab4be92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,6 +2,10 @@ option('libraries', + description: 'Compile Wayland libraries', + type: 'boolean', + value: 'true') ++option('tests', ++ description: 'Compile Wayland tests', ++ type: 'boolean', ++ value: 'true') + option('documentation', + description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', + type: 'boolean', +-- +2.20.1 + diff --git a/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch b/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch deleted file mode 100644 index fdfbeb4bd..000000000 --- a/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 55ae8e1103f4697bfa01a84301a6560b89de5248 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 16 Apr 2018 19:52:34 +0300 -Subject: [PATCH] configure: add option to disable tests - -When building for a product, tests are not needed. - -Besides, one test requires a C++ compiler, which is not always -available. - -So, add an option to configure to disable building tests altogether. - -Signed-off-by: "Yann E. MORIN" -Reviewed-by: Eric Engestrom -Tested-by: Eric Engestrom - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Alexey Brodkin - ---- -Changes v1 -> v2: - - fix typo in yes-check (Eric) ---- - Makefile.am | 2 ++ - configure.ac | 8 ++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 741db5ebf9d9..4862d42959f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -160,6 +160,7 @@ pkgconfig_DATA += egl/wayland-egl.pc - include_HEADERS += egl/wayland-egl-backend.h - pkgconfig_DATA += egl/wayland-egl-backend.pc - -+if ENABLE_TESTS - built_test_programs = \ - array-test \ - client-test \ -@@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la - - exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c - exec_fd_leak_checker_LDADD = libtest-helpers.la -+endif - - EXTRA_DIST += tests/scanner-test.sh \ - protocol/tests.xml \ -diff --git a/configure.ac b/configure.ac -index c74ee97b24a2..5c94b7b76b06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -89,10 +89,18 @@ AC_ARG_ENABLE([dtd-validation], - [], - [enable_dtd_validation=yes]) - -+AC_ARG_ENABLE([tests], -+ [AC_HELP_STRING([--disable-tests], -+ [Disable compilation of test programs])], -+ [], -+ [enable_tests=yes]) -+ - AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) - - AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) - -+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) -+ - AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], - [ ICONDIR=$withval], - [ ICONDIR=${datadir}/icons]) --- -2.14.3 - diff --git a/buildroot/package/wayland/0002-meson-do-not-check-for-c.patch b/buildroot/package/wayland/0002-meson-do-not-check-for-c.patch new file mode 100644 index 000000000..c5819bf47 --- /dev/null +++ b/buildroot/package/wayland/0002-meson-do-not-check-for-c.patch @@ -0,0 +1,29 @@ +From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 29 Jul 2020 08:20:41 +0200 +Subject: [PATCH] meson: do not check for c++ + +Wayland does not need c++, fixes building with toolchains lacking c++. + +Backported from upstream PR: +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b67b101..e47a52d 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project( +- 'wayland', 'c', 'cpp', ++ 'wayland', 'c', + version: '1.18.0', + license: 'MIT', + meson_version: '>= 0.47.0', +-- +2.27.0 + diff --git a/buildroot/package/wayland/Config.in b/buildroot/package/wayland/Config.in index 32718fc2b..c22d9c7ef 100644 --- a/buildroot/package/wayland/Config.in +++ b/buildroot/package/wayland/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_WAYLAND to talk to its clients as well as a library implementation of the protocol. - http://wayland.freedesktop.org/ + https://wayland.freedesktop.org/ comment "wayland needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/wayland/wayland.hash b/buildroot/package/wayland/wayland.hash index 877410188..abd8bcdf2 100644 --- a/buildroot/package/wayland/wayland.hash +++ b/buildroot/package/wayland/wayland.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html -md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz -sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz -sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz -sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html +md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz +sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz +sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz +sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz # Locally calculated -sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/buildroot/package/wayland/wayland.mk b/buildroot/package/wayland/wayland.mk index e325c6d75..1b1927271 100644 --- a/buildroot/package/wayland/wayland.mk +++ b/buildroot/package/wayland/wayland.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAYLAND_VERSION = 1.17.0 -WAYLAND_SITE = http://wayland.freedesktop.org/releases +WAYLAND_VERSION = 1.18.0 +WAYLAND_SITE = https://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING @@ -13,12 +13,8 @@ WAYLAND_INSTALL_STAGING = YES WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2 -# 0002-configure-add-option-to-disable-tests.patch -WAYLAND_AUTORECONF = YES - -# wayland-scanner is only needed for building, not on the target -WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests -HOST_WAYLAND_CONF_OPTS = --disable-tests +WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false +HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false # Remove the DTD from the target, it's not needed at runtime define WAYLAND_TARGET_CLEANUP @@ -26,5 +22,5 @@ define WAYLAND_TARGET_CLEANUP endef WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch b/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch deleted file mode 100644 index a7746c1f3..000000000 --- a/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a39c0c115e19150551c01b04a5e903376633e771 Mon Sep 17 00:00:00 2001 -From: Nils Christopher Brause -Date: Fri, 22 Nov 2019 17:39:20 +0100 -Subject: [PATCH] [cmake] Make target_link_options optional, lowering the - required cmake version to 3.4. - -[Retrieved from: -https://github.com/NilsBrause/waylandpp/commit/a39c0c115e19150551c01b04a5e903376633e771] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 386f8d8..47a412c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,7 +21,7 @@ - # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required(VERSION 3.4) - project(waylandpp VERSION 0.2.7 LANGUAGES CXX) - - # packages -@@ -160,7 +160,9 @@ if(BUILD_LIBRARIES) - "include/wayland-client.hpp;include/wayland-util.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-version.hpp" - src/wayland-client.cpp src/wayland-util.cpp wayland-client-protocol.cpp wayland-client-protocol.hpp) - # Report undefined references only for the base library. -- target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined") -+ if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") -+ target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined") -+ endif() - define_library(wayland-client-extra++ "${WAYLAND_CLIENT_CFLAGS}" "${WAYLAND_CLIENT_LIBRARIES}" - "${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol-extra.hpp" - wayland-client-protocol-extra.cpp wayland-client-protocol-extra.hpp wayland-client-protocol.hpp) diff --git a/buildroot/package/waylandpp/waylandpp.hash b/buildroot/package/waylandpp/waylandpp.hash index 39ea3e170..1b806af9b 100644 --- a/buildroot/package/waylandpp/waylandpp.hash +++ b/buildroot/package/waylandpp/waylandpp.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 fa31b659a6bb93b322e1068831c9a0135a4687d8ef9ceb2e7660c909ce10bfa6 waylandpp-0.2.7.tar.gz -sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt +sha256 e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d waylandpp-0.2.8.tar.gz +sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/buildroot/package/waylandpp/waylandpp.mk b/buildroot/package/waylandpp/waylandpp.mk index 8630b05bb..45d9ccd52 100644 --- a/buildroot/package/waylandpp/waylandpp.mk +++ b/buildroot/package/waylandpp/waylandpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLANDPP_VERSION = 0.2.7 +WAYLANDPP_VERSION = 0.2.8 WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION)) WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner) WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt diff --git a/buildroot/package/webkitgtk/Config.in b/buildroot/package/webkitgtk/Config.in index 86f58821a..4ea931fde 100644 --- a/buildroot/package/webkitgtk/Config.in +++ b/buildroot/package/webkitgtk/Config.in @@ -12,15 +12,17 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7" +comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index cdca65a5a..30b8e4f11 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.28.4.tar.xz.sums -md5 10e0cce27208dfbd4cf63dd68a9a47d7 webkitgtk-2.28.4.tar.xz -sha1 70e9dd80647b30eaaf8a7f5b30d8869cd1254056 webkitgtk-2.28.4.tar.xz -sha256 821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464 webkitgtk-2.28.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.30.2.tar.xz.sums +md5 2163f1f982c63cb8fa75bf1b36396304 webkitgtk-2.30.2.tar.xz +sha1 e27d336570226645f861b5a00116c17da39f9df4 webkitgtk-2.30.2.tar.xz +sha256 c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a webkitgtk-2.30.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 65a443983..1f8582daf 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.28.4 +WEBKITGTK_VERSION = 2.30.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -105,12 +105,17 @@ WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif # JIT is not supported for MIPS r6, but the WebKit build system does not -# have a check for these processors. Disable JIT forcibly here and use -# the CLoop interpreter instead. +# have a check for these processors. The same goes for ARMv5 and ARMv6. +# Disable JIT forcibly here and use the CLoop interpreter instead. # -# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +# Also, we have to disable the sampling profiler, which does NOT work +# with ENABLE_C_LOOP. +# +# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 +# https://bugs.webkit.org/show_bug.cgi?id=172765 +# +ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif $(eval $(cmake-package)) diff --git a/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch b/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch deleted file mode 100644 index 3b37834f5..000000000 --- a/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Tue, 16 Apr 2019 08:38:01 +0200 -Subject: [PATCH] Replace make_shared with new in some cases - -Replace make_shared for asio types that take a lib::ref as a parameter. -This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, -while keeping it backwards compatible to older boost versions. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/zaphoyd/websocketpp/pull/814/commits/c769c9238ad62178f506038178714a1c35aa2769] ---- - websocketpp/transport/asio/connection.hpp | 7 ++++--- - websocketpp/transport/asio/endpoint.hpp | 3 +-- - websocketpp/transport/asio/security/none.hpp | 3 +-- - websocketpp/transport/asio/security/tls.hpp | 3 +-- - 4 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 60f88a79..1ccda8f3 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type { - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index ddab2c74..4b719a97 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ class endpoint : public config::socket_type { - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp -index 5c8293db..6c7d3524 100644 ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this { - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index c76fd9aa..04ac3790 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this { - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); diff --git a/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch b/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch deleted file mode 100644 index 7a27065c7..000000000 --- a/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Wed, 17 Apr 2019 10:06:18 +0000 -Subject: [PATCH] Fix missed entries; fix testing - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/zaphoyd/websocketpp/pull/814/commits/f810ca2e800e9b55be41c5911cf1d1185fcd516b] ---- - CMakeLists.txt | 2 +- - websocketpp/transport/asio/connection.hpp | 3 +-- - websocketpp/transport/asio/endpoint.hpp | 7 ++----- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2786aba9..951de975 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 1ccda8f3..57dda74a 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index 4b719a97..94509adb 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -687,9 +687,7 @@ class endpoint : public config::socket_type { - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -853,8 +851,7 @@ class endpoint : public config::socket_type { - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); diff --git a/buildroot/package/websocketpp/websocketpp.hash b/buildroot/package/websocketpp/websocketpp.hash index 8bf671d96..e4d0c929d 100644 --- a/buildroot/package/websocketpp/websocketpp.hash +++ b/buildroot/package/websocketpp/websocketpp.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 178899de48c02853b55b1ea8681599641cedcdfce59e56beaff3dd0874bf0286 websocketpp-0.8.1.tar.gz +sha256 6ce889d85ecdc2d8fa07408d6787e7352510750daa66b5ad44aacb47bea76755 websocketpp-0.8.2.tar.gz sha256 b31e597bc777d884a39663c11d0557a0af40780e1f451de11ea5103924a69667 COPYING diff --git a/buildroot/package/websocketpp/websocketpp.mk b/buildroot/package/websocketpp/websocketpp.mk index 47da4dbe2..26595a00d 100644 --- a/buildroot/package/websocketpp/websocketpp.mk +++ b/buildroot/package/websocketpp/websocketpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBSOCKETPP_VERSION = 0.8.1 +WEBSOCKETPP_VERSION = 0.8.2 WEBSOCKETPP_SITE = $(call github,zaphoyd,websocketpp,$(WEBSOCKETPP_VERSION)) WEBSOCKETPP_LICENSE = BSD-3c, MIT, Zlib WEBSOCKETPP_LICENSE_FILES = COPYING diff --git a/buildroot/package/weston-imx/Config.in b/buildroot/package/weston-imx/Config.in deleted file mode 100644 index 36ff7ae5a..000000000 --- a/buildroot/package/weston-imx/Config.in +++ /dev/null @@ -1,114 +0,0 @@ -comment "weston-imx needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ - !BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - depends on !BR2_PACKAGE_WESTON - -comment "weston-imx needs imx-gpu-viv with wyalnd output" - depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # imx-gpu-viv - depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - depends on !BR2_PACKAGE_WESTON - -config BR2_PACKAGE_WESTON_IMX - bool "weston-imx" - depends on !BR2_STATIC_LIBS # wayland - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL - depends on !BR2_PACKAGE_WESTON - select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBDRM - # Runtime dependency - select BR2_PACKAGE_XKEYBOARD_CONFIG - # Make sure at least one compositor is selected. - select BR2_PACKAGE_WESTON_IMX_FBDEV if !BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR - help - Weston is the reference implementation of a Wayland - compositor, and a useful compositor in its own right. - Weston has various backends that lets it run on Linux kernel - modesetting and evdev input as well as under X11. - - http://wayland.freedesktop.org/ - -if BR2_PACKAGE_WESTON_IMX - -# Helper to make sure at least one compositor is selected. -config BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR - bool - -config BR2_PACKAGE_WESTON_IMX_DRM - bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL - -config BR2_PACKAGE_WESTON_IMX_FBDEV - bool "fbdev compositor" - -# FreeRDP needs threads and !static, already the case for weston -config BR2_PACKAGE_WESTON_IMX_RDP - bool "RDP compositor" - depends on BR2_USE_MMU # freerdp, libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_WCHAR # freerdp - depends on BR2_INSTALL_LIBSTDCPP # freerdp - select BR2_PACKAGE_FREERDP - select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR - help - This enables the RDP backend, which allows accessing weston - through the network with any RDP-compliant client. - - Please note that one must pass those options to weston for RDP - to be functional: - --rdp-tls-cert=/path/to/server.crt - --rdp-tls-key=/path/to/server.key - - By default, Buildroot installs such files in - /etc/freerdp/server/ so you may want to change them in a - post-build script or a rootfs overlay. - -comment "RDP compositor needs a toolchain w/ wchar, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_WESTON_IMX_X11 - bool "X11 compositor" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR - -comment "X11 compositor needs X.org enabled" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_WESTON_IMX_XWAYLAND - bool "XWayland support" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_LIBEPOXY - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXCURSOR - -comment "XWayland support needs libepoxy and X.org enabled" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY - -config BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS - bool "demo clients" - help - This enables the installation of Weston's demo clients. - -endif diff --git a/buildroot/package/weston-imx/weston-imx.hash b/buildroot/package/weston-imx/weston-imx.hash deleted file mode 100644 index 56885d71a..000000000 --- a/buildroot/package/weston-imx/weston-imx.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 f39f7a24a01b023aa204ad47977a6476c17a307769f29d408621a05b5cbbcfc7 weston-imx-rel_imx_4.9.51_8mq_ga.tar.gz -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/buildroot/package/weston-imx/weston-imx.mk b/buildroot/package/weston-imx/weston-imx.mk deleted file mode 100644 index e803fa3ee..000000000 --- a/buildroot/package/weston-imx/weston-imx.mk +++ /dev/null @@ -1,144 +0,0 @@ -################################################################################ -# -# weston-imx -# -################################################################################ - -WESTON_IMX_VERSION = rel_imx_4.9.51_8mq_ga -WESTON_IMX_SITE = https://source.codeaurora.org/external/imx/weston-imx -WESTON_IMX_SITE_METHOD = git -WESTON_IMX_AUTORECONF = YES -WESTON_IMX_LICENSE = MIT -WESTON_IMX_LICENSE_FILES = COPYING - -WESTON_IMX_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ - $(if $(BR2_PACKAGE_WEBP),webp) - -WESTON_IMX_CONF_OPTS = \ - --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ - --disable-headless-compositor \ - --disable-colord \ - --disable-devdocs \ - --disable-setuid-install - -WESTON_IMX_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols - -# Uses VIDIOC_EXPBUF, only available from 3.8+ -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) -WESTON_IMX_CONF_OPTS += --disable-simple-dmabuf-v4l-client -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -WESTON_IMX_CONF_OPTS += --enable-dbus -WESTON_IMX_DEPENDENCIES += dbus -else -WESTON_IMX_CONF_OPTS += --disable-dbus -endif - -# weston-launch must be u+s root in order to work properly -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -define WESTON_IMX_PERMISSIONS - /usr/bin/weston-launch f 4755 0 0 - - - - - -endef -define WESTON_IMX_USERS - - - weston-launch -1 - - - - Weston launcher group -endef -WESTON_IMX_CONF_OPTS += --enable-weston-launch -WESTON_IMX_DEPENDENCIES += linux-pam -else -WESTON_IMX_CONF_OPTS += --disable-weston-launch -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) -WESTON_IMX_DEPENDENCIES += imx-gpu-g2d -# --enable-imxg2d actually disables it, so no CONF_OPTS -else -WESTON_IMX_CONF_OPTS += --disable-imxg2d -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) -WESTON_IMX_CONF_OPTS += --enable-egl -WESTON_IMX_DEPENDENCIES += libegl libgles -else -WESTON_IMX_CONF_OPTS += \ - --disable-egl \ - --disable-simple-dmabuf-drm-client \ - --disable-simple-egl-clients -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_RDP),y) -WESTON_IMX_DEPENDENCIES += freerdp -WESTON_IMX_CONF_OPTS += --enable-rdp-compositor -else -WESTON_IMX_CONF_OPTS += --disable-rdp-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_FBDEV),y) -WESTON_IMX_CONF_OPTS += \ - --enable-fbdev-compositor \ - WESTON_IMX_NATIVE_BACKEND=fbdev-backend.so -else -WESTON_IMX_CONF_OPTS += --disable-fbdev-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_DRM),y) -WESTON_IMX_CONF_OPTS += \ - --enable-drm-compositor \ - WESTON_IMX_NATIVE_BACKEND=drm-backend.so -else -WESTON_IMX_CONF_OPTS += --disable-drm-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_X11),y) -WESTON_IMX_CONF_OPTS += \ - --enable-x11-compositor \ - WESTON_IMX_NATIVE_BACKEND=x11-backend.so -WESTON_IMX_DEPENDENCIES += libxcb xlib_libX11 -else -WESTON_IMX_CONF_OPTS += --disable-x11-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_XWAYLAND),y) -WESTON_IMX_CONF_OPTS += --enable-xwayland -WESTON_IMX_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor -else -WESTON_IMX_CONF_OPTS += --disable-xwayland -endif - -ifeq ($(BR2_PACKAGE_LIBVA),y) -WESTON_IMX_CONF_OPTS += --enable-vaapi-recorder -WESTON_IMX_DEPENDENCIES += libva -else -WESTON_IMX_CONF_OPTS += --disable-vaapi-recorder -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -WESTON_IMX_CONF_OPTS += --enable-lcms -WESTON_IMX_DEPENDENCIES += lcms2 -else -WESTON_IMX_CONF_OPTS += --disable-lcms -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -WESTON_IMX_CONF_OPTS += --enable-systemd-login --enable-systemd-notify -WESTON_IMX_DEPENDENCIES += systemd -else -WESTON_IMX_CONF_OPTS += --disable-systemd-login --disable-systemd-notify -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WESTON_IMX_CONF_OPTS += --enable-junit-xml -WESTON_IMX_DEPENDENCIES += libxml2 -else -WESTON_IMX_CONF_OPTS += --disable-junit-xml -endif - -ifeq ($(BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS),y) -WESTON_IMX_CONF_OPTS += --enable-demo-clients-install -else -WESTON_IMX_CONF_OPTS += --disable-demo-clients-install -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch b/buildroot/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch new file mode 100644 index 000000000..2eb6bd838 --- /dev/null +++ b/buildroot/package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch @@ -0,0 +1,48 @@ +From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Tue, 8 Sep 2020 19:37:42 -0400 +Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and + O_CREAT + +musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(), +O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors: + +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock': +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] +| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); +| | ^~~~ +| | popen +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function) +| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); +| | ^~~~~~ +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function) +| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); +| | ^~~~~~~~~ +| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function) +| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700); +| | ^~~~~~~ + +Signed-off-by: Denys Dmytriyenko +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +b10c0e843dcb8148bbe869bb15261955b94ac98c] +--- + tests/weston-test-fixture-compositor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c +index 1c32959c..c1eb26c4 100644 +--- a/tests/weston-test-fixture-compositor.c ++++ b/tests/weston-test-fixture-compositor.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "shared/helpers.h" + #include "weston-test-fixture-compositor.h" +-- +2.25.1 + diff --git a/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch b/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch deleted file mode 100644 index 33b1353fb..000000000 --- a/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 1 Feb 2020 20:02:29 -0700 -Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: -../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’? - map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0); - ^~~~~~~~~ - LOCK_READ - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae] ---- - shared/os-compatibility.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c -index 5e1ce479..041c929f 100644 ---- a/shared/os-compatibility.c -+++ b/shared/os-compatibility.c -@@ -34,10 +34,7 @@ - #include - #include - #include -- --#ifdef HAVE_MEMFD_CREATE - #include --#endif - - #include "os-compatibility.h" - --- -2.20.1 - diff --git a/buildroot/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/buildroot/package/weston/0002-libweston-backend-drm-might-need-EGL.patch new file mode 100644 index 000000000..f504e1145 --- /dev/null +++ b/buildroot/package/weston/0002-libweston-backend-drm-might-need-EGL.patch @@ -0,0 +1,47 @@ +From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 21 Oct 2020 13:33:25 +0200 +Subject: [PATCH] libweston/backend/drm: might need EGL + +gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns +includes egl.h. As such, dependencies for drm should include EGL if +it is available. + +This condition is modelled after a similar one in libweston/meson.build + +Reported-by: Gary Bisson +Reported-by: Heiko Thiery +Signed-off-by: Yann E. MORIN +Cc: Refik Tuzakli +Cc: Thomas Petazzoni +Signed-off-by: Heiko Thiery +--- +This patch should be a proper fix for the issue discribed in the patch from +Gary [1]. + +Since the MR on weston upstream [2] is not merged now I add this patch +to have working weston with imx in buildroot. + +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson@boundarydevices.com/ +[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 +--- + libweston/backend-drm/meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 484c2702..e3e5b976 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -53,6 +53,9 @@ if get_option('renderer-gl') + config_h.set('HAVE_GBM_FD_IMPORT', '1') + endif + deps_drm += dep_gbm ++ if dep_egl.found() ++ deps_drm += dep_egl ++ endif + srcs_drm += 'drm-gbm.c' + config_h.set('BUILD_DRM_GBM', '1') + endif +-- +2.20.1 + diff --git a/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch b/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch deleted file mode 100644 index c403ede4b..000000000 --- a/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f0d3a6149158f682230ae9a1e69289431974f635 Mon Sep 17 00:00:00 2001 -From: Sebastian Wick -Date: Wed, 5 Feb 2020 10:27:23 +0100 -Subject: [PATCH] shared: guard all the seal logic behind HAVE_MEMFD_CREATE - -The initial version of os_ro_anonymous_file missed two guards around the -seal logic which leads to a compilation error on older systems. - -Also make the check for a read-only file symmetric in -os_ro_anonymous_file_get_fd and os_ro_anonymous_file_put_fd. - -Signed-off-by: Sebastian Wick -[james.hilliard1@gmail.com: backport from upstream commit -f0d3a6149158f682230ae9a1e69289431974f635] -Signed-off-by: James Hilliard ---- - shared/os-compatibility.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c -index 041c929f..2e12b7cc 100644 ---- a/shared/os-compatibility.c -+++ b/shared/os-compatibility.c -@@ -340,6 +340,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, - void *src, *dst; - int seals, fd; - -+#ifdef HAVE_MEMFD_CREATE - seals = fcntl(file->fd, F_GET_SEALS); - - /* file was sealed for read-only and we don't have to support MAP_SHARED -@@ -348,6 +349,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, - if (seals != -1 && mapmode == RO_ANONYMOUS_FILE_MAPMODE_PRIVATE && - (seals & READONLY_SEALS) == READONLY_SEALS) - return file->fd; -+#endif - - /* for all other cases we create a new anonymous file that can be mapped - * with MAP_SHARED and copy the contents to it and return that instead -@@ -388,17 +390,18 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, - int - os_ro_anonymous_file_put_fd(int fd) - { -+#ifdef HAVE_MEMFD_CREATE - int seals = fcntl(fd, F_GET_SEALS); - if (seals == -1 && errno != EINVAL) - return -1; - -- /* If the fd cannot be sealed seals is -1 at this point -- * or the file can be sealed but has not been sealed for writing. -- * In both cases we created a new anonymous file that we have to -- * close. -+ /* The only case in which we do NOT have to close the file is when the file -+ * was sealed for read-only - */ -- if (seals == -1 || !(seals & F_SEAL_WRITE)) -- close(fd); -+ if (seals != -1 && (seals & READONLY_SEALS) == READONLY_SEALS) -+ return 0; -+#endif - -+ close(fd); - return 0; - } --- -2.20.1 - diff --git a/buildroot/package/weston/Config.in b/buildroot/package/weston/Config.in index bf783b70d..d07eba4c9 100644 --- a/buildroot/package/weston/Config.in +++ b/buildroot/package/weston/Config.in @@ -39,11 +39,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV config BR2_PACKAGE_WESTON_DEFAULT_DRM bool "drm" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_WESTON_DRM comment "drm backend needs mesa3d w/ EGL driver" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_DEFAULT_X11 bool "X11" @@ -63,11 +63,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL # Uses libgbm from mesa3d comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor" diff --git a/buildroot/package/weston/weston.hash b/buildroot/package/weston/weston.hash index 07695fda8..5a6b38686 100644 --- a/buildroot/package/weston/weston.hash +++ b/buildroot/package/weston/weston.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html -md5 53e4810d852df0601d01fd986a5b22b3 weston-8.0.0.tar.xz -sha1 80200a9c677d34c2de52230be444bd03ecd84229 weston-8.0.0.tar.xz -sha256 7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848 weston-8.0.0.tar.xz -sha512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c weston-8.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html +md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz +sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz +sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz +sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/buildroot/package/weston/weston.mk b/buildroot/package/weston/weston.mk index b22e68594..f59963bf2 100644 --- a/buildroot/package/weston/weston.mk +++ b/buildroot/package/weston/weston.mk @@ -4,8 +4,8 @@ # ################################################################################ -WESTON_VERSION = 8.0.0 -WESTON_SITE = http://wayland.freedesktop.org/releases +WESTON_VERSION = 9.0.0 +WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING @@ -14,7 +14,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng jpeg udev cairo libinput libdrm WESTON_CONF_OPTS = \ - -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \ -Dbackend-headless=false \ -Dcolor-management-colord=false \ -Dremoting=false @@ -57,9 +56,16 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgles +ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) +WESTON_CONF_OPTS += -Dpipewire=true +WESTON_DEPENDENCIES += pipewire +else +WESTON_CONF_OPTS += -Dpipewire=false +endif else WESTON_CONF_OPTS += \ - -Drenderer-gl=false + -Drenderer-gl=false \ + -Dpipewire=false endif ifeq ($(BR2_PACKAGE_WESTON_RDP),y) @@ -126,13 +132,6 @@ else WESTON_CONF_OPTS += -Dtest-junit-xml=false endif -ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) -WESTON_CONF_OPTS += -Dpipewire=true -WESTON_DEPENDENCIES += pipewire -else -WESTON_CONF_OPTS += -Dpipewire=false -endif - ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) WESTON_CONF_OPTS += -Ddemo-clients=true WESTON_DEPENDENCIES += pango diff --git a/buildroot/package/whois/whois.hash b/buildroot/package/whois/whois.hash index b83ea68d2..f42db356a 100644 --- a/buildroot/package/whois/whois.hash +++ b/buildroot/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois/whois_5.5.5.dsc -sha256 c30e8a444482eadac157be42649833ef77c5ea9fb5cbcbabb6ee3f2254e5530d whois_5.5.5.tar.xz +# From http://snapshot.debian.org/archive/debian/20201003T204015Z/pool/main/w/whois/whois_5.5.7.dsc +sha256 3efa700dbf38d127c31b21af3176cd6e5a69f96a056be60ac1dcd13df7717393 whois_5.5.7.tar.xz # Hash for license file: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/whois/whois.mk b/buildroot/package/whois/whois.mk index 417f5c76a..7d684922b 100644 --- a/buildroot/package/whois/whois.mk +++ b/buildroot/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.5 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois +WHOIS_VERSION = 5.5.7 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20201003T204015Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/wine/wine.hash b/buildroot/package/wine/wine.hash index eeb30c9a9..08abccb4a 100644 --- a/buildroot/package/wine/wine.hash +++ b/buildroot/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 25026d9f98a5d62583b8a02c91b1adaca9a2ff000d54095bb274045379e00fda wine-4.0.3.tar.xz +sha256 87f17254c6794ec6eeb7020b164c859983c9df0dacdd66d6449ff000498c842e wine-5.12.tar.xz # Locally calculated -sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 d29132813288a9b6034a79c53b22dbb1b078c70cec5c9bb731ae574cf812aa54 LICENSE +sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB +sha256 f3ca909e68d38c972e8ded5248b4745958dbb26f2e581ad73cfbedb6b0408e58 LICENSE diff --git a/buildroot/package/wine/wine.mk b/buildroot/package/wine/wine.mk index f315d9099..7eafe9b06 100644 --- a/buildroot/package/wine/wine.mk +++ b/buildroot/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 4.0.3 +WINE_VERSION = 5.12 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/4.0 +WINE_SITE = https://dl.winehq.org/wine/source/5.x WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_DEPENDENCIES = host-bison host-flex host-wine @@ -19,6 +19,7 @@ WINE_CONF_OPTS = \ --disable-win64 \ --without-capi \ --without-coreaudio \ + --without-faudio \ --without-gettext \ --without-gettextpo \ --without-gphoto \ @@ -144,11 +145,18 @@ else WINE_CONF_OPTS += --without-png endif +ifeq ($(BR2_PACKAGE_LIBUSB),y) +WINE_CONF_OPTS += --with-usb +WINE_DEPENDENCIES += libusb +else +WINE_CONF_OPTS += --without-usb +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) -WINE_CONF_OPTS += --with-v4l +WINE_CONF_OPTS += --with-v4l2 WINE_DEPENDENCIES += libv4l else -WINE_CONF_OPTS += --without-v4l +WINE_CONF_OPTS += --without-v4l2 endif ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -357,6 +365,7 @@ HOST_WINE_CONF_OPTS += \ --without-capi \ --without-cms \ --without-coreaudio \ + --without-faudio \ --without-cups \ --without-curses \ --without-dbus \ @@ -384,7 +393,8 @@ HOST_WINE_CONF_OPTS += \ --without-sane \ --without-sdl \ --without-tiff \ - --without-v4l \ + --without-usb \ + --without-v4l2 \ --without-vkd3d \ --without-vulkan \ --without-x \ diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk index 7239da6d8..082d10c53 100644 --- a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -11,5 +11,13 @@ WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 WIREGUARD_LINUX_COMPAT_LICENSE_FILES = COPYING WIREGUARD_LINUX_COMPAT_MODULE_SUBDIRS = src +define WIREGUARD_LINUX_COMPAT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/buildroot/package/wireguard-tools/wireguard-tools.hash b/buildroot/package/wireguard-tools/wireguard-tools.hash index 475a7450a..3bff364e0 100644 --- a/buildroot/package/wireguard-tools/wireguard-tools.hash +++ b/buildroot/package/wireguard-tools/wireguard-tools.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-March/005191.html -sha256 757ed31d4d48d5fd7853bfd9bfa6a3a1b53c24a94fe617439948784a2c0ed987 wireguard-tools-1.0.20200319.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-August/005790.html +sha256 51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd wireguard-tools-1.0.20200827.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard-tools/wireguard-tools.mk b/buildroot/package/wireguard-tools/wireguard-tools.mk index fc2ec876b..d360c8120 100644 --- a/buildroot/package/wireguard-tools/wireguard-tools.mk +++ b/buildroot/package/wireguard-tools/wireguard-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_TOOLS_VERSION = 1.0.20200319 +WIREGUARD_TOOLS_VERSION = 1.0.20200827 WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz WIREGUARD_TOOLS_LICENSE = GPL-2.0 diff --git a/buildroot/package/wireless-regdb/wireless-regdb.hash b/buildroot/package/wireless-regdb/wireless-regdb.hash index d6cb72ee7..9271073fd 100644 --- a/buildroot/package/wireless-regdb/wireless-regdb.hash +++ b/buildroot/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf wireless-regdb-2019.06.03.tar.xz +sha256 89fd031aed5977c219a71501e144375a10e7c90d1005d5d086ea7972886a2c7a wireless-regdb-2020.04.29.tar.xz # Locally computed -sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE +sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/buildroot/package/wireless-regdb/wireless-regdb.mk b/buildroot/package/wireless-regdb/wireless-regdb.mk index 31b62e36e..52a0e0cff 100644 --- a/buildroot/package/wireless-regdb/wireless-regdb.mk +++ b/buildroot/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2019.06.03 +WIRELESS_REGDB_VERSION = 2020.04.29 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC diff --git a/buildroot/package/wireshark/Config.in b/buildroot/package/wireshark/Config.in index e52edb9f6..95fc9b38f 100644 --- a/buildroot/package/wireshark/Config.in +++ b/buildroot/package/wireshark/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -20,12 +21,12 @@ config BR2_PACKAGE_WIRESHARK_GUI bool "Qt5 GUI" default y depends on BR2_INSTALL_LIBSTDCPP # qt5 + depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5 depends on !BR2_arc # qt5 depends on BR2_PACKAGE_HAS_UDEV # qt5 input select BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime select BR2_PACKAGE_QT5BASE_PNG # runtime select BR2_PACKAGE_QT5BASE_WIDGETS @@ -36,10 +37,11 @@ config BR2_PACKAGE_WIRESHARK_GUI help Enable Qt5 GUI -comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8" +comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, host gcc >= 5.0, gcc >= 5.0" depends on !BR2_arc depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 endif # BR2_PACKAGE_WIRESHARK diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index 16866d96b..667d8a371 100644 --- a/buildroot/package/wireshark/wireshark.hash +++ b/buildroot/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.7.txt -sha1 b564c2e729066cb7c952463fef6163e23a5fea1e wireshark-3.2.7.tar.xz -sha256 be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da wireshark-3.2.7.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.0.txt +sha1 6fdf4f394c287f1e21b48c5293ec1a6e6b627996 wireshark-3.4.0.tar.xz +sha256 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae wireshark-3.4.0.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index 354f00825..567c8cc11 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,12 +4,18 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.7 +WIRESHARK_VERSION = 3.4.0 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING -WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \ +WIRESHARK_DEPENDENCIES = \ + c-ares \ + host-pkgconf \ + host-python3 \ + libgcrypt \ + libglib2 \ + libpcap \ speexdsp WIRESHARK_MAKE_ENV = \ @@ -18,6 +24,7 @@ WIRESHARK_MAKE_ENV = \ WIRESHARK_CONF_OPTS = \ -DDISABLE_WERROR=ON \ + -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF @@ -35,6 +42,12 @@ endef WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL +ifeq ($(BR2_GCC_ENABLE_LTO),y) +WIRESHARK_CONF_OPTS += -DENABLE_LTO=ON +else +WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF +endif + ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools @@ -56,13 +69,6 @@ else WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF endif -ifeq ($(BR2_PACKAGE_C_ARES),y) -WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON -WIRESHARK_DEPENDENCIES += c-ares -else -WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON WIRESHARK_DEPENDENCIES += gnutls @@ -127,6 +133,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF endif +ifeq ($(BR2_PACKAGE_OPUS),y) +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=ON +WIRESHARK_DEPENDENCIES += opus +else +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=OFF +endif + ifeq ($(BR2_PACKAGE_SBC),y) WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON WIRESHARK_DEPENDENCIES += sbc @@ -155,6 +168,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON +WIRESHARK_DEPENDENCIES += zstd +else +WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=OFF +endif + # Disable plugins as some of them (like l16mono) can't be built # statically. ENABLE_STATIC=ON actually means "disable shared library" # and ENABLE_STATIC=OFF means "enable shared library". So for the diff --git a/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch deleted file mode 100644 index 2f4f0c1f0..000000000 --- a/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 2 Dec 2015 00:22:26 +0100 -Subject: [PATCH] Adjust for buildroot build. - - - enable CC override - - fix devLib/gpio include path for local build (without installing first) - - change CFLAGS from '=' to '+=' to honour buildroot given flags - - add linker name link for libwiringPiDev and libwiringPi for local linking - (without installing first) - - fix install linker name link (do not link with absolute path) - - add gpio-static linking target - -Signed-off-by: Peter Seiderer - - - Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a - -Signed-off-by: Atanas Palavrov ---- - devLib/Makefile | 9 +++++---- - gpio/Makefile | 14 +++++++++----- - wiringPi/Makefile | 7 ++++--- - 3 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/devLib/Makefile b/devLib/Makefile -index cf665d6..3fb41e8 100644 ---- a/devLib/Makefile -+++ b/devLib/Makefile -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc --INCLUDE = -I. -+CC ?= gcc -+INCLUDE = -I../wiringPi - DEFS = -D_GNU_SOURCE --CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC -+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC - - LIBS = - -@@ -69,6 +69,7 @@ $(STATIC): $(OBJ) - $(DYNAMIC): $(OBJ) - $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) -+ $Q ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so - - .c.o: - $Q echo [Compile] $< -@@ -93,7 +94,7 @@ install: $(DYNAMIC) - $Q echo "[Install Dynamic Lib]" - $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib - $Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) -- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so -+ $Q ln -sf libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so - $Q $(LDCONFIG) - - .PHONY: install-static -diff --git a/gpio/Makefile b/gpio/Makefile -index 9ec160d..360d64c 100644 ---- a/gpio/Makefile -+++ b/gpio/Makefile -@@ -32,11 +32,11 @@ endif - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc --INCLUDE = -I$(DESTDIR)$(PREFIX)/include --CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe -+CC ?= gcc -+INCLUDE = -I../wiringPi -I../devLib -+CFLAGS += $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe - --LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib -+LDFLAGS = -L../wiringPi -L../devLib - LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt - - # May not need to alter anything below this line -@@ -52,9 +52,13 @@ version.h: ../VERSION - $Q echo Need to run newVersion above. - - gpio: $(OBJ) -- $Q echo [Link] -+ $Q echo "[Link (Dynamic)]" - $Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS) - -+gpio-static: $(OBJ) -+ $Q echo "[Link (Static)]" -+ $Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread -+ - .c.o: - $Q echo [Compile] $< - $Q $(CC) -c $(CFLAGS) $< -o $@ -diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index 287fa58..81595d3 100644 ---- a/wiringPi/Makefile -+++ b/wiringPi/Makefile -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc -+CC ?= gcc - INCLUDE = -I. - DEFS = -D_GNU_SOURCE --CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC -+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC - #CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC - - LIBS = -lm -lpthread -lrt -lcrypt -@@ -76,6 +76,7 @@ static: - $(DYNAMIC): $(OBJ) - $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) -+ $Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so - - .c.o: - $Q echo [Compile] $< -@@ -101,7 +102,7 @@ install: $(DYNAMIC) - $Q echo "[Install Dynamic Lib]" - $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib - $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) -- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so -+ $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so - $Q $(LDCONFIG) - - .PHONY: install-deb --- -2.11.0 - diff --git a/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch deleted file mode 100644 index c9c4385d4..000000000 --- a/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 20 Mar 2017 20:51:20 +0100 -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines - -For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h -containing: - - /* These have totally bogus values and nobody uses them - so far. Later on we'd have to use say 0x10000x and - adjust CBAUD constant and drivers accordingly. - #define B2500000 0x00001010 - #define B3000000 0x00001011 - #define B3500000 0x00001012 - #define B4000000 0x00001013 */ - -Signed-off-by: Peter Seiderer ---- - wiringPi/wiringSerial.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/wiringPi/wiringSerial.c b/wiringPi/wiringSerial.c -index e1587ad..4ac8d1e 100644 ---- a/wiringPi/wiringSerial.c -+++ b/wiringPi/wiringSerial.c -@@ -75,10 +75,18 @@ int serialOpen (const char *device, const int baud) - case 1152000: myBaud = B1152000 ; break ; - case 1500000: myBaud = B1500000 ; break ; - case 2000000: myBaud = B2000000 ; break ; -+#if defined(B2500000) - case 2500000: myBaud = B2500000 ; break ; -+#endif -+#if defined(B3000000) - case 3000000: myBaud = B3000000 ; break ; -+#endif -+#if defined(B3500000) - case 3500000: myBaud = B3500000 ; break ; -+#endif -+#if defined(B4000000) - case 4000000: myBaud = B4000000 ; break ; -+#endif - - default: - return -2 ; --- -2.11.0 - diff --git a/buildroot/package/wiringpi/Config.in b/buildroot/package/wiringpi/Config.in deleted file mode 100644 index 92f5dc653..000000000 --- a/buildroot/package/wiringpi/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_WIRINGPI - bool "wiringpi" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - wiringPi libraries (and gpio command) - - http://wiringpi.com/ - -comment "wiringpi needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/wiringpi/wiringpi.hash b/buildroot/package/wiringpi/wiringpi.hash deleted file mode 100644 index 83885e4b6..000000000 --- a/buildroot/package/wiringpi/wiringpi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/buildroot/package/wiringpi/wiringpi.mk b/buildroot/package/wiringpi/wiringpi.mk deleted file mode 100644 index 0c3774917..000000000 --- a/buildroot/package/wiringpi/wiringpi.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# wiringpi -# -################################################################################ - -WIRINGPI_VERSION = 2.46 -WIRINGPI_SITE = git://git.drogon.net/wiringPi - -WIRINGPI_LICENSE = LGPL-3.0+ -WIRINGPI_LICENSE_FILES = COPYING.LESSER -WIRINGPI_INSTALL_STAGING = YES - -define WIRINGPI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi all - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib all - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio all -endef - -define WIRINGPI_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true -endef - -define WIRINGPI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true - $(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio - $(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/wlroots/Config.in b/buildroot/package/wlroots/Config.in new file mode 100644 index 000000000..eb4c4725a --- /dev/null +++ b/buildroot/package/wlroots/Config.in @@ -0,0 +1,43 @@ +comment "wlroots needs udev, mesa3d w/ EGL and GLES support" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ + !BR2_PACKAGE_MESA3D_OPENGL_ES || \ + !BR2_PACKAGE_HAS_UDEV + +comment "wlroots needs a toolchain w/ threads, locale, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE || \ + BR2_STATIC_LIBS + +config BR2_PACKAGE_WLROOTS + bool "wlroots" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland + depends on BR2_ENABLE_LOCALE # libinput + depends on BR2_PACKAGE_HAS_UDEV # libinput + # Technically wlroots should work with any OpenGL implementation + # which provides EGL, GLES2, and libgbm; but in practice only + # Mesa ships an usable libgbm. + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_ES + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + wlroots is a modular Wayland library for building compositors + which implements many of their common features. + + https://github.com/swaywm/wlroots + +if BR2_PACKAGE_WLROOTS + +config BR2_PACKAGE_WLROOTS_X11 + bool "X11 backend" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + help + Support Wayland sessions nested inside a X11 window + +endif diff --git a/buildroot/package/wlroots/wlroots.hash b/buildroot/package/wlroots/wlroots.hash new file mode 100644 index 000000000..636f39101 --- /dev/null +++ b/buildroot/package/wlroots/wlroots.hash @@ -0,0 +1,5 @@ +# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.11.0/wlroots-0.11.0.tar.gz.sig +sha256 a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01 wlroots-0.11.0.tar.gz + +# Hashes for license files: +sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/buildroot/package/wlroots/wlroots.mk b/buildroot/package/wlroots/wlroots.mk new file mode 100644 index 000000000..c1771df41 --- /dev/null +++ b/buildroot/package/wlroots/wlroots.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# wlroots +# +################################################################################ + +WLROOTS_VERSION = 0.11.0 +WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) +WLROOTS_LICENSE = MIT +WLROOTS_LICENSE_FILES = LICENSE +WLROOTS_INSTALL_STAGING = YES + +WLROOTS_DEPENDENCIES = \ + host-pkgconf \ + host-wayland \ + libinput \ + libxkbcommon \ + mesa3d \ + pixman \ + udev \ + wayland \ + wayland-protocols + +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled + +ifeq ($(BR2_PACKAGE_FFMPEG),y) +WLROOTS_DEPENDENCIES += ffmpeg +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +WLROOTS_DEPENDENCIES += libpng +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) +WLROOTS_CONF_OPTS += -Dlogind=enabled -Dlogind-provider=systemd +WLROOTS_DEPENDENCIES += systemd +else +WLROOTS_CONF_OPTS += -Dlogind=disabled +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) +WLROOTS_CONF_OPTS += -Dx11-backend=enabled +WLROOTS_DEPENDENCIES += xlib_libX11 +else +WLROOTS_CONF_OPTS += -Dx11-backend=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBXCB),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb +else +WLROOTS_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XCB_UTIL_WM),y) +WLROOTS_CONF_OPTS += -Dxcb-icccm=enabled +WLROOTS_DEPENDENCIES += xcb-util-wm +else +WLROOTS_CONF_OPTS += -Dxcb-icccm=disabled +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/wpebackend-fdo/Config.in b/buildroot/package/wpebackend-fdo/Config.in index 161e4c9a7..8a8c820c9 100644 --- a/buildroot/package/wpebackend-fdo/Config.in +++ b/buildroot/package/wpebackend-fdo/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WPEBACKEND_FDO depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBWPE select BR2_PACKAGE_WAYLAND diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash index 0b821f344..2f8321833 100644 --- a/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.6.1.tar.xz.sums -md5 ea6c2a13e6c2423f2c2b0b31fcf9567b wpebackend-fdo-1.6.1.tar.xz -sha1 53e38189324d9c0c87f40164d8349a827663aabd wpebackend-fdo-1.6.1.tar.xz -sha256 740eee3327acfb462b8460519a219e30dc0a870326e88e2ddc4fe2c8de20b1c9 wpebackend-fdo-1.6.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.8.0.tar.xz.sums +md5 6df96f80ff34c02d56f32a7a153a62c0 wpebackend-fdo-1.8.0.tar.xz +sha1 48dd8d5d525e0c89b8b7068fe51c439921804240 wpebackend-fdo-1.8.0.tar.xz +sha256 9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253 wpebackend-fdo-1.8.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk index 5bc2d3ed3..dc0c9b674 100644 --- a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,12 +4,12 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.6.1 +WPEBACKEND_FDO_VERSION = 1.8.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES WPEBACKEND_FDO_LICENSE = BSD-2-Clause WPEBACKEND_FDO_LICENSE_FILES = COPYING -WPEBACKEND_FDO_DEPENDENCIES = libglib2 libwpe wayland +WPEBACKEND_FDO_DEPENDENCIES = libepoxy libglib2 libwpe wayland -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/wpewebkit/Config.in b/buildroot/package/wpewebkit/Config.in index f3029976f..640f7c701 100644 --- a/buildroot/package/wpewebkit/Config.in +++ b/buildroot/package/wpewebkit/Config.in @@ -12,12 +12,13 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS @@ -29,6 +30,7 @@ config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash index 1a6fbc8b9..2bd5fd3fb 100644 --- a/buildroot/package/wpewebkit/wpewebkit.hash +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.28.4.tar.xz.sums -md5 6ab041f6ebdb2e053981de5980c864e7 wpewebkit-2.28.4.tar.xz -sha1 b31739a86a269eac4ddd5e537cdf954224672450 wpewebkit-2.28.4.tar.xz -sha256 785d83b99cd45cedb7c4f1f697db773a5a81eb0a42aeeafa3c623053f6fde87a wpewebkit-2.28.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.30.2.tar.xz.sums +md5 5b0fed3333b53dbb36e572935fd54a7b wpewebkit-2.30.2.tar.xz +sha1 a143723fb77c2ea20bad888b95ccc37a7dd5b375 wpewebkit-2.30.2.tar.xz +sha256 c94925ca2d655c7fc07dbc2d4b7a47a822c7699816a8cca35ed9efd676b5ba86 wpewebkit-2.30.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/wpewebkit/wpewebkit.mk b/buildroot/package/wpewebkit/wpewebkit.mk index 646bdd938..6233505ca 100644 --- a/buildroot/package/wpewebkit/wpewebkit.mk +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.28.4 +WPEWEBKIT_VERSION = 2.30.2 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -64,12 +64,17 @@ WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif # JIT is not supported for MIPS r6, but the WebKit build system does not -# have a check for these processors. Disable JIT forcibly here and use -# the CLoop interpreter instead. +# have a check for these processors. The same goes for ARMv5 and ARMv6. +# Disable JIT forcibly here and use the CLoop interpreter instead. # -# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +# Also, we have to disable the sampling profiler, which does NOT work +# with ENABLE_C_LOOP. +# +# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 +# https://bugs.webkit.org/show_bug.cgi?id=172765 +# +ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif $(eval $(cmake-package)) diff --git a/buildroot/package/x11r7/libxcb/Config.in b/buildroot/package/x11r7/libxcb/Config.in index 7439741f0..e15dde3bb 100644 --- a/buildroot/package/x11r7/libxcb/Config.in +++ b/buildroot/package/x11r7/libxcb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBXCB bool "libxcb" - select BR2_PACKAGE_LIBPTHREAD_STUBS select BR2_PACKAGE_XCB_PROTO select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXAU diff --git a/buildroot/package/x11r7/libxcb/libxcb.hash b/buildroot/package/x11r7/libxcb/libxcb.hash index 9158b6bb2..1861ef8a6 100644 --- a/buildroot/package/x11r7/libxcb/libxcb.hash +++ b/buildroot/package/x11r7/libxcb/libxcb.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg/2018-September/059469.html -md5 f33cdfc67346f7217a9326c0d8679975 libxcb-1.13.1.tar.bz2 -sha1 2ab17a1bb2a44e0a9cb0b26bcf899689ba1bbb3b libxcb-1.13.1.tar.bz2 -sha256 a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4 libxcb-1.13.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-February/003039.html +sha256 a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34 libxcb-1.14.tar.xz +sha512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6 libxcb-1.14.tar.xz # Locally computed sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/buildroot/package/x11r7/libxcb/libxcb.mk b/buildroot/package/x11r7/libxcb/libxcb.mk index fdc65cefc..fb691c242 100644 --- a/buildroot/package/x11r7/libxcb/libxcb.mk +++ b/buildroot/package/x11r7/libxcb/libxcb.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXCB_VERSION = 1.13.1 -LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2 +LIBXCB_VERSION = 1.14 +LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.xz LIBXCB_SITE = http://xcb.freedesktop.org/dist LIBXCB_LICENSE = MIT LIBXCB_LICENSE_FILES = COPYING @@ -13,10 +13,10 @@ LIBXCB_LICENSE_FILES = COPYING LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ - host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ + host-libxslt xcb-proto xlib_libXdmcp xlib_libXau \ host-xcb-proto host-python host-pkgconf HOST_LIBXCB_DEPENDENCIES = \ - host-libxslt host-libpthread-stubs host-xcb-proto host-xlib_libXdmcp \ + host-libxslt host-xcb-proto host-xlib_libXdmcp \ host-xlib_libXau host-python host-pkgconf LIBXCB_CONF_OPTS = --with-doxygen=no diff --git a/buildroot/package/x11r7/xapp_twm/xapp_twm.hash b/buildroot/package/x11r7/xapp_twm/xapp_twm.hash index 572ecb982..26661f1fb 100644 --- a/buildroot/package/x11r7/xapp_twm/xapp_twm.hash +++ b/buildroot/package/x11r7/xapp_twm/xapp_twm.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002857.html -md5 e322c08eeb635f924ede5b8eba3db54e twm-1.0.10.tar.bz2 -sha1 f632a47620dfe6d75b003839d269b14fa22b262e twm-1.0.10.tar.bz2 -sha256 6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7 twm-1.0.10.tar.bz2 -sha512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e twm-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-June/003047.html +sha256 f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7 twm-1.0.11.tar.xz +sha512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d twm-1.0.11.tar.xz # Locally computed -sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING +sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING diff --git a/buildroot/package/x11r7/xapp_twm/xapp_twm.mk b/buildroot/package/x11r7/xapp_twm/xapp_twm.mk index 0af30f737..46d4ca331 100644 --- a/buildroot/package/x11r7/xapp_twm/xapp_twm.mk +++ b/buildroot/package/x11r7/xapp_twm/xapp_twm.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_TWM_VERSION = 1.0.10 -XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2 +XAPP_TWM_VERSION = 1.0.11 +XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.xz XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_TWM_LICENSE = MIT XAPP_TWM_LICENSE_FILES = COPYING diff --git a/buildroot/package/x11r7/xapp_xev/xapp_xev.hash b/buildroot/package/x11r7/xapp_xev/xapp_xev.hash index 160e09e4f..8b9a006c4 100644 --- a/buildroot/package/x11r7/xapp_xev/xapp_xev.hash +++ b/buildroot/package/x11r7/xapp_xev/xapp_xev.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002948.html -md5 eec82a5d4b599736f0fa637e96136746 xev-1.2.3.tar.bz2 -sha1 3a294934b9e150abc3cccc4182a40ed9b5ea9871 xev-1.2.3.tar.bz2 -sha256 66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09 xev-1.2.3.tar.bz2 -sha512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-July/003048.html +sha256 d700e08bfe751ed2dbf802baa204b056d0e49348b6eb3c6f9cb035d8ae4885e2 xev-1.2.4.tar.bz2 +sha512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca xev-1.2.4.tar.bz2 # Locally computed -sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/buildroot/package/x11r7/xapp_xev/xapp_xev.mk b/buildroot/package/x11r7/xapp_xev/xapp_xev.mk index 137a6f205..7d5f3cbb8 100644 --- a/buildroot/package/x11r7/xapp_xev/xapp_xev.mk +++ b/buildroot/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XEV_VERSION = 1.2.3 +XAPP_XEV_VERSION = 1.2.4 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEV_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index 86fd033e3..98bd0c43a 100644 --- a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-June/002901.html -md5 12610df19df2af3797f2c130ee2bce97 xkbcomp-1.4.2.tar.bz2 -sha1 9a39cf7a562c152465e04fc7cf1002c59f883870 xkbcomp-1.4.2.tar.bz2 -sha256 6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424 xkbcomp-1.4.2.tar.bz2 -sha512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e xkbcomp-1.4.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-February/003037.html +sha256 06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435 xkbcomp-1.4.3.tar.bz2 +sha512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d xkbcomp-1.4.3.tar.bz2 # Locally computed sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3 COPYING diff --git a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index 9fcd8c058..e97f8fdd8 100644 --- a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.2 +XAPP_XKBCOMP_VERSION = 1.4.3 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xcb-proto/xcb-proto.hash b/buildroot/package/x11r7/xcb-proto/xcb-proto.hash index b2ef3ee20..c6d2d8e34 100644 --- a/buildroot/package/x11r7/xcb-proto/xcb-proto.hash +++ b/buildroot/package/x11r7/xcb-proto/xcb-proto.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002852.html -md5 abe9aa4886138150bbc04ae4f29b90e3 xcb-proto-1.13.tar.bz2 -sha1 f7fa35ab59af18cecadbe83fe705281dcfd82ffd xcb-proto-1.13.tar.bz2 -sha256 7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1 xcb-proto-1.13.tar.bz2 -sha512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 xcb-proto-1.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-February/003038.html +sha256 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605 xcb-proto-1.14.tar.xz +sha512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 xcb-proto-1.14.tar.xz # Locally computed sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/buildroot/package/x11r7/xcb-proto/xcb-proto.mk b/buildroot/package/x11r7/xcb-proto/xcb-proto.mk index b85dad7f2..f7a3ad55b 100644 --- a/buildroot/package/x11r7/xcb-proto/xcb-proto.mk +++ b/buildroot/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,8 +4,8 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.13 -XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2 +XCB_PROTO_VERSION = 1.14 +XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.xz XCB_PROTO_SITE = http://xcb.freedesktop.org/dist XCB_PROTO_LICENSE = MIT XCB_PROTO_LICENSE_FILES = COPYING @@ -15,15 +15,5 @@ XCB_PROTO_INSTALL_STAGING = YES XCB_PROTO_DEPENDENCIES = host-python HOST_XCB_PROTO_DEPENDENCIES = host-python -# xcbincludedir/pythondir is used by E.G. libxcb at build time to find the -# xml / python files, so ensure these expand to their full (host) paths -define XCB_PROTO_FIXUP_PC_FILE - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \ - -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \ - $(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc -endef - -XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index c33893efe..51f0ce785 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003017.html -md5 d600e8e2e30747b8ce49ec5294ff0ab6 xf86-input-libinput-0.29.0.tar.bz2 -sha1 efa9dbe08ee827949aff0bd752f8270237247c56 xf86-input-libinput-0.29.0.tar.bz2 -sha256 c28b56a21754b972db31798e6a4cf4dc9d69208d08f8fe41701a94def5e94bee xf86-input-libinput-0.29.0.tar.bz2 -sha512 f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b xf86-input-libinput-0.29.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-May/003045.html +md5 11dcfa2cc39f790731a9545fcdeea717 xf86-input-libinput-0.30.0.tar.bz2 +sha1 b705d0280b4fa7ccf44b9ff3869f5d7846e26414 xf86-input-libinput-0.30.0.tar.bz2 +sha256 f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0 xf86-input-libinput-0.30.0.tar.bz2 +sha512 823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380 xf86-input-libinput-0.30.0.tar.bz2 # Locally computed -sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING +sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 220850055..64d972cf3 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.29.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.30.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/buildroot/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch new file mode 100644 index 000000000..b7a66c5c2 --- /dev/null +++ b/buildroot/package/x11r7/xdriver_xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch @@ -0,0 +1,35 @@ +From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 4 Feb 2020 16:38:06 -0500 +Subject: [PATCH xf86-video-ati] Fix link failure with gcc 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the 'extern' this looks like a definition not just a +declaration, in every file that includes the header. gcc 10 is stricter +about this kind of multiple definition. + +Reviewed-by: Michel Dänzer +[backport from upstream: f223035f4ffcff2a9296d1e907a5193f8e8845a3] +Signed-off-by: Romain Naour +--- + src/drmmode_display.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/drmmode_display.h b/src/drmmode_display.h +index 96eaef0a..8cd8a0a6 100644 +--- a/src/drmmode_display.h ++++ b/src/drmmode_display.h +@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, + uint64_t *ust, uint32_t *result_seq); + + +-miPointerSpriteFuncRec drmmode_sprite_funcs; ++extern miPointerSpriteFuncRec drmmode_sprite_funcs; + + + #endif +-- +2.25.4 + diff --git a/buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch b/buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch deleted file mode 100644 index 18e4a60da..000000000 --- a/buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 24 Jan 2017 09:53:06 -0500 -Subject: Remove call to LoaderGetOS - -On OSes that don't have a /dev/videox we'll just fail the open() and not -initialize the Xv adaptor. - -Signed-off-by: Adam Jackson - -Downloaded from upstream commit -https://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=09aaa3d1fae4aeb099b16e7a046151761bcdea95 - -Signed-off-by: Bernd Kuhls ---- - src/z4l.c | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/src/z4l.c b/src/z4l.c -index eccefe8..be0d345 100644 ---- a/src/z4l.c -+++ b/src/z4l.c -@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL }; - static pointer - z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - { -- const char *osname; - static Bool setupDone = FALSE; - - if (setupDone != FALSE) { -@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - } - - setupDone = TRUE; -- LoaderGetOS(&osname, NULL, NULL, NULL); -- -- if (osname == NULL || strcmp(osname, "linux") != 0) { -- if (errmaj) -- *errmaj = LDR_BADOS; -- if (errmin) -- *errmin = 0; -- -- return NULL; -- } -- - xf86AddDriver(&Z4l, module, 0); -- - return (pointer) 1; - } - --- -cgit v1.1 - diff --git a/buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch b/buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch deleted file mode 100644 index 37e4a25e7..000000000 --- a/buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 5 Mar 2018 10:28:15 -0500 -Subject: gx: Fix RANDR initialization for xserver 1.20 - -xf86DisableRandR() doesn't exist anymore, and we don't need it anyway, -the core code will notice that we set up RANDR ourselves. - -Signed-off-by: Adam Jackson - -Downloaded from upstream commit -https://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 - -Signed-off-by: Bernd Kuhls ---- - src/gx_driver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gx_driver.c b/src/gx_driver.c -index ab57df1..4de336e 100644 ---- a/src/gx_driver.c -+++ b/src/gx_driver.c -@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) - - /* Set up RandR */ - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 - xf86DisableRandR(); /* We provide our own RandR goodness */ -+#endif - - /* Try to set up the shadow FB for rotation */ - --- -cgit v1.1 - diff --git a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 07e4abf80..7a66c28b5 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,4 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002750.html -sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 # Locally calculated +sha256 f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 xf86-video-geode-2.11.20.tar.bz2 sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index 54616f65f..dbeae1aa6 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.19 +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.20 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index ff816c7bb..321ae5b60 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b074366aad25cae38bb455792ac3110d52bcb0e4a183766c37ee12cbe56d7f8c xdriver_xf86-video-intel-f66d39544bb8339130c96d282a80f87ca1606caf.tar.gz -sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING +sha256 029afa61e785f6e0fb18d2c2f1619e97af8b6f19c7fa0ba9923eea03ccf78626 xdriver_xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.gz +sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index fb74eb6ad..ac598cf0f 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = f66d39544bb8339130c96d282a80f87ca1606caf +XDRIVER_XF86_VIDEO_INTEL_VERSION = 5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING diff --git a/buildroot/package/x11r7/xkeyboard-config/Config.in b/buildroot/package/x11r7/xkeyboard-config/Config.in index c94174242..17cfe738d 100644 --- a/buildroot/package/x11r7/xkeyboard-config/Config.in +++ b/buildroot/package/x11r7/xkeyboard-config/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG help keyboard configuration database for X - http://xlibs.freedesktop.org/xkbdesc + https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash index ae94bb490..4da866f7b 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce xkeyboard-config-2.28.tar.bz2 -sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING +sha256 095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4 xkeyboard-config-2.30.tar.bz2 +sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk index d8e243423..9cf1a5787 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,16 +4,20 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.28 +XKEYBOARD_CONFIG_VERSION = 2.30 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 -XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config +XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT XKEYBOARD_CONFIG_LICENSE_FILES = COPYING +XKEYBOARD_CONFIG_DEPENDENCIES = \ + $(BR2_PYTHON3_HOST_DEPENDENCY) \ + host-gettext \ + host-xapp_xkbcomp + # xkeyboard-config.pc XKEYBOARD_CONFIG_INSTALL_STAGING = YES XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps -XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-xapp_xkbcomp $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xorgproto/xorgproto.hash b/buildroot/package/x11r7/xorgproto/xorgproto.hash index 17613db00..fda42ac8f 100644 --- a/buildroot/package/x11r7/xorgproto/xorgproto.hash +++ b/buildroot/package/x11r7/xorgproto/xorgproto.hash @@ -1,8 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003029.html -md5 a02dcaff48b4141b949ac99dfc344d86 xorgproto-2019.2.tar.bz2 -sha1 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5 xorgproto-2019.2.tar.bz2 -sha256 46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e xorgproto-2019.2.tar.bz2 -sha512 cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904 xorgproto-2019.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-April/003042.html +md5 c29f4fa78f53b52b3efdc71ebd9506b6 xorgproto-2020.1.tar.bz2 +sha1 1cdab4e9ab796760ddb9582071328469a8eca08a xorgproto-2020.1.tar.bz2 +sha256 54a153f139035a376c075845dd058049177212da94d7a9707cf9468367b699d2 xorgproto-2020.1.tar.bz2 +sha512 2d10533e54987f293e1c8578aa742c38cf2fac8551db1d317cf5ee4a6a9600eced50f59c57c38b35dd210fe02d350294c967512f04cb9876d6c0c1f7e89cb199 xorgproto-2020.1.tar.bz2 # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto diff --git a/buildroot/package/x11r7/xorgproto/xorgproto.mk b/buildroot/package/x11r7/xorgproto/xorgproto.mk index 979286b3c..1c9f320e5 100644 --- a/buildroot/package/x11r7/xorgproto/xorgproto.mk +++ b/buildroot/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2019.2 +XORGPROTO_VERSION = 2020.1 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch rename to buildroot/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch b/buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch rename to buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch b/buildroot/package/x11r7/xserver_xorg-server/0003-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch rename to buildroot/package/x11r7/xserver_xorg-server/0003-include-misc.h-fix-uClibc-build.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/buildroot/package/x11r7/xserver_xorg-server/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch rename to buildroot/package/x11r7/xserver_xorg-server/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch deleted file mode 100644 index ad544aa30..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 -From: Egbert Eich -Date: Tue, 3 Mar 2015 16:27:05 +0100 -Subject: symbols: Fix sdksyms.sh to cope with gcc5 - -Gcc5 adds additional lines stating line numbers before and -after __attribute__() which need to be skipped. - -Downloaded from upstream commit -https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6 - -Signed-off-by: Bernd Kuhls -Signed-off-by: Egbert Eich -Tested-by: Daniel Stone -Signed-off-by: Peter Hutterer - -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 2305073..05ac410 100755 ---- a/hw/xfree86/sdksyms.sh -+++ b/hw/xfree86/sdksyms.sh -@@ -350,13 +350,25 @@ BEGIN { - if (sdk) { - n = 3; - -+ # skip line numbers GCC 5 adds before __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ - # skip attribute, if any - while ($n ~ /^(__attribute__|__global)/ || - # skip modifiers, if any - $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || - # skip pointer -- $n ~ /^[a-zA-Z0-9_]*\*$/) -+ $n ~ /^[a-zA-Z0-9_]*\*$/) { - n++; -+ # skip line numbers GCC 5 adds after __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ } - - # type specifier may not be set, as in - # extern _X_EXPORT unsigned name(...) --- -cgit v0.10.2 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch deleted file mode 100644 index c15dc9f50..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:39 +0300 -Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. - -Make sure that the xEvent eventT is initialized with zeros, the same way as -in SProcSendEvent. - -Some event swapping functions do not overwrite all 32 bytes of xEvent -structure, for example XSecurityAuthorizationRevoked. Two cooperating -clients, one swapped and the other not, can send -XSecurityAuthorizationRevoked event to each other to retrieve old stack data -from X server. This can be potentialy misused to go around ASLR or -stack-protector. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 11d82029f..1cf118ab6 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) - { - CARD32 *p; - int i; -- xEvent eventT; -+ xEvent eventT = { .u.u.type = 0 }; - xEvent *eventP; - EventSwapPtr proc; - --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch deleted file mode 100644 index 12da5f5cb..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:40 +0300 -Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. - -The SendEvent request holds xEvent which is exactly 32 bytes long, no more, -no less. Both ProcSendEvent and SProcSendEvent verify that the received data -exactly match the request size. However nothing stops the client from passing -in event with xEvent::type = GenericEvent and any value of -xGenericEvent::length. - -In the case of ProcSendEvent, the event will be eventually passed to -WriteEventsToClient which will see that it is Generic event and copy the -arbitrary length from the receive buffer (and possibly past it) and send it to -the other client. This allows clients to copy unitialized heap memory out of X -server or to crash it. - -In case of SProcSendEvent, it will attempt to swap the incoming event by -calling a swapping function from the EventSwapVector array. The swapped event -is written to target buffer, which in this case is local xEvent variable. The -xEvent variable is 32 bytes long, but the swapping functions for GenericEvents -expect that the target buffer has size matching the size of the source -GenericEvent. This allows clients to cause stack buffer overflows. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - dix/events.c | 6 ++++++ - dix/swapreq.c | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/dix/events.c b/dix/events.c -index 3e3a01ef9..d3a33ea3f 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->event.u.u.type; - return BadValue; - } -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } - if (stuff->event.u.u.type == ClientMessage && - stuff->event.u.u.detail != 8 && - stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { -diff --git a/dix/swapreq.c b/dix/swapreq.c -index 719e9b81c..67850593b 100644 ---- a/dix/swapreq.c -+++ b/dix/swapreq.c -@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) - swapl(&stuff->destination); - swapl(&stuff->eventMask); - -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } -+ - /* Swap event */ - proc = EventSwapVector[stuff->event.u.u.type & 0177]; - if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch deleted file mode 100644 index 2e651006b..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:41 +0300 -Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. - -The requirement is that events have type in range -EXTENSION_EVENT_BASE..lastEvent, but it was tested -only for first event of all. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 1cf118ab6..5e63bfcca 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) - int - ProcXSendExtensionEvent(ClientPtr client) - { -- int ret; -+ int ret, i; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; -@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) - /* The client's event type must be one defined by an extension. */ - - first = ((xEvent *) &stuff[1]); -- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && -- (first->u.u.type < lastEvent))) { -- client->errorValue = first->u.u.type; -- return BadValue; -+ for (i = 0; i < stuff->num_events; i++) { -+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && -+ (first[i].u.u.type < lastEvent))) { -+ client->errorValue = first[i].u.u.type; -+ return BadValue; -+ } - } - - list = (XEventClass *) (first + stuff->num_events); --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch deleted file mode 100644 index 871e7621e..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:42 +0300 -Subject: [PATCH] Xi: Do not try to swap GenericEvent. - -The SProcXSendExtensionEvent must not attempt to swap GenericEvent because -it is assuming that the event has fixed size and gives the swapping function -xEvent-sized buffer. - -A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 5e63bfcca..5c2e0fc56 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) - - eventP = (xEvent *) &stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { -+ if (eventP->u.u.type == GenericEvent) { -+ client->errorValue = eventP->u.u.type; -+ return BadValue; -+ } -+ - proc = EventSwapVector[eventP->u.u.type & 0177]; -- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ -+ /* no swapping proc; invalid event type? */ -+ if (proc == NotImplemented) { -+ client->errorValue = eventP->u.u.type; - return BadValue; -+ } - (*proc) (eventP, &eventT); - *eventP = eventT; - } --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch deleted file mode 100644 index 4ef95efc3..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Kernel modesettings support also depends on dri2, see -http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46 - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584 - -Signed-off-by: Bernd Kuhls - -diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac ---- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200 -+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200 -@@ -2036,7 +2036,7 @@ - XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS" - fi - -- if test "x$DRM" = xyes; then -+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. - PKG_CHECK_EXISTS(libdrm >= 2.4.46) - XORG_DRIVER_MODESETTING=yes diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch deleted file mode 100644 index c15dc9f50..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:39 +0300 -Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. - -Make sure that the xEvent eventT is initialized with zeros, the same way as -in SProcSendEvent. - -Some event swapping functions do not overwrite all 32 bytes of xEvent -structure, for example XSecurityAuthorizationRevoked. Two cooperating -clients, one swapped and the other not, can send -XSecurityAuthorizationRevoked event to each other to retrieve old stack data -from X server. This can be potentialy misused to go around ASLR or -stack-protector. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 11d82029f..1cf118ab6 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) - { - CARD32 *p; - int i; -- xEvent eventT; -+ xEvent eventT = { .u.u.type = 0 }; - xEvent *eventP; - EventSwapPtr proc; - --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch deleted file mode 100644 index 12da5f5cb..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:40 +0300 -Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. - -The SendEvent request holds xEvent which is exactly 32 bytes long, no more, -no less. Both ProcSendEvent and SProcSendEvent verify that the received data -exactly match the request size. However nothing stops the client from passing -in event with xEvent::type = GenericEvent and any value of -xGenericEvent::length. - -In the case of ProcSendEvent, the event will be eventually passed to -WriteEventsToClient which will see that it is Generic event and copy the -arbitrary length from the receive buffer (and possibly past it) and send it to -the other client. This allows clients to copy unitialized heap memory out of X -server or to crash it. - -In case of SProcSendEvent, it will attempt to swap the incoming event by -calling a swapping function from the EventSwapVector array. The swapped event -is written to target buffer, which in this case is local xEvent variable. The -xEvent variable is 32 bytes long, but the swapping functions for GenericEvents -expect that the target buffer has size matching the size of the source -GenericEvent. This allows clients to cause stack buffer overflows. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - dix/events.c | 6 ++++++ - dix/swapreq.c | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/dix/events.c b/dix/events.c -index 3e3a01ef9..d3a33ea3f 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->event.u.u.type; - return BadValue; - } -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } - if (stuff->event.u.u.type == ClientMessage && - stuff->event.u.u.detail != 8 && - stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { -diff --git a/dix/swapreq.c b/dix/swapreq.c -index 719e9b81c..67850593b 100644 ---- a/dix/swapreq.c -+++ b/dix/swapreq.c -@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) - swapl(&stuff->destination); - swapl(&stuff->eventMask); - -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } -+ - /* Swap event */ - proc = EventSwapVector[stuff->event.u.u.type & 0177]; - if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch deleted file mode 100644 index 2e651006b..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:41 +0300 -Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. - -The requirement is that events have type in range -EXTENSION_EVENT_BASE..lastEvent, but it was tested -only for first event of all. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 1cf118ab6..5e63bfcca 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) - int - ProcXSendExtensionEvent(ClientPtr client) - { -- int ret; -+ int ret, i; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; -@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) - /* The client's event type must be one defined by an extension. */ - - first = ((xEvent *) &stuff[1]); -- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && -- (first->u.u.type < lastEvent))) { -- client->errorValue = first->u.u.type; -- return BadValue; -+ for (i = 0; i < stuff->num_events; i++) { -+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && -+ (first[i].u.u.type < lastEvent))) { -+ client->errorValue = first[i].u.u.type; -+ return BadValue; -+ } - } - - list = (XEventClass *) (first + stuff->num_events); --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch deleted file mode 100644 index 871e7621e..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:42 +0300 -Subject: [PATCH] Xi: Do not try to swap GenericEvent. - -The SProcXSendExtensionEvent must not attempt to swap GenericEvent because -it is assuming that the event has fixed size and gives the swapping function -xEvent-sized buffer. - -A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 5e63bfcca..5c2e0fc56 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) - - eventP = (xEvent *) &stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { -+ if (eventP->u.u.type == GenericEvent) { -+ client->errorValue = eventP->u.u.type; -+ return BadValue; -+ } -+ - proc = EventSwapVector[eventP->u.u.type & 0177]; -- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ -+ /* no swapping proc; invalid event type? */ -+ if (proc == NotImplemented) { -+ client->errorValue = eventP->u.u.type; - return BadValue; -+ } - (*proc) (eventP, &eventT); - *eventP = eventT; - } --- -2.11.0 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/Config.in b/buildroot/package/x11r7/xserver_xorg-server/Config.in index 87f1b37da..3bf5af89b 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/Config.in +++ b/buildroot/package/x11r7/xserver_xorg-server/Config.in @@ -22,6 +22,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA @@ -42,47 +43,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER if BR2_PACKAGE_XSERVER_XORG_SERVER -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI - int - default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - default 24 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - -choice - bool "X Window System server version" - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - bool "1.20.9" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 - select BR2_PACKAGE_XLIB_LIBXFONT2 - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - bool "1.17.4" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - select BR2_PACKAGE_XLIB_LIBXFONT - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - bool "1.14.7" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - select BR2_PACKAGE_XLIB_LIBXFONT - -endchoice - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION - string - default "1.20.9" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - choice prompt "X Window System server type" help @@ -114,13 +74,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE endchoice -config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX - bool "Enable AIGLX Extension" - # AIGLX Extension removed in 1.19.0 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 || BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - help - Enable/Use AIGLX extension. - if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV diff --git a/buildroot/package/x11r7/xserver_xorg-server/xorg.service b/buildroot/package/x11r7/xserver_xorg-server/xorg.service new file mode 100644 index 000000000..553d8b256 --- /dev/null +++ b/buildroot/package/x11r7/xserver_xorg-server/xorg.service @@ -0,0 +1,11 @@ +[Unit] +Description=Xorg server +After=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/Xorg :0.0 vt01 -s 0 -noreset -allowMouseOpenFail +Restart=always + +[Install] +WantedBy=graphical.target diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 930900c5e..2b55449e1 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,8 +1,3 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002440.html -sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2 -sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html -sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2020-August/003059.html sha256 e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 xorg-server-1.20.9.tar.bz2 sha512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 8ccc04224..de9746774 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION)) +XSERVER_XORG_SERVER_VERSION = 1.20.9 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT @@ -20,6 +20,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xlib_libXdmcp \ xlib_libXext \ xlib_libXfixes \ + xlib_libXfont2 \ xlib_libXi \ xlib_libXrender \ xlib_libXres \ @@ -127,12 +128,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx -endif - # Optional packages ifeq ($(BR2_PACKAGE_TSLIB),y) XSERVER_XORG_SERVER_DEPENDENCIES += tslib @@ -166,14 +161,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont -endif - ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc endif @@ -224,6 +211,11 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \ + $(TARGET_DIR)/usr/lib/systemd/system/xorg.service +endef + define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg diff --git a/buildroot/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/buildroot/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 000000000..87dc3c994 --- /dev/null +++ b/buildroot/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,109 @@ +From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 11:43:32 -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 + +[Retrieved from: +https://github.com/LibVNC/x11vnc/commit/daecf59cc8b294265666482a4766aaa3148c308b] +Signed-off-by: Fabrice Fontaine +--- + src/uinput.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +diff --git a/src/uinput.c b/src/uinput.c +index 28fbad3..d71bcde 100644 +--- a/src/uinput.c ++++ b/src/uinput.c +@@ -54,6 +54,11 @@ so, delete this exception statement from your version. + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #if !defined(EV_SYN) || !defined(SYN_REPORT) + #undef UINPUT_OK + #endif +@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) { + static void ptr_move(int dx, int dy) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_rel_fd < 0 ? fd : direct_rel_fd; + + if (injectable && strchr(injectable, 'M') == NULL) { +@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) { + + if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_REL; + ev.code = REL_Y; + ev.value = dy; +@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) { + static void ptr_abs(int x, int y, int p) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int x0, y0; + int d = direct_abs_fd < 0 ? fd : direct_abs_fd; + +@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) { + + if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_ABS; + ev.code = ABS_Y; + ev.value = y; +@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;} + static void button_click(int down, int btn) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_btn_fd < 0 ? fd : direct_btn_fd; + + if (injectable && strchr(injectable, 'B') == NULL) { +@@ -959,7 +971,9 @@ static void button_click(int down, int btn) { + if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.value = down; + +@@ -1230,6 +1244,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) { + void uinput_key_command(int down, int keysym, rfbClientPtr client) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int scancode; + allowed_input_t input; + int d = direct_key_fd < 0 ? fd : direct_key_fd; +@@ -1253,7 +1268,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) { + if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.code = (unsigned char) scancode; + ev.value = down; diff --git a/buildroot/package/x264/x264.hash b/buildroot/package/x264/x264.hash index 0cbdc03a9..93242a46c 100644 --- a/buildroot/package/x264/x264.hash +++ b/buildroot/package/x264/x264.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88bbb8f7453497be4ee85cbc6f7d27c02822c4a3744b5ae6042c9c0159ad0747 x264-snapshot-20190623-2245.tar.bz2 +sha256 0bb67d095513391e637b3b47e8efc3ba4603c3844f1b4c2690f4d36da7763055 x264-snapshot-20191217-2245.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/x264/x264.mk b/buildroot/package/x264/x264.mk index f3654d46b..9d217d191 100644 --- a/buildroot/package/x264/x264.mk +++ b/buildroot/package/x264/x264.mk @@ -4,7 +4,7 @@ # ################################################################################ -X264_VERSION = 20190623-2245 +X264_VERSION = 20191217-2245 X264_SITE = http://download.videolan.org/x264/snapshots X264_SOURCE = x264-snapshot-$(X264_VERSION).tar.bz2 X264_LICENSE = GPL-2.0+ diff --git a/buildroot/package/x265/x265.hash b/buildroot/package/x265/x265.hash index 4e9524d13..3d70ac0c6 100644 --- a/buildroot/package/x265/x265.hash +++ b/buildroot/package/x265/x265.hash @@ -1,5 +1,5 @@ -# From https://mailman.videolan.org/pipermail/x265-devel/2019-October/012721.html -md5 94808045a34d88a857e5eaf3f68f4bca x265_3.2.1.tar.gz +# From https://mailman.videolan.org/pipermail/x265-devel/2020-February/012880.html +md5 0c8c747b59b5411dea8cf557554636c1 x265_3.3.tar.gz # Locally generated -sha256 fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc x265_3.2.1.tar.gz -sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING +sha256 f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_3.3.tar.gz +sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/buildroot/package/x265/x265.mk b/buildroot/package/x265/x265.mk index 5082d0ca2..ae9e0acb6 100644 --- a/buildroot/package/x265/x265.mk +++ b/buildroot/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 3.2.1 +X265_VERSION = 3.3 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ diff --git a/buildroot/package/xapian/xapian.hash b/buildroot/package/xapian/xapian.hash index e4f8dfa23..3ebaea705 100644 --- a/buildroot/package/xapian/xapian.hash +++ b/buildroot/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2019-November/009774.html -sha256 975a7ac018c9d34a15cc94a3ecc883204403469f748907e5c4c64d0aec2e4949 xapian-core-1.4.14.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2020-June/009813.html +sha256 4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70 xapian-core-1.4.16.tar.xz # locally computed -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/xapian/xapian.mk b/buildroot/package/xapian/xapian.mk index 57aba5e03..19d301e98 100644 --- a/buildroot/package/xapian/xapian.mk +++ b/buildroot/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.14 +XAPIAN_VERSION = 1.4.16 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ diff --git a/buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch b/buildroot/package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch similarity index 100% rename from buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch rename to buildroot/package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch diff --git a/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch deleted file mode 100644 index fb316739b..000000000 --- a/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 29 Oct 2016 16:35:26 +0200 -Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment - -When CFLAGS are passed from the environment, the first-level make -invocation will append -D__OBJECT_FILE__ to it, then call a second -make invocation, that will have those new CFLAGS in its environment, -but will also append -D__OBJECT_FILE__ to those. - -Then, the compiler fails because __OBEJECT_FILE__ is defined twice. - -Just undefine it before defining it again, as a *workaround* to this -issue. - -Signed-off-by: "Yann E. MORIN" ---- - xen/Rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/Rules.mk b/xen/Rules.mk -index 3090ea7828..d535bf9e2f 100644 ---- a/xen/Rules.mk -+++ b/xen/Rules.mk -@@ -61,7 +61,7 @@ CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - $(call cc-option-add,CFLAGS,CC,-Wvla) - CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h - CFLAGS-$(CONFIG_DEBUG_INFO) += -g --CFLAGS += '-D__OBJECT_FILE__="$@"' -+CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' - - ifneq ($(clang),y) - # Clang doesn't understand this command line argument, and doesn't appear to --- -2.22.0 - diff --git a/buildroot/package/xen/xen.hash b/buildroot/package/xen/xen.hash index 0dd2f571a..709eeb3d4 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01 xen-4.13.1.tar.gz -sha256 1d057695d5b74ce2857204103e943caeaf773bc4fb9d91ea78016e01a9147ed7 xsa327.patch -sha256 36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3 COPYING +sha256 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 xen-4.14.0.tar.gz +sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index ee5e9847f..a30e80e5e 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,10 +4,8 @@ # ################################################################################ -XEN_VERSION = 4.13.1 +XEN_VERSION = 4.14.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) -XEN_PATCH = \ - https://xenbits.xenproject.org/xsa/xsa327.patch XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING XEN_DEPENDENCIES = host-acpica host-python3 diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in index 0cb0b343d..452b45203 100644 --- a/buildroot/package/xenomai/Config.in +++ b/buildroot/package/xenomai/Config.in @@ -41,17 +41,41 @@ config BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI -config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" +choice + bool "Xenomai version" help - Manually select Xenomai version. If left empty, the default - version will be used. - Make sure that the selected version has a patch for your - selected Linux kernel. If it does not, download and select - a patch manually with - BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux - Kernel -> Linux Kernel Extensions menu. + selected Linux kernel. If it does not, download and select a + patch manually with BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, + in the Linux Kernel -> Linux Kernel Extensions menu. + +config BR2_PACKAGE_XENOMAI_LATEST_VERSION + bool "Latest version (3.0.10)" + +config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION + bool "Custom version" + +config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_PACKAGE_XENOMAI_CUSTOM_GIT + bool "Custom Git repository" + +endchoice + +config BR2_PACKAGE_XENOMAI_REPOSITORY + string "URL of custom repository" + default "https://gitlab.denx.de/Xenomai/xenomai.git" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT + +config BR2_PACKAGE_XENOMAI_VERSION + string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION + default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION + depends on !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + +config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL + string "URL of custom tarball" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL choice prompt "Xenomai core" diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk index 5f389ac85..11c69000d 100644 --- a/buildroot/package/xenomai/xenomai.mk +++ b/buildroot/package/xenomai/xenomai.mk @@ -5,14 +5,23 @@ ################################################################################ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) -ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.10 +ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL),y) +XENOMAI_TARBALL = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL)) +XENOMAI_SOURCE = $(notdir $(XENOMAI_TARBALL)) +XENOMAI_SITE = $(patsubst %/,%,$(dir $(XENOMAI_TARBALL))) +else ifeq ($(BR2_PACKAGE_XENOMAI_CUSTOM_GIT),y) +XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY)) +XENOMAI_SITE_METHOD = git else +XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 +XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable +endif + +# Exclude all from the hash check, but the latest version. +ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif -XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable -XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver) # GFDL is not included but refers to gnu.org XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \ diff --git a/buildroot/package/xerces/Config.in b/buildroot/package/xerces/Config.in index 2edc4346b..828b5dd2a 100644 --- a/buildroot/package/xerces/Config.in +++ b/buildroot/package/xerces/Config.in @@ -1,10 +1,21 @@ config BR2_PACKAGE_XERCES bool "xerces-c++" - depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR help Xerces-C++ is a validating XML parser written in portable C++. http://xerces.apache.org/xerces-c/ +if BR2_PACKAGE_XERCES + +config BR2_PACKAGE_XERCES_ENABLE_NETWORK + bool "Enable network support" + default y + help + Enable network support in xerces + +endif + comment "xerces-c++ needs a toolchain w/ C++, wchar" depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/buildroot/package/xerces/xerces.mk b/buildroot/package/xerces/xerces.mk index c75a8b0d3..ae42b1e62 100644 --- a/buildroot/package/xerces/xerces.mk +++ b/buildroot/package/xerces/xerces.mk @@ -31,12 +31,16 @@ XERCES_CONF_ENV += LIBS=-liconv XERCES_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_XERCES_ENABLE_NETWORK),y) ifeq ($(BR2_PACKAGE_LIBCURL),y) XERCES_CONF_OPTS += -Dnetwork-accessor=curl XERCES_DEPENDENCIES += libcurl else XERCES_CONF_OPTS += -Dnetwork-accessor=socket endif +else +XERCES_CONF_OPTS += -Dnetwork=OFF +endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XERCES_CONF_OPTS += -Dthreads=ON diff --git a/buildroot/package/xfsprogs/xfsprogs.hash b/buildroot/package/xfsprogs/xfsprogs.hash index 629d6fcf9..79f953b33 100644 --- a/buildroot/package/xfsprogs/xfsprogs.hash +++ b/buildroot/package/xfsprogs/xfsprogs.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae xfsprogs-5.2.1.tar.xz +sha256 8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b xfsprogs-5.8.0.tar.xz # Hash for license files -sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a LICENSES/GPL-2.0 -sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/buildroot/package/xfsprogs/xfsprogs.mk b/buildroot/package/xfsprogs/xfsprogs.mk index 43c921aa1..bfaf9fd71 100644 --- a/buildroot/package/xfsprogs/xfsprogs.mk +++ b/buildroot/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 5.2.1 +XFSPROGS_VERSION = 5.8.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) diff --git a/buildroot/package/xl2tp/xl2tp.hash b/buildroot/package/xl2tp/xl2tp.hash index 8cf652283..471657f0f 100644 --- a/buildroot/package/xl2tp/xl2tp.hash +++ b/buildroot/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0d149bf9d2f7d838806e6a36fd7a676d03bf246d2b7869e16c945330e13b922e xl2tp-1.3.15.tar.gz +sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/xl2tp/xl2tp.mk b/buildroot/package/xl2tp/xl2tp.mk index b40eb2fd1..89ca65a7e 100644 --- a/buildroot/package/xl2tp/xl2tp.mk +++ b/buildroot/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.15 +XL2TP_VERSION = 1.3.16 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 diff --git a/buildroot/package/xr819-xradio/xr819-xradio.hash b/buildroot/package/xr819-xradio/xr819-xradio.hash index 393780fb3..efff92ab7 100644 --- a/buildroot/package/xr819-xradio/xr819-xradio.hash +++ b/buildroot/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2f61f2db78d46440819af2d8191f9b5ed2bb3e5404b739f68fb0af7917d0d222 xr819-xradio-aa01ba77b9360dd734b50f5b937960a50c5a0825.tar.gz +sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/buildroot/package/xr819-xradio/xr819-xradio.mk b/buildroot/package/xr819-xradio/xr819-xradio.mk index ae3e4fbd3..c1fe3295b 100644 --- a/buildroot/package/xr819-xradio/xr819-xradio.mk +++ b/buildroot/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = aa01ba77b9360dd734b50f5b937960a50c5a0825 +XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/xscreensaver/xscreensaver.hash b/buildroot/package/xscreensaver/xscreensaver.hash index e33413c76..51f418a89 100644 --- a/buildroot/package/xscreensaver/xscreensaver.hash +++ b/buildroot/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 158f381d687e8360a6debb0d3af0148d279e853666244f02d628a5a482bce194 xscreensaver-5.43.tar.gz -sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h -sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h +sha256 73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95 xscreensaver-5.44.tar.gz +sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h +sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/buildroot/package/xscreensaver/xscreensaver.mk b/buildroot/package/xscreensaver/xscreensaver.mk index 642d65f0c..8f61dd1e1 100644 --- a/buildroot/package/xscreensaver/xscreensaver.mk +++ b/buildroot/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.43 +XSCREENSAVER_VERSION = 5.44 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. diff --git a/buildroot/package/xtables-addons/xtables-addons.hash b/buildroot/package/xtables-addons/xtables-addons.hash index fea496d99..33cc139b3 100644 --- a/buildroot/package/xtables-addons/xtables-addons.hash +++ b/buildroot/package/xtables-addons/xtables-addons.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6 xtables-addons-3.5.tar.xz -sha256 045ee3fcfe5d6edb95483cf49e2446ff8cab4bb79411018b18354138b70c5eb5 xtables-addons-3.7.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE +sha256 064dd68937d98e6cfcbdf51ef459310d9810c17ab31b21285bc7a76cdcef7c49 xtables-addons-3.9.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/xtables-addons/xtables-addons.mk b/buildroot/package/xtables-addons/xtables-addons.mk index 1a74b80f4..c9e5bfdde 100644 --- a/buildroot/package/xtables-addons/xtables-addons.mk +++ b/buildroot/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.7 +XTABLES_ADDONS_VERSION = 3.9 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf @@ -30,4 +30,11 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT) +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/xterm/xterm.hash b/buildroot/package/xterm/xterm.hash index 57d5a72b9..7f2ff2c30 100644 --- a/buildroot/package/xterm/xterm.hash +++ b/buildroot/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f xterm-349.tgz +sha256 7cdb106962910a99700b3c45fa1a1493e46e97a5aa3785093a786e07196fbf7b xterm-358.tgz # Locally calculated -sha256 b0d302c6d67f63122bbe8d622dd8a66cfadccc32853f606b7558103609201993 COPYING +sha256 c655a5fa3dec936543e02f863b8c1343d08522a2821cb484df6c5f62afa7354d COPYING diff --git a/buildroot/package/xterm/xterm.mk b/buildroot/package/xterm/xterm.mk index 8cbfa070e..5e3e64fff 100644 --- a/buildroot/package/xterm/xterm.mk +++ b/buildroot/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 349 +XTERM_VERSION = 358 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf diff --git a/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch b/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch deleted file mode 100644 index ffa486d7d..000000000 --- a/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f04d1b73a9060e8f09cf1173f89daab73d6c0a18 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sat, 9 Nov 2019 17:13:46 +0100 -Subject: [PATCH] [MAKEFILE] Unconditionally disable SSP - -Though -nostdlib is passed in $(cflags), -fno-stack-protector must also be -passed to avoid linking errors related to undefined references to -'__stack_chk_guard' and '__stack_chk_fail' if toolchain enforces --fstack-protector. - -Signed-off-by: Eric Le Bihan -[yann.morin.1998@free.fr: - - applied upstream: https://github.com/avpatel/xvisor-next/commit/6edd4a8bf16c42aac8bea9e0a61e8b3b47e2aa7c -] -Signed-off-by: Yann E. MORIN ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d6bcf519..de8e1043 100644 ---- a/Makefile -+++ b/Makefile -@@ -137,7 +137,7 @@ cppflags+=$(cpu-cppflags) - cppflags+=$(board-cppflags) - cppflags+=$(libs-cppflags-y) - cc=$(CROSS_COMPILE)gcc --cflags=-g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -D__VMM__ -+cflags=-g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -D__VMM__ -fno-stack-protector - cflags+=$(board-cflags) - cflags+=$(cpu-cflags) - cflags+=$(libs-cflags-y) --- -2.21.0 - diff --git a/buildroot/package/xvisor/0001-fix-build-with-gcc-10.patch b/buildroot/package/xvisor/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..a538558d8 --- /dev/null +++ b/buildroot/package/xvisor/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,64 @@ +From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 6 Oct 2020 21:52:20 +0200 +Subject: [PATCH] fix build with gcc 10 + +Define variables in header files as extern to avoid the following build failure +with gcc 10 (which defaults to -fno-common): + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: +/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: +multiple definition of `sdio_func_type'; +/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: +first defined here + +Fixes: + - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xvisor/xvisor/pull/125] +--- + drivers/mmc/core/core.h | 2 +- + emulators/display/drawfn.h | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h +index d75d135a..e2ca3141 100644 +--- a/drivers/mmc/core/core.h ++++ b/drivers/mmc/core/core.h +@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); + * Note: Must be called with host->lock held. + */ + extern struct vmm_bus sdio_bus_type; +-struct vmm_device_type sdio_func_type; ++extern struct vmm_device_type sdio_func_type; + + int __sdio_attach(struct mmc_host *host); + +diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h +index f9163cff..385deaf6 100644 +--- a/emulators/display/drawfn.h ++++ b/emulators/display/drawfn.h +@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, + DRAWFN_ORDER_MAX * \ + DRAWFN_FORMAT_MAX) + +-drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; ++extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; + +-drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; ++extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; + +-drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; ++extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; + +-drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; ++extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; + +-drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; ++extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; + + #endif +-- +2.28.0 + diff --git a/buildroot/package/xvisor/xvisor.hash b/buildroot/package/xvisor/xvisor.hash index dee1ef1d0..6938e20e7 100644 --- a/buildroot/package/xvisor/xvisor.hash +++ b/buildroot/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 a0c9537bd7fb06084c3da663f71bf6f2b1709e34b3b2fca2473c8db1cdd3de1d xvisor-0.2.11.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/xvisor/xvisor.mk b/buildroot/package/xvisor/xvisor.mk index 6094370cc..394ff7c80 100644 --- a/buildroot/package/xvisor/xvisor.mk +++ b/buildroot/package/xvisor/xvisor.mk @@ -4,14 +4,14 @@ # ################################################################################ -XVISOR_VERSION = 0.2.11 +XVISOR_VERSION = 0.3.0 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex XVISOR_MAKE_TARGETS = all diff --git a/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch b/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch deleted file mode 100644 index b275760de..000000000 --- a/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch +++ /dev/null @@ -1,27 +0,0 @@ -Makefile.am: fix install-data-hook - -- Prefix $(appdefaultdir) and $(datarootdir) with $(DESTDIR) to allow - cross-compilation -- Create $(DESTDIR)$(appdefaultdir) if it doesn't exist - -Upstream status: sent to Tom Sato - -diff -Nuar xvkbd-4.0-orig/Makefile.am xvkbd-4.0/Makefile.am ---- xvkbd-4.0-orig/Makefile.am 2019-10-06 11:27:13.692243604 +0200 -+++ xvkbd-4.0/Makefile.am 2019-10-06 11:35:15.872263440 +0200 -@@ -17,11 +17,12 @@ - [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h - - install-data-hook: -+ [ -d $(DESTDIR)$(appdefaultdir) ] || mkdir $(DESTDIR)$(appdefaultdir) - for file in *.ad; do \ -- $(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(appdefaultdir)/$${file%.ad}; \ - done -- [ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/ -- $(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english -+ [ -d $(DESTDIR)$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)$(datarootdir)/xvkbd/ -+ $(INSTALL_DATA) words.english $(DESTDIR)$(datarootdir)/xvkbd/words.english - - EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english - diff --git a/buildroot/package/xvkbd/xvkbd.hash b/buildroot/package/xvkbd/xvkbd.hash index dd6ed79b9..8f13ab7c5 100644 --- a/buildroot/package/xvkbd/xvkbd.hash +++ b/buildroot/package/xvkbd/xvkbd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82 xvkbd-4.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 af0d9b39a91d2779e9758d8dacc24d466bea124c1d401687bddc48543516cd68 README +sha256 952d07df0fe1e45286520b7c98b4fd00fd60dbf3e3e8ff61e12c259f76a3bef4 xvkbd-4.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5dada320d6b4fb7c76ef110a027b019feaf1149576acf7ac5cacf0d0dcdc3671 README diff --git a/buildroot/package/xvkbd/xvkbd.mk b/buildroot/package/xvkbd/xvkbd.mk index 1d056c1c4..f65c02bc0 100644 --- a/buildroot/package/xvkbd/xvkbd.mk +++ b/buildroot/package/xvkbd/xvkbd.mk @@ -4,12 +4,10 @@ # ################################################################################ -XVKBD_VERSION = 4.0 +XVKBD_VERSION = 4.1 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd XVKBD_LICENSE = GPL-2.0+ XVKBD_LICENSE_FILES = COPYING README -# We're patching Makefile.am -XVKBD_AUTORECONF = YES XVKBD_DEPENDENCIES = \ xlib_libICE \ diff --git a/buildroot/package/xxhash/xxhash.hash b/buildroot/package/xxhash/xxhash.hash index 097694364..feb500080 100644 --- a/buildroot/package/xxhash/xxhash.hash +++ b/buildroot/package/xxhash/xxhash.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e xxhash-0.7.2.tar.gz -sha256 94df5da58df6c83bcc2fc0c84aaad71a0b0fe94625060d6cac000121dda37730 LICENSE +sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz +sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE diff --git a/buildroot/package/xxhash/xxhash.mk b/buildroot/package/xxhash/xxhash.mk index bd51c9bd1..c2ddbbd60 100644 --- a/buildroot/package/xxhash/xxhash.mk +++ b/buildroot/package/xxhash/xxhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -XXHASH_VERSION = 0.7.2 +XXHASH_VERSION = 0.8.0 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE diff --git a/buildroot/package/xz/xz.hash b/buildroot/package/xz/xz.hash index 69d1db2f4..3dd0cbe45 100644 --- a/buildroot/package/xz/xz.hash +++ b/buildroot/package/xz/xz.hash @@ -1,8 +1,8 @@ # Locally calculated after checking pgp signature -sha256 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf xz-5.2.4.tar.bz2 +sha256 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 # Hash for license files -sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 +sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/buildroot/package/xz/xz.mk b/buildroot/package/xz/xz.mk index dbf874e9b..487dac461 100644 --- a/buildroot/package/xz/xz.mk +++ b/buildroot/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.4 +XZ_VERSION = 5.2.5 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES diff --git a/buildroot/package/yaml-cpp/yaml-cpp.mk b/buildroot/package/yaml-cpp/yaml-cpp.mk index 906e554ed..beb8d6f55 100644 --- a/buildroot/package/yaml-cpp/yaml-cpp.mk +++ b/buildroot/package/yaml-cpp/yaml-cpp.mk @@ -15,4 +15,10 @@ YAML_CPP_CONF_OPTS += \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=OFF +else +YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=ON +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/ympd/0002-added-forward-declarations.patch b/buildroot/package/ympd/0002-added-forward-declarations.patch new file mode 100644 index 000000000..90ee1eae6 --- /dev/null +++ b/buildroot/package/ympd/0002-added-forward-declarations.patch @@ -0,0 +1,43 @@ +From 2268e0f0f372a61827b912155a1796490968b3ff Mon Sep 17 00:00:00 2001 +From: SuperBFG7 +Date: Tue, 2 Jun 2020 12:41:52 +0200 +Subject: [PATCH] added forward declarations + + +[Retrieved (and slightly updated to remove update of dirble_api_token) +from: +https://github.com/notandy/ympd/pull/191/commits/2268e0f0f372a61827b912155a1796490968b3ff] +Signed-off-by: Fabrice Fontaine +--- + src/mpd_client.c | 2 ++ + src/mpd_client.h | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/mpd_client.c b/src/mpd_client.c +index 2911e461..9f003ab0 100644 +--- a/src/mpd_client.c ++++ b/src/mpd_client.c +@@ -30,6 +30,8 @@ + + /* forward declaration */ + static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev); ++char dirble_api_token[28]; ++struct t_mpd mpd; + + const char * mpd_cmd_strs[] = { + MPD_CMDS(GEN_STR) +diff --git a/src/mpd_client.h b/src/mpd_client.h +index 447dd563..9342c550 100644 +--- a/src/mpd_client.h ++++ b/src/mpd_client.h +@@ -96,6 +96,8 @@ struct t_mpd { + + int song_id; + unsigned queue_version; +-} mpd; ++}; ++ ++extern struct t_mpd mpd; + + struct t_mpd_client_session { + int song_id; diff --git a/buildroot/package/ytree/ytree.hash b/buildroot/package/ytree/ytree.hash index 34ec8fefd..1e620e30e 100644 --- a/buildroot/package/ytree/ytree.hash +++ b/buildroot/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 da8ecaf8e15f8b0d3077ea88da8db9cd607f72ed2a51e91a24d6ef3ff017c6bf ytree-2.00.tar.gz -sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING +sha256 e5bf41ab6bee59cf1e8fc0ca429e9a18e6aa83823f30f5807042b04c88a0e0ec ytree-2.02.tar.gz +sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/buildroot/package/ytree/ytree.mk b/buildroot/package/ytree/ytree.mk index 5a90264f4..48b3f7eff 100644 --- a/buildroot/package/ytree/ytree.mk +++ b/buildroot/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.00 +YTREE_VERSION = 2.02 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING diff --git a/buildroot/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch b/buildroot/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch new file mode 100644 index 000000000..009fd5f96 --- /dev/null +++ b/buildroot/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch @@ -0,0 +1,45 @@ +From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Tue, 28 Jul 2020 09:47:03 +0200 +Subject: [PATCH] zbarcam, zbarimg: get rid of gettext.h + +This doesn't seem to be needed at all for translations to +work. Also, gettext.h uses a different license. So, let's get +rid of it. + +Signed-off-by: Mauro Carvalho Chehab +[Retrieved (and updated to remove gettext.h which is not in the +tarball): +https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a] +Signed-off-by: Fabrice Fontaine +--- + zbar/gettext.h | 294 ---------------------------------------------- + zbarcam/zbarcam.c | 1 - + zbarimg/zbarimg.c | 1 - + 3 files changed, 296 deletions(-) + delete mode 100644 zbar/gettext.h + +diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c +index f7ea281..ad30101 100644 +--- a/zbarcam/zbarcam.c ++++ b/zbarcam/zbarcam.c +@@ -35,7 +35,6 @@ + #include + + #ifdef ENABLE_NLS +-#include "../zbar/gettext.h" + # include + # define _(string) gettext(string) + #else +diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c +index 0796fd8..d05d832 100644 +--- a/zbarimg/zbarimg.c ++++ b/zbarimg/zbarimg.c +@@ -40,7 +40,6 @@ + #include + + #ifdef ENABLE_NLS +-#include "../zbar/gettext.h" + # include + # define _(string) gettext(string) + #else diff --git a/buildroot/package/zbar/0002-zbarcam-zbar-cam-img-.c-fix-build-with-musl.patch b/buildroot/package/zbar/0002-zbarcam-zbar-cam-img-.c-fix-build-with-musl.patch new file mode 100644 index 000000000..fe62c1649 --- /dev/null +++ b/buildroot/package/zbar/0002-zbarcam-zbar-cam-img-.c-fix-build-with-musl.patch @@ -0,0 +1,55 @@ +From ecf90fcff066c06eda1fb931d08fadf5989ecb36 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 29 Aug 2020 14:23:04 +0200 +Subject: [PATCH] zbarcam/zbar{cam,img}.c: fix build with musl + +setlocale is used since version 0.23.1 and +https://git.linuxtv.org/zbar.git/commit/id=d05911f8d5fb8c1e064bd93ed9ec9f038c5da096 + +Include locale.h to avoid the following build failure on musl: + +zbarcam/zbarcam.c:168:5: warning: implicit declaration of function 'setlocale'; did you mean 'setstate'? [-Wimplicit-function-declaration] + setlocale (LC_ALL, ""); + ^~~~~~~~~ + setstate +zbarcam/zbarcam.c:168:16: error: 'LC_ALL' undeclared (first use in this function) + setlocale (LC_ALL, ""); + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/b93ce5430bf22ddda94ee30882a883348617f5b1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mchehab/zbar/pull/115] +--- + zbarcam/zbarcam.c | 1 + + zbarimg/zbarimg.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c +index 6e13c8c..b8bc732 100644 +--- a/zbarcam/zbarcam.c ++++ b/zbarcam/zbarcam.c +@@ -36,6 +36,7 @@ + + #ifdef ENABLE_NLS + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c +index d05d832..52502b2 100644 +--- a/zbarimg/zbarimg.c ++++ b/zbarimg/zbarimg.c +@@ -41,6 +41,7 @@ + + #ifdef ENABLE_NLS + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +-- +2.28.0 + diff --git a/buildroot/package/zbar/zbar.hash b/buildroot/package/zbar/zbar.hash index eae5b7ebf..427709189 100644 --- a/buildroot/package/zbar/zbar.hash +++ b/buildroot/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e99fb8f3be85a76fe24784ad67fecb2da3a02b1e432696b05eefe212d448ad2e zbar-0.23.tar.bz2 -sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md +sha256 dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f zbar-0.23.1.tar.bz2 +sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md diff --git a/buildroot/package/zbar/zbar.mk b/buildroot/package/zbar/zbar.mk index 0550f3e23..f75741ded 100644 --- a/buildroot/package/zbar/zbar.mk +++ b/buildroot/package/zbar/zbar.mk @@ -4,17 +4,17 @@ # ################################################################################ -ZBAR_VERSION = 0.23 +ZBAR_VERSION = 0.23.1 ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md ZBAR_INSTALL_STAGING = YES -ZBAR_DEPENDENCIES = libv4l jpeg -# add host-gettext for AM_ICONV macro -ZBAR_DEPENDENCIES += host-gettext +ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features -ZBAR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ZBAR_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ + LIBS=$(TARGET_NLS_LIBS) ZBAR_CONF_OPTS = \ --disable-doc \ --without-imagemagick \ diff --git a/buildroot/package/zd1211-firmware/zd1211-firmware.hash b/buildroot/package/zd1211-firmware/zd1211-firmware.hash index 2b59b8ac2..14e2c710a 100644 --- a/buildroot/package/zd1211-firmware/zd1211-firmware.hash +++ b/buildroot/package/zd1211-firmware/zd1211-firmware.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 zd1211-firmware-1.4.tar.bz2 +sha256 f11d3810d7f72833997f634584a586dcced71a353f965abf81062ec431d02b12 zd1211-firmware-1.5.tar.bz2 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/zd1211-firmware/zd1211-firmware.mk b/buildroot/package/zd1211-firmware/zd1211-firmware.mk index 860aa76ce..1836a9f7c 100644 --- a/buildroot/package/zd1211-firmware/zd1211-firmware.mk +++ b/buildroot/package/zd1211-firmware/zd1211-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZD1211_FIRMWARE_VERSION = 1.4 +ZD1211_FIRMWARE_VERSION = 1.5 ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION) ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2 ZD1211_FIRMWARE_LICENSE = GPL-2.0 diff --git a/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch b/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch new file mode 100644 index 000000000..ea1166fd5 --- /dev/null +++ b/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch @@ -0,0 +1,107 @@ +From 8cb5708829df9eacd58e1215ce7a1c135eb912b1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 2 Nov 2020 00:04:14 +0100 +Subject: [PATCH] src/compat.hpp: fix build with libbsd and strlcpy + +Don't include bsd/string.h if strlcpy is also defined in string.h to +avoid the following build failure on uclibc: + +In file included from src/compat.hpp:41:0, + from src/ipc_address.cpp:31: +/tmp/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/bsd/string.h:44:54: error: declaration of 'size_t strlcpy(char*, const char*, size_t)' has a different exception specifier + size_t strlcpy(char *dst, const char *src, size_t siz); + ^ +In file included from src/compat.hpp:34:0, + from src/ipc_address.cpp:31: +/tmp/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/string.h:424:15: error: from previous declaration 'size_t strlcpy(char*, const char*, size_t) throw ()' + extern size_t strlcpy(char *__restrict dst, const char *__restrict src, + ^ + +Fixes: + - http://autobuild.buildroot.org/results/51220b1b82774e8f6f6ed8593c58d2e3c31a1531 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/zeromq/libzmq/commit/b2a0842063aaa464ca2d182f9d3fefc6493906d0] +--- + CMakeLists.txt | 4 +--- + configure.ac | 26 ++++++++++++-------------- + src/compat.hpp | 4 +++- + 3 files changed, 16 insertions(+), 18 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85747f626..74dd99ae0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -250,9 +250,7 @@ if(NOT MSVC) + set(ZMQ_HAVE_LIBBSD 1) + endif() + endif() +- if(NOT WITH_LIBBSD OR NOT LIBBSD_FOUND) +- check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY) +- endif() ++ check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY) + endif() + + # Select curve encryption library, defaults to tweetnacl To use libsodium instead, use --with-libsodium(must be +diff --git a/configure.ac b/configure.ac +index 58a78e75e..a7a1609af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -812,20 +812,18 @@ if test "x$enable_libbsd" != "xno"; then + fi + ]) + fi +-if test "x$found_libbsd" != "xyes"; then +- AC_MSG_CHECKING([whether strlcpy is available]) +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include ]], +- [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]]) +- ],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(ZMQ_HAVE_STRLCPY, [1], +- [strlcpy is available]) +- ],[ +- AC_MSG_RESULT([no]) +- ]) +-fi ++AC_MSG_CHECKING([whether strlcpy is available]) ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ]], ++ [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]]) ++ ],[ ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE(ZMQ_HAVE_STRLCPY, [1], ++ [strlcpy is available]) ++ ],[ ++ AC_MSG_RESULT([no]) ++]) + + # pthread_setname is non-posix, and there are at least 4 different implementations + AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument]) +diff --git a/src/compat.hpp b/src/compat.hpp +index 7c7a89275..47744b98e 100644 +--- a/src/compat.hpp ++++ b/src/compat.hpp +@@ -37,9 +37,10 @@ + #define strcasecmp _stricmp + #define strtok_r strtok_s + #else ++#ifndef ZMQ_HAVE_STRLCPY + #ifdef ZMQ_HAVE_LIBBSD + #include +-#elif !defined(ZMQ_HAVE_STRLCPY) ++#else + static inline size_t + strlcpy (char *dest_, const char *src_, const size_t dest_size_) + { +@@ -50,6 +51,7 @@ strlcpy (char *dest_, const char *src_, const size_t dest_size_) + return dest_size_ - remain; + } + #endif ++#endif + template + static inline int strcpy_s (char (&dest_)[size], const char *const src_) + { diff --git a/buildroot/package/zeromq/zeromq.mk b/buildroot/package/zeromq/zeromq.mk index 7840d0362..954964717 100644 --- a/buildroot/package/zeromq/zeromq.mk +++ b/buildroot/package/zeromq/zeromq.mk @@ -8,9 +8,11 @@ ZEROMQ_VERSION = 4.3.3 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux -ZEROMQ_CONF_OPTS = --without-documentation +ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER +# We're patching configure.ac +ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27. @@ -53,6 +55,13 @@ else ZEROMQ_CONF_OPTS += --disable-drafts endif +ifeq ($(BR2_PACKAGE_LIBBSD),y) +ZEROMQ_DEPENDENCIES += host-pkgconf libbsd +ZEROMQ_CONF_OPTS += --enable-libbsd +else +ZEROMQ_CONF_OPTS += --disable-libbsd +endif + # ZeroMQ uses libsodium if it's available. ifeq ($(BR2_PACKAGE_LIBSODIUM),y) ZEROMQ_DEPENDENCIES += libsodium diff --git a/buildroot/package/zip/zip.mk b/buildroot/package/zip/zip.mk index ca52c74fb..c78efedc2 100644 --- a/buildroot/package/zip/zip.mk +++ b/buildroot/package/zip/zip.mk @@ -10,6 +10,7 @@ ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE +ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -39,6 +40,11 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef +define ZIP_INSTALLING_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ + prefix=$(STAGING_DIR)/usr +endef + define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ diff --git a/buildroot/package/zlib-ng/zlib-ng.hash b/buildroot/package/zlib-ng/zlib-ng.hash index 2e89a8d7a..3e1dba35b 100644 --- a/buildroot/package/zlib-ng/zlib-ng.hash +++ b/buildroot/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ec78c8c13530bffaebfc10be2f4695c47cf50fe2fbc2104606467703836fa0e zlib-ng-a17fefa147942edbf80ab22a16bcbc2419def12d.tar.gz -sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md +sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/buildroot/package/zlib-ng/zlib-ng.mk b/buildroot/package/zlib-ng/zlib-ng.mk index 3d9651c08..c56fa72d6 100644 --- a/buildroot/package/zlib-ng/zlib-ng.mk +++ b/buildroot/package/zlib-ng/zlib-ng.mk @@ -4,15 +4,19 @@ # ################################################################################ -ZLIB_NG_VERSION = a17fefa147942edbf80ab22a16bcbc2419def12d -ZLIB_NG_SITE = $(call github,mtl1979,zlib-ng,$(ZLIB_NG_VERSION)) +ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md ZLIB_NG_INSTALL_STAGING = YES ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on -ZLIB_NG_CONF_OPTS += -DZLIB_COMPAT=1 -DWITH_GZFILEOP=1 -DWITH_OPTIM=1 -DCC=$(TARGET_CC) +ZLIB_NG_CONF_OPTS += \ + -DWITH_GZFILEOP=1 \ + -DWITH_OPTIM=1 \ + -DZLIB_COMPAT=1 \ + -DZLIB_ENABLE_TESTS=OFF # Enable NEON and ACLE on ARM ifeq ($(BR2_arm),y) diff --git a/buildroot/package/zlib/Config.in b/buildroot/package/zlib/Config.in index 0f6179f53..550c2efa9 100644 --- a/buildroot/package/zlib/Config.in +++ b/buildroot/package/zlib/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_arm default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x default y if BR2_x86_64 config BR2_PACKAGE_ZLIB @@ -35,7 +37,7 @@ config BR2_PACKAGE_ZLIB_NG Zlib replacement with optimizations for "next generation" systems. - https://github.com/mtl1979/zlib-ng/tree/renamelib + https://github.com/zlib-ng/zlib-ng endchoice diff --git a/buildroot/package/zlog/zlog.hash b/buildroot/package/zlog/zlog.hash index b9f254056..c39505b2c 100644 --- a/buildroot/package/zlog/zlog.hash +++ b/buildroot/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05a6533e32f313eeaf134a761481a5cbc586c5dc85ba9ee6771c7458daaeb031 zlog-1.2.14.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 00037ab8d52772a95d645f1dcfd2c292b7cea326b54e63e219a5b7fdcb7e6508 zlog-1.2.15.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/zlog/zlog.mk b/buildroot/package/zlog/zlog.mk index d9aeae7c7..e2410d366 100644 --- a/buildroot/package/zlog/zlog.mk +++ b/buildroot/package/zlog/zlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLOG_VERSION = 1.2.14 +ZLOG_VERSION = 1.2.15 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING diff --git a/buildroot/package/znc/znc.hash b/buildroot/package/znc/znc.hash index f704e388c..e86171ba1 100644 --- a/buildroot/package/znc/znc.hash +++ b/buildroot/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721 znc-1.7.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d znc-1.8.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/znc/znc.mk b/buildroot/package/znc/znc.mk index 3932c9802..799efa8dc 100644 --- a/buildroot/package/znc/znc.mk +++ b/buildroot/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.7.5 +ZNC_VERSION = 1.8.2 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE diff --git a/buildroot/package/zxing-cpp/zxing-cpp.mk b/buildroot/package/zxing-cpp/zxing-cpp.mk index c138c925b..e9c80b445 100644 --- a/buildroot/package/zxing-cpp/zxing-cpp.mk +++ b/buildroot/package/zxing-cpp/zxing-cpp.mk @@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += opencv3 ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON else ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF diff --git a/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch b/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch deleted file mode 100644 index 1c352236a..000000000 --- a/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9411bde3e4a70a81ff3ffd256b71927b2d90dcbb Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 11:32:04 +0200 -Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). - -[Retrieved (and slightly updated to remove test.zip) from: -https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb] -Signed-off-by: Fabrice Fontaine ---- - test/test.zip | Bin 1361 -> 1361 bytes - zzip/zip.c | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 34 insertions(+), 2 deletions(-) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 88b833b..a685280 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -475,9 +475,15 @@ __zzip_parse_root_directory(int fd, - } else - { - if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) -+ { -+ free(hdr0); - return ZZIP_DIR_SEEK; -+ } - if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) -+ { -+ free(hdr0); - return ZZIP_DIR_READ; -+ } - d = &dirent; - } - -@@ -577,12 +583,38 @@ __zzip_parse_root_directory(int fd, - - if (hdr_return) - *hdr_return = hdr0; -+ else -+ { -+ /* If it is not assigned to *hdr_return, it will never be free()'d */ -+ free(hdr0); -+ /* Make sure we don't free it again in case of error */ -+ hdr0 = NULL; -+ } - } /* else zero (sane) entries */ - # ifndef ZZIP_ALLOW_MODULO_ENTRIES -- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (entries != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # else -- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (((entries & (unsigned)0xFFFF) != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # endif -+ return 0; - } - - /* ------------------------- high-level interface ------------------------- */ diff --git a/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch b/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch deleted file mode 100644 index b0e8858f6..000000000 --- a/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d2e5d5c53212e54a97ad64b793a4389193fec687 Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 11:49:28 +0200 -Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). - -[Retrieved from: -https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687] -Signed-off-by: Fabrice Fontaine ---- - zzip/zip.c | 25 ++----------------------- - 1 file changed, 2 insertions(+), 23 deletions(-) - -diff --git a/zzip/zip.c b/zzip/zip.c -index a685280..51a1a4d 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -587,34 +587,13 @@ __zzip_parse_root_directory(int fd, - { - /* If it is not assigned to *hdr_return, it will never be free()'d */ - free(hdr0); -- /* Make sure we don't free it again in case of error */ -- hdr0 = NULL; - } - } /* else zero (sane) entries */ - # ifndef ZZIP_ALLOW_MODULO_ENTRIES -- if (entries != zz_entries) -- { -- /* If it was assigned to *hdr_return, undo assignment */ -- if (p_reclen && hdr_return) -- *hdr_return = NULL; -- /* Free it, if it was not already free()'d */ -- if (hdr0 != NULL) -- free(hdr0); -- return ZZIP_CORRUPTED; -- } -+ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; - # else -- if (((entries & (unsigned)0xFFFF) != zz_entries) -- { -- /* If it was assigned to *hdr_return, undo assignment */ -- if (p_reclen && hdr_return) -- *hdr_return = NULL; -- /* Free it, if it was not already free()'d */ -- if (hdr0 != NULL) -- free(hdr0); -- return ZZIP_CORRUPTED; -- } -+ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0; - # endif -- return 0; - } - - /* ------------------------- high-level interface ------------------------- */ diff --git a/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch b/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch deleted file mode 100644 index b0506f0cf..000000000 --- a/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0e1dadb05c1473b9df2d7b8f298dab801778ef99 Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 13:55:35 +0200 -Subject: [PATCH] One more free() to avoid memory leak. - -[Retrieved from: -https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99] -Signed-off-by: Fabrice Fontaine ---- - zzip/zip.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 51a1a4d..bc6c080 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -589,6 +589,8 @@ __zzip_parse_root_directory(int fd, - free(hdr0); - } - } /* else zero (sane) entries */ -+ else -+ free(hdr0); - # ifndef ZZIP_ALLOW_MODULO_ENTRIES - return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; - # else diff --git a/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch b/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch deleted file mode 100644 index 1554fff99..000000000 --- a/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch +++ /dev/null @@ -1,344 +0,0 @@ -From 81dfa6b3e08f6934885ba5c98939587d6850d08e Mon Sep 17 00:00:00 2001 -From: Josef Moellers -Date: Thu, 4 Oct 2018 14:21:48 +0200 -Subject: [PATCH] Fix issue #62: Remove any "../" components from pathnames of - extracted files. [CVE-2018-17828] - -[Retrieved from: -https://github.com/gdraheim/zziplib/commit/81dfa6b3e08f6934885ba5c98939587d6850d08e] -Signed-off-by: Fabrice Fontaine ---- - bins/unzzipcat-big.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-mem.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-mix.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-zip.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 224 insertions(+), 4 deletions(-) - -diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c -index 982d262..88c4d65 100644 ---- a/bins/unzzipcat-big.c -+++ b/bins/unzzipcat-big.c -@@ -53,6 +53,48 @@ static void unzzip_cat_file(FILE* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -70,6 +112,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -79,7 +131,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - -diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c -index 9bc966b..793bde8 100644 ---- a/bins/unzzipcat-mem.c -+++ b/bins/unzzipcat-mem.c -@@ -58,6 +58,48 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -75,6 +117,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -84,7 +136,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) -diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c -index 91c2f00..73b6ed6 100644 ---- a/bins/unzzipcat-mix.c -+++ b/bins/unzzipcat-mix.c -@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -86,6 +128,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) -diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c -index 2810f85..7f7f3fa 100644 ---- a/bins/unzzipcat-zip.c -+++ b/bins/unzzipcat-zip.c -@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -86,6 +128,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) diff --git a/buildroot/package/zziplib/zziplib.hash b/buildroot/package/zziplib/zziplib.hash index 88f618b7b..b667b9537 100644 --- a/buildroot/package/zziplib/zziplib.hash +++ b/buildroot/package/zziplib/zziplib.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-0.13.69.tar.gz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB -sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL -sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm +sha256 2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2 zziplib-0.13.71.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB +sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL +sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm diff --git a/buildroot/package/zziplib/zziplib.mk b/buildroot/package/zziplib/zziplib.mk index 967cda033..aab091ac6 100644 --- a/buildroot/package/zziplib/zziplib.mk +++ b/buildroot/package/zziplib/zziplib.mk @@ -4,23 +4,14 @@ # ################################################################################ -ZZIPLIB_VERSION = 0.13.69 +ZZIPLIB_VERSION = 0.13.71 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm ZZIPLIB_INSTALL_STAGING = YES -# 0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch -# 0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch -# 0003-One-more-free-to-avoid-memory-leak.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-16548 +ZZIPLIB_DEPENDENCIES = host-pkgconf host-python3 zlib -# 0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-17828 - -ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib - -# zziplib is not python3 friendly, so force the python interpreter -ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package)) diff --git a/buildroot/support/config-fragments/autobuild/bootlin-x86-64-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-glibc.config new file mode 100644 index 000000000..6a372803b --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-glibc.config @@ -0,0 +1,15 @@ +BR2_x86_64=y +BR2_x86_corei7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2020.02-2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +# BR2_TOOLCHAIN_EXTERNAL_LOCALE is not set +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y +BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG=y +BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS=y +BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config index 961ff7157..f1b0f2a91 100644 --- a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config index 22aa667ea..f8287ccd0 100644 --- a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config +++ b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config @@ -3,7 +3,7 @@ BR2_archs38=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-basic.config b/buildroot/support/config-fragments/autobuild/br-arm-basic.config index edac17648..c73aa782c 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-basic.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config index 4b17df50f..a3b51138d 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config index 40349a5c3..e6a5fa64f 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config index caa2269e5..22e9740e4 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config @@ -3,9 +3,9 @@ BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config index 97e1e8180..3b0267f6d 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,9 +3,9 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config index 4797ccd2f..59e90f337 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,7 +3,7 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full.config b/buildroot/support/config-fragments/autobuild/br-arm-full.config index f12b76e5e..652c5a68e 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config index 7c9b465a8..ea6df7fbd 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_32_X=y -BR2_GCC_VERSION_9_X=y +BR2_BINUTILS_VERSION_2_34_X=y +BR2_GCC_VERSION_10_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index 077e1d84b..2f651dedf 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,7 +2,7 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config index 1fe960ba8..acc7c0942 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,7 +2,7 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config index 25a2a2188..cee8a0426 100644 --- a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config +++ b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config @@ -2,9 +2,9 @@ BR2_m68k=y BR2_m68k_cf5208=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config index 8803fa1db..9f600acf4 100644 --- a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config +++ b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config @@ -1,9 +1,9 @@ BR2_m68k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config index 5dc5e842f..60c23a202 100644 --- a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config +++ b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config @@ -1,7 +1,7 @@ BR2_microblazeel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config index 69cb93c1f..ce61100a3 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config @@ -4,8 +4,8 @@ BR2_mips_32r6=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config index cdd3029b2..99ace7776 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,8 +3,8 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index f722b6582..48ed24dac 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,8 +5,8 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config index 9c46809d8..6099e4886 100644 --- a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config +++ b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config @@ -2,9 +2,9 @@ BR2_mipsel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config index 2f93714fc..c5ac68dc5 100644 --- a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config @@ -2,8 +2,8 @@ BR2_nios2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config index b3cf2d08a..c5391338c 100644 --- a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config +++ b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config @@ -1,9 +1,9 @@ BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2019.11.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2020.02-500-geee96b0.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index b8a568e43..f08346265 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,8 +3,8 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config index dc7c7d35f..c5edcc177 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config @@ -3,9 +3,9 @@ BR2_powerpc_e500mc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index e7ff1a471..5d7171a06 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config index 97c7ebdb6..b743bbc4a 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64le=y BR2_powerpc_power8=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv32.config b/buildroot/support/config-fragments/autobuild/br-riscv32.config index f8901edf2..d9110a6a8 100644 --- a/buildroot/support/config-fragments/autobuild/br-riscv32.config +++ b/buildroot/support/config-fragments/autobuild/br-riscv32.config @@ -2,7 +2,7 @@ BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-full-internal.config b/buildroot/support/config-fragments/autobuild/br-riscv64-full-internal.config new file mode 100644 index 000000000..5c1dfc47e --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/br-riscv64-full-internal.config @@ -0,0 +1,4 @@ +BR2_riscv=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config b/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config deleted file mode 100644 index 89e7afb27..000000000 --- a/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_riscv=y -BR2_TOOLCHAIN_BUILDROOT_MUSL=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config b/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config new file mode 100644 index 000000000..fd6ef822a --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config @@ -0,0 +1,9 @@ +BR2_riscv=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-musl-2020.02.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y +BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64.config b/buildroot/support/config-fragments/autobuild/br-riscv64.config index f98675d8d..c5df86392 100644 --- a/buildroot/support/config-fragments/autobuild/br-riscv64.config +++ b/buildroot/support/config-fragments/autobuild/br-riscv64.config @@ -1,8 +1,8 @@ BR2_riscv=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config new file mode 100644 index 000000000..56af5fb1b --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config @@ -0,0 +1,4 @@ +BR2_s390x=y +BR2_s390x_z13=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sh4-full.config b/buildroot/support/config-fragments/autobuild/br-sh4-full.config index 5e358bb82..dc3190287 100644 --- a/buildroot/support/config-fragments/autobuild/br-sh4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-sh4-full.config @@ -2,9 +2,9 @@ BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config index 74b4bf27e..8550a0126 100644 --- a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config +++ b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config @@ -1,7 +1,7 @@ BR2_sparc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config index 75c31ad5c..0b77bb45f 100644 --- a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config @@ -1,7 +1,7 @@ BR2_sparc64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config index 8bab1deb1..b6682da20 100644 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config +++ b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config @@ -3,9 +3,9 @@ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config index c67a52474..03de24d35 100644 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config @@ -3,8 +3,8 @@ BR2_x86_atom=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config index 3d57b99c3..9d0092143 100644 --- a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config +++ b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config @@ -1,9 +1,9 @@ BR2_xtensa=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config b/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config deleted file mode 100644 index 6c7ad4c5b..000000000 --- a/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config +++ /dev/null @@ -1,4 +0,0 @@ -BR2_x86_64=y -BR2_x86_steamroller=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64=y diff --git a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv index 9b41e2173..f84f27ddc 100644 --- a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv +++ b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv @@ -24,6 +24,7 @@ support/config-fragments/autobuild/sourcery-arm.config,x86 # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/andes-nds32.config,x86 support/config-fragments/autobuild/arm-aarch64.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-glibc.config,x86_64 support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64 support/config-fragments/autobuild/br-arc-full-internal.config,any support/config-fragments/autobuild/br-arc-internal-glibc.config,any @@ -53,7 +54,9 @@ support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64 support/config-fragments/autobuild/br-powerpc-internal-full.config,any support/config-fragments/autobuild/br-riscv32.config,x86_64 support/config-fragments/autobuild/br-riscv64.config,x86_64 -support/config-fragments/autobuild/br-riscv64-internal-musl.config,any +support/config-fragments/autobuild/br-riscv64-full-internal.config,any +support/config-fragments/autobuild/br-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config,any support/config-fragments/autobuild/br-sh4-full.config,x86_64 support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64 @@ -68,4 +71,3 @@ support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 support/config-fragments/autobuild/sourcery-nios2.config,x86 -support/config-fragments/autobuild/sourcery-x86-64.config,x86 diff --git a/buildroot/support/dependencies/dependencies.sh b/buildroot/support/dependencies/dependencies.sh index 891e23404..b44d28682 100755 --- a/buildroot/support/dependencies/dependencies.sh +++ b/buildroot/support/dependencies/dependencies.sh @@ -246,6 +246,16 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi +if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then + if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then + echo + echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." + echo "If you're running a Debian/Ubuntu distribution, install gcc-X-plugin-dev package." + echo "For other distributions, refer to their documentation." + exit 1 ; + fi +fi + # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl diff --git a/buildroot/support/gnuconfig/README.buildroot b/buildroot/support/gnuconfig/README.buildroot index 7e7d49830..952eea8b1 100644 --- a/buildroot/support/gnuconfig/README.buildroot +++ b/buildroot/support/gnuconfig/README.buildroot @@ -13,15 +13,9 @@ files of your package to be updated by using: _POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK --- UPDATE --- -GNU config is now managed in git, so to update: +Run the script 'update' in this directory, and commit the result. -# git clone git://git.savannah.gnu.org/config.git -# cp config/config.* . -# for p in $(ls patches/*.patch); do patch -p1 < $p; done -# rm -rf config +The current Buildroot version is based on this commit of the config.git +repository (leave alone on its own line, the script updates it): -Currently no patches are needed, but they may be needed again in the -future. - -The current Buildroot version is based on the Git commit -104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository. +d7a4dee7cc25e332b990d0a6d9f0ddd42cb33cf5 diff --git a/buildroot/support/gnuconfig/config.guess b/buildroot/support/gnuconfig/config.guess index b40e17b13..8d70ec2b2 100755 --- a/buildroot/support/gnuconfig/config.guess +++ b/buildroot/support/gnuconfig/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-05-28' +timestamp='2020-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -99,6 +99,8 @@ tmp= trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || @@ -148,17 +150,15 @@ Linux|GNU|GNU/*) #elif defined(__dietlibc__) LIBC=dietlibc #else + #include + #ifdef __DEFINED_va_list + LIBC=musl + #else LIBC=gnu #endif + #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl - fi ;; esac @@ -262,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:SolidBSD:*:*) echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; + *:OS108:*:*) + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; @@ -271,12 +274,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -396,7 +402,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -536,10 +542,10 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -572,7 +578,7 @@ EOF echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" @@ -612,7 +618,7 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then + if test -x /usr/bin/lslpp ; then IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else @@ -647,7 +653,7 @@ EOF 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "$sc_cpu_version" in @@ -661,7 +667,7 @@ EOF esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -700,7 +706,7 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -774,7 +780,7 @@ EOF echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -918,7 +924,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -1087,7 +1093,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1276,7 +1292,7 @@ EOF echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1324,39 +1340,43 @@ EOF *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - set_cc_for_build UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; @@ -1620,6 +1640,12 @@ copies of config.guess and config.sub with the latest versions from: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +EOF + +year=`echo $timestamp | sed 's,-.*,,'` +# shellcheck disable=SC2003 +if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then + cat >&2 <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,28 +124,27 @@ case $1 in ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $1 in case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ case $1 in # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ case $1 in | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,450 +190,451 @@ case $1 in case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; - hp300) + hp300 | hp300hpux) basic_machine=m68k-hp + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -686,17 +686,17 @@ case $basic_machine in bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -706,7 +706,7 @@ case $basic_machine in dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -715,7 +715,7 @@ case $basic_machine in elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -728,7 +728,7 @@ case $basic_machine in h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -771,36 +771,36 @@ case $basic_machine in i*86v32) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -811,26 +811,26 @@ case $basic_machine in *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -841,12 +841,12 @@ case $basic_machine in op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -883,12 +883,12 @@ case $basic_machine in sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -905,7 +905,7 @@ case $basic_machine in w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -958,11 +958,11 @@ case $cpu-$vendor in # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1006,7 +1006,7 @@ case $cpu-$vendor in dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1015,7 +1015,7 @@ case $cpu-$vendor in ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1028,7 +1028,7 @@ case $cpu-$vendor in ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1038,7 +1038,7 @@ case $cpu-$vendor in ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1048,7 +1048,7 @@ case $cpu-$vendor in ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1104,11 +1104,14 @@ case $cpu-$vendor in xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; + arm64-*) + cpu=aarch64 + ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1119,7 +1122,7 @@ case $cpu-$vendor in vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1141,16 +1144,12 @@ case $cpu-$vendor in cpu=nsx vendor=tandem ;; - s390-*) - cpu=s390 - vendor=ibm - ;; - s390x-*) - cpu=s390x - vendor=ibm + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1167,7 +1166,7 @@ case $cpu-$vendor in | am33_2.0 \ | amdgcn \ | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1232,6 +1231,7 @@ case $cpu-$vendor in | pyramid \ | riscv | riscv32 | riscv64 \ | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ | score \ | sh | shl \ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ @@ -1278,8 +1278,43 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` + ;; + nto-qnx*) + kernel=nto + os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1533,6 +1493,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1544,7 +1505,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1710,84 +1672,171 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi | eabihf | gnueabi | gnueabihf) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) vendor=ibm ;; - os400*) + *-os400*) vendor=ibm ;; - ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/buildroot/support/gnuconfig/update b/buildroot/support/gnuconfig/update new file mode 100755 index 000000000..c8728eadd --- /dev/null +++ b/buildroot/support/gnuconfig/update @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +cd "${0%/*}" + +git clone https://git.savannah.gnu.org/git/config.git +sha="$(cd config; git log -1 --pretty=tformat:%H)" +sed -r -i -e "\$s/.*/${sha}/" README.buildroot +cp config/config.* . +for p in $(ls patches/*.patch 2>/dev/null); do + patch -p1 < "${p}" +done +rm -rf config diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index f08806df9..53f6012f6 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2020.02.7' +RELEASE='2020.08' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/misc/gitlab-ci.yml.in b/buildroot/support/misc/gitlab-ci.yml.in new file mode 100644 index 000000000..fcfff5c6a --- /dev/null +++ b/buildroot/support/misc/gitlab-ci.yml.in @@ -0,0 +1,78 @@ +.check-DEVELOPERS_base: + # get-developers should print just "No action specified"; if it prints + # anything else, it's a parse error. + # The initial ! is removed by YAML so we need to quote it. + script: + - "! utils/get-developers | grep -v 'No action specified'" + +.check-flake8_base: + script: + - make check-flake8 + +.check-package_base: + script: + - make check-package + +.defconfig_check: + before_script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') + script: + - echo "Configure Buildroot for ${DEFCONFIG_NAME}" + - make ${DEFCONFIG_NAME} + - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} + artifacts: + when: on_failure + expire_in: 2 weeks + paths: + - .config + +.defconfig_base: + before_script: + - DEFCONFIG_NAME=${CI_JOB_NAME} + script: + - echo "Configure Buildroot for ${DEFCONFIG_NAME}" + - make ${DEFCONFIG_NAME} + - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} + - echo 'Build buildroot' + - | + make > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } + - | + ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || { + echo 'Failed runtime test last output' + tail -200 runtime-test.log + exit 1 + } + artifacts: + when: always + expire_in: 2 weeks + paths: + - .config + - build.log + - output/images/ + - output/build/build-time.log + - output/build/packages-file-list.txt + - output/build/*/.config + - runtime-test.log + +.runtime_test_base: + before_script: + - TEST_CASE_NAME=${CI_JOB_NAME} + # Keep build directories so the rootfs can be an artifact of the job. The + # runner will clean up those files for us. + # Multiply every emulator timeout by 10 to avoid sporadic failures in + # elastic runners. + script: + - echo "Starting runtime test ${TEST_CASE_NAME}" + - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} + artifacts: + when: always + expire_in: 2 weeks + paths: + - test-output/*.log + - test-output/*/.config + - test-output/*/images/* + diff --git a/buildroot/support/misc/utils.mk b/buildroot/support/misc/utils.mk index 2f00ccfdb..dc60cad97 100644 --- a/buildroot/support/misc/utils.mk +++ b/buildroot/support/misc/utils.mk @@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) +# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd' +make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,'%',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep diff --git a/buildroot/support/scripts/apply-patches.sh b/buildroot/support/scripts/apply-patches.sh index 2d39d63da..9fb488c57 100755 --- a/buildroot/support/scripts/apply-patches.sh +++ b/buildroot/support/scripts/apply-patches.sh @@ -113,8 +113,8 @@ function apply_patch { echo " to be applied : ${path}/${patch}" exit 1 fi - if grep -q "^rename from" ${path}/${patch} && \ - grep -q "^rename to" ${path}/${patch} ; then + if ${uncomp} "${path}/$patch" | grep -q "^rename from" && \ + ${uncomp} "${path}/$patch" | grep -q "^rename to" ; then echo "Error: patch contains some renames, not supported by old patch versions" exit 1 fi diff --git a/buildroot/support/scripts/boot-qemu-image.py b/buildroot/support/scripts/boot-qemu-image.py new file mode 100755 index 000000000..dbbba552a --- /dev/null +++ b/buildroot/support/scripts/boot-qemu-image.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python3 + +# This script expect to run from the Buildroot top directory. + +import os +import pexpect +import sys +import time + + +def main(): + if not (len(sys.argv) == 2): + print("Error: incorrect number of arguments") + print("""Usage: boot-qemu-image.py """) + sys.exit(1) + + # Ignore non Qemu defconfig + if not sys.argv[1].startswith('qemu_'): + sys.exit(0) + + qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') + + child = pexpect.spawn(qemu_start, ['serial-only'], + timeout=5, encoding='utf-8', + env={"QEMU_AUDIO_DRV": "none"}) + + # We want only stdout into the log to avoid double echo + child.logfile = sys.stdout + + # Let the spawn actually try to fork+exec to the wrapper, and then + # let the wrapper exec the qemu process. + time.sleep(1) + + try: + child.expect(["buildroot login:", pexpect.TIMEOUT], timeout=60) + except pexpect.EOF as e: + # Some emulations require a fork of qemu-system, which may be + # missing on the system, and is not provided by Buildroot. + # In this case, spawn above will succeed at starting the wrapper + # start-qemu.sh, but that one will fail (exit with 127) in such + # a situation. + exit = [int(l.split(' ')[1]) + for l in e.value.splitlines() + if l.startswith('exitstatus: ')] + if len(exit) and exit[0] == 127: + print('qemu-start.sh could not find the qemu binary') + sys.exit(0) + print("Connection problem, exiting.") + sys.exit(1) + except pexpect.TIMEOUT: + print("System did not boot in time, exiting.") + sys.exit(1) + + child.sendline("root\r") + + try: + child.expect(["# ", pexpect.TIMEOUT], timeout=60) + except pexpect.EOF: + print("Cannot connect to shell") + sys.exit(1) + except pexpect.TIMEOUT: + print("Timeout while waiting for shell") + sys.exit(1) + + child.sendline("poweroff\r") + + try: + child.expect(["System halted", pexpect.TIMEOUT], timeout=60) + child.expect(pexpect.EOF) + except pexpect.EOF: + pass + except pexpect.TIMEOUT: + # Qemu may not exit properly after "System halted", ignore. + print("Cannot halt machine") + + sys.exit(0) + + +if __name__ == "__main__": + main() diff --git a/buildroot/support/scripts/br2-external b/buildroot/support/scripts/br2-external index ededd2d90..56dc6f53c 100755 --- a/buildroot/support/scripts/br2-external +++ b/buildroot/support/scripts/br2-external @@ -161,6 +161,8 @@ do_kconfig() { toolchains jpeg openssl + skeleton + init ) for br2 in "${items[@]}"; do @@ -224,6 +226,22 @@ do_kconfig() { else printf '# No openssl from: %s\n\n' "${br2_desc}" fi >>"${outputdir}/.br2-external.in.openssl" + + if [ -f "${br2_ext}/provides/skeleton.in" ]; then + printf 'comment "skeleton from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/skeleton.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No skeleton from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.skeleton" + + if [ -f "${br2_ext}/provides/init.in" ]; then + printf 'comment "init from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/init.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No init from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.init" done printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus" diff --git a/buildroot/support/scripts/check-bin-arch b/buildroot/support/scripts/check-bin-arch index 3449bd1ae..27cc59bca 100755 --- a/buildroot/support/scripts/check-bin-arch +++ b/buildroot/support/scripts/check-bin-arch @@ -25,6 +25,9 @@ declare -a IGNORES=( # it for a different architecture (e.g. i386 grub on x86_64). "/lib/grub" "/usr/lib/grub" + + # Guile modules are ELF files, with a "None" machine + "/usr/lib/guile" ) while getopts p:l:r:a:i: OPT ; do diff --git a/buildroot/support/scripts/check-dotconfig.py b/buildroot/support/scripts/check-dotconfig.py new file mode 100755 index 000000000..f9a416b74 --- /dev/null +++ b/buildroot/support/scripts/check-dotconfig.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 + +# This scripts check that all lines present in the defconfig are +# still present in the .config + +import sys + + +def main(): + if not (len(sys.argv) == 3): + print("Error: incorrect number of arguments") + print("""Usage: check-dotconfig """) + sys.exit(1) + + configfile = sys.argv[1] + defconfig = sys.argv[2] + + # strip() to get rid of trailing \n + with open(configfile) as configf: + configlines = [l.strip() for l in configf.readlines()] + + defconfiglines = [] + with open(defconfig) as defconfigf: + # strip() to get rid of trailing \n + for line in (line.strip() for line in defconfigf.readlines()): + if line.startswith("BR2_"): + defconfiglines.append(line) + elif line.startswith('# BR2_') and line.endswith(' is not set'): + defconfiglines.append(line) + + # Check that all the defconfig lines are still present + missing = [line for line in defconfiglines if line not in configlines] + + if missing: + print("WARN: defconfig {} can't be used:".format(defconfig)) + for m in missing: + print(" Missing: {}".format(m)) + sys.exit(1) + + +if __name__ == "__main__": + main() diff --git a/buildroot/support/scripts/cve-checker b/buildroot/support/scripts/cve-checker new file mode 100755 index 000000000..998ea5b8a --- /dev/null +++ b/buildroot/support/scripts/cve-checker @@ -0,0 +1,196 @@ +#!/usr/bin/env python + +# Copyright (C) 2009 by Thomas Petazzoni +# Copyright (C) 2020 by Gregory CLEMENT +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import argparse +import datetime +import os +import json +import sys +import cve as cvecheck + + +class Package: + def __init__(self, name, version, ignored_cves): + self.name = name + self.version = version + self.cves = list() + self.ignored_cves = ignored_cves + + +def check_package_cves(nvd_path, packages): + if not os.path.isdir(nvd_path): + os.makedirs(nvd_path) + + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): + for pkg_name in cve.pkg_names: + pkg = packages.get(pkg_name, '') + if pkg and cve.affects(pkg.name, pkg.version, pkg.ignored_cves) == cve.CVE_AFFECTS: + pkg.cves.append(cve.identifier) + + +html_header = """ + + + +CVE status for Buildroot configuration + + +

      +""" + + +html_footer = """ + + + +""" + + +def dump_html_pkg(f, pkg): + f.write(" \n") + f.write(" %s\n" % pkg.name) + + # Current version + if len(pkg.version) > 20: + version = pkg.version[:20] + "..." + else: + version = pkg.version + f.write(" %s\n" % version) + + # CVEs + td_class = ["centered"] + if len(pkg.cves) == 0: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" \n" % " ".join(td_class)) + for cve in pkg.cves: + f.write(" %s
      \n" % (cve, cve)) + f.write(" \n") + + f.write(" \n") + + +def dump_html_all_pkgs(f, packages): + f.write(""" + + + + + + +""") + for pkg in packages: + dump_html_pkg(f, pkg) + f.write("
      PackageVersionCVEs
      ") + + +def dump_html_gen_info(f, date): + f.write("

      Generated on %s

      \n" % (str(date))) + + +def dump_html(packages, date, output): + with open(output, 'w') as f: + f.write(html_header) + dump_html_all_pkgs(f, packages) + dump_html_gen_info(f, date) + f.write(html_footer) + + +def dump_json(packages, date, output): + # Format packages as a dictionnary instead of a list + pkgs = { + pkg.name: { + "version": pkg.version, + "cves": pkg.cves, + } for pkg in packages + } + # The actual structure to dump, add date to it + final = {'packages': pkgs, + 'date': str(date)} + with open(output, 'w') as f: + json.dump(final, f, indent=2, separators=(',', ': ')) + f.write('\n') + + +def resolvepath(path): + return os.path.abspath(os.path.expanduser(path)) + + +def parse_args(): + parser = argparse.ArgumentParser() + output = parser.add_argument_group('output', 'Output file(s)') + output.add_argument('--html', dest='html', type=resolvepath, + help='HTML output file') + output.add_argument('--json', dest='json', type=resolvepath, + help='JSON output file') + parser.add_argument('--nvd-path', dest='nvd_path', + help='Path to the local NVD database', type=resolvepath, + required=True) + args = parser.parse_args() + if not args.html and not args.json: + parser.error('at least one of --html or --json (or both) is required') + return args + + +def __main__(): + packages = list() + content = json.load(sys.stdin) + for item in content: + pkg = content[item] + p = Package(item, pkg.get('version', ''), pkg.get('ignore_cves', '')) + packages.append(p) + + args = parse_args() + date = datetime.datetime.utcnow() + + print("Checking packages CVEs") + check_package_cves(args.nvd_path, {p.name: p for p in packages}) + + if args.html: + print("Write HTML") + dump_html(packages, date, args.html) + if args.json: + print("Write JSON") + dump_json(packages, date, args.json) + + +__main__() diff --git a/buildroot/support/scripts/cve.py b/buildroot/support/scripts/cve.py new file mode 100755 index 000000000..6396019e0 --- /dev/null +++ b/buildroot/support/scripts/cve.py @@ -0,0 +1,244 @@ +#!/usr/bin/env python + +# Copyright (C) 2009 by Thomas Petazzoni +# Copyright (C) 2020 by Gregory CLEMENT +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import datetime +import os +import requests # URL checking +import distutils.version +import time +import gzip +import sys +import operator + +try: + import ijson +except ImportError: + sys.stderr.write("You need ijson to parse NVD for CVE check\n") + exit(1) + +sys.path.append('utils/') + +NVD_START_YEAR = 2002 +NVD_JSON_VERSION = "1.1" +NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION + +ops = { + '>=': operator.ge, + '>': operator.gt, + '<=': operator.le, + '<': operator.lt, + '=': operator.eq +} + + +class CVE: + """An accessor class for CVE Items in NVD files""" + CVE_AFFECTS = 1 + CVE_DOESNT_AFFECT = 2 + CVE_UNKNOWN = 3 + + def __init__(self, nvd_cve): + """Initialize a CVE from its NVD JSON representation""" + self.nvd_cve = nvd_cve + + @staticmethod + def download_nvd_year(nvd_path, year): + metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + path_metaf = os.path.join(nvd_path, metaf) + jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) + path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + + # If the database file is less than a day old, we assume the NVD data + # locally available is recent enough. + if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: + return path_jsonf_gz + + # If not, we download the meta file + url = "%s/%s" % (NVD_BASE_URL, metaf) + print("Getting %s" % url) + page_meta = requests.get(url) + page_meta.raise_for_status() + + # If the meta file already existed, we compare the existing + # one with the data newly downloaded. If they are different, + # we need to re-download the database. + # If the database does not exist locally, we need to redownload it in + # any case. + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + meta_known = open(path_metaf, "r").read() + if page_meta.text == meta_known: + return path_jsonf_gz + + # Grab the compressed JSON NVD, and write files to disk + url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + print("Getting %s" % url) + page_json = requests.get(url) + page_json.raise_for_status() + open(path_jsonf_gz, "wb").write(page_json.content) + open(path_metaf, "w").write(page_meta.text) + return path_jsonf_gz + + @classmethod + def read_nvd_dir(cls, nvd_dir): + """ + Iterate over all the CVEs contained in NIST Vulnerability Database + feeds since NVD_START_YEAR. If the files are missing or outdated in + nvd_dir, a fresh copy will be downloaded, and kept in .json.gz + """ + for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): + filename = CVE.download_nvd_year(nvd_dir, year) + try: + content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + except: # noqa: E722 + print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) + raise + for cve in content: + yield cls(cve) + + def each_product(self): + """Iterate over each product section of this cve""" + for vendor in self.nvd_cve['cve']['affects']['vendor']['vendor_data']: + for product in vendor['product']['product_data']: + yield product + + def parse_node(self, node): + """ + Parse the node inside the configurations section to extract the + cpe information usefull to know if a product is affected by + the CVE. Actually only the product name and the version + descriptor are needed, but we also provide the vendor name. + """ + + # The node containing the cpe entries matching the CVE can also + # contain sub-nodes, so we need to manage it. + for child in node.get('children', ()): + for parsed_node in self.parse_node(child): + yield parsed_node + + for cpe in node.get('cpe_match', ()): + if not cpe['vulnerable']: + return + vendor, product, version = cpe['cpe23Uri'].split(':')[3:6] + op_start = '' + op_end = '' + v_start = '' + v_end = '' + + if version != '*' and version != '-': + # Version is defined, this is a '=' match + op_start = '=' + v_start = version + elif version == '-': + # no version information is available + op_start = '=' + v_start = version + else: + # Parse start version, end version and operators + if 'versionStartIncluding' in cpe: + op_start = '>=' + v_start = cpe['versionStartIncluding'] + + if 'versionStartExcluding' in cpe: + op_start = '>' + v_start = cpe['versionStartExcluding'] + + if 'versionEndIncluding' in cpe: + op_end = '<=' + v_end = cpe['versionEndIncluding'] + + if 'versionEndExcluding' in cpe: + op_end = '<' + v_end = cpe['versionEndExcluding'] + + yield { + 'vendor': vendor, + 'product': product, + 'v_start': v_start, + 'op_start': op_start, + 'v_end': v_end, + 'op_end': op_end + } + + def each_cpe(self): + for node in self.nvd_cve['configurations']['nodes']: + for cpe in self.parse_node(node): + yield cpe + + @property + def identifier(self): + """The CVE unique identifier""" + return self.nvd_cve['cve']['CVE_data_meta']['ID'] + + @property + def pkg_names(self): + """The set of package names referred by this CVE definition""" + return set(p['product'] for p in self.each_cpe()) + + def affects(self, name, version, cve_ignore_list): + """ + True if the Buildroot Package object passed as argument is affected + by this CVE. + """ + if self.identifier in cve_ignore_list: + return self.CVE_DOESNT_AFFECT + + pkg_version = distutils.version.LooseVersion(version) + if not hasattr(pkg_version, "version"): + print("Cannot parse package '%s' version '%s'" % (name, version)) + pkg_version = None + + for cpe in self.each_cpe(): + if cpe['product'] != name: + continue + if cpe['v_start'] == '-': + return self.CVE_AFFECTS + if not cpe['v_start'] and not cpe['v_end']: + print("No CVE affected version") + continue + if not pkg_version: + continue + + if cpe['v_start']: + try: + cve_affected_version = distutils.version.LooseVersion(cpe['v_start']) + inrange = ops.get(cpe['op_start'])(pkg_version, cve_affected_version) + except TypeError: + return self.CVE_UNKNOWN + + # current package version is before v_start, so we're + # not affected by the CVE + if not inrange: + continue + + if cpe['v_end']: + try: + cve_affected_version = distutils.version.LooseVersion(cpe['v_end']) + inrange = ops.get(cpe['op_end'])(pkg_version, cve_affected_version) + except TypeError: + return self.CVE_UNKNOWN + + # current package version is after v_end, so we're + # not affected by the CVE + if not inrange: + continue + + # We're in the version range affected by this CVE + return self.CVE_AFFECTS + + return self.CVE_DOESNT_AFFECT diff --git a/buildroot/support/scripts/gen-bootlin-toolchains b/buildroot/support/scripts/gen-bootlin-toolchains new file mode 100755 index 000000000..fce75c51c --- /dev/null +++ b/buildroot/support/scripts/gen-bootlin-toolchains @@ -0,0 +1,498 @@ +#!/usr/bin/env python3 + +import os.path +import re +import requests +import textwrap + +BASE_URL = "https://toolchains.bootlin.com/downloads/releases/toolchains" + +AUTOGENERATED_COMMENT = """# This file was auto-generated by support/scripts/gen-bootlin-toolchains +# Do not edit +""" + +# In the below dict: + +# - 'conditions' indicate the cumulative conditions under which the +# toolchain will be made available. In several situations, a given +# toolchain is usable on several architectures variants (for +# example, an ARMv6 toolchain can be used on ARMv7) +# - 'test_options' indicate one specific configuration where the +# toolchain can be used. It is used to create the runtime test +# cases. If 'test_options' does not exist, the code assumes it can +# be made equal to 'conditions' +# - 'prefix' is the prefix of the cross-compilation toolchain tools + +arches = { + 'aarch64': { + 'conditions': ['BR2_aarch64'], + 'prefix': 'aarch64', + }, + 'aarch64be': { + 'conditions': ['BR2_aarch64_be'], + 'prefix': 'aarch64_be', + }, + 'arcle-750d': { + 'conditions': ['BR2_arcle', 'BR2_arc750d'], + 'prefix': 'arc', + }, + 'arcle-hs38': { + 'conditions': ['BR2_arcle', 'BR2_archs38'], + 'prefix': 'arc', + }, + 'armv5-eabi': { + 'conditions': ['BR2_ARM_CPU_ARMV5', 'BR2_ARM_EABI'], + 'test_options': ['BR2_arm', 'BR2_arm926t', 'BR2_ARM_EABI'], + 'prefix': 'arm', + }, + 'armv6-eabihf': { + 'conditions': ['BR2_ARM_CPU_ARMV6', 'BR2_ARM_EABIHF'], + 'test_options': ['BR2_arm', 'BR2_arm1176jzf_s', 'BR2_ARM_EABIHF'], + 'prefix': 'arm', + }, + 'armv7-eabihf': { + 'conditions': ['BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], + 'test_options': ['BR2_arm', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'], + 'prefix': 'arm', + }, + 'armv7m': { + 'conditions': ['BR2_ARM_CPU_ARMV7M'], + 'test_options': ['BR2_arm', 'BR2_cortex_m4'], + 'prefix': 'arm', + }, + 'm68k-68xxx': { + 'conditions': ['BR2_m68k_m68k'], + 'test_options': ['BR2_m68k', 'BR2_m68k_68040'], + 'prefix': 'm68k', + }, + 'm68k-coldfire': { + 'conditions': ['BR2_m68k_cf'], + 'test_options': ['BR2_m68k', 'BR2_m68k_cf5208'], + 'prefix': 'm68k', + }, + 'microblazebe': { + 'conditions': ['BR2_microblazebe'], + 'prefix': 'microblaze', + }, + 'microblazeel': { + 'conditions': ['BR2_microblazeel'], + 'prefix': 'microblazeel', + }, + 'mips32': { + # Not sure it could be used by other mips32 variants? + 'conditions': ['BR2_mips', 'BR2_mips_32', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mips', + }, + 'mips32el': { + # Not sure it could be used by other mips32el variants? + 'conditions': ['BR2_mipsel', 'BR2_mips_32', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mipsel', + }, + 'mips32r5el': { + 'conditions': ['BR2_mipsel', 'BR2_mips_32r5', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mipsel', + }, + 'mips32r6el': { + 'conditions': ['BR2_mipsel', 'BR2_mips_32r6', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mipsel', + }, + 'mips64': { + # Not sure it could be used by other mips64 variants? + 'conditions': ['BR2_mips64', 'BR2_mips_64', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mips64', + }, + 'mips64-n32': { + # Not sure it could be used by other mips64 variants? + 'conditions': ['BR2_mips64', 'BR2_mips_64', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mips64', + }, + 'mips64el-n32': { + # Not sure it could be used by other mips64el variants? + 'conditions': ['BR2_mips64el', 'BR2_mips_64', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mips64el', + }, + 'mips64r6el-n32': { + 'conditions': ['BR2_mips64el', 'BR2_mips_64r6', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'], + 'prefix': 'mips64el', + }, + 'nios2': { + 'conditions': ['BR2_nios2'], + 'prefix': 'nios2', + }, + 'openrisc': { + 'conditions': ['BR2_or1k'], + 'prefix': 'or1k', + }, + 'powerpc-440fp': { + # Not sure it could be used by other powerpc variants? + 'conditions': ['BR2_powerpc', 'BR2_powerpc_440fp'], + 'prefix': 'powerpc', + }, + 'powerpc-e300c3': { + # Not sure it could be used by other powerpc variants? + 'conditions': ['BR2_powerpc', 'BR2_powerpc_e300c3'], + 'prefix': 'powerpc', + }, + 'powerpc-e500mc': { + # Not sure it could be used by other powerpc variants? + 'conditions': ['BR2_powerpc', 'BR2_powerpc_e500mc'], + 'prefix': 'powerpc', + }, + 'powerpc64-e5500': { + 'conditions': ['BR2_powerpc64', 'BR2_powerpc_e5500'], + 'prefix': 'powerpc64', + }, + 'powerpc64-e6500': { + 'conditions': ['BR2_powerpc64', 'BR2_powerpc_e6500'], + 'prefix': 'powerpc64', + }, + 'powerpc64-power8': { + 'conditions': ['BR2_powerpc64', 'BR2_powerpc_power8'], + 'prefix': 'powerpc64', + }, + 'powerpc64le-power8': { + 'conditions': ['BR2_powerpc64le', 'BR2_powerpc_power8'], + 'prefix': 'powerpc64le', + }, + 'riscv32-ilp32d': { + 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_32', 'BR2_RISCV_ABI_ILP32D'], + 'prefix': 'riscv32', + }, + 'riscv64': { + 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64'], + 'prefix': 'riscv64', + }, + 'sh-sh4': { + 'conditions': ['BR2_sh', 'BR2_sh4'], + 'prefix': 'sh4', + }, + 'sh-sh4aeb': { + 'conditions': ['BR2_sh', 'BR2_sh4aeb'], + 'prefix': 'sh4aeb', + }, + 'sparc64': { + 'conditions': ['BR2_sparc64', 'BR2_sparc_v9'], + 'prefix': 'sparc64', + }, + 'sparcv8': { + 'conditions': ['BR2_sparc', 'BR2_sparc_v8'], + 'prefix': 'sparc', + }, + 'x86-64-core-i7': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42'], + 'test_options': ['BR2_x86_64', 'BR2_x86_corei7'], + 'prefix': 'x86_64', + }, + 'x86-core2': { + 'conditions': ['BR2_i386', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3'], + 'test_options': ['BR2_i386', 'BR2_x86_core2'], + 'prefix': 'i686', + }, + 'x86-i686': { + 'conditions': ['BR2_i386', + '!BR2_x86_i486', + '!BR2_x86_i586', + '!BR2_x86_x1000'], + 'test_options': ['BR2_i386', + 'BR2_x86_i686'], + 'prefix': 'i686', + }, + 'xtensa-lx60': { + 'conditions': ['BR2_xtensa', 'BR2_xtensa_fsf'], + 'prefix': 'xtensa', + }, +} + + +class Toolchain: + def __init__(self, arch, libc, variant, version): + self.arch = arch + self.libc = libc + self.variant = variant + self.version = version + self.fname_prefix = "%s--%s--%s-%s" % (self.arch, self.libc, self.variant, self.version) + self.option_name = "BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_%s_%s_%s" % \ + (self.arch.replace("-", "_").upper(), self.libc.upper(), self.variant.replace("-", "_").upper()) + self.fragment = requests.get(self.fragment_url).text.split("\n") + self.sha256 = requests.get(self.hash_url).text.split(" ")[0] + + @property + def tarball_url(self): + return os.path.join(BASE_URL, self.arch, "tarballs", + self.fname_prefix + ".tar.bz2") + + @property + def hash_url(self): + return os.path.join(BASE_URL, self.arch, "tarballs", + self.fname_prefix + ".sha256") + + @property + def fragment_url(self): + return os.path.join(BASE_URL, self.arch, "fragments", + self.fname_prefix + ".frag") + + def gen_config_in_options(self, f): + f.write("config %s\n" % self.option_name) + f.write("\tbool \"%s %s %s %s\"\n" % + (self.arch, self.libc, self.variant, self.version)) + depends = [] + selects = [] + + for c in arches[self.arch]['conditions']: + depends.append(c) + + for frag in self.fragment: + # libc type + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC"): + selects.append("BR2_TOOLCHAIN_EXTERNAL_UCLIBC") + elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC"): + # glibc needs mmu support + depends.append("BR2_USE_MMU") + # glibc doesn't support static only configuration + depends.append("!BR2_STATIC_LIBS") + selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC") + # all glibc toolchains have RPC support + selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC") + elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL"): + # musl needs mmu support + depends.append("BR2_USE_MMU") + selects.append("BR2_TOOLCHAIN_EXTERNAL_MUSL") + + # gcc version + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_GCC_"): + m = re.match("^BR2_TOOLCHAIN_EXTERNAL_GCC_([0-9_]*)=y$", frag) + assert m, "Cannot get gcc version for toolchain %s" % self.fname_prefix + selects.append("BR2_TOOLCHAIN_GCC_AT_LEAST_%s" % m[1]) + + # kernel headers version + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HEADERS_"): + m = re.match("^BR2_TOOLCHAIN_EXTERNAL_HEADERS_([0-9_]*)=y$", frag) + assert m, "Cannot get kernel headers version for toolchain %s" % self.fname_prefix + selects.append("BR2_TOOLCHAIN_HEADERS_AT_LEAST_%s" % m[1]) + + # C++ + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CXX"): + selects.append("BR2_INSTALL_LIBSTDCPP") + + # SSP + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_SSP"): + selects.append("BR2_TOOLCHAIN_HAS_SSP") + + # wchar + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_WCHAR"): + selects.append("BR2_USE_WCHAR") + + # locale + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_LOCALE"): + # locale implies the availability of wchar + selects.append("BR2_USE_WCHAR") + selects.append("BR2_ENABLE_LOCALE") + + # thread support + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS"): + selects.append("BR2_TOOLCHAIN_HAS_THREADS") + + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG"): + selects.append("BR2_TOOLCHAIN_HAS_THREADS_DEBUG") + + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL"): + selects.append("BR2_TOOLCHAIN_HAS_THREADS_NPTL") + + # RPC + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_INET_RPC"): + selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC") + + # D language + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_DLANG"): + selects.append("BR2_TOOLCHAIN_HAS_DLANG") + + # fortran + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_FORTRAN"): + selects.append("BR2_TOOLCHAIN_HAS_FORTRAN") + + # OpenMP + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_OPENMP"): + selects.append("BR2_TOOLCHAIN_HAS_OPENMP") + + for depend in depends: + f.write("\tdepends on %s\n" % depend) + + for select in selects: + f.write("\tselect %s\n" % select) + + f.write("\thelp\n") + + desc = "Bootlin toolchain for the %s architecture, using the %s C library. " % \ + (self.arch, self.libc) + + if self.variant == "stable": + desc += "This is a stable version, which means it is using stable and proven versions of gcc, gdb and binutils." + else: + desc += "This is a bleeding-edge version, which means it is using the latest versions of gcc, gdb and binutils." + + f.write(textwrap.fill(desc, width=62, initial_indent="\t ", subsequent_indent="\t ") + "\n") + f.write("\n") + f.write("\t https://toolchains.bootlin.com/\n") + + f.write("\n") + + def gen_mk(self, f): + f.write("ifeq ($(%s),y)\n" % self.option_name) + f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = %s\n" % self.version) + f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = %s--%s--%s-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2\n" % + (self.arch, self.libc, self.variant)) + f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = %s\n" % + os.path.join(BASE_URL, self.arch, "tarballs")) + f.write("endif\n\n") + pass + + def gen_hash(self, f): + f.write("# From %s\n" % self.hash_url) + f.write("sha256 %s %s\n" % (self.sha256, os.path.basename(self.tarball_url))) + + def gen_test(self, f): + if self.variant == "stable": + variant = "Stable" + else: + variant = "BleedingEdge" + testname = "TestExternalToolchainBootlin" + \ + self.arch.replace("-", "").capitalize() + \ + self.libc.capitalize() + variant + f.write("\n\n") + f.write("class %s(TestExternalToolchain):\n" % testname) + f.write(" config = \"\"\"\n") + if 'test_options' in arches[self.arch]: + test_options = arches[self.arch]['test_options'] + else: + test_options = arches[self.arch]['conditions'] + for opt in test_options: + if opt.startswith("!"): + f.write(" # %s is not set\n" % opt[1:]) + else: + f.write(" %s=y\n" % opt) + f.write(" BR2_TOOLCHAIN_EXTERNAL=y\n") + f.write(" BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y\n") + f.write(" %s=y\n" % self.option_name) + f.write(" # BR2_TARGET_ROOTFS_TAR is not set\n") + f.write(" \"\"\"\n") + f.write(" toolchain_prefix = \"%s-linux\"\n" % arches[self.arch]['prefix']) + f.write("\n") + f.write(" def test_run(self):\n") + f.write(" TestExternalToolchain.common_check(self)\n") + + def __repr__(self): + return "Toolchain(arch=%s libc=%s variant=%s version=%s, option=%s)" % \ + (self.arch, self.libc, self.variant, self.version, self.option_name) + + +def get_toolchains(): + toolchains = list() + for arch, details in arches.items(): + print(arch) + url = os.path.join(BASE_URL, arch, "available_toolchains") + page = requests.get(url).text + fnames = sorted(re.findall(r'      &1 \ - | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: { extends: .runtime_test }/' \ - | LC_ALL=C sort + cat - "${template}" <<-_EOF_ + # This file is generated; do not edit! + # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines + + image: ${CI_JOB_IMAGE} + +_EOF_ +} + +gen_tests() { + local -a basics defconfigs runtimes + local do_basics do_defconfigs do_runtime + local defconfigs_ext cfg tst + + basics=( DEVELOPERS flake8 package ) + + defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) + + runtimes=( $(./support/testing/run-tests -l 2>&1 \ + | sed -r -e '/^test_run \((.*)\).*/!d; s//\1/' \ + | LC_ALL=C sort) + ) + + if [ -n "${CI_COMMIT_TAG}" ]; then + do_basics=true + do_defconfigs=base + do_runtime=true + elif [ "${CI_PIPELINE_SOURCE}" = "trigger" ]; then + case "${BR_SCHEDULE_JOBS}" in + (basic) + do_basics=true + do_defconfigs=check + defconfigs_ext=_check + ;; + (defconfig) + do_defconfigs=base + ;; + (runtime) + do_runtime=true + ;; + esac + else + case "${CI_COMMIT_REF_NAME}" in + (*-basics) + do_basics=true + do_defconfigs=check + defconfigs_ext=_check + ;; + (*-defconfigs) + do_defconfigs=base + ;; + (*-*_defconfig) + defconfigs=( "${CI_COMMIT_REF_NAME##*-}" ) + do_defconfigs=base + ;; + (*-runtime-tests) + do_runtime=true + ;; + (*-tests.*) + runtimes=( "${CI_COMMIT_REF_NAME##*-}" ) + do_runtime=true + ;; + esac + fi + + # If nothing else, at least do the basics to generate a valid pipeline + if [ -z "${do_defconfigs}" \ + -a -z "${do_runtime}" \ + ] + then + do_basics=true + fi + + if ${do_basics:-false}; then + for tst in "${basics[@]}"; do + printf 'check-%s: { extends: .check-%s_base }\n' "${tst}" "${tst}" + done + fi + + if [ -n "${do_defconfigs}" ]; then + for cfg in "${defconfigs[@]}"; do + printf '%s%s: { extends: .defconfig_%s }\n' \ + "${cfg}" "${defconfigs_ext}" "${do_defconfigs}" + done + fi + + if ${do_runtime:-false}; then + printf '%s: { extends: .runtime_test_base }\n' "${runtimes[@]}" + fi +} + +main "${@}" diff --git a/buildroot/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats index e642147b9..503cc45c1 100755 --- a/buildroot/support/scripts/pkg-stats +++ b/buildroot/support/scripts/pkg-stats @@ -25,20 +25,13 @@ import os from collections import defaultdict import re import subprocess -import requests # NVD database download import json -import ijson -import distutils.version -import time -import gzip import sys sys.path.append('utils/') from getdeveloperlib import parse_developers # noqa: E402 +import cve as cvecheck # noqa: E402 -NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.0" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") @@ -48,10 +41,6 @@ RM_API_STATUS_FOUND_BY_DISTRO = 2 RM_API_STATUS_FOUND_BY_PATTERN = 3 RM_API_STATUS_NOT_FOUND = 4 -CVE_AFFECTS = 1 -CVE_DOESNT_AFFECT = 2 -CVE_UNKNOWN = 3 - class Defconfig: def __init__(self, name, path): @@ -244,11 +233,12 @@ class Package: self.status['pkg-check'] = ("error", "{} warnings".format(self.warnings)) return - def is_cve_ignored(self, cve): + @property + def ignored_cves(self): """ - Tells if the CVE is ignored by the package + Give the list of CVEs ignored by the package """ - return cve in self.all_ignored_cves.get(self.pkgvar(), []) + return list(self.all_ignored_cves.get(self.pkgvar(), [])) def set_developers(self, developers): """ @@ -280,120 +270,6 @@ class Package: self.is_status_ok('license-files'), self.status['hash'], self.patch_count) -class CVE: - """An accessor class for CVE Items in NVD files""" - def __init__(self, nvd_cve): - """Initialize a CVE from its NVD JSON representation""" - self.nvd_cve = nvd_cve - - @staticmethod - def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) - path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) - - # If the database file is less than a day old, we assume the NVD data - # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz - - # If not, we download the meta file - url = "%s/%s" % (NVD_BASE_URL, metaf) - print("Getting %s" % url) - page_meta = requests.get(url) - page_meta.raise_for_status() - - # If the meta file already existed, we compare the existing - # one with the data newly downloaded. If they are different, - # we need to re-download the database. - # If the database does not exist locally, we need to redownload it in - # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): - meta_known = open(path_metaf, "r").read() - if page_meta.text == meta_known: - return path_jsonf_gz - - # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) - print("Getting %s" % url) - page_json = requests.get(url) - page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) - open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz - - @classmethod - def read_nvd_dir(cls, nvd_dir): - """ - Iterate over all the CVEs contained in NIST Vulnerability Database - feeds since NVD_START_YEAR. If the files are missing or outdated in - nvd_dir, a fresh copy will be downloaded, and kept in .json.gz - """ - for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): - filename = CVE.download_nvd_year(nvd_dir, year) - try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') - except: # noqa: E722 - print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) - raise - for cve in content: - yield cls(cve['cve']) - - def each_product(self): - """Iterate over each product section of this cve""" - for vendor in self.nvd_cve['affects']['vendor']['vendor_data']: - for product in vendor['product']['product_data']: - yield product - - @property - def identifier(self): - """The CVE unique identifier""" - return self.nvd_cve['CVE_data_meta']['ID'] - - @property - def pkg_names(self): - """The set of package names referred by this CVE definition""" - return set(p['product_name'] for p in self.each_product()) - - def affects(self, br_pkg): - """ - True if the Buildroot Package object passed as argument is affected - by this CVE. - """ - if br_pkg.is_cve_ignored(self.identifier): - return CVE_DOESNT_AFFECT - - for product in self.each_product(): - if product['product_name'] != br_pkg.name: - continue - - for v in product['version']['version_data']: - if v["version_affected"] == "=": - if br_pkg.current_version == v["version_value"]: - return CVE_AFFECTS - elif v["version_affected"] == "<=": - pkg_version = distutils.version.LooseVersion(br_pkg.current_version) - if not hasattr(pkg_version, "version"): - print("Cannot parse package '%s' version '%s'" % (br_pkg.name, br_pkg.current_version)) - continue - cve_affected_version = distutils.version.LooseVersion(v["version_value"]) - if not hasattr(cve_affected_version, "version"): - print("Cannot parse CVE affected version '%s'" % v["version_value"]) - continue - try: - affected = pkg_version <= cve_affected_version - except TypeError: - return CVE_UNKNOWN - if affected: - return CVE_AFFECTS - else: - return CVE_DOESNT_AFFECT - else: - print("version_affected: %s" % v['version_affected']) - return CVE_DOESNT_AFFECT - - def get_pkglist(npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package @@ -417,7 +293,6 @@ def get_pkglist(npackages, package_list): "package/x11r7/x11r7.mk", "package/doc-asciidoc.mk", "package/pkg-.*.mk", - "package/nvidia-tegra23/nvidia-tegra23.mk", "toolchain/toolchain-external/pkg-toolchain-external.mk", "toolchain/toolchain-external/toolchain-external.mk", "toolchain/toolchain.mk", @@ -656,10 +531,12 @@ def check_package_cves(nvd_path, packages): if not os.path.isdir(nvd_path): os.makedirs(nvd_path) - for cve in CVE.read_nvd_dir(nvd_path): + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): for pkg_name in cve.pkg_names: - if pkg_name in packages and cve.affects(packages[pkg_name]) == CVE_AFFECTS: - packages[pkg_name].cves.append(cve.identifier) + if pkg_name in packages: + pkg = packages[pkg_name] + if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves) == cve.CVE_AFFECTS: + pkg.cves.append(cve.identifier) def calculate_stats(packages): diff --git a/buildroot/support/scripts/pycompile.py b/buildroot/support/scripts/pycompile.py index 8399d5793..2b636e03c 100644 --- a/buildroot/support/scripts/pycompile.py +++ b/buildroot/support/scripts/pycompile.py @@ -15,7 +15,7 @@ import re import sys -def compile_one(host_path, strip_root=None): +def compile_one(host_path, strip_root=None, verbose=False): """ Compile a .py file into a .pyc file located next to it. @@ -24,6 +24,8 @@ def compile_one(host_path, strip_root=None): :arg strip_root: Prefix to remove from the original source paths encoded in compiled files. + :arg verbose: + Print compiled file paths. """ if os.path.islink(host_path) or not os.path.isfile(host_path): return # only compile real files @@ -39,6 +41,9 @@ def compile_one(host_path, strip_root=None): else: runtime_path = host_path + if verbose: + print(" PYC {}".format(runtime_path)) + # will raise an error if the file cannot be compiled py_compile.compile(host_path, cfile=host_path + "c", dfile=runtime_path, doraise=True) @@ -63,6 +68,8 @@ def main(): Prefix to remove from the original source paths encoded in compiled files """) + parser.add_argument("--verbose", action="store_true", + help="Print compiled files") args = parser.parse_args() @@ -72,7 +79,8 @@ def main(): parser.error("DIR: not inside ROOT dir: {!r}".format(d)) for parent, _, files in os.walk(d): for f in files: - compile_one(os.path.join(parent, f), args.strip_root) + compile_one(os.path.join(parent, f), args.strip_root, + args.verbose) except Exception as e: print("error: {}".format(e)) diff --git a/buildroot/support/testing/conf/docker-compose-kernel.config b/buildroot/support/testing/conf/docker-compose-kernel.config index 9468ef8db..4d30a578e 100644 --- a/buildroot/support/testing/conf/docker-compose-kernel.config +++ b/buildroot/support/testing/conf/docker-compose-kernel.config @@ -1,16 +1,7 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y -CONFIG_CGROUPS=y -CONFIG_MEMCG=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y # CONFIG_COMPAT_BRK is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_IOSF_MBI=y @@ -38,33 +29,19 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y # CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CT_PROTO_DCCP is not set # CONFIG_NF_CT_PROTO_SCTP is not set # CONFIG_NF_CT_PROTO_UDPLITE is not set -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_IPVS=y CONFIG_IP_VS=y CONFIG_IP_VS_RR=y CONFIG_IP_VS_NFCT=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_BRIDGE=y # CONFIG_BRIDGE_IGMP_SNOOPING is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MACVLAN=y -CONFIG_VXLAN=y -CONFIG_VETH=y CONFIG_VIRTIO_NET=y # CONFIG_ETHERNET is not set # CONFIG_WLAN is not set @@ -90,12 +67,9 @@ CONFIG_VIRTIO_PCI=y # CONFIG_X86_PLATFORM_DEVICES is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT4_FS=y -CONFIG_OVERLAY_FS=y -CONFIG_OVERLAY_FS_REDIRECT_DIR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_KEYS=y CONFIG_SECURITYFS=y # CONFIG_CRYPTO_ECHAINIV is not set # CONFIG_CRYPTO_HW is not set diff --git a/buildroot/support/testing/infra/basetest.py b/buildroot/support/testing/infra/basetest.py index 5dc603444..a97a81444 100644 --- a/buildroot/support/testing/infra/basetest.py +++ b/buildroot/support/testing/infra/basetest.py @@ -11,11 +11,11 @@ BASIC_TOOLCHAIN_CONFIG = \ BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.05-1078-g95b1dae.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y + BR2_TOOLCHAIN_EXTERNAL_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2018.11-1.tar.bz2" + BR2_TOOLCHAIN_EXTERNAL_GCC_8=y + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y - # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set + BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y BR2_TOOLCHAIN_EXTERNAL_CXX=y """ diff --git a/buildroot/support/testing/infra/builder.py b/buildroot/support/testing/infra/builder.py index 88f01d15c..922a70722 100644 --- a/buildroot/support/testing/infra/builder.py +++ b/buildroot/support/testing/infra/builder.py @@ -12,6 +12,23 @@ class Builder(object): self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + def is_defconfig_valid(self, configfile, defconfig): + """Check if the .config is contains all lines present in the defconfig.""" + with open(configfile) as configf: + configlines = configf.readlines() + + defconfiglines = defconfig.split("\n") + + # Check that all the defconfig lines are still present + for defconfigline in defconfiglines: + if defconfigline + "\n" not in configlines: + self.logfile.write("WARN: defconfig can't be used\n") + self.logfile.write(" Missing: %s\n" % defconfigline.strip()) + self.logfile.flush() + return False + + return True + def configure(self, make_extra_opts=[], make_extra_env={}): """Configure the build. @@ -47,6 +64,9 @@ class Builder(object): if ret != 0: raise SystemError("Cannot olddefconfig") + if not self.is_defconfig_valid(config_file, self.config): + raise SystemError("The defconfig is not valid") + def build(self, make_extra_opts=[], make_extra_env={}): """Perform the build. diff --git a/buildroot/support/testing/tests/boot/test_atf.py b/buildroot/support/testing/tests/boot/test_atf.py index 21c3ec314..08a0b7af2 100644 --- a/buildroot/support/testing/tests/boot/test_atf.py +++ b/buildroot/support/testing/tests/boot/test_atf.py @@ -10,14 +10,15 @@ class TestATFVexpress(infra.basetest.BRTest): BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_VEXPRESS_FIRMWARE=y """ diff --git a/buildroot/support/testing/tests/boot/test_syslinux.py b/buildroot/support/testing/tests/boot/test_syslinux.py new file mode 100644 index 000000000..f25cddfb6 --- /dev/null +++ b/buildroot/support/testing/tests/boot/test_syslinux.py @@ -0,0 +1,84 @@ +import infra.basetest + + +class TestSysLinuxBase(infra.basetest.BRTest): + x86_toolchain_config = \ + """ + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y + BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2" + BR2_TOOLCHAIN_EXTERNAL_GCC_8=y + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y + BR2_TOOLCHAIN_EXTERNAL_CXX=y + """ + + x86_64_toolchain_config = \ + """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y + BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2018.11-1.tar.bz2" + BR2_TOOLCHAIN_EXTERNAL_GCC_7=y + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y + BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y + """ + + syslinux_legacy_config = \ + """ + BR2_TARGET_SYSLINUX=y + BR2_TARGET_SYSLINUX_ISOLINUX=y + BR2_TARGET_SYSLINUX_PXELINUX=y + BR2_TARGET_SYSLINUX_MBR=y + """ + + syslinux_efi_config = \ + """ + BR2_TARGET_SYSLINUX=y + BR2_TARGET_SYSLINUX_EFI=y + """ + + +class TestSysLinuxX86LegacyBios(TestSysLinuxBase): + config = \ + TestSysLinuxBase.x86_toolchain_config + \ + infra.basetest.MINIMAL_CONFIG + \ + TestSysLinuxBase.syslinux_legacy_config + + def test_run(self): + pass + + +class TestSysLinuxX86EFI(TestSysLinuxBase): + config = \ + TestSysLinuxBase.x86_toolchain_config + \ + infra.basetest.MINIMAL_CONFIG + \ + TestSysLinuxBase.syslinux_efi_config + + def test_run(self): + pass + + +class TestSysLinuxX86_64LegacyBios(TestSysLinuxBase): + config = \ + TestSysLinuxBase.x86_64_toolchain_config + \ + infra.basetest.MINIMAL_CONFIG + \ + TestSysLinuxBase.syslinux_legacy_config + + def test_run(self): + pass + + +class TestSysLinuxX86_64EFI(TestSysLinuxBase): + config = \ + TestSysLinuxBase.x86_64_toolchain_config + \ + infra.basetest.MINIMAL_CONFIG + \ + TestSysLinuxBase.syslinux_efi_config + + def test_run(self): + pass diff --git a/buildroot/support/testing/tests/core/test_selinux.py b/buildroot/support/testing/tests/core/test_selinux.py new file mode 100644 index 000000000..28d99d3a6 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestSELinuxInfra(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG +\ + """ + BR2_PACKAGE_REFPOLICY=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_SETOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + """ + + def base_test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + +class TestSELinuxExtraModules(TestSELinuxInfra): + config = TestSELinuxInfra.config + \ + """ + BR2_REFPOLICY_EXTRA_MODULES="ntp tor" + """ + + def test_run(self): + TestSELinuxInfra.base_test_run(self) + + out, ret = self.emulator.run("seinfo -t ntpd_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "ntpd_t") + + out, ret = self.emulator.run("seinfo -t tor_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "tor_t") + +class TestSELinuxExtraModulesDirs(TestSELinuxInfra): + config = TestSELinuxInfra.config + \ + """ + BR2_REFPOLICY_EXTRA_MODULES_DIRS="{}" + """.format(infra.filepath("tests/core/test_selinux/extra_modules")) + + def test_run(self): + TestSELinuxInfra.base_test_run(self) + + out, ret = self.emulator.run("seinfo -t buildroot_test_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "buildroot_test_t") + +class TestSELinuxCustomGit(TestSELinuxInfra): + config = TestSELinuxInfra.config + \ + """ + BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y + BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL="https://github.com/SELinuxProject/refpolicy.git" + BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION="RELEASE_2_20200818" + """ + + def test_run(self): + pass + +class TestSELinuxPackage(TestSELinuxInfra): + br2_external = [infra.filepath("tests/core/test_selinux/br2_external")] + config = TestSELinuxInfra.config + \ + """ + BR2_PACKAGE_SELINUX_TEST=y + """ + + def test_run(self): + TestSELinuxInfra.base_test_run(self) + + out, ret = self.emulator.run("seinfo -t ntpd_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "ntpd_t") + + out, ret = self.emulator.run("seinfo -t tor_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "tor_t") + + out, ret = self.emulator.run("seinfo -t buildroot_test_t", 15) + self.assertEqual(ret, 0) + self.assertEqual(out[2].strip(), "buildroot_test_t") diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/Config.in b/buildroot/support/testing/tests/core/test_selinux/br2_external/Config.in new file mode 100644 index 000000000..9d9c84ee3 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_SELINUX_PATH/package/selinux-test/Config.in" diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/external.desc b/buildroot/support/testing/tests/core/test_selinux/br2_external/external.desc new file mode 100644 index 000000000..44b5b95f5 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/external.desc @@ -0,0 +1 @@ +name: SELINUX diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/external.mk b/buildroot/support/testing/tests/core/test_selinux/br2_external/external.mk new file mode 100644 index 000000000..54d2402d5 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_SELINUX_PATH)/package/*/*.mk)) diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/Config.in b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/Config.in new file mode 100644 index 000000000..e30ac8310 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_SELINUX_TEST + bool "SELinux test package" + help + Test package for SELinux Buildroot helpers. diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux-test.mk b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux-test.mk new file mode 100644 index 000000000..0100b718b --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux-test.mk @@ -0,0 +1,9 @@ +################################################################################ +# +# SELinux test package +# +################################################################################ + +SELINUX_TEST_SELINUX_MODULES = ntp tor + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.fc b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.fc new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.if b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.if new file mode 100644 index 000000000..acf797e60 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.if @@ -0,0 +1 @@ +## Buildroot rules diff --git a/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.te b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.te new file mode 100644 index 000000000..266bc03be --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/br2_external/package/selinux-test/selinux/buildroot.te @@ -0,0 +1,3 @@ +policy_module(buildroot, 1.0.0) + +type buildroot_test_t; diff --git a/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.fc b/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.fc new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.if b/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.if new file mode 100644 index 000000000..acf797e60 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.if @@ -0,0 +1 @@ +## Buildroot rules diff --git a/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.te b/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.te new file mode 100644 index 000000000..266bc03be --- /dev/null +++ b/buildroot/support/testing/tests/core/test_selinux/extra_modules/buildroot.te @@ -0,0 +1,3 @@ +policy_module(buildroot, 1.0.0) + +type buildroot_test_t; diff --git a/buildroot/support/testing/tests/init/test_openrc.py b/buildroot/support/testing/tests/init/test_openrc.py new file mode 100644 index 000000000..14839434e --- /dev/null +++ b/buildroot/support/testing/tests/init/test_openrc.py @@ -0,0 +1,50 @@ +from tests.init.base import InitSystemBase as InitSystemBase + + +class InitSystemOpenrcBase(InitSystemBase): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_INIT_OPENRC=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def check_init(self): + super(InitSystemOpenrcBase, self).check_init('/sbin/openrc-init') + + # Test all services are OK + output, _ = self.emulator.run("rc-status -c") + self.assertEqual(len(output), 0) + + +class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): + config = InitSystemOpenrcBase.config + \ + """ + BR2_SYSTEM_DHCP="eth0" + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set + BR2_TARGET_ROOTFS_SQUASHFS=y + """ + + def test_run(self): + self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") + self.check_init() + + +class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): + config = InitSystemOpenrcBase.config + \ + """ + BR2_SYSTEM_DHCP="eth0" + BR2_TARGET_ROOTFS_EXT2=y + """ + + def test_run(self): + self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") + self.check_init() diff --git a/buildroot/support/testing/tests/init/test_systemd.py b/buildroot/support/testing/tests/init/test_systemd.py index 0ac18cb62..371be4ad7 100644 --- a/buildroot/support/testing/tests/init/test_systemd.py +++ b/buildroot/support/testing/tests/init/test_systemd.py @@ -6,6 +6,8 @@ class InitSystemSystemdBase(InitSystemBase): config = \ """ BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" diff --git a/buildroot/support/testing/tests/init/test_systemd_selinux.py b/buildroot/support/testing/tests/init/test_systemd_selinux.py new file mode 100644 index 000000000..9a98a3282 --- /dev/null +++ b/buildroot/support/testing/tests/init/test_systemd_selinux.py @@ -0,0 +1,74 @@ +import os + +import infra.basetest + + +class TestSELinuxSystemd(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_INIT_SYSTEMD=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.12" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_PACKAGE_LIBSELINUX=y + BR2_PACKAGE_REFPOLICY=y + """ + + def wait_boot(self): + # The complete boot with systemd takes more time than what the default multipler permits + self.emulator.timeout_multiplier *= 10 + self.emulator.login() + + def run_tests(self, fstype): + kernel = os.path.join(self.builddir, "images", "bzImage") + rootfs = os.path.join(self.builddir, "images", "rootfs.{}".format(fstype)) + + self.emulator.boot(arch="x86_64", kernel=kernel, + kernel_cmdline=["root=/dev/vda", "rootfstype={}".format(fstype), + "console=ttyS0", "security=selinux"], + options=["-cpu", "Nehalem", + "-drive", "file={},if=virtio,format=raw".format(rootfs)]) + self.wait_boot() + + # Test the reported SELinux mode. + out, ret = self.emulator.run("getenforce") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Permissive") + + # Check the extended arguments are correctly set. + out, ret = self.emulator.run("ls -dZ /") + self.assertEqual(ret, 0) + self.assertEqual(out[0].split()[0], "system_u:object_r:root_t") + + # Check init's attributes. + out, ret = self.emulator.run("cat /proc/1/attr/current") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "system_u:system_r:init_t\0") + +class TestSELinuxSystemdExt4(TestSELinuxSystemd): + config = TestSELinuxSystemd.config + \ + """ + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="100M" + """ + + def test_run(self): + self.run_tests("ext4") + +class TestSELinuxSystemdSquashfs(TestSELinuxSystemd): + config = TestSELinuxSystemd.config + \ + """ + BR2_TARGET_ROOTFS_SQUASHFS=y + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + """.format( + infra.filepath("tests/init/test_systemd_selinux/linux-squashfs.fragment"), + ) + + def test_run(self): + self.run_tests("squashfs") diff --git a/buildroot/support/testing/tests/init/test_systemd_selinux/linux-squashfs.fragment b/buildroot/support/testing/tests/init/test_systemd_selinux/linux-squashfs.fragment new file mode 100644 index 000000000..7a89d006f --- /dev/null +++ b/buildroot/support/testing/tests/init/test_systemd_selinux/linux-squashfs.fragment @@ -0,0 +1 @@ +CONFIG_SQUASHFS=y diff --git a/buildroot/support/testing/tests/package/sample_gst1_python.py b/buildroot/support/testing/tests/package/sample_gst1_python.py new file mode 100644 index 000000000..fab7e74f4 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_gst1_python.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +"""A simple test that uses gst1-python to run a fake videotestsrc for 100 +frames +""" +import sys +import gi +gi.require_version('Gst', '1.0') +from gi.repository import Gst, GLib # noqa: E402 + + +def on_message(bus, message, loop): + print('Received Gst.Message.type: {}'.format(message.type)) + if message.type == Gst.MessageType.EOS: + loop.quit() + return True + + +def main(): + # Initializes Gstreamer + Gst.init(sys.argv) + pipeline = Gst.parse_launch("videotestsrc num-buffers=100 ! fakevideosink") + bus = pipeline.get_bus() + bus.add_signal_watch() + pipeline.set_state(Gst.State.PLAYING) + loop = GLib.MainLoop() + bus.connect("message", on_message, loop) + loop.run() + pipeline.set_state(Gst.State.NULL) + + +if __name__ == '__main__': + main() diff --git a/buildroot/support/testing/tests/package/sample_python_colorzero.py b/buildroot/support/testing/tests/package/sample_python_colorzero.py new file mode 100644 index 000000000..23862a816 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_colorzero.py @@ -0,0 +1,8 @@ +from colorzero import Color + +red = Color('red') +green = Color('lime') +blue = Color('blue') +assert(red.rgb == (1.0, 0.0, 0.0)) +assert(green.rgb == (0.0, 1.0, 0.0)) +assert(blue.rgb == (0.0, 0.0, 1.0)) diff --git a/buildroot/support/testing/tests/package/sample_python_gobject.py b/buildroot/support/testing/tests/package/sample_python_gobject.py index 84ebee736..50564aa79 100644 --- a/buildroot/support/testing/tests/package/sample_python_gobject.py +++ b/buildroot/support/testing/tests/package/sample_python_gobject.py @@ -1 +1,14 @@ -import gobject # noqa +#!/usr/bin/env python +"""A simple test that uses python-gobject to find the path of sh.""" +from gi.repository import GLib + + +def main(): + sh_path = GLib.find_program_in_path('sh') + if sh_path == "/bin/sh": + return True + return False + + +if __name__ == '__main__': + main() diff --git a/buildroot/support/testing/tests/package/sample_python_gpiozero.py b/buildroot/support/testing/tests/package/sample_python_gpiozero.py new file mode 100644 index 000000000..b95df07fe --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_gpiozero.py @@ -0,0 +1,5 @@ +from gpiozero import pi_info + +piBoardInfo = pi_info('a020d3') # 3B+ + +assert(piBoardInfo.model == '3B+') diff --git a/buildroot/support/testing/tests/package/sample_python_pytest.py b/buildroot/support/testing/tests/package/sample_python_pytest.py new file mode 100644 index 000000000..870cc8512 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pytest.py @@ -0,0 +1,25 @@ +import pytest + + +x = 1 + + +@pytest.fixture() +def f1(): + global x + x = 2 + yield 15 + x = 3 + + +def test_1(): + assert x == 1 + + +def test_2(f1): + assert x == 2 + assert f1 == 15 + + +def test_3(): + assert x == 3 diff --git a/buildroot/support/testing/tests/package/sample_python_rpi_gpio.py b/buildroot/support/testing/tests/package/sample_python_rpi_gpio.py new file mode 100644 index 000000000..5f0d884e0 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_rpi_gpio.py @@ -0,0 +1,6 @@ +try: + import RPi.GPIO # noqa +except RuntimeError as e: + assert(str(e) == 'This module can only be run on a Raspberry Pi!') +else: + raise RuntimeError('Import succeeded when it should not have!') diff --git a/buildroot/support/testing/tests/package/test_glxinfo.py b/buildroot/support/testing/tests/package/test_glxinfo.py index a9df6ddf6..f37236d16 100644 --- a/buildroot/support/testing/tests/package/test_glxinfo.py +++ b/buildroot/support/testing/tests/package/test_glxinfo.py @@ -15,12 +15,8 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2018.11-1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y - # BR2_TOOLCHAIN_EXTERNAL_LOCALE is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y - BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG=y - BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS=y - BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y diff --git a/buildroot/support/testing/tests/package/test_gst1_python.py b/buildroot/support/testing/tests/package/test_gst1_python.py new file mode 100644 index 000000000..caae3e6b2 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_gst1_python.py @@ -0,0 +1,31 @@ +import os +from tests.package.test_python import TestPythonPackageBase + + +class TestGst1Python(TestPythonPackageBase): + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y + BR2_PACKAGE_GSTREAMER1=y + BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y + BR2_PACKAGE_GST1_PLUGINS_BAD=y + BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y + BR2_PACKAGE_GST1_PYTHON=y + BR2_PACKAGE_PYTHON3=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + sample_scripts = ["tests/package/sample_gst1_python.py"] + timeout = 200 diff --git a/buildroot/support/testing/tests/package/test_lua_lyaml.py b/buildroot/support/testing/tests/package/test_lua_lyaml.py new file mode 100644 index 000000000..ece3c675a --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lua_lyaml.py @@ -0,0 +1,27 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaLyaml(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_LYAML=y + """ + + def test_run(self): + self.login() + self.module_test("yaml") + self.module_test("lyaml") + + +class TestLuajitLuaLyaml(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_LYAML=y + """ + + def test_run(self): + self.login() + self.module_test("yaml") + self.module_test("lyaml") diff --git a/buildroot/support/testing/tests/package/test_lua_utf8.py b/buildroot/support/testing/tests/package/test_lua_utf8.py index 3eab19dd4..5946a439c 100644 --- a/buildroot/support/testing/tests/package/test_lua_utf8.py +++ b/buildroot/support/testing/tests/package/test_lua_utf8.py @@ -10,7 +10,7 @@ class TestLuaUtf8(TestLuaBase): def test_run(self): self.login() - self.module_test("utf8") + self.module_test("lua-utf8") class TestLuajitUtf8(TestLuaBase): @@ -22,4 +22,4 @@ class TestLuajitUtf8(TestLuaBase): def test_run(self): self.login() - self.module_test("utf8") + self.module_test("lua-utf8") diff --git a/buildroot/support/testing/tests/package/test_lxc.py b/buildroot/support/testing/tests/package/test_lxc.py index 346247da0..b32b7a20c 100644 --- a/buildroot/support/testing/tests/package/test_lxc.py +++ b/buildroot/support/testing/tests/package/test_lxc.py @@ -7,6 +7,8 @@ class TestLxc(infra.basetest.BRTest): config = \ """ BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y diff --git a/buildroot/support/testing/tests/package/test_netdata.py b/buildroot/support/testing/tests/package/test_netdata.py new file mode 100644 index 000000000..7418b762a --- /dev/null +++ b/buildroot/support/testing/tests/package/test_netdata.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestNetdata(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NETDATA=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + cmd = "wget localhost:19999 -O - | grep 'netdata dashboard'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_openssh.py b/buildroot/support/testing/tests/package/test_openssh.py new file mode 100644 index 000000000..2ae5030d5 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_openssh.py @@ -0,0 +1,60 @@ +import os + +import infra.basetest + + +class TestOpensshBase(infra.basetest.BRTest): + passwd = "testpwd" + opensshconfig = \ + """ + BR2_TARGET_GENERIC_ROOT_PASSWD="{}" + BR2_PACKAGE_OPENSSH=y + BR2_PACKAGE_SSHPASS=y + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + passwd, + infra.filepath("tests/package/test_openssh/post-build.sh")) + + def openssh_test(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img, + "-net", "none"]) + self.emulator.login(self.passwd) + + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:22" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + cmd = "sshpass -p {} ssh -oStrictHostKeyChecking=no localhost /bin/true".format(self.passwd) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + +class TestOpenSshuClibc(TestOpensshBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + TestOpensshBase.opensshconfig + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + """ + + def test_run(self): + self.openssh_test() + + +class TestOpenSshGlibc(TestOpensshBase): + config = \ + TestOpensshBase.opensshconfig + \ + """ + BR2_arm=y + BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + BR2_KERNEL_HEADERS_4_19=y + BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_PACKAGE_RNG_TOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + """ + + def test_run(self): + self.openssh_test() diff --git a/buildroot/support/testing/tests/package/test_openssh/post-build.sh b/buildroot/support/testing/tests/package/test_openssh/post-build.sh new file mode 100755 index 000000000..5a81ede56 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_openssh/post-build.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +cat <<_EOF_ >>"${TARGET_DIR}/etc/ssh/sshd_config" +PermitRootLogin yes +PasswordAuthentication yes +_EOF_ diff --git a/buildroot/support/testing/tests/package/test_perl_html_parser.py b/buildroot/support/testing/tests/package/test_perl_html_parser.py new file mode 100644 index 000000000..643163348 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_html_parser.py @@ -0,0 +1,20 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlHTMLParser(TestPerlBase): + """ + package: + HTML-Parser XS + direct dependencies: + HTML-Tagset + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_HTML_PARSER=y + """ + + def test_run(self): + self.login() + self.module_test("HTML::Parser") diff --git a/buildroot/support/testing/tests/package/test_perl_lwp_protocol_https.py b/buildroot/support/testing/tests/package/test_perl_lwp_protocol_https.py new file mode 100644 index 000000000..35437459a --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_lwp_protocol_https.py @@ -0,0 +1,42 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlLWPProtocolhttps(TestPerlBase): + """ + package: + LWP-Protocol-https + direct dependencies: + IO-Socket-SSL + Mozilla-CA + Net-HTTP + libwww-perl + indirect dependencies: + Encode-Locale + File-Listing + HTML-Parser XS + HTML-Tagset + HTTP-Cookies + HTTP-Daemon + HTTP-Date + HTTP-Message + HTTP-Negotiate + IO-HTML + LWP-MediaTypes + Net-SSLeay XS + TimeDate + Try-Tiny + URI + WWW-RobotRules + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_LWP_PROTOCOL_HTTPS=y + """ + + def test_run(self): + self.login() + self.module_test("HTML::Parser") + self.module_test("Net::SSLeay") + self.module_test("LWP::Protocol::https") diff --git a/buildroot/support/testing/tests/package/test_python_autobahn.py b/buildroot/support/testing/tests/package/test_python_autobahn.py index af1f617d6..a237ce465 100644 --- a/buildroot/support/testing/tests/package/test_python_autobahn.py +++ b/buildroot/support/testing/tests/package/test_python_autobahn.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Autobahn(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_AUTOBAHN=y - """ - sample_scripts = ["tests/package/sample_python_autobahn.py"] - - class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/buildroot/support/testing/tests/package/test_python_colorzero.py b/buildroot/support/testing/tests/package/test_python_colorzero.py new file mode 100644 index 000000000..b7c228ac3 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_colorzero.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Colorzero(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_COLORZERO=y + """ + sample_scripts = ["tests/package/sample_python_colorzero.py"] + timeout = 30 + + +class TestPythonPy3Colorzero(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_COLORZERO=y + """ + sample_scripts = ["tests/package/sample_python_colorzero.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_gobject.py b/buildroot/support/testing/tests/package/test_python_gobject.py index 0a59447ad..cd8a43252 100644 --- a/buildroot/support/testing/tests/package/test_python_gobject.py +++ b/buildroot/support/testing/tests/package/test_python_gobject.py @@ -1,11 +1,27 @@ +import os from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Gobject(TestPythonPackageBase): +class TestPythonPy3Gobject(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + config = \ """ - BR2_PACKAGE_PYTHON=y + BR2_arm=y + BR2_ARM_ENABLE_VFP=y + BR2_cortex_a9=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_GOBJECT_INTROSPECTION=y + BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_GOBJECT=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + sample_scripts = ["tests/package/sample_python_gobject.py"] diff --git a/buildroot/support/testing/tests/package/test_python_gpiozero.py b/buildroot/support/testing/tests/package/test_python_gpiozero.py new file mode 100644 index 000000000..2498a5551 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_gpiozero.py @@ -0,0 +1,32 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonGpiozero(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_gpiozero.py"] + + def run_sample_scripts(self): + cmd = self.interpreter + " sample_python_gpiozero.py" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + cmd = "pinout -r a020d3 -m | cat" + self.assertRunOk(cmd) + + +class TestPythonPy2Gpiozero(TestPythonGpiozero): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GPIOZERO=y + """ + + +class TestPythonPy3Gpiozero(TestPythonGpiozero): + __test__ = True + config = TestPythonGpiozero.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GPIOZERO=y + """ diff --git a/buildroot/support/testing/tests/package/test_python_pytest.py b/buildroot/support/testing/tests/package/test_python_pytest.py new file mode 100644 index 000000000..7fa7e4401 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_pytest.py @@ -0,0 +1,19 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Pytest(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYTEST=y + """ + sample_scripts = ["tests/package/sample_python_pytest.py"] + + def run_sample_scripts(self): + for script in self.sample_scripts: + cmd = self.interpreter + " -m pytest " + os.path.basename(script) + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_python_rpi_gpio.py b/buildroot/support/testing/tests/package/test_python_rpi_gpio.py new file mode 100644 index 000000000..c938ea39b --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_rpi_gpio.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RpiGpio(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RPI_GPIO=y + """ + sample_scripts = ["tests/package/sample_python_rpi_gpio.py"] diff --git a/buildroot/support/testing/tests/package/test_python_txaio.py b/buildroot/support/testing/tests/package/test_python_txaio.py index 7bff1bc23..f1bb2c79a 100644 --- a/buildroot/support/testing/tests/package/test_python_txaio.py +++ b/buildroot/support/testing/tests/package/test_python_txaio.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txaio(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXAIO=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - sample_scripts = ["tests/package/sample_python_txaio_twisted.py"] - - class TestPythonPy3Txaio(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/buildroot/support/testing/tests/package/test_redis.py b/buildroot/support/testing/tests/package/test_redis.py new file mode 100644 index 000000000..d79998514 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_redis.py @@ -0,0 +1,24 @@ +import os + +import infra.basetest + + +class TestRedis(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_REDIS=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + _, exit_code = self.emulator.run("redis-cli SET hello world") + self.assertEqual(exit_code, 0) + + output, exit_code = self.emulator.run("redis-cli GET hello") + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), '"world"') diff --git a/buildroot/support/testing/tests/package/test_rust.py b/buildroot/support/testing/tests/package/test_rust.py index 9854c3692..15bb93dd9 100644 --- a/buildroot/support/testing/tests/package/test_rust.py +++ b/buildroot/support/testing/tests/package/test_rust.py @@ -73,7 +73,6 @@ class TestRustBin(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y """ @@ -102,7 +101,6 @@ class TestRust(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y """ diff --git a/buildroot/support/testing/tests/package/test_tmux.py b/buildroot/support/testing/tests/package/test_tmux.py index 7eb23cac9..b31854cab 100644 --- a/buildroot/support/testing/tests/package/test_tmux.py +++ b/buildroot/support/testing/tests/package/test_tmux.py @@ -6,7 +6,6 @@ import infra.basetest class TestTmux(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_GENERATE_LOCALE="en_US.UTF-8" BR2_PACKAGE_TMUX=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/support/testing/tests/toolchain/test_external.py b/buildroot/support/testing/tests/toolchain/test_external.py index 881d2b00d..db62a8439 100644 --- a/buildroot/support/testing/tests/toolchain/test_external.py +++ b/buildroot/support/testing/tests/toolchain/test_external.py @@ -26,11 +26,15 @@ class TestExternalToolchain(infra.basetest.BRTest): path = os.path.join(self.builddir, "target", d) self.assertFalse(has_broken_links(path)) - interp = infra.get_elf_prog_interpreter(self.builddir, - self.toolchain_prefix, - "bin/busybox") - interp_path = os.path.join(self.builddir, "target", interp[1:]) - self.assertTrue(os.path.exists(interp_path)) + with open(os.path.join(self.builddir, ".config"), 'r') as configf: + configlines = [l.strip() for l in configf.readlines()] + + if "BR2_BINFMT_ELF=y" in configlines: + interp = infra.get_elf_prog_interpreter(self.builddir, + self.toolchain_prefix, + "bin/busybox") + interp_path = os.path.join(self.builddir, "target", interp[1:]) + self.assertTrue(os.path.exists(interp_path)) class TestExternalToolchainSourceryArmv4(TestExternalToolchain): diff --git a/buildroot/support/testing/tests/toolchain/test_external_bootlin.py b/buildroot/support/testing/tests/toolchain/test_external_bootlin.py new file mode 100644 index 000000000..2edbfb320 --- /dev/null +++ b/buildroot/support/testing/tests/toolchain/test_external_bootlin.py @@ -0,0 +1,2594 @@ +# This file was auto-generated by support/scripts/gen-bootlin-toolchains +# Do not edit +from tests.toolchain.test_external import TestExternalToolchain + + +class TestExternalToolchainBootlinAarch64GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64GlibcStable(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64MuslStable(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64UclibcStable(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64beGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_aarch64_be=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64_be-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64beGlibcStable(TestExternalToolchain): + config = """ + BR2_aarch64_be=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64_be-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64beUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_aarch64_be=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64_be-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinAarch64beUclibcStable(TestExternalToolchain): + config = """ + BR2_aarch64_be=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64_be-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArcle750dUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_arc750d=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArcle750dUclibcStable(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_arc750d=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArclehs38GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArclehs38GlibcStable(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArclehs38UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArclehs38UclibcStable(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiGlibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiMuslStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv5eabiUclibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm926t=y + BR2_ARM_EABI=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfGlibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfMuslStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv6eabihfUclibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_arm1176jzf_s=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfGlibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfMuslStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7eabihfUclibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7mUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_m4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmv7mUclibcStable(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_m4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68k68xxxUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68k68xxxUclibcStable(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68kcoldfireUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_cf5208=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68kcoldfireUclibcStable(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_cf5208=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeGlibcStable(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeMuslStable(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazebeUclibcStable(TestExternalToolchain): + config = """ + BR2_microblazebe=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblaze-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelGlibcStable(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelMuslStable(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMicroblazeelUclibcStable(TestExternalToolchain): + config = """ + BR2_microblazeel=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "microblazeel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32GlibcStable(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32MuslStable(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32UclibcStable(TestExternalToolchain): + config = """ + BR2_mips=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elGlibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elMuslStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32elUclibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elGlibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elMuslStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r5elUclibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r5=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elGlibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elMuslStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips32r6elUclibcStable(TestExternalToolchain): + config = """ + BR2_mipsel=y + BR2_mips_32r6=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mipsel-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32GlibcStable(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32MuslStable(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64n32UclibcStable(TestExternalToolchain): + config = """ + BR2_mips64=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32GlibcStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32MuslStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64eln32UclibcStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32GlibcStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32MuslStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinMips64r6eln32UclibcStable(TestExternalToolchain): + config = """ + BR2_mips64el=y + BR2_mips_64r6=y + BR2_MIPS_NABI32=y + # BR2_MIPS_SOFT_FLOAT is not set + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "mips64el-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinNios2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_nios2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "nios2-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinNios2GlibcStable(TestExternalToolchain): + config = """ + BR2_nios2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "nios2-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinOpenriscMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinOpenriscMuslStable(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinOpenriscUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinOpenriscUclibcStable(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpGlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpMuslStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc440fpUclibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_440fp=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3GlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3MuslStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce300c3UclibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e300c3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcGlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcMuslStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpce500mcUclibcStable(TestExternalToolchain): + config = """ + BR2_powerpc=y + BR2_powerpc_e500mc=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e5500GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e5500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e5500GlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e5500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e6500GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e6500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e6500GlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e6500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e6500MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e6500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64e6500MuslStable(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_e6500=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64power8GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64power8GlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64power8MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64power8MuslStable(TestExternalToolchain): + config = """ + BR2_powerpc64=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64lepower8GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64le=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64le-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64lepower8GlibcStable(TestExternalToolchain): + config = """ + BR2_powerpc64le=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64le-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64lepower8MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_powerpc64le=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64le-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinPowerpc64lepower8MuslStable(TestExternalToolchain): + config = """ + BR2_powerpc64le=y + BR2_powerpc_power8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "powerpc64le-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinRiscv32ilp32dGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinRiscv64GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_64=y + BR2_RISCV_ABI_LP64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinRiscv64MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_64=y + BR2_RISCV_ABI_LP64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4GlibcStable(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4MuslStable(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4UclibcStable(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4aebGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4aeb=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4aeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4aebGlibcStable(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4aeb=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4aeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4aebMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4aeb=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4aeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinShsh4aebMuslStable(TestExternalToolchain): + config = """ + BR2_sh=y + BR2_sh4aeb=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sh4aeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinSparc64GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_sparc64=y + BR2_sparc_v9=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sparc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinSparc64GlibcStable(TestExternalToolchain): + config = """ + BR2_sparc64=y + BR2_sparc_v9=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sparc64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinSparcv8UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_sparc=y + BR2_sparc_v8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sparc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinSparcv8UclibcStable(TestExternalToolchain): + config = """ + BR2_sparc=y + BR2_sparc_v8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "sparc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664corei7UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2GlibcStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2MuslStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86core2UclibcStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686GlibcStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686MuslStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX86i686UclibcStable(TestExternalToolchain): + config = """ + BR2_i386=y + BR2_x86_i686=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "i686-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinXtensalx60UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_xtensa=y + BR2_xtensa_fsf=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "xtensa-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinXtensalx60UclibcStable(TestExternalToolchain): + config = """ + BR2_xtensa=y + BR2_xtensa_fsf=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "xtensa-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) diff --git a/buildroot/system/Config.in b/buildroot/system/Config.in index c8c5be40e..b3abeddd6 100644 --- a/buildroot/system/Config.in +++ b/buildroot/system/Config.in @@ -1,21 +1,17 @@ menu "System configuration" -# Note: usually, it is not possible to select a provider of a virtual -# package. But here we have an exception: there are only four providers -# and they only get selected by separate entries in this choice and -# under different, exclusive conditions. So this is a safe situation. +# Note on package/skeleton: usually, it is not safe to 'select' a +# provider of a virtual package. But below we have an exception: each +# init system may select one of the virtual skeleton-init-* packages. +# As only one init system may be enabled, only one skeleton-init-* may +# be selected. So this is a safe situation. choice prompt "Root FS skeleton" config BR2_ROOTFS_SKELETON_DEFAULT bool "default target skeleton" - select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV - select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX - select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_INIT_OPENRC - select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD - select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE help - Use default target skeleton + Use default target skeleton for selected init system. config BR2_ROOTFS_SKELETON_CUSTOM bool "custom target skeleton" @@ -23,6 +19,9 @@ config BR2_ROOTFS_SKELETON_CUSTOM help Use custom target skeleton. +# skeleton from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.skeleton" + endchoice if BR2_ROOTFS_SKELETON_CUSTOM @@ -83,6 +82,8 @@ config BR2_TARGET_GENERIC_PASSWD_METHOD default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 +# See comment at the top of the file, about selecting individual +# skeletons, which are providers of the virtual skeleton package. choice prompt "Init system" default BR2_INIT_BUSYBOX @@ -91,6 +92,7 @@ config BR2_INIT_BUSYBOX bool "BusyBox" select BR2_PACKAGE_BUSYBOX select BR2_PACKAGE_INITSCRIPTS + select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_ROOTFS_SKELETON_DEFAULT config BR2_INIT_SYSV bool "systemV" @@ -98,12 +100,14 @@ config BR2_INIT_SYSV select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # sysvinit select BR2_PACKAGE_INITSCRIPTS select BR2_PACKAGE_SYSVINIT + select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_ROOTFS_SKELETON_DEFAULT config BR2_INIT_OPENRC bool "OpenRC" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS select BR2_PACKAGE_OPENRC + select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT comment "openrc needs a toolchain w/ dynamic library" depends on BR2_USE_MMU @@ -116,28 +120,38 @@ comment "openrc needs a toolchain w/ dynamic library" config BR2_INIT_SYSTEMD bool "systemd" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_SSP + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 config BR2_INIT_NONE bool "None" + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT help Buildroot will not install any init system. You will have to provide your own, either with a new package or with a rootfs-overlay. +# Init systems from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.init" + endchoice choice @@ -397,7 +411,8 @@ endif # BR2_ROOTFS_SKELETON_DEFAULT config BR2_SYSTEM_DEFAULT_PATH string "Set the system's default PATH" - default "/bin:/sbin:/usr/bin:/usr/sbin" + default "/usr/bin:/usr/sbin" if BR2_ROOTFS_MERGED_USR + default "/bin:/sbin:/usr/bin:/usr/sbin" if !BR2_ROOTFS_MERGED_USR help Sets the system's default PATH. It is being used in /etc/profile in the skeleton-init-common package and by some diff --git a/buildroot/system/skeleton/etc/group b/buildroot/system/skeleton/etc/group index 76346b35f..6822a277b 100644 --- a/buildroot/system/skeleton/etc/group +++ b/buildroot/system/skeleton/etc/group @@ -23,4 +23,4 @@ staff:x:50: lock:x:54: netdev:x:82: users:x:100: -nogroup:x:65534: +nobody:x:65534: diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index bff572805..db2ab0f05 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -468,6 +468,26 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -481,6 +501,11 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + default "5.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + default "5.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + default "5.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 default "5.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 default "5.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 @@ -576,10 +601,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_9 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_8 +config BR2_TOOLCHAIN_GCC_AT_LEAST_10 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10 default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 default "8" if BR2_TOOLCHAIN_GCC_AT_LEAST_8 default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/toolchain/toolchain-buildroot/Config.in b/buildroot/toolchain/toolchain-buildroot/Config.in index 8c33b2b4d..f34dd84c2 100644 --- a/buildroot/toolchain/toolchain-buildroot/Config.in +++ b/buildroot/toolchain/toolchain-buildroot/Config.in @@ -31,8 +31,9 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_arm || BR2_armeb || \ BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_sh2a || BR2_sh4 || \ - BR2_sh4eb || BR2_sparc || BR2_xtensa || BR2_x86_64 + BR2_or1k || BR2_powerpc || BR2_riscv || BR2_sh2a || \ + BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ + BR2_x86_64 select BR2_TOOLCHAIN_USES_UCLIBC help This option selects uClibc-ng as the C library for the @@ -46,14 +47,15 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_riscv || BR2_sh || BR2_sparc64 || \ - BR2_x86_64 || BR2_microblaze || BR2_nios2 || \ - (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky + BR2_riscv || BR2_s390x || BR2_sh || \ + BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ + BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 depends on !BR2_powerpc_SPE depends on BR2_RISCV_ISA_RVA || !BR2_riscv select BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/toolchain/toolchain-external/Config.in b/buildroot/toolchain/toolchain-external/Config.in index 128bea257..2177e6a67 100644 --- a/buildroot/toolchain/toolchain-external/Config.in +++ b/buildroot/toolchain/toolchain-external/Config.in @@ -42,8 +42,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" -# x86_64 -source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" +# Bootlin toolchains, available for virtually all architectures +source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" # Kept last, so it remains the non-default choice, unless there isn't # any available toolchain profile for the currently selected @@ -149,8 +149,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" -# x86_64 -source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" +# Bootlin toolchains +source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" # Custom toolchains source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" diff --git a/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk b/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk index 8667d7ddf..6d91cb5d1 100644 --- a/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -499,6 +499,12 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO fi endef +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD + $(Q)if test -f $(STAGING_DIR)/usr/bin/ldd ; then \ + $(INSTALL) -D $(STAGING_DIR)/usr/bin/ldd $(TARGET_DIR)/usr/bin/ldd ; \ + $(SED) 's:.*/bin/bash:#!/bin/sh:' $(TARGET_DIR)/usr/bin/ldd ; \ + fi +endef ################################################################################ # inner-toolchain-external-package -- defines the generic installation rules @@ -593,6 +599,7 @@ define $(2)_INSTALL_TARGET_CMDS $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS) $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER) $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD) endef # Call the generic package infrastructure to generate the necessary diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in new file mode 100644 index 000000000..6552da9a8 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in @@ -0,0 +1,9 @@ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN + bool "Bootlin toolchains" + depends on BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS + depends on BR2_HOSTARCH = "x86_64" + help + Bootlin toolchains are built using Buildroot for a large + number of architectures and C libraries configurations. + + https://toolchains.bootlin.com diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options new file mode 100644 index 000000000..3c94ae153 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -0,0 +1,4302 @@ +# This file was auto-generated by support/scripts/gen-bootlin-toolchains +# Do not edit +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_aarch64_be + default y if BR2_arcle && BR2_arc750d + default y if BR2_arcle && BR2_archs38 + default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI + default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF + default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF + default y if BR2_ARM_CPU_ARMV7M + default y if BR2_m68k_m68k + default y if BR2_m68k_cf + default y if BR2_microblazebe + default y if BR2_microblazeel + default y if BR2_mips && BR2_mips_32 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mipsel && BR2_mips_32 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mipsel && BR2_mips_32r5 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mipsel && BR2_mips_32r6 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mips64 && BR2_mips_64 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mips64 && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mips64el && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_mips64el && BR2_mips_64r6 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT + default y if BR2_nios2 + default y if BR2_or1k + default y if BR2_powerpc && BR2_powerpc_440fp + default y if BR2_powerpc && BR2_powerpc_e300c3 + default y if BR2_powerpc && BR2_powerpc_e500mc + default y if BR2_powerpc64 && BR2_powerpc_e5500 + default y if BR2_powerpc64 && BR2_powerpc_e6500 + default y if BR2_powerpc64 && BR2_powerpc_power8 + default y if BR2_powerpc64le && BR2_powerpc_power8 + default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D + default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64 + default y if BR2_sh && BR2_sh4 + default y if BR2_sh && BR2_sh4aeb + default y if BR2_sparc64 && BR2_sparc_v9 + default y if BR2_sparc && BR2_sparc_v8 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 + default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 + default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 + default y if BR2_xtensa && BR2_xtensa_fsf + +if BR2_TOOLCHAIN_EXTERNAL_BOOTLIN + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "$(ARCH)-linux" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-bootlin" + +choice + prompt "Bootlin toolchain variant" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE + bool "aarch64 glibc bleeding-edge 2020.08-1" + depends on BR2_aarch64 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the aarch64 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE + bool "aarch64 glibc stable 2020.08-1" + depends on BR2_aarch64 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the aarch64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE + bool "aarch64 musl bleeding-edge 2020.08-1" + depends on BR2_aarch64 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the aarch64 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE + bool "aarch64 musl stable 2020.08-1" + depends on BR2_aarch64 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the aarch64 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE + bool "aarch64 uclibc bleeding-edge 2020.08-1" + depends on BR2_aarch64 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the aarch64 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE + bool "aarch64 uclibc stable 2020.08-1" + depends on BR2_aarch64 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the aarch64 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE + bool "aarch64be glibc bleeding-edge 2020.08-1" + depends on BR2_aarch64_be + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the aarch64be architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE + bool "aarch64be glibc stable 2020.08-1" + depends on BR2_aarch64_be + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the aarch64be architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE + bool "aarch64be uclibc bleeding-edge 2020.08-1" + depends on BR2_aarch64_be + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the aarch64be architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE + bool "aarch64be uclibc stable 2020.08-1" + depends on BR2_aarch64_be + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the aarch64be architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE + bool "arcle-750d uclibc bleeding-edge 2020.08-1" + depends on BR2_arcle + depends on BR2_arc750d + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the arcle-750d architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE + bool "arcle-750d uclibc stable 2020.08-1" + depends on BR2_arcle + depends on BR2_arc750d + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the arcle-750d architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE + bool "arcle-hs38 glibc bleeding-edge 2020.08-1" + depends on BR2_arcle + depends on BR2_archs38 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the arcle-hs38 architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE + bool "arcle-hs38 glibc stable 2020.08-1" + depends on BR2_arcle + depends on BR2_archs38 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the arcle-hs38 architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE + bool "arcle-hs38 uclibc bleeding-edge 2020.08-1" + depends on BR2_arcle + depends on BR2_archs38 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the arcle-hs38 architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE + bool "arcle-hs38 uclibc stable 2020.08-1" + depends on BR2_arcle + depends on BR2_archs38 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the arcle-hs38 architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE + bool "armv5-eabi glibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv5-eabi architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE + bool "armv5-eabi glibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv5-eabi architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE + bool "armv5-eabi musl bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv5-eabi architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE + bool "armv5-eabi musl stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv5-eabi architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE + bool "armv5-eabi uclibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv5-eabi architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE + bool "armv5-eabi uclibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV5 + depends on BR2_ARM_EABI + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv5-eabi architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE + bool "armv6-eabihf glibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv6-eabihf architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE + bool "armv6-eabihf glibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv6-eabihf architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE + bool "armv6-eabihf musl bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv6-eabihf architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE + bool "armv6-eabihf musl stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv6-eabihf architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE + bool "armv6-eabihf uclibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv6-eabihf architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE + bool "armv6-eabihf uclibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV6 + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv6-eabihf architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE + bool "armv7-eabihf glibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv7-eabihf architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE + bool "armv7-eabihf glibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the armv7-eabihf architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE + bool "armv7-eabihf musl bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv7-eabihf architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE + bool "armv7-eabihf musl stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the armv7-eabihf architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE + bool "armv7-eabihf uclibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv7-eabihf architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE + bool "armv7-eabihf uclibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv7-eabihf architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE + bool "armv7m uclibc bleeding-edge 2020.08-1" + depends on BR2_ARM_CPU_ARMV7M + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv7m architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE + bool "armv7m uclibc stable 2020.08-1" + depends on BR2_ARM_CPU_ARMV7M + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the armv7m architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE + bool "m68k-68xxx uclibc bleeding-edge 2020.08-1" + depends on BR2_m68k_m68k + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the m68k-68xxx architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE + bool "m68k-68xxx uclibc stable 2020.08-1" + depends on BR2_m68k_m68k + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the m68k-68xxx architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE + bool "m68k-coldfire uclibc bleeding-edge 2020.08-1" + depends on BR2_m68k_cf + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the m68k-coldfire architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE + bool "m68k-coldfire uclibc stable 2020.08-1" + depends on BR2_m68k_cf + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the m68k-coldfire architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE + bool "microblazebe glibc bleeding-edge 2020.08-1" + depends on BR2_microblazebe + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the microblazebe architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE + bool "microblazebe glibc stable 2020.08-1" + depends on BR2_microblazebe + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the microblazebe architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE + bool "microblazebe musl bleeding-edge 2020.08-1" + depends on BR2_microblazebe + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the microblazebe architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE + bool "microblazebe musl stable 2020.08-1" + depends on BR2_microblazebe + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the microblazebe architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE + bool "microblazebe uclibc bleeding-edge 2020.08-1" + depends on BR2_microblazebe + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the microblazebe architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE + bool "microblazebe uclibc stable 2020.08-1" + depends on BR2_microblazebe + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the microblazebe architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE + bool "microblazeel glibc bleeding-edge 2020.08-1" + depends on BR2_microblazeel + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the microblazeel architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE + bool "microblazeel glibc stable 2020.08-1" + depends on BR2_microblazeel + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the microblazeel architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE + bool "microblazeel musl bleeding-edge 2020.08-1" + depends on BR2_microblazeel + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the microblazeel architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE + bool "microblazeel musl stable 2020.08-1" + depends on BR2_microblazeel + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the microblazeel architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE + bool "microblazeel uclibc bleeding-edge 2020.08-1" + depends on BR2_microblazeel + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the microblazeel architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE + bool "microblazeel uclibc stable 2020.08-1" + depends on BR2_microblazeel + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the microblazeel architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE + bool "mips32 glibc bleeding-edge 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE + bool "mips32 glibc stable 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE + bool "mips32 musl bleeding-edge 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE + bool "mips32 musl stable 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE + bool "mips32 uclibc bleeding-edge 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE + bool "mips32 uclibc stable 2020.08-1" + depends on BR2_mips + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE + bool "mips32el glibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32el architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE + bool "mips32el glibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32el architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE + bool "mips32el musl bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32el architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE + bool "mips32el musl stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32el architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE + bool "mips32el uclibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32el architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE + bool "mips32el uclibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32el architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE + bool "mips32r5el glibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32r5el architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE + bool "mips32r5el glibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32r5el architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE + bool "mips32r5el musl bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32r5el architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE + bool "mips32r5el musl stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32r5el architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE + bool "mips32r5el uclibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32r5el architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE + bool "mips32r5el uclibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r5 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32r5el architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE + bool "mips32r6el glibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32r6el architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE + bool "mips32r6el glibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips32r6el architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE + bool "mips32r6el musl bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32r6el architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE + bool "mips32r6el musl stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips32r6el architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE + bool "mips32r6el uclibc bleeding-edge 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32r6el architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE + bool "mips32r6el uclibc stable 2020.08-1" + depends on BR2_mipsel + depends on BR2_mips_32r6 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips32r6el architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE + bool "mips64-n32 glibc bleeding-edge 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64-n32 architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE + bool "mips64-n32 glibc stable 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64-n32 architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE + bool "mips64-n32 musl bleeding-edge 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64-n32 architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE + bool "mips64-n32 musl stable 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64-n32 architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE + bool "mips64-n32 uclibc bleeding-edge 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64-n32 architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE + bool "mips64-n32 uclibc stable 2020.08-1" + depends on BR2_mips64 + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64-n32 architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE + bool "mips64el-n32 glibc bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64el-n32 architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE + bool "mips64el-n32 glibc stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64el-n32 architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE + bool "mips64el-n32 musl bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64el-n32 architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE + bool "mips64el-n32 musl stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64el-n32 architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE + bool "mips64el-n32 uclibc bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64el-n32 architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE + bool "mips64el-n32 uclibc stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64el-n32 architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE + bool "mips64r6el-n32 glibc bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE + bool "mips64r6el-n32 glibc stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE + bool "mips64r6el-n32 musl bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE + bool "mips64r6el-n32 musl stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE + bool "mips64r6el-n32 uclibc bleeding-edge 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the uclibc C library. This is a bleeding-edge + version, which means it is using the latest versions of + gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE + bool "mips64r6el-n32 uclibc stable 2020.08-1" + depends on BR2_mips64el + depends on BR2_mips_64r6 + depends on BR2_MIPS_NABI32 + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the mips64r6el-n32 architecture, + using the uclibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE + bool "nios2 glibc bleeding-edge 2020.08-1" + depends on BR2_nios2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the nios2 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE + bool "nios2 glibc stable 2020.08-1" + depends on BR2_nios2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the nios2 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE + bool "openrisc musl bleeding-edge 2020.08-1" + depends on BR2_or1k + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the openrisc architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE + bool "openrisc musl stable 2020.08-1" + depends on BR2_or1k + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the openrisc architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE + bool "openrisc uclibc bleeding-edge 2020.08-1" + depends on BR2_or1k + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the openrisc architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE + bool "openrisc uclibc stable 2020.08-1" + depends on BR2_or1k + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the openrisc architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE + bool "powerpc-440fp glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-440fp architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE + bool "powerpc-440fp glibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-440fp architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE + bool "powerpc-440fp musl bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-440fp architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE + bool "powerpc-440fp musl stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-440fp architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE + bool "powerpc-440fp uclibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-440fp architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE + bool "powerpc-440fp uclibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_440fp + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-440fp architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE + bool "powerpc-e300c3 glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE + bool "powerpc-e300c3 glibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE + bool "powerpc-e300c3 musl bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE + bool "powerpc-e300c3 musl stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE + bool "powerpc-e300c3 uclibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the uclibc C library. This is a bleeding-edge + version, which means it is using the latest versions of + gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE + bool "powerpc-e300c3 uclibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e300c3 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-e300c3 architecture, + using the uclibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE + bool "powerpc-e500mc glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE + bool "powerpc-e500mc glibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE + bool "powerpc-e500mc musl bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE + bool "powerpc-e500mc musl stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE + bool "powerpc-e500mc uclibc bleeding-edge 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the uclibc C library. This is a bleeding-edge + version, which means it is using the latest versions of + gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE + bool "powerpc-e500mc uclibc stable 2020.08-1" + depends on BR2_powerpc + depends on BR2_powerpc_e500mc + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the powerpc-e500mc architecture, + using the uclibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE + bool "powerpc64-e5500 glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e5500 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-e5500 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE + bool "powerpc64-e5500 glibc stable 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e5500 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-e5500 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE + bool "powerpc64-e6500 glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e6500 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-e6500 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE + bool "powerpc64-e6500 glibc stable 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e6500 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-e6500 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE + bool "powerpc64-e6500 musl bleeding-edge 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e6500 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64-e6500 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE + bool "powerpc64-e6500 musl stable 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_e6500 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64-e6500 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE + bool "powerpc64-power8 glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-power8 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE + bool "powerpc64-power8 glibc stable 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64-power8 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE + bool "powerpc64-power8 musl bleeding-edge 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64-power8 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE + bool "powerpc64-power8 musl stable 2020.08-1" + depends on BR2_powerpc64 + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64-power8 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE + bool "powerpc64le-power8 glibc bleeding-edge 2020.08-1" + depends on BR2_powerpc64le + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64le-power8 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE + bool "powerpc64le-power8 glibc stable 2020.08-1" + depends on BR2_powerpc64le + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the powerpc64le-power8 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE + bool "powerpc64le-power8 musl bleeding-edge 2020.08-1" + depends on BR2_powerpc64le + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64le-power8 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE + bool "powerpc64le-power8 musl stable 2020.08-1" + depends on BR2_powerpc64le + depends on BR2_powerpc_power8 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the powerpc64le-power8 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE + bool "riscv32-ilp32d glibc bleeding-edge 2020.08-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the riscv32-ilp32d architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE + bool "riscv64 glibc bleeding-edge 2020.08-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_64 + depends on BR2_RISCV_ABI_LP64 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the riscv64 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE + bool "riscv64 musl bleeding-edge 2020.08-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_64 + depends on BR2_RISCV_ABI_LP64 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the riscv64 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE + bool "sh-sh4 glibc bleeding-edge 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sh-sh4 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE + bool "sh-sh4 glibc stable 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sh-sh4 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE + bool "sh-sh4 musl bleeding-edge 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the sh-sh4 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE + bool "sh-sh4 musl stable 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the sh-sh4 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE + bool "sh-sh4 uclibc bleeding-edge 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the sh-sh4 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE + bool "sh-sh4 uclibc stable 2020.08-1" + depends on BR2_sh + depends on BR2_sh4 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the sh-sh4 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE + bool "sh-sh4aeb glibc bleeding-edge 2020.08-1" + depends on BR2_sh + depends on BR2_sh4aeb + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sh-sh4aeb architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE + bool "sh-sh4aeb glibc stable 2020.08-1" + depends on BR2_sh + depends on BR2_sh4aeb + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sh-sh4aeb architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE + bool "sh-sh4aeb musl bleeding-edge 2020.08-1" + depends on BR2_sh + depends on BR2_sh4aeb + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the sh-sh4aeb architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE + bool "sh-sh4aeb musl stable 2020.08-1" + depends on BR2_sh + depends on BR2_sh4aeb + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the sh-sh4aeb architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE + bool "sparc64 glibc bleeding-edge 2020.08-1" + depends on BR2_sparc64 + depends on BR2_sparc_v9 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sparc64 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE + bool "sparc64 glibc stable 2020.08-1" + depends on BR2_sparc64 + depends on BR2_sparc_v9 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the sparc64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE + bool "sparcv8 uclibc bleeding-edge 2020.08-1" + depends on BR2_sparc + depends on BR2_sparc_v8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the sparcv8 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE + bool "sparcv8 uclibc stable 2020.08-1" + depends on BR2_sparc + depends on BR2_sparc_v8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the sparcv8 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE + bool "x86-64-core-i7 glibc bleeding-edge 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the glibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE + bool "x86-64-core-i7 glibc stable 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the glibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE + bool "x86-64-core-i7 musl bleeding-edge 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE + bool "x86-64-core-i7 musl stable 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE + bool "x86-64-core-i7 uclibc bleeding-edge 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the uclibc C library. This is a bleeding-edge + version, which means it is using the latest versions of + gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE + bool "x86-64-core-i7 uclibc stable 2020.08-1" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-64-core-i7 architecture, + using the uclibc C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE + bool "x86-core2 glibc bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-core2 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE + bool "x86-core2 glibc stable 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-core2 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE + bool "x86-core2 musl bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-core2 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE + bool "x86-core2 musl stable 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-core2 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE + bool "x86-core2 uclibc bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-core2 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE + bool "x86-core2 uclibc stable 2020.08-1" + depends on BR2_i386 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-core2 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE + bool "x86-i686 glibc bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-i686 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE + bool "x86-i686 glibc stable 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Bootlin toolchain for the x86-i686 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE + bool "x86-i686 musl bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-i686 architecture, using the + musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE + bool "x86-i686 musl stable 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the x86-i686 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE + bool "x86-i686 uclibc bleeding-edge 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-i686 architecture, using the + uclibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE + bool "x86-i686 uclibc stable 2020.08-1" + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_i586 + depends on !BR2_x86_x1000 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the x86-i686 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE + bool "xtensa-lx60 uclibc bleeding-edge 2020.08-1" + depends on BR2_xtensa + depends on BR2_xtensa_fsf + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the xtensa-lx60 architecture, using + the uclibc C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE + bool "xtensa-lx60 uclibc stable 2020.08-1" + depends on BR2_xtensa + depends on BR2_xtensa_fsf + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + help + Bootlin toolchain for the xtensa-lx60 architecture, using + the uclibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +endchoice +endif diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash new file mode 100644 index 000000000..8764f395f --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -0,0 +1,340 @@ +# This file was auto-generated by support/scripts/gen-bootlin-toolchains +# Do not edit +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2020.08-1.sha256 +sha256 212f3c05f3b2263b0e2f902d055aecc2755eba10c0011927788a38faee8fc9aa aarch64--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2020.08-1.sha256 +sha256 8ab7a2f17cb96621b048ab0a872650dd62faa54cd74c961b9902b8c04bff7dd1 aarch64--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2020.08-1.sha256 +sha256 3cf00c1ccaf16d0fbc526529789791de1cf98b918ff812e779f8400d40b6c048 aarch64--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2020.08-1.sha256 +sha256 8319d27e3e637f32ecbdf49ceee2e9b7768b32d3ec7c92c888ff52e6f062bde4 aarch64--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 57fe5cecf37778b35dd09d9a016a1d6d9d7bb0e96ffcc5565e0aa483a46ea3db aarch64--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.sha256 +sha256 04176f56ac977215c5257c307cece2d32e03770b96380e09c50379d4d84a5b39 aarch64--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2020.08-1.sha256 +sha256 9631a57809d2fc2c7bb82bdd79d7647ccabe193126cc59ff9721a573d8870510 aarch64be--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2020.08-1.sha256 +sha256 71e24a2a205726d7d8ec56ead13b7eb427d5aed0e057a94ee06688334a07e6dd aarch64be--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 76017614f0e7770499b5d18943398e51ae1c36d075cf8fba90ea050a29cad747 aarch64be--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2020.08-1.sha256 +sha256 a3bff78e98b2e17ab142ec630f9184f0cd4be6f1f313fdc112d89a843d92cedc aarch64be--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 e33570bdddc08d01b0da81ef6c3b240c6e0a4948f0100314b0be63c18c5f75db arcle-750d--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2020.08-1.sha256 +sha256 bae0cbcab3b3b0149503aef6003dd816102b261461e37d89d32ffe9eb7f5dab9 arcle-750d--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2020.08-1.sha256 +sha256 219be8c5390da6830e7529cb0a611996a8c9451bfa1560d7bda4ed5b182f7744 arcle-hs38--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2020.08-1.sha256 +sha256 ca73399803b6bb46cf27aa2bef5f98eae05fb2fa547403777354067117b44f2f arcle-hs38--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 65e1408112518c1b31350285838f000a78a0dcd78880842933ef80d64d023967 arcle-hs38--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2020.08-1.sha256 +sha256 f0839aa541fe3f29660387c731b52e495bf1b285127b9fba91350b5b67f8ff3e arcle-hs38--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2020.08-1.sha256 +sha256 261e73520fb211f63a88ecce0689d3647acf295527bd6bd16e88e1bd65b3c603 armv5-eabi--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2020.08-1.sha256 +sha256 ed175329057693e496b0d6dbac1ff9db8f8f34737530ab38b5ed677afaefad03 armv5-eabi--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2020.08-1.sha256 +sha256 486b2424321b9866c2677e1dccd3a999394a86f890542c0c63edd5f9456bc4f9 armv5-eabi--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2020.08-1.sha256 +sha256 732edab571d017c550d74b8c53dc703fc650de7aab66e68c70a0bc19d66d0a22 armv5-eabi--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 5e11ec24b910c43f24577b41a38cded192e443c0606be60944fe85b0fbf4b2dd armv5-eabi--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2020.08-1.sha256 +sha256 cf6a668d4f30a4a2e76a0e88177e1301342cc011e94ea399353e77ede0efbb22 armv5-eabi--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2020.08-1.sha256 +sha256 0c66147f05b21529311338e246ed285f9f0f4830af0d4db28e401160a81d1b4f armv6-eabihf--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2020.08-1.sha256 +sha256 539e31b3bdcf76c3d6710951c74fbe682e2de8da4d110b981e9108b656890f4a armv6-eabihf--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2020.08-1.sha256 +sha256 e8c05fb7b909dfd5a42f6de78d1b20605c453a9aea219981966d213ee98968e2 armv6-eabihf--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2020.08-1.sha256 +sha256 68e43e3cd0e1fdd5c2b3ab718368f6ee24824725c641e148ef0a0da57f872034 armv6-eabihf--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 749bb97f7535414c3096564f6e790d1e43ab8c406282480937d8f34478ac7a35 armv6-eabihf--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2020.08-1.sha256 +sha256 680a3bf708cb792c74561514dcba882727086c9317397e8a3ebece1b50fbea4e armv6-eabihf--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2020.08-1.sha256 +sha256 9f5c703cea20834276e1a81e2e54483d0f4fe0e57063ba4d058338ef9c858eb2 armv7-eabihf--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2020.08-1.sha256 +sha256 7b6682603af9a9b5c0e46fd57165723483bb68295e827d14d238e63f33a147a8 armv7-eabihf--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2020.08-1.sha256 +sha256 d9e71499cfb1790a31056ca9199981f699c7e4966b5854f7780d97f5a74d601e armv7-eabihf--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2020.08-1.sha256 +sha256 5c4c9bce5a2a46a9ad46e49e86df708893a8907e702a8ee1b5febd3950e030ed armv7-eabihf--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 7c3ee9f3d6bd4eda38ec94a686a9e348b0f800214f1225c68d172e4ac6b81066 armv7-eabihf--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2020.08-1.sha256 +sha256 f61866b0e60da62eff92b197f0e2a72e8d023bf944a25eb97efc9f5d93680ed9 armv7-eabihf--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 9ce29bbcbc0a2c4925e814a6332c2c71e9a13476040e1db0a5495c68d1566bee armv7m--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2020.08-1.sha256 +sha256 c20df31191b88df09d8ff225ca82e3bb769b2b7ffd3827f6dbf77a6d23230339 armv7m--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 49e26c831694d15bb023a0a36cf9d3967e0ab75c555d8d07bba3317a0a18aa40 m68k-68xxx--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2020.08-1.sha256 +sha256 b133663f5589c71315224792b7e542cfa578e4c354e4a2ac8afcd5ee77fd6f45 m68k-68xxx--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 3efa687ca5d1c5f1ec53032e05a12467ec148c2328836754841f74be217bb035 m68k-coldfire--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2020.08-1.sha256 +sha256 f9879a167e2279fe925a3dc963d349d3d84c85866ec91512b5a7ce667318d716 m68k-coldfire--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2020.08-1.sha256 +sha256 d9fb4403d14f53d5f4be18f38e9604244042ea33ad980ebf0b0057b70d603d16 microblazebe--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2020.08-1.sha256 +sha256 ea466445240a25ba98cd7b34f748afca151fc2479b187566f2faa98f586bfd93 microblazebe--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2020.08-1.sha256 +sha256 0157d051ac5e8b46b4eed7333c9323d1c1602ad5e958e2c12fe9b8dc3b6781c7 microblazebe--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2020.08-1.sha256 +sha256 ec51b07f63cf6d0af1eaed10641d8690a350d879e4b74addca2b3f7992186ee2 microblazebe--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 3aaaab352ca31b2263e29c363609a363a38931f9733c8ad3a386c5cbb791f8e1 microblazebe--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2020.08-1.sha256 +sha256 d2b31177c9c009cd70a9ad4af6e903dfdb5254e3f49fe9389e0e11af7a98e6b6 microblazebe--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2020.08-1.sha256 +sha256 83a451601b24b6a9c609630119e100ef9f18408bdfe1241cc53a904d540e6936 microblazeel--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2020.08-1.sha256 +sha256 c168737ec92889e632673f826b13cf74cfe4ba3ad06cc9e328ee20268ec439e9 microblazeel--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2020.08-1.sha256 +sha256 47660f8a4d84c7b8cd7610b8ba9df5bbfba043b35ebc07d96468c950b282f44d microblazeel--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2020.08-1.sha256 +sha256 6a51e38fe3f72765ad1172488321b60c59867253edce7b6680500c4193a542f7 microblazeel--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 6005fa2b229be380a2e4b8227daa0b4be4739b7cda628679de6d0e048755c769 microblazeel--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2020.08-1.sha256 +sha256 845a4795cab5f88d96679945f7147c5dfe0dd19751b88734ef786bfd5ee5db67 microblazeel--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2020.08-1.sha256 +sha256 63baffcf0a94d7f1b7421ad61ddb56ce5c05595acd09f482dffe13ddf17efd81 mips32--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2020.08-1.sha256 +sha256 90e300a2d224ea79b69cae68e93b0aab70858381b0d11bac846458c625d72653 mips32--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2020.08-1.sha256 +sha256 4ebc20461eafca9c9b50e36f81e13095229aac0cd1dd98a985060f2e95665983 mips32--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2020.08-1.sha256 +sha256 1a544242e9aaaee75c240439a31d2f4304b97705ed2d9e9e38ca552c5f03dced mips32--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 4e0e1bf24e74746775992efd8b8bafbf5b6dd56bfdd1421b2207e1ea23ba2eb3 mips32--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2020.08-1.sha256 +sha256 4c1da37d131f4e66b07536707c6d1be3de29719f228346d4c860c4b3cb4fef31 mips32--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2020.08-1.sha256 +sha256 617c845261bb0a00571c68f250c5a369e60a09164dd3316ab8126c327d911c4b mips32el--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2020.08-1.sha256 +sha256 87875c25075b3850526a54c5e828ce489355d0d50107c262539ee5f577f38d6d mips32el--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2020.08-1.sha256 +sha256 4c81898f2e484c1e1e7d7ac1ae80e0aca5619ef01190df37e41ca459a147e682 mips32el--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2020.08-1.sha256 +sha256 02155c88e0bf92f63105803767ce457790bfd920297ef326c9920853b5a3fe20 mips32el--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 024b0e27fd0c9792bad1944e052768e03173b133079d7c95bf30435d05620152 mips32el--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2020.08-1.sha256 +sha256 8398010ea3dbd43ee99b6be0e3340db44b32228bf063a9c13bf43a359e3d1f6e mips32el--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2020.08-1.sha256 +sha256 f000e8a78a24671a6f87909156e0c2a7403ab5864001c1388faf60190f8594c8 mips32r5el--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2020.08-1.sha256 +sha256 a52a115b852afce04732aa9460c58f30fbfdb17601f9bf32ea97a77d1a073a53 mips32r5el--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2020.08-1.sha256 +sha256 2620edf1045c61ddaf12f979a86719fa83b6598eb10f358a379e52462bb734ba mips32r5el--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2020.08-1.sha256 +sha256 0e03a5f2a7d8ba739f3ef53538d73c33bfc55f45522d4515688ebcb58005e5a1 mips32r5el--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 585e252971553b52833d3970f709196707d908a84a5e1be8360e3019d6bb0da9 mips32r5el--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2020.08-1.sha256 +sha256 7ffccb1f86e7b0f1dd0d87f455ff5f2619a58724850b0b9f106b6545d4de8b3f mips32r5el--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2020.08-1.sha256 +sha256 d6376aeb2b243a58a98c415f2ecf131e14ccdce849a76c0f01902ca4b02fc0ba mips32r6el--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2020.08-1.sha256 +sha256 8640635116e26e51d57b6d5dc1e3213528f742f0cf97cd326af4f5d8e17a63f2 mips32r6el--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2020.08-1.sha256 +sha256 2647d34cb990bdab77efbcc6b4e3d5b1fd02c5032837b7a64bc52cef64aba4ec mips32r6el--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2020.08-1.sha256 +sha256 24b1adfa2eb31f49ae5b4fce9ee9fcb30205ca6f29e423f77bd851070baaa255 mips32r6el--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 18dee7e9de84f6e7d6c9d083decdd465ab08979ebd661d82efbe5dc93f11dcb0 mips32r6el--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2020.08-1.sha256 +sha256 28999f7474a84c3ec36b504c47cf671fc6e82d9b38580a0e2ebe495850ada097 mips32r6el--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2020.08-1.sha256 +sha256 b5d90c06c894d841677da5f81e395113d22a79c53f934e12151128660dd08e76 mips64-n32--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2020.08-1.sha256 +sha256 7ed7a81f1a086e47ddb79d0bdc7142a6b7349feea20b05393be133cc4cf1fff5 mips64-n32--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2020.08-1.sha256 +sha256 937ce7ffda61c93489862122fe6dbfd53445afbdbfb615c06805b05497f336fb mips64-n32--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2020.08-1.sha256 +sha256 2a2acf732498b0acb22f815e1ce7c3ca8124719131febe95c723b1cbab76d947 mips64-n32--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 16ac2a957757f56e0414a638bb3bd526b2d1c3055dd7e036dcdec4bf950f0d1b mips64-n32--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2020.08-1.sha256 +sha256 10d9fb894e5e548e47e2930139117de9549ea49b971ca9fad12f56ef6d188b77 mips64-n32--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2020.08-1.sha256 +sha256 7de65f68b14350670adbd0249562d69e75f7fc65b749284303c32f88112cb6b4 mips64el-n32--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2020.08-1.sha256 +sha256 a6eea19d94a7a953cac84670dcac3adb42dd3eb8950b1f7ca0f1ef37abc7e33f mips64el-n32--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2020.08-1.sha256 +sha256 7cff57dd6d0ee7778c5b764a388bf9e997ba2349da5274b8d8598173030618be mips64el-n32--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2020.08-1.sha256 +sha256 3c42d88c84689703d5b1380f4cf5ad20872611d08ce5fac1a4375bfec80a6b27 mips64el-n32--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 5553a979238f6a25c4e965e18cfbebe36018041ba46968174063328c25e485fc mips64el-n32--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2020.08-1.sha256 +sha256 80e8fa6cca6e0267dad5376bca79ce7457b8d345d43a0d409e4820a791965db9 mips64el-n32--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2020.08-1.sha256 +sha256 0f09da21d6069642064f767a25e64c89caad80660ea184345652301c41a30ac9 mips64r6el-n32--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2020.08-1.sha256 +sha256 7100d3862983c5fb8237386ff4148f6e550e6b299c8b7946a349dedef60f75c9 mips64r6el-n32--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2020.08-1.sha256 +sha256 a692687149e59fdb7ad780cfc51e4a7307ed599433280369fe9e43c63453e4ec mips64r6el-n32--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2020.08-1.sha256 +sha256 e7a35e063fcd748df6f347e5aa97d081f4422480fb02ce6925c4c351c9aca318 mips64r6el-n32--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 69d4287cb32413e054684db9545e6898c09cb90c86a0dce8bb9999498eb798ab mips64r6el-n32--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2020.08-1.sha256 +sha256 4d9eb8900b99871e02ae17b823341189dce3aa592ee82864c73ca3164948aaae mips64r6el-n32--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2020.08-1.sha256 +sha256 b3c7c24e08759af3ea13fc39e8bddb52e4528a05d4aee3c2f75733e067d12edc nios2--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2020.08-1.sha256 +sha256 a46d5ff90e3623d159f3b5be53493e13a2e78ebb733a1ccb68e829d6e28aa129 nios2--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2020.08-1.sha256 +sha256 382ec04511d51f99028b6c568c909e4e010bcfe1d4a4c1ff6f10c7c07c24b3b2 openrisc--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2020.08-1.sha256 +sha256 697ef122917022f400003931bc6da75fe07bb5234ef8186cbe027e560f04a168 openrisc--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 e45d02c9272c909db1c92b6403ed1e0813889ef0c22b2f5166d2675f62d3f20f openrisc--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2020.08-1.sha256 +sha256 62c60f9f99828a01f3a16060ceba74b8e2603a8ca3585649434a66f721ecdf75 openrisc--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2020.08-1.sha256 +sha256 d7e3ab961be0b39f40b428790e48f9f3e44290bb7bed51446bc7c8d66aacf0da powerpc-440fp--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2020.08-1.sha256 +sha256 99ab7272cf8fec3e0ce67935bea9c077a2e9bd9076388238c3976cdf1e8f19e0 powerpc-440fp--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2020.08-1.sha256 +sha256 182dd8d2a4203863c663301b8ee6e59101a0b87dbb03aa3b919944338a2947fe powerpc-440fp--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2020.08-1.sha256 +sha256 4658f631506b7d73a7f6816caa6b8e052d5d203e14a77bd6904af8ee9ebf2868 powerpc-440fp--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 e6570a1683260620bec129e849f68488e59460a99158c5c3e48b30432ec043c7 powerpc-440fp--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2020.08-1.sha256 +sha256 ed632b806c8e8fa77e0d1f43d57ae169629ce94e4783044771ee60775001d207 powerpc-440fp--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2020.08-1.sha256 +sha256 fe4b9817f060d84118fff5b7d855eacac472975f2adfececb641d2999f94a7ea powerpc-e300c3--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2020.08-1.sha256 +sha256 77d215d650850af65c3ac1792dcf100322f3dfea78ba174118197ec0c8a49807 powerpc-e300c3--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2020.08-1.sha256 +sha256 4aa2b5c3c2c3263edfdf95284f0774aed8a47446b7a362ee44dc24d83db06896 powerpc-e300c3--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2020.08-1.sha256 +sha256 129d9aab59e9edfc68739b612f2ee4abce5679830250fbcd50b89ec3d2c865c5 powerpc-e300c3--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 54e6960edd6419bb268b651ffedc24af73a72ad9dd145c1849a6e0fb6f997b15 powerpc-e300c3--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2020.08-1.sha256 +sha256 1057b488623a80037558a1439555b1a15b25a4d7f42dc49d0169349592ad5b3e powerpc-e300c3--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2020.08-1.sha256 +sha256 8cab4fbb645be782a6eaeb7b6afd75fda4c0dc8ca9a4095b0be9b6eeb29a9759 powerpc-e500mc--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2020.08-1.sha256 +sha256 5bb9f6b10b9d2d1a90a1a96a477b90eea32a269c1afccd89284a38a63d7f1c82 powerpc-e500mc--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2020.08-1.sha256 +sha256 36636df56a04e44ddb5bba2e0a30b1f3986618399381278cdb2be207a25825c0 powerpc-e500mc--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2020.08-1.sha256 +sha256 7f924fc3cc3c9070ea1c9d270fea71715bd52beac14649d8a00416dfde1b897b powerpc-e500mc--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 262a2bddd29d6c24cbc32a873e78895499732624923195a5e7ffe16b487dc461 powerpc-e500mc--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2020.08-1.sha256 +sha256 e817af2d5a0fba654e7766dcad89380e278af9feb35c2d0591a0f8d893defa48 powerpc-e500mc--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2020.08-1.sha256 +sha256 418b79f8313ac4ff29cb6c2d639848eb74a0245666142a307374513cffd472e6 powerpc64-e5500--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2020.08-1.sha256 +sha256 a51ddba944394de41b2f7c001772bb68074175d65a0976749da5289a5e705f23 powerpc64-e5500--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2020.08-1.sha256 +sha256 c537c2ef618f767762295806658bb0add514453068ea72ce2bd6e6e805e64af5 powerpc64-e6500--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2020.08-1.sha256 +sha256 1d8aaf1492f69496b01fc930fa928ffd3144d1465c7c954128ed31ce576306b6 powerpc64-e6500--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2020.08-1.sha256 +sha256 c46c7595384929211ce2f54655ceb4eb1d32054923892cd5d10913be364fa6f2 powerpc64-e6500--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2020.08-1.sha256 +sha256 a295073db591ed16eec90caf5fdef62ccff5550166d36496ab24aa993bdb2a42 powerpc64-e6500--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2020.08-1.sha256 +sha256 cbe65abf36fa807176a01488751a2e45800791534400b803c024e4c29357862c powerpc64-power8--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2020.08-1.sha256 +sha256 a670ec95dbfb53a812e9f21aec2ad880a3349125f19219b9a0d139a7d5b9e83b powerpc64-power8--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2020.08-1.sha256 +sha256 1f5b3da078534f9e493f29956d3a1f31ad0539d26b8f83e55c271b6671021928 powerpc64-power8--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2020.08-1.sha256 +sha256 12043ab87cd4ae0c4339cddcb3eb017eaae406bbb332bf3edebfd7f70ecd0a31 powerpc64-power8--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2020.08-1.sha256 +sha256 14e3ff4afbf363decb2c0ddc33b75e41aad9748a65a445cc176215853d0d6185 powerpc64le-power8--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2020.08-1.sha256 +sha256 342442f0773cdf5091443ab06ecf9c3d3c05cf8e2464b82a54707bec90d2a358 powerpc64le-power8--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2020.08-1.sha256 +sha256 fab5f4bc6d219f53f8b15e0d49aea27cdbac9e08e05946577440329c003fc216 powerpc64le-power8--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2020.08-1.sha256 +sha256 47d184beca271c67bdb544fac87cb2126ea2b397d076a79dfaf9667e999fbccd powerpc64le-power8--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2020.08-1.sha256 +sha256 18a47b0c221137f40720df08e9bbdc0bcb6e68cde3a30906681e4dec83eb7547 riscv32-ilp32d--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64/tarballs/riscv64--glibc--bleeding-edge-2020.08-1.sha256 +sha256 09818eccb414359b1df87ec347d94e7bfccc45f8a5eafe8791fddf8110fcc581 riscv64--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64/tarballs/riscv64--musl--bleeding-edge-2020.08-1.sha256 +sha256 2af03e220070eacf6eaf63ccb7442ca5af805caf96ae52fb3eb15370988f12cf riscv64--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2020.08-1.sha256 +sha256 277e78c999c2cba42b25660bbbe0d105a80277c986e0807cfa16a6595af6ce9e sh-sh4--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2020.08-1.sha256 +sha256 256064f35b2759c71ac1bb6c9fe74a7c7c62f070746cfeb35ff0ecb40a91c2b4 sh-sh4--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2020.08-1.sha256 +sha256 34bf211ea0456ef86bbe914e0755f18681531a015e33b8c26b97ca68e29a3ed5 sh-sh4--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2020.08-1.sha256 +sha256 d335189728a6bebd5d180c58c6dabd049500d57ae60fcc8fc51ba5aafafb21d3 sh-sh4--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 89e42b9e7bc3f67660656690899b2fad4015af5c9084dad6624315c39b486d76 sh-sh4--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2020.08-1.sha256 +sha256 13a60cd5653c24491748388284080d5b8da649a63090c0d308c3a3b069b04f21 sh-sh4--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2020.08-1.sha256 +sha256 fe063dd95c71ab41145412faf5e4c2a1386efdda5d944ecc83121fb9b4e213f2 sh-sh4aeb--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2020.08-1.sha256 +sha256 054e669a3165aff35539d3fb7cbde2650c79e5aa88a90a844488ba175a645a07 sh-sh4aeb--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2020.08-1.sha256 +sha256 aa2c560ed4cf4dac8a8803b3fccf846472a226a1a22833c1cbe0d7fd347af3a7 sh-sh4aeb--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2020.08-1.sha256 +sha256 89e7fa5792ed1c35bd57c65935888beafce9a81f84c7d73508b1582539415a3b sh-sh4aeb--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2020.08-1.sha256 +sha256 abba04fcfa11a1eedbf5f5ff38d69d793d394f08998f8374723358b3123cc113 sparc64--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2020.08-1.sha256 +sha256 57184f6edfba03ae9c098ad0bab6635475bb45a874982ad11c0b91bf6043dbc4 sparc64--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 210defc0781683a240bac25295ff612d6b6c875c7d938d11512f8ec9472245bc sparcv8--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2020.08-1.sha256 +sha256 14d508510bf0ed813f6436718486cce7fc6ebfb29b46eea5e52a474b2d5eaa00 sparcv8--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2020.08-1.sha256 +sha256 77935109bbd1bdb84813a588b807052823033ed9094131fdd56f558023a3de08 x86-64-core-i7--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2020.08-1.sha256 +sha256 3dd408e857f5c8e579748995477f2783fcf5ad0aac89719ea3c5c75446dfa63c x86-64-core-i7--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2020.08-1.sha256 +sha256 5d2d13d56a76db30ec28a11a3d6219fe407c3d1b9bbcd4a7255a783da4fcdfcb x86-64-core-i7--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2020.08-1.sha256 +sha256 26ea3cc16c294663b64123c15a95d53f00419ef0f6bcdef489865835c6022650 x86-64-core-i7--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 d1ff16cde93c727b4b39844877f93d865d6945185e71dba4b6c07d2d725e2576 x86-64-core-i7--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2020.08-1.sha256 +sha256 0fdcb93add6ff697b536198da76b4e93bd81efd67793d6640fd6bc1b216abc00 x86-64-core-i7--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2020.08-1.sha256 +sha256 10e7b362008fc3057e9eb42a3fab5f0dc430e05b285dc4f2ec3367d5f36a3094 x86-core2--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2020.08-1.sha256 +sha256 18bbabb672df24bbc2646d94d23c47d16a6c0d8342d910bf441021fad4a82ce3 x86-core2--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2020.08-1.sha256 +sha256 81edcbd69f2fd479d9a25597d0515d42c9c891e1a534d947e87a2e9a3dc67924 x86-core2--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2020.08-1.sha256 +sha256 9e23de3364e1aaec50945c70089273a025ff44815ce4632324d1950e7ba07e9a x86-core2--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 717b6c103e8e50202a45277eef8f9b41b978b17a0110cacddd52a01b7eba3039 x86-core2--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2020.08-1.sha256 +sha256 e23812719fa1027fa0e2a161216cf97ff14bf3bcc19bb400281060a40e762a0d x86-core2--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2020.08-1.sha256 +sha256 9e8c83479dc91e516ee66fe21ff8693afa380cfdb3192c5c1351430a035ab92a x86-i686--glibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2020.08-1.sha256 +sha256 77362d37279636371a42b09bab4f8f1a51a786ed7ec316221786b279389c8008 x86-i686--glibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2020.08-1.sha256 +sha256 ccb6896f02be3444d6cabff0966a0b6f866ebc6d32b483031541626c2fc748fe x86-i686--musl--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2020.08-1.sha256 +sha256 bbbf8b7946e65f35366cb0371910fe3e95e6399c4e6a9cac8b0a4674bcadc36b x86-i686--musl--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 bd57d5cd7958ba7469d74abdf93db1993042f30c774ec3d1fceff57d522a489c x86-i686--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2020.08-1.sha256 +sha256 139c31c25f9834137bbbb4aadc9d78def2819d2c1b9e89dd2300b11fb4879bb4 x86-i686--uclibc--stable-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2020.08-1.sha256 +sha256 46801fc1ae89f380c1b6e1bf8ea723f9d7b1590eea3a2d1218a0307cd4325bc8 xtensa-lx60--uclibc--bleeding-edge-2020.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2020.08-1.sha256 +sha256 b4b28d855594290c853292c9cce43bba573d4187ecb47d78f25411a7f4300d49 xtensa-lx60--uclibc--stable-2020.08-1.tar.bz2 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk new file mode 100644 index 000000000..71f53f6d5 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -0,0 +1,1023 @@ +################################################################################ +# +# toolchain-external-bootlin +# +################################################################################ + +# This file was auto-generated by support/scripts/gen-bootlin-toolchains +# Do not edit +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2020.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs +endif + +$(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in deleted file mode 100644 index c8ec970a4..000000000 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 - bool "Sourcery CodeBench AMD64 2016.11" - depends on BR2_x86_64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - depends on BR2_x86_jaguar || BR2_x86_steamroller - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HAS_OPENMP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 # based-on binutils-2.26 - select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 # based-on binutils-2.26 - help - Sourcery CodeBench toolchain for the amd64 (x86_64) - architectures, from Mentor Graphics. It uses gcc 6.2, - binutils 2.26, glibc 2.24, gdb 7.11 and kernel headers - 4.7. It has support for the following variants: - - AMD Puma/Jaguar (family 16h), glibc - Default for x86_64, nothing special to do. - - AMD Steamroller (family 15h), glibc - Select a steamroller core. - No other architecture variants are supported since glibc - is optimized for one of these two baselines. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options deleted file mode 100644 index 2ab23026e..000000000 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "x86_64-amd-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-amd64" - -endif diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash deleted file mode 100644 index 291e6a59f..000000000 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 a6c23837dd45a33866c60a2fd8d7af40520cd84ff1059abda797952d7ee0fafd amd-2016.11-19-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 d61ce0b5648ad63cca16fe233c82e7eaa6a3212a549d69a527e7a2d5350f7b4a amd-2016.11-19-x86_64-amd-linux-gnu.src.tar.bz2 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk deleted file mode 100644 index 1697e5e67..000000000 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-amd64 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION = 2016.11-19 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_SOURCE = amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_ACTUAL_SOURCE_TARBALL = amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 8c38dd9fc..f7aa5454e 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -31,6 +31,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_10 + bool "10.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + config BR2_TOOLCHAIN_EXTERNAL_GCC_9 bool "9.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_9 @@ -115,8 +119,28 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9 + bool "5.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8 + bool "5.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7 + bool "5.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_6 + bool "5.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5 + bool "5.5.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4 - bool "5.4.x or later" + bool "5.4.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3 diff --git a/buildroot/toolchain/toolchain-wrapper.c b/buildroot/toolchain/toolchain-wrapper.c index aa6d560fe..0fb6064b1 100644 --- a/buildroot/toolchain/toolchain-wrapper.c +++ b/buildroot/toolchain/toolchain-wrapper.c @@ -129,6 +129,8 @@ static const struct str_len_s unsafe_paths[] = { STR_LEN(/usr/lib), STR_LEN(/usr/local/include), STR_LEN(/usr/local/lib), + STR_LEN(/usr/X11R6/include), + STR_LEN(/usr/X11R6/lib), { NULL, 0 }, }; diff --git a/buildroot/toolchain/toolchain-wrapper.mk b/buildroot/toolchain/toolchain-wrapper.mk index f1312c5c7..8b551e3a1 100644 --- a/buildroot/toolchain/toolchain-wrapper.mk +++ b/buildroot/toolchain/toolchain-wrapper.mk @@ -33,6 +33,14 @@ TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH endif endif +# Disable -ftree-loop-distribute-patterns on microblaze to +# workaround a compiler bug with gcc 10 and -O2, -Os or -O3. +# https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5879ab5fafedc8f6f9bfe95a4cf8501b0df90edd +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97208 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10)$(BR2_microblaze),yy) +TOOLCHAIN_WRAPPER_OPTS += -fno-tree-loop-distribute-patterns +endif + # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a # separate argument when used in execv() by the toolchain wrapper. TOOLCHAIN_WRAPPER_ARGS += \ diff --git a/buildroot/utils/genrandconfig b/buildroot/utils/genrandconfig index 63ff32cbf..93dc6d898 100755 --- a/buildroot/utils/genrandconfig +++ b/buildroot/utils/genrandconfig @@ -301,6 +301,22 @@ def fixup_config(sysinfo, configfile): 'BR2_PACKAGE_FLANN=y\n' in configlines: return False + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y\n' in configlines: + bootenv = os.path.join(args.outputdir, "boot_env.txt") + with open(bootenv, "w+") as bootenvf: + bootenvf.write("prop=value") + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="%s"\n' % bootenv) + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x1000"\n') + + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y\n' in configlines: + bootscr = os.path.join(args.outputdir, "boot_script.txt") + with open(bootscr, "w+") as bootscrf: + bootscrf.write("prop=value") + configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE=""\n') + configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="%s"\n' % bootscr) + with open(configfile, "w+") as configf: configf.writelines(configlines) diff --git a/buildroot/utils/scancpan b/buildroot/utils/scancpan index dbd8dab6d..327a58fc7 100755 --- a/buildroot/utils/scancpan +++ b/buildroot/utils/scancpan @@ -800,15 +800,15 @@ while (my ($distname, $dist) = each %dist) { say qq{write ${hashname}} unless $quiet; open my $fh, q{>}, $hashname; say {$fh} qq{# retrieved by scancpan from ${mirror}/}; - say {$fh} qq{md5 ${md5} ${filename}}; - say {$fh} qq{sha256 ${sha256} ${filename}}; + say {$fh} qq{md5 ${md5} ${filename}}; + say {$fh} qq{sha256 ${sha256} ${filename}}; my %license_files = %{$license_files{$distname}}; if (scalar keys %license_files) { say {$fh} q{}; say {$fh} qq{# computed by scancpan}; foreach my $license (sort keys %license_files) { my $digest = $license_files{$license}; - say {$fh} qq{sha256 ${digest} ${license}}; + say {$fh} qq{sha256 ${digest} ${license}}; } } close $fh; diff --git a/buildroot/utils/scanpypi b/buildroot/utils/scanpypi index dfbf8131c..51bc249f9 100755 --- a/buildroot/utils/scanpypi +++ b/buildroot/utils/scanpypi @@ -568,12 +568,12 @@ class BuildrootPackage(): hash_header = '# md5, sha256 from {url}\n'.format( url=self.metadata_url) lines.append(hash_header) - hash_line = '{method}\t{digest} {filename}\n'.format( + hash_line = '{method} {digest} {filename}\n'.format( method='md5', digest=self.used_url['digests']['md5'], filename=self.filename) lines.append(hash_line) - hash_line = '{method}\t{digest} {filename}\n'.format( + hash_line = '{method} {digest} {filename}\n'.format( method='sha256', digest=self.used_url['digests']['sha256'], filename=self.filename) @@ -589,7 +589,7 @@ class BuildrootPackage(): if not data: break sha256.update(data) - hash_line = '{method}\t{digest} {filename}\n'.format( + hash_line = '{method} {digest} {filename}\n'.format( method='sha256', digest=sha256.hexdigest(), filename=license_file.replace(self.tmp_extract, '')[1:])