NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2018-12-02 08:15:26 +01:00
commit 13c43455a0
440 changed files with 4151 additions and 4881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.gitlab-ci.yml
View File

@ -51,6 +51,7 @@ check-package:
only:
- triggers
- tags
- /-defconfigs$/
script: *defconfig_script
artifacts:
when: always
@ -67,6 +68,7 @@ check-package:
only:
- triggers
- tags
- /-runtime-tests$/
# Keep build directories so the rootfs can be an artifact of the job. The
# runner will clean up those files for us.
# Multiply every emulator timeout by 10 to avoid sporadic failures in
@ -79,6 +81,7 @@ check-package:
- test-output/*.log
- test-output/*/.config
- test-output/*/images/*
aarch64_efi_defconfig: *defconfig
acmesystems_aria_g25_128mb_defconfig: *defconfig
acmesystems_aria_g25_256mb_defconfig: *defconfig
acmesystems_arietta_g25_128mb_defconfig: *defconfig
@ -314,18 +317,48 @@ tests.package.test_ipython.TestIPythonPy2: *runtime_test
tests.package.test_ipython.TestIPythonPy3: *runtime_test
tests.package.test_python.TestPython2: *runtime_test
tests.package.test_python.TestPython3: *runtime_test
tests.package.test_python_argh.TestPythonPy2Argh: *runtime_test
tests.package.test_python_argh.TestPythonPy3Argh: *runtime_test
tests.package.test_python_attrs.TestPythonPy2Attrs: *runtime_test
tests.package.test_python_attrs.TestPythonPy3Attrs: *runtime_test
tests.package.test_python_autobahn.TestPythonPy2Autobahn: *runtime_test
tests.package.test_python_autobahn.TestPythonPy3Autobahn: *runtime_test
tests.package.test_python_automat.TestPythonPy2Automat: *runtime_test
tests.package.test_python_automat.TestPythonPy3Automat: *runtime_test
tests.package.test_python_bitstring.TestPythonPy2Bitstring: *runtime_test
tests.package.test_python_bitstring.TestPythonPy3Bitstring: *runtime_test
tests.package.test_python_cbor.TestPythonPy2Cbor: *runtime_test
tests.package.test_python_cbor.TestPythonPy3Cbor: *runtime_test
tests.package.test_python_click.TestPythonPy2Click: *runtime_test
tests.package.test_python_click.TestPythonPy3Click: *runtime_test
tests.package.test_python_constantly.TestPythonPy2Constantly: *runtime_test
tests.package.test_python_constantly.TestPythonPy3Constantly: *runtime_test
tests.package.test_python_crossbar.TestPythonPy3Crossbar: *runtime_test
tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test
tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test
tests.package.test_python_incremental.TestPythonPy2Incremental: *runtime_test
tests.package.test_python_incremental.TestPythonPy3Incremental: *runtime_test
tests.package.test_python_passlib.TestPythonPy2Passlib: *runtime_test
tests.package.test_python_passlib.TestPythonPy3Passlib: *runtime_test
tests.package.test_python_pexpect.TestPythonPy2Pexpect: *runtime_test
tests.package.test_python_pexpect.TestPythonPy3Pexpect: *runtime_test
tests.package.test_python_pynacl.TestPythonPy2Pynacl: *runtime_test
tests.package.test_python_pynacl.TestPythonPy3Pynacl: *runtime_test
tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: *runtime_test
tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: *runtime_test
tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: *runtime_test
tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: *runtime_test
tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: *runtime_test
tests.package.test_python_treq.TestPythonPy2Treq: *runtime_test
tests.package.test_python_treq.TestPythonPy3Treq: *runtime_test
tests.package.test_python_twisted.TestPythonPy2Twisted: *runtime_test
tests.package.test_python_twisted.TestPythonPy3Twisted: *runtime_test
tests.package.test_python_txaio.TestPythonPy2Txaio: *runtime_test
tests.package.test_python_txaio.TestPythonPy3Txaio: *runtime_test
tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: *runtime_test
tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: *runtime_test
tests.package.test_python_ubjson.TestPythonPy2Ubjson: *runtime_test
tests.package.test_python_ubjson.TestPythonPy3Ubjson: *runtime_test
tests.package.test_rust.TestRust: *runtime_test
tests.package.test_rust.TestRustBin: *runtime_test
tests.package.test_syslog_ng.TestSyslogNg: *runtime_test

2
.gitlab-ci.yml.in
View File

@ -51,6 +51,7 @@ check-package:
only:
- triggers
- tags
- /-defconfigs$/
script: *defconfig_script
artifacts:
when: always
@ -67,6 +68,7 @@ check-package:
only:
- triggers
- tags
- /-runtime-tests$/
# Keep build directories so the rootfs can be an artifact of the job. The
# runner will clean up those files for us.
# Multiply every emulator timeout by 10 to avoid sporadic failures in

4
Config.in
View File

@ -136,10 +136,6 @@ config BR2_SCP
string "Secure copy (scp) command"
default "scp"
config BR2_SSH
string "Secure shell (ssh) command"
default "ssh"
config BR2_HG
string "Mercurial (hg) command"
default "hg"

25
DEVELOPERS
View File

@ -98,6 +98,9 @@ F: package/openpgm/
N: Alexander Mukhin <alexander.i.mukhin@gmail.com>
F: package/hostapd/
N: Alexander Sverdlin <alexander.sverdlin@gmail.com>
F: package/mini-snmpd/
N: Alexander Varnin <fenixk19@mail.ru>
F: package/liblog4c-localtime/
@ -146,6 +149,7 @@ F: package/libunwind/
N: Angelo Compagnucci <angelo.compagnucci@gmail.com>
F: package/corkscrew/
F: package/fail2ban/
F: package/i2c-tools/
F: package/mender/
F: package/mono/
@ -351,7 +355,6 @@ F: package/perl-mime-base64/
F: package/perl-net-dns/
F: package/perl-net-http/
F: package/perl-netaddr-ip/
F: package/perl-time-hires/
F: package/perl-timedate/
F: package/perl-uri/
F: package/perl-www-robotrules/
@ -403,6 +406,9 @@ N: Bogdan Radulescu <bogdan@nimblex.net>
F: package/iftop/
F: package/ncdu/
N: Brandon Maier <brandon.maier@rockwellcollins.com>
F: package/vmtouch/
N: Brock Williams <brock@cottonwoodcomputer.com>
F: package/pdmenu/
@ -984,8 +990,12 @@ F: configs/pine64_defconfig
F: configs/pine64_sopine_defconfig
N: James Hilliard <james.hilliard1@gmail.com>
F: package/python-aiodns/
F: package/python-aiohttp/
F: package/python-async-timeout/
F: package/python-cchardet/
F: package/python-multidict/
F: package/python-pycares/
F: package/python-yarl/
N: James Knight <james.knight@rockwellcollins.com>
@ -1066,6 +1076,7 @@ F: package/python-libconfig/
N: Johan Oudinet <johan.oudinet@gmail.com>
F: package/ejabberd/
F: package/erlang-eimp/
F: package/erlang-goldrush/
F: package/erlang-jiffy/
F: package/erlang-lager/
@ -1167,6 +1178,9 @@ F: package/qt5/
N: Julien Floret <julien.floret@6wind.com>
F: package/lldpd/
N: Julien Grossholtz <julien.grossholtz@openest.io>
F: package/paho-mqtt-c
N: Julien Viard de Galbert <julien@vdg.name>
F: package/dieharder/
F: package/easy-rsa/
@ -1361,6 +1375,7 @@ F: package/checkpolicy/
F: package/checksec/
F: package/cgroupfs-mount/
F: package/crda/
F: package/cunit/
F: package/devmem2/
F: package/dnsmasq/
F: package/dosfstools/
@ -1660,6 +1675,7 @@ F: package/ghostscript-fonts/
F: package/gstreamer1/gst1-interpipe/
F: package/gstreamer1/gst1-validate/
F: package/gstreamer1/gstreamer1-editing-services/
F: package/iwd/
F: package/libevdev/
F: package/log4cplus/
F: package/postgresql/
@ -1698,6 +1714,9 @@ F: package/psplash/
F: package/sispmctl/
F: package/zsh/
N: Philipp Richter <richterphilipp.pops@gmail.com>
F: package/libtorrent-rasterbar/
N: Philippe Proulx <eeppeliteloop@gmail.com>
F: package/lttng-babeltrace/
F: package/lttng-libust/
@ -1772,6 +1791,9 @@ F: package/subversion/
N: RJ Ascani <rj.ascani@gmail.com>
F: package/azmq/
N: Robert Rose <robertroyrose@gmail.com>
F: package/grpc/
N: Rodrigo Rebello <rprebello@gmail.com>
F: package/chocolate-doom/
F: package/irssi/
@ -1822,6 +1844,7 @@ F: package/python-pysnmp/
F: package/python-pysnmp-apps/
F: package/python-pysnmp-mibs/
F: package/python-tornado/
F: package/websocketpp/
N: Ryan Coe <bluemrp9@gmail.com>
F: package/inadyn/

61
Makefile
View File

@ -105,22 +105,6 @@ ifneq ($(firstword $(sort $(RUNNING_MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MA
$(error You have make '$(RUNNING_MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
endif
# Parallel execution of this Makefile is disabled because it changes
# the packages building order, that can be a problem for two reasons:
# - If a package has an unspecified optional dependency and that
# dependency is present when the package is built, it is used,
# otherwise it isn't (but compilation happily proceeds) so the end
# result will differ if the order is swapped due to parallel
# building.
# - Also changing the building order can be a problem if two packages
# manipulate the same file in the target directory.
#
# Taking into account the above considerations, if you still want to execute
# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
# use the -j<jobs> option when building, e.g:
# make -j$((`getconf _NPROCESSORS_ONLN`+1))
.NOTPARALLEL:
# absolute path
TOPDIR := $(CURDIR)
CONFIG_CONFIG_IN = Config.in
@ -246,6 +230,22 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include $(BR2_CONFIG)
endif
# Parallel execution of this Makefile is disabled because it changes
# the packages building order, that can be a problem for two reasons:
# - If a package has an unspecified optional dependency and that
# dependency is present when the package is built, it is used,
# otherwise it isn't (but compilation happily proceeds) so the end
# result will differ if the order is swapped due to parallel
# building.
# - Also changing the building order can be a problem if two packages
# manipulate the same file in the target directory.
#
# Taking into account the above considerations, if you still want to execute
# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
# use the -j<jobs> option when building, e.g:
# make -j$((`getconf _NPROCESSORS_ONLN`+1))
.NOTPARALLEL:
# timezone and locale may affect build output
ifeq ($(BR2_REPRODUCIBLE),y)
export TZ = UTC
@ -468,14 +468,14 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"
# Location of a file giving a big fat warning that output/target
# should not be used as the root filesystem.
TARGET_DIR_WARNING_FILE = $(BASE_TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
ifeq ($(BR2_CCACHE),y)
CCACHE := $(HOST_DIR)/bin/ccache
CCACHE = $(HOST_DIR)/bin/ccache
BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR))
export BR_CACHE_DIR
HOSTCC := $(CCACHE) $(HOSTCC)
HOSTCXX := $(CCACHE) $(HOSTCXX)
HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE)
HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE)
else
export BR_NO_CCACHE
endif
@ -572,10 +572,6 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\
endif
.PHONY: dirs
dirs: $(BUILD_DIR) $(STAGING_DIR) $(BASE_TARGET_DIR) \
$(HOST_DIR) $(HOST_DIR_SYMLINK) $(BINARIES_DIR)
$(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" syncconfig
@ -605,11 +601,6 @@ sdk: prepare-sdk $(BR2_TAR_HOST_DEPENDENCY)
--transform='s#^\.#$(BR2_SDK_PREFIX)#' \
-C $(HOST_DIR) "."
# Populating the staging with the base directories is handled by the skeleton package
$(STAGING_DIR):
@mkdir -p $(STAGING_DIR)
@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
RSYNC_VCS_EXCLUSIONS = \
--exclude .svn --exclude .git --exclude .hg --exclude .bzr \
--exclude CVS
@ -710,8 +701,14 @@ $(TARGETS_ROOTFS): target-finalize
# Avoid the rootfs name leaking down the dependency chain
target-finalize: ROOTFS=
host-finalize: $(HOST_DIR_SYMLINK)
.PHONY: staging-finalize
staging-finalize:
@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
.PHONY: target-finalize
target-finalize: $(PACKAGES)
target-finalize: $(PACKAGES) host-finalize
@$(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
@ -782,7 +779,7 @@ endif
touch $(TARGET_DIR)/usr
.PHONY: target-post-image
target-post-image: $(TARGETS_ROOTFS) target-finalize
target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
@rm -f $(ROOTFS_COMMON_TAR)
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
$(call MESSAGE,"Executing post-image script $(s)"); \
@ -811,7 +808,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR)
@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
.PHONY: legal-info
legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)
@cat support/legal-info/README.header >>$(LEGAL_REPORT)
@if [ -r $(LEGAL_WARNINGS) ]; then \

30
board/aarch64-efi/genimage-efi.cfg Normal file
View File

@ -0,0 +1,30 @@
image efi-part.vfat {
vfat {
file startup.nsh {
image = "efi-part/startup.nsh"
}
file EFI {
image = "efi-part/EFI"
}
file Image {
image = "Image"
}
}
size = 32M
}
image disk.img {
hdimage {
}
partition boot {
partition-type = 0xEF
image = "efi-part.vfat"
}
partition root {
partition-type = 0x83
image = "rootfs.ext2"
}
}

6
board/aarch64-efi/grub.cfg Normal file
View File

@ -0,0 +1,6 @@
set default="0"
set timeout="5"
menuentry "Buildroot" {
linux /Image root=/dev/vda2 rootwait console=ttyAMA0
}

5
board/aarch64-efi/post-image.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
BOARD_DIR="$(dirname $0)"
cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg

34
board/aarch64-efi/readme.txt Normal file
View File

@ -0,0 +1,34 @@
The aarch64_efi_defconfig allows to build a minimal Linux system that
can boot on all AArch64 servers providing an EFI firmware and ACPI.
Building and booting
====================
$ make aarch64_efi_defconfig
$ make
The file output/images/disk.img is a complete disk image that can be
booted, it includes the grub2 bootloader, Linux kernel and root
filesystem.
Testing under Qemu
==================
This image can also be tested using Qemu:
qemu-system-aarch64 \
-M virt \
-cpu cortex-a57 \
-m 512 \
-nographic \
-bios </path/to/QEMU_EFI.fd> \
-drive file=output/images/disk.img,if=none,format=raw,id=hd0 \
-device virtio-blk-device,drive=hd0 \
-netdev user,id=eth0 \
-device virtio-net-device,netdev=eth0
Note that </path/to/QEMU_EFI.fd> needs to point to a valid aarch64 UEFI
firmware image for qemu.
It may be provided by your distribution as a edk2-aarch64 or AAVMF
package, in path such as /usr/share/edk2/aarch64/QEMU_EFI.fd .

2
board/orangepi/orangepi-pc/linux.fragment
View File

@ -1,3 +1,5 @@
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_REGULATOR_SY8106A=y
CONFIG_DRM_SUN8I_DW_HDMI=y
CONFIG_SUN8I_DE2_CCU=y
CONFIG_SND_SUN8I_CODEC_ANALOG=y

3
board/orangepi/orangepi-zero/linux-extras.config
View File

@ -15,3 +15,6 @@ CONFIG_CFG80211_WEXT=y
# wireless drivers
CONFIG_WLAN=y
# ondemand cpufreq governor
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

4
board/solidrun/macchiatobin/extlinux.conf Normal file
View File

@ -0,0 +1,4 @@
label Macchiatobin Linux
kernel /boot/Image
devicetree /boot/armada-8040-mcbin.dtb
append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait

2
board/solidrun/macchiatobin/linux-extras.config
View File

@ -1,3 +1,3 @@
CONFIG_MARVELL_PHY=y
CONFIG_MARVELL_10G_PHY=y
CONFIG_PHY_MVEBU_CP110_COMPHY=y
CONFIG_SFP=y

5
board/solidrun/macchiatobin/post-build-mainline.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
BOARD_DIR="$(dirname $0)"
install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf

30
board/solidrun/macchiatobin/readme.txt
View File

@ -15,19 +15,20 @@ How to build
There are two build options: mainline support and vendor support.
For the mainline BSP, we use:
- Linux v4.15
- U-Boot v2018.01
- Linux v4.19.2
- U-Boot v2018.11
For the vendor BSP, we use the sources available from Marvell Github
page at https://github.com/MarvellEmbeddedProcessors, which uses:
- Linux v4.4.52
- U-Boot v2017.03
- Linux v4.4.120
- U-Boot v2018.03
At the moment mainline support for the board is a work in progress.
Mainline kernel 4.15 enables eth2 in 1Gb (RJ45 connector J5) and
eth0 in 10Gb (SFP connector CON15 and RJ45 connector CON16).
The vendor BSP enables more hardware features out of the box,
e.g. all the network interfaces.
At the moment mainline support for the board is a work in
progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5),
copper 10Gb interfaces, and automatic configuration of select SFP
modules on the SFP cages. The vendor BSP enables more hardware features
out of the box, but lacks support for SFP detection and automatic
configuration.
To use the mainline BSP run the following commands:
@ -73,10 +74,13 @@ Insert the micro SDcard in the MacchiatoBin board and power it up.
The serial console is accessible at the micro-USB Type-B connector
marked CON9. The serial line settings are 115200 8N1.
By default U-Boot will load its environment from the SPI flash. On the
first boot SPI flash may be empty or it may contain a legacy
environment incompatible with up-to-date mainline U-Boot and
kernel. Then the following commands can be used to boot the board:
Note: the following text only applies to the vendor BSP from
solidrun_macchiatobin_marvell_defconfig.
By default Marvell provided U-Boot will load its environment from the
SPI flash. On the first boot SPI flash may be empty or it may contain a
legacy environment that prevents proper boot. Then the following
commands can be used to boot the board:
=> ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
=> env import -t 0x01700000 $filesize

2
board/solidrun/macchiatobin/uboot-fragment.config Normal file
View File

@ -0,0 +1,2 @@
CONFIG_ENV_IS_IN_MMC=y
# CONFIG_ENV_IS_IN_SPI_FLASH is not set

48
boot/grub2/Config.in
View File

@ -2,6 +2,9 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS
bool
default y if BR2_i386
default y if BR2_x86_64
default y if BR2_arm
default y if BR2_aarch64
depends on BR2_USE_MMU
config BR2_TARGET_GRUB2
bool "grub2"
@ -29,12 +32,14 @@ choice
config BR2_TARGET_GRUB2_I386_PC
bool "i386-pc"
depends on BR2_i386 || BR2_x86_64
help
Select this option if the platform you're targetting is a
x86 or x86-64 legacy BIOS based platform.
config BR2_TARGET_GRUB2_I386_EFI
bool "i386-efi"
depends on BR2_i386 || BR2_x86_64
help
Select this option if the platform you're targetting has a
32 bits EFI BIOS. Note that some x86-64 platforms use a 32
@ -42,14 +47,38 @@ config BR2_TARGET_GRUB2_I386_EFI
config BR2_TARGET_GRUB2_X86_64_EFI
bool "x86-64-efi"
depends on BR2_ARCH_IS_64
depends on BR2_x86_64
help
Select this option if the platform you're targetting has a
64 bits EFI BIOS.
config BR2_TARGET_GRUB2_ARM_UBOOT
bool "arm-uboot"
depends on BR2_arm
help
Select this option if the platform you're targetting is an
ARM u-boot platform, and you want to boot Grub 2 as an u-boot
compatible image.
config BR2_TARGET_GRUB2_ARM_EFI
bool "arm-efi"
depends on BR2_arm
help
Select this option if the platform you're targetting is an
ARM platform and you want to boot Grub 2 as an EFI
application.
config BR2_TARGET_GRUB2_ARM64_EFI
bool "arm64-efi"
depends on BR2_aarch64
help
Select this option if the platform you're targetting is an
Aarch64 platform and you want to boot Grub 2 as an EFI
application.
endchoice
if BR2_TARGET_GRUB2_I386_PC
if BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT
config BR2_TARGET_GRUB2_BOOT_PARTITION
string "boot partition"
@ -60,13 +89,15 @@ config BR2_TARGET_GRUB2_BOOT_PARTITION
first disk if using a legacy partition table, or 'hd0,gpt1'
if using GPT partition table.
endif # BR2_TARGET_GRUB2_I386_PC
endif # BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT
config BR2_TARGET_GRUB2_BUILTIN_MODULES
string "builtin modules"
default "boot linux ext2 fat squash4 part_msdos part_gpt normal biosdisk" if BR2_TARGET_GRUB2_I386_PC
default "boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop" \
if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI
if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI || \
BR2_TARGET_GRUB2_ARM_EFI || BR2_TARGET_GRUB2_ARM64_EFI
default "linux ext2 fat part_msdos normal" if BR2_TARGET_GRUB2_ARM_UBOOT
config BR2_TARGET_GRUB2_BUILTIN_CONFIG
string "builtin config"
@ -76,6 +107,15 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
device and other configuration parameters, but however menu
entries cannot be described in this embedded configuration.
config BR2_TARGET_GRUB2_INSTALL_TOOLS
bool "install tools"
help
Install support tools to interact with GNU GRUB Multiboot
boot loader.
This will also install the Grub 2 loadable modules to the
target.
endif # BR2_TARGET_GRUB2
comment "grub2 needs a toolchain w/ wchar"

74
boot/grub2/grub2.mk
View File

@ -9,7 +9,15 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub
GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
GRUB2_LICENSE = GPL-3.0+
GRUB2_LICENSE_FILES = COPYING
GRUB2_DEPENDENCIES = host-bison host-flex
GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
HOST_GRUB2_DEPENDENCIES = host-bison host-flex
GRUB2_INSTALL_IMAGES = YES
ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y)
GRUB2_INSTALL_TARGET = YES
else
GRUB2_INSTALL_TARGET = NO
endif
GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
@ -36,29 +44,48 @@ GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = x86_64-efi
GRUB2_TARGET = x86_64
GRUB2_PLATFORM = efi
else ifeq ($(BR2_TARGET_GRUB2_ARM_UBOOT),y)
GRUB2_IMAGE = $(BINARIES_DIR)/boot-part/grub/grub.img
GRUB2_CFG = $(BINARIES_DIR)/boot-part/grub/grub.cfg
GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub
GRUB2_TUPLE = arm-uboot
GRUB2_TARGET = arm
GRUB2_PLATFORM = uboot
else ifeq ($(BR2_TARGET_GRUB2_ARM_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootarm.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = arm-efi
GRUB2_TARGET = arm
GRUB2_PLATFORM = efi
else ifeq ($(BR2_TARGET_GRUB2_ARM64_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootaa64.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = arm64-efi
GRUB2_TARGET = aarch64
GRUB2_PLATFORM = efi
endif
# Grub2 is kind of special: it considers CC, LD and so on to be the
# tools to build the native tools (i.e to be executed on the build
# machine), and uses TARGET_CC, TARGET_CFLAGS, TARGET_CPPFLAGS,
# TARGET_LDFLAGS to build the bootloader itself. However, to add to
# the confusion, it also uses NM, OBJCOPY and STRIP to build the
# bootloader itself; none of these are used to build the native
# tools.
# tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS,
# TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself.
#
# NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
# use the cross compile variant to ensure grub2 builds
HOST_GRUB2_CONF_ENV = \
CPP="$(HOSTCC) -E"
GRUB2_CONF_ENV = \
$(HOST_CONFIGURE_OPTS) \
CPP="$(HOSTCC) -E" \
CPP="$(TARGET_CC) -E" \
TARGET_CC="$(TARGET_CC)" \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
NM="$(TARGET_NM)" \
OBJCOPY="$(TARGET_OBJCOPY)" \
STRIP="$(TARGET_CROSS)strip"
TARGET_NM="$(TARGET_NM)" \
TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \
TARGET_STRIP="$(TARGET_CROSS)strip"
GRUB2_CONF_OPTS = \
--target=$(GRUB2_TARGET) \
@ -72,12 +99,13 @@ GRUB2_CONF_OPTS = \
--enable-libzfs=no \
--disable-werror
# We don't want all the native tools and Grub2 modules to be installed
# in the target. So we in fact install everything into the host
# directory, and the image generation process (below) will use the
# grub-mkimage tool and Grub2 modules from the host directory.
GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
HOST_GRUB2_CONF_OPTS = \
--disable-grub-mkfont \
--enable-efiemu=no \
ac_cv_lib_lzma_lzma_code=no \
--enable-device-mapper=no \
--enable-libzfs=no \
--disable-werror
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
define GRUB2_IMAGE_INSTALL_ELTORITO
@ -86,10 +114,10 @@ define GRUB2_IMAGE_INSTALL_ELTORITO
endef
endif
define GRUB2_IMAGE_INSTALLATION
define GRUB2_INSTALL_IMAGES_CMDS
mkdir -p $(dir $(GRUB2_IMAGE))
$(HOST_DIR)/bin/grub-mkimage \
-d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \
$(HOST_DIR)/usr/bin/grub-mkimage \
-d $(@D)/grub-core/ \
-O $(GRUB2_TUPLE) \
-o $(GRUB2_IMAGE) \
-p "$(GRUB2_PREFIX)" \
@ -99,14 +127,14 @@ define GRUB2_IMAGE_INSTALLATION
$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
$(GRUB2_IMAGE_INSTALL_ELTORITO)
endef
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION
ifeq ($(GRUB2_PLATFORM),efi)
define GRUB2_EFI_STARTUP_NSH
echo $(notdir $(GRUB2_IMAGE)) > \
$(BINARIES_DIR)/efi-part/startup.nsh
endef
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH
GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH
endif
$(eval $(autotools-package))
$(eval $(host-autotools-package))

102
boot/grub2/readme.txt
View File

@ -53,8 +53,8 @@ To test your BIOS image in Qemu
qemu-system-{i386,x86-64} -hda disk.img
Notes on using Grub2 for EFI-based platforms
============================================
Notes on using Grub2 for x86/x86_64 EFI-based platforms
=======================================================
1. Create a disk image
dd if=/dev/zero of=disk.img bs=1M count=32
@ -83,16 +83,108 @@ Notes on using Grub2 for EFI-based platforms
sudo losetup -d /dev/loop0
7. Your disk.img is ready!
To test your EFI image in Qemu
------------------------------
To test your i386/x86-64 EFI image in Qemu
------------------------------------------
1. Download the EFI BIOS for Qemu
Version IA32 or X64 depending on the chosen Grub2
platform (i386-efi vs. x86-64-efi)
http://sourceforge.net/projects/edk2/files/OVMF/
https://www.kraxel.org/repos/jenkins/edk2/
(or use one provided by your distribution as OVMF)
2. Extract, and rename OVMF.fd to bios.bin and
CirrusLogic5446.rom to vgabios-cirrus.bin.
3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
4. Make sure to pass pci=nocrs to the kernel command line,
to workaround a bug in the EFI BIOS regarding the
EFI framebuffer.
Notes on using Grub2 for ARM u-boot-based platforms
===================================================
The following steps show how to use the Grub2 arm-uboot platform
support in the simplest way possible and with a single
buildroot-generated filesystem.
1. Load qemu_arm_vexpress_defconfig
2. Enable u-boot with the vexpress_ca9x4 board name and with
u-boot.elf image format.
3. Enable grub2 for the arm-uboot platform.
4. Enable "Install kernel image to /boot in target" in the kernel
menu to populate a /boot directory with zImage in it.
5. The upstream u-boot vexpress_ca9x4 doesn't have CONFIG_API enabled
by default, which is required.
Before building, patch u-boot (for example, make u-boot-extract to
edit the source before building) file
include/configs/vexpress_common.h to define:
#define CONFIG_API
#define CONFIG_SYS_MMC_MAX_DEVICE 1
6. Create a custom grub2 config file with the following contents and
set its path in BR2_TARGET_GRUB2_CFG:
set default="0"
set timeout="5"
menuentry "Buildroot" {
set root='(hd0)'
linux /boot/zImage root=/dev/mmcblk0 console=ttyAMA0
devicetree /boot/vexpress-v2p-ca9.dtb
}
7. Create a custom builtin config file with the following contents
and set its path in BR2_TARGET_GRUB2_BUILTIN_CONFIG:
set root=(hd0)
set prefix=/boot/grub
8. Create a custom post-build script which copies files from
${BINARIES_DIR}/boot-part to $(TARGET_DIR)/boot (set its path in
BR2_ROOTFS_POST_BUILD_SCRIPT):
#!/bin/sh
cp -r ${BINARIES_DIR}/boot-part/* ${TARGET_DIR}/boot/
9. make
10. Run qemu with:
qemu-system-arm -M vexpress-a9 -kernel output/images/u-boot -m 1024 \
-nographic -sd output/images/rootfs.ext2
11. In u-boot, stop at the prompt and run grub2 with:
=> ext2load mmc 0:0 ${loadaddr} /boot/grub/grub.img
=> bootm
12. This should bring the grub2 menu, upon which selecting the "Buildroot"
entry should boot Linux.
Notes on using Grub2 for Aarch64 EFI-based platforms
====================================================
The following steps show how to use the Grub2 arm64-efi platform,
using qemu and EFI firmware built for qemu.
1. Load aarch64_efi_defconfig
2. make
3. Download the EFI firmware for qemu aarch64
https://www.kraxel.org/repos/jenkins/edk2/
(or use one provided by your distribution as OVMF-aarch64 or AAVMF)
4. Run qemu with:
qemu-system-aarch64 -M virt -cpu cortex-a57 -m 512 -nographic \
-bios <path/to/EDK2>/QEMU_EFI.fd -hda output/images/disk.img \
-netdev user,id=eth0 -device virtio-net-device,netdev=eth0
5. This should bring the grub2 menu, upon which selecting the
"Buildroot" entry should boot Linux.

33
configs/aarch64_efi_defconfig Normal file
View File

@ -0,0 +1,33 @@
# Architecture
BR2_aarch64=y
# Toolchain, required for eudev and grub
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
# System
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
## Required tools to create bootable media
BR2_PACKAGE_HOST_GENIMAGE=y
# Bootloader
BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_AARCH64_EFI=y
# Filesystem / image
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg"
# Linux headers same as kernel, a 4.18 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y

13
configs/olimex_a20_olinuxino_lime2_defconfig
View File

@ -3,8 +3,8 @@ BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_EABIHF=y
# Linux headers same as kernel, a 4.18 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
# Linux headers same as kernel, a 4.19 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
# System configuration
BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
@ -18,13 +18,18 @@ 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.18.7"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2"
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
# sunxi packages
BR2_PACKAGE_SUNXI_TOOLS=y
BR2_PACKAGE_SUNXI_MALI_MAINLINE=y
BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y
# Filesystem
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
@ -34,7 +39,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="2018.09"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

13
configs/olimex_a20_olinuxino_lime_defconfig
View File

@ -3,8 +3,8 @@ BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_EABIHF=y
# Linux headers same as kernel, a 4.18 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
# Linux headers same as kernel, a 4.19 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
# System configuration
BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
@ -18,13 +18,18 @@ 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.18.7"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2"
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-lime"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
# sunxi packages
BR2_PACKAGE_SUNXI_TOOLS=y
BR2_PACKAGE_SUNXI_MALI_MAINLINE=y
BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y
# Filesystem
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
@ -34,7 +39,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="2018.09"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

6
configs/olimex_imx233_olinuxino_defconfig
View File

@ -2,8 +2,8 @@
BR2_arm=y
BR2_arm926t=y
# Linux headers same as kernel, a 4.14 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
# Linux headers same as kernel, a 4.19 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=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.14"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2"
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y

6
configs/orangepi_pc_defconfig
View File

@ -1,7 +1,7 @@
BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_FPU_VFPV4=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC"
BR2_SYSTEM_DHCP="eth0"
@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3"
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@ -20,7 +20,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="2018.07"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

6
configs/orangepi_zero_defconfig
View File

@ -3,13 +3,13 @@ BR2_cortex_a7=y
BR2_ARM_FPU_VFPV4=y
BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
BR2_SYSTEM_DHCP="eth0"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3"
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero"
@ -21,7 +21,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="2018.07"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

13
configs/solidrun_macchiatobin_mainline_defconfig
View File

@ -1,5 +1,5 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
BR2_TARGET_GENERIC_HOSTNAME="mcbin"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
@ -19,14 +19,17 @@ BR2_TARGET_MV_DDR_MARVELL=y
# U-Boot
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_USE_DEFCONFIG=y
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragment.config"
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin"
@ -41,4 +44,4 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build.sh"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build-mainline.sh"

13
fs/common.mk
View File

@ -70,6 +70,8 @@ rootfs-common-show-depends:
# all variable references except the arguments must be $$-quoted.
define inner-rootfs
ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1)
ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME))
ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1)
ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target
@ -104,10 +106,11 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz
ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c
endif
$$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2)
$$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2)
$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES)
@$$(call MESSAGE,"Generating filesystem image $$(ROOTFS_$(2)_FINAL_IMAGE_NAME)")
mkdir -p $$(@D)
rm -rf $$(ROOTFS_$(2)_DIR)
mkdir -p $$(ROOTFS_$(2)_DIR)
rsync -auH \
@ -142,7 +145,7 @@ endif
rootfs-$(1)-show-depends:
@echo $$(ROOTFS_$(2)_DEPENDENCIES)
rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1)
rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME)
.PHONY: rootfs-$(1) rootfs-$(1)-show-depends

4
linux/Config.in
View File

@ -30,7 +30,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
bool "Latest version (4.18)"
bool "Latest version (4.19)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (v4.4.154-cip28)"
@ -120,7 +120,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "4.18.20" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.2" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.154-cip28" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION

1
linux/linux.hash
View File

@ -1,5 +1,6 @@
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 68ac319e0fb7edd6b6051541d9cf112cd4f77a29e16a69ae1e133ff51117f653 linux-4.18.20.tar.xz
sha256 c10c7f81019bd782ea77a25725f6d53e9affa4a0cfd3985c161f3a2a22f2df73 linux-4.19.2.tar.xz
sha256 41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021 linux-4.16.18.tar.xz
sha256 701728de924e0ec4a6b7cf59252011f8268a1b70aaf02b8487c1b2190feb3f20 linux-4.14.83.tar.xz
sha256 f888aef58c2c4d82c81511ad6a4528ee9a8241bb96c05c65e71224988782f943 linux-4.9.140.tar.xz

3
linux/linux.mk
View File

@ -323,6 +323,9 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(if $(BR2_PACKAGE_AUDIT),
$(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config))
$(if $(BR2_PACKAGE_INTEL_MICROCODE),
$(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL,$(@D)/.config))
$(if $(BR2_PACKAGE_KTAP),
$(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config)

14
package/Config.in
View File

@ -131,6 +131,7 @@ menu "Debugging, profiling and benchmark"
source "package/trinity/Config.in"
source "package/uclibc-ng-test/Config.in"
source "package/valgrind/Config.in"
source "package/vmtouch/Config.in"
source "package/whetstone/Config.in"
endmenu
@ -141,6 +142,7 @@ menu "Development tools"
source "package/check/Config.in"
source "package/cmake/Config.in"
source "package/cppunit/Config.in"
source "package/cunit/Config.in"
source "package/cvs/Config.in"
source "package/cxxtest/Config.in"
source "package/diffutils/Config.in"
@ -550,6 +552,7 @@ menu "Interpreter languages and scripting"
source "package/erlang/Config.in"
if BR2_PACKAGE_ERLANG
menu "Erlang libraries/modules"
source "package/erlang-eimp/Config.in"
source "package/erlang-goldrush/Config.in"
source "package/erlang-jiffy/Config.in"
source "package/erlang-lager/Config.in"
@ -756,7 +759,6 @@ menu "Perl libraries/modules"
source "package/perl-sys-cpu/Config.in"
source "package/perl-sys-meminfo/Config.in"
source "package/perl-sys-mmap/Config.in"
source "package/perl-time-hires/Config.in"
source "package/perl-time-parsedate/Config.in"
source "package/perl-timedate/Config.in"
source "package/perl-try-tiny/Config.in"
@ -794,6 +796,8 @@ endif
if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
menu "External python modules"
source "package/python-aiocoap/Config.in"
source "package/python-aiodns/Config.in"
source "package/python-aiohttp/Config.in"
source "package/python-alsaaudio/Config.in"
source "package/python-argh/Config.in"
source "package/python-arrow/Config.in"
@ -813,6 +817,7 @@ menu "External python modules"
source "package/python-cached-property/Config.in"
source "package/python-can/Config.in"
source "package/python-cbor/Config.in"
source "package/python-cchardet/Config.in"
source "package/python-certifi/Config.in"
source "package/python-cffi/Config.in"
source "package/python-characteristic/Config.in"
@ -949,6 +954,7 @@ menu "External python modules"
source "package/python-pyasn-modules/Config.in"
source "package/python-pyasn1/Config.in"
source "package/python-pyasn1-modules/Config.in"
source "package/python-pycares/Config.in"
source "package/python-pycli/Config.in"
source "package/python-pycparser/Config.in"
source "package/python-pycrypto/Config.in"
@ -1495,6 +1501,7 @@ menu "Networking"
source "package/freeradius-client/Config.in"
source "package/geoip/Config.in"
source "package/glib-networking/Config.in"
source "package/grpc/Config.in"
source "package/gssdp/Config.in"
source "package/gupnp/Config.in"
source "package/gupnp-av/Config.in"
@ -1550,6 +1557,7 @@ menu "Networking"
source "package/libstrophe/Config.in"
source "package/libtirpc/Config.in"
source "package/libtorrent/Config.in"
source "package/libtorrent-rasterbar/Config.in"
source "package/libupnp/Config.in"
source "package/libupnp18/Config.in"
source "package/libupnpp/Config.in"
@ -1583,6 +1591,7 @@ menu "Networking"
source "package/thrift/Config.in"
source "package/usbredir/Config.in"
source "package/wampcc/Config.in"
source "package/websocketpp/Config.in"
source "package/zeromq/Config.in"
source "package/zmqpp/Config.in"
source "package/zyre/Config.in"
@ -1826,6 +1835,7 @@ menu "Networking applications"
source "package/ejabberd/Config.in"
source "package/ethtool/Config.in"
source "package/faifa/Config.in"
source "package/fail2ban/Config.in"
source "package/fastd/Config.in"
source "package/fcgiwrap/Config.in"
source "package/flannel/Config.in"
@ -1866,6 +1876,7 @@ menu "Networking applications"
source "package/iputils/Config.in"
source "package/irssi/Config.in"
source "package/iw/Config.in"
source "package/iwd/Config.in"
source "package/janus-gateway/Config.in"
source "package/keepalived/Config.in"
source "package/kismet/Config.in"
@ -1885,6 +1896,7 @@ menu "Networking applications"
source "package/macchanger/Config.in"
source "package/memcached/Config.in"
source "package/mii-diag/Config.in"
source "package/mini-snmpd/Config.in"
source "package/minidlna/Config.in"
source "package/minissdpd/Config.in"
source "package/mjpg-streamer/Config.in"

8
package/acpid/acpid.mk
View File

@ -10,6 +10,14 @@ ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
ACPID_LICENSE = GPL-2.0+
ACPID_LICENSE_FILES = COPYING
define ACPID_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0755 package/acpid/acpid.service \
$(TARGET_DIR)/usr/lib/systemd/system/acpid.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/acpid.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/acpid.service
endef
define ACPID_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/acpid/S02acpid \
$(TARGET_DIR)/etc/init.d/S02acpid

9
package/acpid/acpid.service Normal file
View File

@ -0,0 +1,9 @@
[Unit]
Description=ACPI event daemon
Documentation=man:acpid(8)
[Service]
ExecStart=/usr/sbin/acpid --foreground --netlink
[Install]
WantedBy=multi-user.target

2
package/alsa-lib/alsa-lib.hash
View File

@ -1,4 +1,4 @@
# Locally calculated
sha256 5f2cd274b272cae0d0d111e8a9e363f08783329157e8dd68b3de0c096de6d724 alsa-lib-1.1.6.tar.bz2
sha256 9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09 alsa-lib-1.1.7.tar.bz2
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING

2
package/alsa-lib/alsa-lib.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ALSA_LIB_VERSION = 1.1.6
ALSA_LIB_VERSION = 1.1.7
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)

2
package/alsa-utils/alsa-utils.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 155caecc40b2220f686f34ba3655a53e3bdbc0586adb1056733949feaaf7d36e alsa-utils-1.1.6.tar.bz2
sha256 1db27fb54ab7fdeb54b00d68b8a174808ffea198cfbd67e3c959482194e1540a alsa-utils-1.1.7.tar.bz2
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING

2
package/alsa-utils/alsa-utils.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ALSA_UTILS_VERSION = 1.1.6
ALSA_UTILS_VERSION = 1.1.7
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
ALSA_UTILS_LICENSE = GPL-2.0

48
package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch Normal file
View File

@ -0,0 +1,48 @@
From d24abbec201975a5eb7f8589614cfb424b8c80b6 Mon Sep 17 00:00:00 2001
From: Alex Kaplan <kaplan2539@gmail.com>
Date: Sat, 10 Nov 2018 19:50:51 -0800
Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
Signed-off-by: Alex Kaplan <kaplan2539@gmail.com>
---
debian/makefiles/ext4_utils.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
index cb64916..c5904bf 100644
--- a/debian/makefiles/ext4_utils.mk
+++ b/debian/makefiles/ext4_utils.mk
@@ -1,6 +1,7 @@
# Makefile for ext4_utils; based on https://heiher.info/2227.html
# Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
+VPATH+=$(SRCDIR)/extras/ext4_utils
SRCS+=make_ext4fs.c
SRCS+=ext4fixup.c
SRCS+=ext4_utils.c
@@ -13,7 +14,7 @@ SRCS+=sha1.c
SRCS+=wipe.c
SRCS+=crc16.c
-VPATH+=../../core/libsparse
+VPATH+=$(SRCDIR)/core/libsparse
SRCS+= backed_block.c
SRCS+= sparse_crc32.c
SRCS+= sparse.c
@@ -31,10 +32,9 @@ SRCS+=img2simg.c
SRCS+=simg2img.c
SRCS+=simg2simg.c
-CPPFLAGS+= -I.
-CPPFLAGS+= -I/usr/include
-CPPFLAGS+= -I../../core/include
-CPPFLAGS+= -I../../core/libsparse/include/
+CPPFLAGS+= -I$(SRCDIR)
+CPPFLAGS+= -I$(SRCDIR)/core/include
+CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/
LIBS+= -lz -lselinux
--
2.7.4

7
package/android-tools/Config.in.host
View File

@ -23,4 +23,11 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB
host, which can be used to interact with target devices
implementing the ADB protocol.
config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS
bool "ext4 utils"
help
This option will build and install the ext4 utils for the
host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg,
simg2img and simg2simg.
endif

19
package/android-tools/android-tools.mk
View File

@ -31,15 +31,24 @@ HOST_ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT),y)
HOST_ANDROID_TOOLS_TARGETS += fastboot
HOST_ANDROID_TOOLS_BUILD_TARGETS += fastboot
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-fastboot/fastboot
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-libselinux
endif
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB),y)
HOST_ANDROID_TOOLS_TARGETS += adb
HOST_ANDROID_TOOLS_BUILD_TARGETS += adb
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-adb/adb
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-openssl
endif
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS),y)
HOST_ANDROID_TOOLS_BUILD_TARGETS += ext4_utils
HOST_ANDROID_TOOLS_INSTALL_TARGETS += \
$(addprefix build-ext4_utils/,make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg)
HOST_ANDROID_TOOLS_DEPENDENCIES += host-libselinux
endif
ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT),y)
ANDROID_TOOLS_TARGETS += fastboot
ANDROID_TOOLS_DEPENDENCIES += zlib libselinux
@ -58,7 +67,7 @@ endif
# Build each tool in its own directory not to share object files
define HOST_ANDROID_TOOLS_BUILD_CMDS
$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
$(foreach t,$(HOST_ANDROID_TOOLS_BUILD_TARGETS),\
mkdir -p $(@D)/build-$(t) && \
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \
-C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep))
@ -72,8 +81,8 @@ define ANDROID_TOOLS_BUILD_CMDS
endef
define HOST_ANDROID_TOOLS_INSTALL_CMDS
$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/bin/$(t)$(sep))
$(foreach t,$(HOST_ANDROID_TOOLS_INSTALL_TARGETS),\
$(INSTALL) -D -m 0755 $(@D)/$(t) $(HOST_DIR)/bin/$(notdir $(t))$(sep))
endef
define ANDROID_TOOLS_INSTALL_TARGET_CMDS

41
package/binutils/2.31.1/0002-ld-makefile.patch
View File

@ -1,41 +0,0 @@
From ae435bc27e1eb59e4ad571a37a144bf99dc68f55 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:40:53 +0100
Subject: [PATCH] ld-makefile
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/Makefile.am | 2 +-
ld/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ld/Makefile.am b/ld/Makefile.am
index d86ad0940c9..c95b0ef0252 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -57,7 +57,7 @@ endif
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
EMUL = @EMUL@
EMULATION_OFILES = @EMULATION_OFILES@
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 4792b2b013c..789df2d01b9 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include
--
2.14.4

36
package/binutils/2.31.1/0003-check-ldrunpath-length.patch
View File

@ -1,36 +0,0 @@
From a216bfcd91363a8e8c14db320a2870fff2985d78 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:41:47 +0100
Subject: [PATCH] check-ldrunpath-length
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/emultempl/elf32.em | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 1ad9d6b6fa8..637a5d5d585 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1471,6 +1471,8 @@ fragment <<EOF
&& command_line.rpath == NULL)
{
path = (const char *) getenv ("LD_RUN_PATH");
+ if ((path) && (strlen (path) == 0))
+ path = NULL;
if (path
&& gld${EMULATION_NAME}_search_needed (path, &n, force))
break;
@@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void)
rpath = command_line.rpath;
if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH");
+ if ((rpath) && (strlen (rpath) == 0))
+ rpath = NULL;
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--
2.14.4

51
package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch
View File

@ -1,51 +0,0 @@
From 73ecf6f6a1f327c9fa3af1fc924d152321aac801 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:42:48 +0100
Subject: [PATCH] add sysroot fix from bug #3049
Always try to prepend the sysroot prefix to absolute filenames first.
http://bugs.gentoo.org/275666
http://sourceware.org/bugzilla/show_bug.cgi?id=10340
Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/ldfile.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ld/ldfile.c b/ld/ldfile.c
index a72ff135264..b3d166cbd60 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
directory first. */
if (!entry->flags.maybe_archive)
{
- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+ /* For absolute pathnames, try to always open the file in the
+ sysroot first. If this fails, try to open the file at the
+ given location. */
+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
+ && ld_sysroot)
{
char *name = concat (ld_sysroot, entry->filename,
(const char *) NULL);
if (ldfile_try_open_bfd (name, entry))
{
entry->filename = name;
+ entry->flags.sysrooted = TRUE;
return TRUE;
}
free (name);
}
- else if (ldfile_try_open_bfd (entry->filename, entry))
+ if (ldfile_try_open_bfd (entry->filename, entry))
return TRUE;
if (IS_ABSOLUTE_PATH (entry->filename))
--
2.14.4

