Remove rearranging of repositories.conf

- build on multiple cores

.buildbot/openwrt/build.sh

@@ -10,6 +10,8 @@
 # https://github.com/IchthysMaranatha/asterisk-chan-quectel/tree/master/openwrt
 
 set -x
+renice -n 19 $$
+export MAKEOPTS="-j $(nproc)"
 
 tar -xJf /Downloads/openwrt-sdk-${OPENWRT_VERSION}-*.tar.xz
 
@@ -24,16 +26,16 @@ cat ${pwd}/feeds.conf >> feeds.conf
 ./scripts/feeds update -a
 ./scripts/feeds install -a
 
-make defconfig
+make $MAKEOPTS defconfig
 # Enable collectd network encryption
 echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
 
-make package/kmod-nvme/compile
+make $MAKEOPTS package/kmod-nvme/compile
-make package/kmod-i2c-mux-pinctrl/compile
+make $MAKEOPTS package/kmod-i2c-mux-pinctrl/compile
-make package/kmod-rtc-pcf85063/compile
+make $MAKEOPTS package/kmod-rtc-pcf85063/compile
-make package/nvme-cli/compile
+make $MAKEOPTS package/nvme-cli/compile
-make package/asterisk-chan-quectel/compile
+make $MAKEOPTS package/asterisk-chan-quectel/compile
-make package/collectd/compile
+make $MAKEOPTS package/collectd/compile
 
 sdkdir=$(pwd)
 cd ${pwd}
@@ -50,12 +52,20 @@ 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/local/*.ipk packages/
 
-make info
+ls -l ${sdkdir}/${BINPATH}/packages/*.ipk
+ls -l ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk
+ls -l ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk
+ls -l ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk
+ls -l packages/*.ipk
+
+make $MAKEOPTS info
 
 # Increase the size of the root partition
 echo "CONFIG_TARGET_ROOTFS_PARTSIZE=308" >> .config
 # Disable ext4 images
 echo "CONFIG_TARGET_ROOTFS_EXT4FS=n" >> .config
+# re-enable collectd encrypted network, it gets removed somewhere
+echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
 
 PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
           kmod-nf-nathelper-extra \
@@ -65,7 +75,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
 	  kmod-usb-net-qmi-wwan libqmi qmi-utils uqmi luci-proto-qmi \
 	  shadow-usermod \
 	  ca-certificates \
-	  collectd collectd-mod-contextswitch collectd-mod-cpu \
+	  collectd=5.12.0-33 collectd-mod-contextswitch collectd-mod-cpu \
 	  collectd-mod-curl collectd-mod-df \
 	  collectd-mod-dhcpleases collectd-mod-disk \
 	  collectd-mod-dns collectd-mod-entropy \
@@ -122,7 +132,15 @@ pushd ${BOOTSOURCE}
 git apply ${pwd}/patches/bootconfig-add.patch
 popd
 
-make image PROFILE=${PROFILE} \
+# reorder packages so the local ones have a higher priority
+#sed -i -E 's/^(src imagebuilder file:packages.*)/#\1/
+#sed -i -E 's/^(src\/gz openwrt_.*)/#\1/' repositories.conf
+#5i src imagebuilder file:packages' \
+
+# debug
+#cat repositories.conf
+
+make $MAKEOPTS image PROFILE=${PROFILE} \
      PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
@@ -131,7 +149,7 @@ mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-du
 sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt
 sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=768/g" .config
 
-make image PROFILE=${PROFILE} \
+make $MAKEOPTS image PROFILE=${PROFILE} \
      PACKAGES=" \
 	${PACKAGES} cryptsetup kmod-ata-ahci smartmontools hdparm fdisk parted \
 	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs kmod-nvme nvme-cli \
@@ -153,7 +171,7 @@ popd
 sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=308/g" .config
 
 
-make image PROFILE=${PROFILE} \
+make $MAKEOPTS image PROFILE=${PROFILE} \
      PACKAGES="${PACKAGES} asterisk \
 	  asterisk-app-sms asterisk-pjsip asterisk-bridge-simple \
 	  asterisk-codec-alaw asterisk-codec-ulaw \