armbian/build
0
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-01-06 09:58:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge safe changes from development to master, part 2

Browse Source
This commit is contained in:
zador-blood-stained
2018-04-29 16:02:11 +03:00
parent bedc19439f
commit 2a11de768c
19 changed files with 106 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
config-docker.conf
View File

@@ -16,7 +16,13 @@ chmod --quiet g+w,g+s $SRC/{output,userpatches}
# build a new container based on provided Dockerfile
display_alert "Building a Docker container"
docker build -t armbian .
if ! docker build -t armbian . ; then
STATUS=$?
# Adding a newline, so the alert won't be shown in the same line as the error
echo
display_alert "Docker container build exited with code: " "$STATUS" "err"
exit 1
fi
DOCKER_FLAGS=()
@@ -45,14 +51,21 @@ done
# https://github.com/moby/moby/issues/27886
# --device-cgroup-rule requires new Docker version
# allow loop devices (not required)
DOCKER_FLAGS+=(--device-cgroup-rule='b 7:* rmw')
# allow loop device partitions
DOCKER_FLAGS+=(--device-cgroup-rule='b 259:* rmw')
# Test for --device-cgroup-rule support. If supported, appends it
# Otherwise, let it go and let user know that only kernel and u-boot for you
if docker run --help | grep device-cgroup-rule > /dev/null 2>&1; then
# allow loop devices (not required)
DOCKER_FLAGS+=(--device-cgroup-rule='b 7:* rmw')
# allow loop device partitions
DOCKER_FLAGS+=(--device-cgroup-rule='b 259:* rmw')
# this is an ugly hack, but it is required to get /dev/loopXpY minor number
# for mknod inside the container, and container itself still uses private /dev internally
DOCKER_FLAGS+=(-v /dev:/tmp/dev:ro)
# this is an ugly hack, but it is required to get /dev/loopXpY minor number
# for mknod inside the container, and container itself still uses private /dev internally
DOCKER_FLAGS+=(-v /dev:/tmp/dev:ro)
else
display_alert "Your Docker version does not support device-cgroup-rule" "" "wrn"
display_alert "and will be able to create only Kernel and u-boot packages (KERNEL_ONLY=yes)" "" "wrn"
fi
# mount 2 named volumes - for cacheable data and compiler cache
DOCKER_FLAGS+=(-v=armbian-cache:/root/armbian/cache -v=armbian-ccache:/root/.ccache)
@@ -62,17 +75,35 @@ DOCKER_FLAGS+=(-v=$SRC/output:/root/armbian/output -v=$SRC/userpatches:/root/arm
# pass other command line arguments like KERNEL_ONLY=yes, KERNEL_CONFIGURE=yes, etc.
# pass "docker-guest" as an additional config name that will be sourced in the container if exists
display_alert "Running the container"
display_alert "Running the container" "" "info"
docker run "${DOCKER_FLAGS[@]}" -it armbian docker-guest "$@"
# Docker error treatment
STATUS=$?
if [[ $STATUS -ge 125 && $STATUS -le 127 ]]; then
display_alert "Docker error" "$STATUS" "wrn"
display_alert "please make sure you are using the latest version (17.06 CE or newer)" "" "wrn"
display_alert "please check the Armbian documentation for the Docker setup procedure" "" "wrn"
docker version
fi
# Adding a newline, so the message won't be shown in the same line as the error
echo
case $STATUS in
0)
# No errors from either Docker or build script
echo
;;
125)
display_alert "Docker command failed, check syntax or version support. Error code: " "$STATUS" "err"
;;
126)
display_alert "Failure when running containerd command. Error code: " "$STATUS" "err"
;;
127)
display_alert "containerd command not found. Error code: " "$STATUS" "err"
;;
137)
display_alert "Container exit from docker stop. Error code: " "$STATUS" "info"
;;
*)
# Build script exited with error, but the error message should have been already printed
echo
;;
esac
# don't need to proceed further on the host
exit 0

2
config/kernel/linux-cubox-dev.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.9.78 Kernel Configuration
# Linux/arm 4.9.89 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y

6
config/kernel/linux-meson-default.config
View File

@@ -1118,7 +1118,7 @@ CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
CONFIG_WEXT_PRIV=y
# CONFIG_CFG80211 is not set
CONFIG_CFG80211=m
# CONFIG_LIB80211 is not set
#
@@ -1356,7 +1356,7 @@ CONFIG_AMAUDIO=y
# CONFIG_AMAUDIO2 is not set
#
# Audio dsp process
# Audio dsp process
#
CONFIG_AML_AUDIO_DSP=y
@@ -4602,7 +4602,7 @@ CONFIG_BACKPORT_MAC80211_RC_MINSTREL_HT=y
# CONFIG_BACKPORT_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_BACKPORT_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_BACKPORT_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_BACKPORT_MAC80211_MESH is not set
CONFIG_BACKPORT_MAC80211_MESH=y
CONFIG_BACKPORT_MAC80211_LEDS=y
# CONFIG_BACKPORT_MAC80211_DEBUGFS is not set
# CONFIG_BACKPORT_MAC80211_MESSAGE_TRACING is not set

4
config/kernel/linux-mvebu-default.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.4.119 Kernel Configuration
# Linux/arm 4.4.128 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -446,7 +446,7 @@ CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_CACHE_L2X0=y
# CONFIG_PL310_ERRATA_588369 is not set
# CONFIG_PL310_ERRATA_727915 is not set
# CONFIG_PL310_ERRATA_753970 is not set
CONFIG_PL310_ERRATA_753970=y
# CONFIG_PL310_ERRATA_769419 is not set
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_L1_CACHE_SHIFT=6

2
config/kernel/linux-mvebu-next.config
View File

@@ -1505,7 +1505,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set

