Buildroot 2019.02.8 (#533)

* Update Buildroot 2019.02.8

* Update patches
This commit is contained in:
Pascal Vizeli 2020-01-11 11:24:41 +01:00 committed by GitHub
parent a874bb5fb5
commit 63967cf6c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
629 changed files with 8416 additions and 3889 deletions

View File

@ -1,7 +1,7 @@
diff --git a/buildroot/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 6b182dc6..8e3be238 100644
--- a/buildroot/package/linux-firmware/Config.in
+++ b/buildroot/package/linux-firmware/Config.in
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -44,6 +44,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO
help
Firmware files for Qualcomm Adreno GPU firmware
@ -15,10 +15,10 @@ index 6b182dc6..8e3be238 100644
endmenu # Video
menu "Bluetooth firmware"
diff --git a/buildroot/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 86e1d1e7..6453c402 100644
--- a/buildroot/package/linux-firmware/linux-firmware.mk
+++ b/buildroot/package/linux-firmware/linux-firmware.mk
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a*
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt
endif

View File

@ -1,32 +0,0 @@
From f80ba7397087960c033bc8ba43959e399aefb250 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 26 Jun 2019 13:38:47 +0000
Subject: [PATCH 1/1] openvmtools: start only inside a vmware env
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/openvmtools/vmtoolsd.service | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/openvmtools/vmtoolsd.service b/package/openvmtools/vmtoolsd.service
index 17a4df44c2..1d2a3566cf 100644
--- a/package/openvmtools/vmtoolsd.service
+++ b/package/openvmtools/vmtoolsd.service
@@ -1,11 +1,12 @@
[Unit]
Description=vmtoolsd for openvmtools
After=syslog.target network.target
+ConditionVirtualization=vmware
[Service]
Type=forking
-PIDFile=/var/run/vmtoolsd.pid
-ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
+PIDFile=/run/vmtoolsd.pid
+ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid
Restart=on-failure
KillMode=process
KillSignal=SIGKILL
--
2.17.1

View File

@ -1,3 +1,182 @@
2019.02.8, released December 7th, 2019
Important / security related fixes.
Infrastructure: Make HOST_<pkg>_DL_OPTS inherit from
<pkg>_DL_OPTS by default, just like it is done for a number of
other package variables
Add <pkg>_KEEP_PY_FILES to exclude specific python .py files
from the removal done by BR2_PACKAGE_PYTHON{,3}_PYC_ONLY for
the (rare) case where the .py files are needed at runtime
rather than .pyc.
Fix <pkg>-reconfigure handling for packages using the kconfig
infrastructure.
Toolchain: ensure external toolchain kernel headers version
check correctly stop the build on mismatch
Deconfigs: beaglebone: fix boot issue
Updated/fixed packages: am33x-cm3, asterisk, bind, chrony,
clamav, collectd, connman, faifa, gob2, haproxy,
intel-microcode, ipsec-tools, jasper, jpeg-turbo, kodi,
kvm-unit-tests, libftdi, libftdi1, libnss, libstrophe,
libsvgtiny, lvm2, lzma, mariadb, minicom, neardal, nodejs,
opencv3, openvmtools, oracle-mysql, perl-gdgraph,
perl-gdtextutil, php, postgresql, prosody, python-django,
rabbitmq-c, rauc, redis, rpcbind, socat, spice,
spice-protocol, tftpd, tiff, webkitgtk
New packages: libmspack
Issues resolved (http://bugs.uclibc.org):
#12166: Compiling nodejs for SAMA5D3 always crash with illegal inst..
#12171: Python-opencv needs config.py and config-3.7.py to run..
#12211: host-nodejs 10.15.3 package fail to build
#12316: tzdata fails to install with empty "default local time"
2019.02.7, Released November 10th, 2019
Important / security related fixes.
support/testing: use a kernel with HW_RANDOM_VIRTIO to work
around issues with lack of entrophy
Toolchain: Also copy libssp.so for external toolchains if SSP
is enabled to handle toolchains providing SSP support in
libssp rather than in the C library
Download: Also use the package download method for extra
downloads from the same site, so it does not get confused by
URLs containing '+'
Fakeroot now works correctly under Microsoft Windows 10
Services for Linux, which does not provide SYSV IPC support
utils/test-pkg: ensure to exit with an error upon failure
Updated/fixed packages: asterisk, azmq, cups-filters,
domoticz, duma, elf2flt, eudev, exfat, exfat-utils, fakeroot,
file, freerdp, gd, ghostscript, go, gvfs, intel-microcode,
kvm-unit-tests, libarchive, libnspr, libnss, libopenssl,
libpcap, libpciaccess, librsvg, libseccomp, libsigrok,
libtorrent, libunwind, linux-tools, lua-sdl2, lxc, minizip,
mjpegtools, mongoose, php, python, python-pysnmp-apps,
python3, qemu, qt5base, ruby, safeclib, samba4, sdl_mixer,
sox, sudo, systemd, tcpdump, unscd, util-lkinux, vtun, xvisor,
yaffs2utils
Issues resolved (http://bugs.uclibc.org):
#11366: [2018.08] SysV IPC not available for fakeroot on WSL
#12261: sudo versions prior to 1.8.28 are affected
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.
@ -26,6 +205,8 @@
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

View File

@ -26,9 +26,6 @@
# infrastructure, and will be CC'ed on all patches that add or
# 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>
F: package/audit/
F: package/busybox/
@ -127,7 +124,6 @@ N: Anders Darander <anders@chargestorm.se>
F: package/ktap/
N: André Hentschel <nerv@dawncrow.de>
F: package/azure-iot-sdk-c/
F: package/libkrb5/
F: package/openal/
F: package/p7zip/
@ -148,9 +144,6 @@ F: package/zstd/
N: Andrey Yurovsky <yurovsky@gmail.com>
F: package/rauc/
N: Andy Kennedy <andy.kennedy@adtran.com>
F: package/libunwind/
N: Angelo Compagnucci <angelo.compagnucci@gmail.com>
F: package/corkscrew/
F: package/fail2ban/
@ -209,11 +202,12 @@ F: package/sqlcipher/
F: package/stress/
N: Asaf Kahlon <asafka7@gmail.com>
F: package/collectd/
F: package/libuv/
F: package/python*
F: package/zeromq/
N: Ash Charles <ash.charles@savoirfairelinux.com>
N: Ash Charles <ashcharles@gmail.com>
F: package/pru-software-support/
F: package/ti-cgt-pru/
@ -267,7 +261,6 @@ F: package/alsa-utils/
F: package/apache/
F: package/apr/
F: package/apr-util/
F: package/asterisk/
F: package/bcg729/
F: package/bluez-tools/
F: package/boinc/
@ -316,6 +309,7 @@ F: package/libilbc/
F: package/libldns/
F: package/libmicrohttpd/
F: package/libminiupnpc/
F: package/libmspack/
F: package/libnatpmp/
F: package/libnpth/
F: package/libogg/
@ -563,9 +557,6 @@ F: package/log4cpp/
N: Daniel Nicoletti <dantti12@gmail.com>
F: package/cutelyst/
N: Daniel Nyström <daniel.nystrom@timeterminal.se>
F: package/e2tools/
N: Daniel Price <daniel.price@gmail.com>
F: package/nodejs/
F: package/redis/
@ -633,9 +624,6 @@ F: package/unscd/
N: Dushara Jayasinghe <nidujay@gmail.com>
F: package/prosody/
N: Ed Swierk <eswierk@skyportsystems.com>
F: package/xxhash/
N: Eric Le Bihan <eric.le.bihan.dev@free.fr>
F: docs/manual/adding-packages-meson.txt
F: package/adwaita-icon-theme/
@ -819,7 +807,9 @@ F: package/ser2net/
N: Francois Perrad <francois.perrad@gadz.org>
F: board/olimex/a20_olinuxino
F: board/olimex/imx233_olinuxino/
F: configs/olimex_a20_olinuxino_*
F: configs/olimex_imx233_olinuxino_defconfig
F: package/4th/
F: package/chipmunk/
F: package/dado/
@ -892,7 +882,7 @@ F: package/tesseract-ocr/
F: package/webp/
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-driver/
@ -1131,10 +1121,6 @@ F: package/phidgetwebservice/
F: package/rapidxml/
F: package/sphinxbase/
N: Jonathan Liu <net147@gmail.com>
F: package/python-meld3/
F: package/supervisor/
N: Jörg Krause <joerg.krause@embedded.rocks>
F: board/lemaker/bananapro/
F: configs/bananapro_defconfig
@ -1201,9 +1187,6 @@ F: package/python-pygame/
N: Julien Corjon <corjon.j@ecagroup.com>
F: package/qt5/
N: Julien Floret <julien.floret@6wind.com>
F: package/lldpd/
N: Julien Grossholtz <julien.grossholtz@openest.io>
F: package/paho-mqtt-c
@ -1223,9 +1206,6 @@ F: package/cpuload/
F: package/bwm-ng/
F: package/ramsmp/
N: Kevin Joly <kevin.joly@sensefly.com>
F: package/libgphoto2/
N: Koen Martens <gmc@sonologic.nl>
F: package/capnproto/
F: package/linuxconsoletools/
@ -1329,9 +1309,6 @@ F: package/luaossl/
F: package/rs485conf/
F: package/turbolua/
N: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
F: package/libkcapi/
N: Marcus Folkesson <marcus.folkesson@gmail.com>
F: package/libostree/
F: package/libselinux/
@ -1354,7 +1331,7 @@ F: package/lynx/
N: Mario Rugiero <mrugiero@gmail.com>
F: package/ratpoison/
N: Mark Corbin <mark.corbin@embecosm.com>
N: Mark Corbin <mark@dibsco.co.uk>
F: arch/arch.mk.riscv
F: arch/Config.in.riscv
F: board/qemu/riscv32-virt/
@ -1363,10 +1340,6 @@ F: boot/riscv-pk/
F: configs/qemu_riscv32_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>
F: board/raspberrypi/
F: configs/raspberrypi3_defconfig
@ -1387,7 +1360,7 @@ F: package/tslib/
F: package/x11r7/xdriver_xf86-input-tslib/
F: package/x11vnc/
N: Mathieu Audat <mathieu.audat@savoirfairelinux.com>
N: Mathieu Audat <mathieuaudat@gmail.com>
F: board/technologic/ts4900/
F: configs/ts4900_defconfig
F: package/ts4900-fpga/
@ -1547,6 +1520,9 @@ F: package/python-pyzmq/
N: Michael Trimarchi <michael@amarulasolutions.com>
F: package/python-spidev/
N: Michael Vetter <jubalh@iodoru.org>
F: package/jasper/
N: Michał Łyszczek <michal.lyszczek@bofc.pl>
F: board/altera/socrates_cyclone5/
F: board/pine64/rock64
@ -1566,9 +1542,6 @@ F: package/shadowsocks-libev/
N: Mirza Krak <mirza.krak@northern.tech>
F: package/mender/
N: Morgan Delestre <m.delestre@sinters.fr>
F: package/monkey/
N: Murat Demirten <mdemirten@yh.com.tr>
F: package/jpeg-turbo/
F: package/libgeotiff/
@ -1698,6 +1671,8 @@ F: package/python-webob/
F: package/python-websocket-client/
F: package/sedutil/
F: package/triggerhappy/
F: package/wireguard/
F: support/testing/tests/package/test_docker_compose.py
N: Peter Seiderer <ps.report@gmx.net>
F: board/raspberrypi/
@ -1781,9 +1756,6 @@ F: package/libdvbpsi/
F: package/mraa/
F: package/synergy/
N: Pranit Sirsat <Pranit.Sirsat@imgtec.com>
F: package/paho-mqtt-c/
N: Qais Yousef <Qais.Yousef@imgtec.com>
F: package/bellagio/
@ -1814,7 +1786,13 @@ N: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
F: package/atop/
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: utils/check-package
F: utils/checkpackagelib/
@ -1840,6 +1818,8 @@ F: package/vnstat/
N: Romain Naour <romain.naour@gmail.com>
F: package/aubio/
F: package/bullet/
F: package/clang/
F: package/clinfo/
F: package/efl/
F: package/enlightenment/
F: package/flare-engine/
@ -1847,9 +1827,11 @@ F: package/flare-game/
F: package/irrlicht/
F: package/liblinear/
F: package/lensfun/
F: package/libclc/
F: package/libgta/
F: package/libspatialindex/
F: package/linux-syscall-support/
F: package/llvm/
F: package/lugaru/
F: package/mcelog/
F: package/mesa3d/
@ -2036,9 +2018,6 @@ F: package/tovid/
F: package/udftools/
F: package/xorriso/
N: Steve Thomas <scjthm@live.com>
F: package/isl/
N: Steven Noonan <steven@uplinklabs.net>
F: package/hwloc/
F: package/powertop/
@ -2176,7 +2155,7 @@ F: package/pixz/
N: Vinicius Tinti <viniciustinti@gmail.com>
F: package/python-thrift/
N: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
N: Vivien Didelot <vivien.didelot@gmail.com>
F: board/technologic/ts5500/
F: configs/ts5500_defconfig
@ -2258,6 +2237,8 @@ F: package/zisofs-tools/
F: support/download/
N: Yegor Yefremov <yegorslists@googlemail.com>
F: configs/beaglebone_defconfig
F: configs/beaglebone_qt5_defconfig
F: package/acl/
F: package/attr/
F: package/bluez_utils/
@ -2266,6 +2247,7 @@ F: package/bootstrap/
F: package/cannelloni/
F: package/can-utils/
F: package/circus/
F: package/dhcpcd/
F: package/feh/
F: package/giblib/
F: package/imlib2/
@ -2282,6 +2264,7 @@ F: package/libubox/
F: package/libuci/
F: package/linux-firmware/
F: package/modem-manager/
F: package/nftables/
F: package/nuttcp/
F: package/parted/
F: package/phytool/

View File

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

View File

@ -101,6 +101,15 @@ config BR2_x86_corei7
select BR2_X86_CPU_HAS_SSSE3
select BR2_X86_CPU_HAS_SSE4
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
bool "corei7-avx"
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_core2 && 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_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_silvermont && 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 "core-avx2" if BR2_x86_core_avx2
default "atom" if BR2_x86_atom
default "westmere" if BR2_x86_westmere
default "silvermont" if BR2_x86_silvermont
default "k8" if BR2_x86_opteron
default "k8-sse3" if BR2_x86_opteron_sse3

View File

@ -3,6 +3,9 @@ devtype=mmc
bootdir=
bootfile=zImage
bootpartition=mmcblk0p2
console=ttyS0,115200n8
loadaddr=0x82000000
fdtaddr=0x88000000
set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi
set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
set_bootargs=setenv bootargs console=${console} root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr}

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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:

View File

@ -1,6 +1,6 @@
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
graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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
graphical window is the framebuffer. No keyboard support has been

View File

@ -1,6 +1,6 @@
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
graphical window is the framebuffer. No keyboard support has been

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
Run the emulation with:
qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "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
graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
Run the emulation with:
qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "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
graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
Run the emulation with:
qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 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
graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
Run the emulation with:
qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "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 graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
Run the emulation with:
qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "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 graphical window is the framebuffer.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -1,6 +1,6 @@
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.

View File

@ -5,8 +5,6 @@
################################################################################
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)
# Handle custom ATF tarballs as specified by the configuration
@ -19,6 +17,10 @@ ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
else
# Handle stable official ATF versions
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
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_OPTS = $$($(1)_MAKE_FLAGS)
$(1)_KCONFIG_DEPENDENCIES = \
$(BR2_BISON_HOST_DEPENDENCY) \
$(BR2_FLEX_HOST_DEPENDENCY)
ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
define $(1)_BUILD_BAREBOXENV_CMDS
$$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \

View File

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

View File

@ -2,7 +2,6 @@ BR2_arm=y
BR2_cortex_a8=y
BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
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_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y

View File

@ -17,7 +17,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain:
---------------------------
01: config BR2_PACKAGE_FOO
02: bool "foo"
03: depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
04: select BR2_PACKAGE_HOST_CARGO
05: help
06: This is a comment that explains what foo is.

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
+supervisor+).
In their +Config.in+ file, they should depend on +BR2_PACKAGE_PYTHON+
so that when Buildroot will enable Python 3 usage for modules, we will
be able to enable Python modules progressively on Python 3.
Packages that are only compatible with one version of Python (as in:
Python 2 or Python 3) should depend on that version explicitely in
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
+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
(+python-argparse+ on most distributions).
Just like for the duration graph, a +BR2_GRAPH_OUT+ environment is
supported to adjust the output file format. See xref:graph-depends[]
Just like for the duration graph, a +BR2_GRAPH_OUT+ environment variable
is supported to adjust the output file format. See xref:graph-depends[]
for details about this environment variable.
.Note

