Bump Buildroot Version to buildroot 2019_02_6

This commit is contained in:
NADAL Jean-Baptiste
2019-10-25 11:46:00 +02:00
parent e07322a5a8
commit c1075f68da
549 changed files with 6692 additions and 4165 deletions

View File

@@ -1,3 +1,140 @@
2019.02.6, Released October 3rd, 2019
Important / security related fixes.
Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone:
Use default console settings
Dependencies: Ensure host has JSON::PP perl module installed
if webkitgtk/wpewebkit packages are enabled as it is needed
during their build process.
Toolchain: Generate check-headers program under BUILD_DIR
rather than /tmp to fix issues with distributions mounting
/tmp noexec.
Updated/fixed packages: asterisk, augeas, bind, bwm-ng, cups,
cups-filters, docker-cli, docker-engine, docker-proxy,
dropbear, e2fsprogs, eudev, exim, expat, gcc, go, ifplugd,
haveged, iptables, joe, kf5-extra-cmake-modules,
kf5-modemmanager-qt, kf5-networkmanager-qt, libcurl,
libgcrypt, libgpg-error, libnftl, libnspr, libnss, libopenssl,
luksmeta, mariadb, mbedtls, mongodb, mosquitto, ncurses,
nfs-utils, nghttp2, nodejs, openvmtools, php, protobuf, putty,
qemu, qt5base, samba4, swupdate, systemd-bootchart, thttpd,
uclibc, unzip, util-linux, wireshark
Issues resolved (http://bugs.uclibc.org):
#10806: Allow nfs-utils to use ipv6
#11781: mariadb build error
#12031: Build of cups-filters fails while linking, apparently due..
#12141: eudev package is missing "render" and "kvm" groups
#12181: dropbear: norootlogin (-w) no longer works when PAM is enabled
#12241: Permission denied while running "make"
2019.02.5, Released September 2nd, 2019
Important / security related fixes.
Filesystems: Pass extra pax options to tar for binary
reproducibility.
Updated/fixed packages: apache, arm-trusted-firmware,
asterisk, atk, autofs, batctl, batman-adv, berkeleydb, brotli,
busybox, bzip2, clamav, cloop, cmake, collectd, connman-gtk,
cryptopp, dahdi-linux, dahdi-tools, daq, dehydrated, dovecot,
dovecot-pigeonhole,, elfutils, evtest, exim, expect, giflib,
git, glib-networking, glibc, gnupg2, gnutls, go,
gst1-rtsp-server, gtkperf, gupnp-tools, gvfs, imagemagick,
imx-uuc, intel-microcode, json-glib, lftp, libbsd, libcurl,
libgit2, libgtk3, libmodplug, libnss, libpri, libshout,
libss7, libssh2, libvips, libxcb, linux-headers, mdadm,
mesa3d, metacity, mpg123, mosquitto, musl, nginx, openblas,
opencv3, openldap, openvmtools, pcmanfm, php, pigpio,
postgresql, prboom, proftpd, proj, python, python-django,
python-idna, python-numpy, python-urllib3, python3, qemu, qt5,
qt5base, qt5enginio, quagga, rygel, squid, subversion,
tcpreplay, unzip, vlc, vte, webkitgtk, weston, wireless-regdb,
xen, xfont_font-util, xlib_libICE, xlib_libXfont,
xlib_libXfont2, yad, zeromq
Issues resolved (http://bugs.uclibc.org):
#11741: pigpio does not build host-pigpio
#11876: automount using host mount/umount
#11881: Build breaks with lftp package enabled and libexpat1-dev inst..
#11921: dahdi fails to build
#11961: libpri build failure
#12096: tcpreplay: build fails if libdumbnet-dev is installed in the..
#12106: daq: build fails if libdumbnet-dev is installed in the host
#12126: vc4 has neon as hard dependency
2019.02.4, Released July 10th, 2019
Important / security related fixes.
arch: x86: Fix typo breaking 'core-avx2' variant, add Westmere
variant.
linux: Workaround -Werror related build failure on powerpc,
by forcing CONFIG_PPC_DISABLE_WERROR on.
support/testing: Emulate a machine with 256MB RAM to fix
issues with certain tests running out of memory.
test-pkg: Correct long option handling and clean output dir
after a successful build to save disk space.
Ensure custom <pkg>_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS are
passed before the standard exclusions so they are not ignored
by rsync when using override-srcdir.
Defconfigs: QEMU: use 'rootwait' kernel option to ensure root
partition is available before mounting.
Updated/fixed packages: barebox, bzip2, davfs2, dbus, dialog,
docker-cli, docker-engine, expat, faad2, ffmpeg, freeswitch,
gerbera, haveged, irssi, libcdadio, libgit2, libglib2,
libsecret, libvncserver, lmbench, logrotate, mariadb, meson,
mongoose, monit, mpd, openblas, php, postgresql, psplash,
python, python-django, python3, qt5base, samba4, taglib,
tvheadend, vlc, webkitgtk, xserver_xorg-server, znc
2019.02.3, Released June 7th, 2019
Important / security related fixes.
Infra: pkg-config: Use a dedicated timestamp file rather than
.config as that gets touched by linux-4.19+, causing repeated
builds.
check-bin-arch: Also ignore /usr/lib/grub to support merged
/usr setups, similar to how /lib/grub is ignored.
gnuconfig/config.sub: Add C-SKY architecture support.
Updated/fixed packages: assimp, atftp, atop, botan, busybox,
ca-certificates, chocolate-doom, cjson, coreutils, cracklib,
ddrescue, dhcp, docker-cli, docker-containerd, docker-engine,
dosfstools, dovecot, dovecot-pigeonhole, dropbear, exim,
ffmpeg, flare-engine, gcc, gdb, gerbera, glibmm, go, gpsd,
gst-ffmpeg, gst1-plugins-bad, gst1-plugins-base, imagemagick,
intel-microcode, jasper, kf5-kcoreaddons, kismet, libcurl,
libglib2, libnss, libopenssl, libsigrok, libssh2, libupnp18,
linuxptp, luajit, lynx, matchbox-panel, mender,
netcat-openbsd, netsurf, nfs-utils, opus, orc, owfs,
pcsc-lite, php, popt, postgresql, python, python-cython,
python-django, python-ply, qt5enginio, rpm, runc, samba4,
sqlite, subversion, supertux, systemd, tslib, uclibc,
v4l2loopback, webkitgtk, woff2
Issues resolved (http://bugs.uclibc.org):
#11816: Only selected coreutils binaries are installed
#11841: grub-efi.cfg not used when building EFI disk image
#11911: systemd v240 memory leak in systemd-journald
2019.02.2, Released April 29th, 2019 2019.02.2, Released April 29th, 2019
Important / security related fixes. Important / security related fixes.

View File

@@ -26,9 +26,6 @@
# infrastructure, and will be CC'ed on all patches that add or # infrastructure, and will be CC'ed on all patches that add or
# modify packages that use this infrastructure. # modify packages that use this infrastructure.
N: Abhilash Tuse <abhilash.tuse@imgtec.com>
F: package/gstreamer1/gst1-rtsp-server/
N: Adam Duskett <aduskett@gmail.com> N: Adam Duskett <aduskett@gmail.com>
F: package/audit/ F: package/audit/
F: package/busybox/ F: package/busybox/
@@ -127,7 +124,6 @@ N: Anders Darander <anders@chargestorm.se>
F: package/ktap/ F: package/ktap/
N: André Hentschel <nerv@dawncrow.de> N: André Hentschel <nerv@dawncrow.de>
F: package/azure-iot-sdk-c/
F: package/libkrb5/ F: package/libkrb5/
F: package/openal/ F: package/openal/
F: package/p7zip/ F: package/p7zip/
@@ -148,9 +144,6 @@ F: package/zstd/
N: Andrey Yurovsky <yurovsky@gmail.com> N: Andrey Yurovsky <yurovsky@gmail.com>
F: package/rauc/ F: package/rauc/
N: Andy Kennedy <andy.kennedy@adtran.com>
F: package/libunwind/
N: Angelo Compagnucci <angelo.compagnucci@gmail.com> N: Angelo Compagnucci <angelo.compagnucci@gmail.com>
F: package/corkscrew/ F: package/corkscrew/
F: package/fail2ban/ F: package/fail2ban/
@@ -209,6 +202,7 @@ F: package/sqlcipher/
F: package/stress/ F: package/stress/
N: Asaf Kahlon <asafka7@gmail.com> N: Asaf Kahlon <asafka7@gmail.com>
F: package/collectd/
F: package/libuv/ F: package/libuv/
F: package/python* F: package/python*
F: package/zeromq/ F: package/zeromq/
@@ -633,9 +627,6 @@ F: package/unscd/
N: Dushara Jayasinghe <nidujay@gmail.com> N: Dushara Jayasinghe <nidujay@gmail.com>
F: package/prosody/ F: package/prosody/
N: Ed Swierk <eswierk@skyportsystems.com>
F: package/xxhash/
N: Eric Le Bihan <eric.le.bihan.dev@free.fr> N: Eric Le Bihan <eric.le.bihan.dev@free.fr>
F: docs/manual/adding-packages-meson.txt F: docs/manual/adding-packages-meson.txt
F: package/adwaita-icon-theme/ F: package/adwaita-icon-theme/
@@ -821,11 +812,9 @@ N: Francois Perrad <francois.perrad@gadz.org>
F: board/olimex/a20_olinuxino F: board/olimex/a20_olinuxino
F: configs/olimex_a20_olinuxino_* F: configs/olimex_a20_olinuxino_*
F: package/4th/ F: package/4th/
F: package/botan/
F: package/chipmunk/ F: package/chipmunk/
F: package/dado/ F: package/dado/
F: package/ficl/ F: package/ficl/
F: package/gdbm/
F: package/libtomcrypt/ F: package/libtomcrypt/
F: package/libtommath/ F: package/libtommath/
F: package/libump/ F: package/libump/
@@ -843,9 +832,6 @@ F: package/netsurf/
F: package/perl* F: package/perl*
F: package/pkg-perl.mk F: package/pkg-perl.mk
F: package/pkg-luarocks.mk F: package/pkg-luarocks.mk
F: package/qemu/
F: package/sdl2_mixer/
F: package/sdl2_net/
F: package/tekui/ F: package/tekui/
F: package/wsapi-fcgi/ F: package/wsapi-fcgi/
F: package/wsapi-xavante/ F: package/wsapi-xavante/
@@ -897,7 +883,8 @@ F: package/tesseract-ocr/
F: package/webp/ F: package/webp/
F: package/xapian/ F: package/xapian/
N: Giulio Benetti <giulio.benetti@micronovasrl.com> N: Giulio Benetti <giulio.benetti@benettiengineering.com>
F: package/minicom/
F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline/
F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-mainline-driver/
@@ -979,6 +966,7 @@ F: board/bananapi/
F: board/engicam/ F: board/engicam/
F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-a64/
F: board/friendlyarm/nanopi-neo2/ F: board/friendlyarm/nanopi-neo2/
F: board/olimex/a33_olinuxino/
F: board/olimex/a64-olinuxino/ F: board/olimex/a64-olinuxino/
F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-lite2/
F: board/orangepi/orangepi-one-plus F: board/orangepi/orangepi-one-plus
@@ -999,6 +987,7 @@ F: configs/engicam_imx6ul_geam_defconfig
F: configs/engicam_imx6ul_isiot_defconfig F: configs/engicam_imx6ul_isiot_defconfig
F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_a64_defconfig
F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig
F: configs/olimex_a33_olinuxino_defconfig
F: configs/olimex_a64_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig
F: configs/orangepi_lite2_defconfig F: configs/orangepi_lite2_defconfig
F: configs/orangepi_one_plus_defconfig F: configs/orangepi_one_plus_defconfig
@@ -1205,9 +1194,6 @@ F: package/python-pygame/
N: Julien Corjon <corjon.j@ecagroup.com> N: Julien Corjon <corjon.j@ecagroup.com>
F: package/qt5/ F: package/qt5/
N: Julien Floret <julien.floret@6wind.com>
F: package/lldpd/
N: Julien Grossholtz <julien.grossholtz@openest.io> N: Julien Grossholtz <julien.grossholtz@openest.io>
F: package/paho-mqtt-c F: package/paho-mqtt-c
@@ -1227,9 +1213,6 @@ F: package/cpuload/
F: package/bwm-ng/ F: package/bwm-ng/
F: package/ramsmp/ F: package/ramsmp/
N: Kevin Joly <kevin.joly@sensefly.com>
F: package/libgphoto2/
N: Koen Martens <gmc@sonologic.nl> N: Koen Martens <gmc@sonologic.nl>
F: package/capnproto/ F: package/capnproto/
F: package/linuxconsoletools/ F: package/linuxconsoletools/
@@ -1333,9 +1316,6 @@ F: package/luaossl/
F: package/rs485conf/ F: package/rs485conf/
F: package/turbolua/ F: package/turbolua/
N: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
F: package/libkcapi/
N: Marcus Folkesson <marcus.folkesson@gmail.com> N: Marcus Folkesson <marcus.folkesson@gmail.com>
F: package/libostree/ F: package/libostree/
F: package/libselinux/ F: package/libselinux/
@@ -1367,10 +1347,6 @@ F: boot/riscv-pk/
F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv32_virt_defconfig
F: configs/qemu_riscv64_virt_defconfig F: configs/qemu_riscv64_virt_defconfig
N: Markos Chandras <markos.chandras@imgtec.com>
F: package/harfbuzz/
F: package/libsecret/
N: Martin Bark <martin@barkynet.com> N: Martin Bark <martin@barkynet.com>
F: board/raspberrypi/ F: board/raspberrypi/
F: configs/raspberrypi3_defconfig F: configs/raspberrypi3_defconfig
@@ -1391,7 +1367,7 @@ F: package/tslib/
F: package/x11r7/xdriver_xf86-input-tslib/ F: package/x11r7/xdriver_xf86-input-tslib/
F: package/x11vnc/ F: package/x11vnc/
N: Mathieu Audat <mathieu.audat@savoirfairelinux.com> N: Mathieu Audat <mathieuaudat@gmail.com>
F: board/technologic/ts4900/ F: board/technologic/ts4900/
F: configs/ts4900_defconfig F: configs/ts4900_defconfig
F: package/ts4900-fpga/ F: package/ts4900-fpga/
@@ -1785,9 +1761,6 @@ F: package/libdvbpsi/
F: package/mraa/ F: package/mraa/
F: package/synergy/ F: package/synergy/
N: Pranit Sirsat <Pranit.Sirsat@imgtec.com>
F: package/paho-mqtt-c/
N: Qais Yousef <Qais.Yousef@imgtec.com> N: Qais Yousef <Qais.Yousef@imgtec.com>
F: package/bellagio/ F: package/bellagio/
@@ -1818,7 +1791,14 @@ N: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
F: package/atop/ F: package/atop/
N: Ricardo Martincoski <ricardo.martincoski@gmail.com> N: Ricardo Martincoski <ricardo.martincoski@gmail.com>
F: support/testing/ F: support/testing/infra/
F: support/testing/run-tests
F: support/testing/tests/core/test_file_capabilities.py
F: support/testing/tests/download/
F: support/testing/tests/package/*_python*.py
F: support/testing/tests/package/test_atop.py
F: support/testing/tests/package/test_syslog_ng.py
F: support/testing/tests/utils/test_check_package.py
F: utils/check-package F: utils/check-package
F: utils/checkpackagelib/ F: utils/checkpackagelib/
@@ -2040,9 +2020,6 @@ F: package/tovid/
F: package/udftools/ F: package/udftools/
F: package/xorriso/ F: package/xorriso/
N: Steve Thomas <scjthm@live.com>
F: package/isl/
N: Steven Noonan <steven@uplinklabs.net> N: Steven Noonan <steven@uplinklabs.net>
F: package/hwloc/ F: package/hwloc/
F: package/powertop/ F: package/powertop/
@@ -2180,7 +2157,7 @@ F: package/pixz/
N: Vinicius Tinti <viniciustinti@gmail.com> N: Vinicius Tinti <viniciustinti@gmail.com>
F: package/python-thrift/ F: package/python-thrift/
N: Vivien Didelot <vivien.didelot@savoirfairelinux.com> N: Vivien Didelot <vivien.didelot@gmail.com>
F: board/technologic/ts5500/ F: board/technologic/ts5500/
F: configs/ts5500_defconfig F: configs/ts5500_defconfig
@@ -2262,6 +2239,8 @@ F: package/zisofs-tools/
F: support/download/ F: support/download/
N: Yegor Yefremov <yegorslists@googlemail.com> N: Yegor Yefremov <yegorslists@googlemail.com>
F: configs/beaglebone_defconfig
F: configs/beaglebone_qt5_defconfig
F: package/acl/ F: package/acl/
F: package/attr/ F: package/attr/
F: package/bluez_utils/ F: package/bluez_utils/
@@ -2270,6 +2249,7 @@ F: package/bootstrap/
F: package/cannelloni/ F: package/cannelloni/
F: package/can-utils/ F: package/can-utils/
F: package/circus/ F: package/circus/
F: package/dhcpcd/
F: package/feh/ F: package/feh/
F: package/giblib/ F: package/giblib/
F: package/imlib2/ F: package/imlib2/
@@ -2286,6 +2266,7 @@ F: package/libubox/
F: package/libuci/ F: package/libuci/
F: package/linux-firmware/ F: package/linux-firmware/
F: package/modem-manager/ F: package/modem-manager/
F: package/nftables/
F: package/nuttcp/ F: package/nuttcp/
F: package/parted/ F: package/parted/
F: package/phytool/ F: package/phytool/

View File

@@ -92,9 +92,9 @@ all:
.PHONY: all .PHONY: all
# Set and export the version string # Set and export the version string
export BR2_VERSION := 2019.02.2 export BR2_VERSION := 2019.02.6
# Actual time the release is cut (for reproducible builds) # Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1556527000 BR2_VERSION_EPOCH = 1570115000
# Save running make version since it's clobbered by the make package # Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION) RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -248,7 +248,6 @@ ifeq ($(BR2_REPRODUCIBLE),y)
export TZ = UTC export TZ = UTC
export LANG = C export LANG = C
export LC_ALL = C export LC_ALL = C
export GZIP = -n
endif endif
# To put more focus on warnings, be less verbose as default # To put more focus on warnings, be less verbose as default
@@ -811,6 +810,7 @@ endif # merged /usr
.PHONY: target-post-image .PHONY: target-post-image
target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
@rm -f $(ROOTFS_COMMON_TAR) @rm -f $(ROOTFS_COMMON_TAR)
$(Q)mkdir -p $(BINARIES_DIR)
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
$(call MESSAGE,"Executing post-image script $(s)"); \ $(call MESSAGE,"Executing post-image script $(s)"); \
$(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

View File

@@ -1 +1 @@
buildroot 2019_02_2 buildroot 2019_02_6

View File

@@ -101,6 +101,15 @@ config BR2_x86_corei7
select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSSE3
select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE4
select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_SSE42
config BR2_x86_westmere
bool "westmere"
select BR2_X86_CPU_HAS_MMX
select BR2_X86_CPU_HAS_SSE
select BR2_X86_CPU_HAS_SSE2
select BR2_X86_CPU_HAS_SSE3
select BR2_X86_CPU_HAS_SSSE3
select BR2_X86_CPU_HAS_SSE4
select BR2_X86_CPU_HAS_SSE42
config BR2_x86_corei7_avx config BR2_x86_corei7_avx
bool "corei7-avx" bool "corei7-avx"
select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_MMX
@@ -235,8 +244,9 @@ config BR2_ARCH
default "i686" if BR2_x86_nocona && BR2_i386 default "i686" if BR2_x86_nocona && BR2_i386
default "i686" if BR2_x86_core2 && BR2_i386 default "i686" if BR2_x86_core2 && BR2_i386
default "i686" if BR2_x86_corei7 && BR2_i386 default "i686" if BR2_x86_corei7 && BR2_i386
default "i686" if BR2_x86_westmere && BR2_i386
default "i686" if BR2_x86_corei7_avx && BR2_i386 default "i686" if BR2_x86_corei7_avx && BR2_i386
default "i686" if BR2_x86_corei7_avx2 && BR2_i386 default "i686" if BR2_x86_core_avx2 && BR2_i386
default "i686" if BR2_x86_atom && BR2_i386 default "i686" if BR2_x86_atom && BR2_i386
default "i686" if BR2_x86_silvermont && BR2_i386 default "i686" if BR2_x86_silvermont && BR2_i386
default "i686" if BR2_x86_opteron && BR2_i386 default "i686" if BR2_x86_opteron && BR2_i386
@@ -271,6 +281,7 @@ config BR2_GCC_TARGET_ARCH
default "corei7-avx" if BR2_x86_corei7_avx default "corei7-avx" if BR2_x86_corei7_avx
default "core-avx2" if BR2_x86_core_avx2 default "core-avx2" if BR2_x86_core_avx2
default "atom" if BR2_x86_atom default "atom" if BR2_x86_atom
default "westmere" if BR2_x86_westmere
default "silvermont" if BR2_x86_silvermont default "silvermont" if BR2_x86_silvermont
default "k8" if BR2_x86_opteron default "k8" if BR2_x86_opteron
default "k8-sse3" if BR2_x86_opteron_sse3 default "k8-sse3" if BR2_x86_opteron_sse3

View File

@@ -1,6 +0,0 @@
set default="0"
set timeout="5"
menuentry "Buildroot" {
linux /bzImage root=/dev/sda2 rootwait console=tty1
}

View File

@@ -57,13 +57,7 @@ qemu-system-x86_64 \
Emulation in qemu (UEFI) Emulation in qemu (UEFI)
======================== ========================
1. Edit grub-efi.cfg Run the emulation with:
Since the driver will show up in the virtual machine as /dev/vda,
change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
root=/dev/sda2. Then rebuild grub2 and the image.
2. Run the emulation with:
qemu-system-x86_64 \ qemu-system-x86_64 \
-M pc \ -M pc \

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user
Or for the noMMU emulation: Or for the noMMU emulation:

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/sda console=ttyS0" qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0"
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been graphical window is the framebuffer. No keyboard support has been

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been graphical window is the framebuffer. No keyboard support has been

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user -nographic qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda"
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda"
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
The login prompt will appear in the terminal that started Qemu. The The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 root=/dev/vda" -serial mon:stdio -nographic qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
The login prompt will appear in the terminal window. The login prompt will appear in the terminal window.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic qemu-system-riscv32 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-riscv64 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic qemu-system-riscv64 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.
The graphical window is the framebuffer. The graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.
The graphical window is the framebuffer. The graphical window is the framebuffer.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user
The login prompt will appear in the terminal that started Qemu. The login prompt will appear in the terminal that started Qemu.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user
Optionally add -smp N to emulate a SMP system with N CPUs. Optionally add -smp N to emulate a SMP system with N CPUs.

View File

@@ -1,6 +1,6 @@
Run the emulation with: Run the emulation with:
qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user
Optionally add -smp N to emulate a SMP system with N CPUs. Optionally add -smp N to emulate a SMP system with N CPUs.

View File

@@ -5,8 +5,6 @@
################################################################################ ################################################################################
ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION)) ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
# Handle custom ATF tarballs as specified by the configuration # Handle custom ATF tarballs as specified by the configuration
@@ -19,6 +17,10 @@ ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
else else
# Handle stable official ATF versions # Handle stable official ATF versions
ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
# The licensing of custom or from-git versions is unknown.
# This is valid only for the official v1.4.
ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
endif endif
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y)

View File

@@ -76,6 +76,10 @@ $(1)_KCONFIG_FRAGMENT_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_CONFIG_FRAGMENT_
$(1)_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig $(1)_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
$(1)_KCONFIG_OPTS = $$($(1)_MAKE_FLAGS) $(1)_KCONFIG_OPTS = $$($(1)_MAKE_FLAGS)
$(1)_KCONFIG_DEPENDENCIES = \
$(BR2_BISON_HOST_DEPENDENCY) \
$(BR2_FLEX_HOST_DEPENDENCY)
ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
define $(1)_BUILD_BAREBOXENV_CMDS define $(1)_BUILD_BAREBOXENV_CMDS
$$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \ $$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \

View File

@@ -13,7 +13,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
# Bootloader # Bootloader
BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_AARCH64_EFI=y BR2_TARGET_GRUB2_ARM64_EFI=y
# Filesystem / image # Filesystem / image
BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2=y

View File

@@ -2,7 +2,6 @@ BR2_arm=y
BR2_cortex_a8=y BR2_cortex_a8=y
BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_GIT=y

View File

@@ -23,3 +23,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf"
BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
# Kernel needs mkimage
BR2_PACKAGE_HOST_UBOOT_TOOLS=y

View File

@@ -27,3 +27,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf"
BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
# Kernel needs mkimage
BR2_PACKAGE_HOST_UBOOT_TOOLS=y

View File

@@ -67,9 +67,13 @@ Python build system, but are not Python modules, can freely choose
their name (existing examples in Buildroot are +scons+ and their name (existing examples in Buildroot are +scons+ and
+supervisor+). +supervisor+).
In their +Config.in+ file, they should depend on +BR2_PACKAGE_PYTHON+ Packages that are only compatible with one version of Python (as in:
so that when Buildroot will enable Python 3 usage for modules, we will Python 2 or Python 3) should depend on that version explicitely in
be able to enable Python modules progressively on Python 3. their +Config.in+ file (+BR2_PACKAGE_PYTHON+ for Python 2,
+BR2_PACKAGE_PYTHON3+ for Python 3). Packages that are compatible
with both versions should not explicitely depend on them in their
+Config.in+ file, since that condition is already expressed for the
whole "External python modules" menu.
The main macro of the Python package infrastructure is The main macro of the Python package infrastructure is
+python-package+. It is similar to the +generic-package+ macro. It is +python-package+. It is similar to the +generic-package+ macro. It is

View File

@@ -310,8 +310,8 @@ installed (+python-matplotlib+ on most distributions), and also the
+argparse+ module if you're using a Python version older than 2.7 +argparse+ module if you're using a Python version older than 2.7
(+python-argparse+ on most distributions). (+python-argparse+ on most distributions).
Just like for the duration graph, a +BR2_GRAPH_OUT+ environment is Just like for the duration graph, a +BR2_GRAPH_OUT+ environment variable
supported to adjust the output file format. See xref:graph-depends[] is supported to adjust the output file format. See xref:graph-depends[]
for details about this environment variable. for details about this environment variable.
.Note .Note

View File

@@ -73,7 +73,7 @@ basically two things that can be done:
In the commit message of a patch fixing an autobuild failure, add a In the commit message of a patch fixing an autobuild failure, add a
reference to the build result directory, as follows: reference to the build result directory, as follows:
--------------------- ---------------------
Fixes http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069
--------------------- ---------------------
=== Reviewing and testing patches === Reviewing and testing patches
@@ -402,7 +402,7 @@ the problem is complex, it is OK to add more paragraphs. All paragraphs
should be wrapped at 72 characters. should be wrapped at 72 characters.
A paragraph that explains the root cause of the problem. Again, more A paragraph that explains the root cause of the problem. Again, more
than on paragraph is OK. than one paragraph is OK.
Finally, one or more paragraphs that explain how the problem is solved. Finally, one or more paragraphs that explain how the problem is solved.
Don't hesitate to explain complex solutions in detail. Don't hesitate to explain complex solutions in detail.

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@@ -161,13 +161,13 @@ List of Examples
--------------------------------------------------------------------- ---------------------------------------------------------------------
Buildroot 2019.02.2 manual generated on 2019-04-29 08:38:35 UTC from Buildroot 2019.02.6 manual generated on 2019-10-03 15:16:21 UTC from
git revision 3b4b3e7cd4 git revision 4564d8f397
The Buildroot manual is written by the Buildroot developers. It is The Buildroot manual is written by the Buildroot developers. It is
licensed under the GNU General Public License, version 2. Refer to licensed under the GNU General Public License, version 2. Refer to
the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
3b4b3e7cd4618e56f5c6a8ea098ffd573a2e868e] file in the Buildroot 4564d8f3977a6ed448edf9567f4eb6a6b8c127c8] file in the Buildroot
sources for the full text of this license. sources for the full text of this license.
Copyright © 2004-2019 The Buildroot developers Copyright © 2004-2019 The Buildroot developers
@@ -362,9 +362,8 @@ All of these "make" commands will need to build a configuration
utility (including the interface), so you may need to install utility (including the interface), so you may need to install
"development" packages for relevant libraries used by the "development" packages for relevant libraries used by the
configuration utilities. Refer to Chapter 2, System requirements for configuration utilities. Refer to Chapter 2, System requirements for
more details, specifically the optional requirements Section 2.2, more details, specifically the optional requirements to get the
“Optional packages” to get the dependencies of your favorite dependencies of your favorite interface.
interface.
For each menu entry in the configuration tool, you can find For each menu entry in the configuration tool, you can find
associated help that describes the purpose of the entry. Refer to associated help that describes the purpose of the entry. Refer to
@@ -1469,10 +1468,10 @@ installed (python-matplotlib on most distributions), and also the
argparse module if youre using a Python version older than 2.7 argparse module if youre using a Python version older than 2.7
(python-argparse on most distributions). (python-argparse on most distributions).
Just like for the duration graph, a BR2_GRAPH_OUT environment is Just like for the duration graph, a BR2_GRAPH_OUT environment
supported to adjust the output file format. See Section 8.8, variable is supported to adjust the output file format. See
“Graphing the dependencies between packages” for details about this Section 8.8, “Graphing the dependencies between packages” for details
environment variable. about this environment variable.
Note. The collected filesystem size data is only meaningful after a Note. The collected filesystem size data is only meaningful after a
complete clean rebuild. Be sure to run make clean all before using complete clean rebuild. Be sure to run make clean all before using
@@ -1738,10 +1737,8 @@ Additionally, there are some other useful make targets:
| graph-depends |Generate a dependency graph of the | | graph-depends |Generate a dependency graph of the |
| |package, in the context of the | | |package, in the context of the |
| |current Buildroot configuration. See| | |current Buildroot configuration. See|
| |this section Section 8.8, “Graphing | | |this section for more details about |
| |the dependencies between packages” | | |dependency graphs. |
| |for more details about dependency |
| |graphs. |
|-----------------------+------------------------------------| |-----------------------+------------------------------------|
| graph-rdepends |Generate a graph of this package | | graph-rdepends |Generate a graph of this package |
| |reverse dependencies (i.e the | | |reverse dependencies (i.e the |
@@ -1793,10 +1790,21 @@ clean.
Therefore, Buildroot provides a specific mechanism for this use case: Therefore, Buildroot provides a specific mechanism for this use case:
the <pkg>_OVERRIDE_SRCDIR mechanism. Buildroot reads an override the <pkg>_OVERRIDE_SRCDIR mechanism. Buildroot reads an override
file, which allows the user to tell Buildroot the location of the file, which allows the user to tell Buildroot the location of the
source for certain packages. By default this override file is named source for certain packages.
local.mk and located in the top directory of the Buildroot source
tree, but a different location can be specified through the The default location of the override file is $(CONFIG_DIR)/local.mk,
BR2_PACKAGE_OVERRIDE_FILE configuration option. as defined by the BR2_PACKAGE_OVERRIDE_FILE configuration option. $
(CONFIG_DIR) is the location of the Buildroot .config file, so
local.mk by default lives side-by-side with the .config file, which
means:
* In the top-level Buildroot source directory for in-tree builds
(i.e., when O= is not used)
* In the out-of-tree directory for out-of-tree builds (i.e., when O
= is used)
If a different location than these defaults is required, it can be
specified through the BR2_PACKAGE_OVERRIDE_FILE configuration option.
In this override file, Buildroot expects to find lines of the form: In this override file, Buildroot expects to find lines of the form:
@@ -1853,6 +1861,15 @@ WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \
--exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \ --exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \
--exclude WebKit.xcworkspace --exclude Websites --exclude Examples --exclude WebKit.xcworkspace --exclude Websites --exclude Examples
By default, Buildroot skips syncing of VCS artifacts (e.g., the .git
and .svn directories). Some packages prefer to have these VCS
directories available during build, for example for automatically
determining a precise commit reference for version information. To
undo this built-in filtering at a cost of a slower speed, add these
directories back:
LINUX_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = --include .git
Chapter 9. Project-specific customization Chapter 9. Project-specific customization
Typical actions you may need to perform for a given project are: Typical actions you may need to perform for a given project are:
@@ -2520,8 +2537,7 @@ from the post-build script.
Instead, Buildroot provides support for so-called permission tables. Instead, Buildroot provides support for so-called permission tables.
To use this feature, set config option BR2_ROOTFS_DEVICE_TABLE to a To use this feature, set config option BR2_ROOTFS_DEVICE_TABLE to a
space-separated list of permission tables, regular text files space-separated list of permission tables, regular text files
following the makedev syntax Chapter 23, Makedev syntax documentation following the makedev syntax.
.
If you are using a static device table (i.e. not using devtmpfs, If you are using a static device table (i.e. not using devtmpfs,
mdev, or (e)udev) then you can add device nodes using the same mdev, or (e)udev) then you can add device nodes using the same
@@ -2543,8 +2559,7 @@ Sometimes it is needed to add specific users in the target system. To
cover this requirement, Buildroot provides support for so-called cover this requirement, Buildroot provides support for so-called
users tables. To use this feature, set config option users tables. To use this feature, set config option
BR2_ROOTFS_USERS_TABLES to a space-separated list of users tables, BR2_ROOTFS_USERS_TABLES to a space-separated list of users tables,
regular text files following the makeusers syntax Chapter 24, regular text files following the makeusers syntax.
Makeusers syntax documentation.
As shown in Section 9.1, “Recommended directory structure”, the As shown in Section 9.1, “Recommended directory structure”, the
recommended location for such files is board/<company>/<boardname>/. recommended location for such files is board/<company>/<boardname>/.
@@ -3653,8 +3668,7 @@ also enabled, but not necessarily built before your package. To do
so, the dependency also needs to be expressed in the .mk file of the so, the dependency also needs to be expressed in the .mk file of the
package. package.
Further formatting details: see the coding style Section 15.1, Further formatting details: see the coding style.
“Config.in file”.
17.2.4. Dependencies on target and toolchain options 17.2.4. Dependencies on target and toolchain options
@@ -3838,36 +3852,27 @@ different way, using different infrastructures:
infrastructure must be used for all packages that do not use the infrastructure must be used for all packages that do not use the
autotools as their build system. In the future, other specialized autotools as their build system. In the future, other specialized
infrastructures might be written for other build systems. We infrastructures might be written for other build systems. We
cover them through in a tutorial Section 17.5.1, “generic-package cover them through in a tutorial and a reference.
tutorial” and a reference Section 17.5.2, “generic-package
reference”.
* Makefiles for autotools-based software (autoconf, automake, * Makefiles for autotools-based software (autoconf, automake,
etc.): We provide a dedicated infrastructure for such packages, etc.): We provide a dedicated infrastructure for such packages,
since autotools is a very common build system. This since autotools is a very common build system. This
infrastructure must be used for new packages that rely on the infrastructure must be used for new packages that rely on the
autotools as their build system. We cover them through a tutorial autotools as their build system. We cover them through a tutorial
Section 17.6.1, “autotools-package tutorial” and reference and reference.
Section 17.6.2, “autotools-package reference”.
* Makefiles for cmake-based software: We provide a dedicated * Makefiles for cmake-based software: We provide a dedicated
infrastructure for such packages, as CMake is a more and more infrastructure for such packages, as CMake is a more and more
commonly used build system and has a standardized behaviour. This commonly used build system and has a standardized behaviour. This
infrastructure must be used for new packages that rely on CMake. infrastructure must be used for new packages that rely on CMake.
We cover them through a tutorial Section 17.7.1, “cmake-package We cover them through a tutorial and reference.
tutorial” and reference Section 17.7.2, “cmake-package reference”
.
* Makefiles for Python modules: We have a dedicated infrastructure * Makefiles for Python modules: We have a dedicated infrastructure
for Python modules that use either the distutils or the for Python modules that use either the distutils or the
setuptools mechanism. We cover them through a tutorial setuptools mechanism. We cover them through a tutorial and a
Section 17.8.1, “python-package tutorial” and a reference reference.
Section 17.8.2, “python-package reference”.
* Makefiles for Lua modules: We have a dedicated infrastructure for * Makefiles for Lua modules: We have a dedicated infrastructure for
Lua modules available through the LuaRocks web site. We cover Lua modules available through the LuaRocks web site. We cover
them through a tutorial Section 17.9.1, “luarocks-package them through a tutorial and a reference.
tutorial” and a reference Section 17.9.2, “luarocks-package
reference”.
Further formatting details: see the writing rules Section 15.2, “The Further formatting details: see the writing rules.
.mk file”.
17.4. The .hash file 17.4. The .hash file
@@ -4209,9 +4214,9 @@ information is (assuming the package name is libfoo) :
are included in Buildroot itself use a different mechanism: all are included in Buildroot itself use a different mechanism: all
files of the form *.patch present in the package directory inside files of the form *.patch present in the package directory inside
Buildroot will be applied to the package after extraction (see Buildroot will be applied to the package after extraction (see
patching a package Chapter 18, Patching a package). Finally, patching a package). Finally, patches listed in the LIBFOO_PATCH
patches listed in the LIBFOO_PATCH variable are applied before variable are applied before the patches stored in the Buildroot
the patches stored in the Buildroot package directory. package directory.
* LIBFOO_SITE provides the location of the package, which can be a * LIBFOO_SITE provides the location of the package, which can be a
URL or a local filesystem path. HTTP, FTP and SCP are supported URL or a local filesystem path. HTTP, FTP and SCP are supported
URL types for retrieving package tarballs. In these cases dont URL types for retrieving package tarballs. In these cases dont
@@ -4870,9 +4875,13 @@ be named python-<something> in Buildroot. Other packages that use the
Python build system, but are not Python modules, can freely choose Python build system, but are not Python modules, can freely choose
their name (existing examples in Buildroot are scons and supervisor). their name (existing examples in Buildroot are scons and supervisor).
In their Config.in file, they should depend on BR2_PACKAGE_PYTHON so Packages that are only compatible with one version of Python (as in:
that when Buildroot will enable Python 3 usage for modules, we will Python 2 or Python 3) should depend on that version explicitely in
be able to enable Python modules progressively on Python 3. their Config.in file (BR2_PACKAGE_PYTHON for Python 2,
BR2_PACKAGE_PYTHON3 for Python 3). Packages that are compatible with
both versions should not explicitely depend on them in their
Config.in file, since that condition is already expressed for the
whole "External python modules" menu.
The main macro of the Python package infrastructure is The main macro of the Python package infrastructure is
python-package. It is similar to the generic-package macro. It is python-package. It is similar to the generic-package macro. It is
@@ -4884,12 +4893,11 @@ by defining a number of variables before calling the python-package
or host-python-package macros. or host-python-package macros.
All the package metadata information variables that exist in the All the package metadata information variables that exist in the
generic package infrastructure Section 17.5.2, “generic-package generic package infrastructure also exist in the Python
reference” also exist in the Python infrastructure: infrastructure: PYTHON_FOO_VERSION, PYTHON_FOO_SOURCE,
PYTHON_FOO_VERSION, PYTHON_FOO_SOURCE, PYTHON_FOO_PATCH, PYTHON_FOO_PATCH, PYTHON_FOO_SITE, PYTHON_FOO_SUBDIR,
PYTHON_FOO_SITE, PYTHON_FOO_SUBDIR, PYTHON_FOO_DEPENDENCIES, PYTHON_FOO_DEPENDENCIES, PYTHON_FOO_LICENSE,
PYTHON_FOO_LICENSE, PYTHON_FOO_LICENSE_FILES, PYTHON_FOO_LICENSE_FILES, PYTHON_FOO_INSTALL_STAGING, etc.
PYTHON_FOO_INSTALL_STAGING, etc.
Note that: Note that:
@@ -5807,9 +5815,8 @@ The Makefile starts with the definition of the standard variables for
package declaration (lines 7 to 11). package declaration (lines 7 to 11).
As seen in line 35, it is based on the generic-package infrastructure As seen in line 35, it is based on the generic-package infrastructure
Section 17.5.1, “generic-package tutorial”. So, it defines the . So, it defines the variables required by this particular
variables required by this particular infrastructure, where Cargo is infrastructure, where Cargo is invoked:
invoked:
* FOO_BUILD_CMDS: Cargo is invoked to perform the build. The * FOO_BUILD_CMDS: Cargo is invoked to perform the build. The
options required to configure the cross-compilation of the options required to configure the cross-compilation of the
@@ -5892,10 +5899,10 @@ Just like the generic infrastructure, the Go infrastructure works by
defining a number of variables before calling the golang-package. defining a number of variables before calling the golang-package.
All the package metadata information variables that exist in the All the package metadata information variables that exist in the
generic package infrastructure Section 17.5.2, “generic-package generic package infrastructure also exist in the Go infrastructure:
reference” also exist in the Go infrastructure: FOO_VERSION, FOO_VERSION, FOO_SOURCE, FOO_PATCH, FOO_SITE, FOO_SUBDIR,
FOO_SOURCE, FOO_PATCH, FOO_SITE, FOO_SUBDIR, FOO_DEPENDENCIES, FOO_DEPENDENCIES, FOO_LICENSE, FOO_LICENSE_FILES,
FOO_LICENSE, FOO_LICENSE_FILES, FOO_INSTALL_STAGING, etc. FOO_INSTALL_STAGING, etc.
Note that it is not necessary to add host-go in the FOO_DEPENDENCIES Note that it is not necessary to add host-go in the FOO_DEPENDENCIES
variable of a package, since this basic dependency is automatically variable of a package, since this basic dependency is automatically
@@ -5984,8 +5991,7 @@ On line 13, we invoke the kernel-module helper infrastructure, that
generates all the appropriate Makefile rules and variables to build generates all the appropriate Makefile rules and variables to build
that kernel module. that kernel module.
Finally, on line 14, we invoke the generic-package infrastructure Finally, on line 14, we invoke the generic-package infrastructure.
Section 17.5.1, “generic-package tutorial”.
The dependency on linux is automatically added, so it is not needed The dependency on linux is automatically added, so it is not needed
to specify it in FOO_DEPENDENCIES. to specify it in FOO_DEPENDENCIES.
@@ -6097,10 +6103,9 @@ there is, as for packages, an infrastructure for rendering documents
using the AsciiDoc syntax. using the AsciiDoc syntax.
Also as for packages, the AsciiDoc infrastructure is available from a Also as for packages, the AsciiDoc infrastructure is available from a
br2-external tree Section 9.2, “Keeping customizations outside of br2-external tree. This allows documentation for a br2-external tree
Buildroot”. This allows documentation for a br2-external tree to to match the Buildroot documentation, as it will be rendered to the
match the Buildroot documentation, as it will be rendered to the same same formats and use the same layout and theme.
formats and use the same layout and theme.
17.19.1. asciidoc-document tutorial 17.19.1. asciidoc-document tutorial
@@ -6271,10 +6276,9 @@ only when the foo tool is selected.
The rest of the Makefile, lines 11-25 defines what should be done at The rest of the Makefile, lines 11-25 defines what should be done at
the different steps of the Linux tool build process like for a the different steps of the Linux tool build process like for a
generic package Section 17.5.1, “generic-package tutorial”. They will generic package. They will actually be used only when the foo tool is
actually be used only when the foo tool is selected. The only selected. The only supported commands are _BUILD_CMDS,
supported commands are _BUILD_CMDS, _INSTALL_STAGING_CMDS and _INSTALL_STAGING_CMDS and _INSTALL_TARGET_CMDS.
_INSTALL_TARGET_CMDS.
Note. One must not call $(eval $(generic-package)) or any other Note. One must not call $(eval $(generic-package)) or any other
package infrastructure! Linux tools are not packages by themselves, package infrastructure! Linux tools are not packages by themselves,
@@ -6335,8 +6339,7 @@ modify the Linux kernel tree; this is specific to the linux extension
and can use the variables defined by the foo package, like: $ and can use the variables defined by the foo package, like: $
(FOO_DIR) or $(FOO_VERSION)… as well as all the Linux variables, (FOO_DIR) or $(FOO_VERSION)… as well as all the Linux variables,
like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)… like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)…
See the definition of those kernel variables Section 17.18.2, See the definition of those kernel variables.
“kernel-module reference”.
17.21. Hooks available in the various build steps 17.21. Hooks available in the various build steps
@@ -6926,7 +6929,7 @@ basically two things that can be done:
patch fixing an autobuild failure, add a reference to the patch fixing an autobuild failure, add a reference to the
build result directory, as follows: build result directory, as follows:
Fixes http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069
21.3. Reviewing and testing patches 21.3. Reviewing and testing patches
@@ -7124,8 +7127,8 @@ options that no longer exist or are no longer needed.
If you are interested in getting notified of build failures and of If you are interested in getting notified of build failures and of
further changes in the packages you added or modified, please add further changes in the packages you added or modified, please add
yourself to the DEVELOPERS file. This should be done in the same yourself to the DEVELOPERS file. This should be done in the same
patch creating or modifying the package. See the DEVELOPERS file patch creating or modifying the package. See the DEVELOPERS file for
Chapter 22, DEVELOPERS file and get-developers for more information. more information.
Buildroot provides a handy tool to check for common coding style Buildroot provides a handy tool to check for common coding style
mistakes on files you created or modified, called check-package (see mistakes on files you created or modified, called check-package (see
@@ -7233,7 +7236,7 @@ the problem is complex, it is OK to add more paragraphs. All paragraphs
should be wrapped at 72 characters. should be wrapped at 72 characters.
A paragraph that explains the root cause of the problem. Again, more A paragraph that explains the root cause of the problem. Again, more
than on paragraph is OK. than one paragraph is OK.
Finally, one or more paragraphs that explain how the problem is solved. Finally, one or more paragraphs that explain how the problem is solved.
Don't hesitate to explain complex solutions in detail. Don't hesitate to explain complex solutions in detail.
@@ -7283,14 +7286,12 @@ as superseded.
21.6. Reporting issues/bugs or getting help 21.6. Reporting issues/bugs or getting help
Before reporting any issue, please check in the mailing list archive Before reporting any issue, please check in the mailing list archive
Chapter 5, Community resources whether someone has already reported whether someone has already reported and/or fixed a similar problem.
and/or fixed a similar problem.
However you choose to report bugs or get help, either by opening a However you choose to report bugs or get help, either by opening a
bug in the bug tracker Chapter 5, Community resources or by sending a bug in the bug tracker or by sending a mail to the mailing list,
mail to the mailing list Chapter 5, Community resources, there are a there are a number of details to provide in order to help people
number of details to provide in order to help people reproduce and reproduce and find a solution to the issue.
find a solution to the issue.
Try to think as if you were trying to help someone else; in that Try to think as if you were trying to help someone else; in that
case, what would you need? case, what would you need?

View File

@@ -28,10 +28,22 @@ clean+.
Therefore, Buildroot provides a specific mechanism for this use case: Therefore, Buildroot provides a specific mechanism for this use case:
the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_ the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
file, which allows the user to tell Buildroot the location of the file, which allows the user to tell Buildroot the location of the
source for certain packages. By default this _override_ file is named source for certain packages.
+local.mk+ and located in the top directory of the Buildroot source
tree, but a different location can be specified through the The default location of the override file is +$(CONFIG_DIR)/local.mk+,
+BR2_PACKAGE_OVERRIDE_FILE+ configuration option. as defined by the +BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+$(CONFIG_DIR)+ is the location of the Buildroot +.config+ file, so
+local.mk+ by default lives side-by-side with the +.config+ file,
which means:
* In the top-level Buildroot source directory for in-tree builds
(i.e., when +O=+ is not used)
* In the out-of-tree directory for out-of-tree builds (i.e., when
+O=+ is used)
If a different location than these defaults is required, it can be
specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
option.
In this _override_ file, Buildroot expects to find lines of the form: In this _override_ file, Buildroot expects to find lines of the form:
@@ -97,3 +109,13 @@ WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \
--exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \ --exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \
--exclude WebKit.xcworkspace --exclude Websites --exclude Examples --exclude WebKit.xcworkspace --exclude Websites --exclude Examples
------------------ ------------------
By default, Buildroot skips syncing of VCS artifacts (e.g., the *.git* and
*.svn* directories). Some packages prefer to have these VCS directories
available during build, for example for automatically determining a precise
commit reference for version information. To undo this built-in filtering at a
cost of a slower speed, add these directories back:
------------------
LINUX_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = --include .git
------------------

View File

@@ -82,7 +82,7 @@ ROOTFS_$(2)_DEPENDENCIES += rootfs-common
ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
ROOTFS_$(2)_COMPRESS_EXT = .gz ROOTFS_$(2)_COMPRESS_EXT = .gz
ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c -n
endif endif
ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y) ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
ROOTFS_$(2)_COMPRESS_EXT = .bz2 ROOTFS_$(2)_COMPRESS_EXT = .bz2

View File

@@ -8,6 +8,9 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
ROOTFS_TAR_DEPENDENCIES = $(BR2_TAR_HOST_DEPENDENCY) ROOTFS_TAR_DEPENDENCIES = $(BR2_TAR_HOST_DEPENDENCY)
# do not store atime/ctime in PaxHeaders to ensure reproducbility
TAR_OPTS += --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0
define ROOTFS_TAR_CMD define ROOTFS_TAR_CMD
(cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \
tar $(TAR_OPTS) -cf $@ --null --xattrs-include='*' --no-recursion -T - --numeric-owner) tar $(TAR_OPTS) -cf $@ --null --xattrs-include='*' --no-recursion -T - --numeric-owner)

View File

@@ -122,7 +122,7 @@ endif
config BR2_LINUX_KERNEL_VERSION config BR2_LINUX_KERNEL_VERSION
string string
default "4.19.36" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.76" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.176-cip31" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "v4.4.176-cip31" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION if BR2_LINUX_KERNEL_CUSTOM_VERSION

View File

@@ -1,6 +1,6 @@
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e linux-4.20.17.tar.xz sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e linux-4.20.17.tar.xz
sha256 b808b508177f9d288d94a3b9df7b01d5eac9fcc1804a794c913b2144de63f2bc linux-4.19.36.tar.xz sha256 ba4dd29902734b263a5197410363b17f30dc60bc999bd6ce90b6f5910b971e66 linux-4.19.76.tar.xz
sha256 b24df2e37faaf2290999c507f9e29de98494f52429bcd35513c5b3e52eaddac2 linux-4.14.113.tar.xz sha256 a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5 linux-4.14.146.tar.xz
sha256 33887b40fc8e0b71f423bb7afe112a4ae190378145f4a3f3892c563b7e43131d linux-4.9.170.tar.xz sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3 linux-4.9.194.tar.xz
sha256 c3598c22b7994b3bebc3059e8ab85bc212c53550eb401baab3f29f8d007a043d linux-4.4.178.tar.xz sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3 linux-4.9.194.tar.xz

View File

@@ -64,7 +64,8 @@ LINUX_MAKE_ENV = \
BR_BINARIES_DIR=$(BINARIES_DIR) BR_BINARIES_DIR=$(BINARIES_DIR)
LINUX_INSTALL_IMAGES = YES LINUX_INSTALL_IMAGES = YES
LINUX_DEPENDENCIES = host-kmod LINUX_DEPENDENCIES = host-kmod \
$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode)
# Starting with 4.16, the generated kconfig paser code is no longer # Starting with 4.16, the generated kconfig paser code is no longer
# shipped with the kernel sources, so we need flex and bison, but # shipped with the kernel sources, so we need flex and bison, but
@@ -315,6 +316,8 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(LINUX_FIXUP_CONFIG_ENDIANNESS) $(LINUX_FIXUP_CONFIG_ENDIANNESS)
$(if $(BR2_arm)$(BR2_armeb), $(if $(BR2_arm)$(BR2_armeb),
$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config))
$(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),
$(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR,$(@D)/.config))
$(if $(BR2_TARGET_ROOTFS_CPIO), $(if $(BR2_TARGET_ROOTFS_CPIO),
$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)) $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config))
# As the kernel gets compiled before root filesystems are # As the kernel gets compiled before root filesystems are

View File

@@ -1042,7 +1042,7 @@ menu "External python modules"
source "package/python-slob/Config.in" source "package/python-slob/Config.in"
source "package/python-smbus-cffi/Config.in" source "package/python-smbus-cffi/Config.in"
source "package/python-socketio/Config.in" source "package/python-socketio/Config.in"
source "package/python-sortedcontainers//Config.in" source "package/python-sortedcontainers/Config.in"
source "package/python-spidev/Config.in" source "package/python-spidev/Config.in"
source "package/python-sqlalchemy/Config.in" source "package/python-sqlalchemy/Config.in"
source "package/python-subprocess32/Config.in" source "package/python-subprocess32/Config.in"

View File

@@ -1,4 +1,4 @@
# From http://archive.apache.org/dist/httpd/httpd-2.4.39.tar.bz2.sha256 # From http://archive.apache.org/dist/httpd/httpd-2.4.41.tar.bz2.sha256
sha256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 httpd-2.4.39.tar.bz2 sha256 133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 httpd-2.4.41.tar.bz2
# Locally computed # Locally computed
sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
APACHE_VERSION = 2.4.39 APACHE_VERSION = 2.4.41
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_SITE = http://archive.apache.org/dist/httpd
APACHE_LICENSE = Apache-2.0 APACHE_LICENSE = Apache-2.0

View File

@@ -1,9 +1,5 @@
config BR2_PACKAGE_ASSIMP config BR2_PACKAGE_ASSIMP
bool "assimp" bool "assimp"
# All gcc versions affected by
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
# cause an infinite loop in gcc when building this package.
depends on !BR2_microblaze
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
@@ -16,5 +12,4 @@ config BR2_PACKAGE_ASSIMP
http://www.assimp.org http://www.assimp.org
comment "assimp needs a toolchain w/ C++" comment "assimp needs a toolchain w/ C++"
depends on !BR2_microblaze
depends on !BR2_INSTALL_LIBSTDCPP depends on !BR2_INSTALL_LIBSTDCPP

View File

@@ -19,11 +19,15 @@ endif
# workaround SuperH compiler failure when static linking (i.e -fPIC is # workaround SuperH compiler failure when static linking (i.e -fPIC is
# not passed) in gcc versions 5.x or older. The -Os optimization level # not passed) in gcc versions 5.x or older. The -Os optimization level
# causes a "unable to find a register to spill in class # causes a "unable to find a register to spill in class
# GENERAL_REGS" error. -O2 works fine. # 'GENERAL_REGS'" error. -O2 works fine.
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:) ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
ASSIMP_CXXFLAGS += -O2 ASSIMP_CXXFLAGS += -O2
endif endif
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
ASSIMP_CXXFLAGS += -O0
endif
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"

View File

@@ -1,5 +1,5 @@
# Locally computed # Locally computed
sha256 c022e9d5410ed94ab1aa51ba1e2a8b196f0dfa15bcd0bd545d06efee4c786578 asterisk-16.2.1.tar.gz sha256 122ecf242e06da373488024e0c76154f2404d024d09eed20b23cae0795033380 asterisk-16.5.1.tar.gz
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
# sha256 locally computed # sha256 locally computed

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
ASTERISK_VERSION = 16.2.1 ASTERISK_VERSION = 16.5.1
# Use the github mirror: it's an official mirror maintained by Digium, and # Use the github mirror: it's an official mirror maintained by Digium, and
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))

View File

@@ -1,2 +1,3 @@
# Locally computed # Locally computed
sha1 fc9e9f821dfd2f257b4a5c32b948ed60b4e31fd1 atftp-0.7.1.tar.gz sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041 atftp-0.7.2.tar.gz
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE

View File

@@ -4,19 +4,19 @@
# #
################################################################################ ################################################################################
ATFTP_VERSION = 0.7.1 ATFTP_VERSION = 0.7.2
ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_SITE = http://sourceforge.net/projects/atftp/files
ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE = GPL-2.0+
ATFTP_LICENSE_FILES = LICENSE ATFTP_LICENSE_FILES = LICENSE
# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am
ATFTP_AUTORECONF = YES
ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
# For static we need to explicitly link against libpthread # For static we need to explicitly link against libpthread
ATFTP_LIBS = -lpthread ATFTP_LIBS = -lpthread
# We use CPPFLAGS for -fgnu89-inline even though it's a compiler flag # -fgnu89-inline is needed to avoid multiple definition error with gcc 5. See
# because atftp discards configure environment CFLAGS. -fgnu89-inline
# is needed to avoid multiple definition error with gcc 5. See
# https://gcc.gnu.org/gcc-5/porting_to.html. # https://gcc.gnu.org/gcc-5/porting_to.html.
ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)" \ ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -fgnu89-inline" CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline"
ifeq ($(BR2_PACKAGE_READLINE),y) ifeq ($(BR2_PACKAGE_READLINE),y)
ATFTP_DEPENDENCIES += readline ATFTP_DEPENDENCIES += readline

View File

@@ -11,6 +11,8 @@ ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
ATK_LICENSE = LGPL-2.0+ ATK_LICENSE = LGPL-2.0+
ATK_LICENSE_FILES = COPYING ATK_LICENSE_FILES = COPYING
ATK_INSTALL_STAGING = YES ATK_INSTALL_STAGING = YES
ATK_DEPENDENCIES = libglib2 ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
$(eval $(meson-package)) $(eval $(meson-package))

View File

@@ -10,8 +10,15 @@ ATOP_LICENSE = GPL-2.0+
ATOP_LICENSE_FILES = COPYING ATOP_LICENSE_FILES = COPYING
ATOP_DEPENDENCIES = ncurses zlib ATOP_DEPENDENCIES = ncurses zlib
ATOP_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
ATOP_CFLAGS += -O0
endif
define ATOP_BUILD_CMDS define ATOP_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \
-C $(@D)
endef endef
define ATOP_INSTALL_TARGET_CMDS define ATOP_INSTALL_TARGET_CMDS

View File

@@ -11,9 +11,6 @@ AUGEAS_LICENSE = LGPL-2.1+
AUGEAS_LICENSE_FILES = COPYING AUGEAS_LICENSE_FILES = COPYING
AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
# patching examples/Makefile.am, can be removed when updating from version 1.9.0
AUGEAS_AUTORECONF = YES
AUGEAS_CONF_OPTS = --disable-gnulib-tests AUGEAS_CONF_OPTS = --disable-gnulib-tests
# Remove the test lenses which occupy about 1.4 MB on the target # Remove the test lenses which occupy about 1.4 MB on the target

View File

@@ -11,11 +11,18 @@ AUTOFS_LICENSE = GPL-2.0+
AUTOFS_LICENSE_FILES = COPYING COPYRIGHT AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
# autofs looks on the build machine for the path of modprobe, so tell # autofs looks on the build machine for the path of modprobe, mount,
# it explicitly where it will be located on the target. # umount and fsck programs so tell it explicitly where they will be
# located on the target.
AUTOFS_CONF_ENV = \ AUTOFS_CONF_ENV = \
ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \
ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \
ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \
ac_cv_path_KRB5_CONFIG=no \ ac_cv_path_KRB5_CONFIG=no \
ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_MODPROBE=/sbin/modprobe \
ac_cv_path_MOUNT=/bin/mount \
ac_cv_path_MOUNT_NFS=/usr/sbin/mount.nfs \
ac_cv_path_UMOUNT=/bin/umount \
ac_cv_linux_procfs=yes ac_cv_linux_procfs=yes
# instead of looking in the PATH like any reasonable package, autofs # instead of looking in the PATH like any reasonable package, autofs

View File

@@ -6,7 +6,7 @@
BATCTL_VERSION = 2017.0 BATCTL_VERSION = 2017.0
BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
BATCTL_LICENSE = GPL-2.0 BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h)
BATCTL_DEPENDENCIES = libnl host-pkgconf BATCTL_DEPENDENCIES = libnl host-pkgconf
define BATCTL_BUILD_CMDS define BATCTL_BUILD_CMDS

View File

@@ -6,7 +6,7 @@
BATMAN_ADV_VERSION = 2017.0.1 BATMAN_ADV_VERSION = 2017.0.1
BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
BATMAN_ADV_LICENSE = GPL-2.0 BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
# Bridge Loop Avoidance, Distributed Arp Table are always enabled # Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_CFLAGS = \ BATMAN_ADV_CFLAGS = \

View File

@@ -44,6 +44,22 @@ define BERKELEYDB_CONFIGURE_CMDS
) )
endef endef
define HOST_BERKELEYDB_CONFIGURE_CMDS
(cd $(@D)/build_unix; rm -rf config.cache; \
$(HOST_CONFIGURE_OPTS) \
../dist/configure $(QUIET) \
--prefix=$(HOST_DIR) \
--with-gnu-ld \
--disable-cxx \
--disable-java \
--disable-tcl \
--disable-compat185 \
--with-pic \
--enable-o_direct \
--disable-mutexsupport \
)
endef
ifneq ($(BR2_PACKAGE_BERKELEYDB_TOOLS),y) ifneq ($(BR2_PACKAGE_BERKELEYDB_TOOLS),y)
define BERKELEYDB_REMOVE_TOOLS define BERKELEYDB_REMOVE_TOOLS
@@ -61,3 +77,4 @@ endef
BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package))

View File

@@ -1,18 +1,23 @@
Use host compiler to build 'gen' since it's run when building. Use host compiler to build 'gen' since it's run when building.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Fabrice: updated for 9.11.10]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
--- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300 --- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300
+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200 +++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200
@@ -160,8 +160,8 @@ @@ -160,10 +160,8 @@
./gen -s ${srcdir} > code.h ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: gen.c gen: gen.c
- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ - ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} - ${LFS_CFLAGS} ${LFS_LDFLAGS} \
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
- ${BUILD_LIBS} ${LFS_LIBS}
+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \ + ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c + ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
rbtdb64.@O@: rbtdb.c timestamp: include libdns.@A@
touch timestamp

View File

@@ -1,133 +0,0 @@
From ef49780d30d3ddc5735cfc32561b678a634fa72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 17 Apr 2019 15:22:27 +0200
Subject: [PATCH] Replace atomic operations in bin/named/client.c with
isc_refcount reference counting
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
bin/named/client.c | 18 +++++++-----------
bin/named/include/named/interfacemgr.h | 5 +++--
bin/named/interfacemgr.c | 7 +++++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/bin/named/client.c b/bin/named/client.c
index 845326abc0..29fecadca8 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -402,12 +402,10 @@ tcpconn_detach(ns_client_t *client) {
static void
mark_tcp_active(ns_client_t *client, bool active) {
if (active && !client->tcpactive) {
- isc_atomic_xadd(&client->interface->ntcpactive, 1);
+ isc_refcount_increment0(&client->interface->ntcpactive, NULL);
client->tcpactive = active;
} else if (!active && client->tcpactive) {
- uint32_t old =
- isc_atomic_xadd(&client->interface->ntcpactive, -1);
- INSIST(old > 0);
+ isc_refcount_decrement(&client->interface->ntcpactive, NULL);
client->tcpactive = active;
}
}
@@ -554,7 +552,7 @@ exit_check(ns_client_t *client) {
if (client->mortal && TCP_CLIENT(client) &&
client->newstate != NS_CLIENTSTATE_FREED &&
!ns_g_clienttest &&
- isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0)
+ isc_refcount_current(&client->interface->ntcpaccepting) == 0)
{
/* Nobody else is accepting */
client->mortal = false;
@@ -3328,7 +3326,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
ns_client_t *client = event->ev_arg;
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
- uint32_t old;
REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
REQUIRE(NS_CLIENT_VALID(client));
@@ -3348,8 +3345,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
INSIST(client->naccepts == 1);
client->naccepts--;
- old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1);
- INSIST(old > 0);
+ isc_refcount_decrement(&client->interface->ntcpaccepting, NULL);
/*
* We must take ownership of the new socket before the exit
@@ -3480,8 +3476,8 @@ client_accept(ns_client_t *client) {
* quota is tcp-clients plus the number of listening
* interfaces plus 1.)
*/
- exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) >
- (client->tcpactive ? 1 : 0));
+ exit = (isc_refcount_current(&client->interface->ntcpactive) >
+ (client->tcpactive ? 1U : 0U));
if (exit) {
client->newstate = NS_CLIENTSTATE_INACTIVE;
(void)exit_check(client);
@@ -3539,7 +3535,7 @@ client_accept(ns_client_t *client) {
* listening for connections itself to prevent the interface
* going dead.
*/
- isc_atomic_xadd(&client->interface->ntcpaccepting, 1);
+ isc_refcount_increment0(&client->interface->ntcpaccepting, NULL);
}
static void
diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 3535ef22a8..6e10f210fd 100644
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -45,6 +45,7 @@
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/socket.h>
+#include <isc/refcount.h>
#include <dns/result.h>
@@ -75,11 +76,11 @@ struct ns_interface {
/*%< UDP dispatchers. */
isc_socket_t * tcpsocket; /*%< TCP socket. */
isc_dscp_t dscp; /*%< "listen-on" DSCP value */
- int32_t ntcpaccepting; /*%< Number of clients
+ isc_refcount_t ntcpaccepting; /*%< Number of clients
ready to accept new
TCP connections on this
interface */
- int32_t ntcpactive; /*%< Number of clients
+ isc_refcount_t ntcpactive; /*%< Number of clients
servicing TCP queries
(whether accepting or
connected) */
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index d9f6df5802..135533be6b 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -386,8 +386,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
* connections will be handled in parallel even though there is
* only one client initially.
*/
- ifp->ntcpaccepting = 0;
- ifp->ntcpactive = 0;
+ isc_refcount_init(&ifp->ntcpaccepting, 0);
+ isc_refcount_init(&ifp->ntcpactive, 0);
ifp->nudpdispatch = 0;
@@ -618,6 +618,9 @@ ns_interface_destroy(ns_interface_t *ifp) {
ns_interfacemgr_detach(&ifp->mgr);
+ isc_refcount_destroy(&ifp->ntcpactive);
+ isc_refcount_destroy(&ifp->ntcpaccepting);
+
ifp->magic = 0;
isc_mem_put(mctx, ifp, sizeof(*ifp));
}
--
2.11.0

View File

@@ -1,4 +1,4 @@
# Verified from https://ftp.isc.org/isc/bind9/9.11.6-P1/bind-9.11.6-P1.tar.gz.asc # Verified from https://ftp.isc.org/isc/bind9/9.11.10/bind-9.11.10.tar.gz.asc
# with key 156890685EA0DF6A1371EF2017CC5DB1F0088407 # with key 156890685EA0DF6A1371EF2017CC5DB1F0088407
sha256 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef bind-9.11.6-P1.tar.gz sha256 b2bb840cda20e6771ae8c054007b4ec12e1bb6aa6bfe79102890eb94956a70c3 bind-9.11.10.tar.gz
sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
BIND_VERSION = 9.11.6-P1 BIND_VERSION = 9.11.10
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
# bind does not support parallel builds. # bind does not support parallel builds.
BIND_MAKE = $(MAKE1) BIND_MAKE = $(MAKE1)

View File

@@ -0,0 +1,38 @@
From a837dd63f3ac5a9c206863c82b57c679cb72b8b7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 28 Apr 2019 10:21:06 +0200
Subject: [PATCH] makefile.in: move LDFLAGS after EXE_LINKS_TO
Move LDFLAGS after EXE_LINKS_TO to allow the user to give additional
libraries such as -latomic otherwise static build will fail:
cli/tls_server.o build/obj/cli/tls_utils.o build/obj/cli/utils.o build/obj/cli/x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan
/home/buildroot/autobuild/instance-1/output/host/bin/sparc-linux-g++ -Wl,-rpath=\$ORIGIN -pthread -static -latomic build/obj/test/main.o build/obj/test/test_aead.o build/obj/test/test_asn1.o build/obj/test/test_bigint.o build/obj/test/test_block.o build/obj/test/test_blowfish.o build/obj/test/test_c25519.o build/obj/test/test_certstor.o build/obj/test/test_compression.o build/obj/test/test_cryptobox.o build/obj/test/test_datastore.o build/obj/test/test_dh.o build/obj/test/test_dl_group.o build/obj/test/test_dlies.o build/obj/test/test_dsa.o build/obj/test/test_ecc_pointmul.o build/obj/test/test_ecdh.o build/obj/test/test_ecdsa.o build/obj/test/test_ecgdsa.o build/obj/test/test_ecies.o build/obj/test/test_eckcdsa.o build/obj/test/test_ed25519.o build/obj/test/test_elg.o build/obj/test/test_entropy.o build/obj/test/test_ffi.o build/obj/test/test_filters.o build/obj/test/test_fpe.o build/obj/test/test_gf2m.o build/obj/test/test_gost_3410.o build/obj/test/test_hash.o build/obj/test/test_hash_id.o build/obj/test/test_kdf.o build/obj/test/test_keywrap.o build/obj/test/test_mac.o build/obj/test/test_mceliece.o build/obj/test/test_modes.o build/obj/test/test_mp.o build/obj/test/test_name_constraint.o build/obj/test/test_newhope.o build/obj/test/test_ocb.o build/obj/test/test_ocsp.o build/obj/test/test_octetstring.o build/obj/test/test_oid.o build/obj/test/test_os_utils.o build/obj/test/test_otp.o build/obj/test/test_package_transform.o build/obj/test/test_pad.o build/obj/test/test_passhash.o build/obj/test/test_pbkdf.o build/obj/test/test_pem.o build/obj/test/test_pk_pad.o build/obj/test/test_pkcs11.o build/obj/test/test_pkcs11_high_level.o build/obj/test/test_pkcs11_low_level.o build/obj/test/test_psk_db.o build/obj/test/test_pubkey.o build/obj/test/test_rfc6979.o build/obj/test/test_rng.o build/obj/test/test_rng_kat.o build/obj/test/test_rsa.o build/obj/test/test_runner.o build/obj/test/test_simd.o build/obj/test/test_siv.o build/obj/test/test_sm2.o build/obj/test/test_srp6.o build/obj/test/test_stream.o build/obj/test/test_tests.o build/obj/test/test_tls.o build/obj/test/test_tls_messages.o build/obj/test/test_tpm.o build/obj/test/test_tss.o build/obj/test/test_utils.o build/obj/test/test_workfactor.o build/obj/test/test_x509_dn.o build/obj/test/test_x509_path.o build/obj/test/test_xmss.o build/obj/test/tests.o build/obj/test/unit_ecc.o build/obj/test/unit_ecdh.o build/obj/test/unit_ecdsa.o build/obj/test/unit_tls.o build/obj/test/unit_tls_policy.o build/obj/test/unit_x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan-test
./libbotan-2.a(utils_filesystem.o): In function `Botan::get_files_recursive(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
filesystem.cpp:(.text+0x758): undefined reference to `__atomic_fetch_sub_4'
Fixes:
- http://autobuild.buildroot.org/results/9db39b209a0f4be1e09b7e4ddb5e9a63da4fbbfa
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/randombit/botan/pull/1916]
---
src/build-data/makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
index 08c9c5421..7111c7b19 100644
--- a/src/build-data/makefile.in
+++ b/src/build-data/makefile.in
@@ -71,7 +71,7 @@ $(CLI): $(LIBRARIES) $(CLIOBJS)
$(POST_LINK_CMD)
$(TEST): $(LIBRARIES) $(TESTOBJS)
- $(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@
+ $(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(EXE_LINKS_TO) $(LDFLAGS) %{output_to_exe}$@
$(POST_LINK_CMD)
%{if build_fuzzers}
--
2.20.1

View File

@@ -14,4 +14,12 @@ BROTLI_CONF_OPTS = \
-DBROTLI_DISABLE_TESTS=ON \ -DBROTLI_DISABLE_TESTS=ON \
-DBROTLI_BUNDLED_MODE=OFF -DBROTLI_BUNDLED_MODE=OFF
BROTLI_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
BROTLI_CFLAGS += -O0
endif
BROTLI_CONF_OPTS += -DCMAKE_C_FLAGS="$(BROTLI_CFLAGS)"
$(eval $(cmake-package)) $(eval $(cmake-package))

View File

@@ -967,9 +967,9 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
# CONFIG_FEATURE_UDHCP_PORT is not set # CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
# CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_FEATURE_UDHCP_8021Q=y
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search"
# #
# Print Utilities # Print Utilities

View File

@@ -32,6 +32,7 @@ BUSYBOX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \ $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \ $(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \ $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
$(if $(BR2_PACKAGE_DOSFSTOOLS),dosfstools) \
$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \ $(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
$(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_FBSET),fbset) \
$(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GAWK),gawk) \

View File

@@ -56,7 +56,7 @@ case "$1" in
cat $TMPFILE > $RESOLV_CONF cat $TMPFILE > $RESOLV_CONF
rm -f $TMPFILE rm -f $TMPFILE
# prefer rfc3359 domain search list (option 119) if available # prefer rfc3397 domain search list (option 119) if available
if [ -n "$search" ]; then if [ -n "$search" ]; then
search_list=$search search_list=$search
elif [ -n "$domain" ]; then elif [ -n "$domain" ]; then

View File

@@ -7,7 +7,7 @@
BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef
BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION)) BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION))
BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
BWM_NG_LICENSE = GPL-2.0 BWM_NG_LICENSE = GPL-2.0+
BWM_NG_LICENSE_FILES = COPYING BWM_NG_LICENSE_FILES = COPYING
BWM_NG_AUTORECONF = YES BWM_NG_AUTORECONF = YES

