Compare commits

...

4 Commits

Author SHA1 Message Date
a3ddbfac67
Exit early if imagebuilder fails
All checks were successful
buildbot/travis_bionic Build done.
buildbot/multibuild_parent Build done.
buildbot/job/openwrt Build done.
2023-05-26 01:50:19 +03:00
afa793799c
Rename feed to local 2023-05-26 01:48:20 +03:00
78bcedaf60
Cleanup build.sh:
- show the manifest existing after make image instead of making a new one;
  - don't move packages to out - the directory is ignored by multibuild;
  - don't make package index, because imagebuilder builds it's own.
2023-05-24 17:29:22 +03:00
604299e7ce
Comment out downloading of toolchain - it's not used 2023-05-24 17:26:05 +03:00
3 changed files with 7 additions and 10 deletions

View File

@ -21,7 +21,7 @@ RUN wget -qP /Downloads \
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" "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 \ # 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" # "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 . . ADD . .

View File

@ -32,8 +32,6 @@ make package/kmod-i2c-mux-pinctrl/compile
make package/kmod-rtc-pcf85063/compile make package/kmod-rtc-pcf85063/compile
make package/asterisk-chan-quectel/compile make package/asterisk-chan-quectel/compile
make package/collectd/compile make package/collectd/compile
# no signing key
make package/index
sdkdir=$(pwd) sdkdir=$(pwd)
cd ${pwd} cd ${pwd}
@ -48,7 +46,7 @@ cd openwrt-imagebuilder-*/
cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/ cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/
cp ${sdkdir}/bin/packages/aarch64_cortex-a72/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/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 make info
@ -128,7 +126,7 @@ git apply ${pwd}/patches/bootconfig-add.patch
popd popd
make image PROFILE=${PROFILE} \ 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-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-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 popd
make image PROFILE=${PROFILE} \ 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-factory.img.gz ${IMAGE_PATH}-squashfs-factory-sensing.img.gz
mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-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 out=../../out
mkdir -p ${out} mkdir -p ${out}
mv ${BINPATH}/*.gz ${out} mv ${BINPATH}/*.gz ${out}
mv packages ${out}

View File

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