summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/openwrt-hash.patch13
-rwxr-xr-xtemplates/turris.run1
2 files changed, 0 insertions, 14 deletions
diff --git a/files/openwrt-hash.patch b/files/openwrt-hash.patch
deleted file mode 100644
index 35a06c4..0000000
--- a/files/openwrt-hash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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"
diff --git a/templates/turris.run b/templates/turris.run
index 6402019..34357bd 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -28,7 +28,6 @@ else
cd turris-build
"$FILES/turris_checkout_repo_branch.sh" "$ANIMAL"
cat feeds.conf
- patch -Np1 -r - < "$FILES/openwrt-hash.patch" || true # just ignore if it fails
patch -Np1 -r - < "$FILES/git-fetch-lock.patch" || true # just ignore if it fails
)