diff options
| author | Karel Kočí <cynerd@email.cz> | 2020-07-29 09:09:41 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2020-07-29 09:09:41 +0200 |
| commit | f16429be49e8ec16120ccf0cf05f94a0ce0efe28 (patch) | |
| tree | cac9597b05e6db1b3245caf6a97ba9a53ac30550 | |
| parent | 5945a7d62cd656394d5e9880c5d9116351e81955 (diff) | |
| download | laminar-cnf-f16429be49e8ec16120ccf0cf05f94a0ce0efe28.tar.gz laminar-cnf-f16429be49e8ec16120ccf0cf05f94a0ce0efe28.tar.bz2 laminar-cnf-f16429be49e8ec16120ccf0cf05f94a0ce0efe28.zip | |
turris: drop patch that is now in all branches
| -rw-r--r-- | files/openwrt-hash.patch | 13 | ||||
| -rwxr-xr-x | templates/turris.run | 1 |
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 ) |