From 8eff39554cd59298791cef1852e1e9133443cd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 21 Apr 2020 15:37:38 +0200 Subject: turris: patch openwrt version checkout --- files/openwrt-hash.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 files/openwrt-hash.patch (limited to 'files/openwrt-hash.patch') diff --git a/files/openwrt-hash.patch b/files/openwrt-hash.patch new file mode 100644 index 0000000..35a06c4 --- /dev/null +++ b/files/openwrt-hash.patch @@ -0,0 +1,13 @@ +diff --git a/compile_pkgs b/compile_pkgs +index 3a04a5c..30d1ce7 100755 +--- a/compile_pkgs ++++ b/compile_pkgs +@@ -62,7 +62,7 @@ openwrt_feed() { + # OpenWRT git repository URL + OPENWRT_URL="$(sed -n 's/# openwrt \([^;^]\+\).*/\1/p' "$src_dir/feeds.conf")" + # Git reference used to checkout OpenWRT repository +- OPENWRT_BRANCH="$(sed -n 's/# openwrt [^;^]\+[;^]\([^\s]\+\).*/\1/p' "$src_dir/feeds.conf")" ++ OPENWRT_BRANCH="$(sed -n 's/# openwrt [^;^]\+[;^]\([^[:blank:]]\+\).*/\1/p' "$src_dir/feeds.conf")" + # Check if ^ is used to separate URL and branch and in such case it is hash not branch + grep -E '^# openwrt [^;^]+\^.+' "$src_dir/feeds.conf" && OPENWRT_BRANCH="#$OPENWRT_BRANCH" + [ -n "$OPENWRT_BRANCH" ] || OPENWRT_BRANCH="master" -- cgit v1.2.3