Tracking: skiff vs upstream-master

.github/buildroot-upstream

@@ -0,0 +1 @@
+upstream/master

.github/workflows/buildroot-e2e.yml

@@ -0,0 +1,65 @@
+name: CI
+
+# Controls when the action will run.
+on:
+  push:
+    branches: [master, skiff, skiff-next]
+  pull_request:
+    branches: [skiff, skiff-next, upstream-master]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    env:
+      # for add-env below
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+
+    # Steps represent a sequence of tasks
+    steps:
+      # Checks-out the repo under $GITHUB_WORKSPACE
+      - uses: actions/checkout@v2
+
+      - name: Cache build cache and downloads
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-buildroot
+        with:
+          path: ~/br-cache/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Makefile') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      # Detect changes vs upstream-master
+      - name: Detect changes vs upstream
+        run: |
+          cd $GITHUB_WORKSPACE
+          git fetch
+          git remote add upstream https://github.com/buildroot/buildroot.git
+          git fetch upstream
+          export BUILDROOT_UPSTREAM=$(cat .github/buildroot-upstream)
+          echo "::set-env name=CHANGED_VS_UPSTREAM::$(git diff --diff-filter=ACM --name-only $BUILDROOT_UPSTREAM | xargs)"
+
+      # Installing buildroot deps
+      - name: Install buildroot apt deps
+        run: |
+          sudo apt-get install -y libelf-dev python3-magic python3-flake8
+
+      # Run check-package on changed files
+      - name: Run check-package on all changed files and setup env
+        run: |
+          cd $GITHUB_WORKSPACE
+          ./utils/check-package $CHANGED_VS_UPSTREAM
+
+      # Test a build
+      - name: Run a generic build
+        run: |
+          cd $GITHUB_WORKSPACE
+          make defconfig BR2_DEFCONFIG=$(pwd)/.github/workflows/buildroot-e2e_defconfig
+          make -s all legal-info BR2_CCACHE_DIR=${HOME}/br-cache/ccache BR2_DL_DIR=${HOME}/br-cache/dl
+

.github/workflows/buildroot-e2e_defconfig

@@ -0,0 +1,21 @@
+BR2_x86_64=y
+BR2_x86_core_avx2=y
+BR2_CCACHE=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_GCC_ENABLE_LTO=n
+BR2_INIT_SYSTEMD=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
+BR2_SYSTEM_BIN_SH_BASH=y
+BR2_ENABLE_LOCALE_WHITELIST="C en_US en_US.UTF-8"
+BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_DELVE=y
+BR2_PACKAGE_DOCKER_CLI=y
+BR2_PACKAGE_DOCKER_CLI_STATIC=y
+BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL=y
+BR2_PACKAGE_MENDER=y
+BR2_PACKAGE_HOST_MENDER_ARTIFACT=y

Config.in

@@ -68,6 +68,10 @@ config BR2_HOST_GCC_AT_LEAST_11
 # When adding new entries above, be sure to update
 # the HOSTCC_MAX_VERSION variable in the Makefile.
 
+# Hidden boolean selected if bootstrapping Go w/ GCC is not supported.
+config BR2_NEEDS_HOST_GO
+	bool
+
 # Hidden boolean selected by packages in need of Java in order to build
 # (example: kodi)
 config BR2_NEEDS_HOST_JAVA
@@ -268,6 +272,16 @@ config BR2_BACKUP_SITE
 	  buildroot will fall back to download package sources from here
 	  if the normal location fails.
 
+config BR2_SKIFFOS_BACKUP_SITE
+	string "SkiffOS backup download site"
+	default "https://github.com/skiffos/mirror/raw/master"
+	help
+	  Backup site to download from. If this option is set then
+	  buildroot will fall back to download package sources from here
+	  if the normal location fails.
+
+	  This is an additional mirror used by SkiffOS.
+
 config BR2_KERNEL_MIRROR
 	string "Kernel.org mirror"
 	default "https://cdn.kernel.org/pub"

DEVELOPERS

@@ -613,8 +613,10 @@ N:	Christian Kellermann <christian.kellermann@solectrix.de>
 F:	package/python-pylibftdi/
 
 N:	Christian Stewart <christian@aperture.us>