12
config/kernel/linux-mvebu64-default.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.4.119 Kernel Configuration
# Linux/arm64 4.4.127 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -5098,11 +5098,11 @@ CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=m
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_QUOTACTL=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
#
# Caches

10
config/kernel/linux-mvebu64-next.config
View File

@@ -4687,11 +4687,11 @@ CONFIG_PRINT_QUOTA_WARNING=y
# CONFIG_QUOTA_DEBUG is not set
# CONFIG_QFMT_V1 is not set
# CONFIG_QFMT_V2 is not set
CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_QUOTACTL=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_INDEX is not set

4
config/kernel/linux-odroidc1-default.config
View File

@@ -1356,7 +1356,7 @@ CONFIG_AMAUDIO=y
# CONFIG_AMAUDIO2 is not set
#
# Audio dsp process
# Audio dsp process
#
CONFIG_AML_AUDIO_DSP=y
@@ -4570,7 +4570,7 @@ CONFIG_BACKPORT_MAC80211_RC_MINSTREL_HT=y
# CONFIG_BACKPORT_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_BACKPORT_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_BACKPORT_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_BACKPORT_MAC80211_MESH is not set
CONFIG_BACKPORT_MAC80211_MESH=y
CONFIG_BACKPORT_MAC80211_LEDS=y
# CONFIG_BACKPORT_MAC80211_DEBUGFS is not set
# CONFIG_BACKPORT_MAC80211_MESSAGE_TRACING is not set

2
config/kernel/linux-odroidc2-dev.config
View File

@@ -1336,7 +1336,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set

7
config/kernel/linux-odroidc2-next.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.18 Kernel Configuration
# Linux/arm64 4.14.29 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -433,6 +433,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
CONFIG_QCOM_FALKOR_ERRATUM_1003=y
CONFIG_QCOM_FALKOR_ERRATUM_1009=y
CONFIG_QCOM_QDF2400_ERRATUM_0065=y
CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
@@ -518,6 +519,8 @@ CONFIG_KEXEC=y
CONFIG_XEN_DOM0=y
CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
# CONFIG_ARMV8_DEPRECATED is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
@@ -1380,7 +1383,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set

2
config/kernel/linux-odroidxu4-default.config
View File

@@ -4457,7 +4457,7 @@ CONFIG_BACKPORT_MAC80211_RC_MINSTREL_HT=y
# CONFIG_BACKPORT_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_BACKPORT_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_BACKPORT_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_BACKPORT_MAC80211_MESH is not set
CONFIG_BACKPORT_MAC80211_MESH=y
CONFIG_BACKPORT_MAC80211_LEDS=y
# CONFIG_BACKPORT_MAC80211_DEBUGFS is not set
# CONFIG_BACKPORT_MAC80211_MESSAGE_TRACING is not set

2
config/kernel/linux-pine64-default.config
View File

@@ -979,7 +979,7 @@ CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set

14
config/kernel/linux-rockchip-next.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.23 Kernel Configuration
# Linux/arm 4.14.29 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1367,7 +1367,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
# CONFIG_MAC80211_MESSAGE_TRACING is not set
@@ -4832,11 +4832,11 @@ CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_QUOTACTL=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_INDEX is not set

9
config/kernel/linux-s5p6818-next.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.15 Kernel Configuration
# Linux/arm64 4.14.34 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -416,6 +416,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
CONFIG_QCOM_FALKOR_ERRATUM_1003=y
CONFIG_QCOM_FALKOR_ERRATUM_1009=y
CONFIG_QCOM_QDF2400_ERRATUM_0065=y
CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
@@ -494,6 +495,8 @@ CONFIG_SECCOMP=y
# CONFIG_CRASH_DUMP is not set
# CONFIG_XEN is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
# CONFIG_ARMV8_DEPRECATED is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
@@ -4602,10 +4605,6 @@ CONFIG_DYNAMIC_DEBUG=y
# Compile-time checks and compiler options
#
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_GDB_SCRIPTS is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024

2
config/kernel/linux-sun5i-default.config
View File

@@ -604,7 +604,7 @@ CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
# CONFIG_MAC80211_LEDS is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set

5
config/kernel/linux-sunxi64-next.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.18 Kernel Configuration
# Linux/arm64 4.14.29 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -430,6 +430,7 @@ CONFIG_CAVIUM_ERRATUM_23144=y
# CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
# CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set
# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
@@ -518,6 +519,8 @@ CONFIG_PARAVIRT=y
# CONFIG_CRASH_DUMP is not set
# CONFIG_XEN is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
# CONFIG_ARMV8_DEPRECATED is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set

10
config/kernel/linux-udoo-dev.config
View File

@@ -4370,11 +4370,11 @@ CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=m
# CONFIG_QFMT_V1 is not set
# CONFIG_QFMT_V2 is not set
CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_QUOTACTL=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_INDEX is not set

13
config/kernel/linux-udoo-next.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.4.115 Kernel Configuration
# Linux/arm 4.4.122 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1239,6 +1239,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
# CONFIG_NFC is not set
# CONFIG_LWTUNNEL is not set
CONFIG_DST_CACHE=y
CONFIG_HAVE_BPF_JIT=y
#
@@ -4057,11 +4058,11 @@ CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=m
# CONFIG_QFMT_V1 is not set
# CONFIG_QFMT_V2 is not set
CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_QUOTACTL=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
#
# Caches

3
packages/bsp/common/etc/init.d/firstrun
View File

@@ -50,6 +50,9 @@ case "$1" in
# update console info
setupcon --save
# add unique installation id to the image release file
cat /proc/sys/kernel/random/uuid >> /etc/armbian-image-release
# SSH Keys creation
rm -f /etc/ssh/ssh_host*
read entropy_before </proc/sys/kernel/random/entropy_avail