4
package/binutils/Config.in.host
View File

@ -31,13 +31,13 @@ config BR2_BINUTILS_VERSION_2_31_X
bool "binutils 2.31.1"
config BR2_BINUTILS_VERSION_ARC
bool "binutils arc (2.29)"
bool "binutils arc (2.31)"
depends on BR2_arc
endchoice
config BR2_BINUTILS_VERSION
string
default "arc-2018.03" if BR2_BINUTILS_VERSION_ARC
default "arc-2018.09" if BR2_BINUTILS_VERSION_ARC
default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X
default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X
default "2.30" if BR2_BINUTILS_VERSION_2_30_X

41
package/binutils/arc-2018.03/0002-ld-makefile.patch
View File

@ -1,41 +0,0 @@
From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:40:53 +0100
Subject: [PATCH] ld-makefile
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/Makefile.am | 2 +-
ld/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 625347f..d5334d2 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -57,7 +57,7 @@ endif
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
EMUL = @EMUL@
EMULATION_OFILES = @EMULATION_OFILES@
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ba25177..a2cf228 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include
--
2.9.4

36
package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch
View File

@ -1,36 +0,0 @@
From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:41:47 +0100
Subject: [PATCH] check-ldrunpath-length
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/emultempl/elf32.em | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index d2551b6..70fcb56 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1463,6 +1463,8 @@ fragment <<EOF
&& command_line.rpath == NULL)
{
path = (const char *) getenv ("LD_RUN_PATH");
+ if ((path) && (strlen (path) == 0))
+ path = NULL;
if (path
&& gld${EMULATION_NAME}_search_needed (path, &n, force))
break;
@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void)
rpath = command_line.rpath;
if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH");
+ if ((rpath) && (strlen (rpath) == 0))
+ rpath = NULL;
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--
2.9.4

51
package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch
View File

@ -1,51 +0,0 @@
From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:42:48 +0100
Subject: [PATCH] add sysroot fix from bug #3049
Always try to prepend the sysroot prefix to absolute filenames first.
http://bugs.gentoo.org/275666
http://sourceware.org/bugzilla/show_bug.cgi?id=10340
Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
[Romain: rebase on top of 2.26]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
ld/ldfile.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 3b37a0a..f7e5473 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
directory first. */
if (!entry->flags.maybe_archive)
{
- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+ /* For absolute pathnames, try to always open the file in the
+ sysroot first. If this fails, try to open the file at the
+ given location. */
+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
+ && ld_sysroot)
{
char *name = concat (ld_sysroot, entry->filename,
(const char *) NULL);
if (ldfile_try_open_bfd (name, entry))
{
entry->filename = name;
+ entry->flags.sysrooted = TRUE;
return TRUE;
}
free (name);
}
- else if (ldfile_try_open_bfd (entry->filename, entry))
+ if (ldfile_try_open_bfd (entry->filename, entry))
return TRUE;
if (IS_ABSOLUTE_PATH (entry->filename))
--
2.9.4

60
package/binutils/arc-2018.03/0005-poison-system-directories.patch → package/binutils/arc-2018.09/0005-poison-system-directories.patch
View File

