summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmakebranch.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/makebranch.sh b/makebranch.sh
index 0e39749..7a82de6 100755
--- a/makebranch.sh
+++ b/makebranch.sh
@@ -138,10 +138,15 @@ sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$bas
package/base-files/image-config.in > package/base-files/image-config.branch && \
mv package/base-files/image-config.branch package/base-files/image-config.in
+sed -e 's!openwrt-.*.pem!openwrt-'"$version"'.pem!g' \
+ package/system/openwrt-keyring/Makefile > package/system/openwrt-keyring/Makefile.branch && \
+ mv package/system/openwrt-keyring/Makefile.branch package/system/openwrt-keyring/Makefile
+
git commit -sm "${distname:-OpenWrt} v$version: set branch defaults" \
feeds.conf.default \
include/version.mk \
- package/base-files/image-config.in
+ package/base-files/image-config.in \
+ package/system/openwrt-keyring/Makefile
git --no-pager log -p -1
git checkout "${prev_branch#refs/heads/}"