From 9e905faff0e9e7bb077ab41b0ed74a1c27b63ff6 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Sun, 8 Jan 2023 09:43:25 +0200 Subject: [PATCH 1/6] Try to build a single package: add feeds --- .buildbot/openwrt/Dockerfile | 5 +- .buildbot/openwrt/build.sh | 31 ++++++++++-- feed/asterisk-chan-quectel/Makefile | 74 +++++++++++++++++++++++++++++ feeds.conf | 4 ++ 4 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 feed/asterisk-chan-quectel/Makefile create mode 100644 feeds.conf diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile index 843a6e0..876653d 100644 --- a/.buildbot/openwrt/Dockerfile +++ b/.buildbot/openwrt/Dockerfile @@ -8,7 +8,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \ apt -yq install \ build-essential rsync git-core subversion mercurial libssl-dev \ libncurses5-dev unzip gawk zlib1g-dev libncursesw5-dev zlib1g-dev \ - gettext xsltproc wget unzip python + gettext xsltproc wget unzip python python3-distutils rxvt-unicode RUN mkdir /Downloads @@ -18,3 +18,6 @@ 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" 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" + +RUN git clone https://git.openwrt.org/openwrt/openwrt.git +RUN cd openwrt && git checkout v${OPENWRT_VERSION} diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index 5bbcda7..2f3b206 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -12,7 +12,31 @@ ls -lah /Downloads # https://github.com/IchthysMaranatha/asterisk-chan-quectel/tree/master/openwrt tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz -cd openwrt-imagebuilder-*/ + +cp -r feed /openwrt/ +cp feeds.conf /openwrt/ + +cd openwrt + +git checkout v${OPENWRT_VERSION} +cp ../feeds.conf . +cp ../config.buildinfo .config +./scripts/feeds update -a +./scripts/feeds install -a + +export FORCE_UNSAFE_CONFIGURE=1 +make defconfig +make tools/install +make toolchain/install + +opkg info asterisk-chan-quectel + +make package/asterisk-chan-quectel/compile +make package/index + +mv bin/*.ipk ../openwrt-imagebuilder-*/packages/ + +cd ../openwrt-imagebuilder-*/ make info @@ -24,8 +48,9 @@ make image \ 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-codec-alaw asterisk-codec-ulaw \ + asterisk-res-rtp-asterisk kmod-nf-nathelper-extra \ + asterisk-chan-quectel" mkdir -p ../../out diff --git a/feed/asterisk-chan-quectel/Makefile b/feed/asterisk-chan-quectel/Makefile new file mode 100644 index 0000000..6a31b80 --- /dev/null +++ b/feed/asterisk-chan-quectel/Makefile @@ -0,0 +1,74 @@ +# +# Copyright (C) 2017 - 2023 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=asterisk-chan-quectel +PKG_VERSION:=3.6 +PKG_RELEASE:=3.6 + +PKG_SOURCE:=master.zip +PKG_SOURCE_URL:=https://github.com/IchthysMaranatha/asterisk-chan-quectel/archive/refs/heads/ +PKG_CAT:=unzip +PKG_HASH:=skip +PKG_FIXUP:=autoreconf +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-master +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYRIGHT.txt LICENSE.txt + + +MODULES_DIR:=/usr/lib/asterisk/modules + +include $(INCLUDE_DIR)/package.mk +# asterisk-chan-quectel needs iconv +include $(INCLUDE_DIR)/nls.mk + +define Package/asterisk-chan-quectel + SUBMENU:=Telephony + SECTION:=net + CATEGORY:=Network + URL:=https://github.com/IchthysMaranatha/asterisk-chan-quectel + DEPENDS:=asterisk $(ICONV_DEPENDS) +kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +alsa-lib + TITLE:=Asterisk Mobile Telephony Module +endef + +define Package/asterisk-chan-quectel/description + Asterisk channel driver for mobile telephony. +endef + + +CONFIGURE_ARGS+= \ + --with-asterisk=$(STAGING_DIR)/usr/include \ + --with-astversion=20 \ + --with-iconv=$(ICONV_PREFIX)/include + +TARGET_CFLAGS+= \ + -I$(CHAN_quectel_AST_HEADERS) + +MAKE_FLAGS+=LD="$(TARGET_CC)" + +CONFIGURE_VARS += \ + DESTDIR="$(MODULES_DIR)" \ + ac_cv_type_size_t=yes \ + ac_cv_type_ssize_t=yes + + +define Package/asterisk-chan-quectel/conffiles + /etc/asterisk/quectel.conf +endef + + +define Package/asterisk-chan-quectel/install + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/quectel.conf $(1)/etc/asterisk + $(INSTALL_DIR) $(1)$(MODULES_DIR) + $(INSTALL_BIN) $(PKG_BUILD_DIR)/chan_quectel.so $(1)$(MODULES_DIR) +endef + + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/feeds.conf b/feeds.conf new file mode 100644 index 0000000..84ac52e --- /dev/null +++ b/feeds.conf @@ -0,0 +1,4 @@ +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 -- 2.45.2 From fb3dae61976b200254d88883cd008c7aea7bda04 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Sun, 8 Jan 2023 21:26:29 +0200 Subject: [PATCH 2/6] Move toolchain installation into Dockerfile: break the big make step into several ones. Make also a factory world. Extra packages are made in the build.sh. --- .buildbot/openwrt/Dockerfile | 29 +++++++++++++------ .buildbot/openwrt/build.sh | 56 +++++++++++++++++------------------- config.extra | 15 ++++++++++ 3 files changed, 61 insertions(+), 39 deletions(-) create mode 100644 config.extra diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile index 876653d..0315e12 100644 --- a/.buildbot/openwrt/Dockerfile +++ b/.buildbot/openwrt/Dockerfile @@ -10,14 +10,25 @@ 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 mkdir /Downloads - -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 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" -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" - RUN git clone https://git.openwrt.org/openwrt/openwrt.git RUN cd openwrt && git checkout v${OPENWRT_VERSION} + +RUN wget -qP /openwrt \ + "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/config.buildinfo" + +RUN cd /openwrt && cp config.buildinfo .config && make defconfig + +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 + +ADD . . diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index 2f3b206..802903a 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -1,7 +1,5 @@ #!/bin/bash -ls -lah /Downloads - # use the SDK to build the module: # https://github.com/IchthysMaranatha/asterisk-chan-quectel # The module is for two vendors, the Quectel-EC* and Simcom SIM7600. In @@ -11,47 +9,45 @@ ls -lah /Downloads # now I noticed there is actually a Makefile for openwrt in the repo already: # https://github.com/IchthysMaranatha/asterisk-chan-quectel/tree/master/openwrt -tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz - cp -r feed /openwrt/ cp feeds.conf /openwrt/ -cd openwrt +pwd=$(pwd) +cd /openwrt -git checkout v${OPENWRT_VERSION} -cp ../feeds.conf . -cp ../config.buildinfo .config ./scripts/feeds update -a ./scripts/feeds install -a -export FORCE_UNSAFE_CONFIGURE=1 +cp config.buildinfo /openwrt/.config +cat ${pwd}/config.extra >> /openwrt/.config make defconfig -make tools/install -make toolchain/install -opkg info asterisk-chan-quectel +make -j1 V=s world -make package/asterisk-chan-quectel/compile -make package/index +# The full distribution +ls -lah bin/targets/bcm27xx/bcm2711 -mv bin/*.ipk ../openwrt-imagebuilder-*/packages/ +# tar -xJf bin/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz +# cp bin/targets/bcm27xx/bcm2711/packages/asterisk*.ipk openwrt-imagebuilder-*/packages/ -cd ../openwrt-imagebuilder-*/ +cd ${pwd} -make info +# 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" +# 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" +out=../../out -mkdir -p ../../out -mv build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/tmp/*.gz ../../out +mkdir -p ${out} +mv /openwrt/bin/targets/bcm27xx/bcm2711/*.gz ${out} +mv /openwrt/bin/targets/bcm27xx/bcm2711/packages ${out} diff --git a/config.extra b/config.extra new file mode 100644 index 0000000..e58cc40 --- /dev/null +++ b/config.extra @@ -0,0 +1,15 @@ +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 -- 2.45.2 From b527854368a8eb2d3be7d0063be5b69f06b1b16f Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 12 Jan 2023 04:55:05 +0200 Subject: [PATCH 3/6] Build a single package with its deps, use builder for images. --- .buildbot/openwrt/Dockerfile | 24 +++++---------- .buildbot/openwrt/build.sh | 60 ++++++++++++++++++++---------------- config.extra | 15 --------- feeds.conf | 4 +-- 4 files changed, 42 insertions(+), 61 deletions(-) delete mode 100644 config.extra 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 -- 2.45.2 From 1da3e27066e53187d8028bef4f313df2fd9c15cc Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 13 Jan 2023 00:53:17 +0200 Subject: [PATCH 4/6] Parametrize downloads further, reverse apt packages --- .buildbot/openwrt/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile index 09a3f3d..5b374be 100644 --- a/.buildbot/openwrt/Dockerfile +++ b/.buildbot/openwrt/Dockerfile @@ -1,6 +1,9 @@ FROM ubuntu:focal ENV OPENWRT_VERSION=22.03.2 +ENV OPENWRT_TARGET=bcm27xx +ENV OPENWRT_DEVICE=bcm2711 +ENV OPENWRT_CC=gcc-11.2.0_musl RUN apt -y update @@ -8,17 +11,17 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \ apt -yq install \ build-essential rsync git-core subversion mercurial libssl-dev \ libncurses5-dev unzip gawk zlib1g-dev libncursesw5-dev zlib1g-dev \ - gettext xsltproc wget unzip python python3-distutils rxvt-unicode + gettext xsltproc wget unzip python RUN mkdir /Downloads 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" + "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}.Linux-x86_64.tar.xz" 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" + "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}-bcm27xx-bcm2711_gcc-11.2.0_musl.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 . . -- 2.45.2 From 73b6bdecfd5356dde578039b5b8fae67be1136e7 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 13 Jan 2023 03:03:51 +0200 Subject: [PATCH 5/6] Edit Makefile again --- feed/asterisk-chan-quectel/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/feed/asterisk-chan-quectel/Makefile b/feed/asterisk-chan-quectel/Makefile index 6a31b80..771c616 100644 --- a/feed/asterisk-chan-quectel/Makefile +++ b/feed/asterisk-chan-quectel/Makefile @@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk # asterisk-chan-quectel needs iconv include $(INCLUDE_DIR)/nls.mk -define Package/asterisk-chan-quectel +define Package/$(PKG_NAME) SUBMENU:=Telephony SECTION:=net CATEGORY:=Network @@ -37,15 +37,15 @@ define Package/asterisk-chan-quectel TITLE:=Asterisk Mobile Telephony Module endef -define Package/asterisk-chan-quectel/description +define Package/$(PKG_NAME)/description Asterisk channel driver for mobile telephony. endef CONFIGURE_ARGS+= \ --with-asterisk=$(STAGING_DIR)/usr/include \ - --with-astversion=20 \ - --with-iconv=$(ICONV_PREFIX)/include + --with-astversion=20 \ + --with-iconv=$(ICONV_PREFIX)/include TARGET_CFLAGS+= \ -I$(CHAN_quectel_AST_HEADERS) @@ -58,12 +58,12 @@ CONFIGURE_VARS += \ ac_cv_type_ssize_t=yes -define Package/asterisk-chan-quectel/conffiles +define Package/$(PKG_NAME)/conffiles /etc/asterisk/quectel.conf endef -define Package/asterisk-chan-quectel/install +define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/asterisk $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/quectel.conf $(1)/etc/asterisk $(INSTALL_DIR) $(1)$(MODULES_DIR) -- 2.45.2 From ed3791fe1c4bf0a8ecd430e8da6dd09de17fd66c Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Fri, 13 Jan 2023 23:01:08 +0200 Subject: [PATCH 6/6] Added missing packages --- .buildbot/openwrt/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index 4ef935b..c7766d8 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -42,14 +42,14 @@ make info make image \ PROFILE=rpi-4 \ - PACKAGES="kmod-rtc-ds1307 \ - kmod-usb-net-rtl8152 \ - pciutils usbutils \ + PACKAGES="kmod-nf-nathelper-extra kmod-rtc-ds1307 \ + kmod-usb-audio kmod-usb-net-rtl8152 \ + alsa-lib pciutils usbutils \ kmod-usb-net-qmi-wwan libqmi qmi-utils uqmi luci-proto-qmi \ asterisk \ - asterisk-pjsip asterisk-bridge-simple \ + asterisk-app-sms asterisk-pjsip asterisk-bridge-simple \ asterisk-codec-alaw asterisk-codec-ulaw \ - asterisk-res-rtp-asterisk kmod-nf-nathelper-extra \ + asterisk-res-rtp-asterisk \ asterisk-chan-quectel" ls -lah packages -- 2.45.2