@ -1,4 +1,4 @@
From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001
From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:45:38 +0100
Subject: [PATCH] poison-system-directories
@ -70,7 +70,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
ld/configure | 14 ++++++++++++++
ld/configure.ac | 10 ++++++++++
ld/ld.h | 8 ++++++++
ld/ld.texinfo | 12 ++++++++++++
ld/ld.texi | 12 ++++++++++++
ld/ldfile.c | 17 +++++++++++++++++
ld/ldlex.h | 2 ++
ld/ldmain.c | 2 ++
@ -78,10 +78,10 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9 files changed, 89 insertions(+)
diff --git a/ld/config.in b/ld/config.in
index 5d91380..ffe84a7 100644
index d93c9b0..5da2742 100644
--- a/ld/config.in
+++ b/ld/config.in
@@ -21,6 +21,9 @@
@@ -31,6 +31,9 @@
language is requested. */
#undef ENABLE_NLS
@ -92,10 +92,10 @@ index 5d91380..ffe84a7 100644
#undef EXTRA_SHLIB_EXTENSION
diff --git a/ld/configure b/ld/configure
index da20ab5..63e3da7 100755
index 300a272..d68890f 100755
--- a/ld/configure
+++ b/ld/configure
@@ -785,6 +785,7 @@ with_lib_path
@@ -822,6 +822,7 @@ with_lib_path
enable_targets
enable_64_bit_bfd
with_sysroot
@ -103,7 +103,7 @@ index da20ab5..63e3da7 100755
enable_gold
enable_got
enable_compressed_debug_sections
@@ -1443,6 +1444,8 @@ Optional Features:
@@ -1486,6 +1487,8 @@ Optional Features:
--disable-largefile omit support for large files
--enable-targets alternative target configurations
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@ -112,7 +112,7 @@ index da20ab5..63e3da7 100755
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
--enable-got=<type> GOT handling scheme (target, single, negative,
multigot)
@@ -15497,7 +15500,18 @@ else
@@ -15803,7 +15806,18 @@ else
fi
@ -132,10 +132,10 @@ index da20ab5..63e3da7 100755
# Check whether --enable-got was given.
if test "${enable_got+set}" = set; then :
diff --git a/ld/configure.ac b/ld/configure.ac
index 34315e6..5ade9a0 100644
index d10c553..9f1b57b 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
AC_SUBST(TARGET_SYSTEM_ROOT)
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
@ -153,10 +153,10 @@ index 34315e6..5ade9a0 100644
dnl "install_as_default" is set to false if gold is the default linker.
dnl "installed_linker" is the installed BFD linker name.
diff --git a/ld/ld.h b/ld/ld.h
index 162e156..7d6d7ef 100644
index ba914b9..9df17da 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -177,6 +177,14 @@ typedef struct
@@ -180,6 +180,14 @@ typedef struct
in the linker script. */
bfd_boolean force_group_allocation;
@ -171,11 +171,11 @@ index 162e156..7d6d7ef 100644
/* Big or little endian as set on command line. */
enum endian_enum endian;
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index bb5f719..78501e4 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
diff --git a/ld/ld.texi b/ld/ld.texi
index 40d79dd..137d46c 100644
--- a/ld/ld.texi
+++ b/ld/ld.texi
@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change.
Passing @code{none} for @var{style} disables the setting from any
@code{--build-id} options earlier on the command line.
@ -195,7 +195,7 @@ index bb5f719..78501e4 100644
@c man end
diff --git a/ld/ldfile.c b/ld/ldfile.c
index f7e5473..2cd84d3 100644
index b3d166c..3dcbf66 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
@ -223,10 +223,10 @@ index f7e5473..2cd84d3 100644
/* Try to open a BFD for a lang_input_statement. */
diff --git a/ld/ldlex.h b/ld/ldlex.h
index 5aa7f6b..cb655e0 100644
index 04d6fd5..d7df005 100644
--- a/ld/ldlex.h
+++ b/ld/ldlex.h
@@ -147,6 +147,8 @@ enum option_values
@@ -148,6 +148,8 @@ enum option_values
OPTION_REQUIRE_DEFINED_SYMBOL,
OPTION_ORPHAN_HANDLING,
OPTION_FORCE_GROUP_ALLOCATION,
@ -236,10 +236,10 @@ index 5aa7f6b..cb655e0 100644
/* The initial parser states. */
diff --git a/ld/ldmain.c b/ld/ldmain.c
index ee5ab11..5f6effd 100644
index f31eeb2..25f8497 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -270,6 +270,8 @@ main (int argc, char **argv)
@@ -268,6 +268,8 @@ main (int argc, char **argv)
command_line.warn_mismatch = TRUE;
command_line.warn_search_mismatch = TRUE;
command_line.check_section_addresses = -1;
@ -249,10 +249,10 @@ index ee5ab11..5f6effd 100644
/* We initialize DEMANGLING based on the environment variable
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 08106bc..d619d50 100644
index 86a033a..f07f095 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] =
{ {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
'\0', N_("=MODE"), N_("Control how orphan sections are handled."),
TWO_DASHES },
@ -267,7 +267,7 @@ index 08106bc..d619d50 100644
};
#define OPTION_COUNT ARRAY_SIZE (ld_options)
@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv)
int ingroup = 0;
char *default_dirlist = NULL;
char *shortopts;
@ -275,9 +275,9 @@ index 08106bc..d619d50 100644
struct option *longopts;
struct option *really_longopts;
int last_optind;
@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
}
break;
@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv)
}
break;
+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
+ command_line.poison_system_directories = FALSE;
@ -290,7 +290,7 @@ index 08106bc..d619d50 100644
case OPTION_PUSH_STATE:
input_flags.pushed = xmemdup (&input_flags,
sizeof (input_flags),
@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv)
command_line.soname = NULL;
}
@ -302,5 +302,5 @@ index 08106bc..d619d50 100644
{
lang_leave_group ();
--
2.9.4
2.7.4

2
package/binutils/binutils.hash
View File

@ -5,4 +5,4 @@ sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b19
sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz
# Locally calculated (fetched from Github)
sha512 bea88164ed48733bad63393fe702e12e651efd113aa4f3fe2e253e05c4c1e5da20b5a99333f0b5528df6d32ce806f799211c568e1916845a87999901dde28817 binutils-arc-2018.03.tar.gz
sha512 5db8f749bfaf4d688ad3429018cbf2b5448b69d8f14a99e00df309d96735eae03da49b82ed38e4b2602c2da5b1b26b7453986b108e1898aff07cdef511802cdb binutils-arc-2018.09.tar.gz

4
package/binutils/binutils.mk
View File

@ -9,13 +9,13 @@
BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
ifeq ($(BINUTILS_VERSION),)
ifeq ($(BR2_arc),y)
BINUTILS_VERSION = arc-2018.03
BINUTILS_VERSION = arc-2018.09
else
BINUTILS_VERSION = 2.29.1
endif
endif # BINUTILS_VERSION
ifeq ($(BINUTILS_VERSION),arc-2018.03)
ifeq ($(BINUTILS_VERSION),arc-2018.09)
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

2
package/c-ares/c-ares.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz
sha256 6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852 c-ares-1.15.0.tar.gz
# Hash for license file
sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md

3
package/c-ares/c-ares.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
C_ARES_VERSION = 1.14.0
C_ARES_VERSION = 1.15.0
C_ARES_SITE = http://c-ares.haxx.se/download
C_ARES_INSTALL_STAGING = YES
C_ARES_CONF_OPTS = --with-random=/dev/urandom
@ -14,3 +14,4 @@ C_ARES_LICENSE = MIT
C_ARES_LICENSE_FILES = LICENSE.md
$(eval $(autotools-package))
$(eval $(host-autotools-package))

27
package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch
View File

@ -1,27 +0,0 @@
From 0821066f9adf8410891cd07684ecac50a9bc36a4 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail>
Date: Wed, 25 Feb 2015 18:40:24 +0100
Subject: [PATCH] Lua: fix a typo changing %(LFS_DIR) to $(LFS_DIR)
Also this fix a error on GNU Make v4.0:
Makefile:203: *** mixed implicit and normal rules. Stop.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail>
---
resources/Makefile.in-lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua
index 0902f11..f3d95fd 100644
--- a/resources/Makefile.in-lua
+++ b/resources/Makefile.in-lua
@@ -57,5 +57,5 @@ LFS_CFLAGS = -I$(LFS_DIR)
OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS)
CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
-SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)
+SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR)
--
2.3.0

34
package/civetweb/0001-modlua.ini-include-dlfcn.h.patch Normal file
View File

@ -0,0 +1,34 @@
From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 29 Nov 2018 21:43:28 +0100
Subject: [PATCH] modlua.ini: include dlfcn.h
dlfcn.h must be included to be able to use dlopen otherwise build will
fail on:
src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function)
lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY);
Fixes:
- http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/civetweb/civetweb/pull/706]
---
src/mod_lua.inl | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mod_lua.inl b/src/mod_lua.inl
index 97a5de1e..ce7a4b2e 100644
--- a/src/mod_lua.inl
+++ b/src/mod_lua.inl
@@ -2,6 +2,7 @@
* See https://github.com/civetweb/civetweb/
*/
+#include <dlfcn.h>
#include "civetweb_lua.h"
#include "civetweb_private_lua.h"
--
2.14.1

