From db3374c15eddb5ed5ef041d2df5e7e063af236de Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Sat, 18 Mar 2023 17:01:58 +0100 Subject: [PATCH] refactor: drop armbian_pkgupgrade Due usage of weekly build images pkgupgrade is useless Signed-off-by: Stephan Wendel --- config/armbian/default | 2 +- .../armbian_pkgupgrade/start_chroot_script | 78 ------------------- 2 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 src/modules/armbian_pkgupgrade/start_chroot_script diff --git a/config/armbian/default b/config/armbian/default index f8efce374..1a9e655d9 100644 --- a/config/armbian/default +++ b/config/armbian/default @@ -23,7 +23,7 @@ BASE_IMAGE_RESIZEROOT=600 # Compress not needed due compression done in workflow BASE_RELEASE_COMPRESS=no # Modules are valid for 32bit and 64bit images -MODULES="base,armbian_pkgupgrade,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)" +MODULES="base,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)" # export Variables export DOWNLOAD_BASE_URL diff --git a/src/modules/armbian_pkgupgrade/start_chroot_script b/src/modules/armbian_pkgupgrade/start_chroot_script deleted file mode 100644 index 7090d0e5d..000000000 --- a/src/modules/armbian_pkgupgrade/start_chroot_script +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -#### MainsailOS Specific procedure for armbian images to replace 'pkgupgrade' module -#### -#### Written by Stephan Wendel aka KwadFan -#### Copyright 2023 - till today -#### https://github.com/mainsail-crew/MainsailOS -#### -#### This File is distributed under GPLv3 -#### - -#### Description: -#### Due missing packages in our armbian builds and -#### and buggy behaviour of kernel upgrades we have to skip -#### upgrading the kernel package during build time. -#### Kernel upgrade is possible after first boot. - -# shellcheck enable=require-variable-braces -# Source error handling, leave this in place -set -Ee - -# Source CustomPIOS common.sh -# shellcheck disable=SC1091 -source /common.sh -install_cleanup_trap - -### Helper func -is_board_type() { - local board releasefile - board="" - releasefile="/etc/armbian-release" - if [[ -f "${releasefile}" ]]; then - board="$(grep "BOARD=" "${releasefile}" | cut -d'=' -f2)" - fi - echo "${board}" -} - - -## Install some basic packages that are needed during build -## Package net-tools fixes module 'armbian_net' -DEBIAN_FRONTEND=noninteractive -export DEBIAN_FRONTEND -apt-get update --allow-releaseinfo-change -apt-get install --yes --assume-yes sudo apt-utils wget net-tools - -## Set kernel package on hold -### Orange Pi 3 LTS -if [[ "$(is_board_type)" == "orangepi3-lts" ]]; then - echo "armbian-firmware hold" | dpkg --set-selections - echo "linux-image-current-sunxi64 hold" | dpkg --set-selections - echo "linux-dtb-current-sunxi64 hold" | dpkg --set-selections -fi - -### Orange Pi 4 LTS -if [[ "$(is_board_type)" == "orangepi4-lts" ]]; then - echo "armbian-firmware hold" | dpkg --set-selections - echo "linux-image-current-rockchip64 hold" | dpkg --set-selections - echo "linux-dtb-current-rockchip64 hold" | dpkg --set-selections -fi - -## Run full upgrade -apt-get upgrade --yes --assume-yes - -## Revert hold status -### Orange Pi 3 LTS -if [[ "$(is_board_type)" == "orangepi3-lts" ]]; then - echo "armbian-firmware install" | dpkg --set-selections - echo "linux-image-current-sunxi64 install" | dpkg --set-selections - echo "linux-dtb-current-sunxi64 install" | dpkg --set-selections -fi - -### Orange Pi 4 LTS -if [[ "$(is_board_type)" == "orangepi4-lts" ]]; then - echo "armbian-firmware install" | dpkg --set-selections - echo "linux-image-current-rockchip64 install" | dpkg --set-selections - echo "linux-dtb-current-rockchip64 install" | dpkg --set-selections -fi - -unset DEBIAN_FRONTEND