View File

@ -206,9 +206,9 @@ Buildroot or crosstool-NG.
If you want to generate a custom toolchain for your project, that can
be used as an external toolchain in Buildroot, our recommendation is
definitely to build it with http://crosstool-ng.org[crosstool-NG]. We
recommend to build the toolchain separately from Buildroot, and then
_import_ it in Buildroot using the external toolchain backend.
to build it either with Buildroot itself (see
xref:build-toolchain-with-buildroot[]) or with
http://crosstool-ng.org[crosstool-NG].
Advantages of this backend:
@ -223,7 +223,53 @@ Drawbacks of this backend:
* If your pre-built external toolchain has a bug, may be hard to get a
fix from the toolchain vendor, unless you build your external
toolchain by yourself using Crosstool-NG.
toolchain by yourself using Buildroot or Crosstool-NG.
[[build-toolchain-with-buildroot]]
==== Build an external toolchain with Buildroot
The Buildroot internal toolchain option can be used to create an
external toolchain. Here are a series of steps to build an internal
toolchain and package it up for reuse by Buildroot itself (or other
projects).
Create a new Buildroot configuration, with the following details:
* Select the appropriate *Target options* for your target CPU
architecture
* In the *Toolchain* menu, keep the default of *Buildroot toolchain*
for *Toolchain type*, and configure your toolchain as desired
* In the *System configuration* menu, select *None* as the *Init
system* and *none* as */bin/sh*
* In the *Target packages* menu, disable *BusyBox*
* In the *Filesystem images* menu, disable *tar the root filesystem*
Then, we can trigger the build, and also ask Buildroot to generate a
SDK. This will conveniently generate for us a tarball which contains
our toolchain:
-----
make sdk
-----
This produces the SDK tarball in +$(O)/images+, with a name similar to
+arm-buildroot-linux-uclibcgnueabi_sdk-buildroot.tar.gz+. Save this
tarball, as it is now the toolchain that you can re-use as an external
toolchain in other Buildroot projects.
In those other Buildroot projects, in the *Toolchain* menu:
* Set *Toolchain type* to *External toolchain*
* Set *Toolchain* to *Custom toolchain*
* Set *Toolchain origin* to *Toolchain to be downloaded and installed*
* Set *Toolchain URL* to +file:///path/to/your/sdk/tarball.tar.gz+
===== External toolchain wrapper

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
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
@ -402,7 +402,7 @@ the problem is complex, it is OK to add more paragraphs. All paragraphs
should be wrapped at 72 characters.
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.
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.3 manual generated on 2019-06-07 07:39:18 UTC from
git revision 3e8b918b87
Buildroot 2019.02.8 manual generated on 2019-12-07 19:24:23 UTC from
git revision aaa1437b11
The Buildroot manual is written by the Buildroot developers. It is
licensed under the GNU General Public License, version 2. Refer to
the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
3e8b918b871f484b3ef57832aa41982e368d74c2] file in the Buildroot
aaa1437b110f886ee24757595542f715a77d702a] file in the Buildroot
sources for the full text of this license.
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
"development" packages for relevant libraries used by the
configuration utilities. Refer to Chapter 2, System requirements for
more details, specifically the optional requirements Section 2.2,
“Optional packages” to get the dependencies of your favorite
interface.
more details, specifically the optional requirements to get the
dependencies of your favorite interface.
For each menu entry in the configuration tool, you can find
associated help that describes the purpose of the entry. Refer to
@ -404,15 +403,21 @@ directory contains several subdirectories:
needed by Buildroot on the host and packages compiled for the
target). This directory contains one subdirectory for each of
these components.
* staging/ which contains a hierarchy similar to a root filesystem
hierarchy. This directory contains the headers and libraries of
the cross-compilation toolchain and all the userspace packages
selected for the target. However, this directory is not intended
to be the root filesystem for the target: it contains a lot of
development files, unstripped binaries and libraries that make it
far too big for an embedded system. These development files are
used to compile libraries and applications for the target that
depend on other libraries.
* host/ contains both the tools built for the host, and the sysroot
of the target toolchain. The former is an installation of tools
compiled for the host that are needed for the proper execution of
Buildroot, including the cross-compilation toolchain. The latter
is a hierarchy similar to a root filesystem hierarchy. It
contains the headers and libraries of all user-space packages
that provide and install libraries used by other packages.
However, this directory is not intended to be the root filesystem
for the target: it contains a lot of development files,
unstripped binaries and libraries that make it far too big for an
embedded system. These development files are used to compile
libraries and applications for the target that depend on other
libraries.
* staging/ is a symlink to the target toolchain sysroot inside host
/, which exists for backwards compatibility.
* target/ which contains almost the complete root filesystem for
the target: everything needed is present except the device files
in /dev/ (Buildroot cant create them because Buildroot doesnt
@ -426,9 +431,6 @@ directory contains several subdirectories:
/, target/ contains only the files and libraries needed to run
the selected target applications: the development files (headers,
etc.) are not present, the binaries are stripped.
* host/ contains the installation of tools compiled for the host
that are needed for the proper execution of Buildroot, including
the cross-compilation toolchain.
These commands, make menuconfig|nconfig|gconfig|xconfig and make, are
the basic ones that allow to easily and quickly generate images
@ -765,9 +767,9 @@ Buildroot or crosstool-NG.
If you want to generate a custom toolchain for your project, that can
be used as an external toolchain in Buildroot, our recommendation is
definitely to build it with crosstool-NG [http://crosstool-ng.org].
We recommend to build the toolchain separately from Buildroot, and
then import it in Buildroot using the external toolchain backend.
to build it either with Buildroot itself (see Section 6.1.3, “Build
an external toolchain with Buildroot”) or with crosstool-NG [http://
crosstool-ng.org].
Advantages of this backend:
@ -781,9 +783,45 @@ Drawbacks of this backend:
* If your pre-built external toolchain has a bug, may be hard to
get a fix from the toolchain vendor, unless you build your
external toolchain by yourself using Crosstool-NG.
external toolchain by yourself using Buildroot or Crosstool-NG.
6.1.2.1. External toolchain wrapper
6.1.3. Build an external toolchain with Buildroot
The Buildroot internal toolchain option can be used to create an
external toolchain. Here are a series of steps to build an internal
toolchain and package it up for reuse by Buildroot itself (or other
projects).
Create a new Buildroot configuration, with the following details:
* Select the appropriate Target options for your target CPU
architecture
* In the Toolchain menu, keep the default of Buildroot toolchain
for Toolchain type, and configure your toolchain as desired
* In the System configuration menu, select None as the Init system
and none as /bin/sh
* In the Target packages menu, disable BusyBox
* In the Filesystem images menu, disable tar the root filesystem
Then, we can trigger the build, and also ask Buildroot to generate a
SDK. This will conveniently generate for us a tarball which contains
our toolchain:
make sdk
This produces the SDK tarball in $(O)/images, with a name similar to
arm-buildroot-linux-uclibcgnueabi_sdk-buildroot.tar.gz. Save this
tarball, as it is now the toolchain that you can re-use as an
external toolchain in other Buildroot projects.
In those other Buildroot projects, in the Toolchain menu:
* Set Toolchain type to External toolchain
* Set Toolchain to Custom toolchain
* Set Toolchain origin to Toolchain to be downloaded and installed
* Set Toolchain URL to file:///path/to/your/sdk/tarball.tar.gz
6.1.3.1. External toolchain wrapper
When using an external toolchain, Buildroot generates a wrapper
program, that transparently passes the appropriate options (according
@ -1193,15 +1231,21 @@ command.
On the other hand, if you only want to restart the build process of a
package from its compilation step, you can run make <package>
-rebuild, followed by make or make <package>. It will restart the
compilation and installation of the package, but not from scratch: it
basically re-executes make and make install inside the package, so it
will only rebuild files that changed.
-rebuild. It will restart the compilation and installation of the
package, but not from scratch: it basically re-executes make and make
install inside the package, so it will only rebuild files that
changed.
If you want to restart the build process of a package from its
configuration step, you can run make <package>-reconfigure, followed
by make or make <package>. It will restart the configuration,
compilation and installation of the package.
configuration step, you can run make <package>-reconfigure. It will
restart the configuration, compilation and installation of the
package.
While <package>-rebuild implies <package>-reinstall and <package>
-reconfigure implies <package>-rebuild, these targets as well as
<package> only act on the said package, and do not trigger
re-creating the root filesystem image. If re-creating the root
filesystem in necessary, one should in addition run make or make all.
Internally, Buildroot creates so-called stamp files to keep track of
which build steps have been completed for each package. They are
@ -1469,10 +1513,10 @@ installed (python-matplotlib on most distributions), and also the
argparse module if youre using a Python version older than 2.7
(python-argparse on most distributions).
Just like for the duration graph, a BR2_GRAPH_OUT environment is
supported to adjust the output file format. See Section 8.8,
“Graphing the dependencies between packages” for details about this
environment variable.
Just like for the duration graph, a BR2_GRAPH_OUT environment
variable is supported to adjust the output file format. See
Section 8.8, “Graphing the dependencies between packages” for details
about this environment variable.
Note. The collected filesystem size data is only meaningful after a
complete clean rebuild. Be sure to run make clean all before using
@ -1738,10 +1782,8 @@ Additionally, there are some other useful make targets:
| graph-depends |Generate a dependency graph of the |
| |package, in the context of the |
| |current Buildroot configuration. See|
| |this section Section 8.8, “Graphing |
| |the dependencies between packages” |
| |for more details about dependency |
| |graphs. |
| |this section for more details about |
| |dependency graphs. |
|-----------------------+------------------------------------|
| graph-rdepends |Generate a graph of this package |
| |reverse dependencies (i.e the |
@ -1864,6 +1906,15 @@ WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \
--exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \
--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
Typical actions you may need to perform for a given project are:
@ -2531,8 +2582,7 @@ from the post-build script.
Instead, Buildroot provides support for so-called permission tables.
To use this feature, set config option BR2_ROOTFS_DEVICE_TABLE to a
space-separated list of permission tables, regular text files
following the makedev syntax Chapter 23, Makedev syntax documentation
.
following the makedev syntax.
If you are using a static device table (i.e. not using devtmpfs,
mdev, or (e)udev) then you can add device nodes using the same
@ -2554,8 +2604,7 @@ Sometimes it is needed to add specific users in the target system. To
cover this requirement, Buildroot provides support for so-called
users tables. To use this feature, set config option
BR2_ROOTFS_USERS_TABLES to a space-separated list of users tables,
regular text files following the makeusers syntax Chapter 24,
Makeusers syntax documentation.
regular text files following the makeusers syntax.
As shown in Section 9.1, “Recommended directory structure”, the
recommended location for such files is board/<company>/<boardname>/.
@ -3664,8 +3713,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
package.
Further formatting details: see the coding style Section 15.1,
“Config.in file”.
Further formatting details: see the coding style.
17.2.4. Dependencies on target and toolchain options
@ -3849,36 +3897,27 @@ different way, using different infrastructures:
infrastructure must be used for all packages that do not use the
autotools as their build system. In the future, other specialized
infrastructures might be written for other build systems. We
cover them through in a tutorial Section 17.5.1, “generic-package
tutorial” and a reference Section 17.5.2, “generic-package
reference”.
cover them through in a tutorial and a reference.
* Makefiles for autotools-based software (autoconf, automake,
etc.): We provide a dedicated infrastructure for such packages,
since autotools is a very common build system. This
infrastructure must be used for new packages that rely on the
autotools as their build system. We cover them through a tutorial
Section 17.6.1, “autotools-package tutorial” and reference
Section 17.6.2, “autotools-package reference”.
and reference.
* Makefiles for cmake-based software: We provide a dedicated
infrastructure for such packages, as CMake is a more and more
commonly used build system and has a standardized behaviour. This
infrastructure must be used for new packages that rely on CMake.
We cover them through a tutorial Section 17.7.1, “cmake-package
tutorial” and reference Section 17.7.2, “cmake-package reference”
.
We cover them through a tutorial and reference.
* Makefiles for Python modules: We have a dedicated infrastructure
for Python modules that use either the distutils or the
setuptools mechanism. We cover them through a tutorial
Section 17.8.1, “python-package tutorial” and a reference
Section 17.8.2, “python-package reference”.
setuptools mechanism. We cover them through a tutorial and a
reference.
* Makefiles for Lua modules: We have a dedicated infrastructure for
Lua modules available through the LuaRocks web site. We cover
them through a tutorial Section 17.9.1, “luarocks-package
tutorial” and a reference Section 17.9.2, “luarocks-package
reference”.
them through a tutorial and a reference.
Further formatting details: see the writing rules Section 15.2, “The
.mk file”.
Further formatting details: see the writing rules.
17.4. The .hash file
@ -4220,9 +4259,9 @@ information is (assuming the package name is libfoo) :
are included in Buildroot itself use a different mechanism: all
files of the form *.patch present in the package directory inside
Buildroot will be applied to the package after extraction (see
patching a package Chapter 18, Patching a package). Finally,
patches listed in the LIBFOO_PATCH variable are applied before
the patches stored in the Buildroot package directory.
patching a package). Finally, patches listed in the LIBFOO_PATCH
variable are applied before the patches stored in the Buildroot
package directory.
* 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 types for retrieving package tarballs. In these cases dont
@ -4881,9 +4920,13 @@ be named python-<something> in Buildroot. Other packages that use the
Python build system, but are not Python modules, can freely choose
their name (existing examples in Buildroot are scons and supervisor).
In their Config.in file, they should depend on BR2_PACKAGE_PYTHON so
that when Buildroot will enable Python 3 usage for modules, we will
be able to enable Python modules progressively on Python 3.
Packages that are only compatible with one version of Python (as in:
Python 2 or Python 3) should depend on that version explicitely in
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
python-package. It is similar to the generic-package macro. It is
@ -4895,12 +4938,11 @@ by defining a number of variables before calling the python-package
or host-python-package macros.
All the package metadata information variables that exist in the
generic package infrastructure Section 17.5.2, “generic-package
reference” also exist in the Python infrastructure:
PYTHON_FOO_VERSION, PYTHON_FOO_SOURCE, PYTHON_FOO_PATCH,
PYTHON_FOO_SITE, PYTHON_FOO_SUBDIR, PYTHON_FOO_DEPENDENCIES,
PYTHON_FOO_LICENSE, PYTHON_FOO_LICENSE_FILES,
PYTHON_FOO_INSTALL_STAGING, etc.
generic package infrastructure also exist in the Python
infrastructure: PYTHON_FOO_VERSION, PYTHON_FOO_SOURCE,
PYTHON_FOO_PATCH, PYTHON_FOO_SITE, PYTHON_FOO_SUBDIR,
PYTHON_FOO_DEPENDENCIES, PYTHON_FOO_LICENSE,
PYTHON_FOO_LICENSE_FILES, PYTHON_FOO_INSTALL_STAGING, etc.
Note that:
@ -5765,7 +5807,7 @@ The Config.in file of Cargo-based package foo should contain:
01: config BR2_PACKAGE_FOO
02: bool "foo"
03: depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
04: select BR2_PACKAGE_HOST_CARGO
05: help
06: This is a comment that explains what foo is.
@ -5818,9 +5860,8 @@ The Makefile starts with the definition of the standard variables for
package declaration (lines 7 to 11).
As seen in line 35, it is based on the generic-package infrastructure
Section 17.5.1, “generic-package tutorial”. So, it defines the
variables required by this particular infrastructure, where Cargo is
invoked:
. So, it defines the variables required by this particular
infrastructure, where Cargo is invoked:
* FOO_BUILD_CMDS: Cargo is invoked to perform the build. The
options required to configure the cross-compilation of the
@ -5903,10 +5944,10 @@ Just like the generic infrastructure, the Go infrastructure works by
defining a number of variables before calling the golang-package.
All the package metadata information variables that exist in the
generic package infrastructure Section 17.5.2, “generic-package
reference” also exist in the Go infrastructure: FOO_VERSION,
FOO_SOURCE, FOO_PATCH, FOO_SITE, FOO_SUBDIR, FOO_DEPENDENCIES,
FOO_LICENSE, FOO_LICENSE_FILES, FOO_INSTALL_STAGING, etc.
generic package infrastructure also exist in the Go infrastructure:
FOO_VERSION, FOO_SOURCE, FOO_PATCH, FOO_SITE, FOO_SUBDIR,
FOO_DEPENDENCIES, FOO_LICENSE, FOO_LICENSE_FILES,
FOO_INSTALL_STAGING, etc.
Note that it is not necessary to add host-go in the FOO_DEPENDENCIES
variable of a package, since this basic dependency is automatically
@ -5995,8 +6036,7 @@ On line 13, we invoke the kernel-module helper infrastructure, that
generates all the appropriate Makefile rules and variables to build
that kernel module.
Finally, on line 14, we invoke the generic-package infrastructure
Section 17.5.1, “generic-package tutorial”.
Finally, on line 14, we invoke the generic-package infrastructure.
The dependency on linux is automatically added, so it is not needed
to specify it in FOO_DEPENDENCIES.
@ -6108,10 +6148,9 @@ there is, as for packages, an infrastructure for rendering documents
using the AsciiDoc syntax.
Also as for packages, the AsciiDoc infrastructure is available from a
br2-external tree Section 9.2, “Keeping customizations outside of
Buildroot”. This allows documentation for a br2-external tree to
match the Buildroot documentation, as it will be rendered to the same
formats and use the same layout and theme.
br2-external tree. This allows documentation for a br2-external tree
to match the Buildroot documentation, as it will be rendered to the
same formats and use the same layout and theme.
17.19.1. asciidoc-document tutorial
@ -6282,10 +6321,9 @@ only when the foo tool is selected.
The rest of the Makefile, lines 11-25 defines what should be done at
the different steps of the Linux tool build process like for a
generic package Section 17.5.1, “generic-package tutorial”. They will
actually be used only when the foo tool is selected. The only
supported commands are _BUILD_CMDS, _INSTALL_STAGING_CMDS and
_INSTALL_TARGET_CMDS.
generic package. They will actually be used only when the foo tool is
selected. The only supported commands are _BUILD_CMDS,
_INSTALL_STAGING_CMDS and _INSTALL_TARGET_CMDS.
Note. One must not call $(eval $(generic-package)) or any other
package infrastructure! Linux tools are not packages by themselves,
@ -6346,8 +6384,7 @@ modify the Linux kernel tree; this is specific to the linux extension
and can use the variables defined by the foo package, like: $
(FOO_DIR) or $(FOO_VERSION)… as well as all the Linux variables,
like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)…
See the definition of those kernel variables Section 17.18.2,
“kernel-module reference”.
See the definition of those kernel variables.
17.21. Hooks available in the various build steps
@ -6937,7 +6974,7 @@ basically two things that can be done:
patch fixing an autobuild failure, add a reference to the
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
@ -7135,8 +7172,8 @@ options that no longer exist or are no longer needed.
If you are interested in getting notified of build failures and of
further changes in the packages you added or modified, please add
yourself to the DEVELOPERS file. This should be done in the same
patch creating or modifying the package. See the DEVELOPERS file
Chapter 22, DEVELOPERS file and get-developers for more information.
patch creating or modifying the package. See the DEVELOPERS file for
more information.
Buildroot provides a handy tool to check for common coding style
mistakes on files you created or modified, called check-package (see
@ -7244,7 +7281,7 @@ the problem is complex, it is OK to add more paragraphs. All paragraphs
should be wrapped at 72 characters.
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.
Don't hesitate to explain complex solutions in detail.
@ -7294,14 +7331,12 @@ as superseded.
21.6. Reporting issues/bugs or getting help
Before reporting any issue, please check in the mailing list archive
Chapter 5, Community resources whether someone has already reported
and/or fixed a similar problem.
whether someone has already reported and/or fixed a similar problem.
However you choose to report bugs or get help, either by opening a
bug in the bug tracker Chapter 5, Community resources or by sending a
mail to the mailing list Chapter 5, Community resources, there are a
number of details to provide in order to help people reproduce and
find a solution to the issue.
bug in the bug tracker or by sending a mail to the mailing list,
there are a number of details to provide in order to help people
reproduce and find a solution to the issue.
Try to think as if you were trying to help someone else; in that
case, what would you need?

View File

@ -87,15 +87,21 @@ This directory contains several subdirectories:
target). This directory contains one subdirectory for each of these
components.
* +staging/+ which contains a hierarchy similar to a root filesystem
hierarchy. This directory contains the headers and libraries of the
cross-compilation toolchain and all the userspace packages selected
for the target. However, this directory is 'not' intended to be
the root filesystem for the target: it contains a lot of development
files, unstripped binaries and libraries that make it far too big
for an embedded system. These development files are used to compile
libraries and applications for the target that depend on other
libraries.
* +host/+ contains both the tools built for the host, and the sysroot
of the target toolchain. The former is an installation of tools
compiled for the host that are needed for the proper execution of
Buildroot, including the cross-compilation toolchain. The latter
is a hierarchy similar to a root filesystem hierarchy. It contains
the headers and libraries of all user-space packages that provide
and install libraries used by other packages. However, this
directory is 'not' intended to be the root filesystem for the target:
it contains a lot of development files, unstripped binaries and
libraries that make it far too big for an embedded system. These
development files are used to compile libraries and applications for
the target that depend on other libraries.
* +staging/+ is a symlink to the target toolchain sysroot inside
+host/+, which exists for backwards compatibility.
* +target/+ which contains 'almost' the complete root filesystem for
the target: everything needed is present except the device files in
@ -111,10 +117,6 @@ This directory contains several subdirectories:
development files (headers, etc.) are not present, the binaries are
stripped.
* +host/+ contains the installation of tools compiled for the host
that are needed for the proper execution of Buildroot, including the
cross-compilation toolchain.
These commands, +make menuconfig|nconfig|gconfig|xconfig+ and +make+, are the
basic ones that allow to easily and quickly generate images fitting
your needs, with all the features and applications you enabled.

View File

@ -99,16 +99,20 @@ re-configure, re-compile and re-install this package from scratch. You
can ask buildroot to do this with the +make <package>-dirclean+ command.
On the other hand, if you only want to restart the build process of a
package from its compilation step, you can run +make
<package>-rebuild+, followed by +make+ or +make <package>+. It will
restart the compilation and installation of the package, but not from
scratch: it basically re-executes +make+ and +make install+
inside the package, so it will only rebuild files that changed.
package from its compilation step, you can run +make <package>-rebuild+. It
will restart the compilation and installation of the package, but not from
scratch: it basically re-executes +make+ and +make install+ inside the package,
so it will only rebuild files that changed.
If you want to restart the build process of a package from its
configuration step, you can run +make <package>-reconfigure+, followed
by +make+ or +make <package>+. It will restart the configuration,
compilation and installation of the package.
If you want to restart the build process of a package from its configuration
step, you can run +make <package>-reconfigure+. It will restart the
configuration, compilation and installation of the package.
While +<package>-rebuild+ implies +<package>-reinstall+ and
+<package>-reconfigure+ implies +<package>-rebuild+, these targets as well
as +<package>+ only act on the said package, and do not trigger re-creating
the root filesystem image. If re-creating the root filesystem in necessary,
one should in addition run +make+ or +make all+.
Internally, Buildroot creates so-called _stamp files_ to keep track of
which build steps have been completed for each package. They are

View File

@ -109,3 +109,13 @@ WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \
--exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \
--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)
ROOTFS_$(2)_COMPRESS_EXT = .gz
ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c
ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c -n
endif
ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
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)
# 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
(cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \
tar $(TAR_OPTS) -cf $@ --null --xattrs-include='*' --no-recursion -T - --numeric-owner)

View File

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

View File

@ -1,6 +1,6 @@
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e linux-4.20.17.tar.xz
sha256 5d08f3890e7ca2b94529675120f170c5b764f795e6dd184a1190c23a40ef5365 linux-4.19.47.tar.xz
sha256 25f58cb56bde388ac9bcee984f5f2d0ca094b0a8af6b92ad1f5b2fd0e6725b85 linux-4.14.123.tar.xz
sha256 d25a490d62a3e96a587333e163862585eac4086fc8d4893b4ec1711e7d387c5f linux-4.9.180.tar.xz
sha256 1a450217d381bb7fd259d026d3b7a57c717e8d1f66754cd6fcc9df3c4a8a6a7a linux-4.4.180.tar.xz
sha256 5da5e16fe08fa506f8f74aa4f17be22b52c0f513e9a3f7e7ae22fc53597ad493 linux-4.4.206.tar.xz
sha256 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 linux-4.9.206.tar.xz
sha256 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 linux-4.14.158.tar.xz
sha256 c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe linux-4.19.88.tar.xz

View File

@ -316,6 +316,8 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(LINUX_FIXUP_CONFIG_ENDIANNESS)
$(if $(BR2_arm)$(BR2_armeb),
$(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),
$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config))
# 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-smbus-cffi/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-sqlalchemy/Config.in"
source "package/python-subprocess32/Config.in"
@ -1161,6 +1161,7 @@ endmenu
menu "Compression and decompression"
source "package/libarchive/Config.in"
source "package/libmspack/Config.in"
source "package/libsquish/Config.in"
source "package/libzip/Config.in"
source "package/lzo/Config.in"