12
package/civetweb/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_CIVETWEB
bool "civetweb"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_CIVETWEB_SERVER if !BR2_PACKAGE_CIVETWEB_LIB
help
Full featured embedded web server with Lua support.
@ -9,6 +10,17 @@ config BR2_PACKAGE_CIVETWEB
if BR2_PACKAGE_CIVETWEB
config BR2_PACKAGE_CIVETWEB_SERVER
bool "enable the web server application"
help
Include the web server and its config files.
config BR2_PACKAGE_CIVETWEB_LIB
bool "enable library for embedding"
help
Enable the civetweb library for embedding in another
application.
config BR2_PACKAGE_CIVETWEB_WITH_LUA
bool "enable Lua support"
# required by the bundled Sqlite3 and Lua code

3
package/civetweb/civetweb.hash
View File

@ -1,2 +1,3 @@
# Locally calculated
sha256 79a852a26068eb6d2f8de5ee72e021f0d2c8bd176eb81f41909a876b736815d9 civetweb-v1.5.tar.gz
sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-v1.11.tar.gz
sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706 LICENSE.md

53
package/civetweb/civetweb.mk
View File

@ -4,16 +4,22 @@
#
################################################################################
CIVETWEB_VERSION = v1.5
CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
CIVETWEB_VERSION = v1.11
CIVETWEB_SITE = $(call github,civetweb,civetweb,$(CIVETWEB_VERSION))
CIVETWEB_LICENSE = MIT
CIVETWEB_LICENSE_FILES = LICENSE.md
CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1
CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \
$(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0
CIVETWEB_LIBS = -lpthread -lm
CIVETWEB_SYSCONFDIR = /etc
CIVETWEB_HTMLDIR = /var/www
CIVETWEB_INSTALL_OPTS = \
DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)"
ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)
CIVETWEB_CONF_OPTS += WITH_LUA=1
@ -28,19 +34,48 @@ else
CIVETWEB_COPT += -DNO_SSL
endif
ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
CIVETWEB_BUILD_TARGETS += build
CIVETWEB_INSTALL_TARGETS += install
endif
ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
CIVETWEB_INSTALL_STAGING = YES
CIVETWEB_INSTALL_TARGETS += install-headers
ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
CIVETWEB_BUILD_TARGETS += lib
CIVETWEB_INSTALL_TARGETS += install-lib
endif
ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
CIVETWEB_BUILD_TARGETS += slib
CIVETWEB_INSTALL_TARGETS += install-slib
CIVETWEB_COPT += -fPIC
endif
endif # BR2_PACKAGE_CIVETWEB_LIB
define CIVETWEB_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_BUILD_TARGETS) \
$(CIVETWEB_CONF_OPTS) \
COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
endef
define CIVETWEB_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
PREFIX="$(STAGING_DIR)/usr" \
$(CIVETWEB_INSTALL_OPTS) \
$(CIVETWEB_CONF_OPTS) \
COPT='$(CIVETWEB_COPT)'
endef
define CIVETWEB_INSTALL_TARGET_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
mkdir -p $(TARGET_DIR)/usr/include
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
PREFIX="$(TARGET_DIR)/usr" \
$(CIVETWEB_INSTALL_OPTS) \
$(CIVETWEB_CONF_OPTS) \
COPT='$(CIVETWEB_COPT)'
endef

