Verified Commit 5168459a authored by Josef Schlehofer's avatar Josef Schlehofer 💬
Browse files

Revert Medkits changes done in HBL from HBK

parent f7c42733
Pipeline #75490 passed with stages
in 3 minutes and 40 seconds
......@@ -14,25 +14,24 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set -eu
set -e
src_dir="$(dirname "$(readlink -f "${0%/*}")")"
. "$src_dir/helpers/common.sh"
. "$src_dir/helpers/generate_common.sh"
. "$src_dir/defaults.sh"
export BOOTSTRAP_BOARD=
export BOARD=
export BRANCH="$PUBLISH_BRANCH"
export BOOTSTRAP_UPDATER_BRANCH=
export BOOTSTRAP_L10N=cs,de
export BOOTSTRAP_PKGLISTS=
export BOOTSTRAP_DRIVERS=
export BOOTSTRAP_CONTRACT=
export UPDATER_BRANCH=
export L10N=cs,de
export PKGLISTS=
export CONTRACT=
export UPDATER_SCRIPT=
export OVERLAY=
export SIGN_KEY=
export OUTPUT=
export BOOTSTRAP_TESTKEY=
export TESTKEY=
export TURRIS_BUILD_DIR="$src_dir"
......@@ -56,7 +55,7 @@ while [ $# -gt 0 ]; do
echo " values are: turris1x, omnia, mox"
echo " --branch, -b BRANCH"
echo " Set given branch as source for packages used to generate "
echo " this medkit. If this option is not set then '$PUBLISH_BRANCH' is used."
echo " this medkit. If this option is not set then 'hbl' is used."
echo " Note that this does not sets that branch to updater-ng"
echo " configuration. You have to use --updater-branch for that."
echo " --updater-branch BRANCH"
......@@ -75,12 +74,6 @@ while [ $# -gt 0 ]; do
echo " means that they will be removed with first update. To"
echo " prevent this you have to include our own"
echo " /etc/config/pkglists in overlay."
echo " --drivers, -d DRIVER,.."
echo " What additional drivers should be included in medkit. Format"
echo " is CLASS:FLAG where CLASS is either 'pci' or 'usb'. Multiple"
echo " drivers can be specified by separating them by commas. This"
echo " affects only medkit. Unnecessary drivers are removed with"
echo " first system update."
echo " --contract CONTRACT"
echo " Build medkit for router under CONTRACT."
echo " --updater-script FILE"
......@@ -99,7 +92,7 @@ while [ $# -gt 0 ]; do
;;
--target|-t)
shift
BOOTSTRAP_BOARD="$1"
BOARD="$1"
;;
--branch|-b)
shift
......@@ -107,25 +100,21 @@ while [ $# -gt 0 ]; do
;;
--updater-branch)
shift
BOOTSTRAP_UPDATER_BRANCH="$1"
BOOTSTRAP_TESTKEY=y
UPDATER_BRANCH="$1"
TESTKEY=y
;;
--localization|-l)
shift
BOOTSTRAP_L10N="$1"
L10N="$1"
;;
--lists|-p)
shift
BOOTSTRAP_PKGLISTS="$1"
;;
--drivers|-d)
shift
DRIVERS_DRIVERS="$1"
PKGLISTS="$1"
;;
--contract)
[ -z "$CONTRACT" ] || die "--contract can be specified only once"
shift
BOOTSTRAP_CONTRACT="$1"
CONTRACT="$1"
default_output_ext="-contract-$1"
;;
--updater-script)
......@@ -148,12 +137,12 @@ while [ $# -gt 0 ]; do
shift
done
[ -n "$BOOTSTRAP_BOARD" ] || die "You have to specify target Turris router."
[ -n "$BOARD" ] || die "You have to specify target Turris router."
[ -n "$OUTPUT" ] || \
OUTPUT="$BOOTSTRAP_BOARD-medkit$default_output_ext.tar.gz"
OUTPUT="$BOARD-medkit$default_output_ext.tar.gz"
OUTPUT="$(readlink -f "$OUTPUT")"
updater_ng_repodetect "$BRANCH" "$BOOTSTRAP_BOARD"
updater_ng_repodetect "$BRANCH" "$BOARD"
get_usign
get_updater_ng
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment