mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 11:46:30 +00:00
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
commit
1c8dda3e43
@ -126,6 +126,9 @@ imx23evk_defconfig: *defconfig
|
||||
imx6-sabreauto_defconfig: *defconfig
|
||||
imx6-sabresd_defconfig: *defconfig
|
||||
imx6-sabresd_qt5_defconfig: *defconfig
|
||||
imx6slevk_defconfig: *defconfig
|
||||
imx6sx-sdb_defconfig: *defconfig
|
||||
imx6ulevk_defconfig: *defconfig
|
||||
imx6ulpico_defconfig: *defconfig
|
||||
imx7dpico_defconfig: *defconfig
|
||||
lego_ev3_defconfig: *defconfig
|
||||
|
@ -142,6 +142,17 @@ comment "build, or run, in unpredictable ways. "
|
||||
comment "----------------------------------------------------"
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2018.02"
|
||||
|
||||
config BR2_PACKAGE_GNUPG2_GPGV2
|
||||
bool "gnupg2 gpgv2 option removed"
|
||||
select BR2_LEGACY
|
||||
select BR2_PACKAGE_GNUPG2_GPGV
|
||||
help
|
||||
The gpgv2 executable is now named gpgv. The config option
|
||||
has been renamed accordingly.
|
||||
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2017.11"
|
||||
|
||||
@ -1143,13 +1154,6 @@ config BR2_x86_i386
|
||||
The support for the i386 processors of the x86 architecture
|
||||
has been removed.
|
||||
|
||||
config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
|
||||
bool "qt5webkit-examples package removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The qt5webkit-examples package has been removed, since it
|
||||
was removed from upstream starting from Qt 5.6.
|
||||
|
||||
config BR2_PACKAGE_QT5QUICK1
|
||||
bool "qt5quick1 package removed"
|
||||
select BR2_LEGACY
|
||||
|
26
DEVELOPERS
26
DEVELOPERS
@ -79,6 +79,9 @@ F: package/putty/
|
||||
N: Alexander Lukichev <alexander.lukichev@espotel.com>
|
||||
F: package/openpgm/
|
||||
|
||||
N: Alexander Mukhin <alexander.i.mukhin@gmail.com>
|
||||
F: package/hostapd/
|
||||
|
||||
N: Alexander Varnin <fenixk19@mail.ru>
|
||||
F: package/liblog4c-localtime/
|
||||
|
||||
@ -324,8 +327,10 @@ F: package/python-mwclient/
|
||||
F: package/python-mwscrape/
|
||||
F: package/python-mwscrape2slob/
|
||||
F: package/python-mako/
|
||||
F: package/python-oauthlib/
|
||||
F: package/python-pyicu/
|
||||
F: package/python-pylru/
|
||||
F: package/python-requests-oauthlib/
|
||||
F: package/python-slob/
|
||||
F: package/rtmpdump/
|
||||
F: package/softether/
|
||||
@ -339,6 +344,7 @@ F: package/vdr/
|
||||
F: package/vdr-plugin-vnsiserver/
|
||||
F: package/vlc/
|
||||
F: package/vnstat/
|
||||
F: package/waylandpp/
|
||||
F: package/x11r7/
|
||||
F: package/x264/
|
||||
F: package/x265/
|
||||
@ -579,6 +585,9 @@ N: Fabio Estevam <festevam@gmail.com>
|
||||
F: board/warp7/
|
||||
F: configs/freescale_imx*
|
||||
F: configs/imx6-sabresd*
|
||||
F: configs/imx6slevk_defconfig
|
||||
F: configs/imx6sx-sdb_defconfig
|
||||
F: configs/imx6ulevk_defconfig
|
||||
F: configs/imx6ulpico_defconfig
|
||||
F: configs/mx6cubox_defconfig
|
||||
F: configs/mx6sx_udoo_neo_defconfig
|
||||
@ -611,8 +620,10 @@ F: package/gupnp-tools/
|
||||
F: package/hiredis/
|
||||
F: package/igd2-for-linux/
|
||||
F: package/libupnp/
|
||||
F: package/libupnp18/
|
||||
F: package/minissdpd/
|
||||
F: package/motion/
|
||||
F: package/rygel/
|
||||
F: package/tinycbor/
|
||||
F: package/tinydtls/
|
||||
|
||||
@ -671,6 +682,7 @@ F: package/zxing-cpp/
|
||||
N: Gaël Portay <gael.portay@savoirfairelinux.com>
|
||||
F: package/qt5/qt5virtualkeyboard/
|
||||
F: package/qt5/qt5webengine/
|
||||
F: package/qt5/qt5webkit-examples/
|
||||
|
||||
N: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
F: board/boundarydevices/
|
||||
@ -797,6 +809,8 @@ F: board/qemu/ppc64le-pseries/
|
||||
F: configs/qemu_ppc64le_pseries_defconfig
|
||||
|
||||
N: Joseph Kogut <joseph.kogut@gmail.com>
|
||||
F: package/python-raven/
|
||||
F: package/python-schedule/
|
||||
F: package/python-websockets/
|
||||
|
||||
N: Johan Derycke <johanderycke@gmail.com>
|
||||
@ -1005,6 +1019,10 @@ F: package/turbolua/
|
||||
N: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
|
||||
F: package/libkcapi/
|
||||
|
||||
N: Marcus Folkesson <marcus.folkesson@gmail.com>
|
||||
F: package/libostree/
|
||||
F: utils/diffconfig
|
||||
|
||||
N: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
F: package/libatasmart/
|
||||
F: package/polkit/
|
||||
@ -1411,6 +1429,7 @@ F: package/minetest/
|
||||
F: package/minetest-game/
|
||||
F: package/openpowerlink/
|
||||
F: package/physfs/
|
||||
F: package/solarus/
|
||||
F: package/stress-ng/
|
||||
F: package/supertux/
|
||||
F: package/supertuxkart/
|
||||
@ -1485,6 +1504,13 @@ F: package/mpir/
|
||||
|
||||
N: Sergey Matyukevich <geomatsi@gmail.com>
|
||||
F: package/xr819-xradio/
|
||||
F: package/armbian-firmware/
|
||||
F: board/orangepi/orangepi-zero
|
||||
F: board/orangepi/orangepi-one
|
||||
F: board/linksprite/pcduino
|
||||
F: configs/orangepi_one_defconfig
|
||||
F: configs/orangepi_zero_defconfig
|
||||
F: configs/linksprite_pcduino_defconfig
|
||||
|
||||
N: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
F: package/libgdiplus/
|
||||
|
6
Makefile
6
Makefile
@ -679,6 +679,10 @@ $(TARGETS_ROOTFS): target-finalize
|
||||
.PHONY: target-finalize
|
||||
target-finalize: $(PACKAGES)
|
||||
@$(call MESSAGE,"Finalizing target directory")
|
||||
# Check files that are touched by more than one package
|
||||
./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
|
||||
./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt
|
||||
./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt
|
||||
$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
|
||||
rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
|
||||
$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
|
||||
@ -789,7 +793,7 @@ legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p
|
||||
|
||||
.PHONY: show-targets
|
||||
show-targets:
|
||||
@echo $(PACKAGES) $(TARGETS_ROOTFS)
|
||||
@echo $(sort $(PACKAGES)) $(sort $(TARGETS_ROOTFS))
|
||||
|
||||
.PHONY: show-build-order
|
||||
show-build-order: $(patsubst %,%-show-build-order,$(PACKAGES))
|
||||
|
@ -79,6 +79,7 @@ config BR2_aarch64_be
|
||||
config BR2_bfin
|
||||
bool "Blackfin"
|
||||
select BR2_ARCH_HAS_FDPIC_SUPPORT
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
help
|
||||
The Blackfin is a family of 16 or 32-bit microprocessors developed,
|
||||
manufactured and marketed by Analog Devices.
|
||||
@ -261,6 +262,27 @@ config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
|
||||
bool
|
||||
default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
|
||||
|
||||
# The following symbols are selected by the individual
|
||||
# Config.in.$ARCH files
|
||||
config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
|
||||
bool
|
||||
|
||||
config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
|
||||
|
||||
config BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
|
||||
|
||||
config BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
|
||||
config BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
|
||||
# The following string values are defined by the individual
|
||||
# Config.in.$ARCH files
|
||||
config BR2_ARCH
|
||||
|
@ -59,7 +59,7 @@ config BR2_ARM_CPU_ARMV7A
|
||||
config BR2_ARM_CPU_ARMV7M
|
||||
bool
|
||||
|
||||
config BR2_ARM_CPU_ARMV8
|
||||
config BR2_ARM_CPU_ARMV8A
|
||||
bool
|
||||
|
||||
choice
|
||||
@ -68,20 +68,32 @@ choice
|
||||
help
|
||||
Specific CPU variant to use
|
||||
|
||||
if !BR2_ARCH_IS_64
|
||||
comment "armv4 cores"
|
||||
config BR2_arm920t
|
||||
bool "arm920t"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm922t
|
||||
bool "arm922t"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_fa526
|
||||
bool "fa526/626"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_strongarm
|
||||
bool "strongarm sa110/sa1100"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
|
||||
comment "armv5 cores"
|
||||
config BR2_arm926t
|
||||
bool "arm926t"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -89,14 +101,25 @@ config BR2_arm926t
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_iwmmxt
|
||||
bool "iwmmxt"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_xscale
|
||||
bool "xscale"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
|
||||
comment "armv6 cores"
|
||||
config BR2_arm1136j_s
|
||||
bool "arm1136j-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1136jf_s
|
||||
bool "arm1136jf-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -104,14 +127,12 @@ config BR2_arm1136jf_s
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1176jz_s
|
||||
bool "arm1176jz-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1176jzf_s
|
||||
bool "arm1176jzf-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -119,7 +140,6 @@ config BR2_arm1176jzf_s
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm11mpcore
|
||||
bool "mpcore"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -127,7 +147,8 @@ config BR2_arm11mpcore
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
|
||||
comment "armv7a cores"
|
||||
config BR2_cortex_a5
|
||||
bool "cortex-A5"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -136,7 +157,6 @@ config BR2_cortex_a5
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a7
|
||||
bool "cortex-A7"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -145,7 +165,6 @@ config BR2_cortex_a7
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a8
|
||||
bool "cortex-A8"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -154,7 +173,6 @@ config BR2_cortex_a8
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a9
|
||||
bool "cortex-A9"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -163,7 +181,6 @@ config BR2_cortex_a9
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a12
|
||||
bool "cortex-A12"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -172,7 +189,6 @@ config BR2_cortex_a12
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a15
|
||||
bool "cortex-A15"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -181,7 +197,6 @@ config BR2_cortex_a15
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a15_a7
|
||||
bool "cortex-A15/A7 big.LITTLE"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -190,7 +205,7 @@ config BR2_cortex_a15_a7
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
|
||||
config BR2_cortex_a17
|
||||
bool "cortex-A17"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -199,7 +214,7 @@ config BR2_cortex_a17
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_cortex_a17_a7
|
||||
bool "cortex-A17/A7 big.LITTLE"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -208,14 +223,52 @@ config BR2_cortex_a17_a7
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_pj4
|
||||
bool "pj4"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_VFPV3
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
|
||||
comment "armv7m cores"
|
||||
config BR2_cortex_m3
|
||||
bool "cortex-M3"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
config BR2_cortex_m4
|
||||
bool "cortex-M4"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
endif # !BR2_ARCH_IS_64
|
||||
|
||||
comment "armv8 cores"
|
||||
config BR2_cortex_a32
|
||||
bool "cortex-A32"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_NEON
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_cortex_a35
|
||||
bool "cortex-A35"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_cortex_a53
|
||||
bool "cortex-A53"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_a57
|
||||
bool "cortex-A57"
|
||||
@ -223,7 +276,7 @@ config BR2_cortex_a57
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_a57_a53
|
||||
bool "cortex-A57/A53 big.LITTLE"
|
||||
@ -231,66 +284,153 @@ config BR2_cortex_a57_a53
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_cortex_a72
|
||||
bool "cortex-A72"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_cortex_a72_a53
|
||||
bool "cortex-A72/A53 big.LITTLE"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_m3
|
||||
bool "cortex-M3"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_m4
|
||||
bool "cortex-M4"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_fa526
|
||||
bool "fa526/626"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_cortex_a73
|
||||
bool "cortex-A73"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_pj4
|
||||
bool "pj4"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_VFPV3
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_cortex_a73_a35
|
||||
bool "cortex-A73/A35 big.LITTLE"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_strongarm
|
||||
bool "strongarm sa110/sa1100"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_cortex_a73_a53
|
||||
bool "cortex-A73/A53 big.LITTLE"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_xscale
|
||||
bool "xscale"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_exynos_m1
|
||||
bool "exynos-m1"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_iwmmxt
|
||||
bool "iwmmxt"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_falkor
|
||||
bool "falkor"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_qdf24xx
|
||||
bool "qdf24xx"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
if BR2_ARCH_IS_64
|
||||
config BR2_thunderx
|
||||
bool "thunderx"
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_thunderxt81
|
||||
bool "thunderxt81"
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_thunderxt83
|
||||
bool "thunderxt83"
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_thunderxt88
|
||||
bool "thunderxt88"
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_thunderxt88p1
|
||||
bool "thunderxt88p1"
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
endif # BR2_ARCH_IS_64
|
||||
config BR2_xgene1
|
||||
bool "xgene1"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
|
||||
if BR2_ARCH_IS_64
|
||||
comment "armv8.1a cores"
|
||||
config BR2_thunderx2t99
|
||||
bool "thunderx2t99"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_thunderx2t99p1
|
||||
bool "thunderx2t99p1"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
config BR2_vulcan
|
||||
bool "vulcan"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
endif # BR2_ARCH_IS_64
|
||||
endchoice
|
||||
|
||||
config BR2_ARM_ENABLE_NEON
|
||||
@ -545,15 +685,23 @@ config BR2_ENDIAN
|
||||
default "BIG" if (BR2_armeb || BR2_aarch64_be)
|
||||
|
||||
config BR2_GCC_TARGET_CPU
|
||||
# armv4
|
||||
default "arm920t" if BR2_arm920t
|
||||
default "arm922t" if BR2_arm922t
|
||||
default "fa526" if BR2_fa526
|
||||
default "strongarm" if BR2_strongarm
|
||||
# armv5
|
||||
default "arm926ej-s" if BR2_arm926t
|
||||
default "iwmmxt" if BR2_iwmmxt
|
||||
default "xscale" if BR2_xscale
|
||||
# armv6
|
||||
default "arm1136j-s" if BR2_arm1136j_s
|
||||
default "arm1136jf-s" if BR2_arm1136jf_s
|
||||
default "arm1176jz-s" if BR2_arm1176jz_s
|
||||
default "arm1176jzf-s" if BR2_arm1176jzf_s
|
||||
default "mpcore" if BR2_arm11mpcore && BR2_ARM_CPU_HAS_VFPV2
|
||||
default "mpcorenovfp" if BR2_arm11mpcore
|
||||
# armv7a
|
||||
default "cortex-a5" if BR2_cortex_a5
|
||||
default "cortex-a7" if BR2_cortex_a7
|
||||
default "cortex-a8" if BR2_cortex_a8
|
||||
@ -563,18 +711,34 @@ config BR2_GCC_TARGET_CPU
|
||||
default "cortex-a15.cortex-a7" if BR2_cortex_a15_a7
|
||||
default "cortex-a17" if BR2_cortex_a17
|
||||
default "cortex-a17.cortex-a7" if BR2_cortex_a17_a7
|
||||
default "marvell-pj4" if BR2_pj4
|
||||
# armv7m
|
||||
default "cortex-m3" if BR2_cortex_m3
|
||||
default "cortex-m4" if BR2_cortex_m4
|
||||
default "fa526" if BR2_fa526
|
||||
default "marvell-pj4" if BR2_pj4
|
||||
default "strongarm" if BR2_strongarm
|
||||
default "xscale" if BR2_xscale
|
||||
default "iwmmxt" if BR2_iwmmxt
|
||||
# armv8a
|
||||
default "cortex-a32" if BR2_cortex_a32
|
||||
default "cortex-a35" if BR2_cortex_a35
|
||||
default "cortex-a53" if BR2_cortex_a53
|
||||
default "cortex-a57" if BR2_cortex_a57
|
||||
default "cortex-a57.cortex-a53" if BR2_cortex_a57_a53
|
||||
default "cortex-a72" if BR2_cortex_a72
|
||||
default "cortex-a72.cortex-a53" if BR2_cortex_a72_a53
|
||||
default "cortex-a73" if BR2_cortex_a73
|
||||
default "cortex-a73.cortex-a35" if BR2_cortex_a73_a35
|
||||
default "cortex-a73.cortex-a53" if BR2_cortex_a73_a53
|
||||
default "exynos-m1" if BR2_exynos_m1
|
||||
default "falkor" if BR2_falkor
|
||||
default "qdf24xx" if BR2_qdf24xx
|
||||
default "thunderx" if BR2_thunderx
|
||||
default "thunderxt81" if BR2_thunderxt81
|
||||
default "thunderxt83" if BR2_thunderxt83
|
||||
default "thunderxt88" if BR2_thunderxt88
|
||||
default "thunderxt88p1" if BR2_thunderxt88p1
|
||||
default "xgene1" if BR2_xgene1
|
||||
# armv8.1a
|
||||
default "thunderx2t99" if BR2_thunderx2t99
|
||||
default "thunderx2t99p1" if BR2_thunderx2t99p1
|
||||
default "vulcan" if BR2_vulcan
|
||||
|
||||
config BR2_GCC_TARGET_ABI
|
||||
default "aapcs-linux" if BR2_arm || BR2_armeb
|
||||
|
@ -7,9 +7,11 @@ config BR2_MIPS_CPU_MIPS32R2
|
||||
select BR2_MIPS_NAN_LEGACY
|
||||
config BR2_MIPS_CPU_MIPS32R5
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_MIPS_CPU_MIPS32R6
|
||||
bool
|
||||
select BR2_MIPS_NAN_2008
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_MIPS_CPU_MIPS64
|
||||
bool
|
||||
select BR2_MIPS_NAN_LEGACY
|
||||
@ -18,9 +20,11 @@ config BR2_MIPS_CPU_MIPS64R2
|
||||
select BR2_MIPS_NAN_LEGACY
|
||||
config BR2_MIPS_CPU_MIPS64R5
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
config BR2_MIPS_CPU_MIPS64R6
|
||||
bool
|
||||
select BR2_MIPS_NAN_2008
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
|
||||
choice
|
||||
prompt "Target Architecture Variant"
|
||||
@ -53,11 +57,13 @@ config BR2_mips_interaptiv
|
||||
bool "interAptiv"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R2
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_mips_m5150
|
||||
bool "M5150"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R5
|
||||
select BR2_MIPS_NAN_2008
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_mips_m6250
|
||||
bool "M6250"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
@ -101,6 +107,7 @@ config BR2_mips_i6400
|
||||
bool "I6400"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R6
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
config BR2_mips_p6600
|
||||
bool "P6600"
|
||||
depends on BR2_ARCH_IS_64
|
||||
@ -139,7 +146,7 @@ config BR2_MIPS_SOFT_FLOAT
|
||||
choice
|
||||
prompt "FP mode"
|
||||
depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
|
||||
default BR2_MIPS_FP32_MODE_XX if BR2_TOOLCHAIN_HAS_MFPXX_OPTION
|
||||
default BR2_MIPS_FP32_MODE_XX
|
||||
help
|
||||
MIPS32 supports different FP modes (32,xx,64). Information about FP
|
||||
modes can be found here:
|
||||
@ -152,7 +159,7 @@ config BR2_MIPS_FP32_MODE_32
|
||||
|
||||
config BR2_MIPS_FP32_MODE_XX
|
||||
bool "xx"
|
||||
depends on BR2_TOOLCHAIN_HAS_MFPXX_OPTION
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
|
||||
config BR2_MIPS_FP32_MODE_64
|
||||
bool "64"
|
||||
@ -169,10 +176,10 @@ config BR2_MIPS_NAN_LEGACY
|
||||
|
||||
config BR2_MIPS_NAN_2008
|
||||
bool
|
||||
select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
|
||||
|
||||
choice
|
||||
prompt "Target NaN"
|
||||
depends on BR2_TOOLCHAIN_HAS_MNAN_OPTION
|
||||
depends on BR2_mips_32r5 || BR2_mips_64r5
|
||||
default BR2_MIPS_ENABLE_NAN_2008
|
||||
help
|
||||
|
@ -1,185 +0,0 @@
|
||||
# CONFIG_LOCALVERSION_AUTO is not set
|
||||
# CONFIG_SWAP is not set
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EMBEDDED=y
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
CONFIG_SLAB=y
|
||||
CONFIG_PROFILING=y
|
||||
CONFIG_OPROFILE=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
# CONFIG_BLK_DEV_BSG is not set
|
||||
CONFIG_PARTITION_ADVANCED=y
|
||||
CONFIG_BSD_DISKLABEL=y
|
||||
# CONFIG_IOSCHED_CFQ is not set
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_MXS=y
|
||||
CONFIG_PREEMPT=y
|
||||
CONFIG_AEABI=y
|
||||
# CONFIG_OABI_COMPAT is not set
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_CPU_IDLE=y
|
||||
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_PNP=y
|
||||
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
||||
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
||||
# CONFIG_INET_XFRM_MODE_BEET is not set
|
||||
# CONFIG_INET_LRO is not set
|
||||
# CONFIG_INET_DIAG is not set
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_CAN=m
|
||||
CONFIG_CAN_VCAN=m
|
||||
CONFIG_CAN_FLEXCAN=m
|
||||
CONFIG_BT=m
|
||||
CONFIG_BT_RFCOMM=m
|
||||
CONFIG_BT_RFCOMM_TTY=y
|
||||
CONFIG_BT_BNEP=m
|
||||
CONFIG_BT_BNEP_MC_FILTER=y
|
||||
CONFIG_BT_BNEP_PROTO_FILTER=y
|
||||
CONFIG_BT_HIDP=m
|
||||
CONFIG_BT_HCIBTUSB=m
|
||||
CONFIG_CFG80211=m
|
||||
CONFIG_MAC80211=m
|
||||
CONFIG_MAC80211_RC_PID=y
|
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_DEVTMPFS=y
|
||||
CONFIG_DEVTMPFS_MOUNT=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_DATAFLASH=y
|
||||
CONFIG_MTD_M25P80=y
|
||||
# CONFIG_M25PXX_USE_FAST_READ is not set
|
||||
CONFIG_MTD_SST25L=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_GPMI_NAND=y
|
||||
CONFIG_MTD_UBI=y
|
||||
CONFIG_EEPROM_AT24=y
|
||||
CONFIG_EEPROM_AT25=y
|
||||
CONFIG_SCSI=y
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_CHR_DEV_ST=y
|
||||
CONFIG_BLK_DEV_SR=y
|
||||
CONFIG_CHR_DEV_SG=y
|
||||
CONFIG_CHR_DEV_SCH=y
|
||||
CONFIG_SCSI_MULTI_LUN=y
|
||||
CONFIG_SCSI_LOGGING=y
|
||||
CONFIG_SCSI_SCAN_ASYNC=y
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_RTL8187=m
|
||||
CONFIG_RT2X00=m
|
||||
CONFIG_RT73USB=m
|
||||
CONFIG_ZD1211RW=m
|
||||
CONFIG_INPUT_JOYDEV=y
|
||||
CONFIG_INPUT_EVDEV=y
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_UINPUT=m
|
||||
# CONFIG_SERIO_SERPORT is not set
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_AMBA_PL011=y
|
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_MXS_AUART=y
|
||||
CONFIG_TTY_PRINTK=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MXS=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_BITBANG=m
|
||||
CONFIG_SPI_MXS=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_HWMON=m
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_STMP3XXX_RTC_WATCHDOG=y
|
||||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_MEDIA_SUPPORT=m
|
||||
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MXS=y
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_LCD_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
# CONFIG_BACKLIGHT_GENERIC is not set
|
||||
CONFIG_BACKLIGHT_PWM=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
CONFIG_LOGO=y
|
||||
# CONFIG_LOGO_LINUX_MONO is not set
|
||||
# CONFIG_LOGO_LINUX_VGA16 is not set
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_DEBUG=y
|
||||
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
||||
CONFIG_USB_MON=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_ACM=y
|
||||
CONFIG_USB_PRINTER=y
|
||||
CONFIG_USB_WDM=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_CHIPIDEA=y
|
||||
CONFIG_USB_CHIPIDEA_UDC=y
|
||||
CONFIG_USB_CHIPIDEA_HOST=y
|
||||
CONFIG_USB_MXS_PHY=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_DEBUG_FILES=y
|
||||
CONFIG_USB_ETH=m
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_MXS=y
|
||||
CONFIG_NEW_LEDS=y
|
||||
CONFIG_LEDS_CLASS=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LEDS_TRIGGERS=y
|
||||
CONFIG_LEDS_TRIGGER_TIMER=y
|
||||
CONFIG_LEDS_TRIGGER_ONESHOT=y
|
||||
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
||||
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
||||
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_STMP=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_MXS_DMA=y
|
||||
CONFIG_STAGING=y
|
||||
CONFIG_MXS_LRADC=y
|
||||
CONFIG_IIO=y
|
||||
CONFIG_PWM=y
|
||||
CONFIG_PWM_MXS=y
|
||||
CONFIG_EXT2_FS=y
|
||||
CONFIG_EXT2_FS_XATTR=y
|
||||
CONFIG_EXT2_FS_POSIX_ACL=y
|
||||
CONFIG_EXT2_FS_SECURITY=y
|
||||
CONFIG_EXT2_FS_XIP=y
|
||||
CONFIG_EXT3_FS=y
|
||||
CONFIG_EXT3_FS_POSIX_ACL=y
|
||||
CONFIG_EXT3_FS_SECURITY=y
|
||||
CONFIG_AUTOFS4_FS=y
|
||||
CONFIG_ISO9660_FS=y
|
||||
CONFIG_JOLIET=y
|
||||
CONFIG_ZISOFS=y
|
||||
CONFIG_MSDOS_FS=y
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_UBIFS_FS=y
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NLS_CODEPAGE_437=y
|
||||
CONFIG_NLS_CODEPAGE_850=y
|
||||
CONFIG_NLS_ISO8859_1=y
|
||||
CONFIG_DEBUG_FS=y
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
# CONFIG_CRYPTO_HW is not set
|
||||
CONFIG_FONTS=y
|
||||
CONFIG_FONT_8x8=y
|
@ -1,20 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
echo --rootpath "${TARGET_DIR}"
|
||||
echo --tmppath "${GENIMAGE_TMP}"
|
||||
echo --inputpath "${BINARIES_DIR}"
|
||||
echo --outputpath "${BINARIES_DIR}"
|
||||
echo --config "${GENIMAGE_CFG}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
14
board/freescale/imx6slevk/readme.txt
Normal file
14
board/freescale/imx6slevk/readme.txt
Normal file
@ -0,0 +1,14 @@
|
||||
NXP i.MX6SL EVK board
|
||||
---------------------
|
||||
|
||||
To build a minimal support for this board:
|
||||
|
||||
$ make imx6slevk_defconfig
|
||||
$ make
|
||||
|
||||
Buildroot prepares a bootable "sdcard.img" image in the output/images/
|
||||
directory, ready to be flashed into the SD card:
|
||||
|
||||
$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
|
||||
|
||||
Then insert the SD card into the SD2 slot and boot the board.
|
14
board/freescale/imx6sxsdb/readme.txt
Normal file
14
board/freescale/imx6sxsdb/readme.txt
Normal file
@ -0,0 +1,14 @@
|
||||
NXP i.MX6SX SDB board
|
||||
---------------------
|
||||
|
||||
To build a minimal support for this board:
|
||||
|
||||
$ make imx6sx-sdb_defconfig
|
||||
$ make
|
||||
|
||||
Buildroot prepares a bootable "sdcard.img" image in the output/images/
|
||||
directory, ready to be flashed into the SD card:
|
||||
|
||||
$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
|
||||
|
||||
Then insert the SD card into the SD4 boot slot and boot the board.
|
@ -12,8 +12,18 @@ Build
|
||||
|
||||
First, configure Buildroot for your i.MX6UL EVK board:
|
||||
|
||||
In order to to do so there are two supported options:
|
||||
|
||||
make freescale_imx6ulevk_defconfig
|
||||
|
||||
if you plan to use NXP provided U-Boot and kernel.
|
||||
|
||||
or
|
||||
|
||||
make imx6ulevk_defconfig
|
||||
|
||||
if you plan to use mainline U-Boot and mainline kernel.
|
||||
|
||||
Build all components:
|
||||
|
||||
make
|
||||
|
@ -20,13 +20,13 @@ image flash.bin {
|
||||
}
|
||||
partition uimage {
|
||||
image = "uImage.da850-lego-ev3"
|
||||
size = 3M
|
||||
size = 4M
|
||||
offset = 0x50000
|
||||
}
|
||||
partition rootfs {
|
||||
image = "rootfs.squashfs"
|
||||
size = 9600K
|
||||
offset = 0x350000
|
||||
size = 10M
|
||||
offset = 0x450000
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -54,3 +54,9 @@ CONFIG_SQUASHFS=y
|
||||
CONFIG_SQUASHFS_LZ4=y
|
||||
CONFIG_SQUASHFS_LZO=y
|
||||
CONFIG_SQUASHFS_XZ=y
|
||||
CONFIG_DRM=y
|
||||
CONFIG_DRM_TILCDC=n
|
||||
CONFIG_DRM_DUMB_VGA_DAC=n
|
||||
CONFIG_DRM_TINYDRM=y
|
||||
CONFIG_TINYDRM_ST7586=y
|
||||
CONFIG_FB_DA8XX=n
|
||||
|
@ -1,56 +0,0 @@
|
||||
From 8a81ff173c5c9a0ab1df84fab17971dbcce8490a Mon Sep 17 00:00:00 2001
|
||||
From: David Lechner <david@lechnology.com>
|
||||
Date: Tue, 7 Feb 2017 13:22:07 -0600
|
||||
Subject: ARM: da850-lego-ev3: Add device tree node for A/DC
|
||||
|
||||
This adds a node for the TI ADS7957 analog/digital converter on LEGO
|
||||
MINDSTORMS EV3 as well as a regulator node that is used by the A/DC node.
|
||||
|
||||
Signed-off-by: David Lechner <david@lechnology.com>
|
||||
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
|
||||
---
|
||||
arch/arm/boot/dts/da850-lego-ev3.dts | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
index 112ec92..0309537 100644
|
||||
--- a/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
@@ -139,6 +139,19 @@
|
||||
enable-active-high;
|
||||
regulator-boot-on;
|
||||
};
|
||||
+
|
||||
+ /*
|
||||
+ * This is a simple voltage divider on VCC5V to provide a 2.5V
|
||||
+ * reference signal to the ADC.
|
||||
+ */
|
||||
+ adc_ref: regulator2 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "adc ref";
|
||||
+ regulator-min-microvolt = <2500000>;
|
||||
+ regulator-max-microvolt = <2500000>;
|
||||
+ regulator-boot-on;
|
||||
+ vin-supply = <&vcc5v>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&pmx_core {
|
||||
@@ -293,6 +306,14 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
+
|
||||
+ adc: adc@3 {
|
||||
+ compatible = "ti,ads7957";
|
||||
+ reg = <3>;
|
||||
+ #io-channel-cells = <1>;
|
||||
+ spi-max-frequency = <10000000>;
|
||||
+ vref-supply = <&adc_ref>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&gpio {
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -1,85 +0,0 @@
|
||||
From 7723d70bebd749ef24fef19db52d827c7fd7f858 Mon Sep 17 00:00:00 2001
|
||||
From: David Lechner <david@lechnology.com>
|
||||
Date: Tue, 7 Feb 2017 13:22:09 -0600
|
||||
Subject: ARM: da850-lego-ev3: Add device tree node for sound
|
||||
|
||||
This adds a device tree node for sound on LEGO MINDSTORMS EV3. The EV3
|
||||
uses one of the SoC PWMs connected to an amplifier to create sound from
|
||||
a speaker.
|
||||
|
||||
The PWM is passed through a low-pass filter, so it is actually possible
|
||||
to do PCM playback, but there is no existing driver, so just using
|
||||
pwm-beeper for now, since it is also a compatible mode of operation.
|
||||
|
||||
Signed-off-by: David Lechner <david@lechnology.com>
|
||||
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
|
||||
---
|
||||
arch/arm/boot/dts/da850-lego-ev3.dts | 31 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
index 0309537..c20580a 100644
|
||||
--- a/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
|
||||
@@ -123,6 +123,14 @@
|
||||
pinctrl-0 = <&system_power_pin>;
|
||||
};
|
||||
|
||||
+ sound {
|
||||
+ compatible = "pwm-beeper";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&ehrpwm0b_pins>;
|
||||
+ pwms = <&ehrpwm0 1 1000000 0>;
|
||||
+ amp-supply = <&>;
|
||||
+ };
|
||||
+
|
||||
/*
|
||||
* This is a 5V current limiting regulator that is shared by USB,
|
||||
* the sensor (input) ports, the motor (output) ports and the A/DC.
|
||||
@@ -152,6 +160,18 @@
|
||||
regulator-boot-on;
|
||||
vin-supply = <&vcc5v>;
|
||||
};
|
||||
+
|
||||
+ /*
|
||||
+ * This is the amplifier for the speaker.
|
||||
+ */
|
||||
+ amp: regulator3 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&_pins>;
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "amp";
|
||||
+ gpio = <&gpio 111 GPIO_ACTIVE_HIGH>;
|
||||
+ enable-active-high;
|
||||
+ };
|
||||
};
|
||||
|
||||
&pmx_core {
|
||||
@@ -208,6 +228,13 @@
|
||||
0x4c 0x00008000 0x0000f000
|
||||
>;
|
||||
};
|
||||
+
|
||||
+ amp_pins: pinmux_amp_pins {
|
||||
+ pinctrl-single,bits = <
|
||||
+ /* GP6[15] */
|
||||
+ 0x34 0x00000008 0x0000000f
|
||||
+ >;
|
||||
+ };
|
||||
};
|
||||
|
||||
&pinconf {
|
||||
@@ -316,6 +343,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&ehrpwm0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&gpio {
|
||||
status = "okay";
|
||||
};
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -0,0 +1,31 @@
|
||||
From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001
|
||||
From: David Lechner <david@lechnology.com>
|
||||
Date: Sun, 19 Nov 2017 19:54:32 -0600
|
||||
Subject: [PATCH] configs: legoev3: increase flash image sizes
|
||||
|
||||
This increases the kernel image to 4M and the rootfs image to 10M.
|
||||
|
||||
It is getting hard to get a kernel image to fit in 3M and the rootfs image
|
||||
size now matches the filesyssize variable.
|
||||
|
||||
Signed-off-by: David Lechner <david@lechnology.com>
|
||||
---
|
||||
include/configs/legoev3.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
|
||||
index 79fa3c4..2eeaf85 100644
|
||||
--- a/include/configs/legoev3.h
|
||||
+++ b/include/configs/legoev3.h
|
||||
@@ -204,7 +204,7 @@
|
||||
"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
|
||||
"mmcboot=bootm ${loadaddr}\0" \
|
||||
"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
|
||||
- "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
|
||||
+ "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
|
||||
"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
|
||||
"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
|
||||
"bootscript=source ${bootscraddr}\0" \
|
||||
--
|
||||
2.7.4
|
||||
|
@ -38,7 +38,7 @@ choice
|
||||
Select the specific U-Boot version you want to use
|
||||
|
||||
config BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
bool "2017.09"
|
||||
bool "2017.11"
|
||||
|
||||
config BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@ -86,7 +86,7 @@ endif
|
||||
|
||||
config BR2_TARGET_UBOOT_VERSION
|
||||
string
|
||||
default "2017.09" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default "2017.11" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
|
||||
if BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
|
||||
@ -334,13 +334,14 @@ config BR2_TARGET_UBOOT_SPL
|
||||
into DDR.
|
||||
|
||||
config BR2_TARGET_UBOOT_SPL_NAME
|
||||
string "U-Boot SPL binary image name"
|
||||
string "U-Boot SPL/TPL binary image name(s)"
|
||||
default "spl/u-boot-spl.bin"
|
||||
depends on BR2_TARGET_UBOOT_SPL
|
||||
help
|
||||
A space-separated list of SPL binaries, generated during
|
||||
u-boot build. For most platform it is spl/u-boot-spl.bin but
|
||||
not always. It is MLO on OMAP and SPL on i.MX6 for example.
|
||||
A space-separated list of SPL/TPL binaries, generated during
|
||||
u-boot build. For most platform SPL name is spl/u-boot-spl.bin
|
||||
and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is
|
||||
MLO on OMAP and SPL on i.MX6 for example.
|
||||
|
||||
config BR2_TARGET_UBOOT_ZYNQ_IMAGE
|
||||
bool "Generate image for Xilinx Zynq"
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744 u-boot-2017.09.tar.bz2
|
||||
sha256 6a018fd3caf58f3dcfa23ee989a82bd35df03af71872b9dca8c6d758a0d26c05 u-boot-2017.11.tar.bz2
|
||||
|
@ -2,8 +2,8 @@
|
||||
BR2_arm=y
|
||||
BR2_arm926t=y
|
||||
|
||||
# Linux headers same as kernel, a 4.4 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
|
||||
# Linux headers same as kernel, a 4.9 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_HOSTNAME="apf28"
|
||||
@ -13,9 +13,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-4.4.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.64"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
@ -6,7 +6,8 @@ BR2_arm926t=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
|
||||
# Creation of the SD card image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -15,7 +15,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
# Needed for usb-utils
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
# Creation of the SD card image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -8,7 +8,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
||||
BR2_PTHREAD_DEBUG=y
|
||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d27_som1_ek_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
|
||||
|
@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
|
||||
|
@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
# Needed for usb-utils
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
# Creation of the SD card image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -3,7 +3,8 @@ BR2_cortex_a5=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
|
||||
|
@ -17,7 +17,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
# Needed for usb-utils
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
# Creation of the SD card image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
|
||||
|
@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
# Needed for usb-utils
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
# Creation of the SD card image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
|
||||
# Linux headers same as kernel, a 4.13 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
|
||||
@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto"
|
||||
|
@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
|
||||
# Linux headers same as kernel, a 4.13 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
|
||||
|
@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
|
||||
# Linux headers same as kernel, a 4.13 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# Additional features needed for packages
|
||||
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
||||
@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
|
||||
|
26
configs/imx6slevk_defconfig
Normal file
26
configs/imx6slevk_defconfig
Normal file
@ -0,0 +1,26 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6slevk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
# required tools to create the SD card image
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
26
configs/imx6sx-sdb_defconfig
Normal file
26
configs/imx6sx-sdb_defconfig
Normal file
@ -0,0 +1,26 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
# required tools to create the SD card image
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
37
configs/imx6ulevk_defconfig
Normal file
37
configs/imx6ulevk_defconfig
Normal file
@ -0,0 +1,37 @@
|
||||
# architecture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_ARM_FPU_NEON_VFPV4=y
|
||||
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# system
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk"
|
||||
|
||||
# bootloader
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
|
||||
# required tools to create the SD card image
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# filesystem / image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
@ -9,13 +9,13 @@ BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches"
|
||||
BR2_TARGET_GENERIC_GETTY=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh"
|
||||
# Linux headers same as kernel, a 4.11 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="davinci_all"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment"
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000"
|
||||
@ -36,7 +36,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3"
|
||||
|
||||
# host
|
||||
|
@ -2,8 +2,8 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a8=y
|
||||
|
||||
# Linux headers same as kernel, a 4.12 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx53loco"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.12"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb"
|
||||
|
@ -3,8 +3,8 @@ BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
# Linux headers same as kernel, a 4.13 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh"
|
||||
@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard"
|
||||
|
@ -1,35 +1,48 @@
|
||||
# Architecture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_ARM_EABIHF=y
|
||||
# Linux headers same as kernel, a 4.1 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
|
||||
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System configuration
|
||||
BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
|
||||
BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
|
||||
BR2_TARGET_GENERIC_GETTY=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
BR2_PACKAGE_SUNXI_TOOLS=y
|
||||
BR2_PACKAGE_SUNXI_BOARDS=y
|
||||
BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex"
|
||||
|
||||
# Filesystem
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
|
||||
# Bootloaders
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
|
||||
BR2_TARGET_UBOOT_FORMAT_BIN=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
|
||||
BR2_TARGET_UBOOT_BOOT_SCRIPT=y
|
||||
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
|
||||
|
||||
# Additional tools
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
|
@ -3,8 +3,8 @@ BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_ARM_EABIHF=y
|
||||
|
||||
# Linux headers same as kernel, a 4.9 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System configuration
|
||||
BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
|
||||
@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
|
||||
|
@ -41,7 +41,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
|
||||
|
@ -2,8 +2,8 @@
|
||||
BR2_arm=y
|
||||
BR2_arm926t=y
|
||||
|
||||
# Linux headers same as kernel, a 4.9 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
|
||||
# Linux headers same as kernel, a 4.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino"
|
||||
BR2_TARGET_UBOOT_FORMAT_SD=y
|
||||
|
||||
|
@ -2,6 +2,7 @@ BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_ARM_FPU_VFPV4=y
|
||||
BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches"
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
|
||||
BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
|
||||
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
|
||||
@ -30,8 +31,10 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
|
||||
|
||||
# wireless driver
|
||||
# wireless driver and firmware
|
||||
BR2_PACKAGE_XR819_XRADIO=y
|
||||
BR2_PACKAGE_ARMBIAN_FIRMWARE=y
|
||||
BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y
|
||||
|
||||
# wireless support
|
||||
BR2_PACKAGE_IW=y
|
||||
|
@ -5,12 +5,12 @@ BR2_or1k=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||
|
||||
# Linux headers same as kernel, a 4,11 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
|
||||
# Linux headers same as kernel, a 4,14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.2"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux-4.11.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config"
|
||||
|
27
fs/common.mk
27
fs/common.mk
@ -19,10 +19,6 @@
|
||||
# ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
|
||||
# generating the filesystem image
|
||||
#
|
||||
# ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
|
||||
# run after running the main filesystem target. This is useful for
|
||||
# initramfs, to rebuild the kernel once the initramfs is generated.
|
||||
#
|
||||
# In terms of configuration option, this macro assumes that the
|
||||
# BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable
|
||||
# the generation of a filesystem image of a particular type. If
|
||||
@ -31,11 +27,12 @@
|
||||
# BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the
|
||||
# macro will automatically generate a compressed filesystem image.
|
||||
|
||||
FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
|
||||
FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
|
||||
FS_DIR = $(BUILD_DIR)/buildroot-fs
|
||||
FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs
|
||||
FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt
|
||||
ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
|
||||
$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
|
||||
USERS_TABLE = $(BUILD_DIR)/_users_table.txt
|
||||
USERS_TABLE = $(FS_DIR)/users_table.txt
|
||||
ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
|
||||
|
||||
# Since this function will be called from within an $(eval ...)
|
||||
@ -73,9 +70,8 @@ endif
|
||||
$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
|
||||
@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
|
||||
$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
|
||||
rm -f $$(FAKEROOT_SCRIPT)
|
||||
rm -f $$(TARGET_DIR_WARNING_FILE)
|
||||
rm -f $$(USERS_TABLE)
|
||||
rm -rf $(FS_DIR)
|
||||
mkdir -p $(FS_DIR)
|
||||
echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
|
||||
echo "set -e" >> $$(FAKEROOT_SCRIPT)
|
||||
echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
@ -104,9 +100,9 @@ endif
|
||||
$$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\
|
||||
$$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep))
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
rm -f $$(TARGET_DIR_WARNING_FILE)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
$$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
|
||||
-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
|
||||
ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
|
||||
PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
|
||||
endif
|
||||
@ -115,7 +111,7 @@ endif
|
||||
rootfs-$(1)-show-depends:
|
||||
@echo $$(ROOTFS_$(2)_DEPENDENCIES)
|
||||
|
||||
rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
|
||||
rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1)
|
||||
|
||||
.PHONY: rootfs-$(1) rootfs-$(1)-show-depends
|
||||
|
||||
@ -123,6 +119,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
|
||||
TARGETS_ROOTFS += rootfs-$(1)
|
||||
PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES))
|
||||
endif
|
||||
|
||||
# Check for legacy POST_TARGETS rules
|
||||
ifneq ($$(ROOTFS_$(2)_POST_TARGETS),)
|
||||
$$(error Filesystem $(1) uses post-target rules, which are no longer supported.\
|
||||
Update $(1) to use post-gen hooks instead)
|
||||
endif
|
||||
|
||||
endef
|
||||
|
||||
define ROOTFS_TARGET
|
||||
|
@ -31,12 +31,13 @@ define ROOTFS_CPIO_CMD
|
||||
cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
|
||||
endef
|
||||
|
||||
$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools
|
||||
$(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
|
||||
-C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
|
||||
ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot
|
||||
ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools
|
||||
define ROOTFS_CPIO_UBOOT_MKIMAGE
|
||||
$(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
|
||||
-C none -d $@$(ROOTFS_CPIO_COMPRESS_EXT) $@.uboot
|
||||
endef
|
||||
ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE
|
||||
endif
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,cpio))
|
||||
|
@ -36,13 +36,11 @@ define ROOTFS_EXT2_CMD
|
||||
}
|
||||
endef
|
||||
|
||||
rootfs-ext2-symlink:
|
||||
ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
|
||||
|
||||
.PHONY: rootfs-ext2-symlink
|
||||
|
||||
ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
|
||||
ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink
|
||||
define ROOTFS_EXT2_SYMLINK
|
||||
ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
|
||||
endef
|
||||
ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK
|
||||
endif
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,ext2))
|
||||
|
@ -5,17 +5,25 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ROOTFS_INITRAMFS_DEPENDENCIES += rootfs-cpio
|
||||
|
||||
ROOTFS_INITRAMFS_POST_TARGETS += linux-rebuild-with-initramfs
|
||||
|
||||
|
||||
# The generic fs infrastructure isn't very useful here.
|
||||
#
|
||||
# The initramfs image does not actually build an image; its only purpose is:
|
||||
# 1- to ensure rootfs.cpio is generated,
|
||||
# 2- to then rebuild the kernel with rootfs.cpio as initramfs
|
||||
#
|
||||
# Note: ordering of the dependencies is not guaranteed here, but in
|
||||
# linux/linux.mk, via the linux-rebuild-with-initramfs rule, which depends
|
||||
# on the rootfs-cpio filesystem rule.
|
||||
#
|
||||
# Note: the trick here is that we directly depend on rebuilding the Linux
|
||||
# kernel image (which itself depends on the rootfs-cpio rule), while we
|
||||
# advertise that our dependency is on the rootfs-cpio rule, which is
|
||||
# cleaner in the dependency graph.
|
||||
|
||||
rootfs-initramfs: $(ROOTFS_INITRAMFS_DEPENDENCIES) $(ROOTFS_INITRAMFS_POST_TARGETS)
|
||||
rootfs-initramfs: linux-rebuild-with-initramfs
|
||||
|
||||
rootfs-initramfs-show-depends:
|
||||
@echo $(ROOTFS_INITRAMFS_DEPENDENCIES)
|
||||
@echo rootfs-cpio
|
||||
|
||||
.PHONY: rootfs-initramfs rootfs-initramfs-show-depends
|
||||
|
||||
|
@ -35,7 +35,7 @@ ROOTFS_ISO9660_USE_INITRD = YES
|
||||
endif
|
||||
|
||||
ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
|
||||
ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/rootfs.iso9660.tmp
|
||||
ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
|
||||
define ROOTFS_ISO9660_CREATE_TEMPDIR
|
||||
$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
|
||||
mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
|
||||
|
@ -26,7 +26,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "Latest version (4.13)"
|
||||
bool "Latest version (4.14)"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
bool "Latest CIP SLTS version (v4.4.83-cip8)"
|
||||
@ -116,7 +116,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.13.16" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.14" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "v4.4.83-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
|
@ -484,18 +484,17 @@ endif # BR_BUILDING
|
||||
$(eval $(kconfig-package))
|
||||
|
||||
# Support for rebuilding the kernel after the cpio archive has
|
||||
# been generated in $(BINARIES_DIR)/rootfs.cpio.
|
||||
$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio
|
||||
# been generated.
|
||||
.PHONY: linux-rebuild-with-initramfs
|
||||
linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_target_installed
|
||||
linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_images_installed
|
||||
linux-rebuild-with-initramfs: rootfs-cpio
|
||||
linux-rebuild-with-initramfs:
|
||||
@$(call MESSAGE,"Rebuilding kernel with initramfs")
|
||||
# Build the kernel.
|
||||
$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
|
||||
$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME)
|
||||
$(LINUX_APPEND_DTB)
|
||||
# Copy the kernel image(s) to its(their) final destination
|
||||
$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
|
||||
# If there is a .ub file copy it to the final destination
|
||||
test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
|
||||
$(Q)touch $@
|
||||
|
||||
# The initramfs building code must make sure this target gets called
|
||||
# after it generated the initramfs list of files.
|
||||
linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
|
||||
|
@ -241,6 +241,7 @@ menu "Games"
|
||||
source "package/prboom/Config.in"
|
||||
source "package/rubix/Config.in"
|
||||
source "package/sl/Config.in"
|
||||
source "package/solarus/Config.in"
|
||||
source "package/stella/Config.in"
|
||||
source "package/supertux/Config.in"
|
||||
source "package/supertuxkart/Config.in"
|
||||
@ -369,6 +370,7 @@ menu "Firmware"
|
||||
source "package/wilc1000-firmware/Config.in"
|
||||
source "package/wilink-bt-firmware/Config.in"
|
||||
source "package/zd1211-firmware/Config.in"
|
||||
source "package/armbian-firmware/Config.in"
|
||||
endmenu
|
||||
source "package/a10disp/Config.in"
|
||||
source "package/acpica/Config.in"
|
||||
@ -788,6 +790,7 @@ menu "External python modules"
|
||||
source "package/python-ipython-genutils/Config.in"
|
||||
source "package/python-iso8601/Config.in"
|
||||
source "package/python-itsdangerous/Config.in"
|
||||
source "package/python-jaraco-classes/Config.in"
|
||||
source "package/python-jinja2/Config.in"
|
||||
source "package/python-jsonschema/Config.in"
|
||||
source "package/python-json-schema-validator/Config.in"
|
||||
@ -815,6 +818,7 @@ menu "External python modules"
|
||||
source "package/python-networkmanager/Config.in"
|
||||
source "package/python-nfc/Config.in"
|
||||
source "package/python-numpy/Config.in"
|
||||
source "package/python-oauthlib/Config.in"
|
||||
source "package/python-paho-mqtt/Config.in"
|
||||
source "package/python-pam/Config.in"
|
||||
source "package/python-paramiko/Config.in"
|
||||
@ -874,12 +878,15 @@ menu "External python modules"
|
||||
source "package/python-pyxb/Config.in"
|
||||
source "package/python-pyyaml/Config.in"
|
||||
source "package/python-pyzmq/Config.in"
|
||||
source "package/python-raven/Config.in"
|
||||
source "package/python-requests/Config.in"
|
||||
source "package/python-requests-oauthlib/Config.in"
|
||||
source "package/python-requests-toolbelt/Config.in"
|
||||
source "package/python-rpi-gpio/Config.in"
|
||||
source "package/python-rtslib-fb/Config.in"
|
||||
source "package/python-scandir/Config.in"
|
||||
source "package/python-scapy3k/Config.in"
|
||||
source "package/python-schedule/Config.in"
|
||||
source "package/python-sdnotify/Config.in"
|
||||
source "package/python-serial/Config.in"
|
||||
source "package/python-service-identity/Config.in"
|
||||
@ -1142,6 +1149,7 @@ menu "Graphics"
|
||||
source "package/tiff/Config.in"
|
||||
source "package/wayland/Config.in"
|
||||
source "package/wayland-protocols/Config.in"
|
||||
source "package/waylandpp/Config.in"
|
||||
source "package/webkitgtk/Config.in"
|
||||
source "package/webp/Config.in"
|
||||
source "package/zbar/Config.in"
|
||||
@ -1381,6 +1389,7 @@ menu "Networking"
|
||||
source "package/libtirpc/Config.in"
|
||||
source "package/libtorrent/Config.in"
|
||||
source "package/libupnp/Config.in"
|
||||
source "package/libupnp18/Config.in"
|
||||
source "package/libupnpp/Config.in"
|
||||
source "package/liburiparser/Config.in"
|
||||
source "package/libvncserver/Config.in"
|
||||
@ -1759,6 +1768,7 @@ endif
|
||||
source "package/rsync/Config.in"
|
||||
source "package/rtorrent/Config.in"
|
||||
source "package/rtptools/Config.in"
|
||||
source "package/rygel/Config.in"
|
||||
source "package/s6-dns/Config.in"
|
||||
source "package/s6-networking/Config.in"
|
||||
source "package/samba4/Config.in"
|
||||
@ -1916,6 +1926,7 @@ menu "System tools"
|
||||
source "package/keyutils/Config.in"
|
||||
source "package/kmod/Config.in"
|
||||
source "package/kvmtool/Config.in"
|
||||
source "package/libostree/Config.in"
|
||||
source "package/lxc/Config.in"
|
||||
source "package/monit/Config.in"
|
||||
source "package/ncdu/Config.in"
|
||||
|
21
package/armbian-firmware/Config.in
Normal file
21
package/armbian-firmware/Config.in
Normal file
@ -0,0 +1,21 @@
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE
|
||||
bool "armbian-firmware"
|
||||
help
|
||||
This package enables access to various firmware
|
||||
blobs from the Armbian firmware repository.
|
||||
|
||||
https://github.com/armbian/firmware
|
||||
|
||||
if BR2_PACKAGE_ARMBIAN_FIRMWARE
|
||||
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819
|
||||
bool "XR819 WiFi"
|
||||
help
|
||||
Firmware files for XR819 WiFi SDIO chip.
|
||||
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212
|
||||
bool "AP6212 WiFi/BT"
|
||||
help
|
||||
Firmware files for AP6212 WiFi/BT combo chip.
|
||||
|
||||
endif
|
2
package/armbian-firmware/armbian-firmware.hash
Normal file
2
package/armbian-firmware/armbian-firmware.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 876958ce6ba8a4a01a424f2b4455208b7a989eaba96015649c774340553f0c35 armbian-firmware-455d6b6701178dafe7fd0168eb4a4ef78a8d24a3.tar.gz
|
53
package/armbian-firmware/armbian-firmware.mk
Normal file
53
package/armbian-firmware/armbian-firmware.mk
Normal file
@ -0,0 +1,53 @@
|
||||
################################################################################
|
||||
#
|
||||
# armbian-firmware
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARMBIAN_FIRMWARE_VERSION = 455d6b6701178dafe7fd0168eb4a4ef78a8d24a3
|
||||
ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware
|
||||
ARMBIAN_FIRMWARE_SITE_METHOD = git
|
||||
|
||||
# XR819 WiFi firmware
|
||||
ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y)
|
||||
ARMBIAN_FIRMWARE_FILES += \
|
||||
xr819/boot_xr819.bin \
|
||||
xr819/fw_xr819.bin \
|
||||
xr819/sdd_xr819.bin
|
||||
endif
|
||||
|
||||
# AP6212 WiFi/BT combo firmware
|
||||
ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y)
|
||||
ARMBIAN_FIRMWARE_DIRS += ap6212
|
||||
endif
|
||||
|
||||
ifneq ($(ARMBIAN_FIRMWARE_FILES),)
|
||||
define ARMBIAN_FIRMWARE_INSTALL_FILES
|
||||
cd $(@D) ; \
|
||||
$(TAR) c $(sort $(ARMBIAN_FIRMWARE_FILES)) | \
|
||||
$(TAR) x -C $(TARGET_DIR)/lib/firmware
|
||||
endef
|
||||
endif
|
||||
|
||||
ifneq ($(ARMBIAN_FIRMWARE_DIRS),)
|
||||
# We need to rm -rf the destination directory to avoid copying
|
||||
# into it in itself, should we re-install the package.
|
||||
define ARMBIAN_FIRMWARE_INSTALL_DIRS
|
||||
$(foreach d,$(ARMBIAN_FIRMWARE_DIRS), \
|
||||
rm -rf $(TARGET_DIR)/lib/firmware/$(d); \
|
||||
cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep))
|
||||
endef
|
||||
endif
|
||||
|
||||
ifneq ($(ARMBIAN_FIRMWARE_FILES)$(ARMBIAN_FIRMWARE_DIRS),)
|
||||
ARMBIAN_FIRMWARE_LICENSE = PROPRIETARY
|
||||
ARMBIAN_FIRMWARE_REDISTRIBUTE = NO
|
||||
endif
|
||||
|
||||
define ARMBIAN_FIRMWARE_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/lib/firmware
|
||||
$(ARMBIAN_FIRMWARE_INSTALL_FILES)
|
||||
$(ARMBIAN_FIRMWARE_INSTALL_DIRS)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,4 +1,4 @@
|
||||
#Locally computed
|
||||
sha256 57b5ae5697f288b8e53286eacd1c6c2e88bd65db18df3d855332fc63b302fdae audit-2.7.8.tar.gz
|
||||
sha256 1becde92ff6e81798fa8878820ab2497d867036a6596f55109504b37c8b33b6c audit-2.8.1.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUDIT_VERSION = 2.7.8
|
||||
AUDIT_VERSION = 2.8.1
|
||||
AUDIT_SITE = http://people.redhat.com/sgrubb/audit
|
||||
AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||
AUDIT_LICENSE_FILES = COPYING COPYING.LIB
|
||||
|
@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 avahi-0.6.32.tar.gz
|
||||
sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz
|
||||
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE
|
||||
|
@ -4,14 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
#
|
||||
# This program is free software; you can redistribute it
|
||||
# and/or modify it under the terms of the GNU Lesser General
|
||||
# Public License as published by the Free Software Foundation
|
||||
# either version 2.1 of the License, or (at your option) any
|
||||
# later version.
|
||||
|
||||
AVAHI_VERSION = 0.6.32
|
||||
AVAHI_VERSION = 0.7
|
||||
AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION)
|
||||
AVAHI_LICENSE = LGPL-2.1+
|
||||
AVAHI_LICENSE_FILES = LICENSE
|
||||
|
@ -4,7 +4,7 @@ config BR2_PACKAGE_AXEL
|
||||
help
|
||||
HTTP/FTP download accelerator.
|
||||
|
||||
http://axel.alioth.debian.org/
|
||||
https://github.com/axel-download-accelerator/axel/
|
||||
|
||||
comment "axel needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
@ -1,2 +1 @@
|
||||
# Locally calculated
|
||||
sha256 359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036 axel-2.4.tar.gz
|
||||
sha256 bd65f8d8add34ab61ce1fb9e1c7b1c3449b1cfd981ce48aeee218e755ba0d6fb axel-2.16.tar.xz
|
||||
|
@ -4,33 +4,27 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AXEL_VERSION = 2.4
|
||||
AXEL_SITE = http://sources.buildroot.net
|
||||
AXEL_VERSION = 2.16
|
||||
AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION)
|
||||
AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz
|
||||
AXEL_LICENSE = GPL-2.0+
|
||||
AXEL_LICENSE_FILES = COPYING
|
||||
AXEL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
AXEL_LDFLAGS = -lpthread $(TARGET_NLS_LIBS)
|
||||
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
|
||||
AXEL_DISABLE_I18N = --i18n=0
|
||||
# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test
|
||||
# provided by autoconf relies on wchar_t.
|
||||
AXEL_CONF_OPTS = \
|
||||
ac_cv_prog_cc_c99=-std=c99 \
|
||||
CFLAGS="$(TARGET_CFLAGS)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBRESSL),y)
|
||||
AXEL_CONF_OPTS += --with-ssl
|
||||
AXEL_DEPENDENCIES += libressl
|
||||
else ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
AXEL_CONF_OPTS += --with-ssl
|
||||
AXEL_DEPENDENCIES += openssl
|
||||
else
|
||||
AXEL_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
define AXEL_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--debug=1 \
|
||||
$(AXEL_DISABLE_I18N) \
|
||||
)
|
||||
endef
|
||||
|
||||
define AXEL_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D)
|
||||
endef
|
||||
|
||||
define AXEL_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(autotools-package))
|
||||
|
@ -1,2 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz
|
||||
# Locally calculated after checking pgp signature from
|
||||
# http://ftp.gnu.org/gnu/bash/bash-4.4.12.tar.gz.sig
|
||||
sha256 57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331 bash-4.4.12.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BASH_VERSION = 4.4
|
||||
BASH_VERSION = 4.4.12
|
||||
BASH_SITE = $(BR2_GNU_MIRROR)/bash
|
||||
# Build after since bash is better than busybox shells
|
||||
BASH_DEPENDENCIES = ncurses readline host-bison \
|
||||
|
@ -1,64 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-001
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-001
|
||||
|
||||
Bug-Reported-by: Sean Zha <freeman_cha@hotmail.com>
|
||||
Bug-Reference-ID: <BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.4 changed the way the history list is initially allocated to reduce
|
||||
the number of reallocations and copies. Users who set HISTSIZE to a very
|
||||
large number to essentially unlimit the size of the history list will get
|
||||
memory allocation errors
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
|
||||
--- b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
|
||||
***************
|
||||
*** 58,61 ****
|
||||
--- 58,63 ----
|
||||
#define DEFAULT_HISTORY_INITIAL_SIZE 502
|
||||
|
||||
+ #define MAX_HISTORY_INITIAL_SIZE 8192
|
||||
+
|
||||
/* The number of slots to increase the_history by. */
|
||||
#define DEFAULT_HISTORY_GROW_SIZE 50
|
||||
***************
|
||||
*** 308,312 ****
|
||||
{
|
||||
if (history_stifled && history_max_entries > 0)
|
||||
! history_size = history_max_entries + 2;
|
||||
else
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
--- 310,316 ----
|
||||
{
|
||||
if (history_stifled && history_max_entries > 0)
|
||||
! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
|
||||
! ? MAX_HISTORY_INITIAL_SIZE
|
||||
! : history_max_entries + 2;
|
||||
else
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 0
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,73 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-002
|
||||
|
||||
Bug-Reported-by: Eric Pruitt <eric.pruitt@gmail.com>
|
||||
Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.4 warns when discarding NUL bytes in command substitution output
|
||||
instead of silently dropping them. This patch changes the warnings from
|
||||
one per NUL byte encountered to one warning per command substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||
--- b/subst.c 2016-09-26 10:20:19.000000000 -0400
|
||||
***************
|
||||
*** 5932,5935 ****
|
||||
--- 5933,5937 ----
|
||||
int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
|
||||
ssize_t bufn;
|
||||
+ int nullbyte;
|
||||
|
||||
istring = (char *)NULL;
|
||||
***************
|
||||
*** 5939,5942 ****
|
||||
--- 5941,5946 ----
|
||||
skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
|
||||
|
||||
+ nullbyte = 0;
|
||||
+
|
||||
/* Read the output of the command through the pipe. This may need to be
|
||||
changed to understand multibyte characters in the future. */
|
||||
***************
|
||||
*** 5957,5961 ****
|
||||
{
|
||||
#if 1
|
||||
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||
#endif
|
||||
continue;
|
||||
--- 5961,5969 ----
|
||||
{
|
||||
#if 1
|
||||
! if (nullbyte == 0)
|
||||
! {
|
||||
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||
! nullbyte = 1;
|
||||
! }
|
||||
#endif
|
||||
continue;
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,62 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-003
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-003
|
||||
|
||||
Bug-Reported-by: op7ic \x00 <op7ica@gmail.com>
|
||||
Bug-Reference-ID: <CAFHyJTopWC5Jx+U7WcvxSZKu+KrqSf+_3sHPiRWo=VzXSiPq=w@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Specially-crafted input, in this case an incomplete pathname expansion
|
||||
bracket expression containing an invalid collating symbol, can cause the
|
||||
shell to crash.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400
|
||||
--- b/lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400
|
||||
***************
|
||||
*** 331,334 ****
|
||||
--- 331,340 ----
|
||||
if (p[pc] == L('.') && p[pc+1] == L(']'))
|
||||
break;
|
||||
+ if (p[pc] == 0)
|
||||
+ {
|
||||
+ if (vp)
|
||||
+ *vp = INVALID;
|
||||
+ return (p + pc);
|
||||
+ }
|
||||
val = COLLSYM (p, pc);
|
||||
if (vp)
|
||||
***************
|
||||
*** 484,487 ****
|
||||
--- 490,496 ----
|
||||
c = FOLD (c);
|
||||
|
||||
+ if (c == L('\0'))
|
||||
+ return ((test == L('[')) ? savep : (CHAR *)0);
|
||||
+
|
||||
if ((flags & FNM_PATHNAME) && c == L('/'))
|
||||
/* [/] can never match when matching a pathname. */
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,88 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-004
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-004
|
||||
|
||||
Bug-Reported-by: Christian Weisgerber <naddy@mips.inka.de>
|
||||
Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a race condition that can result in bash referencing freed memory
|
||||
when freeing data associated with the last process substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400
|
||||
--- b/jobs.c 2016-11-02 18:24:45.000000000 -0400
|
||||
***************
|
||||
*** 454,457 ****
|
||||
--- 454,472 ----
|
||||
}
|
||||
|
||||
+ void
|
||||
+ discard_last_procsub_child ()
|
||||
+ {
|
||||
+ PROCESS *disposer;
|
||||
+ sigset_t set, oset;
|
||||
+
|
||||
+ BLOCK_CHILD (set, oset);
|
||||
+ disposer = last_procsub_child;
|
||||
+ last_procsub_child = (PROCESS *)NULL;
|
||||
+ UNBLOCK_CHILD (oset);
|
||||
+
|
||||
+ if (disposer)
|
||||
+ discard_pipeline (disposer);
|
||||
+ }
|
||||
+
|
||||
struct pipeline_saver *
|
||||
alloc_pipeline_saver ()
|
||||
*** a/bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400
|
||||
--- b/jobs.h 2016-11-02 18:25:08.000000000 -0400
|
||||
***************
|
||||
*** 191,194 ****
|
||||
--- 191,195 ----
|
||||
extern void stop_making_children __P((void));
|
||||
extern void cleanup_the_pipeline __P((void));
|
||||
+ extern void discard_last_procsub_child __P((void));
|
||||
extern void save_pipeline __P((int));
|
||||
extern PROCESS *restore_pipeline __P((int));
|
||||
*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||
--- b/subst.c 2016-11-02 18:23:24.000000000 -0400
|
||||
***************
|
||||
*** 5809,5816 ****
|
||||
#if defined (JOB_CONTROL)
|
||||
if (last_procsub_child)
|
||||
! {
|
||||
! discard_pipeline (last_procsub_child);
|
||||
! last_procsub_child = (PROCESS *)NULL;
|
||||
! }
|
||||
last_procsub_child = restore_pipeline (0);
|
||||
#endif
|
||||
--- 5834,5838 ----
|
||||
#if defined (JOB_CONTROL)
|
||||
if (last_procsub_child)
|
||||
! discard_last_procsub_child ();
|
||||
last_procsub_child = restore_pipeline (0);
|
||||
#endif
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,51 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-005
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-005
|
||||
|
||||
Bug-Reported-by: Dr. Werner Fink <werner@suse.de>
|
||||
Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Under certain circumstances, a simple command is optimized to eliminate a
|
||||
fork, resulting in an EXIT trap not being executed.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400
|
||||
--- b/builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500
|
||||
***************
|
||||
*** 105,114 ****
|
||||
*bash_input.location.string == '\0' &&
|
||||
command->type == cm_simple &&
|
||||
- #if 0
|
||||
signal_is_trapped (EXIT_TRAP) == 0 &&
|
||||
signal_is_trapped (ERROR_TRAP) == 0 &&
|
||||
- #else
|
||||
any_signals_trapped () < 0 &&
|
||||
- #endif
|
||||
command->redirects == 0 && command->value.Simple->redirects == 0 &&
|
||||
((command->flags & CMD_TIME_PIPELINE) == 0) &&
|
||||
--- 105,111 ----
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,63 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-006
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-006
|
||||
|
||||
Bug-Reported-by: <fernando@null-life.com>
|
||||
Bug-Reference-ID: <CAEr-gPFPvqheiAeENmMkEwWRd4U=1iqCsYmR3sLdULOqL++_tQ@mail.gmail.com>
|
||||
Bug-Reference-URL:
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Out-of-range negative offsets to popd can cause the shell to crash attempting
|
||||
to free an invalid memory block.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
|
||||
--- b/builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
|
||||
***************
|
||||
*** 366,370 ****
|
||||
}
|
||||
|
||||
! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
|
||||
{
|
||||
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
--- b/366,370 ----
|
||||
}
|
||||
|
||||
! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
|
||||
{
|
||||
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
***************
|
||||
*** 388,391 ****
|
||||
--- b/388,396 ----
|
||||
of the list into place. */
|
||||
i = (direction == '+') ? directory_list_offset - which : which;
|
||||
+ if (i < 0 || i > directory_list_offset)
|
||||
+ {
|
||||
+ pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
+ return (EXECUTION_FAILURE);
|
||||
+ }
|
||||
free (pushd_directory_list[i]);
|
||||
directory_list_offset--;
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 6
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,155 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-007
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-007
|
||||
|
||||
Bug-Reported-by: Jens Heyens <jens.heyens@cispa.saarland>
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://savannah.gnu.org/support/?109224
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When performing filename completion, bash dequotes the directory name being
|
||||
completed, which can result in match failures and potential unwanted
|
||||
expansion.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/bashline.c 2016-08-05 21:44:05.000000000 -0400
|
||||
--- b/bashline.c 2017-01-19 13:15:51.000000000 -0500
|
||||
***************
|
||||
*** 143,147 ****
|
||||
static void restore_directory_hook __P((rl_icppfunc_t));
|
||||
|
||||
! static int directory_exists __P((const char *));
|
||||
|
||||
static void cleanup_expansion_error __P((void));
|
||||
--- b/144,148 ----
|
||||
static void restore_directory_hook __P((rl_icppfunc_t));
|
||||
|
||||
! static int directory_exists __P((const char *, int));
|
||||
|
||||
static void cleanup_expansion_error __P((void));
|
||||
***************
|
||||
*** 3103,3111 ****
|
||||
}
|
||||
|
||||
! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash
|
||||
! removed, exists. */
|
||||
static int
|
||||
! directory_exists (dirname)
|
||||
const char *dirname;
|
||||
{
|
||||
char *new_dirname;
|
||||
--- b/3107,3116 ----
|
||||
}
|
||||
|
||||
! /* Check whether not DIRNAME, with any trailing slash removed, exists. If
|
||||
! SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */
|
||||
static int
|
||||
! directory_exists (dirname, should_dequote)
|
||||
const char *dirname;
|
||||
+ int should_dequote;
|
||||
{
|
||||
char *new_dirname;
|
||||
***************
|
||||
*** 3113,3118 ****
|
||||
struct stat sb;
|
||||
|
||||
! /* First, dequote the directory name */
|
||||
! new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character);
|
||||
dirlen = STRLEN (new_dirname);
|
||||
if (new_dirname[dirlen - 1] == '/')
|
||||
--- b/3118,3124 ----
|
||||
struct stat sb;
|
||||
|
||||
! /* We save the string and chop the trailing slash because stat/lstat behave
|
||||
! inconsistently if one is present. */
|
||||
! new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname);
|
||||
dirlen = STRLEN (new_dirname);
|
||||
if (new_dirname[dirlen - 1] == '/')
|
||||
***************
|
||||
*** 3146,3150 ****
|
||||
should_expand_dirname = '`';
|
||||
|
||||
! if (should_expand_dirname && directory_exists (local_dirname))
|
||||
should_expand_dirname = 0;
|
||||
|
||||
--- b/3152,3156 ----
|
||||
should_expand_dirname = '`';
|
||||
|
||||
! if (should_expand_dirname && directory_exists (local_dirname, 0))
|
||||
should_expand_dirname = 0;
|
||||
|
||||
***************
|
||||
*** 3156,3160 ****
|
||||
global_nounset = unbound_vars_is_error;
|
||||
unbound_vars_is_error = 0;
|
||||
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
|
||||
unbound_vars_is_error = global_nounset;
|
||||
if (wl)
|
||||
--- b/3162,3166 ----
|
||||
global_nounset = unbound_vars_is_error;
|
||||
unbound_vars_is_error = 0;
|
||||
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
|
||||
unbound_vars_is_error = global_nounset;
|
||||
if (wl)
|
||||
***************
|
||||
*** 3245,3249 ****
|
||||
}
|
||||
|
||||
! if (should_expand_dirname && directory_exists (local_dirname))
|
||||
should_expand_dirname = 0;
|
||||
|
||||
--- b/3262,3266 ----
|
||||
}
|
||||
|
||||
! if (should_expand_dirname && directory_exists (local_dirname, 1))
|
||||
should_expand_dirname = 0;
|
||||
|
||||
***************
|
||||
*** 3251,3255 ****
|
||||
{
|
||||
new_dirname = savestring (local_dirname);
|
||||
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
|
||||
if (wl)
|
||||
{
|
||||
--- b/3268,3272 ----
|
||||
{
|
||||
new_dirname = savestring (local_dirname);
|
||||
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
|
||||
if (wl)
|
||||
{
|
||||
*** bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||
--- b/subst.c 2017-01-19 07:09:57.000000000 -0500
|
||||
***************
|
||||
*** 9459,9462 ****
|
||||
--- b/9459,9466 ----
|
||||
if (word->flags & W_COMPLETE)
|
||||
tword->flags |= W_COMPLETE; /* for command substitutions */
|
||||
+ if (word->flags & W_NOCOMSUB)
|
||||
+ tword->flags |= W_NOCOMSUB;
|
||||
+ if (word->flags & W_NOPROCSUB)
|
||||
+ tword->flags |= W_NOPROCSUB;
|
||||
|
||||
temp = (char *)NULL;
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 6
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 7
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,88 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-008
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-008
|
||||
|
||||
Bug-Reported-by: Koichi MURASE <myoga.murase@gmail.com>
|
||||
Bug-Reference-ID: <CAFLRLk-V+1AeQ2k=pY7ih6V+MfQ_w8EF3YWL2E+wmLfgKBtzXA@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Under certain circumstances, bash will evaluate arithmetic expressions as
|
||||
part of reading an expression token even when evaluation is suppressed. This
|
||||
happens while evaluating a conditional expression and skipping over the
|
||||
failed branch of the expression.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/expr.c 2015-10-11 14:46:36.000000000 -0400
|
||||
--- b/expr.c 2016-11-08 11:55:46.000000000 -0500
|
||||
***************
|
||||
*** 579,585 ****
|
||||
if (curtok == QUES) /* found conditional expr */
|
||||
{
|
||||
- readtok ();
|
||||
- if (curtok == 0 || curtok == COL)
|
||||
- evalerror (_("expression expected"));
|
||||
if (cval == 0)
|
||||
{
|
||||
--- b/579,582 ----
|
||||
***************
|
||||
*** 588,591 ****
|
||||
--- b/585,592 ----
|
||||
}
|
||||
|
||||
+ readtok ();
|
||||
+ if (curtok == 0 || curtok == COL)
|
||||
+ evalerror (_("expression expected"));
|
||||
+
|
||||
val1 = EXP_HIGHEST ();
|
||||
|
||||
***************
|
||||
*** 594,600 ****
|
||||
if (curtok != COL)
|
||||
evalerror (_("`:' expected for conditional expression"));
|
||||
! readtok ();
|
||||
! if (curtok == 0)
|
||||
! evalerror (_("expression expected"));
|
||||
set_noeval = 0;
|
||||
if (cval)
|
||||
--- b/595,599 ----
|
||||
if (curtok != COL)
|
||||
evalerror (_("`:' expected for conditional expression"));
|
||||
!
|
||||
set_noeval = 0;
|
||||
if (cval)
|
||||
***************
|
||||
*** 604,608 ****
|
||||
--- b/603,611 ----
|
||||
}
|
||||
|
||||
+ readtok ();
|
||||
+ if (curtok == 0)
|
||||
+ evalerror (_("expression expected"));
|
||||
val2 = expcond ();
|
||||
+
|
||||
if (set_noeval)
|
||||
noeval--;
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 7
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 8
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,111 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-009
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-009
|
||||
|
||||
Bug-Reported-by: Hong Cho <hong.cho@citrix.com>
|
||||
Bug-Reference-ID: <c30b5fe62b2543af8297e47ca487c29c@SJCPEX02CL02.citrite.net>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a race condition in add_history() that can be triggered by a fatal
|
||||
signal arriving between the time the history length is updated and the time
|
||||
the history list update is completed. A later attempt to reference an
|
||||
invalid history entry can cause a crash.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/lib/readline/history.c 2016-11-11 13:42:49.000000000 -0500
|
||||
--- b/lib/readline/history.c 2016-12-05 10:37:51.000000000 -0500
|
||||
***************
|
||||
*** 280,283 ****
|
||||
--- b/280,284 ----
|
||||
{
|
||||
HIST_ENTRY *temp;
|
||||
+ int new_length;
|
||||
|
||||
if (history_stifled && (history_length == history_max_entries))
|
||||
***************
|
||||
*** 296,306 ****
|
||||
/* Copy the rest of the entries, moving down one slot. Copy includes
|
||||
trailing NULL. */
|
||||
- #if 0
|
||||
- for (i = 0; i < history_length; i++)
|
||||
- the_history[i] = the_history[i + 1];
|
||||
- #else
|
||||
memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
|
||||
- #endif
|
||||
|
||||
history_base++;
|
||||
}
|
||||
--- b/297,303 ----
|
||||
/* Copy the rest of the entries, moving down one slot. Copy includes
|
||||
trailing NULL. */
|
||||
memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
|
||||
|
||||
+ new_length = history_length;
|
||||
history_base++;
|
||||
}
|
||||
***************
|
||||
*** 316,320 ****
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
|
||||
! history_length = 1;
|
||||
}
|
||||
else
|
||||
--- b/313,317 ----
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
|
||||
! new_length = 1;
|
||||
}
|
||||
else
|
||||
***************
|
||||
*** 326,330 ****
|
||||
xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
|
||||
}
|
||||
! history_length++;
|
||||
}
|
||||
}
|
||||
--- b/323,327 ----
|
||||
xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
|
||||
}
|
||||
! new_length = history_length + 1;
|
||||
}
|
||||
}
|
||||
***************
|
||||
*** 332,337 ****
|
||||
temp = alloc_history_entry ((char *)string, hist_inittime ());
|
||||
|
||||
! the_history[history_length] = (HIST_ENTRY *)NULL;
|
||||
! the_history[history_length - 1] = temp;
|
||||
}
|
||||
|
||||
--- b/329,335 ----
|
||||
temp = alloc_history_entry ((char *)string, hist_inittime ());
|
||||
|
||||
! the_history[new_length] = (HIST_ENTRY *)NULL;
|
||||
! the_history[new_length - 1] = temp;
|
||||
! history_length = new_length;
|
||||
}
|
||||
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 8
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 9
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,53 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-010
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-010
|
||||
|
||||
Bug-Reported-by: Clark Wang <dearvoid@gmail.com>
|
||||
Bug-Reference-ID: <CADv8-og092RvvUUHy46=BPKChCXw5g=GOOqgN0V3f4a3TpLebQ@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Depending on compiler optimizations and behavior, the `read' builtin may not
|
||||
save partial input when a timeout occurs.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/builtins/read.def 2016-05-16 14:24:56.000000000 -0400
|
||||
--- b/builtins/read.def 2016-11-25 12:37:56.000000000 -0500
|
||||
***************
|
||||
*** 182,186 ****
|
||||
{
|
||||
register char *varname;
|
||||
! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
|
||||
int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
|
||||
int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
|
||||
--- b/182,187 ----
|
||||
{
|
||||
register char *varname;
|
||||
! int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
|
||||
! volatile int i;
|
||||
int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
|
||||
int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
|
||||
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 9
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 10
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,54 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-011
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-011
|
||||
|
||||
Bug-Reported-by: Russell King <rmk@armlinux.org.uk>
|
||||
Bug-Reference-ID: <E1cNnFx-0007G2-S2@flint.armlinux.org.uk>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Subshells begun to run command and process substitutions may attempt to
|
||||
set the terminal's process group to an incorrect value if they receive
|
||||
a fatal signal. This depends on the behavior of the process that starts
|
||||
the shell.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/sig.c 2016-02-11 15:02:45.000000000 -0500
|
||||
--- b/sig.c 2017-01-04 09:09:47.000000000 -0500
|
||||
***************
|
||||
*** 586,590 ****
|
||||
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
|
||||
hangup_all_jobs ();
|
||||
! end_job_control ();
|
||||
#endif /* JOB_CONTROL */
|
||||
|
||||
--- b/571,576 ----
|
||||
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
|
||||
hangup_all_jobs ();
|
||||
! if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
|
||||
! end_job_control ();
|
||||
#endif /* JOB_CONTROL */
|
||||
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 10
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 11
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,165 +0,0 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-012
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-012
|
||||
|
||||
Bug-Reported-by: Clark Wang <dearvoid@gmail.com>
|
||||
Bug-Reference-ID: <CADv8-ojttPUFOZXqbjsvy83LfaJtQKZ5qejGdF6j0VJ3vtrYOA@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When -N is used, the input is not supposed to be split using $IFS, but
|
||||
leading and trailing IFS whitespace was still removed.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/subst.c 2017-01-20 14:22:01.000000000 -0500
|
||||
--- b/subst.c 2017-01-25 13:43:22.000000000 -0500
|
||||
***************
|
||||
*** 2826,2834 ****
|
||||
/* Parse a single word from STRING, using SEPARATORS to separate fields.
|
||||
ENDPTR is set to the first character after the word. This is used by
|
||||
! the `read' builtin. This is never called with SEPARATORS != $IFS;
|
||||
! it should be simplified.
|
||||
|
||||
XXX - this function is very similar to list_string; they should be
|
||||
combined - XXX */
|
||||
char *
|
||||
get_word_from_string (stringp, separators, endptr)
|
||||
--- b/2826,2838 ----
|
||||
/* Parse a single word from STRING, using SEPARATORS to separate fields.
|
||||
ENDPTR is set to the first character after the word. This is used by
|
||||
! the `read' builtin.
|
||||
!
|
||||
! This is never called with SEPARATORS != $IFS, and takes advantage of that.
|
||||
|
||||
XXX - this function is very similar to list_string; they should be
|
||||
combined - XXX */
|
||||
+
|
||||
+ #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0)
|
||||
+
|
||||
char *
|
||||
get_word_from_string (stringp, separators, endptr)
|
||||
***************
|
||||
*** 2838,2841 ****
|
||||
--- b/2842,2846 ----
|
||||
char *current_word;
|
||||
int sindex, sh_style_split, whitesep, xflags;
|
||||
+ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */
|
||||
size_t slen;
|
||||
|
||||
***************
|
||||
*** 2847,2854 ****
|
||||
separators[2] == '\n' &&
|
||||
separators[3] == '\0';
|
||||
! for (xflags = 0, s = ifs_value; s && *s; s++)
|
||||
{
|
||||
if (*s == CTLESC) xflags |= SX_NOCTLESC;
|
||||
if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
|
||||
}
|
||||
|
||||
--- b/2852,2861 ----
|
||||
separators[2] == '\n' &&
|
||||
separators[3] == '\0';
|
||||
! memset (local_cmap, '\0', sizeof (local_cmap));
|
||||
! for (xflags = 0, s = separators; s && *s; s++)
|
||||
{
|
||||
if (*s == CTLESC) xflags |= SX_NOCTLESC;
|
||||
if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
|
||||
+ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */
|
||||
}
|
||||
|
||||
***************
|
||||
*** 2857,2864 ****
|
||||
|
||||
/* Remove sequences of whitespace at the beginning of STRING, as
|
||||
! long as those characters appear in IFS. */
|
||||
! if (sh_style_split || !separators || !*separators)
|
||||
{
|
||||
! for (; *s && spctabnl (*s) && isifs (*s); s++);
|
||||
|
||||
/* If the string is nothing but whitespace, update it and return. */
|
||||
--- b/2864,2872 ----
|
||||
|
||||
/* Remove sequences of whitespace at the beginning of STRING, as
|
||||
! long as those characters appear in SEPARATORS. This happens if
|
||||
! SEPARATORS == $' \t\n' or if IFS is unset. */
|
||||
! if (sh_style_split || separators == 0)
|
||||
{
|
||||
! for (; *s && spctabnl (*s) && islocalsep (*s); s++);
|
||||
|
||||
/* If the string is nothing but whitespace, update it and return. */
|
||||
***************
|
||||
*** 2879,2885 ****
|
||||
This obeys the field splitting rules in Posix.2. */
|
||||
sindex = 0;
|
||||
! /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
|
||||
! unless multibyte chars are possible. */
|
||||
! slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
|
||||
current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
|
||||
|
||||
--- b/2887,2893 ----
|
||||
This obeys the field splitting rules in Posix.2. */
|
||||
sindex = 0;
|
||||
! /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
|
||||
! possible, but need it in string_extract_verbatim for bounds checking */
|
||||
! slen = STRLEN (s);
|
||||
current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
|
||||
|
||||
***************
|
||||
*** 2900,2904 ****
|
||||
/* Now skip sequences of space, tab, or newline characters if they are
|
||||
in the list of separators. */
|
||||
! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
|
||||
sindex++;
|
||||
|
||||
--- b/2908,2912 ----
|
||||
/* Now skip sequences of space, tab, or newline characters if they are
|
||||
in the list of separators. */
|
||||
! while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
|
||||
sindex++;
|
||||
|
||||
***************
|
||||
*** 2907,2916 ****
|
||||
delimiter, not a separate delimiter that would result in an empty field.
|
||||
Look at POSIX.2, 3.6.5, (3)(b). */
|
||||
! if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
|
||||
{
|
||||
sindex++;
|
||||
/* An IFS character that is not IFS white space, along with any adjacent
|
||||
IFS white space, shall delimit a field. */
|
||||
! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
|
||||
sindex++;
|
||||
}
|
||||
--- b/2915,2924 ----
|
||||
delimiter, not a separate delimiter that would result in an empty field.
|
||||
Look at POSIX.2, 3.6.5, (3)(b). */
|
||||
! if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
|
||||
{
|
||||
sindex++;
|
||||
/* An IFS character that is not IFS white space, along with any adjacent
|
||||
IFS white space, shall delimit a field. */
|
||||
! while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
|
||||
sindex++;
|
||||
}
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 11
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 12
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -2,8 +2,8 @@ comment "Binutils Options"
|
||||
|
||||
choice
|
||||
prompt "Binutils Version"
|
||||
default BR2_BINUTILS_VERSION_2_28_X
|
||||
depends on !BR2_arc
|
||||
default BR2_BINUTILS_VERSION_2_28_X if !BR2_arc
|
||||
default BR2_BINUTILS_VERSION_ARC if BR2_arc
|
||||
help
|
||||
Select the version of binutils you wish to use.
|
||||
|
||||
@ -11,18 +11,23 @@ config BR2_BINUTILS_VERSION_2_27_X
|
||||
bool "binutils 2.27"
|
||||
# binutils 2.27 triggers a bug in elf2flt on ARM/noMMU
|
||||
depends on !(BR2_arm && !BR2_USE_MMU)
|
||||
depends on !BR2_arc
|
||||
|
||||
config BR2_BINUTILS_VERSION_2_28_X
|
||||
bool "binutils 2.28.1"
|
||||
depends on !BR2_arc
|
||||
|
||||
config BR2_BINUTILS_VERSION_2_29_X
|
||||
bool "binutils 2.29.1"
|
||||
|
||||
config BR2_BINUTILS_VERSION_ARC
|
||||
bool "binutils arc (2.29)"
|
||||
depends on BR2_arc
|
||||
endchoice
|
||||
|
||||
config BR2_BINUTILS_VERSION
|
||||
string
|
||||
default "arc-2017.09-release" if BR2_arc
|
||||
default "arc-2017.09-release" if BR2_BINUTILS_VERSION_ARC
|
||||
default "2.27" if BR2_BINUTILS_VERSION_2_27_X
|
||||
default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X
|
||||
default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X
|
||||
|
@ -15,7 +15,7 @@ BINUTILS_VERSION = 2.28.1
|
||||
endif
|
||||
endif # BINUTILS_VERSION
|
||||
|
||||
ifeq ($(BR2_arc),y)
|
||||
ifeq ($(BINUTILS_VERSION),arc-2017.09-release)
|
||||
BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
|
||||
BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
|
||||
BINUTILS_FROM_GIT = y
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.0.tar.gz.asc
|
||||
sha256 39af0d9267391434b549c5c4adc001b735518c96f7630c3fe7162af1d13ef3c0 dbus-1.12.0.tar.gz
|
||||
# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.2.tar.gz.asc
|
||||
sha256 272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88 dbus-1.12.2.tar.gz
|
||||
# Locally calculated
|
||||
sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DBUS_VERSION = 1.12.0
|
||||
DBUS_VERSION = 1.12.2
|
||||
DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
|
||||
DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
|
||||
DBUS_LICENSE_FILES = COPYING
|
||||
|
@ -1,2 +1,3 @@
|
||||
# Locally computed after checking signature
|
||||
sha256 629204bfbdcd3480e1ebcdc246da438323c3ea5fea57480ab859e8b201ad8793 dovecot-2.2-pigeonhole-0.4.19.tar.gz
|
||||
sha256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a dovecot-2.2-pigeonhole-0.4.21.tar.gz
|
||||
sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOVECOT_PIGEONHOLE_VERSION = 0.4.19
|
||||
DOVECOT_PIGEONHOLE_VERSION = 0.4.21
|
||||
DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
|
||||
DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
|
||||
DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
|
||||
|
32
package/dovecot/0001-byteorder.h-fix-uclibc-build.patch
Normal file
32
package/dovecot/0001-byteorder.h-fix-uclibc-build.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001
|
||||
From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
|
||||
Date: Tue, 14 Nov 2017 06:01:21 +0100
|
||||
Subject: [PATCH] byteorder.h: fix uclibc build
|
||||
|
||||
Patch suggested on upstream mailinglist:
|
||||
https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/lib/byteorder.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h
|
||||
index 2f5dc7c17..4ffe8da21 100644
|
||||
--- a/src/lib/byteorder.h
|
||||
+++ b/src/lib/byteorder.h
|
||||
@@ -23,6 +23,11 @@
|
||||
#ifndef BYTEORDER_H
|
||||
#define BYTEORDER_H
|
||||
|
||||
+#undef bswap_8
|
||||
+#undef bswap_16
|
||||
+#undef bswap_32
|
||||
+#undef bswap_64
|
||||
+
|
||||
/*
|
||||
* These prototypes exist to catch bugs in the code generating macros below.
|
||||
*/
|
||||
--
|
||||
2.11.0
|
||||
|
@ -1,2 +1,5 @@
|
||||
# Locally computed after checking signature
|
||||
sha256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 dovecot-2.2.31.tar.gz
|
||||
sha256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 dovecot-2.2.33.2.tar.gz
|
||||
sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
|
||||
sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
DOVECOT_VERSION_MAJOR = 2.2
|
||||
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).31
|
||||
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2
|
||||
DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
|
||||
DOVECOT_INSTALL_STAGING = YES
|
||||
DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.5.tar.xz.sha256
|
||||
sha256 da5e69b81c94b79f4e31cfc312413c36acb7429e1cb6fd4397a1251a0e23c21c efl-1.20.5.tar.xz
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256
|
||||
sha256 56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1 efl-1.20.6.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EFL_VERSION = 1.20.5
|
||||
EFL_VERSION = 1.20.6
|
||||
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
|
||||
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
|
||||
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+
|
||||
|
@ -1,4 +1,5 @@
|
||||
# From http://dev.gentoo.org/~blueness/eudev/
|
||||
md5 66acef4c6094aab4aced7ae83b74b0d2 eudev-3.2.4.tar.gz
|
||||
md5 6ca08c0e14380f87df8e8aceac123671 eudev-3.2.5.tar.gz
|
||||
# Locally calculated
|
||||
sha256 dddcf4c89b21f5f3210f7e4d3888c92cbfc657ff734ac21b6bdd3f5bcb146fed eudev-3.2.4.tar.gz
|
||||
sha256 49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af eudev-3.2.5.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EUDEV_VERSION = 3.2.4
|
||||
EUDEV_VERSION = 3.2.5
|
||||
EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
|
||||
EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||
EUDEV_LICENSE_FILES = COPYING
|
||||
|
@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.2.4/
|
||||
md5 6e3980aba29a224a9f478d88ac7ec207 expat-2.2.4.tar.bz2
|
||||
sha1 3394d6390c041a8f5dec1d5fe7c4af0a23ae4504 expat-2.2.4.tar.bz2
|
||||
# Calculated based on the hashes above
|
||||
sha256 03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e expat-2.2.4.tar.bz2
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.2.5/
|
||||
md5 789e297f547980fc9ecc036f9a070d49 expat-2.2.5.tar.bz2
|
||||
sha1 490659abd7d6c6d4cb4e60c945a15fbf081564f6 expat-2.2.5.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 expat-2.2.5.tar.bz2
|
||||
sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXPAT_VERSION = 2.2.4
|
||||
EXPAT_VERSION = 2.2.5
|
||||
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
|
||||
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
|
||||
EXPAT_INSTALL_STAGING = YES
|
||||
|
@ -1,4 +1,5 @@
|
||||
# From http://www.fftw.org/fftw-3.3.6-pl2.tar.gz.md5sum
|
||||
md5 927e481edbb32575397eb3d62535a856 fftw-3.3.6-pl2.tar.gz
|
||||
# From http://www.fftw.org/fftw-3.3.7.tar.gz.md5sum
|
||||
md5 0d5915d7d39b3253c1cc05030d79ac47 fftw-3.3.7.tar.gz
|
||||
# Locally computed
|
||||
sha256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 fftw-3.3.6-pl2.tar.gz
|
||||
sha256 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573 fftw-3.3.7.tar.gz
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FFTW_VERSION = 3.3.6-pl2
|
||||
FFTW_VERSION = 3.3.7
|
||||
FFTW_SITE = http://www.fftw.org
|
||||
FFTW_INSTALL_STAGING = YES
|
||||
FFTW_LICENSE = GPL-2.0+
|
||||
|
@ -1,5 +1,10 @@
|
||||
# From https://sourceforge.net/projects/freetype/files/freetype2/2.8/
|
||||
md5 2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2
|
||||
sha1 42c6b1f733fe13a3eba135f5025b22cb68450f91 freetype-2.8.tar.bz2
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b freetype-2.8.tar.bz2
|
||||
# From https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/
|
||||
md5 bf0a210b6fe781228fa0e4a80691a521 freetype-2.8.1.tar.bz2
|
||||
sha1 417bb3747c4ac95b6f2652024a53fad45581fa1c freetype-2.8.1.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 freetype-2.8.1.tar.bz2
|
||||
sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT
|
||||
sha256 4a9a548027a2c1d37788519dea833294c9c81f1ebc280e817f41f50d0c642d78 docs/FTL.TXT
|
||||
sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FREETYPE_VERSION = 2.8
|
||||
FREETYPE_VERSION = 2.8.1
|
||||
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
|
||||
FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
|
||||
FREETYPE_INSTALL_STAGING = YES
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user