View File

@@ -70,15 +70,15 @@ Index: b/Makefile-libbz2_so
huffman.o \ huffman.o \
@@ -37,8 +36,11 @@ @@ -37,8 +36,11 @@
all: $(OBJS) all: $(OBJS)
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
- rm -f libbz2.so.1.0 - rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.6 libbz2.so.1.0 - ln -s libbz2.so.1.0.8 libbz2.so.1.0
+ +
+install: +install:
+ install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6 + install -m 0755 -D libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0.8
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so + ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 + ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0
clean: clean:
rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared

View File

@@ -5,3 +5,5 @@ config BR2_PACKAGE_BZIP2
It typically compresses files to within 10% to 15% of the best It typically compresses files to within 10% to 15% of the best
available techniques, while being around twice as fast at available techniques, while being around twice as fast at
compression and six times faster at decompression. compression and six times faster at decompression.
https://sourceware.org/bzip2/

View File

@@ -1,2 +1,4 @@
# From http://www.bzip.org/downloads.html # From https://sourceware.org/pub/bzip2/sha512.sum
md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz sha512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
# Locally calculated
sha256 c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3 LICENSE

View File

@@ -4,8 +4,8 @@
# #
################################################################################ ################################################################################
BZIP2_VERSION = 1.0.6 BZIP2_VERSION = 1.0.8
BZIP2_SITE = http://sources.buildroot.net BZIP2_SITE = https://sourceware.org/pub/bzip2
BZIP2_INSTALL_STAGING = YES BZIP2_INSTALL_STAGING = YES
BZIP2_LICENSE = bzip2 license BZIP2_LICENSE = bzip2 license
BZIP2_LICENSE_FILES = LICENSE BZIP2_LICENSE_FILES = LICENSE

View File

@@ -1,3 +1,6 @@
# hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
sha1 edf0ec04b02fcbc90cc65906ff83fb042894a3b7 ca-certificates_20180409.tar.xz sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz
sha256 7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 ca-certificates_20180409.tar.xz sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
# Locally computed
sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright

View File

@@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
CA_CERTIFICATES_VERSION = 20180409 CA_CERTIFICATES_VERSION = 20190110
CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20180411T111033Z/pool/main/c/ca-certificates CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
CA_CERTIFICATES_DEPENDENCIES = host-openssl CA_CERTIFICATES_DEPENDENCIES = host-openssl
# ca-certificates can be built with either python 2 or python 3 # ca-certificates can be built with either python 2 or python 3
# but it must be at least python 2.7 # but it must be at least python 2.7

View File

@@ -10,7 +10,7 @@ config BR2_PACKAGE_CAPNPROTO
Cap'n Proto is an insanely fast data interchange format Cap'n Proto is an insanely fast data interchange format
and capability-based RPC system. Think JSON, except and capability-based RPC system. Think JSON, except
binary. Or think Protocol Buffers, except faster. In binary. Or think Protocol Buffers, except faster. In
fact, in benchmarks, Capn Proto is INFINITY TIMES fact, in benchmarks, Cap'n Proto is INFINITY TIMES
faster than Protocol Buffers. faster than Protocol Buffers.
https://capnproto.org/index.html https://capnproto.org/index.html

