diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages index c0080f851e..086157dafd 100644 --- a/config/cli/bullseye/main/packages +++ b/config/cli/bullseye/main/packages @@ -7,6 +7,7 @@ dialog fake-hwclock figlet fping +nala ncurses-term nocache openssh-server diff --git a/config/cli/bullseye/main/sources/apt/nala.gpg b/config/cli/bullseye/main/sources/apt/nala.gpg new file mode 100644 index 0000000000..79361eed92 Binary files /dev/null and b/config/cli/bullseye/main/sources/apt/nala.gpg differ diff --git a/config/cli/bullseye/main/sources/apt/nala.source b/config/cli/bullseye/main/sources/apt/nala.source new file mode 100644 index 0000000000..a87b69d8bc --- /dev/null +++ b/config/cli/bullseye/main/sources/apt/nala.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/nala.gpg] http://deb.volian.org/volian/ scar main diff --git a/config/cli/focal/main/packages b/config/cli/focal/main/packages index c0080f851e..7a0a7a3b63 100644 --- a/config/cli/focal/main/packages +++ b/config/cli/focal/main/packages @@ -8,6 +8,7 @@ fake-hwclock figlet fping ncurses-term +nala nocache openssh-server parted diff --git a/config/cli/focal/main/sources/apt/nala.gpg b/config/cli/focal/main/sources/apt/nala.gpg new file mode 100644 index 0000000000..79361eed92 Binary files /dev/null and b/config/cli/focal/main/sources/apt/nala.gpg differ diff --git a/config/cli/focal/main/sources/apt/nala.source b/config/cli/focal/main/sources/apt/nala.source new file mode 100644 index 0000000000..a87b69d8bc --- /dev/null +++ b/config/cli/focal/main/sources/apt/nala.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/nala.gpg] http://deb.volian.org/volian/ scar main diff --git a/config/cli/jammy/main/sources b/config/cli/jammy/main/sources new file mode 120000 index 0000000000..c26d381b2f --- /dev/null +++ b/config/cli/jammy/main/sources @@ -0,0 +1 @@ +../../focal/main/sources \ No newline at end of file diff --git a/config/cli/sid/main/packages b/config/cli/sid/main/packages index c0080f851e..086157dafd 100644 --- a/config/cli/sid/main/packages +++ b/config/cli/sid/main/packages @@ -7,6 +7,7 @@ dialog fake-hwclock figlet fping +nala ncurses-term nocache openssh-server diff --git a/config/cli/sid/main/sources/apt/nala.gpg b/config/cli/sid/main/sources/apt/nala.gpg new file mode 120000 index 0000000000..22da101e86 --- /dev/null +++ b/config/cli/sid/main/sources/apt/nala.gpg @@ -0,0 +1 @@ +../../../../bullseye/main/sources/apt/nala.gpg \ No newline at end of file diff --git a/config/cli/sid/main/sources/apt/nala.source b/config/cli/sid/main/sources/apt/nala.source new file mode 120000 index 0000000000..04eadb3336 --- /dev/null +++ b/config/cli/sid/main/sources/apt/nala.source @@ -0,0 +1 @@ +../../../../bullseye/main/sources/apt/nala.source \ No newline at end of file diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index e12c3b4120..1fae8af88d 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -275,6 +275,9 @@ create_rootfs_cache() # this should fix resolvconf installation failure in some cases chroot $SDCARD /bin/bash -c 'echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections' + # TODO change name of the function from "desktop" and move to appropriate location + add_desktop_package_sources + # stage: update packages list display_alert "Updating package list" "$RELEASE" "info" eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -e -c "apt-get -q -y $apt_extra update"' \ @@ -292,12 +295,6 @@ create_rootfs_cache() ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Upgrading base packages..." $TTY_Y $TTY_X'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} ';EVALPIPE=(${PIPESTATUS[@]})' - # Myy: Dividing the desktop packages installation steps into multiple - # ones. We first install the "ADDITIONAL_PACKAGES" in order to get - # access to software-common-properties installation. - # THEN we add the APT sources and install the Desktop packages. - # TODO : Find a way to add APT sources WITHOUT software-common-properties - [[ ${EVALPIPE[0]} -ne 0 ]] && display_alert "Upgrading base packages" "failed" "wrn" # stage: install additional packages @@ -311,12 +308,6 @@ create_rootfs_cache() [[ ${EVALPIPE[0]} -ne 0 ]] && exit_with_error "Installation of Armbian main packages for ${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL} failed" if [[ $BUILD_DESKTOP == "yes" ]]; then - # FIXME Myy : Are we keeping this only for Desktop users, - # or should we extend this to CLI users too ? - # There might be some clunky boards that require Debian packages from - # specific repos... - display_alert "Adding apt sources for Desktop packages" - add_desktop_package_sources local apt_desktop_install_flags="" if [[ ! -z ${DESKTOP_APT_FLAGS_SELECTED+x} ]]; then diff --git a/lib/desktop.sh b/lib/desktop.sh index 0c7e7c453a..17f43d38f8 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -202,7 +202,7 @@ add_apt_sources() { get_all_potential_paths "${DESKTOP_ENVIRONMENTS_SEARCH_RELATIVE_DIRS}" "." "sources/apt" get_all_potential_paths "${DESKTOP_APPGROUPS_SEARCH_RELATIVE_DIRS}" "${DESKTOP_APPGROUPS_SELECTED}" "sources/apt" - display_alert "ADDING ADDITIONAL APT SOURCES" + display_alert "Adding additional apt sources" for apt_sources_dirpath in ${potential_paths}; do if [[ -d "${apt_sources_dirpath}" ]]; then @@ -218,11 +218,11 @@ add_apt_sources() { display_alert "Adding APT Source ${new_apt_source}" if [[ "${new_apt_source}" == ppa* ]] ; then - + # ppa with software-common-properties + run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" # add list with apt-add # -y -> Assumes yes to all queries # -n -> Do not update package cache after adding - run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" if [[ -f "${apt_source_gpg_filepath}" ]]; then display_alert "Adding GPG Key ${apt_source_gpg_filepath}" cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}" @@ -230,7 +230,7 @@ add_apt_sources() { echo "APT Key returned : $?" fi else - # copy list if its not ppa + # installation without software-common-properties, sources.list + key.gpg echo "${new_apt_source}" > "${SDCARD}/etc/apt/sources.list.d/${apt_source_filename}" if [[ -f "${apt_source_gpg_filepath}" ]]; then display_alert "Adding GPG Key ${apt_source_gpg_filepath}" @@ -254,8 +254,9 @@ add_desktop_package_sources() { # Myy : I see Snap and Flatpak coming up in the next releases # so... let's prepare for that + add_apt_sources - run_on_sdcard "apt -y update" >> "${DEST}"/${LOG_SUBPATH}/install.log + ls -l "${SDCARD}/usr/share/keyrings" >> "${DEST}"/${LOG_SUBPATH}/install.log ls -l "${SDCARD}/etc/apt/sources.list.d" >> "${DEST}"/${LOG_SUBPATH}/install.log cat "${SDCARD}/etc/apt/sources.list" >> "${DEST}"/${LOG_SUBPATH}/install.log