From bb550f39979cfd2be74f6349f5d0e660438f3474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Tue, 23 Apr 2019 15:27:07 +0200
Subject: [PATCH] Add obsolete lists
These are temporally lists to redirect previous versions of updater to
correct locations.
---
generate_lists | 12 ++++++++----
lists-obsolete/3g.lua.m4 | 2 ++
lists-obsolete/base-min.lua.m4 | 2 ++
lists-obsolete/base-netboot.lua.m4 | 2 ++
lists-obsolete/base.lua.m4 | 2 ++
lists-obsolete/common.m4 | 22 ++++++++++++++++++++++
lists-obsolete/datacollect.lua.m4 | 2 ++
lists-obsolete/dev-detect.lua.m4 | 2 ++
lists-obsolete/dvb.lua.m4 | 2 ++
lists-obsolete/honeypot.lua.m4 | 2 ++
lists-obsolete/luci-controls.lua.m4 | 2 ++
lists-obsolete/lxc.lua.m4 | 2 ++
lists-obsolete/nas.lua.m4 | 2 ++
lists-obsolete/netboot.lua.m4 | 2 ++
lists-obsolete/netmetr.lua.m4 | 2 ++
lists-obsolete/openvpn.lua.m4 | 2 ++
lists-obsolete/pakon.lua.m4 | 2 ++
lists-obsolete/printserver.lua.m4 | 2 ++
lists-obsolete/ssbackup.lua.m4 | 2 ++
lists-obsolete/tor.lua.m4 | 2 ++
20 files changed, 66 insertions(+), 4 deletions(-)
create mode 100644 lists-obsolete/3g.lua.m4
create mode 100644 lists-obsolete/base-min.lua.m4
create mode 100644 lists-obsolete/base-netboot.lua.m4
create mode 100644 lists-obsolete/base.lua.m4
create mode 100644 lists-obsolete/common.m4
create mode 100644 lists-obsolete/datacollect.lua.m4
create mode 100644 lists-obsolete/dev-detect.lua.m4
create mode 100644 lists-obsolete/dvb.lua.m4
create mode 100644 lists-obsolete/honeypot.lua.m4
create mode 100644 lists-obsolete/luci-controls.lua.m4
create mode 100644 lists-obsolete/lxc.lua.m4
create mode 100644 lists-obsolete/nas.lua.m4
create mode 100644 lists-obsolete/netboot.lua.m4
create mode 100644 lists-obsolete/netmetr.lua.m4
create mode 100644 lists-obsolete/openvpn.lua.m4
create mode 100644 lists-obsolete/pakon.lua.m4
create mode 100644 lists-obsolete/printserver.lua.m4
create mode 100644 lists-obsolete/ssbackup.lua.m4
create mode 100644 lists-obsolete/tor.lua.m4
diff --git a/generate_lists b/generate_lists
index b221b9286..4f7894afa 100755
--- a/generate_lists
+++ b/generate_lists
@@ -18,6 +18,7 @@ set -e
output_path=
sign_key=
+obsolete=
while [ $# -gt 0 ]; do
case "$1" in
-h|--help)
@@ -40,6 +41,9 @@ while [ $# -gt 0 ]; do
--debug)
set -x
;;
+ --obsolete)
+ obsolete=-obsolete
+ ;;
*)
if [ -z "$output_path" ]; then
output_path="$1"
@@ -54,7 +58,7 @@ done
[ -n "$output_path" ] || output_path="generated_lists"
tb="$(dirname "$(readlink -f "$0")")"
-[ -d "$tb/lists" -a -f "$tb/feeds.conf" ] || {
+[ -d "$tb/lists$obsolete" -a -f "$tb/feeds.conf" ] || {
echo "This script has to be in same direstory as feeds.conf and lists directory." >&2
exit 1
}
@@ -66,13 +70,13 @@ mkdir -p "$output_path"
"$tb/helpers/turris-version.sh" version > "$output_path/turris-version"
( cd "$tb" && git rev-parse HEAD > "$output_path/git-hash" )
-m4args=( "--include=$tb/lists" "-D_INCLUDE_=$tb/lists/" "-D_FEEDS_=$tb/feeds.conf" )
+m4args=( "--include=$tb/lists$obsolete" "-D_INCLUDE_=$tb/lists$obsolete/" "-D_FEEDS_=$tb/feeds.conf" )
-for f in "$tb"/lists/*.lua.m4; do
+for f in "$tb"/lists$obsolete/*.lua.m4; do
[ -f "$f" ] || continue
m4 "${m4args[@]}" "$f" > "$output_path/$(basename "$f" | sed s/\.m4$//)"
done
-for f in "$tb"/lists/*.lua; do
+for f in "$tb"/lists$obsolete/*.lua; do
[ -f "$f" ] || continue
cp "$f" "$output_path/$(basename "$f")"
done
diff --git a/lists-obsolete/3g.lua.m4 b/lists-obsolete/3g.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/3g.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/base-min.lua.m4 b/lists-obsolete/base-min.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/base-min.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/base-netboot.lua.m4 b/lists-obsolete/base-netboot.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/base-netboot.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/base.lua.m4 b/lists-obsolete/base.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/base.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/common.m4 b/lists-obsolete/common.m4
new file mode 100644
index 000000000..098e5ddda
--- /dev/null
+++ b/lists-obsolete/common.m4
@@ -0,0 +1,22 @@
+define(`LIST',`--[[
+This is temporally script to migrate previous Turris OS 4.0-alpha releases.
+]]
+if not board then
+ local model = model or os_release["LEDE_DEVICE_PRODUCT"]
+ if model:match("[Mm]ox") then
+ board = "mox"
+ elseif model:match("[Oo]mnia") then
+ board = "omnia"
+ elseif model:match("^[Tt]urris$") or model:match("[Tt]urris 1.x") then
+ board = "turris1x"
+ else
+ DIE("Unsupported Turris model: " .. tostring(model))
+ end
+end
+
+if features["relative_uri"] then
+ Script("../" .. board .. "/lists/patsubst(__file__, `\.m4$', `')")
+else
+ Script((repo_base_uri or "https://repo.turris.cz/hbs") .. "/" .. board .. "/lists/patsubst(__file__, `\.m4$', `')")
+end
+')dnl
diff --git a/lists-obsolete/datacollect.lua.m4 b/lists-obsolete/datacollect.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/datacollect.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/dev-detect.lua.m4 b/lists-obsolete/dev-detect.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/dev-detect.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/dvb.lua.m4 b/lists-obsolete/dvb.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/dvb.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/honeypot.lua.m4 b/lists-obsolete/honeypot.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/honeypot.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/luci-controls.lua.m4 b/lists-obsolete/luci-controls.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/luci-controls.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/lxc.lua.m4 b/lists-obsolete/lxc.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/lxc.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/nas.lua.m4 b/lists-obsolete/nas.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/nas.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/netboot.lua.m4 b/lists-obsolete/netboot.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/netboot.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/netmetr.lua.m4 b/lists-obsolete/netmetr.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/netmetr.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/openvpn.lua.m4 b/lists-obsolete/openvpn.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/openvpn.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/pakon.lua.m4 b/lists-obsolete/pakon.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/pakon.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/printserver.lua.m4 b/lists-obsolete/printserver.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/printserver.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/ssbackup.lua.m4 b/lists-obsolete/ssbackup.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/ssbackup.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
diff --git a/lists-obsolete/tor.lua.m4 b/lists-obsolete/tor.lua.m4
new file mode 100644
index 000000000..aeeac9a65
--- /dev/null
+++ b/lists-obsolete/tor.lua.m4
@@ -0,0 +1,2 @@
+include(common.m4)dnl
+LIST
--
GitLab