View File

@@ -21,6 +21,14 @@ CHOCOLATE_DOOM_CONF_OPTS = \
--with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr --with-sdl-exec-prefix=$(STAGING_DIR)/usr
CHOCOLATE_DOOM_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
CHOCOLATE_DOOM_CFLAGS += -O0
endif
CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)"
ifeq ($(BR2_PACKAGE_LIBPNG),y) ifeq ($(BR2_PACKAGE_LIBPNG),y)
CHOCOLATE_DOOM_DEPENDENCIES += libpng CHOCOLATE_DOOM_DEPENDENCIES += libpng
CHOCOLATE_DOOM_CONF_OPTS += --with-libpng CHOCOLATE_DOOM_CONF_OPTS += --with-libpng

View File

@@ -1,3 +1,3 @@
# Locally computed: # Locally computed:
sha256 17ace0e31ebd639906983b05fe1d51576b948ca5411c2162f55dd34c122162ca cjson-v1.7.11.tar.gz sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7 cjson-v1.7.12.tar.gz
sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
CJSON_VERSION = v1.7.11 CJSON_VERSION = v1.7.12
CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT CJSON_LICENSE = MIT

View File

@@ -1,5 +1,5 @@
# Locally calculated # Locally calculated
sha256 0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 clamav-0.101.2.tar.gz sha256 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd clamav-0.101.4.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
CLAMAV_VERSION = 0.101.2 CLAMAV_VERSION = 0.101.4
CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \

