Merge branch 'master' into next
Conflicts: package/go/go.hash package/go/go.mk Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
commit
7dac56b76e
140
CHANGES
140
CHANGES
@ -1,3 +1,40 @@
|
||||
2021.08-rc2, released August 18th, 2021
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Defconfigs: Acmesystems acqua a5: Bump at91bootstrap version
|
||||
to fix build issue with binutils >= 2.35, Microchip sam9x60ek
|
||||
mmc_dev: Add missing toolchain/system options, sama5d2-icp
|
||||
mmc: Correct at91bootstrap options
|
||||
|
||||
Updated/fixed packages: arm-trusted-firmware, at91bootstrap3,
|
||||
azure-iot-sdk-c, bluez5_utils, bullet, busybox, cegui, efl,
|
||||
erlang, ffmpeg, flatbuffers, fontconfig, gcc, gd, glibc, go,
|
||||
gobject-introspection, gpsd, guile, harfbuzz, iozone, iputils,
|
||||
jszip, libargtable2, libbpf, libebml, libepoxy, libesmtp,
|
||||
libfuse3, libgeos, libnss, libodb-boost, libodb-mysql,
|
||||
libodb-pgsql, libqmi, libqrtr-glib, libuhttpd, libuwsc,
|
||||
libvirt, ltp-testsuite, luaossl, mongodb, mpd, mupdf, mutt,
|
||||
network-manager, nginx-naxsi, nodejs, ogre, openzwave,
|
||||
optee-os, osm2pgsql, pdbg, perl-net-ssh2, php, pipewire,
|
||||
pistache, pixman, poke, polkit, poppler, postgresql, postkit,
|
||||
prelink-cross, prosody, protobuf, pulseview,
|
||||
python-cryptography, python-keyring, python-matplotlib,
|
||||
python-pymupdf, python-pyopenssl, python-secretstorage,
|
||||
python-treq, python-txtorcon, python3, qemu, qpdf, qt5base,
|
||||
refpolicy, ruby, rust-bin, s390-tools, sconeserver, seatd,
|
||||
shairport-sync, sox, sqlite, sylpheed, sysdig, syslog-ng,
|
||||
system-config-printer, tar, terminology, tor, tpm2-tools, uhd,
|
||||
unbound, usbguard, wireshark, xen, xenomai, xlib_libxshmfence,
|
||||
zstd
|
||||
|
||||
New packages: desktop-file-utils
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#13586: grub failure with BR2_OPTIMIZE_3
|
||||
#13671: openSSH server closes connection before authentication..
|
||||
|
||||
2021.08-rc1, released August 3rd, 2021
|
||||
|
||||
Numerous package updates.
|
||||
@ -55,6 +92,58 @@
|
||||
#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to
|
||||
y as before
|
||||
|
||||
2021.05.1, released August 10, 2021
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II)
|
||||
as it is not currently working.
|
||||
|
||||
binutils: fix linker assert failure on OpenRisc, or1k build
|
||||
issue with gcc < 5
|
||||
|
||||
gdb: Enable on NIOS II
|
||||
|
||||
utils/scanpypi: Various improvements
|
||||
|
||||
Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip
|
||||
sam9x60ek mmc_dev: Add missing toolchain/system options
|
||||
|
||||
Updated/fixed packages: arm-trusted-firmware, apache, audit,
|
||||
avahi, bind, binutils, bird, bluez5_utils, boinc, busybox,
|
||||
chrony, clamav, connman, cryptsetup, dnsmasq, docker-cli,
|
||||
docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2,
|
||||
fail2ban, fb-test-app, feh, fetchmail, ffmpeg, flac, fluxbox,
|
||||
gawk, gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go,
|
||||
gptfdisk, gqrx, granite, grub2, guile, hdparm, heirloom-mailx,
|
||||
htop, ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd,
|
||||
intel-microcode, iodine, irqbalance, keepalived, kexec-tools,
|
||||
libass, libconfig, libcurl, libfreeimage, libfuse3, libgcrypt,
|
||||
libgudev, libhtp, libinput, libjson, libgtk3, libkrb5,
|
||||
libloki, libmodsecurity, libndp, libnetfilter-log,
|
||||
libnfnetlink, libnice, libodb, libodb-boost, libodb-mysql,
|
||||
libodb-pgsql, libpcap, libqmi, libqrtr-glib, libressl,
|
||||
librsvg, libtasn1, libtirpc, libuci, libxmlrpc,
|
||||
linux-firmware, linuxptp, lrzsz, lvm2, mariadb, mesa3d,
|
||||
mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd,
|
||||
netsnmp, nettle, nmap, nodejs, ntp, openntpd, openpgm,
|
||||
openswan, pango, pcre2, perl-crypt-openssl-rsa, php, pixman,
|
||||
postgresql, proxychains-ng, putty, python,
|
||||
python-dataproperty, python-django, python-pysftp,
|
||||
python-urllib3, python3, qpdf, redis, ripgrep, rsync, ruby,
|
||||
samba4, sane-backends, slirp, spice, squid, suricata, tcpdump,
|
||||
tftpd, thrift, tor, tpm2-tools, trinity, uboot, uboot-tools,
|
||||
uclibc, vlc, wireless-regdb, wireshark, wolfssl,
|
||||
xapp_fonttosfnt, xlib_libX11, xlib_libxshmfence,
|
||||
xserver_xorg-server
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#13586: grub failure with BR2_OPTIMIZE_3
|
||||
#13661: host-python2 build fails on aarch64
|
||||
#13836: package build failure when target install set to no..
|
||||
#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to..
|
||||
|
||||
2021.05, released June 6th, 2021
|
||||
|
||||
Various fixes.
|
||||
@ -201,6 +290,57 @@
|
||||
#13751: libopenssl (static): huge drop in performance in newer ..
|
||||
#13771: package htop has undeclared dependency on host python
|
||||
|
||||
2021.02.4, released August 10th, 2021
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II)
|
||||
as it is not currently working.
|
||||
|
||||
binutils: fix linker assert failure on OpenRisc, or1k build
|
||||
issue with gcc < 5
|
||||
|
||||
gdb: Enable on NIOS II
|
||||
|
||||
utils/scanpypi: Various improvements
|
||||
|
||||
Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip
|
||||
sam9x60ek mmc_dev: Add missing toolchain/system options
|
||||
|
||||
Updated/fixed packages: apache, arm-trusted-firmware, audit,
|
||||
avahi, bind, binutils, bird, bluez5_utils, boinc, busybox,
|
||||
chrony, clamav, cryptsetup, cwiid, dnsmasq, docker-cli,
|
||||
docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2,
|
||||
fail2ban, fb-test-app, feh, fetchmail, flac, fluxbox, gawk,
|
||||
gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, gptfdisk,
|
||||
granite, grub2, gqrx, guile, hdparm, heirloom-mailx,
|
||||
ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, intel-microcode,
|
||||
iodine, irqbalance, keepalived, libass, libconfig, libcurl,
|
||||
libfreeimage, libfuse3, libgcrypt, libgtk3, libgudev, libhtp,
|
||||
libjson, libkrb5, libloki, libmodsecurity, libndp,
|
||||
libnetfilter-log, libnfnetlink, libnice, libodb, libodb-boost,
|
||||
libodb-mysql, libodb-pgsql, libpcap, libqmi, libressl,
|
||||
librsvg, libtasn1, libtirpc, libuci, libxmlrpc,
|
||||
linux-firmware, linuxptp, lrzsz, ltp-testsuite, lvm2, mariadb,
|
||||
mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, neard,
|
||||
netsnmp, nettle, nginx-modsecurity, nmap, nodejs, ntp,
|
||||
openntpd, openpgm, openswan, pango, pcre2,
|
||||
perl-crypt-openssl-rsa, php, pixman, polkit, postgresql,
|
||||
proxychains-ng, putty, python, python-django,
|
||||
python-dataproperty, python-pysftp, python-urllib3, python3,
|
||||
qpdf, redis, ripgrep, ruby, samba4, spice, slirp, suricata,
|
||||
sysdig, tcpdump, tftpd, thrift, tor, tpm2-tools, trinity,
|
||||
uboot, uboot-tools, uclibc, util-linux, vlc, wireless-regdb,
|
||||
wireshark, wolfssl, xapp_fonttosfnt, xlib_libX11,
|
||||
xlib_libxshmfence, xserver_xorg-server
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#13586: grub failure with BR2_OPTIMIZE_3
|
||||
#13661: host-python2 build fails on aarch64
|
||||
#13836: package build failure when target install set to no..
|
||||
#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to..
|
||||
|
||||
2021.02.3, released June 12th, 2021
|
||||
|
||||
Important / security related fixes.
|
||||
|
@ -853,9 +853,16 @@ endchoice
|
||||
comment "RELocation Read Only (RELRO) needs shared libraries"
|
||||
depends on !BR2_SHARED_LIBS
|
||||
|
||||
config BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
|
||||
bool
|
||||
default y
|
||||
# Microblaze glibc toolchains don't work with Fortify Source enabled
|
||||
depends on !BR2_microblaze
|
||||
|
||||
choice
|
||||
bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
|
||||
default BR2_FORTIFY_SOURCE_1
|
||||
depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_OPTIMIZE_0
|
||||
help
|
||||
@ -896,6 +903,7 @@ config BR2_FORTIFY_SOURCE_2
|
||||
endchoice
|
||||
|
||||
comment "Fortify Source needs a glibc toolchain and optimization"
|
||||
depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
|
||||
depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
|
||||
endmenu
|
||||
|
||||
|
@ -146,6 +146,26 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2021.08"
|
||||
|
||||
config BR2_PACKAGE_LIBMCRYPT
|
||||
bool "libmcrypt package was removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
This package has been removed as "the last update to libmcrypt
|
||||
was in 2007, despite years of unmerged patches. These facts
|
||||
have led security experts to declare mcrypt abandonware and
|
||||
discourage its use in new development" (extract from
|
||||
https://en.wikipedia.org/wiki/Mcrypt).
|
||||
|
||||
config BR2_PACKAGE_MCRYPT
|
||||
bool "mcrypt package was removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
This package has been removed as "the last update to libmcrypt
|
||||
was in 2007, despite years of unmerged patches. These facts
|
||||
have led security experts to declare mcrypt abandonware and
|
||||
discourage its use in new development" (extract from
|
||||
https://en.wikipedia.org/wiki/Mcrypt).
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_MCRYPT
|
||||
bool "PHP mcrypt extension removed"
|
||||
select BR2_LEGACY
|
||||
|
37
DEVELOPERS
37
DEVELOPERS
@ -1055,6 +1055,8 @@ F: package/xapian/
|
||||
|
||||
N: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
F: package/at/
|
||||
F: package/binutils/
|
||||
F: package/gcc/
|
||||
F: package/libfuse3/
|
||||
F: package/libnspr/
|
||||
F: package/libnss/
|
||||
@ -1063,6 +1065,7 @@ F: package/nfs-utils/
|
||||
F: package/sunxi-mali-mainline/
|
||||
F: package/sunxi-mali-mainline-driver/
|
||||
F: package/udisks/
|
||||
F: toolchain/
|
||||
|
||||
N: Gregory Dymarek <gregd72002@gmail.com>
|
||||
F: package/ding-libs/
|
||||
@ -1444,7 +1447,6 @@ 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/
|
||||
|
||||
@ -1878,36 +1880,6 @@ F: package/postgis/
|
||||
F: package/protozero/
|
||||
F: package/timescaledb/
|
||||
|
||||
N: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
F: package/babeld/
|
||||
F: package/dante/
|
||||
F: package/faifa/
|
||||
F: package/initscripts/
|
||||
F: package/intel-microcode/
|
||||
F: package/iucode-tool/
|
||||
F: package/jasper/
|
||||
F: package/kodi/
|
||||
F: package/libass/
|
||||
F: package/libbluray/
|
||||
F: package/libcdio/
|
||||
F: package/libcofi/
|
||||
F: package/libenca/
|
||||
F: package/libmodplug/
|
||||
F: package/libnfs/
|
||||
F: package/libplist/
|
||||
F: package/libshairplay/
|
||||
F: package/linux-zigbee/
|
||||
F: package/netcat-openbsd/
|
||||
F: package/open-plc-utils/
|
||||
F: package/rpi-firmware/
|
||||
F: package/rpi-userland/
|
||||
F: package/rtmpdump/
|
||||
F: package/skeleton/
|
||||
F: package/systemd/
|
||||
F: package/systemd-bootchart/
|
||||
F: package/tinyalsa/
|
||||
F: package/tinyxml/
|
||||
|
||||
N: Michael Durrant <mdurrant@arcturusnetworks.com>
|
||||
F: board/arcturus/
|
||||
F: configs/arcturus_ucp1020_defconfig
|
||||
@ -2574,9 +2546,6 @@ F: configs/rock_pi_n10_defconfig
|
||||
F: configs/rockpro64_defconfig
|
||||
F: package/arm-gnu-a-toolchain/
|
||||
|
||||
N: Sven Fischer <sven@leiderfischer.de>
|
||||
F: package/qt5/qt5remoteobjects/
|
||||
|
||||
N: Sven Haardiek <sven.haardiek@iotec-gmbh.de>
|
||||
F: package/lcdproc/
|
||||
F: package/python-influxdb/
|
||||
|
4
Makefile
4
Makefile
@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2021.08-rc1
|
||||
export BR2_VERSION := 2021.08-rc2
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1628024000
|
||||
BR2_VERSION_EPOCH = 1629283000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
@ -1,5 +0,0 @@
|
||||
setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
|
||||
ext4load mmc 0 0x49000000 /boot/${fdtfile}
|
||||
ext4load mmc 0 0x46000000 /boot/zImage
|
||||
env set fdt_high ffffffff
|
||||
bootz 0x46000000 - 0x49000000
|
1
board/olimex/a10_olinuxino/boot.cmd
Symbolic link
1
board/olimex/a10_olinuxino/boot.cmd
Symbolic link
@ -0,0 +1 @@
|
||||
../a20_olinuxino/boot.cmd
|
@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
|
1
board/olimex/a10_olinuxino/post-build.sh
Symbolic link
1
board/olimex/a10_olinuxino/post-build.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../a20_olinuxino/post-build.sh
|
5
board/olimex/a20_olinuxino/boot.cmd
Normal file
5
board/olimex/a20_olinuxino/boot.cmd
Normal file
@ -0,0 +1,5 @@
|
||||
setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
|
||||
ext4load mmc 0 0x49000000 /boot/${fdtfile}
|
||||
ext4load mmc 0 0x46000000 /boot/zImage
|
||||
env set fdt_high ffffffff
|
||||
bootz 0x46000000 - 0x49000000
|
3
board/olimex/a20_olinuxino/post-build.sh
Executable file
3
board/olimex/a20_olinuxino/post-build.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
|
@ -213,7 +213,10 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL
|
||||
string
|
||||
default "none" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
|
||||
# While newer versions of TF-A support "none" as
|
||||
# ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only
|
||||
# supported "0" to disable SSP.
|
||||
default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
|
||||
default "default" if BR2_SSP_REGULAR
|
||||
default "strong" if BR2_SSP_STRONG
|
||||
default "all" if BR2_SSP_ALL
|
||||
|
@ -51,7 +51,10 @@ endif
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
|
||||
PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
|
||||
PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_ENV += \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL))
|
||||
|
||||
ifeq ($(BR2_ARM_CPU_ARMV7A),y)
|
||||
@ -169,7 +172,8 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
|
||||
cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/
|
||||
)
|
||||
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
|
||||
$(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
|
||||
$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
|
||||
$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
|
||||
endef
|
||||
|
@ -19,10 +19,10 @@ choice
|
||||
prompt "AT91 Bootstrap 3+ version"
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
bool "4.0.0-rc2"
|
||||
bool "4.0.0"
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X
|
||||
bool "3.10.2"
|
||||
bool "3.10.3"
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
|
||||
bool "Custom Git repository"
|
||||
@ -54,8 +54,8 @@ endif
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_VERSION
|
||||
string
|
||||
default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
default "v3.10.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X
|
||||
default "v4.0.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
default "v3.10.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X
|
||||
default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
|
||||
if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
|
||||
default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL
|
||||
|
@ -1,3 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 33e4ba431af93a4fc2e81c1458cd31901b9f69c583ebe4c74ca78c0846479bfd at91bootstrap3-v3.10.2.tar.gz
|
||||
sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz
|
||||
sha256 b6ae5bcaacc5a949f400182e036ae053049638444a3ba8b1dd154ec5f7898d8e at91bootstrap3-v3.10.3.tar.gz
|
||||
sha256 08c5b95df28be7f2e0439fb2b77fe27524f97c499850641e4540c07ea0b2c25d at91bootstrap3-v4.0.0.tar.gz
|
||||
sha256 5a3809b1c2ba13b7242572322951311c584419f1f8516f665d6c06f0668d78de LICENSES/MIT.txt
|
||||
|
@ -19,7 +19,12 @@ else
|
||||
AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
|
||||
AT91BOOTSTRAP3_LICENSE = MIT
|
||||
AT91BOOTSTRAP3_LICENSE_FILES = LICENSES/MIT.txt
|
||||
else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X),y)
|
||||
AT91BOOTSTRAP3_LICENSE = Atmel License
|
||||
endif
|
||||
|
||||
AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam
|
||||
AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap
|
||||
|
@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-256m"
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
|
@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-512m"
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
|
@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m"
|
||||
|
||||
# Tools to build sdcard.img
|
||||
|
@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m"
|
||||
|
||||
# Tools to build sdcard.img
|
||||
|
@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m"
|
||||
|
||||
# Tools to build sdcard.img
|
||||
|
@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m"
|
||||
|
||||
# Tools to build sdcard.img
|
||||
|
@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_UBI=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9260eknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9g20eknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9m10g45eknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9rleknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -84,7 +84,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -26,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -86,7 +86,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -71,7 +71,7 @@ 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.2)/at91bootstrap3-v3.9.2.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -17,7 +17,7 @@ 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)/at91bootstrap3-v3.9.0.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
# Bootloaders
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI=y
|
||||
BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -85,7 +85,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
|
||||
# Bootloaders
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -16,7 +16,7 @@ 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)/at91bootstrap3-v3.9.0.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -87,7 +87,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
# Bootloaders
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
|
||||
# Bootloaders
|
||||
BR2_TARGET_AT91BOOTSTRAP3=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.8.10)/at91bootstrap3-v3.8.10.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
|
||||
BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -89,7 +89,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
|
||||
# Bootloaders
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -17,7 +17,7 @@ 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)/at91bootstrap3-v3.9.0.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
# Bootloaders
|
||||
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.10.3)/at91bootstrap3-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -4,7 +4,7 @@ BR2_RISCV_ISA_CUSTOM_RVM=y
|
||||
BR2_RISCV_ISA_CUSTOM_RVF=y
|
||||
BR2_RISCV_ISA_CUSTOM_RVD=y
|
||||
BR2_RISCV_ISA_CUSTOM_RVC=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglev/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglev/genimage.cfg"
|
||||
|
@ -14,7 +14,7 @@ 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.10.0)/at91bootstrap-v3.10.0.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sam9x60eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -1,6 +1,10 @@
|
||||
BR2_arm=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
|
||||
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
||||
BR2_PTHREAD_DEBUG=y
|
||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek"
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
@ -64,7 +68,7 @@ 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.10.0)/at91bootstrap-v3.10.0.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sam9x60eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -17,7 +17,7 @@ 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_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -72,7 +72,7 @@ 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_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
|
@ -16,7 +16,6 @@ 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_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot"
|
||||
|
@ -59,7 +59,6 @@ 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_GIT=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y
|
||||
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz"
|
||||
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot"
|
||||
|
@ -23,13 +23,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg"
|
||||
|
||||
# Linux headers same as kernel, a 4.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
|
||||
# Linux headers same as kernel, a 4.19 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
|
@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh"
|
||||
|
||||
# Linux headers same as kernel, a 4.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
|
||||
# Linux headers same as kernel, a 4.19 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
|
@ -8,6 +8,36 @@ Some versions have introduced backward incompatibilities. This section
|
||||
explains those incompatibilities, and for each explains what to do to
|
||||
complete the migration.
|
||||
|
||||
[[migrating-approach]]
|
||||
=== General approach
|
||||
|
||||
To migrate from an older Buildroot version, take the following steps.
|
||||
|
||||
. For all your configurations, do a build in the old Buildroot
|
||||
environment. Run +make graph-size+. Save
|
||||
+graphs/file-size-stats.csv+ in a different location. Run +make
|
||||
clean+ to remove the rest.
|
||||
. Review the specific migration notes below and make the required
|
||||
adaptations to external packages and custom build scripts.
|
||||
. Update Buildroot.
|
||||
. Run +make menuconfig+ starting from the existing +.config+.
|
||||
. If anything is enabled in the Legacy menu, check its help text,
|
||||
unselect it, and save the configuration.
|
||||
. For more details, review the git commit messages for the packages that
|
||||
you need. Change into the +packages+ directory and run
|
||||
+git log <old version>.. -- <your packages>+.
|
||||
. Build in the new Buildroot environment.
|
||||
. Fix build issues in external packages (usually due to updated
|
||||
dependencies).
|
||||
. Run +make graph-size+.
|
||||
. Compare the new +file-size-stats.csv+ with the original one, to
|
||||
check if no required files have disappeared and if no new big unneeded
|
||||
files have appeared.
|
||||
. For configuration (and other) files in a custom overlay that overwrite
|
||||
files created by Buildroot, check if there are changes in the
|
||||
Buildroot-generated file that need to be propagated to your custom
|
||||
file.
|
||||
|
||||
[[br2-external-converting]]
|
||||
=== Migrating to 2016.11
|
||||
|
||||
|
@ -8,105 +8,105 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2021.02.3</b></h3>
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2021.02.4</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.02.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.4.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.02.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.4.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2021.02.3.tar.gz">buildroot-2021.02.3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.3.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.02.4.tar.gz">buildroot-2021.02.4.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.4.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.02.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.4.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.02.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.4.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2021.02.3.tar.bz2">buildroot-2021.02.3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.3.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.02.4.tar.bz2">buildroot-2021.02.4.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.4.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2021.05</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2021.05.1</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.05.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.05.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2021.05.tar.gz">buildroot-2021.05.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.05.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.05.1.tar.gz">buildroot-2021.05.1.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.05.1.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.05.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.05.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2021.05.tar.bz2">buildroot-2021.05.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.05.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.05.1.tar.bz2">buildroot-2021.05.1.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.05.1.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2021.08-rc1</b></h3>
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2021.08-rc2</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.08-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.08-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.08-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.08-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2021.08-rc1.tar.gz">buildroot-2021.08-rc1.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.08-rc1.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.08-rc2.tar.gz">buildroot-2021.08-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.08-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2021.08-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.08-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2021.08-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.08-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2021.08-rc1.tar.bz2">buildroot-2021.08-rc1.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.08-rc1.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.08-rc2.tar.bz2">buildroot-2021.08-rc2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.08-rc2.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -9,6 +9,65 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2021.08-rc2 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>18 August 2021</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>2021.08-rc2 has been released with more cleanups and build fixes. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2021.08-rc2">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2021.08-rc2.tar.bz2">2021.08-rc2
|
||||
release candidate</a>, and report any problems found to the
|
||||
<a href="support.html">mailing list</a> or
|
||||
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2021.02.4 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>11 August 2021</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2021.02.4 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2021.02.3 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.4">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2021-August/620747.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2021.02.4.tar.bz2">2021.02.4 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2021.05.1 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>10 August 2021</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2021.05.1 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2021.05 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2021.05.1">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2021-August/620721.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2021.05.1.tar.bz2">2021.05.1 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
@ -59,11 +59,8 @@
|
||||
list, since there is a good chance someone else has asked the same question
|
||||
before.</p>
|
||||
|
||||
<form method="get" action="http://buildroot-busybox.2317881.n4.nabble.com/template/NamlServlet.jtp">
|
||||
<input type="text" name="query">
|
||||
<input type="hidden" name="macro" value="search_page">
|
||||
<input type="hidden" name="node" value="2">
|
||||
<input type="hidden" name="sort" value="date">
|
||||
<form method="get" action="https://lore.kernel.org/buildroot/">
|
||||
<input type="text" name="q">
|
||||
<button type="submit" class="btn btn-default">Submit</button>
|
||||
</form>
|
||||
</div>
|
||||
|
@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "Latest version (5.13)"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
bool "Latest CIP SLTS version (4.19.182-cip45)"
|
||||
bool "Latest CIP SLTS version (4.19.198-cip54)"
|
||||
help
|
||||
CIP launched in the spring of 2016 to address the needs of
|
||||
organizations in industries such as power generation and
|
||||
@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
https://www.cip-project.org
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
bool "Latest CIP RT SLTS version (4.19.165-cip41-rt18)"
|
||||
bool "Latest CIP RT SLTS version (4.19.198-cip54-rt21)"
|
||||
help
|
||||
Same as the CIP version, but this is the PREEMPT_RT realtime
|
||||
variant.
|
||||
@ -125,9 +125,9 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "5.13.2" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.182-cip45" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "4.19.165-cip41-rt18" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default "5.13.9" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
|
||||
|
@ -1,17 +1,17 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 c3940d09cfb629f8c140b7b098cf6356d60cd8043df6b17c1f004077269ca937 linux-5.13.2.tar.xz
|
||||
sha256 c8d499fc53ed14838994ec2f51591ae40d64cce68559cd897be8acbeeee7630f linux-5.12.10.tar.xz
|
||||
sha256 72fe7cc1f0363523061659a21e24754697b27f405cb88a41a63038629636159a linux-5.13.9.tar.xz
|
||||
sha256 e9381cd3525a02f5b895f74147e2440be443ecd45484c6c64075046bc6f94c73 linux-5.12.19.tar.xz
|
||||
sha256 11027c6114eb916edbcc37897226fb6263b2931911d2d5093550473ce1a57600 linux-5.11.22.tar.xz
|
||||
sha256 83b81e433ba2f8ee143064fb163699ee857e26dd789006bc1e9edf1ccd0bd403 linux-5.10.43.tar.xz
|
||||
sha256 17ee750a4aeb1c883d721e730d1f7e2855124585e2f47766864a1359a7ebe33c linux-5.4.125.tar.xz
|
||||
sha256 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d linux-5.10.57.tar.xz
|
||||
sha256 0471d0ccb7953cdae7d235192588ac5d72344851969962676d1703e69084a37f linux-5.4.139.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 d13fa552be602825c443fcca90d6bdd72f4ebef809889ef015dba4593d3224ab linux-4.4.272.tar.xz
|
||||
sha256 f8bf0c390ae40ca736e104f10f744446bc534bf87ba1b6dbb2b7c9a8bece1058 linux-4.9.272.tar.xz
|
||||
sha256 e4eae297a6fefefd8ce4781d98178a7c1ee51ca0a4c8a7e46e61b121fbab8b2a linux-4.14.236.tar.xz
|
||||
sha256 aaaebdccf599f77148fe170642fa7dc2452cf994b5cbbb4d39cab9e7f4058896 linux-4.19.194.tar.xz
|
||||
sha256 4bdf66494be66a1da857f09b40b95026a0388e373fb01a206c60f67834746cb4 linux-4.4.279.tar.xz
|
||||
sha256 21edb57dea0fe04a51fcfb6d4e8c0c052787a20015bc74a0a0e63329601f2e07 linux-4.9.279.tar.xz
|
||||
sha256 7f235d454d703112e86574150652807f42abead92f3837da32ea86b4f148b371 linux-4.14.243.tar.xz
|
||||
sha256 f2827d0506622fcae0dae0bc72b2f016469210f50c2d3dd1bdd1211a813dca27 linux-4.19.202.tar.xz
|
||||
# Locally computed
|
||||
sha256 9f1de83c5c2bb582a33bd4ee892d45671901cd06af9dc159f0f499f1b5265b20 linux-cip-4.19.182-cip45.tar.gz
|
||||
sha256 0eeba6d6ecc45cf8f16458842b64d22e7064b9de9c31c11d1c395b08a47e3855 linux-cip-4.19.165-cip41-rt18.tar.gz
|
||||
sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz
|
||||
sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz
|
||||
|
||||
# Licenses hashes
|
||||
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING
|
||||
|
@ -1377,7 +1377,6 @@ menu "Crypto"
|
||||
source "package/libgpgme/Config.in"
|
||||
source "package/libkcapi/Config.in"
|
||||
source "package/libksba/Config.in"
|
||||
source "package/libmcrypt/Config.in"
|
||||
source "package/libmhash/Config.in"
|
||||
source "package/libnss/Config.in"
|
||||
source "package/libolm/Config.in"
|
||||
@ -2066,7 +2065,6 @@ menu "Miscellaneous"
|
||||
source "package/gsettings-desktop-schemas/Config.in"
|
||||
source "package/haveged/Config.in"
|
||||
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"
|
||||
|
@ -79,7 +79,6 @@ 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"
|
||||
|
@ -77,7 +77,6 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
|
||||
fi
|
||||
if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
|
||||
mkdir -p $(TARGET_DIR)/usr/share/; \
|
||||
rm -rf $(TARGET_DIR)/usr/share/alsa/; \
|
||||
cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
|
||||
fi
|
||||
endef
|
||||
|
@ -9,6 +9,7 @@ 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_CPE_ID_VENDOR = linphone
|
||||
BELLE_SIP_INSTALL_STAGING = YES
|
||||
BELLE_SIP_DEPENDENCIES = \
|
||||
bctoolbox \
|
||||
|
@ -0,0 +1,42 @@
|
||||
From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 7 Aug 2021 17:11:24 +0200
|
||||
Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build
|
||||
|
||||
Fix the following build failure on musl (which does not provide
|
||||
PTHREAD_MUTEX_RECURSIVE_NP):
|
||||
|
||||
In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289,
|
||||
from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19,
|
||||
from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18,
|
||||
from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28:
|
||||
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()':
|
||||
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'?
|
||||
97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930]
|
||||
---
|
||||
Extras/VHACD/inc/vhacdMutex.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h
|
||||
index 4d1ad2a7d..78c111383 100644
|
||||
--- a/Extras/VHACD/inc/vhacdMutex.h
|
||||
+++ b/Extras/VHACD/inc/vhacdMutex.h
|
||||
@@ -69,7 +69,7 @@
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
-#if defined(__APPLE__)
|
||||
+#if defined(__APPLE__) || !defined(__GLIBC__)
|
||||
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
||||
#endif
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
@ -24,7 +24,7 @@ endif
|
||||
|
||||
BULLET_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_101952),)
|
||||
BULLET_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
||||
|
||||
ACTION="$1"
|
||||
RESOLV_CONF="/etc/resolv.conf"
|
||||
[ -e $RESOLV_CONF ] || touch $RESOLV_CONF
|
||||
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
||||
@ -29,7 +30,7 @@ wait_for_ipv6_default_route() {
|
||||
printf " timeout!\n"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
case "$ACTION" in
|
||||
deconfig)
|
||||
/sbin/ifconfig $interface up
|
||||
/sbin/ifconfig $interface 0.0.0.0
|
||||
@ -115,7 +116,7 @@ esac
|
||||
HOOK_DIR="$0.d"
|
||||
for hook in "${HOOK_DIR}/"*; do
|
||||
[ -f "${hook}" -a -x "${hook}" ] || continue
|
||||
"${hook}" "${@}"
|
||||
"${hook}" "$ACTION"
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343 cjson-1.7.14.tar.gz
|
||||
sha256 5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 cjson-1.7.15.tar.gz
|
||||
sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CJSON_VERSION = 1.7.14
|
||||
CJSON_VERSION = 1.7.15
|
||||
CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION))
|
||||
CJSON_INSTALL_STAGING = YES
|
||||
CJSON_LICENSE = MIT
|
||||
|
461
package/cpio/0002-Rewrite-dynamic-string-support.patch
Normal file
461
package/cpio/0002-Rewrite-dynamic-string-support.patch
Normal file
@ -0,0 +1,461 @@
|
||||
From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Poznyakoff <gray@gnu.org>
|
||||
Date: Sat, 7 Aug 2021 12:52:21 +0300
|
||||
Subject: Rewrite dynamic string support.
|
||||
|
||||
* src/dstring.c (ds_init): Take a single argument.
|
||||
(ds_free): New function.
|
||||
(ds_resize): Take a single argument. Use x2nrealloc to expand
|
||||
the storage.
|
||||
(ds_reset,ds_append,ds_concat,ds_endswith): New function.
|
||||
(ds_fgetstr): Rewrite. In particular, this fixes integer overflow.
|
||||
* src/dstring.h (dynamic_string): Keep both the allocated length
|
||||
(ds_size) and index of the next free byte in the string (ds_idx).
|
||||
(ds_init,ds_resize): Change signature.
|
||||
(ds_len): New macro.
|
||||
(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos.
|
||||
* src/copyin.c: Use new ds_ functions.
|
||||
* src/copyout.c: Likewise.
|
||||
* src/copypass.c: Likewise.
|
||||
* src/util.c: Likewise.
|
||||
|
||||
[Retrieved from:
|
||||
https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dd96882877721703e19272fe25034560b794061b]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/copyin.c | 40 +++++++++++++-------------
|
||||
src/copyout.c | 16 ++++-------
|
||||
src/copypass.c | 34 +++++++++++------------
|
||||
src/dstring.c | 88 ++++++++++++++++++++++++++++++++++++++++++----------------
|
||||
src/dstring.h | 31 ++++++++++-----------
|
||||
src/util.c | 6 ++--
|
||||
6 files changed, 123 insertions(+), 92 deletions(-)
|
||||
|
||||
diff --git a/src/copyin.c b/src/copyin.c
|
||||
index a096048..4fb14af 100644
|
||||
--- a/src/copyin.c
|
||||
+++ b/src/copyin.c
|
||||
@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out,
|
||||
char *str_res; /* Result for string function. */
|
||||
static dynamic_string new_name; /* New file name for rename option. */
|
||||
static int initialized_new_name = false;
|
||||
+
|
||||
if (!initialized_new_name)
|
||||
- {
|
||||
- ds_init (&new_name, 128);
|
||||
- initialized_new_name = true;
|
||||
- }
|
||||
+ {
|
||||
+ ds_init (&new_name);
|
||||
+ initialized_new_name = true;
|
||||
+ }
|
||||
|
||||
if (rename_flag)
|
||||
{
|
||||
@@ -780,37 +781,36 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name)
|
||||
already in `save_patterns' (from the command line) are preserved. */
|
||||
|
||||
static void
|
||||
-read_pattern_file ()
|
||||
+read_pattern_file (void)
|
||||
{
|
||||
- int max_new_patterns;
|
||||
- char **new_save_patterns;
|
||||
- int new_num_patterns;
|
||||
+ char **new_save_patterns = NULL;
|
||||
+ size_t max_new_patterns;
|
||||
+ size_t new_num_patterns;
|
||||
int i;
|
||||
- dynamic_string pattern_name;
|
||||
+ dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER;
|
||||
FILE *pattern_fp;
|
||||
|
||||
if (num_patterns < 0)
|
||||
num_patterns = 0;
|
||||
- max_new_patterns = 1 + num_patterns;
|
||||
- new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *));
|
||||
new_num_patterns = num_patterns;
|
||||
- ds_init (&pattern_name, 128);
|
||||
+ max_new_patterns = num_patterns;
|
||||
+ new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns[0]));
|
||||
|
||||
pattern_fp = fopen (pattern_file_name, "r");
|
||||
if (pattern_fp == NULL)
|
||||
open_fatal (pattern_file_name);
|
||||
while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
|
||||
{
|
||||
- if (new_num_patterns >= max_new_patterns)
|
||||
- {
|
||||
- max_new_patterns += 1;
|
||||
- new_save_patterns = (char **)
|
||||
- xrealloc ((char *) new_save_patterns,
|
||||
- max_new_patterns * sizeof (char *));
|
||||
- }
|
||||
+ if (new_num_patterns == max_new_patterns)
|
||||
+ new_save_patterns = x2nrealloc (new_save_patterns,
|
||||
+ &max_new_patterns,
|
||||
+ sizeof (new_save_patterns[0]));
|
||||
new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string);
|
||||
++new_num_patterns;
|
||||
}
|
||||
+
|
||||
+ ds_free (&pattern_name);
|
||||
+
|
||||
if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
|
||||
close_error (pattern_file_name);
|
||||
|
||||
@@ -1210,7 +1210,7 @@ swab_array (char *ptr, int count)
|
||||
in the file system. */
|
||||
|
||||
void
|
||||
-process_copy_in ()
|
||||
+process_copy_in (void)
|
||||
{
|
||||
FILE *tty_in = NULL; /* Interactive file for rename option. */
|
||||
FILE *tty_out = NULL; /* Interactive file for rename option. */
|
||||
diff --git a/src/copyout.c b/src/copyout.c
|
||||
index 5ca587f..ca6798c 100644
|
||||
--- a/src/copyout.c
|
||||
+++ b/src/copyout.c
|
||||
@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value)
|
||||
The format of the header depends on the compatibility (-c) flag. */
|
||||
|
||||
void
|
||||
-process_copy_out ()
|
||||
+process_copy_out (void)
|
||||
{
|
||||
- dynamic_string input_name; /* Name of file read from stdin. */
|
||||
+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
|
||||
+ /* Name of file read from stdin. */
|
||||
struct stat file_stat; /* Stat record for file. */
|
||||
struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER;
|
||||
/* Output header information. */
|
||||
@@ -605,7 +606,6 @@ process_copy_out ()
|
||||
char *orig_file_name = NULL;
|
||||
|
||||
/* Initialize the copy out. */
|
||||
- ds_init (&input_name, 128);
|
||||
file_hdr.c_magic = 070707;
|
||||
|
||||
/* Check whether the output file might be a tape. */
|
||||
@@ -657,14 +657,9 @@ process_copy_out ()
|
||||
{
|
||||
if (file_hdr.c_mode & CP_IFDIR)
|
||||
{
|
||||
- int len = strlen (input_name.ds_string);
|
||||
/* Make sure the name ends with a slash */
|
||||
- if (input_name.ds_string[len-1] != '/')
|
||||
- {
|
||||
- ds_resize (&input_name, len + 2);
|
||||
- input_name.ds_string[len] = '/';
|
||||
- input_name.ds_string[len+1] = 0;
|
||||
- }
|
||||
+ if (!ds_endswith (&input_name, '/'))
|
||||
+ ds_append (&input_name, '/');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -875,6 +870,7 @@ process_copy_out ()
|
||||
(unsigned long) blocks), (unsigned long) blocks);
|
||||
}
|
||||
cpio_file_stat_free (&file_hdr);
|
||||
+ ds_free (&input_name);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/src/copypass.c b/src/copypass.c
|
||||
index 5d5e939..23ee687 100644
|
||||
--- a/src/copypass.c
|
||||
+++ b/src/copypass.c
|
||||
@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st)
|
||||
If `link_flag', link instead of copying. */
|
||||
|
||||
void
|
||||
-process_copy_pass ()
|
||||
+process_copy_pass (void)
|
||||
{
|
||||
- dynamic_string input_name; /* Name of file from stdin. */
|
||||
- dynamic_string output_name; /* Name of new file. */
|
||||
+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
|
||||
+ /* Name of file from stdin. */
|
||||
+ dynamic_string output_name = DYNAMIC_STRING_INITIALIZER;
|
||||
+ /* Name of new file. */
|
||||
size_t dirname_len; /* Length of `directory_name'. */
|
||||
int res; /* Result of functions. */
|
||||
char *slash; /* For moving past slashes in input name. */
|
||||
@@ -65,25 +67,18 @@ process_copy_pass ()
|
||||
created files */
|
||||
|
||||
/* Initialize the copy pass. */
|
||||
- ds_init (&input_name, 128);
|
||||
|
||||
dirname_len = strlen (directory_name);
|
||||
if (change_directory_option && !ISSLASH (directory_name[0]))
|
||||
{
|
||||
char *pwd = xgetcwd ();
|
||||
-
|
||||
- dirname_len += strlen (pwd) + 1;
|
||||
- ds_init (&output_name, dirname_len + 2);
|
||||
- strcpy (output_name.ds_string, pwd);
|
||||
- strcat (output_name.ds_string, "/");
|
||||
- strcat (output_name.ds_string, directory_name);
|
||||
+
|
||||
+ ds_concat (&output_name, pwd);
|
||||
+ ds_append (&output_name, '/');
|
||||
}
|
||||
- else
|
||||
- {
|
||||
- ds_init (&output_name, dirname_len + 2);
|
||||
- strcpy (output_name.ds_string, directory_name);
|
||||
- }
|
||||
- output_name.ds_string[dirname_len] = '/';
|
||||
+ ds_concat (&output_name, directory_name);
|
||||
+ ds_append (&output_name, '/');
|
||||
+ dirname_len = ds_len (&output_name);
|
||||
output_is_seekable = true;
|
||||
|
||||
change_dir ();
|
||||
@@ -116,8 +111,8 @@ process_copy_pass ()
|
||||
/* Make the name of the new file. */
|
||||
for (slash = input_name.ds_string; *slash == '/'; ++slash)
|
||||
;
|
||||
- ds_resize (&output_name, dirname_len + strlen (slash) + 2);
|
||||
- strcpy (output_name.ds_string + dirname_len + 1, slash);
|
||||
+ ds_reset (&output_name, dirname_len);
|
||||
+ ds_concat (&output_name, slash);
|
||||
|
||||
existing_dir = false;
|
||||
if (lstat (output_name.ds_string, &out_file_stat) == 0)
|
||||
@@ -333,6 +328,9 @@ process_copy_pass ()
|
||||
(unsigned long) blocks),
|
||||
(unsigned long) blocks);
|
||||
}
|
||||
+
|
||||
+ ds_free (&input_name);
|
||||
+ ds_free (&output_name);
|
||||
}
|
||||
|
||||
/* Try and create a hard link from FILE_NAME to another file
|
||||
diff --git a/src/dstring.c b/src/dstring.c
|
||||
index b261d5a..692d3e7 100644
|
||||
--- a/src/dstring.c
|
||||
+++ b/src/dstring.c
|
||||
@@ -20,8 +20,8 @@
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
# include <config.h>
|
||||
#endif
|
||||
-
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
|
||||
#include <string.h>
|
||||
#else
|
||||
@@ -33,24 +33,41 @@
|
||||
/* Initialiaze dynamic string STRING with space for SIZE characters. */
|
||||
|
||||
void
|
||||
-ds_init (dynamic_string *string, int size)
|
||||
+ds_init (dynamic_string *string)
|
||||
+{
|
||||
+ memset (string, 0, sizeof *string);
|
||||
+}
|
||||
+
|
||||
+/* Free the dynamic string storage. */
|
||||
+
|
||||
+void
|
||||
+ds_free (dynamic_string *string)
|
||||
{
|
||||
- string->ds_length = size;
|
||||
- string->ds_string = (char *) xmalloc (size);
|
||||
+ free (string->ds_string);
|
||||
}
|
||||
|
||||
-/* Expand dynamic string STRING, if necessary, to hold SIZE characters. */
|
||||
+/* Expand dynamic string STRING, if necessary. */
|
||||
|
||||
void
|
||||
-ds_resize (dynamic_string *string, int size)
|
||||
+ds_resize (dynamic_string *string)
|
||||
{
|
||||
- if (size > string->ds_length)
|
||||
+ if (string->ds_idx == string->ds_size)
|
||||
{
|
||||
- string->ds_length = size;
|
||||
- string->ds_string = (char *) xrealloc ((char *) string->ds_string, size);
|
||||
+ string->ds_string = x2nrealloc (string->ds_string, &string->ds_size,
|
||||
+ 1);
|
||||
}
|
||||
}
|
||||
|
||||
+/* Reset the index of the dynamic string S to LEN. */
|
||||
+
|
||||
+void
|
||||
+ds_reset (dynamic_string *s, size_t len)
|
||||
+{
|
||||
+ while (len > s->ds_size)
|
||||
+ ds_resize (s);
|
||||
+ s->ds_idx = len;
|
||||
+}
|
||||
+
|
||||
/* Dynamic string S gets a string terminated by the EOS character
|
||||
(which is removed) from file F. S will increase
|
||||
in size during the function if the string from F is longer than
|
||||
@@ -61,34 +78,50 @@ ds_resize (dynamic_string *string, int size)
|
||||
char *
|
||||
ds_fgetstr (FILE *f, dynamic_string *s, char eos)
|
||||
{
|
||||
- int insize; /* Amount needed for line. */
|
||||
- int strsize; /* Amount allocated for S. */
|
||||
int next_ch;
|
||||
|
||||
/* Initialize. */
|
||||
- insize = 0;
|
||||
- strsize = s->ds_length;
|
||||
+ s->ds_idx = 0;
|
||||
|
||||
/* Read the input string. */
|
||||
- next_ch = getc (f);
|
||||
- while (next_ch != eos && next_ch != EOF)
|
||||
+ while ((next_ch = getc (f)) != eos && next_ch != EOF)
|
||||
{
|
||||
- if (insize >= strsize - 1)
|
||||
- {
|
||||
- ds_resize (s, strsize * 2 + 2);
|
||||
- strsize = s->ds_length;
|
||||
- }
|
||||
- s->ds_string[insize++] = next_ch;
|
||||
- next_ch = getc (f);
|
||||
+ ds_resize (s);
|
||||
+ s->ds_string[s->ds_idx++] = next_ch;
|
||||
}
|
||||
- s->ds_string[insize++] = '\0';
|
||||
+ ds_resize (s);
|
||||
+ s->ds_string[s->ds_idx] = '\0';
|
||||
|
||||
- if (insize == 1 && next_ch == EOF)
|
||||
+ if (s->ds_idx == 0 && next_ch == EOF)
|
||||
return NULL;
|
||||
else
|
||||
return s->ds_string;
|
||||
}
|
||||
|
||||
+void
|
||||
+ds_append (dynamic_string *s, int c)
|
||||
+{
|
||||
+ ds_resize (s);
|
||||
+ s->ds_string[s->ds_idx] = c;
|
||||
+ if (c)
|
||||
+ {
|
||||
+ s->ds_idx++;
|
||||
+ ds_resize (s);
|
||||
+ s->ds_string[s->ds_idx] = 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+ds_concat (dynamic_string *s, char const *str)
|
||||
+{
|
||||
+ size_t len = strlen (str);
|
||||
+ while (len + 1 > s->ds_size)
|
||||
+ ds_resize (s);
|
||||
+ memcpy (s->ds_string + s->ds_idx, str, len);
|
||||
+ s->ds_idx += len;
|
||||
+ s->ds_string[s->ds_idx] = 0;
|
||||
+}
|
||||
+
|
||||
char *
|
||||
ds_fgets (FILE *f, dynamic_string *s)
|
||||
{
|
||||
@@ -100,3 +133,10 @@ ds_fgetname (FILE *f, dynamic_string *s)
|
||||
{
|
||||
return ds_fgetstr (f, s, '\0');
|
||||
}
|
||||
+
|
||||
+/* Return true if the dynamic string S ends with character C. */
|
||||
+int
|
||||
+ds_endswith (dynamic_string *s, int c)
|
||||
+{
|
||||
+ return (s->ds_idx > 0 && s->ds_string[s->ds_idx - 1] == c);
|
||||
+}
|
||||
diff --git a/src/dstring.h b/src/dstring.h
|
||||
index 5d24181..ca7a5f1 100644
|
||||
--- a/src/dstring.h
|
||||
+++ b/src/dstring.h
|
||||
@@ -17,10 +17,6 @@
|
||||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301 USA. */
|
||||
|
||||
-#ifndef NULL
|
||||
-#define NULL 0
|
||||
-#endif
|
||||
-
|
||||
/* A dynamic string consists of record that records the size of an
|
||||
allocated string and the pointer to that string. The actual string
|
||||
is a normal zero byte terminated string that can be used with the
|
||||
@@ -30,22 +26,25 @@
|
||||
|
||||
typedef struct
|
||||
{
|
||||
- int ds_length; /* Actual amount of storage allocated. */
|
||||
- char *ds_string; /* String. */
|
||||
+ size_t ds_size; /* Actual amount of storage allocated. */
|
||||
+ size_t ds_idx; /* Index of the next free byte in the string. */
|
||||
+ char *ds_string; /* String storage. */
|
||||
} dynamic_string;
|
||||
|
||||
+#define DYNAMIC_STRING_INITIALIZER { 0, 0, NULL }
|
||||
|
||||
-/* Macros that look similar to the original string functions.
|
||||
- WARNING: These macros work only on pointers to dynamic string records.
|
||||
- If used with a real record, an "&" must be used to get the pointer. */
|
||||
-#define ds_strlen(s) strlen ((s)->ds_string)
|
||||
-#define ds_strcmp(s1, s2) strcmp ((s1)->ds_string, (s2)->ds_string)
|
||||
-#define ds_strncmp(s1, s2, n) strncmp ((s1)->ds_string, (s2)->ds_string, n)
|
||||
-#define ds_index(s, c) index ((s)->ds_string, c)
|
||||
-#define ds_rindex(s, c) rindex ((s)->ds_string, c)
|
||||
+void ds_init (dynamic_string *string);
|
||||
+void ds_free (dynamic_string *string);
|
||||
+void ds_reset (dynamic_string *s, size_t len);
|
||||
|
||||
-void ds_init (dynamic_string *string, int size);
|
||||
-void ds_resize (dynamic_string *string, int size);
|
||||
+/* All functions below guarantee that s->ds_string[s->ds_idx] == '\0' */
|
||||
char *ds_fgetname (FILE *f, dynamic_string *s);
|
||||
char *ds_fgets (FILE *f, dynamic_string *s);
|
||||
char *ds_fgetstr (FILE *f, dynamic_string *s, char eos);
|
||||
+void ds_append (dynamic_string *s, int c);
|
||||
+void ds_concat (dynamic_string *s, char const *str);
|
||||
+
|
||||
+#define ds_len(s) ((s)->ds_idx)
|
||||
+
|
||||
+int ds_endswith (dynamic_string *s, int c);
|
||||
+
|
||||
diff --git a/src/util.c b/src/util.c
|
||||
index 996d4fa..ff2746d 100644
|
||||
--- a/src/util.c
|
||||
+++ b/src/util.c
|
||||
@@ -846,11 +846,9 @@ get_next_reel (int tape_des)
|
||||
FILE *tty_out; /* File for interacting with user. */
|
||||
int old_tape_des;
|
||||
char *next_archive_name;
|
||||
- dynamic_string new_name;
|
||||
+ dynamic_string new_name = DYNAMIC_STRING_INITIALIZER;
|
||||
char *str_res;
|
||||
|
||||
- ds_init (&new_name, 128);
|
||||
-
|
||||
/* Open files for interactive communication. */
|
||||
tty_in = fopen (TTY_NAME, "r");
|
||||
if (tty_in == NULL)
|
||||
@@ -925,7 +923,7 @@ get_next_reel (int tape_des)
|
||||
error (PAXEXIT_FAILURE, 0, _("internal error: tape descriptor changed from %d to %d"),
|
||||
old_tape_des, tape_des);
|
||||
|
||||
- free (new_name.ds_string);
|
||||
+ ds_free (&new_name);
|
||||
fclose (tty_in);
|
||||
fclose (tty_out);
|
||||
}
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
40
package/cpio/0003-Fix-previous-commit.patch
Normal file
40
package/cpio/0003-Fix-previous-commit.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Poznyakoff <gray@gnu.org>
|
||||
Date: Wed, 11 Aug 2021 18:10:38 +0300
|
||||
Subject: Fix previous commit
|
||||
|
||||
* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a
|
||||
loop.
|
||||
|
||||
[Retrieved from:
|
||||
https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dfc801c44a93bed7b3951905b188823d6a0432c8]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/dstring.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/dstring.c b/src/dstring.c
|
||||
index 692d3e7..b7e0bb5 100644
|
||||
--- a/src/dstring.c
|
||||
+++ b/src/dstring.c
|
||||
@@ -64,7 +64,7 @@ void
|
||||
ds_reset (dynamic_string *s, size_t len)
|
||||
{
|
||||
while (len > s->ds_size)
|
||||
- ds_resize (s);
|
||||
+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
|
||||
s->ds_idx = len;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str)
|
||||
{
|
||||
size_t len = strlen (str);
|
||||
while (len + 1 > s->ds_size)
|
||||
- ds_resize (s);
|
||||
+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
|
||||
memcpy (s->ds_string + s->ds_idx, str, len);
|
||||
s->ds_idx += len;
|
||||
s->ds_string[s->ds_idx] = 0;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
@ -12,6 +12,10 @@ CPIO_LICENSE = GPL-3.0+
|
||||
CPIO_LICENSE_FILES = COPYING
|
||||
CPIO_CPE_ID_VENDOR = gnu
|
||||
|
||||
# 0002-Rewrite-dynamic-string-support.patch
|
||||
# 0003-Fix-previous-commit.patch
|
||||
CPIO_IGNORE_CVES += CVE-2021-38185
|
||||
|
||||
# cpio uses argp.h which is not provided by uclibc or musl by default.
|
||||
# Use the argp-standalone package to provide this.
|
||||
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
|
||||
|
35
package/efl/0003-ecore_fb-fix-build-with-tslib.patch
Normal file
35
package/efl/0003-ecore_fb-fix-build-with-tslib.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 9a785396a7940ec541cf4793f9c9f92548c99d4c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 10 Jul 2021 22:38:03 +0200
|
||||
Subject: [PATCH] ecore_fb: fix build with tslib
|
||||
|
||||
Build with tslib is broken since version 1.25.0 and
|
||||
https://git.enlightenment.org/core/efl.git/commit/?id=8e3606698eb439eecd7302a885504365aca7e564:
|
||||
|
||||
/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/9.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/lib/ecore_fb/libecore_fb.so.1.25.1.p/ecore_fb_ts.c.o: in function `_ecore_fb_ts_fd_handler':
|
||||
ecore_fb_ts.c:(.text+0x4c): undefined reference to `ts_read_raw'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/fa111306b95316eed54771550474dae804fa261e
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/lib/ecore_fb/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/ecore_fb/meson.build b/src/lib/ecore_fb/meson.build
|
||||
index 6d50e0f146..7c7f6786c3 100644
|
||||
--- a/src/lib/ecore_fb/meson.build
|
||||
+++ b/src/lib/ecore_fb/meson.build
|
||||
@@ -22,7 +22,7 @@ ecore_fb_src = files([
|
||||
ecore_fb_lib = library('ecore_fb',
|
||||
ecore_fb_src, pub_eo_file_target,
|
||||
c_args : package_c_args,
|
||||
- dependencies: ecore_fb_pub_deps + ecore_fb_deps,
|
||||
+ dependencies: ecore_fb_pub_deps + ecore_fb_deps + ecore_fb_ext_deps,
|
||||
include_directories : config_dir,
|
||||
install: true,
|
||||
version : meson.project_version()
|
||||
--
|
||||
2.30.2
|
||||
|
@ -15,6 +15,7 @@ EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
# 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
|
||||
EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \
|
||||
-DCMAKE_Fortran_COMPILER=$(TARGET_FC)
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
@ -0,0 +1,47 @@
|
||||
From 0c288853630b7b4e004774c39945d4a804afcfa8 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 6 Aug 2021 09:17:20 +0200
|
||||
Subject: [PATCH] configure: add extralibs to extralibs_xxx
|
||||
|
||||
Add extralibs to extralibs_xxx (e.g. extralibs_avformat) to allow
|
||||
applications such as motion to retrieve ffmpeg dependencies such as
|
||||
-latomic through pkg-config
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not upstreamable]
|
||||
---
|
||||
configure | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 0bb3a7cf2b..3bda99e415 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}")
|
||||
source_path=${source_path}
|
||||
LIBPREF=${LIBPREF}
|
||||
LIBSUF=${LIBSUF}
|
||||
-extralibs_avutil="$avutil_extralibs"
|
||||
-extralibs_avcodec="$avcodec_extralibs"
|
||||
-extralibs_avformat="$avformat_extralibs"
|
||||
-extralibs_avdevice="$avdevice_extralibs"
|
||||
-extralibs_avfilter="$avfilter_extralibs"
|
||||
-extralibs_avresample="$avresample_extralibs"
|
||||
-extralibs_postproc="$postproc_extralibs"
|
||||
-extralibs_swscale="$swscale_extralibs"
|
||||
-extralibs_swresample="$swresample_extralibs"
|
||||
+extralibs_avutil="$avutil_extralibs $extralibs"
|
||||
+extralibs_avcodec="$avcodec_extralibs $extralibs"
|
||||
+extralibs_avformat="$avformat_extralibs $extralibs"
|
||||
+extralibs_avdevice="$avdevice_extralibs $extralibs"
|
||||
+extralibs_avfilter="$avfilter_extralibs $extralibs"
|
||||
+extralibs_avresample="$avresample_extralibs $extralibs"
|
||||
+extralibs_postproc="$postproc_extralibs $extralibs"
|
||||
+extralibs_swscale="$swscale_extralibs $extralibs"
|
||||
+extralibs_swresample="$swresample_extralibs $extralibs"
|
||||
EOF
|
||||
|
||||
for lib in $LIBRARY_LIST; do
|
||||
--
|
||||
2.30.2
|
||||
|
@ -0,0 +1,51 @@
|
||||
From 0315cef04a5a8a953072691faa48af9acb6009bd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 10 Aug 2021 13:39:58 +0200
|
||||
Subject: [PATCH] include/flatbuffers/base.h: fix build on musl
|
||||
|
||||
Build of applications using flatbuffers such as snort3 are broken on
|
||||
musl since version 1.11.0 and
|
||||
https://github.com/google/flatbuffers/commit/5f32f948102e65eaeea461b44f3b43f96c7a7a5a
|
||||
because strtoll_l (and strtoull_l) are not available on musl.
|
||||
flatbuffers checks for the availability of strtoull_l in CMakeLists.txt
|
||||
so flatbuffers builds successfully but for applications using
|
||||
flatbuffers, the result of this check is not available and
|
||||
FLATBUFFERS_LOCALE_INDEPENDENT is set to 1 resulting in the following
|
||||
build failure:
|
||||
|
||||
In file included from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/flexbuffers.h:24,
|
||||
from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/idl.h:26,
|
||||
from /tmp/instance-0/output-1/build/snort3-3.1.6.0/src/network_inspectors/perf_monitor/fbs_formatter.cc:29:
|
||||
/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h: In function 'void flatbuffers::strtoval_impl(int64_t*, const char*, char**, int)':
|
||||
/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h:258:12: error: 'strtoll_l' was not declared in this scope; did you mean 'strcoll_l'?
|
||||
258 | *val = __strtoll_impl(str, endptr, base);
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
Fix this failure by checking if __GNUC__ is defined before setting
|
||||
FLATBUFFERS_LOCALE_INDEPENDENT to 1.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/google/flatbuffers/pull/6773]
|
||||
---
|
||||
include/flatbuffers/base.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
|
||||
index de7898dc..101c7598 100644
|
||||
--- a/include/flatbuffers/base.h
|
||||
+++ b/include/flatbuffers/base.h
|
||||
@@ -266,7 +266,7 @@ namespace flatbuffers {
|
||||
#ifndef FLATBUFFERS_LOCALE_INDEPENDENT
|
||||
// Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
|
||||
#if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \
|
||||
- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
|
||||
+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
|
||||
#define FLATBUFFERS_LOCALE_INDEPENDENT 1
|
||||
#else
|
||||
#define FLATBUFFERS_LOCALE_INDEPENDENT 0
|
||||
--
|
||||
2.30.2
|
||||
|
@ -10,9 +10,12 @@ 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
|
||||
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_FONTCONFIG_DEPENDENCIES = \
|
||||
host-freetype host-expat host-pkgconf host-gperf host-util-linux
|
||||
host-freetype host-expat host-pkgconf host-gperf host-util-linux \
|
||||
host-gettext
|
||||
FONTCONFIG_LICENSE = fontconfig license
|
||||
FONTCONFIG_LICENSE_FILES = COPYING
|
||||
FONTCONFIG_CPE_ID_VENDOR = fontconfig_project
|
||||
|
@ -0,0 +1,200 @@
|
||||
From eff8110674ef193481d3657456a262beeb9951ff Mon Sep 17 00:00:00 2001
|
||||
From: Stafford Horne <shorne@gmail.com>
|
||||
Date: Tue, 6 Apr 2021 05:47:17 +0900
|
||||
Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs
|
||||
|
||||
When building libgeos we get an error with:
|
||||
|
||||
linux-uclibc/9.3.0/crtbeginS.o: in function `__do_global_dtors_aux':
|
||||
crtstuff.c:(.text+0x118): relocation truncated to fit: R_OR1K_GOT16 against symbol `__cxa_finalize' defined in .text section in
|
||||
/home/shorne/work/openrisc/3eb9f9d0f6d8274b2d19753c006bd83f7d536e3c/output/host/or1k-buildroot-linux-uclibc/sysroot/lib/libc.so.
|
||||
|
||||
This is caused by GOT code having a limit of 64k. In OpenRISC this
|
||||
looks to be the only relocation code pattern to be limited to 64k.
|
||||
|
||||
This patch allows specifying a new option -mcmodel=large which can be
|
||||
used to generate 2 more instructions to construct 32-bit addresses for
|
||||
up to 4G GOTs.
|
||||
|
||||
gcc/ChangeLog:
|
||||
|
||||
PR target/99783
|
||||
* config/or1k/or1k-opts.h: New file.
|
||||
* config/or1k/or1k.c (or1k_legitimize_address_1, print_reloc):
|
||||
Support generating gotha relocations if -mcmodel=large is
|
||||
specified.
|
||||
* config/or1k/or1k.h (TARGET_CMODEL_SMALL, TARGET_CMODEL_LARGE):
|
||||
New macros.
|
||||
* config/or1k/or1k.opt (mcmodel=): New option.
|
||||
* doc/invoke.texi (OpenRISC Options): Document mcmodel.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++
|
||||
gcc/config/or1k/or1k.c | 11 +++++++++--
|
||||
gcc/config/or1k/or1k.h | 7 +++++++
|
||||
gcc/config/or1k/or1k.opt | 19 +++++++++++++++++++
|
||||
gcc/doc/invoke.texi | 12 +++++++++++-
|
||||
5 files changed, 76 insertions(+), 3 deletions(-)
|
||||
create mode 100644 gcc/config/or1k/or1k-opts.h
|
||||
|
||||
diff --git a/gcc/config/or1k/or1k-opts.h b/gcc/config/or1k/or1k-opts.h
|
||||
new file mode 100644
|
||||
index 00000000000..f791b894fdd
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/or1k/or1k-opts.h
|
||||
@@ -0,0 +1,30 @@
|
||||
+/* Definitions for option handling for OpenRISC.
|
||||
+ Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
+ Contributed by Stafford Horne.
|
||||
+
|
||||
+ 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
|
||||
+ <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#ifndef GCC_OR1K_OPTS_H
|
||||
+#define GCC_OR1K_OPTS_H
|
||||
+
|
||||
+/* The OpenRISC code generation models available. */
|
||||
+enum or1k_cmodel_type {
|
||||
+ CMODEL_SMALL,
|
||||
+ CMODEL_LARGE
|
||||
+};
|
||||
+
|
||||
+#endif /* GCC_OR1K_OPTS_H */
|
||||
diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c
|
||||
index e772a7addea..27d3fa17995 100644
|
||||
--- a/gcc/config/or1k/or1k.c
|
||||
+++ b/gcc/config/or1k/or1k.c
|
||||
@@ -750,7 +750,14 @@ or1k_legitimize_address_1 (rtx x, rtx scratch)
|
||||
{
|
||||
base = gen_sym_unspec (base, UNSPEC_GOT);
|
||||
crtl->uses_pic_offset_table = 1;
|
||||
- t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base);
|
||||
+ if (TARGET_CMODEL_LARGE)
|
||||
+ {
|
||||
+ emit_insn (gen_rtx_SET (t1, gen_rtx_HIGH (Pmode, base)));
|
||||
+ emit_insn (gen_add3_insn (t1, t1, pic_offset_table_rtx));
|
||||
+ t2 = gen_rtx_LO_SUM (Pmode, t1, base);
|
||||
+ }
|
||||
+ else
|
||||
+ t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base);
|
||||
t2 = gen_const_mem (Pmode, t2);
|
||||
emit_insn (gen_rtx_SET (t1, t2));
|
||||
base = t1;
|
||||
@@ -1089,7 +1096,7 @@ print_reloc (FILE *stream, rtx x, HOST_WIDE_INT add, reloc_kind kind)
|
||||
no special markup. */
|
||||
static const char * const relocs[RKIND_MAX][RTYPE_MAX] = {
|
||||
{ "lo", "got", "gotofflo", "tpofflo", "gottpofflo", "tlsgdlo" },
|
||||
- { "ha", NULL, "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" },
|
||||
+ { "ha", "gotha", "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" },
|
||||
};
|
||||
reloc_type type = RTYPE_DIRECT;
|
||||
|
||||
diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h
|
||||
index fe01ab81ead..669907e7e74 100644
|
||||
--- a/gcc/config/or1k/or1k.h
|
||||
+++ b/gcc/config/or1k/or1k.h
|
||||
@@ -21,6 +21,8 @@
|
||||
#ifndef GCC_OR1K_H
|
||||
#define GCC_OR1K_H
|
||||
|
||||
+#include "config/or1k/or1k-opts.h"
|
||||
+
|
||||
/* Names to predefine in the preprocessor for this target machine. */
|
||||
#define TARGET_CPU_CPP_BUILTINS() \
|
||||
do \
|
||||
@@ -37,6 +39,11 @@
|
||||
} \
|
||||
while (0)
|
||||
|
||||
+#define TARGET_CMODEL_SMALL \
|
||||
+ (or1k_code_model == CMODEL_SMALL)
|
||||
+#define TARGET_CMODEL_LARGE \
|
||||
+ (or1k_code_model == CMODEL_LARGE)
|
||||
+
|
||||
/* Storage layout. */
|
||||
|
||||
#define DEFAULT_SIGNED_CHAR 1
|
||||
diff --git a/gcc/config/or1k/or1k.opt b/gcc/config/or1k/or1k.opt
|
||||
index 6bd0f3eee6d..cc23e3b8856 100644
|
||||
--- a/gcc/config/or1k/or1k.opt
|
||||
+++ b/gcc/config/or1k/or1k.opt
|
||||
@@ -21,6 +21,9 @@
|
||||
; See the GCC internals manual (options.texi) for a description of
|
||||
; this file's format.
|
||||
|
||||
+HeaderInclude
|
||||
+config/or1k/or1k-opts.h
|
||||
+
|
||||
mhard-div
|
||||
Target RejectNegative InverseMask(SOFT_DIV)
|
||||
Enable generation of hardware divide (l.div, l.divu) instructions. This is the
|
||||
@@ -63,6 +66,22 @@ When -mhard-float is selected, enables generation of unordered floating point
|
||||
compare and set flag (lf.sfun*) instructions. By default functions from libgcc
|
||||
are used to perform unordered floating point compare and set flag operations.
|
||||
|
||||
+mcmodel=
|
||||
+Target RejectNegative Joined Enum(or1k_cmodel_type) Var(or1k_code_model) Init(CMODEL_SMALL)
|
||||
+Specify the code model used for accessing memory addresses. Specifying large
|
||||
+enables generating binaries with large global offset tables. By default the
|
||||
+value is small.
|
||||
+
|
||||
+Enum
|
||||
+Name(or1k_cmodel_type) Type(enum or1k_cmodel_type)
|
||||
+Known code model types (for use with the -mcmodel= option):
|
||||
+
|
||||
+EnumValue
|
||||
+Enum(or1k_cmodel_type) String(small) Value(CMODEL_SMALL)
|
||||
+
|
||||
+EnumValue
|
||||
+Enum(or1k_cmodel_type) String(large) Value(CMODEL_LARGE)
|
||||
+
|
||||
mcmov
|
||||
Target RejectNegative Mask(CMOV)
|
||||
Enable generation of conditional move (l.cmov) instructions. By default the
|
||||
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
|
||||
index 57b97a0838c..d8a6b0b60c9 100644
|
||||
--- a/gcc/doc/invoke.texi
|
||||
+++ b/gcc/doc/invoke.texi
|
||||
@@ -1141,7 +1141,8 @@ Objective-C and Objective-C++ Dialects}.
|
||||
@gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol
|
||||
-msoft-mul -msoft-div @gol
|
||||
-msoft-float -mhard-float -mdouble-float -munordered-float @gol
|
||||
--mcmov -mror -mrori -msext -msfimm -mshftimm}
|
||||
+-mcmov -mror -mrori -msext -msfimm -mshftimm @gol
|
||||
+-mcmodel=@var{code-model}}
|
||||
|
||||
@emph{PDP-11 Options}
|
||||
@gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol
|
||||
@@ -26684,6 +26685,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli},
|
||||
@code{l.slli}) instructions. By default extra instructions will be generated
|
||||
to store the immediate to a register first.
|
||||
|
||||
+@item -mcmodel=small
|
||||
+@opindex mcmodel=small
|
||||
+Generate OpenRISC code for the small model: The GOT is limited to 64k. This is
|
||||
+the default model.
|
||||
+
|
||||
+@item -mcmodel=large
|
||||
+@opindex mcmodel=large
|
||||
+Generate OpenRISC code for the large model: The GOT may grow up to 4G in size.
|
||||
+
|
||||
|
||||
@end table
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
@ -0,0 +1,60 @@
|
||||
From da8a9d695b3c4b9397b5d9a27660bfa48af8d707 Mon Sep 17 00:00:00 2001
|
||||
From: Stafford Horne <shorne@gmail.com>
|
||||
Date: Wed, 21 Apr 2021 05:33:15 +0900
|
||||
Subject: [PATCH] or1k: Use cmodel=large when building crtstuff
|
||||
|
||||
When linking gcc runtime objects into large binaries the link may fail
|
||||
with the below errors. This will happen even if we are building with
|
||||
-mcmodel=large.
|
||||
|
||||
/home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `deregister_tm_clones':
|
||||
crtstuff.c:(.text+0x3c): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_deregisterTMCloneTable'
|
||||
/home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `register_tm_clones':
|
||||
crtstuff.c:(.text+0xc0): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_registerTMCloneTable'
|
||||
|
||||
This patch builds the gcc crtstuff binaries always with the
|
||||
-mcmodel=large option to ensure they can be linked into large binaries.
|
||||
|
||||
libgcc/ChangeLog:
|
||||
|
||||
PR target/99783
|
||||
* config.host (or1k-*, tmake_file): Add or1k/t-crtstuff.
|
||||
* config/or1k/t-crtstuff: New file.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
libgcc/config.host | 4 ++--
|
||||
libgcc/config/or1k/t-crtstuff | 2 ++
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
create mode 100644 libgcc/config/or1k/t-crtstuff
|
||||
|
||||
diff --git a/libgcc/config.host b/libgcc/config.host
|
||||
index 50f00062232..8ca7a00082a 100644
|
||||
--- a/libgcc/config.host
|
||||
+++ b/libgcc/config.host
|
||||
@@ -1119,12 +1119,12 @@ nios2-*-*)
|
||||
extra_parts="$extra_parts crti.o crtn.o"
|
||||
;;
|
||||
or1k-*-linux*)
|
||||
- tmake_file="$tmake_file or1k/t-or1k"
|
||||
+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff"
|
||||
tmake_file="$tmake_file t-softfp-sfdf t-softfp"
|
||||
md_unwind_header=or1k/linux-unwind.h
|
||||
;;
|
||||
or1k-*-*)
|
||||
- tmake_file="$tmake_file or1k/t-or1k"
|
||||
+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff"
|
||||
tmake_file="$tmake_file t-softfp-sfdf t-softfp"
|
||||
;;
|
||||
pdp11-*-*)
|
||||
diff --git a/libgcc/config/or1k/t-crtstuff b/libgcc/config/or1k/t-crtstuff
|
||||
new file mode 100644
|
||||
index 00000000000..dcae7f3498e
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/or1k/t-crtstuff
|
||||
@@ -0,0 +1,2 @@
|
||||
+# Compile crtbeginS.o and crtendS.o with -mcmodel=large
|
||||
+CRTSTUFF_T_CFLAGS_S += -mcmodel=large
|
||||
--
|
||||
2.25.1
|
||||
|
@ -0,0 +1,29 @@
|
||||
From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001
|
||||
From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu>
|
||||
Date: Mon, 19 Jul 2021 10:07:13 +0430
|
||||
Subject: [PATCH] fix read out-of-bands in reading tga header file
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/libgd/libgd/commit/8b111b2b4a4842179be66db68d84dda91a246032]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/gd_tga.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gd_tga.c b/src/gd_tga.c
|
||||
index cae9428da..286febb28 100644
|
||||
--- a/src/gd_tga.c
|
||||
+++ b/src/gd_tga.c
|
||||
@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga)
|
||||
return -1;
|
||||
}
|
||||
|
||||
- gdGetBuf(tga->ident, tga->identsize, ctx);
|
||||
+
|
||||
+ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) {
|
||||
+ gd_error("fail to read header ident");
|
||||
+ return -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
return 1;
|
@ -15,6 +15,9 @@ GD_CPE_ID_PRODUCT = libgd
|
||||
GD_CONF_OPTS = --without-x --disable-rpath --disable-werror
|
||||
GD_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# 0001-fix-read-out-of-bands-in-reading-tga-header-file.patch
|
||||
GD_IGNORE_CVES += CVE-2021-38115
|
||||
|
||||
# gd forgets to link utilities with -pthread even though it uses
|
||||
# pthreads, causing linking errors with static linking
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
|
@ -91,5 +91,14 @@ config BR2_GDB_VERSION
|
||||
default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
|
||||
default "8.3.1" if BR2_GDB_VERSION_8_3
|
||||
default "9.2" if BR2_GDB_VERSION_9_2 || (!BR2_PACKAGE_HOST_GDB && !BR2_riscv)
|
||||
default "10.1" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv)
|
||||
default "10.2" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv)
|
||||
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
|
||||
|
||||
# recent gdb versions (>= 10) have gdbserver moved at the top-level,
|
||||
# which requires a different build logic.
|
||||
config BR2_PACKAGE_GDB_TOPLEVEL
|
||||
bool
|
||||
default y if BR2_arc
|
||||
default y if BR2_GDB_VERSION_10
|
||||
default y if !BR2_PACKAGE_HOST_GDB && BR2_riscv
|
||||
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
|
||||
|
@ -1,7 +1,7 @@
|
||||
# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum
|
||||
sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz
|
||||
sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz
|
||||
sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz
|
||||
sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz
|
||||
|
@ -8,19 +8,10 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
|
||||
GDB_SITE = $(BR2_GNU_MIRROR)/gdb
|
||||
GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz
|
||||
|
||||
# recent gdb versions (>= 10) have gdbserver moved at the top-level,
|
||||
# which requires a different build logic.
|
||||
ifeq ($(BR2_GDB_VERSION_10),y)
|
||||
GDB_GDBSERVER_TOPLEVEL = y
|
||||
endif
|
||||
|
||||
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)
|
||||
@ -35,7 +26,7 @@ GDB_CPE_ID_VENDOR = gnu
|
||||
|
||||
# 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),)
|
||||
ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(BR2_PACKAGE_GDB_TOPLEVEL),)
|
||||
GDB_SUBDIR = gdb/gdbserver
|
||||
|
||||
# When we want to build the full gdb, or for very recent versions of
|
||||
|
@ -1,7 +0,0 @@
|
||||
# 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
|
@ -11,13 +11,7 @@ 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
|
||||
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.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f
|
||||
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.
|
||||
|
@ -116,22 +116,22 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
|
||||
|
||||
# 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
|
||||
# build .gir and .typelib files. Unfortunately, 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)
|
||||
# Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR)
|
||||
# to the correct location.
|
||||
$(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \
|
||||
$(SED) "s%^datadir=.*%datadir=\$${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" \
|
||||
# Changing the prefix to prefix prevents this error.
|
||||
$(SED) "s%girdir=.*%girdir=\$${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" \
|
||||
$(SED) "s%typelibdir=.*%typelibdir=\$${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
|
||||
|
@ -0,0 +1,33 @@
|
||||
From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 6 Aug 2021 19:49:37 +0200
|
||||
Subject: [PATCH] module/system/base/target.scm: support riscv32
|
||||
|
||||
Fix the following build failure on riscv32:
|
||||
|
||||
system/base/target.scm:132:16: In procedure triplet-pointer-size:
|
||||
unknown CPU word size "riscv32"
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
module/system/base/target.scm | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/module/system/base/target.scm b/module/system/base/target.scm
|
||||
index 2088cd866..dba46664d 100644
|
||||
--- a/module/system/base/target.scm
|
||||
+++ b/module/system/base/target.scm
|
||||
@@ -116,6 +116,7 @@
|
||||
|
||||
((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32
|
||||
|
||||
+ ((string-match "32$" cpu) 4)
|
||||
((string-match "64$" cpu) 8)
|
||||
((string-match "64_?[lbe][lbe]$" cpu) 8)
|
||||
((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4)
|
||||
--
|
||||
2.30.2
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.2.tar.gz.sha256
|
||||
sha256 edf9788f7f3411498e3d7b21777036b4dc14183e95c8e2ce7577baa0ea4ea2aa haproxy-2.4.2.tar.gz
|
||||
# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.3.tar.gz.sha256
|
||||
sha256 ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405 haproxy-2.4.3.tar.gz
|
||||
# Locally computed:
|
||||
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
HAPROXY_VERSION_MAJOR = 2.4
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).2
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).3
|
||||
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
|
||||
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
|
||||
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
|
||||
|
@ -90,5 +90,9 @@ else
|
||||
HARFBUZZ_CONF_OPTS += -Dicu=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
|
||||
HARFBUZZ_CXXFLAGS += $(TARGET_CXXFLAGS) -DHB_NO_MT
|
||||
endif
|
||||
|
||||
$(eval $(meson-package))
|
||||
$(eval $(host-meson-package))
|
||||
|
@ -20,10 +20,18 @@ define HEIRLOOM_MAILX_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig)
|
||||
endef
|
||||
|
||||
HEIRLOOM_MAILX_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
# -fPIC is needed to build with NIOS2 toolchains.
|
||||
HEIRLOOM_MAILX_CFLAGS += -fPIC
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101916),y)
|
||||
HEIRLOOM_MAILX_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
define HEIRLOOM_MAILX_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) \
|
||||
CFLAGS="$(TARGET_CFLAGS) -fPIC" \
|
||||
CFLAGS="$(HEIRLOOM_MAILX_CFLAGS)" \
|
||||
-C $(@D)
|
||||
endef
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IOZONE_VERSION = 3_490
|
||||
IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
|
||||
IOZONE_VERSION = 3.490
|
||||
IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar
|
||||
IOZONE_SITE = http://www.iozone.org/src/current
|
||||
IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
|
||||
# IOzone license details can be found at:
|
||||
|
218
package/iputils/0001-meson-Make-tests-optional.patch
Normal file
218
package/iputils/0001-meson-Make-tests-optional.patch
Normal file
@ -0,0 +1,218 @@
|
||||
From 3163c49f9f4ad473a00d8a345ee334a028376011 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Becker <heirecka@exherbo.org>
|
||||
Date: Fri, 23 Jul 2021 16:32:46 +0200
|
||||
Subject: [PATCH] meson: Make tests optional
|
||||
|
||||
Now can be disabled with -DSKIP_TESTS=true.
|
||||
|
||||
It allows to avoid meson error during build when ip isn't installed.
|
||||
|
||||
Closes: #359
|
||||
|
||||
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Signed-off-by: Heiko Becker <heirecka@exherbo.org>
|
||||
[ pvorel: Rename variable TEST => SKIP_TESTS, default false, adjust
|
||||
the description ]
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
meson_options.txt | 3 ++
|
||||
ping/meson.build | 84 ++-----------------------------------------
|
||||
ping/test/meson.build | 81 +++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 86 insertions(+), 82 deletions(-)
|
||||
create mode 100644 ping/test/meson.build
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index ac5f5d98..517667f4 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -72,3 +72,6 @@ option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false,
|
||||
|
||||
option('USE_GETTEXT', type: 'boolean', value: true,
|
||||
description: 'Enable I18N')
|
||||
+
|
||||
+option('SKIP_TESTS', type: 'boolean', value: false,
|
||||
+ description: 'Skip tests during build')
|
||||
diff --git a/ping/meson.build b/ping/meson.build
|
||||
index 1e678ec8..83ea353c 100644
|
||||
--- a/ping/meson.build
|
||||
+++ b/ping/meson.build
|
||||
@@ -27,86 +27,6 @@ if (setcap_ping)
|
||||
)
|
||||
endif
|
||||
|
||||
-##### TESTS #####
|
||||
-
|
||||
-# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
|
||||
-
|
||||
-# GitHub CI does not have working IPv6
|
||||
-# https://github.com/actions/virtual-environments/issues/668
|
||||
-ipv6_dst = []
|
||||
-ipv6_switch = []
|
||||
-r = run_command('ip', '-6', 'a')
|
||||
-if r.stdout().strip().contains('::1')
|
||||
- message('IPv6 enabled')
|
||||
- ipv6_dst = [ '::1' ]
|
||||
- ipv6_switch = [ '-6' ]
|
||||
-else
|
||||
- message('WARNING: IPv6 disabled')
|
||||
+if not get_option('SKIP_TESTS')
|
||||
+ subdir('test')
|
||||
endif
|
||||
-
|
||||
-run_as_root = false
|
||||
-r = run_command('id', '-u')
|
||||
-if r.stdout().strip().to_int() == 0
|
||||
- message('running as root')
|
||||
- run_as_root = true
|
||||
-else
|
||||
- message('running as normal user')
|
||||
-endif
|
||||
-
|
||||
-foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
|
||||
- foreach switch : [ '', '-4' ] + ipv6_switch
|
||||
- args = [ '-c1', dst ]
|
||||
- should_fail = false
|
||||
-
|
||||
- if switch != ''
|
||||
- args = [switch] + args
|
||||
- if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
|
||||
- should_fail = true
|
||||
- endif
|
||||
- endif
|
||||
-
|
||||
- name = 'ping ' + ' '.join(args)
|
||||
- test(name, ping, args : args, should_fail : should_fail)
|
||||
- endforeach
|
||||
-endforeach
|
||||
-
|
||||
-ping_tests_opt = [
|
||||
- [ '-c1' ],
|
||||
- [ '-c5', '-i0.1' ],
|
||||
- [ '-c1', '-I', 'lo' ],
|
||||
- [ '-c1', '-w1' ],
|
||||
- [ '-c1', '-W1' ],
|
||||
- [ '-c1', '-W1.1' ],
|
||||
-]
|
||||
-foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
- foreach args : ping_tests_opt
|
||||
- args += [ dst ]
|
||||
- name = 'ping ' + ' '.join(args)
|
||||
- test(name, ping, args : args)
|
||||
- endforeach
|
||||
-endforeach
|
||||
-
|
||||
-ping_tests_opt_fail = [
|
||||
- [ '-c1.1' ],
|
||||
- [ '-I', 'nonexisting' ],
|
||||
- [ '-w0.1' ],
|
||||
- [ '-w0,1' ],
|
||||
-]
|
||||
-foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
- foreach args : ping_tests_opt_fail
|
||||
- args += [ dst ]
|
||||
- name = 'ping ' + ' '.join(args)
|
||||
- test(name, ping, args : args, should_fail : true)
|
||||
- endforeach
|
||||
-endforeach
|
||||
-
|
||||
-ping_tests_user_fail = [
|
||||
- [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
|
||||
-]
|
||||
-foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
- foreach args : ping_tests_user_fail
|
||||
- args += [ dst ]
|
||||
- name = 'ping ' + ' '.join(args)
|
||||
- test(name, ping, args : args, should_fail : not run_as_root)
|
||||
- endforeach
|
||||
-endforeach
|
||||
diff --git a/ping/test/meson.build b/ping/test/meson.build
|
||||
new file mode 100644
|
||||
index 00000000..43aed758
|
||||
--- /dev/null
|
||||
+++ b/ping/test/meson.build
|
||||
@@ -0,0 +1,81 @@
|
||||
+# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_"
|
||||
+
|
||||
+# GitHub CI does not have working IPv6
|
||||
+# https://github.com/actions/virtual-environments/issues/668
|
||||
+ipv6_dst = []
|
||||
+ipv6_switch = []
|
||||
+r = run_command('ip', '-6', 'a')
|
||||
+if r.stdout().strip().contains('::1')
|
||||
+ message('IPv6 enabled')
|
||||
+ ipv6_dst = [ '::1' ]
|
||||
+ ipv6_switch = [ '-6' ]
|
||||
+else
|
||||
+ message('WARNING: IPv6 disabled')
|
||||
+endif
|
||||
+
|
||||
+run_as_root = false
|
||||
+r = run_command('id', '-u')
|
||||
+if r.stdout().strip().to_int() == 0
|
||||
+ message('running as root')
|
||||
+ run_as_root = true
|
||||
+else
|
||||
+ message('running as normal user')
|
||||
+endif
|
||||
+
|
||||
+foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
|
||||
+ foreach switch : [ '', '-4' ] + ipv6_switch
|
||||
+ args = [ '-c1', dst ]
|
||||
+ should_fail = false
|
||||
+
|
||||
+ if switch != ''
|
||||
+ args = [switch] + args
|
||||
+ if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1')
|
||||
+ should_fail = true
|
||||
+ endif
|
||||
+ endif
|
||||
+
|
||||
+ name = 'ping ' + ' '.join(args)
|
||||
+ test(name, ping, args : args, should_fail : should_fail)
|
||||
+ endforeach
|
||||
+endforeach
|
||||
+
|
||||
+ping_tests_opt = [
|
||||
+ [ '-c1' ],
|
||||
+ [ '-c5', '-i0.1' ],
|
||||
+ [ '-c1', '-I', 'lo' ],
|
||||
+ [ '-c1', '-w1' ],
|
||||
+ [ '-c1', '-W1' ],
|
||||
+ [ '-c1', '-W1.1' ],
|
||||
+]
|
||||
+foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
+ foreach args : ping_tests_opt
|
||||
+ args += [ dst ]
|
||||
+ name = 'ping ' + ' '.join(args)
|
||||
+ test(name, ping, args : args)
|
||||
+ endforeach
|
||||
+endforeach
|
||||
+
|
||||
+ping_tests_opt_fail = [
|
||||
+ [ '-c1.1' ],
|
||||
+ [ '-I', 'nonexisting' ],
|
||||
+ [ '-w0.1' ],
|
||||
+ [ '-w0,1' ],
|
||||
+]
|
||||
+foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
+ foreach args : ping_tests_opt_fail
|
||||
+ args += [ dst ]
|
||||
+ name = 'ping ' + ' '.join(args)
|
||||
+ test(name, ping, args : args, should_fail : true)
|
||||
+ endforeach
|
||||
+endforeach
|
||||
+
|
||||
+ping_tests_user_fail = [
|
||||
+ [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root
|
||||
+]
|
||||
+foreach dst : [ '127.0.0.1' ] + ipv6_dst
|
||||
+ foreach args : ping_tests_user_fail
|
||||
+ args += [ dst ]
|
||||
+ name = 'ping ' + ' '.join(args)
|
||||
+ test(name, ping, args : args, should_fail : not run_as_root)
|
||||
+ endforeach
|
||||
+endforeach
|
@ -23,10 +23,11 @@ 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) \
|
||||
-DENABLE_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)
|
||||
-DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \
|
||||
-DSKIP_TESTS=true
|
||||
|
||||
# Selectively select the appropriate SELinux refpolicy modules
|
||||
IPUTILS_SELINUX_MODULES = \
|
||||
|
@ -0,0 +1,56 @@
|
||||
From 22357494f424178cb416cdb7d93b26dd4f824b36 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Aquilina <michaelaquilina@gmail.com>
|
||||
Date: Mon, 14 Jun 2021 12:28:46 +0100
|
||||
Subject: [PATCH] fix: Use a null prototype object for this.files
|
||||
|
||||
This approach is taken to prevent overriding object methods that would
|
||||
exist on a normal object Object.create({})
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/Stuk/jszip/commit/22357494f424178cb416cdb7d93b26dd4f824b36]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
lib/index.js | 5 ++++-
|
||||
lib/object.js | 6 +++---
|
||||
2 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/index.js b/lib/index.js
|
||||
index b449877..b4c95ba 100644
|
||||
--- a/lib/index.js
|
||||
+++ b/lib/index.js
|
||||
@@ -19,7 +19,10 @@ function JSZip() {
|
||||
// "folder/" : {...},
|
||||
// "folder/data.txt" : {...}
|
||||
// }
|
||||
- this.files = {};
|
||||
+ // NOTE: we use a null prototype because we do not
|
||||
+ // want filenames like "toString" coming from a zip file
|
||||
+ // to overwrite methods and attributes in a normal Object.
|
||||
+ this.files = Object.create(null);
|
||||
|
||||
this.comment = null;
|
||||
|
||||
diff --git a/lib/object.js b/lib/object.js
|
||||
index 1c9d8e8..aec3db7 100644
|
||||
--- a/lib/object.js
|
||||
+++ b/lib/object.js
|
||||
@@ -179,16 +179,16 @@ var out = {
|
||||
*/
|
||||
forEach: function(cb) {
|
||||
var filename, relativePath, file;
|
||||
+ /* jshint ignore:start */
|
||||
+ // ignore warning about unwanted properties because this.files is a null prototype object
|
||||
for (filename in this.files) {
|
||||
- if (!this.files.hasOwnProperty(filename)) {
|
||||
- continue;
|
||||
- }
|
||||
file = this.files[filename];
|
||||
relativePath = filename.slice(this.root.length, filename.length);
|
||||
if (relativePath && filename.slice(0, this.root.length) === this.root) { // the file is in the current root
|
||||
cb(relativePath, file); // TODO reverse the parameters ? need to be clean AND consistent with the filter search fn...
|
||||
}
|
||||
}
|
||||
+ /* jshint ignore:end */
|
||||
},
|
||||
|
||||
/**
|
@ -8,6 +8,10 @@ JSZIP_VERSION = 3.2.2
|
||||
JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION))
|
||||
JSZIP_LICENSE = MIT or GPL-3.0
|
||||
JSZIP_LICENSE_FILES = LICENSE.markdown
|
||||
JSZIP_CPE_ID_VENDOR = jszip_project
|
||||
|
||||
# 0001-fix-Use-a-null-prototype-object-for-this-files.patch
|
||||
JSZIP_IGNORE_CVES += CVE-2021-23413
|
||||
|
||||
define JSZIP_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \
|
||||
|
@ -0,0 +1,61 @@
|
||||
From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Huth <thuth@redhat.com>
|
||||
Date: Wed, 13 May 2020 13:14:46 +0200
|
||||
Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32
|
||||
|
||||
The linker from Fedora 32 complains:
|
||||
|
||||
powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not
|
||||
covered by LOAD segment
|
||||
|
||||
Let's introduce some fake PHDRs to the linker script to get this
|
||||
working again.
|
||||
|
||||
Message-Id: <20200514192626.9950-7-thuth@redhat.com>
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
Signed-off-by: Matthew Weber <matthew.weber@collins.com>
|
||||
---
|
||||
powerpc/flat.lds | 19 ++++++++++++++++---
|
||||
1 file changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/powerpc/flat.lds b/powerpc/flat.lds
|
||||
index 53221e8..5eed368 100644
|
||||
--- a/powerpc/flat.lds
|
||||
+++ b/powerpc/flat.lds
|
||||
@@ -1,7 +1,17 @@
|
||||
|
||||
+PHDRS
|
||||
+{
|
||||
+ text PT_LOAD FLAGS(5);
|
||||
+ data PT_LOAD FLAGS(6);
|
||||
+}
|
||||
+
|
||||
SECTIONS
|
||||
{
|
||||
- .text : { *(.init) *(.text) *(.text.*) }
|
||||
+ .text : {
|
||||
+ *(.init)
|
||||
+ *(.text)
|
||||
+ *(.text.*)
|
||||
+ } :text
|
||||
. = ALIGN(64K);
|
||||
etext = .;
|
||||
.opd : { *(.opd) }
|
||||
@@ -19,9 +29,12 @@ SECTIONS
|
||||
.data : {
|
||||
*(.data)
|
||||
*(.data.rel*)
|
||||
- }
|
||||
+ } :data
|
||||
. = ALIGN(16);
|
||||
- .rodata : { *(.rodata) *(.rodata.*) }
|
||||
+ .rodata : {
|
||||
+ *(.rodata)
|
||||
+ *(.rodata.*)
|
||||
+ } :data
|
||||
. = ALIGN(16);
|
||||
.bss : { *(.bss) }
|
||||
. = ALIGN(256);
|
||||
--
|
||||
2.17.1
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user