diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile index 0315e12..09a3f3d 100644 --- a/.buildbot/openwrt/Dockerfile +++ b/.buildbot/openwrt/Dockerfile @@ -10,25 +10,15 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \ libncurses5-dev unzip gawk zlib1g-dev libncursesw5-dev zlib1g-dev \ gettext xsltproc wget unzip python python3-distutils rxvt-unicode -RUN git clone https://git.openwrt.org/openwrt/openwrt.git -RUN cd openwrt && git checkout v${OPENWRT_VERSION} +RUN mkdir /Downloads -RUN wget -qP /openwrt \ - "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/config.buildinfo" +RUN wget -qP /Downloads \ + "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-bcm27xx-bcm2711.Linux-x86_64.tar.xz" -RUN cd /openwrt && cp config.buildinfo .config && make defconfig +RUN wget -qP /Downloads \ + "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-bcm27xx-bcm2711_gcc-11.2.0_musl.Linux-x86_64.tar.xz" -ENV FORCE_UNSAFE_CONFIGURE=1 - -RUN cd /openwrt && make tools/install -RUN cd /openwrt && make toolchain/install - -RUN cd /openwrt && make download -RUN cd /openwrt && make world - -RUN useradd -m -U -u 999 buildbot -RUN chown -R buildbot.buildbot /openwrt - -USER buildbot +RUN wget -qP /Downloads \ + "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-bcm27xx-bcm2711_gcc-11.2.0_musl.Linux-x86_64.tar.xz" ADD . . diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index 802903a..4ef935b 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -9,45 +9,53 @@ # now I noticed there is actually a Makefile for openwrt in the repo already: # https://github.com/IchthysMaranatha/asterisk-chan-quectel/tree/master/openwrt -cp -r feed /openwrt/ -cp feeds.conf /openwrt/ +tar -xJf /Downloads/openwrt-sdk-${OPENWRT_VERSION}-*.tar.xz + +cp -r feed openwrt-sdk-*/ pwd=$(pwd) -cd /openwrt +cd openwrt-sdk-*/ + +cp feeds.conf.default feeds.conf +cat ${pwd}/feeds.conf >> feeds.conf ./scripts/feeds update -a ./scripts/feeds install -a -cp config.buildinfo /openwrt/.config -cat ${pwd}/config.extra >> /openwrt/.config make defconfig -make -j1 V=s world - -# The full distribution -ls -lah bin/targets/bcm27xx/bcm2711 - -# tar -xJf bin/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz -# cp bin/targets/bcm27xx/bcm2711/packages/asterisk*.ipk openwrt-imagebuilder-*/packages/ +make package/asterisk-chan-quectel/compile +# no signing key +make package/index +sdkdir=$(pwd) cd ${pwd} -# make info +tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz -# make image \ -# PROFILE=rpi-4 \ -# PACKAGES="kmod-rtc-ds1307 \ -# kmod-usb-net-rtl8152 \ -# pciutils usbutils \ -# kmod-usb-net-qmi-wwan libqmi qmi-utils uqmi luci-proto-qmi \ -# asterisk \ -# asterisk-pjsip asterisk-bridge-simple \ -# asterisk-codec-alaw asterisk-codec-ulaw \ -# asterisk-res-rtp-asterisk kmod-nf-nathelper-extra \ -# asterisk-chan-quectel" +cd openwrt-imagebuilder-*/ +cp ${sdkdir}/bin/targets/bcm27xx/bcm2711/packages/*.ipk packages/ +cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/ +cp ${sdkdir}/bin/packages/aarch64_cortex-a72/quectel/*.ipk packages/ + +make info + +make image \ + PROFILE=rpi-4 \ + PACKAGES="kmod-rtc-ds1307 \ + kmod-usb-net-rtl8152 \ + pciutils usbutils \ + kmod-usb-net-qmi-wwan libqmi qmi-utils uqmi luci-proto-qmi \ + asterisk \ + asterisk-pjsip asterisk-bridge-simple \ + asterisk-codec-alaw asterisk-codec-ulaw \ + asterisk-res-rtp-asterisk kmod-nf-nathelper-extra \ + asterisk-chan-quectel" + +ls -lah packages out=../../out mkdir -p ${out} -mv /openwrt/bin/targets/bcm27xx/bcm2711/*.gz ${out} -mv /openwrt/bin/targets/bcm27xx/bcm2711/packages ${out} +mv bin/targets/bcm27xx/bcm2711/*.gz ${out} +mv packages ${out} diff --git a/config.extra b/config.extra deleted file mode 100644 index e58cc40..0000000 --- a/config.extra +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG_PACKAGE_asterisk=y -# Feeds -CONFIG_PER_FEED_REPO=y -CONFIG_FEED_packages=y -CONFIG_FEED_luci=y -CONFIG_FEED_telephony=y -CONFIG_FEED_quectel=y -CONFIG_PACKAGE_asterisk-pjsip=m -CONFIG_PACKAGE_asterisk-bridge-simple=m -CONFIG_PACKAGE_asterisk-codec-alaw=m -CONFIG_PACKAGE_asterisk-codec-ulaw=m -CONFIG_PACKAGE_asterisk-res-rtp-asterisk=m -CONFIG_PACKAGE_asterisk-chan-quectel=m -CONFIG_PACKAGE_kmod-nf-nathelper-extra=m -CONFIG_PACKAGE_kmod-rtc-ds1307=m diff --git a/feeds.conf b/feeds.conf index 84ac52e..dc06164 100644 --- a/feeds.conf +++ b/feeds.conf @@ -1,4 +1,2 @@ -src-git packages https://github.com/openwrt/packages.git -src-git luci https://github.com/openwrt/luci.git -src-git telephony https://github.com/openwrt/telephony.git + src-link quectel ../feed