View File

@ -16,6 +16,7 @@ menu "Host utilities"
source "package/dtc/Config.in.host"
source "package/e2fsprogs/Config.in.host"
source "package/e2tools/Config.in.host"
source "package/eudev/Config.in.host"
source "package/f2fs-tools/Config.in.host"
source "package/faketime/Config.in.host"
source "package/fwup/Config.in.host"

View File

@ -0,0 +1,35 @@
From 6c3b05b74ccd49d8ba246bfef0c2e549b9f2bf7b Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 29 Oct 2019 16:14:18 +0100
Subject: [PATCH] Makefile: unconditionally disable SSP
Though -nostdlib is passed in $(CFLAGS), -fno-stack-protector must also be
passed to avoid linking errors related to undefined references to
'__stack_chk_guard' and '__stack_chk_fail' if toolchain enforces
-fstack-protector.
Fixes:
- http://autobuild.buildroot.net/results/3a3a21f3c35ea025e9b93e09c2454aed0ad31034
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c3ec071..5226006 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ INCLUDES = $(SRCDIR)/include
CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
- -Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2
+ -Wempty-body -fno-strict-overflow -fno-stack-protector \
+ -g -I$(INCLUDES) -O2
LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
EXECUTABLE=am335x-pm-firmware.elf
--
2.23.0