6
package/cunit/Config.in Normal file
View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_CUNIT
bool "cunit"
help
An automated testing framework in 'C'.
http://cunit.sourceforge.net/

3
package/cunit/cunit.hash Normal file
View File

@ -0,0 +1,3 @@
# Locally calculated:
sha256 f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214 CUnit-2.1-3.tar.bz2
sha256 5d9d73d41a57dd2f34487ef3978a2c13cdb97294baeeb81fcd274796399eb15f COPYING

17
package/cunit/cunit.mk Normal file
View File

@ -0,0 +1,17 @@
################################################################################
#
# cunit
#
################################################################################
CUNIT_VERSION = 2.1-3
CUNIT_SITE = http://downloads.sourceforge.net/project/cunit/CUnit/$(CUNIT_VERSION)
CUNIT_SOURCE = CUnit-$(CUNIT_VERSION).tar.bz2
CUNIT_INSTALL_STAGING = YES
CUNIT_LICENSE = LGPL-2.0+
CUNIT_LICENSE_FILES = COPYING
# The source archive does not have the autoconf/automake material generated.
CUNIT_AUTORECONF = YES
$(eval $(autotools-package))

7
package/dante/dante.mk
View File

@ -14,6 +14,13 @@ DANTE_AUTORECONF = YES
DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
DANTE_DEPENDENCIES += linux-pam
DANTE_CONF_OPTS += --with-pam
else
DANTE_CONF_OPTS += --without-pam
endif
define DANTE_INSTALL_CONFIG_FILE
$(INSTALL) -D -m 644 $(@D)/example/sockd.conf \
$(TARGET_DIR)/etc/sockd.conf

2
package/dbus-python/dbus-python.hash
View File

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc dbus-python-1.2.4.tar.gz
sha256 abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f dbus-python-1.2.8.tar.gz

2
package/dbus-python/dbus-python.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DBUS_PYTHON_VERSION = 1.2.4
DBUS_PYTHON_VERSION = 1.2.8
DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
DBUS_PYTHON_INSTALL_STAGING = YES
DBUS_PYTHON_LICENSE = MIT

2
package/dovecot-pigeonhole/dovecot-pigeonhole.hash
View File

@ -1,3 +1,3 @@
# Locally computed after checking signature
sha256 e02f2741c05f9e2af1c5f46da35efb74997f9d4b941ba68936206d310ddf2622 dovecot-2.3-pigeonhole-0.5.3.tar.gz
sha256 547999e67a001abc5e654c7e35653d3fe057fa9a47a24257e39a79c41ef08516 dovecot-2.3-pigeonhole-0.5.4.tar.gz
sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING

2
package/dovecot-pigeonhole/dovecot-pigeonhole.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOVECOT_PIGEONHOLE_VERSION = 0.5.3
DOVECOT_PIGEONHOLE_VERSION = 0.5.4
DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3
DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1

2
package/dovecot/dovecot.hash
View File

@ -1,5 +1,5 @@
# Locally computed after checking signature
sha256 15af27ee25258afb4ad9581f8df681be998b763597086bbae54ca7d77a066d8e dovecot-2.3.3.tar.gz
sha256 d91b76eff8df6185c1799f1b279f780105bdeeea27e3286b42f4cab18efbef05 dovecot-2.3.4.tar.gz
sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT

2
package/dovecot/dovecot.mk
View File

@ -5,7 +5,7 @@
################################################################################
DOVECOT_VERSION_MAJOR = 2.3
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).3
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).4
DOVECOT_SITE = https://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

30
package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch
View File

