Sysdeploy/openwrt
2
0
Fork 2
Code Issues 5 Pull Requests 2 Packages Projects 1 Releases Wiki Activity

Compare commits

base: Sysdeploy:e03f2fc84fc43d9e8e2f833bee9072b44de2e260
Branches Tags
Sysdeploy:main
Sysdeploy:23.05.3
Sysdeploy:kernel-test
Sysdeploy:collectd-build-debug
Sysdeploy:kmod-nvme
..
compare: Sysdeploy:80c1368f2ce4876f50ff02769ea616da0515cf90
Branches Tags
Sysdeploy:23.05.3
Sysdeploy:kernel-test
Sysdeploy:main
Sysdeploy:collectd-build-debug
Sysdeploy:kmod-nvme

2 Commits
e03f2fc84f ... 80c1368f2c

Author SHA1 Message Date
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
3 changed files with 12 additions and 7 deletions
Show Stats Expand all files Collapse all files

3
.buildbot/openwrt/build.sh
View File

@ -25,12 +25,9 @@ cat ${pwd}/feeds.conf >> feeds.conf
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig make defconfig
echo 'CONFIG_PACKAGE_python3-packages=y' >> .config
echo 'CONFIG_PACKAGE_python3-packages-list="CherryPy==18.8.0"' >> .config
# Enable collectd network encryption # Enable collectd network encryption
echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
make package/python3-packages/compile
make package/asterisk-chan-quectel/compile make package/asterisk-chan-quectel/compile
make package/collectd/compile make package/collectd/compile
# no signing key # no signing key

8
defaults/49-network
View File

@ -1,7 +1,9 @@
[ "$(uci -q get luci.diag.dns)" = "bitmessage.org" ] && exit 0 VERSION=1
# make a significant change [ "$(uci -q get defaults.version.network)" -ge "$VERSION" ] & exit
/sbin/uci set luci.diag.dns='bitmessage.org'
# save version
/sbin/uci set defaults.version.network="$VERSION"
# switch LAN to eth1 # switch LAN to eth1
/sbin/uci set network.@device[0].ports='eth1' /sbin/uci set network.@device[0].ports='eth1'

8
defaults/50-dropbear
View File

@ -1,6 +1,12 @@
VERSION=1 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 # save version
/sbin/uci set defaults.version.dropbear="$VERSION" /sbin/uci set defaults.version.dropbear="$VERSION"