View File

@ -0,0 +1,33 @@
From 0e8c3c4851ce64268a8ae1810ef72594251d917d Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 10 Nov 2019 21:57:12 +0100
Subject: [PATCH] Makefile: unconditionally disable PIE
Though -nostdlib is passed in $(CFLAGS), -fno-pie must also be passed to
avoid linking errors related to overlapping sections if toolchain
enforces PIE.
Fixes:
- http://autobuild.buildroot.org/results/418a40b995e91bc66e692dfbc4b0521db3fa5fbb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5226006..fe3d844 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
-Wempty-body -fno-strict-overflow -fno-stack-protector \
- -g -I$(INCLUDES) -O2
+ -fno-pie -g -I$(INCLUDES) -O2
LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
EXECUTABLE=am335x-pm-firmware.elf
--
2.23.0

View File

@ -1,4 +1,4 @@
# From http://archive.apache.org/dist/httpd/httpd-2.4.39.tar.bz2.sha256
sha256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 httpd-2.4.39.tar.bz2
# From http://archive.apache.org/dist/httpd/httpd-2.4.41.tar.bz2.sha256
sha256 133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 httpd-2.4.41.tar.bz2
# Locally computed
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_SITE = http://archive.apache.org/dist/httpd
APACHE_LICENSE = Apache-2.0