@ -1,30 +0,0 @@
From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 4 Jan 2017 12:24:55 +0100
Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
breathe docs
Protected against NULL pointer of variable al
[Romain: backport from upstream]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
src/xmlgen.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index fe95c7a..70e198a 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
if (md->isInline()) t << "yes"; else t << "no";
t << "\"";
- if (al->refQualifier!=RefQualifierNone)
+ if (al!=0 && al->refQualifier!=RefQualifierNone)
{
t << " refqual=\"";
if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
--
2.9.4

58
package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch
View File

@ -1,58 +0,0 @@
From f9a3aa72c2bf15726bcdafd140fd21f790de555d Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <brgl@bgdev.pl>
Date: Wed, 21 Jun 2017 14:32:25 +0200
Subject: [PATCH] build: fix the way lang_cfg.h is generated
This header is generated by running cmake/lang_cfg.cmake and
redirecting its stderr. If any warning is emitted by this script, it
ends up in the generated header and breaks the build.
To avoid such problems: pass the path to the header as an argument to
the cmake script and use the cmake 'file' command instead of 'message'.
We can't even use message(STATUS...) as - although it prints to stdout
as opposed to other types of messages - it prepends all output with
a double hyphen.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
cmake/lang_cfg.cmake | 10 +++++-----
src/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake
index c57d3ed..86c2d9a 100644
--- a/cmake/lang_cfg.cmake
+++ b/cmake/lang_cfg.cmake
@@ -1,10 +1,10 @@
-if(${CMAKE_ARGC} GREATER 1)
- if ("${CMAKE_ARGV3}" STREQUAL "ENONLY")
- message("#define ENGLISH_ONLY")
+if(${CMAKE_ARGC} GREATER 2)
+ if ("${CMAKE_ARGV4}" STREQUAL "ENONLY")
+ file(APPEND ${CMAKE_ARGV3} " #define ENGLISH_ONLY")
else()
math(EXPR UPTO ${CMAKE_ARGC}-1)
- foreach(i RANGE 3 ${UPTO})
- message("#define LANG_${CMAKE_ARGV${i}}")
+ foreach(i RANGE 4 ${UPTO})
+ file(APPEND ${CMAKE_ARGV3} " #define LANG_${CMAKE_ARGV${i}}")
endforeach()
endif()
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08c8439..dcf4ef8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
# lang_cfg.h
add_custom_command(
COMMENT "Generating ${GENERATED_SRC}/lang_cfg.h"
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${GENERATED_SRC}/lang_cfg.h ${LANG_CODES}
DEPENDS ${LANGUAGE_FILES}
OUTPUT ${GENERATED_SRC}/lang_cfg.h
)
--
2.9.3

2
package/doxygen/doxygen.hash
View File

@ -1,2 +1,2 @@
# Computed locally
sha256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b doxygen-1.8.13.src.tar.gz
sha256 d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d doxygen-1.8.14.src.tar.gz

2
package/doxygen/doxygen.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOXYGEN_VERSION = 1.8.13
DOXYGEN_VERSION = 1.8.14
DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri
DOXYGEN_LICENSE = GPL-2.0

35
package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch Normal file
View File

@ -0,0 +1,35 @@
From 277103e886c9b3ddfede8b3f5b92d3e94736f404 Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Fri, 23 Nov 2018 16:13:21 +0100
Subject: [PATCH] Makefile.in: do not download or compile dependencies
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 48dca7d8..d2324dae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,7 @@ ifneq ($(INSTALLGROUP),)
G_USER=-g $(INSTALLGROUP)
endif
-all: deps src
+all: src
deps: deps/.got
@@ -108,7 +108,7 @@ deps/.built: deps/.got
$(REBAR) configure-deps
$(REBAR) compile && :> deps/.built
-src: deps/.built
+src:
$(REBAR) skip_deps=true compile
update:
--
2.17.1

43
package/ejabberd/0001-remove-make-targets-for-deps.patch
View File

@ -1,43 +0,0 @@
From 21d1f05a8882657c151397d0e4723535402f1757 Mon Sep 17 00:00:00 2001
From: Philipp Huebner <debalance@debian.org>
Date: Wed, 20 Jan 2016 10:22:57 -0500
Subject: [PATCH] remove make targets for deps
Without this patch, dependencies would be downloaded and compiled
using rebar at build time.
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
diff --git a/Makefile.in b/Makefile.in
index df2abfdc..8c8fd714 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,27 +86,11 @@ else
INIT_USER=$(INSTALLUSER)
endif
-all: deps src
+all: src
-deps: deps/.got
-
-deps/.got:
- rm -rf deps/.got
- rm -rf deps/.built
- mkdir -p deps
- $(REBAR) get-deps && :> deps/.got
-
-deps/.built: deps/.got
- $(REBAR) compile && :> deps/.built
-
-src: deps/.built
+src:
$(REBAR) skip_deps=true compile
-update:
- rm -rf deps/.got
- rm -rf deps/.built
- $(REBAR) update-deps && :> deps/.got
-
xref: all
$(REBAR) skip_deps=true xref

0
package/ejabberd/0007-fix-ejabberdctl.patch → package/ejabberd/0002-fix-ejabberdctl.patch
View File

106
package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
View File

@ -1,106 +0,0 @@
From 8674f61701da41cc53c532b5fa3a516838a2c5d4 Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Wed, 10 Jan 2018 15:14:56 +0100
Subject: [PATCH] remove dependencies from rebar config
Without this patch, dependencies would be downloaded and compiled by
rebar at build time.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
rebar.config | 72 ------------------------------------------------------------
1 file changed, 72 deletions(-)
diff --git a/rebar.config b/rebar.config
index d6ad5e7b..0b246b92 100644
--- a/rebar.config
+++ b/rebar.config
@@ -18,68 +18,6 @@
%%%
%%%----------------------------------------------------------------------
-{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager",
- {tag, {if_version_above, "17", "3.4.2", "3.2.1"}}}},
- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}},
- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.12"}}},
- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}},
- {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.16"}}},
- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.12"}}},
- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}},
- {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
- {jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}},
- {fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}},
- {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}},
- {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}},
- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
- {tag, "1.0.4"}}}},
- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
- {tag, "1.1.4"}}}},
- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
- {tag, "1.1.5"}}}},
- {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
- {tag, "1.0.3"}}}},
- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
- {tag, "1.0.3"}}}},
- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git",
- {tag, {if_version_above, "19", "develop", "2.5.3"}}}}},
- {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", {tag, "1.0.2"}}}},
- %% Elixir support, needed to run tests
- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
- {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
- %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
- {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*",
- {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
- {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
- {tag, "1.0.6"}}}},
- {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
- {tag, "0.8.4"}}}},
- {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
- {tag, "1.0.5c"}}}},
- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
- {tag, "v1.0.8"}}}}]}.
-
-{if_var_true, latest_deps,
- {floating_deps, [cache_tab,
- fast_tls,
- stringprep,
- fast_xml,
- esip,
- stun,
- fast_yaml,
- xmpp,
- p1_utils,
- p1_mysql,
- p1_pgsql,
- p1_oauth2,
- epam,
- ezlib,
- eimp,
- iconv]}}.
-
{erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}.
{erl_opts, [nowarn_deprecated_function,
@@ -153,16 +91,6 @@
{if_version_above, "17", {cover_enabled, true}}.
{cover_export_enabled, true}.
-{post_hook_configure, [{"fast_tls", []},
- {"stringprep", []},
- {"fast_yaml", []},
- {if_var_true, sip, {"esip", []}},
- {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
- {if_var_true, pam, {"epam", []}},
- {if_var_true, zlib, {"ezlib", []}},
- {if_var_true, graphics, {"eimp", []}},
- {if_var_true, iconv, {"iconv", []}}]}.
-
{port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
{port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
--
2.14.1

32
package/ejabberd/0003-remove-checking-erlang-version.patch
View File

@ -1,32 +0,0 @@
From f384518dedec4ad657ad69d55754076c13c22d96 Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Wed, 20 Jan 2016 08:11:32 -0500
Subject: [PATCH] remove checking erlang version
Without this patch, the configure will try to run erlang to simply check
if the version is supported by ejabberd. Instead, we do this test
statically.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
configure.ac | 2 --
1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 97e89a2..cd1ab08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check,
[Check Erlang/OTP version @<:@default=yes@:>@])])
case "$enable_erlang_version_check" in
yes|'')
- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
;;
no)
- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
;;
esac
--
2.5.0

1919
package/ejabberd/0004-correct-includes.patch
View File

File diff suppressed because it is too large Load Diff

29
package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
View File

@ -1,29 +0,0 @@
From d43a65b112ec995a5ee52aca2a16e5cf9699d7c1 Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Wed, 20 Jan 2016 08:16:26 -0500
Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK
Without this patch, the configure will try to execute erlang to check
if it uses deprecated types. Assume the answer is false.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index cd1ab08..a4f1533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ if test "$ENABLEUSER" != ""; then
AC_SUBST([INSTALLUSER], [$ENABLEUSER])
fi
-ERLANG_DEPRECATED_TYPES_CHECK
+AC_SUBST(erlang_deprecated_types, false)
if test "$sqlite" = "true"; then
AX_LIB_SQLITE3([3.6.19])
--
2.5.0

84
package/ejabberd/0006-fix-install-permissions.patch
View File

