Merge branch 'main' into kaslr_kernel_hardening_opi5-plus

armbian · Aug 15, 2024 · a9d20a9 · a9d20a9
2 parents 21812c0 + 6e6fbac
commit a9d20a9
Show file tree

Hide file tree

Showing 23 changed files with 587 additions and 1,028 deletions.
diff --git a/config/boards/nanopi-r5c.csc b/config/boards/nanopi-r5c.csc
@@ -12,7 +12,7 @@ FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 
 BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07/board_${BOARD}"
+BOOTPATCHDIR="v2024.07"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
 
 OVERLAY_PREFIX="rockchip-rk3568"

diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
@@ -36,7 +36,7 @@ function post_family_config_branch_edge__orangepi5plus_use_mainline_uboot() {
  declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
  declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ mainline U-Boot
  declare -g BOOTBRANCH="tag:v2024.07"
- declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+ declare -g BOOTPATCHDIR="v2024.07"
  declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
  declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
  unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

diff --git a/lib/functions/compilation/kernel-make.sh b/lib/functions/compilation/kernel-make.sh
@@ -58,10 +58,13 @@ function run_kernel_make_internal() {
 
  "SOURCE_DATE_EPOCH=${kernel_base_revision_ts}" # https://reproducible-builds.org/docs/source-date-epoch/ and https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html
  "KBUILD_BUILD_TIMESTAMP=${kernel_base_revision_date}" # https://www.kernel.org/doc/html/latest/kbuild/kbuild.html#kbuild-build-timestamp
- "KBUILD_BUILD_USER=armbian" # https://www.kernel.org/doc/html/latest/kbuild/kbuild.html#kbuild-build-user-kbuild-build-host
- "KBUILD_BUILD_HOST=next"  # https://www.kernel.org/doc/html/latest/kbuild/kbuild.html#kbuild-build-user-kbuild-build-host
+ "KBUILD_BUILD_USER=build"  # https://www.kernel.org/doc/html/latest/kbuild/kbuild.html#kbuild-build-user-kbuild-build-host
+ "KBUILD_BUILD_HOST=armbian" # https://www.kernel.org/doc/html/latest/kbuild/kbuild.html#kbuild-build-user-kbuild-build-host
 
- "KGZIP=pigz" "KBZIP2=pbzip2" # Parallel compression, use explicit parallel compressors https://lore.kernel.org/lkml/20200901151002.988547791@linuxfoundation.org/ # @TODO: what about XZ?
+ # Parallel compression, use explicit parallel compressors https://lore.kernel.org/lkml/20200901151002.988547791@linuxfoundation.org/
+ "KGZIP=pigz"
+ "KBZIP2=pbzip2"
+ # Parallel compression for `xz` if needed can be added with "XZ_OPT=\"--threads=0\""
  )
  if [[ -n "${llvm_flag}" ]]; then
  common_make_params_quoted+=("${llvm_flag}")