View File

@ -1,5 +1,5 @@
# Locally computed
sha256 c022e9d5410ed94ab1aa51ba1e2a8b196f0dfa15bcd0bd545d06efee4c786578 asterisk-16.2.1.tar.gz
sha256 474cbc6f9dddee94616f8af8e097bc4d340dc9698c4165dc45be6e0be80ff725 asterisk-16.6.2.tar.gz
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
# sha256 locally computed
@ -11,5 +11,5 @@ sha256 449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538 asteri
# License files, locally computed
sha256 82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f COPYING
sha256 ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312 main/sha1.c
sha256 309462c10e84f46bda22032ebe6359f3e9e3e23afcf1fc2aaed5b59daf800d84 codecs/speex/speex_resampler.h
sha256 6215e3ed73c3982a5c6701127d681ec0b9f1121ac78a28805bd93f93c3eb84c0 codecs/speex/speex_resampler.h
sha256 1ca2c7a7a1ae7ccd75212a8c1e85dd9ec92bdbc9170aafd97ea60459387755fd utils/db1-ast/include/db.h

View File

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

View File

@ -7,6 +7,8 @@ config BR2_PACKAGE_ATK
help
The ATK accessibility toolkit, needed to build GTK+-2.x.
https://gitlab.gnome.org/GNOME/atk
comment "atk needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

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_FILES = COPYING
ATK_INSTALL_STAGING = YES
ATK_DEPENDENCIES = libglib2
ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
$(eval $(meson-package))

