Fix issues #3 #4

Author: anaelorlinski

README.md

@@ -19,6 +19,9 @@ Those are my customized builds of OpenWrt for FriendlyARM NanoPi R2S / R4S
 
 ## Changelog
 
+#### 2021-07-07
+- Fix issue #3 with strangri_repo : thanks TheLinuxGuy for reporting
+- Fix issue #4 with dnsmasq misconfigured : thanks semicuda for reporting
 #### 2021-05-27
 - Add ddns-scripts and bind-tools
 #### 2021-05-25

seed/ao-mini.seed

@@ -110,7 +110,6 @@ CONFIG_PACKAGE_diffutils=y
 # CONFIG_PACKAGE_dnsmasq is not set
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_auth=y
-CONFIG_PACKAGE_dnsmasq_full_broken_rtc=y
 CONFIG_PACKAGE_dnsmasq_full_conntrack=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
 CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y

seed/ao.seed

@@ -132,7 +132,6 @@ CONFIG_PACKAGE_diffutils=y
 # CONFIG_PACKAGE_dnsmasq is not set
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_auth=y
-CONFIG_PACKAGE_dnsmasq_full_broken_rtc=y
 CONFIG_PACKAGE_dnsmasq_full_conntrack=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
 CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y

steps/04-prepare_package.sh

@@ -8,22 +8,23 @@ fi
 
 cd "$ROOTDIR/build"
 
+# clone stangri repo
+rm -rf stangri_repo
+git clone https://github.com/stangri/source.openwrt.melmac.net stangri_repo
+
 # install feeds
 cd openwrt
 
-# add stangri repo source from github
-sed -i '/stangri_repo/d' feeds.conf.default
-! grep -q 'stangri_repo' feeds.conf.default && sed -i '5 i\src-git stangri_repo https://github.com/stangri/source.openwrt.melmac.net' feeds.conf.default
-
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p packages
 ./scripts/feeds install -a -p luci
 ./scripts/feeds install -a -p routing
 ./scripts/feeds install -a -p telephony
 
+
 # replace vpn routing packages
-./scripts/feeds uninstall vpn-policy-routing
-./scripts/feeds install -p stangri_repo vpn-policy-routing
+rm -rf feeds/packages/net/vpn-policy-routing/
+cp -R ../stangri_repo/vpn-policy-routing feeds/packages/net/
 
 # this does not work
 #./scripts/feeds uninstall luci-app-vpn-policy-routing