@ -1,84 +0,0 @@
From ef847479778cc58818e066b87aa1789ba1c4148b Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Wed, 20 Jan 2016 09:34:07 -0500
Subject: [PATCH] fix install permissions
Without this patch, the makefile will try to install directories and
files with incompatible permissions for ejabberd, which run as an
ejabberd user.
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
diff --git a/Makefile.in b/Makefile.in
index a0b4553d..2cae2db4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,10 +169,8 @@ copy-files-sub: copy-files-sub2
install: all copy-files
#
# Configuration files
- $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
- [ -f $(ETCDIR)/ejabberd.yml ] \
- && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
- || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
+ $(INSTALL) -d $(ETCDIR)
+ $(INSTALL) -b -m 644 ejabberd.yml.example $(ETCDIR)/ejabberd.yml
$(SED) -e "s*{{rootdir}}*@prefix@*g" \
-e "s*{{installuser}}*@INSTALLUSER@*g" \
-e "s*{{bindir}}*@bindir@*g" \
@@ -183,53 +181,16 @@ install: all copy-files
-e "s*{{erl}}*@ERL@*g" \
-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
> ejabberdctl.example
- [ -f $(ETCDIR)/ejabberdctl.cfg ] \
- && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
- || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+ $(INSTALL) -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+ $(INSTALL) -b -m 644 inetrc $(ETCDIR)/inetrc
#
# Administration script
- [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ $(INSTALL) -D ejabberdctl.example $(SBINDIR)/ejabberdctl
# Elixir binaries
[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
- #
- # Init script
- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
- -e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
- > ejabberd.init
- chmod 755 ejabberd.init
- #
- # Service script
- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
- > ejabberd.service
- chmod 644 ejabberd.service
- #
- # Spool directory
- $(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
- chmod -R 750 $(SPOOLDIR)
- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
- #
- # ejabberdctl lock directory
- $(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR)
- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
- chmod -R 750 $(CTLLOCKDIR)
- #
- # Log directory
- $(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
- chmod -R 750 $(LOGDIR)
- #
- # Documentation
- $(INSTALL) -d $(DOCDIR)
- [ -f doc/guide.html ] \
- && $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
- || echo "Documentation not included in sources"
- $(INSTALL) -m 644 COPYING $(DOCDIR)
uninstall: uninstall-binary

32
package/ejabberd/0008-handle-error-case-from-lib_dir.patch
View File

@ -1,32 +0,0 @@
From d0bfcbbfd8a6e7ee6213112e4078b020e4e1d15d Mon Sep 17 00:00:00 2001
From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Wed, 10 Jan 2018 16:34:01 +0100
Subject: [PATCH] Handle error case from code:lib_dir in ResolveDepPath in
rebar.config.script
This patch have already been applied in upstream/master.
Signed-off-by: Paweł Chmielowski <pchmielowski@process-one.net>
---
rebar.config.script | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/rebar.config.script b/rebar.config.script
index 85f918fffd..ba374e5c5f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -233,9 +233,10 @@ ResolveDepPath = case {SystemDeps, IsRebar3} of
{true, _} ->
fun("deps/" ++ Rest) ->
Slash = string:str(Rest, "/"),
- code:lib_dir(
- string:sub_string(Rest, 1, Slash -1)) ++
- string:sub_string(Rest, Slash);
+ case code:lib_dir(string:sub_string(Rest, 1, Slash -1)) of
+ {error, _} -> Rest;
+ V -> V ++ string:sub_string(Rest, Slash)
+ end;
(Path) ->
Path
end;

32
package/ejabberd/0009-disable-mod_avatar.patch
View File

@ -1,32 +0,0 @@
From e6eac74e82975e7d87b1f59c50eb007ab04c1392 Mon Sep 17 00:00:00 2001
From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Tue, 16 Jan 2018 14:29:56 +0100
Subject: [PATCH] disable mod_avatar
This module requires to compile with graphics enabled.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
ejabberd.yml.example | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ejabberd.yml.example b/ejabberd.yml.example
index e178e956..7c12b76c 100644
--- a/ejabberd.yml.example
+++ b/ejabberd.yml.example
@@ -796,9 +796,9 @@ modules:
search: false
mod_vcard_xupdate: {}
## Convert all avatars posted by Android clients from WebP to JPEG
- mod_avatar:
- convert:
- webp: jpeg
+ ## mod_avatar:
+ ## convert:
+ ## webp: jpeg
mod_version: {}
mod_stream_mgmt: {}
## Non-SASL Authentication (XEP-0078) is now disabled by default
--
2.14.1

1
package/ejabberd/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_EJABBERD
bool "ejabberd"
depends on BR2_PACKAGE_ERLANG
depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
select BR2_PACKAGE_ERLANG_EIMP
select BR2_PACKAGE_ERLANG_JIFFY
select BR2_PACKAGE_ERLANG_LAGER
select BR2_PACKAGE_ERLANG_P1_CACHE_TAB

2
package/ejabberd/ejabberd.hash
View File

@ -1,2 +1,2 @@
# Locally computed
sha256 bd16b33a2f1345e5847fd05b70a5fa992181bac756cd6d5d621de9c18cb76801 ejabberd-17.11.tgz
sha256 781a68d2deefb4afae563c29a8955063c759c244d308251167d46185f145d4ff ejabberd-18.09.tgz

12
package/ejabberd/ejabberd.mk
View File

@ -4,12 +4,13 @@
#
################################################################################
EJABBERD_VERSION = 17.11
EJABBERD_VERSION = 18.09
EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
EJABBERD_LICENSE_FILES = COPYING
EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \
EJABBERD_DEPENDENCIES = getent openssl erlang-eimp \
host-erlang-lager erlang-lager \
erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \
erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \
erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
@ -35,8 +36,7 @@ EJABBERD_CONF_ENV = \
EJABBERD_CONF_OPTS = \
--enable-system-deps \
--disable-erlang-version-check \
--disable-graphics
--disable-erlang-version-check
define EJABBERD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)
@ -54,6 +54,10 @@ define EJABBERD_USERS
ejabberd -1 ejabberd -1 * /var/lib/ejabberd /bin/sh - ejabberd daemon
endef
define EJABBERD_PERMISSIONS
/etc/ejabberd r 750 root ejabberd - - - - -
endef
define EJABBERD_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/ejabberd/S50ejabberd \
$(TARGET_DIR)/etc/init.d/S50ejabberd

30
package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch Normal file
View File

@ -0,0 +1,30 @@
From e68d797ffdfe768c1e4a356add5bb12c43f40a72 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Fri, 9 Nov 2018 23:28:39 +0100
Subject: [PATCH] ell/ell.sym: add missing l_genl_family_set_unicast_handler
Fixes iwd compile failure:
src/netdev.o: In function `netdev_set_nl80211':
netdev.c:(.text+0x6f04): undefined reference to `l_genl_family_set_unicast_handler'
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
ell/ell.sym | 1 +
1 file changed, 1 insertion(+)
diff --git a/ell/ell.sym b/ell/ell.sym
index 614bc93..cdd2c21 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -257,6 +257,7 @@ global:
l_genl_family_new;
l_genl_family_ref;
l_genl_family_unref;
+ l_genl_family_set_unicast_handler;
l_genl_family_set_watches;
l_genl_family_get_version;
l_genl_family_get_genl;
--
2.19.1

57
package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
View File

@ -1,57 +0,0 @@
From abff9db9a6e86e00613a420dd6a0ba3bc81e2b72 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Fri, 2 Nov 2018 12:58:57 +0100
Subject: [PATCH] ell/signal.h: use standard sigset_t, fixes musl compile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use standard sigset_t (instead __sigset_t):
- fixes musl compile
- fies mismatch between header and implementation file
Fixes:
In file included from ell/main.c:35:0:
ell/signal.h:39:40: error: unknown type name ‘__sigset_t’
struct l_signal *l_signal_create(const __sigset_t *mask,
^~~~~~~~~~
In file included from ell/signal.c:35:0:
ell/signal.h:39:40: error: unknown type name ‘__sigset_t’
struct l_signal *l_signal_create(const __sigset_t *mask,
^~~~~~~~~~
ell/signal.c:153:29: error: conflicting types for ‘l_signal_create’
LIB_EXPORT struct l_signal *l_signal_create(const sigset_t *mask,
^~~~~~~~~~~~~~~
In file included from ell/signal.c:35:0:
ell/signal.h:39:18: note: previous declaration of ‘l_signal_create’ was here
struct l_signal *l_signal_create(const __sigset_t *mask,
^~~~~~~~~~~~~~~
Reverts upstream commit [1], superseeded in the next version by [2].
[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=7af8e3ba0ed522897f5a87e6c8f2980f82ff5012
[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=4a386a10d88ff52097a974167ab889b3fc2add70
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
ell/signal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ell/signal.h b/ell/signal.h
index 0d4fdc8..98cf0fa 100644
--- a/ell/signal.h
+++ b/ell/signal.h
@@ -36,7 +36,7 @@ typedef void (*l_signal_notify_cb_t) (struct l_signal *signal,
uint32_t signo, void *user_data);
typedef void (*l_signal_destroy_cb_t) (void *user_data);
-struct l_signal *l_signal_create(const __sigset_t *mask,
+struct l_signal *l_signal_create(const sigset_t *mask,
l_signal_notify_cb_t callback,
void *user_data, l_signal_destroy_cb_t destroy);
void l_signal_remove(struct l_signal *signal);
--
2.19.1

2
package/ell/ell.hash
View File

@ -1,5 +1,5 @@
# Locally computed
sha256 8e629347d49d30418e215ccf80f05eb6ff617f752396f93287ed723169aec006 ell-0.13.tar.gz
sha256 1791d2e18f0089af0d58a3d2f76a2846c2d9fa59eb2848124a713ce380561b0e ell-0.14.tar.gz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING

2
package/ell/ell.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ELL_VERSION = 0.13
ELL_VERSION = 0.14
ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
ELL_SITE_METHOD = git
ELL_LICENSE = LGPL-2.1+

12
package/erlang-eimp/Config.in Normal file
View File

@ -0,0 +1,12 @@
config BR2_PACKAGE_ERLANG_EIMP
bool "erlang-eimp"
select BR2_PACKAGE_ERLANG_P1_UTILS
select BR2_PACKAGE_GD
select BR2_PACKAGE_GD_WEBPNG
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_WEBP
help
Erlang Image Manipulation Process
https://github.com/processone/eimp

13
package/erlang-eimp/erlang-eimp.mk Normal file
View File

@ -0,0 +1,13 @@
################################################################################
#
# erlang-eimp
#
################################################################################
ERLANG_EIMP_VERSION = 1.0.8
ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION))
ERLANG_EIMP_LICENSE = Apache-2.0
ERLANG_EIMP_LICENSE_FILES = LICENSE.txt
ERLANG_EIMP_DEPENDENCIES = erlang-p1-utils gd jpeg libpng webp
$(eval $(rebar-package))

2
package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
View File

@ -1,2 +1,2 @@
# Locally calculated
sha256 5ef27d3be0ef2e8dc06468ec39dc3a43506d6f85af0edc21b9c14db860669d38 erlang-p1-cache-tab-1.0.12.tar.gz
sha256 169c3ca82b99c482e5914b616d594fed25cf34a4c995e37bfe1651d70bbaea55 erlang-p1-cache-tab-1.0.16.tar.gz

2
package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ERLANG_P1_CACHE_TAB_VERSION = 1.0.12
ERLANG_P1_CACHE_TAB_VERSION = 1.0.16
ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt

2
package/erlang-p1-iconv/erlang-p1-iconv.hash
View File

@ -1,2 +1,2 @@
# Locally calculated
sha256 c7214ea7503c3de1edf3bdd72b37187aa3a9a36d7cf7f5945a067ae8d262d3fb erlang-p1-iconv-1.0.6.tar.gz
sha256 8a9ff8a3dd983284caa964f118b5782ef1c0c662995608b2ca4f4a5f285605a9 erlang-p1-iconv-1.0.10.tar.gz

2
package/erlang-p1-iconv/erlang-p1-iconv.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ERLANG_P1_ICONV_VERSION = 1.0.6
ERLANG_P1_ICONV_VERSION = 1.0.10
ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION))
ERLANG_P1_ICONV_LICENSE = Apache-2.0
ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt

2
package/erlang-p1-oauth2/erlang-p1-oauth2.hash
View File

@ -1,2 +1,2 @@
# Locally calculated
sha256 aea823ccc49b20f7e27f1893c7edf231339f56b16ba21ce78a60f735b6211718 erlang-p1-oauth2-0.6.2.tar.gz
sha256 d7d954376ae7c131a0884c7c80b0b9e8270b6f574182df59ce4f2fbbae322854 erlang-p1-oauth2-0.6.3.tar.gz

2
package/erlang-p1-oauth2/erlang-p1-oauth2.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ERLANG_P1_OAUTH2_VERSION = 0.6.2
ERLANG_P1_OAUTH2_VERSION = 0.6.3
ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION))
ERLANG_P1_OAUTH2_LICENSE = MIT
ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE

20
package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
View File

@ -1,20 +0,0 @@
Without this patch, dependencies would be downloaded and compiled
by rebar at build time.
Signed-off-by: Christophe Romain <cromain@process-one.net>
diff --git a/rebar.config b/rebar.config
index ed93134..5b32788 100644
--- a/rebar.config
+++ b/rebar.config
@@ -31,10 +31,6 @@
{port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}.
-{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}},
- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
-
{clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}.
{cover_enabled, true}.

2
package/erlang-p1-sip/erlang-p1-sip.hash
View File

@ -1,2 +1,2 @@
# Locally calculated
sha256 6ac36594921561d0d5502bb824b7408223a3f53560a9d2fa4b0f685c0441baf0 erlang-p1-sip-1.0.17.tar.gz
sha256 be38cceff8e2207da24805b8e1c926cdf6d63ab116be12cd829f5a3a4e5e58ab erlang-p1-sip-1.0.26.tar.gz

2
package/erlang-p1-sip/erlang-p1-sip.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
ERLANG_P1_SIP_VERSION = 1.0.17
ERLANG_P1_SIP_VERSION = 1.0.26
ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION))
ERLANG_P1_SIP_LICENSE = Apache-2.0
ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt

2
package/erlang-p1-stringprep/erlang-p1-stringprep.hash
View File

@ -1,2 +1,2 @@
# Locally calculated
sha256 baef9e6bd59e00c9d2600e8db87078c19d76cbf66d5068efeaf1df740ee306ce erlang-p1-stringprep-1.0.10.tar.gz
sha256 32245561f84b03b9024c8768ad2ac8d67f285a032a7f36ff35a74c77fc701f96 erlang-p1-stringprep-1.0.14.tar.gz

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