View File

@ -11,9 +11,6 @@ AUGEAS_LICENSE = LGPL-2.1+
AUGEAS_LICENSE_FILES = COPYING
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
# 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_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
# autofs looks on the build machine for the path of modprobe, so tell
# it explicitly where it will be located on the target.
# autofs looks on the build machine for the path of modprobe, mount,
# umount and fsck programs so tell it explicitly where they will be
# located on the target.
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_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
# instead of looking in the PATH like any reasonable package, autofs

View File

@ -20,7 +20,7 @@ config BR2_PACKAGE_AZMQ
https://github.com/zeromq/azmq
comment "azmq needs a toolchain w/ C++11, wchar and NTPL"
comment "azmq needs a toolchain w/ C++11, wchar and NPTL"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL)

View File

@ -6,7 +6,7 @@
BATCTL_VERSION = 2017.0
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
define BATCTL_BUILD_CMDS

View File

@ -6,7 +6,7 @@
BATMAN_ADV_VERSION = 2017.0.1
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
BATMAN_ADV_CFLAGS = \

View File

@ -4,4 +4,4 @@ config BR2_PACKAGE_BCG729
Bcg729 is an opensource implementation of both encoder and
decoder of the ITU G729 Annex A/B speech codec.
http://www.linphone.org/technical-corner/bcg729/overview
https://www.linphone.org/technical-corner/bcg729