+F:	boot/refind/
 F:	package/balena-engine/
 F:	package/batman-adv/
+F:	package/buildah/
 F:	package/catatonit/
 F:	package/cni-plugins/
 F:	package/conmon/
@@ -633,6 +635,7 @@ F:	package/moby-buildkit/
 F:	package/mosh/
 F:	package/nerdctl/
 F:	package/pkg-golang.mk
+F:	package/podman/
 F:	package/rtl8821au/
 F:	package/rtl8821cu/
 F:	package/runc/
@@ -1544,6 +1547,7 @@ F:	package/microchip-hss-payload-generator/
 N:	Jan Havran <havran.jan@email.cz>
 F:	board/pine64/pinecube/
 F:	configs/pine64_pinecube_defconfig
+F:	package/rtklib/
 
 N:	Jan Heylen <jan.heylen@nokia.com>
 F:	package/opentracing-cpp/

arch/Config.in.arm

@@ -465,6 +465,14 @@ config BR2_cortex_a76_a55
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
+config BR2_cortex_a77
+	bool "cortex-A77"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_neoverse_n1
 	bool "neoverse-N1 (aka ares)"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64

boot/Config.in

@@ -12,6 +12,8 @@ source "boot/mv-ddr-marvell/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/optee-os/Config.in"
 source "boot/opensbi/Config.in"
+source "boot/refind/Config.in"
+source "boot/refind-bin/Config.in"
 source "boot/s500-bootloader/Config.in"
 source "boot/shim/Config.in"
 source "boot/syslinux/Config.in"

boot/refind-bin/Config.in

@@ -0,0 +1,28 @@
+config BR2_PACKAGE_REFIND_BIN_ARCH_SUPPORTS
+	bool
+	default y if BR2_i386
+	default y if BR2_x86_64
+	default y if BR2_aarch64
+	depends on BR2_USE_MMU
+
+menuconfig BR2_TARGET_REFIND_BIN
+	bool "refind-bin"
+	depends on BR2_PACKAGE_REFIND_BIN_ARCH_SUPPORTS
+	help
+	  rEFInd presents a user-friendly GUI for boot selection.
+
+	  For additional notes on using rEFInd with Buildroot, see
+	  boot/refind/readme.txt
+
+	  This is the pre-compiled binary variant.
+
+	  https://www.rodsbooks.com/refind/
+
+if BR2_TARGET_REFIND_BIN
+
+config BR2_TARGET_REFIND_BIN_RENAME_TO_BOOT
+	bool "rename refind efi files to BOOT"
+	help
+	  Move refind EFI directory to the default BOOT path.
+
+endif

boot/refind-bin/readme.txt

@@ -0,0 +1,42 @@
+Notes on using rEFInd
+=============================================
+
+1. Create a disk image
+   dd if=/dev/zero of=disk.img bs=1M count=32
+2. Partition it (either legacy or GPT style partitions work)
+    - Create one fat16 partition, labeled BOOT, flags boot, lba.
+    - Create one ext4 partition, type Linux, for the root fs.
+3. Setup loop device and loop partitions
+   sudo losetup -f disk.img
+   sudo partx -a /dev/loop0
+4. Prepare the partition contents
+   sudo mkfs.fat -F 16 -L BOOT /dev/loop0p1
+   sudo mkfs.ext4 -L root /dev/loop0p2
+   sudo mount /dev/loop0p1 /mnt
+   sudo tar -C /mnt -xf output/images/refind.tar
+   sudo umount /mnt
+   sudo mount /dev/loop0p2 /mnt
+   sudo tar -C /mnt -xf output/images/rootfs.tar
+   sudo umount /mnt
+5. Cleanup loop device
+   sudo partx -d /dev/loop0
+   sudo losetup -d /dev/loop0
+6. Your disk.img is ready!
+
+Configuring rEFInd
+=============================================
+
+rEFInd will search for refind_linux.conf files.
+
+Place a refind_linux.conf file in the same location as your initrd:
+
+"Boot Buildroot"  "initrd=/boot/initrd-%v root=/dev/initrd ro earlyprintk"
+
+rEFInd will find all files with prefix initrd- and display options on screen,
+defaulting to the most recent build version.
+
+Example contents of /boot:
+
+bzImage-buildroot-2022.05.1-104-1
+initrd-buildroot-2022.05.1-104-1
+refind_linux.conf

