diff --git a/Dockerfile b/Dockerfile index 4a5eff01..17bc85ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ ENV CONFIG_SHELL=/bin/bash COPY . /home/builder/openwrt RUN useradd -m -s /bin/bash builder RUN chown -R builder:builder /home/builder/openwrt +RUN git config --system http.sslVerify false USER builder WORKDIR /home/builder/openwrt diff --git a/build.sh b/build.sh index 68ee9bf6..12b0b879 100755 --- a/build.sh +++ b/build.sh @@ -7,24 +7,26 @@ CONTAINER_NAME="openwrt-builder-container" FIRMWARE_PATH="/home/builder/openwrt/bin/brcm963xx/zyxel/ras.bin" echo "Building Docker image ${IMAGE_NAME}..." -docker build -t ${IMAGE_NAME} . +docker build --platform linux/amd64 -t ${IMAGE_NAME} . echo "Starting container..." -docker run --cpus="1" -it --name "${CONTAINER_NAME}" \ - -e TERM=vt100 \ - "${IMAGE_NAME}" \ - /bin/bash -c "cd /home/builder/openwrt && \ - ./scripts/feeds update -a && \ - ./scripts/feeds install -a && \ - make -j1 V=sc" +docker run --platform linux/amd64 --cpus="1" -it --name "${CONTAINER_NAME}" -e TERM=vt100 "${IMAGE_NAME}" /bin/bash -c \ + "cd /home/builder/openwrt && \ + ./scripts/feeds update -a && \ + ./scripts/feeds install -a && \ + make PROJECT=brcm963xx clean && \ + make PROJECT=brcm963xx -j1 V=sc" docker cp ${CONTAINER_NAME}:.config ./.config-build docker cp ${CONTAINER_NAME}:defconfig.log ./defconfig-build.log -docker cp ${CONTAINER_NAME}:${FIRMWARE_PATH} ./build/ras.bin 2>/dev/null || { - echo "ERROR: Firmware not found at ${FIRMWARE_PATH}" - echo "The build may have failed or the output path is not ${FIRMWARE_PATH}" - echo "You can inspect the container manually: docker start -ai ${CONTAINER_NAME}" - exit 1 -} -echo "Firmware copied to ./build/ras.bin" +if docker cp ${CONTAINER_NAME}:${FIRMWARE_PATH} ./build/ras.bin 2>/dev/null; then + echo "Firmware copied to ./build/ras.bin" +else + echo "ERROR: Firmware not found at ${FIRMWARE_PATH}" + echo "The build may have failed or the output path is not ${FIRMWARE_PATH}" + echo "You can inspect the container manually: docker start -ai ${CONTAINER_NAME}" + exit 1 +fi + +docker rm ${CONTAINER_NAME} diff --git a/feeds.conf.default b/feeds.conf.default index 3c822c0a..340bbc15 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git +src-git packages git://git.openwrt.org/feed/packages.git src-git xwrt https://github.com/stgerrard008/OpenWRT-missing-file src-git luci git://nbd.name/luci.git src-git bmx6 https://github.com/stgerrard008/OpenWRT-missing-file @@ -10,7 +10,6 @@ src-git bmx6 https://github.com/stgerrard008/OpenWRT-missing-file #src-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde #src-link custom /usr/src/openwrt/custom-feed - #old #src-svn packages svn://svn.openwrt.org/openwrt/packages #src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package diff --git a/package/lxc/patches-2.0.4/002-skip-distro-checks-cross.patch.patch b/package/lxc/patches-2.0.4/002-skip-distro-checks-cross.patch.patch deleted file mode 100644 index 683b19c6..00000000 --- a/package/lxc/patches-2.0.4/002-skip-distro-checks-cross.patch.patch +++ /dev/null @@ -1,25 +0,0 @@ -mkdir -p package/lxc/patches-2.0.4 -cat > package/lxc/patches-2.0.4/999-skip-distro-checks-cross.patch << 'EOF' ---- a/configure.ac -+++ b/configure.ac -@@ -112,13 +112,15 @@ - AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"]) - - # Detect distribution --AC_CHECK_FILE(/etc/redhat-release, [distro=redhat]) --AC_CHECK_FILE(/etc/oracle-release, [distro=oracle]) --AC_CHECK_FILE(/etc/sparclinux-release, [distro=sparclinux]) --AC_CHECK_FILE(/etc/SuSE-release, [distro=suse]) --AC_CHECK_FILE(/etc/debian_version, [distro=debian]) -+if test "$cross_compiling" != "yes"; then -+ AC_CHECK_FILE(/etc/redhat-release, [distro=redhat]) -+ AC_CHECK_FILE(/etc/oracle-release, [distro=oracle]) -+ AC_CHECK_FILE(/etc/sparclinux-release, [distro=sparclinux]) -+ AC_CHECK_FILE(/etc/SuSE-release, [distro=suse]) -+ AC_CHECK_FILE(/etc/debian_version, [distro=debian]) -+fi - - AM_CONDITIONAL([HAVE_REDHAT], [test "$distro" = "redhat"]) - AM_CONDITIONAL([HAVE_SPARCLINUX], [test "$distro" = "sparclinux"]) - AM_CONDITIONAL([HAVE_ORACLE], [test "$distro" = "oracle"]) -EOF