View File

@ -44,6 +44,22 @@ define BERKELEYDB_CONFIGURE_CMDS
)
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)
define BERKELEYDB_REMOVE_TOOLS
@ -61,3 +77,4 @@ endef
BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
$(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.
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
--- 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
@@ -160,8 +160,8 @@
./gen -s ${srcdir} > code.h
@@ -160,10 +160,8 @@
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: gen.c
- ${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 \
+ ${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

@ -24,7 +24,7 @@ config BR2_PACKAGE_BIND
intended to be linked with applications requiring name
service.
http://www.isc.org/sw/bind/
https://www.isc.org/bind/
if BR2_PACKAGE_BIND

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
# with key 156890685EA0DF6A1371EF2017CC5DB1F0088407
sha256 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef bind-9.11.6-P1.tar.gz
# Verified from https://ftp.isc.org/isc/bind9/9.11.13/bind-9.11.13.tar.gz.asc
# with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38
sha256 fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d bind-9.11.13.tar.gz
sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT

View File

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

View File

@ -14,4 +14,12 @@ BROTLI_CONF_OPTS = \
-DBROTLI_DISABLE_TESTS=ON \
-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))

View File

@ -967,9 +967,9 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
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_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search"
#
# Print Utilities

View File

@ -56,7 +56,7 @@ case "$1" in
cat $TMPFILE > $RESOLV_CONF
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
search_list=$search
elif [ -n "$domain" ]; then

View File

@ -7,7 +7,7 @@
BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef
BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION))
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_AUTORECONF = YES

View File

@ -70,15 +70,15 @@ Index: b/Makefile-libbz2_so
huffman.o \
@@ -37,8 +36,11 @@
all: $(OBJS)
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
$(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.8
- 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 -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
+ install -m 0755 -D libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0.8
+ ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so
+ ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0
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
available techniques, while being around twice as fast at
compression and six times faster at decompression.
https://sourceware.org/bzip2/

View File

@ -1,2 +1,4 @@
# From http://www.bzip.org/downloads.html
md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
# From https://sourceware.org/pub/bzip2/sha512.sum
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_SITE = http://sources.buildroot.net
BZIP2_VERSION = 1.0.8
BZIP2_SITE = https://sourceware.org/pub/bzip2
BZIP2_INSTALL_STAGING = YES
BZIP2_LICENSE = bzip2 license
BZIP2_LICENSE_FILES = LICENSE

View File

@ -9,4 +9,4 @@ config BR2_PACKAGE_CA_CERTIFICATES
Debian infrastructure and those shipped with Mozilla's
browsers.
http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git
https://salsa.debian.org/debian/ca-certificates

View File

@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \
--host-system=Linux \
--host-machine=$(BR2_ARCH) \
--prefix=/usr \
--without-readline \
--without-tomcrypt
ifeq ($(BR2_PACKAGE_LIBCAP),y)
@ -34,10 +35,10 @@ else
CHRONY_CONF_OPTS += --without-seccomp
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
CHRONY_DEPENDENCIES += readline
ifeq ($(BR2_PACKAGE_LIBEDIT),y)
CHRONY_DEPENDENCIES += libedit
else
CHRONY_CONF_OPTS += --disable-readline
CHRONY_CONF_OPTS += --without-editline --disable-readline
endif
# If pps-tools is available, build it before so the package can use it

View File

@ -4,6 +4,7 @@ config BR2_PACKAGE_CLAMAV
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBMSPACK
select BR2_PACKAGE_LIBTOOL
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB

View File

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

View File

@ -4,7 +4,7 @@
#
################################################################################
CLAMAV_VERSION = 0.101.2
CLAMAV_VERSION = 0.101.5
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
@ -12,6 +12,7 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
COPYING.unrar COPYING.zlib
CLAMAV_DEPENDENCIES = \
host-pkgconf \
libmspack \
libtool \
openssl \
zlib \
@ -32,6 +33,7 @@ CLAMAV_CONF_OPTS = \
--with-ltdl-include=$(STAGING_DIR)/usr/include \
--with-ltdl-lib=$(STAGING_DIR)/usr/lib \
--with-openssl=$(STAGING_DIR)/usr \
--with-system-libmspack=$(STAGING_DIR)/usr \
--with-zlib=$(STAGING_DIR)/usr \
--disable-zlib-vcheck \
--disable-rpath \

View File

@ -13,7 +13,8 @@ CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
HOST_CLOOP_DEPENDENCIES = host-zlib
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
define HOST_CLOOP_INSTALL_CMDS

View File

@ -1,5 +1,5 @@
# 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
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_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
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
COLLECTD_PLUGINS_DISABLE = \
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 \
nut onewire oracle perl pf pinba powerdns python redis routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
@ -184,7 +184,7 @@ COLLECTD_CONF_OPTS += --with-libpq=$(STAGING_DIR)/usr/bin/pg_config
COLLECTD_CONF_ENV += LIBS="-lpthread -lm"
endif
ifeq ($(BR2_PACKAGE_YAJL),y)
COLLECTD_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr
COLLECTD_CONF_OPTS += --with-libyajl=$(STAGING_DIR)/usr
endif
# network can use libgcrypt

View File

@ -1,2 +1,3 @@
# Locally calculated
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_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2
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_FILES = COPYING
CONNMAN_GTK_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
$(eval $(autotools-package))

View File

@ -39,6 +39,7 @@ define CONNMAN_INSTALL_INIT_SYSTEMD
endef
ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
CONNMAN_LICENSE += , GPL-2.0+ (client)
CONNMAN_CONF_OPTS += --enable-client
CONNMAN_DEPENDENCIES += readline

View File

@ -8,4 +8,4 @@ config BR2_PACKAGE_COPAS
servers. But it also features timers and client support for
http(s), ftp and smtp requests.
http://www.keplerproject.org/copas/
http://keplerproject.github.io/copas/

View File

@ -15,16 +15,23 @@ define HOST_CRYPTOPP_EXTRACT_CMDS
$(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D)
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_CONFIGURE_OPTS) \
CXXFLAGS="$(HOST_CXXFLAGS) -fPIC"
CXXFLAGS="$(HOST_CRYPTOPP_CXXFLAGS)"
define HOST_CRYPTOPP_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared
endef
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
$(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

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