boot/refind-bin/refind-bin.hash

@@ -0,0 +1,5 @@
+# Locally computed
+sha256  44a981538cf06e683bc095e11694ce8508826fcc6ca6229e116938575e7c4c54  refind-bin-0.13.3.1.zip
+sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING.txt
+sha256  cebbc60079d3e79a1d94bf7c63482ca27d8ce58739d28c5e209bbd378337729b  LICENSE.txt
+sha256  4748f03ed2dbcc14cde6ebc30799899c403e356a7465dc30fcf2b80c45fc0059  docs/refind/FDL-1.3.txt

boot/refind-bin/refind-bin.mk

@@ -0,0 +1,63 @@
+################################################################################
+#
+# refind-bin
+#
+################################################################################
+
+REFIND_BIN_VERSION = 0.13.3.1
+REFIND_BIN_SITE = http://downloads.sourceforge.net/project/refind/$(REFIND_BIN_VERSION)
+REFIND_BIN_SOURCE = refind-bin-$(REFIND_BIN_VERSION).zip
+REFIND_BIN_LICENSE = GPL-3.0+, GFDL-1.3+ (docs)
+REFIND_BIN_LICENSE_FILES = COPYING.txt LICENSE.txt docs/refind/FDL-1.3.txt
+REFIND_BIN_INSTALL_IMAGES = YES
+
+ifeq ($(BR2_x86_64),y)
+REFIND_BIN_ARCH = x86_64
+REFIND_BIN_PLATFORM = x64
+else ifeq ($(BR2_aarch64),y)
+REFIND_BIN_ARCH = aarch64
+REFIND_BIN_PLATFORM = aa64
+else
+REFIND_BIN_ARCH = ia32
+REFIND_BIN_PLATFORM = ia32
+endif
+
+REFIND_BIN_EFI_PART_DIR = $(BINARIES_DIR)/efi-part
+REFIND_BIN_BINARIES_DIR = $(REFIND_BIN_EFI_PART_DIR)/EFI/refind
+
+REFIND_BIN_EXTRACT_CMDS = \
+	bsdtar --strip-components=1 \
+		-C $(REFIND_BIN_DIR) \
+		$(TAR_OPTIONS) $(REFIND_BIN_DL_DIR)/$(REFIND_BIN_SOURCE) -
+
+define REFIND_BIN_INSTALL_IMAGES_CMDS
+	if [ -d $(REFIND_BIN_BINARIES_DIR) ]; then \
+		rm -rf $(REFIND_BIN_BINARIES_DIR); \
+	fi
+	$(INSTALL) -m 0755 -D $(@D)/refind/refind_$(REFIND_BIN_PLATFORM).efi \
+		$(REFIND_BIN_BINARIES_DIR)/refind_$(REFIND_BIN_PLATFORM).efi
+	cp -r $(@D)/refind/drivers_$(REFIND_BIN_PLATFORM) \
+		$(REFIND_BIN_BINARIES_DIR)/drivers_$(REFIND_BIN_PLATFORM)
+	echo "refind_$(REFIND_BIN_PLATFORM).efi,rEFInd Boot Manager,,Entry for rEFInd" > \
+		$(REFIND_BIN_BINARIES_DIR)/BOOT.CSV
+	echo "# rEFInd configuration\ntimeout 20\n" > \
+		$(REFIND_BIN_BINARIES_DIR)/refind.conf
+	cp -r $(@D)/refind/icons $(REFIND_BIN_BINARIES_DIR)/icons
+	cp -r $(@D)/{fonts,banners,keys} $(REFIND_BIN_BINARIES_DIR)/
+endef
+
+ifeq ($(BR2_TARGET_REFIND_BIN_RENAME_TO_BOOT),y)
+define REFIND_BIN_IMAGES_RENAME_TO_BOOT
+	if [ -d $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT ]; then \
+		rm -rf $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT; \
+	fi
+	mv $(REFIND_BIN_BINARIES_DIR)/ $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/
+	mv $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/refind_$(REFIND_BIN_PLATFORM).efi \
+		$(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/BOOT$(REFIND_BIN_PLATFORM).EFI
+	echo "BOOT$(REFIND_BIN_PLATFORM).EFI,rEFInd Boot Manager,,Entry for rEFInd" > \
+		$(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/BOOT.CSV
+endef
+REFIND_BIN_POST_INSTALL_IMAGES_HOOKS += REFIND_BIN_IMAGES_RENAME_TO_BOOT
+endif
+
+$(eval $(generic-package))

boot/refind/0001-Make.common-use-environment-variables-for-toolchain.patch

@@ -0,0 +1,58 @@
+From 1ab4b8b448f87167d512222e0de92c0fb2e73b0e Mon Sep 17 00:00:00 2001
+From: Christian Stewart <christian@paral.in>
+Date: Fri, 2 Sep 2022 00:41:13 -0700
+Subject: [PATCH] Make.common: use environment variables for toolchain
+
+Use the environment specified CC, LD, etc.
+
+Signed-off-by: Christian Stewart <christian@paral.in>
+---
+ Make.common | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/Make.common b/Make.common
+index 95a3a97..62c1059 100644
+--- a/Make.common
++++ b/Make.common
+@@ -17,38 +17,8 @@
+ # used to compile rEFInd....
+ #
+
+-EFIINC          = /usr/include/efi
+-GNUEFILIB       = /usr/lib
+-EFILIB          = /usr/lib
+-EFICRT0         = /usr/lib
+-
+-# Comment out above and uncomment below if using locally-compiled GNU-EFI....
+-#EFIINC          = /usr/local/include/efi
+-#GNUEFILIB       = /usr/local/lib
+-#EFILIB          = /usr/local/lib
+-#EFICRT0         = /usr/local/lib
+-
+-HOSTARCH        = $(shell uname -m | sed s,i[3456789]86,ia32,)
+-ARCH            ?= $(HOSTARCH)
+-
+ # Note: TIANOBASE is defined in master Makefile and exported
+ GENFW           = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw
+-prefix          = /usr/bin/
+-ifeq ($(ARCH),aarch64)
+-  CC            = $(prefix)aarch64-linux-gnu-gcc
+-  AS            = $(prefix)aarch64-linux-gnu-as
+-  LD            = $(prefix)aarch64-linux-gnu-ld
+-  AR            = $(prefix)aarch64-linux-gnu-ar
+-  RANLIB        = $(prefix)aarch64-linux-gnu-ranlib
+-  OBJCOPY       = $(prefix)aarch64-linux-gnu-objcopy
+-else
+-  CC            = $(prefix)gcc
+-  AS            = $(prefix)as
+-  LD            = $(prefix)ld
+-  AR            = $(prefix)ar
+-  RANLIB        = $(prefix)ranlib
+-  OBJCOPY       = $(prefix)objcopy
+-endif
+
+ ifeq ($(MAKEWITH),TIANO)
+ # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47)
+-- 
+2.37.2
+

boot/refind/Config.in

@@ -0,0 +1,27 @@
+config BR2_PACKAGE_REFIND_ARCH_SUPPORTS
+	bool
+	default y if BR2_i386
+	default y if BR2_x86_64
+	default y if BR2_aarch64
+	depends on BR2_USE_MMU
+
+menuconfig BR2_TARGET_REFIND
+	bool "refind"
+	depends on BR2_PACKAGE_REFIND_ARCH_SUPPORTS
+	select BR2_PACKAGE_GNU_EFI
+	help
+	  rEFInd presents a user-friendly GUI for boot selection.
+
+	  For additional notes on using rEFInd with Buildroot, see
+	  boot/refind/readme.txt
+
+	  https://www.rodsbooks.com/refind/
+
+if BR2_TARGET_REFIND
+
+config BR2_TARGET_REFIND_RENAME_TO_BOOT
+	bool "rename refind efi files to BOOT"
+	help
+	  Move refind EFI directory to the default BOOT path.
+
+endif