Skip to content
Snippets Groups Projects
Verified Commit 17069a8b authored by Karel Koci's avatar Karel Koci :metal:
Browse files

Revert "Add obsolete lists"

This reverts commit 1bd0f379.

This was created to migrate Turris OS 4.0-alpha* releases. The first
supported version 4.0-beta1 already contains correct path with board
specific path so there is no need to preserve these obsolete ones.
Non the less they are also wrong with additional introduced changes.
They point to pkglists in invalid location.

This requires also removal of code on build server to not use --obsolete
option and to not deploy those.
parent 5a041d90
No related branches found
No related tags found
1 merge request!123Turris OS 5.0 (HBK)
Showing
with 2 additions and 64 deletions
......@@ -18,7 +18,6 @@ set -e
output_path=
sign_key=
obsolete=
while [ $# -gt 0 ]; do
case "$1" in
-h|--help)
......@@ -41,9 +40,6 @@ while [ $# -gt 0 ]; do
--debug)
set -x
;;
--obsolete)
obsolete=-obsolete
;;
*)
if [ -z "$output_path" ]; then
output_path="$1"
......@@ -58,7 +54,7 @@ done
[ -n "$output_path" ] || output_path="generated_lists"
tb="$(dirname "$(readlink -f "$0")")"
[ -d "$tb/lists$obsolete" -a -f "$tb/feeds.conf" ] || {
[ -d "$tb/lists" -a -f "$tb/feeds.conf" ] || {
echo "This script has to be in same direstory as feeds.conf and lists directory." >&2
exit 1
}
......@@ -70,7 +66,7 @@ mkdir -p "$output_path"
"$tb/helpers/turris-version.sh" version > "$output_path/turris-version"
( cd "$tb" && git rev-parse HEAD > "$output_path/git-hash" )
listsdir="$tb/lists$obsolete"
listsdir="$tb/lists"
m4args=( "--include=$listsdir" "-D_INCLUDE_=$listsdir/" "-D_FEEDS_=$tb/feeds.conf" )
m4args+=( "-D_TURRIS_OS_VERSION_=$("${0%/*}/helpers/turris-version.sh" version)" )
......
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
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$', `\1')")
else
Script((repo_base_uri or "https://repo.turris.cz/hbs") .. "/" .. board .. "/lists/patsubst(__file__, `^.*/\([^/]*\)\.m4$', `\1')")
end
')dnl
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
include(common.m4)dnl
LIST
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment