Try enabling standard ds1307 for dualeth

Add kmod-i2c-mux to PACKAGES
Work around inability to add files to boot via FILES make parameter
2023-03-03 03:34:56 +02:00 · 2023-03-03 03:30:44 +02:00 · 2023-03-03 03:30:44 +02:00 · 2023-03-03 03:30:44 +02:00 · 2023-03-03 03:30:43 +02:00 · 2023-03-01 14:37:27 +01:00
3 changed files with 31 additions and 18 deletions
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@ -9,6 +9,8 @@
 # now I noticed there is actually a Makefile for openwrt in the repo already:
 # https://github.com/IchthysMaranatha/asterisk-chan-quectel/tree/master/openwrt

+set -x
+
 tar -xJf /Downloads/openwrt-sdk-${OPENWRT_VERSION}-*.tar.xz

 cp -r feed openwrt-sdk-*/
@ -23,11 +25,11 @@ cat ${pwd}/feeds.conf >> feeds.conf
 ./scripts/feeds install -a

 make defconfig
-echo 'CONFIG_PACKAGE_python3-packages=y' >> .config
-echo 'CONFIG_PACKAGE_python3-packages-list="CherryPy==18.8.0"' >> .config
+# Enable collectd network encryption
+echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config

-make package/python3-packages/compile
 make package/asterisk-chan-quectel/compile
+make package/collectd/compile
 # no signing key
 make package/index

@ -48,8 +50,8 @@ cp ${sdkdir}/bin/packages/aarch64_cortex-a72/quectel/*.ipk packages/

 make info

-# Double the size of the root partition
-echo "CONFIG_TARGET_ROOTFS_PARTSIZE=208" >> .config
+# Increase the size of the root partition
+echo "CONFIG_TARGET_ROOTFS_PARTSIZE=308" >> .config
 # Disable ext4 images
 echo "CONFIG_TARGET_ROOTFS_EXT4FS=n" >> .config

@ -66,7 +68,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-nf-nathelper-extra \
 	  asterisk-chan-quectel \
 	  ca-certificates \
 	  collectd collectd-mod-contextswitch collectd-mod-cpu \
-	  collectd-mod-curl \
+	  collectd-mod-curl collectd-mod-df \
 	  collectd-mod-dhcpleases collectd-mod-disk \
 	  collectd-mod-dns collectd-mod-entropy \
 	  collectd-mod-ethstat collectd-mod-exec \
@ -84,8 +86,11 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-nf-nathelper-extra \
 	  collectd-mod-wireless \
 	  curl etherwake fail2ban hwclock i2c-tools \
 	  luci-app-mwan3 luci-app-upnp \
+	  luci-proto-wireguard \
 	  luci-ssl-nginx luci-app-acme \
 	  python3-packages python3-yaml \
+	  openssh-sftp-server tcpdump \
+	  iptables-nft ip6tables-nft \
 	  wireguard-tools wget-ssl \
 	 "

@ -104,16 +109,16 @@ cp ${pwd}/defaults/* files/etc/uci-defaults

 cp ${pwd}/overlays/dualeth.txt ${BOOTSOURCE}

-# cat << "EOF" >> ${BOOTCONFIG}
-# dtparam=i2c1=on
-# dtparam=spi=on
-# dtparam=i2s=on
-# dtoverlay=i2c-rtc,ds1307
-# EOF
-
 cp ${BOOTCONFIG} .

-echo "include dualeth.txt" >> ${BOOTCONFIG}
+cat << "EOF" >> ${BOOTCONFIG}
+dtparam=i2c1=on
+dtparam=spi=on
+dtparam=i2s=on
+dtoverlay=i2c-rtc,ds1307
+
+include dualeth.txt
+EOF

 make image PROFILE=${PROFILE} \
     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
--- a/defaults/49-network
+++ b/defaults/49-network
@ -1,7 +1,9 @@
-[ "$(uci -q get luci.diag.dns)" = "bitmessage.org" ] && exit 0
+VERSION=1

-# make a significant change
-/sbin/uci set luci.diag.dns='bitmessage.org'
+[ "$(uci -q get defaults.version.network)" -ge "$VERSION" ] & exit 
+
+# save version
+/sbin/uci set defaults.version.network="$VERSION"

 # switch LAN to eth1
 /sbin/uci set network.@device[0].ports='eth1'
--- a/defaults/50-dropbear
+++ b/defaults/50-dropbear
@ -1,6 +1,12 @@
 VERSION=1

-[ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ] && exit 0
+if [ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ]
+then
+	# may leave dropbear off after an upgrade
+	/sbin/service dropbear enable
+	/sbin/service dropbear restart
+	exit 0
+fi

 # save version
 /sbin/uci set defaults.version.dropbear="$VERSION"
Author	SHA1	Message	Date
Lee Miller	18475fca74	Try enabling standard ds1307 for dualeth	2023-03-03 03:34:56 +02:00
Lee Miller	3c0b752465	Add kmod-i2c-mux to PACKAGES	2023-03-03 03:30:44 +02:00
Lee Miller	af4e1053b6	Work around inability to add files to boot via FILES make parameter	2023-03-03 03:30:44 +02:00
Lee Miller	31107a2ef5	Build a separate image for each bootconfig, add pcf8563 kmod for sensing	2023-03-03 03:30:44 +02:00
Lee Miller	68bee355e2	Add i2c kmod and the files	2023-03-03 03:30:43 +02:00
Peter Šurda	90e53ad77b	Add luci-proto-wireguard All checks were successful buildbot/multibuild_parent Build done. Details buildbot/travis_bionic Build done. Details buildbot/job/openwrt Build done. Details	2023-03-01 14:37:27 +01:00
Peter Šurda	80c1368f2c	Remove cherrypy All checks were successful buildbot/travis_bionic Build done. Details buildbot/multibuild_parent Build done. Details buildbot/job/openwrt Build done. Details - I don't need it after all	2023-03-01 08:17:25 +01:00
Peter Šurda	7b3a05217c	Refactor and cleanup defaults - 49-network is now using versioning - 50-dropbear will make sure dropbear runs even if no version bump happened	2023-03-01 08:15:29 +01:00
Peter Šurda	e03f2fc84f	Add packages All checks were successful buildbot/travis_bionic Build done. Details buildbot/multibuild_parent Build done. Details buildbot/job/openwrt Build done. Details - found some missing and nice to have packages during testing - also increase rootfs size - also add encryption support to collectd network protocol	2023-03-01 03:53:35 +01:00