summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-07-24 10:06:56 +0200
committerKarel Kočí <cynerd@email.cz>2020-07-24 10:06:56 +0200
commit6acf1abf2f406fd687c51542e55ba692b6208493 (patch)
treeaf42ce11ba9867f869e59ec538d9361961d86cdf
parent3546c4c68eb0c7e0955015977c83833dc3447f25 (diff)
downloadopenwrt-personal-pkgs-6acf1abf2f406fd687c51542e55ba692b6208493.tar.gz
openwrt-personal-pkgs-6acf1abf2f406fd687c51542e55ba692b6208493.tar.bz2
openwrt-personal-pkgs-6acf1abf2f406fd687c51542e55ba692b6208493.zip
base64c: base64c really does not need updater's files
-rw-r--r--base64c/files/turris.lua80
-rwxr-xr-xbase64c/files/update_alternatives.sh23
-rw-r--r--base64c/files/updater.config4
3 files changed, 0 insertions, 107 deletions
diff --git a/base64c/files/turris.lua b/base64c/files/turris.lua
deleted file mode 100644
index 7555813..0000000
--- a/base64c/files/turris.lua
+++ /dev/null
@@ -1,80 +0,0 @@
---[[
-This file is part of updater-ng. Don't edit it.
-]]
-
-local uci_cursor = nil
-if uci then
- uci_cursor = uci.cursor(root_dir .. "/etc/config")
-else
- ERROR("UCI library is not available. Configuration not used.")
-end
-local function uci_cnf(name, default)
- if uci_cursor then
- return uci_cursor:get("updater", "turris", name) or default
- else
- return default
- end
-end
-
--- Configuration variables
-local mode = uci_cnf("mode", "branch") -- should we follow branch or version?
-local branch = uci_cnf("branch", "hbs") -- which branch to follow
-local version = uci_cnf("version", nil) -- which version to follow
-
--- Verify that we have sensible configuration
-if mode == "version" and not version then
- WARN("Mode configured to be 'version' but no version provided. Changing mode to 'branch' instead.")
- mode = "branch"
-end
-
--- Detect host board
-local product = os_release["OPENWRT_DEVICE_PRODUCT"] or os_release["LEDE_DEVICE_PRODUCT"]
-if product:match("[Mm]ox") then
- board = "mox"
-elseif product:match("[Oo]mnia") then
- board = "omnia"
-elseif product:match("[Tt]urris 1.x") then
- board = "turris1x"
-else
- DIE("Unsupported Turris board: " .. tostring(product))
-end
-Export('board')
-
--- Common URI to Turris OS lists
-local base_url
-if mode == "branch" then
- base_url = "https://repo.turris.cz/" .. branch .. "/" .. board .. "/lists/"
-elseif mode == "version" then
- base_url = "https://repo.turris.cz/archive/" .. version .. "/" .. board .. "/lists/"
-else
- DIE("Invalid updater.turris.mode specified: " .. mode)
-end
-
--- Common connection settings for Turris OS scripts
-local script_options = {
- security = "Remote",
- pubkey = {
- "file:///etc/updater/keys/release.pub",
- "file:///etc/updater/keys/standby.pub",
- "file:///etc/updater/keys/test.pub" -- It is normal for this one to not be present in production systems
- }
-}
-
--- The distribution base script. It contains the repository and bunch of basic packages
-Script(base_url .. "base.lua", script_options)
-
--- Additional enabled distribution lists forced by boot arguments
-if root_dir == "/" then
- local cmdf = io.open("/proc/cmdline")
- if cmdf then
- for cmdarg in cmdf:read():gmatch('[^ ]+') do
- local key, value = cmdarg:match('([^=]+)=(.*)')
- if key == "turris_lists" then
- for list in value:gmatch('[^,]+') do
- Script(base_url .. list .. ".lua", script_options)
- end
- end
- end
- cmdf:close()
- end
-end
diff --git a/base64c/files/update_alternatives.sh b/base64c/files/update_alternatives.sh
deleted file mode 100755
index c93ae45..0000000
--- a/base64c/files/update_alternatives.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ $# -gt 0 ]; then
- echo "This script is part of updater and allows user to manually fix alternative links in system." >&2
- exit 0
-fi
-
-if [ ! -d /usr/lib/opkg/info ]; then
- echo "OPKG info directory not located. This is OpenWrt system, isn't it?" >&2
- exit 1
-fi
-
-# Fist install all busybox applets and then overwite them with alternatives
-
-busybox --install /bin
-
-sed -n 's/^Alternatives://p' /usr/lib/opkg/info/*.control | \
- tr , '\n' | \
- sort -n | \
- while IFS=: read PRIO TRG SRC; do
- ln -sf "$SRC" "$TRG"
- done
diff --git a/base64c/files/updater.config b/base64c/files/updater.config
deleted file mode 100644
index 82e220e..0000000
--- a/base64c/files/updater.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-config turris 'turris'
- option mode 'branch'
-