Sysdeploy/openwrt
2
0
Fork 2
Code Issues 5 Pull Requests 2 Packages Projects 1 Releases Wiki Activity

Cleanup in Dockerfile and build script #39

Merged
PeterSurda merged 4 commits from lee.miller/openwrt:cleanup into main 2023-05-30 09:30:36 +02:00
Conversation 2 Commits 4 Files Changed 3 +7 -10
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.buildbot/openwrt/Dockerfile
View File

@ -21,7 +21,7 @@ RUN wget -qP /Downloads \
RUN wget -qP /Downloads \
"https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
RUN wget -qP /Downloads \
"https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
# RUN wget -qP /Downloads \
# "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
ADD . .

11
.buildbot/openwrt/build.sh
View File

@ -32,8 +32,6 @@ make package/kmod-i2c-mux-pinctrl/compile
make package/kmod-rtc-pcf85063/compile
make package/asterisk-chan-quectel/compile
make package/collectd/compile
# no signing key
make package/index
sdkdir=$(pwd)
cd ${pwd}
@ -48,7 +46,7 @@ cd openwrt-imagebuilder-*/
cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/
cp ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk packages/
cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/
cp ${sdkdir}/bin/packages/aarch64_cortex-a72/quectel/*.ipk packages/
cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/
make info
@ -128,7 +126,7 @@ git apply ${pwd}/patches/bootconfig-add.patch
popd
make image PROFILE=${PROFILE} \
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz
@ -142,16 +140,15 @@ git apply ${pwd}/patches/overlay-add.patch
popd
make image PROFILE=${PROFILE} \
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-sensing.img.gz
mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-sensing.img.gz
make manifest PROFILE=${PROFILE} PACKAGES="${PACKAGES}"
cat ${BINPATH}/*.manifest
out=../../out
mkdir -p ${out}
mv ${BINPATH}/*.gz ${out}
mv packages ${out}

2
feeds.conf
View File

@ -1,2 +1,2 @@
src-link quectel ../feed
src-link local ../feed