JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Multiple sources fix: after changing to deb822 we forgot on leftovers

Browse Source 
- deboostrap still uses old ways and we need to remove this file
- when displaying the content of sources, we need to look correct file
This commit is contained in:
Igor Pecovnik
2025-03-04 10:22:19 +01:00
committed by Igor
parent a370033dc3
commit 3199178c70
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/rootfs/create-cache.sh
View File

@@ -132,4 +132,4 @@ function extract_rootfs_artifact() {
} }
# This comment strategically introduced to force a rebuild of all rootfs, as this file's contents are hashed into all rootfs versions. # This comment strategically introduced to force a rebuild of all rootfs, as this file's contents are hashed into all rootfs versions.
# Just a number to force rebuild 003 # Just a number to force rebuild 004

3
lib/functions/rootfs/distro-specific.sh
View File

@@ -80,6 +80,9 @@ function create_sources_list_and_deploy_repo_key() {
declare distro="" declare distro=""
# Drop deboostrap sources leftovers
rm -f "${basedir}/etc/apt/sources.list"
# Add upstream (Debian/Ubuntu) APT repository # Add upstream (Debian/Ubuntu) APT repository
case $release in case $release in
buster | bullseye | bookworm | trixie) buster | bullseye | bookworm | trixie)

2
lib/functions/rootfs/rootfs-create.sh
View File

@@ -177,7 +177,7 @@ function create_new_rootfs_cache_via_debootstrap() {
# @TODO: use asset logging for this; actually log contents of the files too # @TODO: use asset logging for this; actually log contents of the files too
run_host_command_logged ls -l "${SDCARD}/usr/share/keyrings" run_host_command_logged ls -l "${SDCARD}/usr/share/keyrings"
run_host_command_logged ls -l "${SDCARD}/etc/apt/sources.list.d" run_host_command_logged ls -l "${SDCARD}/etc/apt/sources.list.d"
run_host_command_logged cat "${SDCARD}/etc/apt/sources.list" run_host_command_logged cat "${SDCARD}/etc/apt/sources.list.d/${DISTRIBUTION,,}.sources"
# stage: update packages list # stage: update packages list
display_alert "Updating package list" "$RELEASE" "info" display_alert "Updating package list" "$RELEASE" "info"