View File

@@ -13,7 +13,8 @@ CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
HOST_CLOOP_DEPENDENCIES = host-zlib HOST_CLOOP_DEPENDENCIES = host-zlib
define HOST_CLOOP_BUILD_CMDS define HOST_CLOOP_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes \
CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE"
endef endef
define HOST_CLOOP_INSTALL_CMDS define HOST_CLOOP_INSTALL_CMDS

View File

@@ -389,7 +389,7 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
Connects to and executes SQL statements on a PostgreSQL Connects to and executes SQL statements on a PostgreSQL
database. It then reads back the results and, depending on the database. It then reads back the results and, depending on the
configuration, the returned values are then converted into configuration, the returned values are then converted into
collectd value lists. collectd 'value lists'.
comment "postgresql support needs a toolchain w/ wchar" comment "postgresql support needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR depends on !BR2_USE_WCHAR

View File

@@ -1,5 +1,5 @@
# From https://collectd.org/files/SHA256SUM # From https://collectd.org/files/SHA256SUM
sha256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 collectd-5.7.1.tar.bz2 sha256 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 collectd-5.7.2.tar.bz2
# Hash for license files # Hash for license files
sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING

View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
COLLECTD_VERSION = 5.7.1 COLLECTD_VERSION = 5.7.2
COLLECTD_SITE = http://collectd.org/files COLLECTD_SITE = http://collectd.org/files
COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
# These require unmet dependencies, are fringe, pointless or deprecated # These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \ COLLECTD_PLUGINS_DISABLE = \
amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \
gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \ gmond grpc hddtemp intel_rdt ipmi java lpar lua lvm \
madwifi mbmon mic multimeter netapp notify_desktop numa \ madwifi mbmon mic multimeter netapp notify_desktop numa \
nut onewire oracle perl pf pinba powerdns python redis routeros \ nut onewire oracle perl pf pinba powerdns python redis routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \

View File

@@ -1,2 +1,3 @@
# Locally calculated # Locally calculated
sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2 sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

View File

@@ -8,8 +8,10 @@ CONNMAN_GTK_VERSION = 1.1.1
CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONNMAN_GTK_VERSION) CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONNMAN_GTK_VERSION)
CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2 CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2
CONNMAN_GTK_INSTALL_STAGING = YES CONNMAN_GTK_INSTALL_STAGING = YES
CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3 CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3 \
$(TARGET_NLS_DEPENDENCIES)
CONNMAN_GTK_LICENSE = GPL-2.0+ CONNMAN_GTK_LICENSE = GPL-2.0+
CONNMAN_GTK_LICENSE_FILES = COPYING CONNMAN_GTK_LICENSE_FILES = COPYING
CONNMAN_GTK_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@@ -55,7 +55,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
MAKEINFO=true \ MAKEINFO=true \
INSTALL_PROGRAM=$(INSTALL) INSTALL_PROGRAM=$(INSTALL)
COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \ COREUTILS_BIN_PROGS = base64 cat chgrp chmod chown cp date dd df dir echo false \
kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \ kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
vdir sleep stty sync touch true uname join vdir sleep stty sync touch true uname join

View File

@@ -9,7 +9,8 @@ CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-
CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE = LGPL-2.1
CRACKLIB_LICENSE_FILES = COPYING.LIB CRACKLIB_LICENSE_FILES = COPYING.LIB
CRACKLIB_INSTALL_STAGING = YES CRACKLIB_INSTALL_STAGING = YES
CRACKLIB_DEPENDENCIES = host-cracklib CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES)
CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_ZLIB),y) ifeq ($(BR2_PACKAGE_ZLIB),y)
CRACKLIB_CONF_OPTS += --with-zlib CRACKLIB_CONF_OPTS += --with-zlib

