Remove obsolete cross-compilation patch for LXC
This commit is contained in:
@@ -50,6 +50,7 @@ ENV CONFIG_SHELL=/bin/bash
|
|||||||
COPY . /home/builder/openwrt
|
COPY . /home/builder/openwrt
|
||||||
RUN useradd -m -s /bin/bash builder
|
RUN useradd -m -s /bin/bash builder
|
||||||
RUN chown -R builder:builder /home/builder/openwrt
|
RUN chown -R builder:builder /home/builder/openwrt
|
||||||
|
RUN git config --system http.sslVerify false
|
||||||
USER builder
|
USER builder
|
||||||
WORKDIR /home/builder/openwrt
|
WORKDIR /home/builder/openwrt
|
||||||
|
|
||||||
|
|||||||
@@ -7,24 +7,26 @@ CONTAINER_NAME="openwrt-builder-container"
|
|||||||
FIRMWARE_PATH="/home/builder/openwrt/bin/brcm963xx/zyxel/ras.bin"
|
FIRMWARE_PATH="/home/builder/openwrt/bin/brcm963xx/zyxel/ras.bin"
|
||||||
|
|
||||||
echo "Building Docker image ${IMAGE_NAME}..."
|
echo "Building Docker image ${IMAGE_NAME}..."
|
||||||
docker build -t ${IMAGE_NAME} .
|
docker build --platform linux/amd64 -t ${IMAGE_NAME} .
|
||||||
|
|
||||||
echo "Starting container..."
|
echo "Starting container..."
|
||||||
docker run --cpus="1" -it --name "${CONTAINER_NAME}" \
|
docker run --platform linux/amd64 --cpus="1" -it --name "${CONTAINER_NAME}" -e TERM=vt100 "${IMAGE_NAME}" /bin/bash -c \
|
||||||
-e TERM=vt100 \
|
"cd /home/builder/openwrt && \
|
||||||
"${IMAGE_NAME}" \
|
./scripts/feeds update -a && \
|
||||||
/bin/bash -c "cd /home/builder/openwrt && \
|
./scripts/feeds install -a && \
|
||||||
./scripts/feeds update -a && \
|
make PROJECT=brcm963xx clean && \
|
||||||
./scripts/feeds install -a && \
|
make PROJECT=brcm963xx -j1 V=sc"
|
||||||
make -j1 V=sc"
|
|
||||||
|
|
||||||
docker cp ${CONTAINER_NAME}:.config ./.config-build
|
docker cp ${CONTAINER_NAME}:.config ./.config-build
|
||||||
docker cp ${CONTAINER_NAME}:defconfig.log ./defconfig-build.log
|
docker cp ${CONTAINER_NAME}:defconfig.log ./defconfig-build.log
|
||||||
|
|
||||||
docker cp ${CONTAINER_NAME}:${FIRMWARE_PATH} ./build/ras.bin 2>/dev/null || {
|
if docker cp ${CONTAINER_NAME}:${FIRMWARE_PATH} ./build/ras.bin 2>/dev/null; then
|
||||||
echo "ERROR: Firmware not found at ${FIRMWARE_PATH}"
|
echo "Firmware copied to ./build/ras.bin"
|
||||||
echo "The build may have failed or the output path is not ${FIRMWARE_PATH}"
|
else
|
||||||
echo "You can inspect the container manually: docker start -ai ${CONTAINER_NAME}"
|
echo "ERROR: Firmware not found at ${FIRMWARE_PATH}"
|
||||||
exit 1
|
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}"
|
||||||
echo "Firmware copied to ./build/ras.bin"
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker rm ${CONTAINER_NAME}
|
||||||
|
|||||||
+1
-2
@@ -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 xwrt https://github.com/stgerrard008/OpenWRT-missing-file
|
||||||
src-git luci git://nbd.name/luci.git
|
src-git luci git://nbd.name/luci.git
|
||||||
src-git bmx6 https://github.com/stgerrard008/OpenWRT-missing-file
|
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-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde
|
||||||
#src-link custom /usr/src/openwrt/custom-feed
|
#src-link custom /usr/src/openwrt/custom-feed
|
||||||
|
|
||||||
|
|
||||||
#old
|
#old
|
||||||
#src-svn packages svn://svn.openwrt.org/openwrt/packages
|
#src-svn packages svn://svn.openwrt.org/openwrt/packages
|
||||||
#src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
|
#src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user