Merge things together into one

This commit is contained in:
Alex D. 2023-10-11 12:58:21 +00:00
parent 27e0eac595
commit c55cf88cf9
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
20 changed files with 34 additions and 424 deletions

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_ath79=y
CONFIG_TARGET_ath79_generic=y
CONFIG_TARGET_ath79_generic_DEVICE_ubnt_unifiac-pro=y

View File

@ -1,47 +0,0 @@
FROM localhost/openwrt-base:debian AS builder
ADD target.config /run/target.config
RUN cat /run/target.config > .config
RUN make defconfig
RUN make -j$(nproc) V=w download
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
tools/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
toolchain/compile
ADD config /run/config
RUN cat /run/target.config /run/config >> .config
RUN make defconfig
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
target/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
package/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
world
RUN --mount=type=cache,dst=/root/.ccache ccache -s
FROM scratch
COPY --from=builder /root/OpenWRT/bin/ /

View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_ath79=y
CONFIG_TARGET_ath79_nand=y
CONFIG_TARGET_ath79_nand_DEVICE_aerohive_hiveap-121=y

27
config
View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,6 +1,17 @@
FROM localhost/openwrt-base:debian AS builder
ADD target.config /run/target.config
ARG PLATFORM=x86
ARG SUBTARGET=64
ARG DEVICE=generic
RUN printf '%s\n%s\n%s\n' \
"CONFIG_TARGET_${PLATFORM}=y" \
"CONFIG_TARGET_${PLATFORM}_${SUBTARGET}=y" \
"CONFIG_TARGET_${PLATFORM}_${SUBTARGET}_DEVICE_${DEVICE}=y" \
> /run/target.config
RUN echo "Building for ${PLATFORM}/${SUBTARGET}/${DEVICE}"
RUN cat /run/target.config > .config
RUN make defconfig

22
generic/Makefile Normal file
View File

@ -0,0 +1,22 @@
.DEFAULT_GOAL: all
TARGETS := \
ath79/generic/ubnt_unifiac-pro \
mediatek/filogic/bananapi_bpi-r3 \
mediatek/mt7622/ubnt_unifi-6-lr-v1 \
mediatek/mt7622/ubnt_unifi-6-lr-v2 \
x86/64/generic
all: $(TARGETS)
$(TARGETS): Containerfile config
buildah build \
--layers=true \
--network=host \
-o type=local,dest="$@/" \
--build-arg PLATFORM="$(shell echo $@ | cut -d'/' -f1)" \
--build-arg SUBTARGET="$(shell echo $@ | cut -d'/' -f2)" \
--build-arg DEVICE="$(shell echo $@ | cut -d'/' -f3)" \
./
.SUFFIXES:

View File

@ -1,49 +0,0 @@
FROM localhost/openwrt-base:debian AS builder
# Use debian to prevent arm-tf-fiptool ioctl misuse for now, patching openwrt might be more resourceful
# See: https://github.com/ARM-software/arm-trusted-firmware/blob/4d4fec281861066ab2249bc3db7c2decdd176f34/tools/fiptool/fiptool.c#L317
ADD target.config /run/target.config
RUN cat /run/target.config > .config
RUN make defconfig
RUN make -j$(nproc) V=w download
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
tools/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
toolchain/compile
ADD config /run/config
RUN cat /run/config /run/target.config >> .config
RUN make defconfig
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
target/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
package/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
world
RUN --mount=type=cache,dst=/root/.ccache ccache -s
FROM scratch
COPY --from=builder /root/OpenWRT/bin/ /

View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r3=y

View File

@ -1,47 +0,0 @@
FROM localhost/openwrt-base:debian AS builder
ADD target.config /run/target.config
RUN cat /run/target.config > .config
RUN make defconfig
RUN make -j$(nproc) V=w download
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
tools/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
toolchain/compile
ADD config /run/config
RUN cat /run/target.config /run/config >> .config
RUN make defconfig
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
target/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
package/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
world
RUN --mount=type=cache,dst=/root/.ccache ccache -s
FROM scratch
COPY --from=builder /root/OpenWRT/bin/ /

View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_mt7622=y
CONFIG_TARGET_mediatek_mt7622_DEVICE_ubnt_unifi-6-lr-v1=y

View File

@ -1,47 +0,0 @@
FROM localhost/openwrt-base:debian AS builder
ADD target.config /run/target.config
RUN cat /run/target.config > .config
RUN make defconfig
RUN make -j$(nproc) V=w download
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
tools/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
toolchain/compile
ADD config /run/config
RUN cat /run/target.config /run/config >> .config
RUN make defconfig
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
target/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
package/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
world
RUN --mount=type=cache,dst=/root/.ccache ccache -s
FROM scratch
COPY --from=builder /root/OpenWRT/bin/ /

View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_mt7622=y
CONFIG_TARGET_mediatek_mt7622_DEVICE_ubnt_unifi-6-lr-v2=y

View File

@ -1,47 +0,0 @@
FROM localhost/openwrt-base:debian AS builder
ADD target.config /run/target.config
RUN cat /run/target.config > .config
RUN make defconfig
RUN make -j$(nproc) V=w download
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
tools/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=w \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
toolchain/compile
ADD config /run/config
RUN cat /run/target.config /run/config >> .config
RUN make defconfig
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
target/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
package/compile
RUN --mount=type=cache,dst=/root/.ccache make -j$(nproc) \
V=wc \
CONFIG_CCACHE=y \
CONFIG_CCACHE_DIR=/root/.ccache \
world
RUN --mount=type=cache,dst=/root/.ccache ccache -s
FROM scratch
COPY --from=builder /root/OpenWRT/bin/ /

View File

@ -1,27 +0,0 @@
# WPAD
CONFIG_PACKAGE_wpad-openssl=y
# LuCI
CONFIG_PACKAGE_luci=y
CONFIG_LUCI_LANG_de=y
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-mod-network=y
CONFIG_PACKAGE_luci-mod-status=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
# Protocol support
CONFIG_PACKAGE_luci-proto-ipv6=y
CONFIG_PACKAGE_luci-proto-bonding=y
CONFIG_PACKAGE_luci-proto-relay=y
# Application support
CONFIG_PACKAGE_luci-app-wireguard=y
CONFIG_PACKAGE_luci-app-firewall=y
# Misc
CONFIG_PACKAGE_zabbix-agentd=y
# ZRAM
CONFIG_PROCD_ZRAM_TMPFS=y
CONFIG_PACKAGE_kmod-zram=m
CONFIG_PACKAGE_zram-swap=m

View File

@ -1,4 +0,0 @@
# Target
CONFIG_TARGET_x86=y
CONFIG_TARGET_x86_64=y
CONFIG_TARGET_x86_64_DEVICE_generic=y