View File

@@ -15,16 +15,23 @@ define HOST_CRYPTOPP_EXTRACT_CMDS
$(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) $(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D)
endef endef
HOST_CRYPTOPP_CXXFLAGS = $(HOST_CFLAGS) -fPIC
# _mm256_broadcastsi128_si256 has been added only in gcc 4.9
ifneq ($(BR2_HOST_GCC_AT_LEAST_4_9),y)
HOST_CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2
endif
HOST_CRYPTOPP_MAKE_OPTS = \ HOST_CRYPTOPP_MAKE_OPTS = \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
CXXFLAGS="$(HOST_CXXFLAGS) -fPIC" CXXFLAGS="$(HOST_CRYPTOPP_CXXFLAGS)"
define HOST_CRYPTOPP_BUILD_CMDS define HOST_CRYPTOPP_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared
endef endef
define HOST_CRYPTOPP_INSTALL_CMDS define HOST_CRYPTOPP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib
endef endef
$(eval $(host-generic-package)) $(eval $(host-generic-package))

View File

@@ -1,46 +0,0 @@
From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Thu, 8 Mar 2018 12:32:23 +0200
Subject: [PATCH] install: don't use ln -r
Oldish enterprise-class distributions have too old versions of
coreutils, with ln not supporting -r.
So we fake it.
ln -r would create minimalist relative paths, but they are not
trivial to generate. Instead, we always create paths relative to the
root, i.e.:
ln -s -r /usr/bin/foo /usr/sbin/foo
would create: /usr/sbin/foo -> ../bin/foo
while we do : /usr/sbin/foo -> ../../usr/bin/foo
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d959227..b49914a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -998,11 +998,11 @@ install-exec-hook:
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
if ENABLE_FOOMATIC
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ $(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
endif
if ENABLE_DRIVERLESS
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
endif
if ENABLE_BRAILLE
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
--
2.14.1

View File

@@ -0,0 +1,214 @@
From edd44df686b4ec983a327cabc5035106addb274f Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Mon, 16 Sep 2019 22:22:37 -0300
Subject: [PATCH] install: support old ln versions without the -r option
Oldish enterprise-class Linux distributions have outdated versions of
coreutils whose ln command do not support the -r option. Also non-Linux
systems like FreeBSD don't support that option. Use a shell script that
mimics the missing functionality.
The script creates minimalist relative paths, like ln -r does, but in
order to simplify the logic, it requires that the arguments be absolute
paths and do not end with '/'. This is enough for our purposes.
Add configuration logic to detect if ln supports the -r option, based on
the logic used by Autoconf to check if ln supports the -s option.
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile.am | 6 ++--
configure.ac | 2 ++
ln-srf | 49 ++++++++++++++++++++++++++
m4/ac_ln_srf.m4 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 145 insertions(+), 3 deletions(-)
create mode 100755 ln-srf
create mode 100644 m4/ac_ln_srf.m4
diff --git a/Makefile.am b/Makefile.am
index 76b81de5..beb2882e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -988,11 +988,11 @@ install-exec-hook:
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
if ENABLE_FOOMATIC
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ $(LN_SRF) $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
endif
if ENABLE_DRIVERLESS
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
endif
if ENABLE_BRAILLE
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
diff --git a/configure.ac b/configure.ac
index d5a539b6..fbcf829a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,8 @@ AM_ICONV
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
+AS_LN_SRF_PREPARE
+AC_PROG_LN_SRF
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.20])
diff --git a/ln-srf b/ln-srf
new file mode 100755
index 00000000..f395a760
--- /dev/null
+++ b/ln-srf
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Author: Carlos Santos <unixmania@gmail.com>
+# This file is in public domain.
+#
+
+error() {
+ echo "$@" 1>&2
+ exit 1
+}
+
+src="$1"
+dst="$2"
+
+check_path() {
+ case "$2" in
+ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";;
+ */) error "$1 path '$2' must not end with '/'";;
+ /?*) ;;
+ *) error "$1 path '$2' must start with '/'";;
+ esac
+}
+
+check_path "source" "$src"
+check_path "destination" "$dst"
+
+# strip leading '/'
+src=${src#/*}
+tmp=${dst#/*}
+
+s_prefix=${src%%/*}
+d_prefix=${tmp%%/*}
+
+# strip leading common
+while [ "$s_prefix" = "$d_prefix" ]; do
+ src="${src#$s_prefix/}"
+ tmp="${tmp#$d_prefix/}"
+ s_prefix=${src%%/*}
+ d_prefix=${tmp%%/*}
+done
+
+s_prefix="../"
+while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do
+ s_prefix="../$s_prefix"
+ tmp="${tmp#$d_prefix/}"
+ d_prefix=${tmp%%/*}
+done
+
+ln -s -f "$s_prefix$src" "$dst"
diff --git a/m4/ac_ln_srf.m4 b/m4/ac_ln_srf.m4
new file mode 100644
index 00000000..204b3439
--- /dev/null
+++ b/m4/ac_ln_srf.m4
@@ -0,0 +1,91 @@
+# Adapted from Autoconf Version 2.63 (GPLv2).
+#
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception, the Free Software Foundation gives unlimited
+# permission to copy, distribute and modify the configure scripts that
+# are the output of Autoconf. You need not follow the terms of the GNU
+# General Public License when using or distributing such scripts, even
+# though portions of the text of Autoconf appear in them. The GNU
+# General Public License (GPL) does govern all other use of the material
+# that constitutes the Autoconf program.
+#
+# Certain portions of the Autoconf source text are designed to be copied
+# (in certain cases, depending on the input) into the output of
+# Autoconf. We call these the "data" portions. The rest of the Autoconf
+# source text consists of comments plus executable code that decides which
+# of the data portions to output in any given case. We call these
+# comments and executable code the "non-data" portions. Autoconf never
+# copies any of the non-data portions into its output.
+#
+# This special exception to the GPL applies to versions of Autoconf
+# released by the Free Software Foundation. When you make and
+# distribute a modified version of Autoconf, you may extend this special
+# exception to the GPL to apply to your modified version as well, *unless*
+# your modified version has the potential to copy into its output some
+# of the text that was the non-data portion of the version that you started
+# with. (In other words, unless your change moves or copies text from
+# the non-data portions to the data portions.) If your modification has
+# such potential, you must delete any notice of this special exception
+# to the GPL from your modified version.
+
+# AS_LN_SRF_PREPARE
+# ------------------------------------
+m4_defun([AS_LN_SRF_PREPARE],
+[rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s -r conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf='ln -s -r -f'
+ elif ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf='./ln-srf'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pRf'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_srf='cp -pRf'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf=ln
+ else
+ as_ln_srf='cp -pRf'
+ fi
+else
+ as_ln_srf='cp -pRf'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+])# AS_LN_SRF_PREPARE
+
+# AC_PROG_LN_SRF
+# --------------------------------
+AC_DEFUN([AC_PROG_LN_SRF],
+[AC_MSG_CHECKING([whether ln -s -r -f works])
+AC_SUBST([LN_SRF], [$as_ln_srf])dnl
+if test "$LN_SRF" = "ln -s -r -f"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no, using $LN_SRF])
+fi
+])# AC_PROG_LN_SRF
--
2.18.1

View File

@@ -0,0 +1,122 @@
From 734ef160b428c545d8c6ae16c4bfe3c036173aa4 Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Sun, 21 Jul 2019 23:54:29 -0300
Subject: [PATCH] filter/texttotext.c: link with libiconv if needed
texttotext.c uses iconv so it should link with libiconv on platforms
where it is a separate library (e.g. uClibc-ng without built-in NLS)
otherwise texttotext fails to link:
CCLD texttotext
[...]/ld: texttotext-texttotext.o: in function `main':
texttotext.c:(.text.startup+0xde0): undefined reference to `libiconv_open'
[...]/ld: texttotext.c:(.text.startup+0xf9d): undefined reference to `libiconv'
[...]/ld: texttotext.c:(.text.startup+0xfd6): undefined reference to `libiconv'
[...]/ld: texttotext.c:(.text.startup+0x16c3): undefined reference to `libiconv_close'
Modify autogen.sh to call autopoint, which adds the libiconv discovery.
It also creates a "po" skeleton but we can discard it, since it is not
really necessary.
Fixes: https://bugs.busybox.net/show_bug.cgi?id=12031
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile.am | 4 +++-
autogen.sh | 17 +++++++++++++++++
configure.ac | 6 +++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 72e023ed..76b81de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -778,7 +778,7 @@ texttotext_SOURCES = \
filter/texttotext.c
EXTRA_texttotext_SOURCES = filter/strcasestr.c
texttotext_CFLAGS = $(CUPS_CFLAGS)
-texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS)
+texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) $(LIBICONV)
texttotext_DEPENDENCIES = $(STRCASESTR)
pdftops_SOURCES = \
@@ -1049,3 +1049,5 @@ if ENABLE_BRAILLE
$(RM) $(DESTDIR)$(pkgfilterdir)/vectortoubrl
$(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
endif
+
+SUBDIRS =
diff --git a/autogen.sh b/autogen.sh
index 5462a323..cd7397a9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,11 +13,22 @@ aclocal --version > /dev/null 2> /dev/null || {
echo "error: aclocal not found"
exit 1
}
+
automake --version > /dev/null 2> /dev/null || {
echo "error: automake not found"
exit 1
}
+autopoint --version > /dev/null 2> /dev/null || {
+ echo "error: autopoint not found"
+ exit 1
+}
+
+gettext --version > /dev/null 2> /dev/null || {
+ echo "error: gettext not found"
+ exit 1
+}
+
for i in $TESTLIBTOOLIZE; do
if which $i > /dev/null 2>&1; then
LIBTOOLIZE=$i
@@ -39,6 +50,12 @@ fi
rm -rf autom4te*.cache
+autopoint --force || {
+ echo "error: autopoint failed"
+ exit 1
+}
+# autopoint is for libiconv discovery; we don't want the po directory
+rm -rf po
$LIBTOOLIZE --force --copy || {
echo "error: libtoolize failed"
exit 1
diff --git a/configure.ac b/configure.ac
index 607dc17a..d5a539b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/ac_define_dir.m4])
m4_include([m4/ax_compare_version.m4])
m4_include([m4/basic-directories.m4])
-AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects])
AM_SILENT_RULES([yes])
AC_LANG([C++])
AC_CONFIG_HEADERS([config.h])
@@ -54,6 +54,7 @@ AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
AM_PROG_CC_C_O
+AM_ICONV
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -61,6 +62,9 @@ AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.20])
+AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_GNU_GETTEXT([external])
+
# ========================================
# Specify the fontdir patch if not default
# ========================================
--
2.18.1

View File

@@ -8,7 +8,7 @@ CUPS_FILTERS_VERSION = 1.21.3
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
CUPS_FILTERS_LICENSE_FILES = COPYING CUPS_FILTERS_LICENSE_FILES = COPYING
# 0001-Replace-relative-linking-with-absolute-linking.patch # 0001-install-support-old-ln-versions-without-the-r-option.patch
CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_AUTORECONF = YES
CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
@@ -16,11 +16,20 @@ CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
--disable-mutool \ --disable-mutool \
--disable-foomatic \ --disable-foomatic \
--disable-braille \
--with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
--with-sysroot=$(STAGING_DIR) \ --with-sysroot=$(STAGING_DIR) \
--with-pdftops=pdftops \ --with-pdftops=pdftops \
--with-jpeg --with-jpeg
# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf
# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them.
define CUPS_FILTERS_ADD_MISSING_FILE
touch $(@D)/config.rpath $(@D)/ABOUT-NLS
endef
CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE
ifeq ($(BR2_PACKAGE_LIBPNG),y) ifeq ($(BR2_PACKAGE_LIBPNG),y)
CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_CONF_OPTS += --with-png
CUPS_FILTERS_DEPENDENCIES += libpng CUPS_FILTERS_DEPENDENCIES += libpng

Some files were not shown because too many files have changed in this diff Show More