Merge branch 'buildroot-2022.05'

Author: ailispaw

Dockerfile

@@ -1,4 +1,4 @@
-FROM ailispaw/ubuntu-essential:18.04-nodoc
+FROM ailispaw/ubuntu-essential:16.04-nodoc
 
 ENV TERM xterm
 
@@ -12,8 +12,8 @@ ENV SRC_DIR=/build \
     BR_ROOT=/build/buildroot
 RUN mkdir -p ${SRC_DIR}
 
-ENV BR_VERSION 2019.05
-RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.bz2 | tar xj && \
+ENV BR_VERSION 2022.05
+RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.xz | tar xJ && \
     mv buildroot-${BR_VERSION} ${BR_ROOT}
 
 # Apply patches
@@ -22,16 +22,17 @@ RUN for patch in ${SRC_DIR}/patches/*.patch; do \
       patch -p1 -d ${BR_ROOT} < ${patch}; \
     done
 
+# Copy extra packages
+COPY extra ${SRC_DIR}/extra
+
 # Copy the empty config file
 COPY empty.config ${BR_ROOT}/.config
 
-# Copy extra packages
-COPY extra ${SRC_DIR}/extra
+# Copy the build script file
+COPY build.sh ${SRC_DIR}/build.sh
+
+VOLUME ${BR_ROOT}/dl ${BR_ROOT}/ccache
 
 WORKDIR ${BR_ROOT}
 
-RUN make BR2_EXTERNAL=${SRC_DIR}/extra oldconfig && \
-    make --quiet && \
-    find output/build -mindepth 2 -not -name '.stamp_*' | xargs rm -rf && \
-    find output/target/ -name 'libstdc++.so*' | tar zcf ${SRC_DIR}/libstdcxx.tar.gz --transform 's?output/target?.?g' -T - && \
-    rm -rf board/* configs/* dl/* output/images/* output/target/* ccache/*
+CMD ["../build.sh"]

Dockerfile.extra

@@ -1,7 +1,14 @@
 FROM ailispaw/barge-pkg
 
+# Setup environment
+ENV SRC_DIR=/build
+
 # Update extra packages
 RUN rm -rf ${SRC_DIR}/extra/*
 COPY extra ${SRC_DIR}/extra
 
-RUN make BR2_EXTERNAL=${SRC_DIR}/extra oldconfig
+VOLUME ${BR_ROOT}/dl ${BR_ROOT}/ccache
+
+WORKDIR ${BR_ROOT}
+
+CMD ["make", "BR2_EXTERNAL=${SRC_DIR}/extra", "oldconfig"]

Makefile

@@ -1,28 +1,70 @@
 BUILDER := ailispaw/barge-pkg
-VERSION := 2.13.0
+VERSION := 2.15.0-rc2
 
-KERNEL_VERSION := 4.14.125
+KERNEL_VERSION := 4.14.282
 
-SOURCES := .dockerignore empty.config
+SOURCES := .dockerignore empty.config build.sh \
+	$(shell find patches -type f)
 
 EXTRA := $(shell find extra -type f)
 
+TMP_BUILD_IMAGE     := barge-pkg-builder
+TMP_BUILD_CONTAINER := barge-pkg-built
+
+DL_DIR     := /mnt/data/dl
+CCACHE_DIR := /mnt/data/ccache
+
 # $1: Dockerfile
 # $2: image-name:tag
 # $3: dependencies
+# $4: an intermediate image to build
+# $5: an intermediate container to build
 define docker_build
 	$(eval SRC_UPDATED=$$(shell stat -f "%m" $3 | sort -gr | head -n1))
-	$(eval STR_CREATED=$$(shell docker inspect -f '{{.Created}}' $2 2>/dev/null))
-	$(eval IMG_CREATED=`date -j -u -f "%FT%T" "$$(STR_CREATED)" +"%s" 2>/dev/null || echo 0`)
-	@if [ "$(SRC_UPDATED)" -gt "$(IMG_CREATED)" ]; then \
-		set -e; \
+	@echo "SRC_UPDATED=`date -r $(SRC_UPDATED)`"
+
+	@set -e; \
+	IMG_CREATED=`docker inspect -f '{{.Created}}' $4 2>/dev/null || true`; \
+	IMG_CREATED=`date -j -u -f "%FT%T" "$${IMG_CREATED}" +"%s" 2>/dev/null || echo 0`; \
+	echo "IMG_CREATED=`date -r $${IMG_CREATED}`"; \
+	if [ "$(SRC_UPDATED)" -gt "$${IMG_CREATED}" ]; then \
 		find . -type f -name '.DS_Store' | xargs rm -f; \
-		docker build -f $1 -t $2 .; \
+		docker build -f $1 -t $4 .; \
+		IMG_CREATED2=`docker inspect -f '{{.Created}}' $4 2>/dev/null || true`; \
+		IMG_CREATED2=`date -j -u -f "%FT%T" "$${IMG_CREATED2}" +"%s" 2>/dev/null || echo 0`; \
+		echo "IMG_CREATED2=`date -r $${IMG_CREATED2}`"; \
+		if [ "$${IMG_CREATED2}" -gt "$(SRC_UPDATED)" ]; then \
+			(docker rm -f $5 || true); \
+		fi; \
+	fi
+
+	@set -e; \
+	CTN_EXISTS=`docker ps -aq -f name='$5$$' -f exited=0`; \
+	echo "CTN_EXISTS=$${CTN_EXISTS}"; \
+	if [ -z "$${CTN_EXISTS}" ]; then \
+		(docker rm -f $5 || true); \
+		docker run --privileged -v $(DL_DIR):/build/buildroot/dl \
+			-v $(CCACHE_DIR):/build/buildroot/ccache --name $5 $4; \
+	fi
+
+	@set -e; \
+	CTN_FINISHED=`docker inspect -f '{{.State.FinishedAt}}' $5 2>/dev/null || true`; \
+	CTN_FINISHED=`date -j -u -f "%FT%T" "$${CTN_FINISHED}" +"%s" 2>/dev/null || echo 0`; \
+	echo "CTN_FINISHED=`date -r $${CTN_FINISHED}`"; \
+	PKG_CREATED=`docker inspect -f '{{.Created}}' $2 2>/dev/null || true`; \
+	PKG_CREATED=`date -j -u -f "%FT%T" "$${PKG_CREATED}" +"%s" 2>/dev/null || echo 0`; \
+	echo "PKG_CREATED=`date -r $${PKG_CREATED}`"; \
+	if [ "$${CTN_FINISHED}" -gt "$${PKG_CREATED}" ]; then \
+		docker export $5 | docker import \
+			-c 'VOLUME /build/buildroot/dl /build/buildroot/ccache' \
+			-c 'WORKDIR /build/buildroot' \
+			-m 'https://github.com/bargees/barge-pkg' \
+			- $2; \
 	fi
 endef
 
 build: Dockerfile $(SOURCES) $(EXTRA)
-	$(call docker_build,$<,$(BUILDER),$^)
+	$(call docker_build,$<,$(BUILDER),$^,$(TMP_BUILD_IMAGE),$(TMP_BUILD_CONTAINER))
 
 tag: | build
 	docker tag $(BUILDER) $(BUILDER):$(VERSION)
@@ -31,14 +73,21 @@ release: | tag
 	docker push $(BUILDER):$(VERSION)
 
 extra: Dockerfile.extra $(EXTRA)
-	$(call docker_build,$<,$(BUILDER):$(VERSION),$^)
+	$(call docker_build,$<,$(BUILDER):$@,$^,$(TMP_BUILD_IMAGE)-$@,$(TMP_BUILD_CONTAINER)-$@)
 
 vagrant:
 	vagrant up
+	vagrant ssh -c 'sudo mkdir -p $(DL_DIR) $(CCACHE_DIR)'
 
 clean:
+	-docker rm -f $(TMP_BUILD_CONTAINER)
+	-docker rm -f $(TMP_BUILD_CONTAINER)-extra
+	-docker rmi `docker images -q -f dangling=true`
+	-docker rmi $(TMP_BUILD_IMAGE)
+	-docker rmi $(TMP_BUILD_IMAGE)-extra
 	-docker rmi $(BUILDER):$(VERSION)
 	-docker rmi $(BUILDER)
+	-docker rmi $(BUILDER):extra
 
 .PHONY: build tag release base extra vagrant clean
 
@@ -49,15 +98,15 @@ output/$(VERSION)/buildroot.config: | output
 
 PACKAGES := acl bindfs criu eudev git iproute2 ipvsadm kmod libfuse locales make \
 	shadow sshfs su-exec tar tmux tzdata vim \
-	dmidecode findutils socat zlib wireguard qemu-ga
+	dmidecode findutils socat zlib wireguard-linux-compat wireguard-tools qemu-ga
 
 EUDEV_OPTIONS       := -e BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 GIT_OPTIONS         := -e BR2_PACKAGE_OPENSSL=y -e BR2_PACKAGE_LIBCURL=y
 IPVSADM_OPTIONS     := -e BR2_PACKAGE_LIBNL=y
 KMOD_OPTIONS        := -e BR2_PACKAGE_KMOD_TOOLS=y
 TMUX_OPTIONS        := -e BR2_PACKAGE_NCURSES_WCHAR=y
 TZDATA_OPTIONS      := -e BR2_TARGET_TZ_ZONELIST=default -e BR2_TARGET_LOCALTIME="Etc/UTC"
-WIREGUARD_OPTIONS   := -v /vagrant/output/$(VERSION)/kernel.config:/build/kernel.config \
+WIREGUARD_LINUX_COMPAT_OPTIONS := -v /vagrant/output/$(VERSION)/kernel.config:/build/kernel.config \
 	-e BR2_LINUX_KERNEL=y \
 	-e BR2_LINUX_KERNEL_CUSTOM_VERSION=y \
 	-e BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$(KERNEL_VERSION)\" \
@@ -67,9 +116,9 @@ WIREGUARD_OPTIONS   := -v /vagrant/output/$(VERSION)/kernel.config:/build/kernel
 
 packages: libstdcxx $(PACKAGES)
 
-libstdcxx $(filter-out wireguard,$(PACKAGES)): % : output/$(VERSION)/barge-pkg-%-$(VERSION).tar.gz
+libstdcxx $(filter-out wireguard-linux-compat,$(PACKAGES)): % : output/$(VERSION)/barge-pkg-%-$(VERSION).tar.gz
 
-wireguard: % : output/$(VERSION)/kernel.config output/$(VERSION)/barge-pkg-%-$(VERSION).tar.gz
+wireguard-linux-compat: % : output/$(VERSION)/kernel.config output/$(VERSION)/barge-pkg-%-$(VERSION).tar.gz
 	$(eval TMP_DIR=/tmp/barge-pkg-$*-$(VERSION))
 	vagrant ssh -c ' \
 		sudo tar -zc -f /vagrant/output/$(VERSION)/barge-pkg-$*-$(VERSION).tar.gz -C $(TMP_DIR) \
@@ -90,9 +139,8 @@ $(PACKAGES:%=output/$(VERSION)/barge-pkg-%-$(VERSION).tar.gz): \
 		for i in bin dev/pts etc/ld.so.conf.d etc/network lib sbin usr/bin usr/lib usr/sbin var/lib/misc; do \
 			sudo mkdir -p $(TMP_DIR)/$$i; \
 		done; \
-		sudo mkdir -p /opt/pkg/ccache /opt/pkg/dl && \
 		docker run --rm -v $(TMP_DIR):/build/buildroot/output/target \
-			-v /opt/pkg/ccache:/build/buildroot/ccache -v /opt/pkg/dl:/build/buildroot/dl \
+			-v $(DL_DIR):/build/buildroot/dl -v $(CCACHE_DIR):/build/buildroot/ccache \
 			$($(shell echo $* | tr a-z- A-Z_)_OPTIONS) \
 			$(BUILDER):$(VERSION) sh -c " \
 				cp .config .config.org && \

build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+make BR2_EXTERNAL=${SRC_DIR}/extra oldconfig
+make --quiet
+
+# Make the libstdcxx package
+find output/target/ -name 'libstdc++.so*' | tar zcf ${SRC_DIR}/libstdcxx.tar.gz --transform 's?output/target?.?g' -T -
+
+# Clean intermediate objects
+find output/build -mindepth 2 -not -name '.stamp_*' | xargs rm -rf
+rm -rf board/* configs/* output/images/* output/target/*