Skip to content

Commit cadd7be

Browse files
different way to add apt sources list
1 parent 2c784f4 commit cadd7be

File tree

3 files changed

+82
-14
lines changed

3 files changed

+82
-14
lines changed

.github/scripts/build-hirsute.sh

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,44 @@ ENABLE_USER_SETUP=false
1414
PREFIX="${frn}"
1515

1616
additional_setup() {
17-
run_cmd echo deb $MIRROR $SUITE main restricted > /etc/apt/sources.list
18-
run_cmd echo deb-src $MIRROR $SUITE main restricted > /etc/apt/sources.list
19-
run_cmd echo deb $MIRROR $SUITE-updates multiverse > /etc/apt/sources.list
20-
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser > /etc/apt/sources.list
17+
cat <<- EOF > $chroot_dir/etc/apt/sources.list
18+
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
19+
# newer versions of the distribution.
20+
deb $MIRROR $SUITE main restricted
21+
# deb-src $MIRROR $SUITE main restricted
22+
23+
## Major bug fix updates produced after the final release of the
24+
## distribution.
25+
deb $MIRROR $SUITE-updates main restricted
26+
# deb-src $MIRROR $SUITE-updates main restricted
27+
28+
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
29+
## team. Also, please note that software in universe WILL NOT receive any
30+
## review or updates from the Ubuntu security team.
31+
deb $MIRROR $SUITE universe
32+
# deb-src $MIRROR $SUITE universe
33+
deb $MIRROR $SUITE-updates universe
34+
# deb-src $MIRROR $SUITE-updates universe
35+
36+
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
37+
## team, and may not be under a free licence. Please satisfy yourself as to
38+
## your rights to use the software. Also, please note that software in
39+
## multiverse WILL NOT receive any review or updates from the Ubuntu
40+
## security team.
41+
deb $MIRROR $SUITE multiverse
42+
# deb-src $MIRROR $SUITE multiverse
43+
deb $MIRROR $SUITE-updates multiverse
44+
# deb-src $MIRROR $SUITE-updates multiverse
45+
46+
## N.B. software from this repository may not have been tested as
47+
## extensively as that contained in the main release, although it includes
48+
## newer versions of some applications which may provide useful features.
49+
## Also, please note that software in backports WILL NOT receive any review
50+
## or updates from the Ubuntu security team.
51+
deb $MIRROR $SUITE-backports main restricted universe multiverse
52+
# deb-src $MIRROR $SUITE-backports main restricted universe multiverse
53+
54+
EOF
2155
}
2256

2357
do_build "$PREFIX-arm64" arm64

.github/scripts/build-impish.sh

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,44 @@ ENABLE_USER_SETUP=false
1414
PREFIX="${frn}"
1515

1616
additional_setup() {
17-
run_cmd echo deb $MIRROR $SUITE main restricted > /etc/apt/sources.list
18-
run_cmd echo deb-src $MIRROR $SUITE main restricted > /etc/apt/sources.list
19-
run_cmd echo deb $MIRROR $SUITE-updates multiverse > /etc/apt/sources.list
20-
run_cmd echo deb-src $MIRROR $SUITE-updates multiverser > /etc/apt/sources.list
17+
cat <<- EOF > $chroot_dir/etc/apt/sources.list
18+
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
19+
# newer versions of the distribution.
20+
deb $MIRROR $SUITE main restricted
21+
# deb-src $MIRROR $SUITE main restricted
22+
23+
## Major bug fix updates produced after the final release of the
24+
## distribution.
25+
deb $MIRROR $SUITE-updates main restricted
26+
# deb-src $MIRROR $SUITE-updates main restricted
27+
28+
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
29+
## team. Also, please note that software in universe WILL NOT receive any
30+
## review or updates from the Ubuntu security team.
31+
deb $MIRROR $SUITE universe
32+
# deb-src $MIRROR $SUITE universe
33+
deb $MIRROR $SUITE-updates universe
34+
# deb-src $MIRROR $SUITE-updates universe
35+
36+
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
37+
## team, and may not be under a free licence. Please satisfy yourself as to
38+
## your rights to use the software. Also, please note that software in
39+
## multiverse WILL NOT receive any review or updates from the Ubuntu
40+
## security team.
41+
deb $MIRROR $SUITE multiverse
42+
# deb-src $MIRROR $SUITE multiverse
43+
deb $MIRROR $SUITE-updates multiverse
44+
# deb-src $MIRROR $SUITE-updates multiverse
45+
46+
## N.B. software from this repository may not have been tested as
47+
## extensively as that contained in the main release, although it includes
48+
## newer versions of some applications which may provide useful features.
49+
## Also, please note that software in backports WILL NOT receive any review
50+
## or updates from the Ubuntu security team.
51+
deb $MIRROR $SUITE-backports main restricted universe multiverse
52+
# deb-src $MIRROR $SUITE-backports main restricted universe multiverse
53+
54+
EOF
2155
}
2256

2357
do_build "$PREFIX-arm64" arm64

build-impish-raw.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ ENABLE_USER_SETUP=false
2020

2121
additional_setup() {
2222
shout "additional_setup"
23-
run_cmd echo deb http://archive.ubuntu.com/ubuntu/ focal main restricted \> /etc/apt/sources.list
24-
run_cmd echo deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted \> /etc/apt/sources.list
25-
run_cmd echo deb http://archive.ubuntu.com/ubuntu/ focal-updates universe \> /etc/apt/sources.list
26-
run_cmd echo deb-src http://archive.ubuntu.com/ubuntu/ focal-updates universe \> /etc/apt/sources.list
27-
run_cmd echo deb http://archive.ubuntu.com/ubuntu/ focal multiverse \> /etc/apt/sources.list
28-
run_cmd echo deb-src http://archive.ubuntu.com/ubuntu/ focal multiverse \> /etc/apt/sources.list
23+
run_cmd echo deb $MIRROR focal main restricted \> /etc/apt/sources.list
24+
run_cmd echo deb-src $MIRROR focal main restricted \> /etc/apt/sources.list
25+
run_cmd echo deb $MIRROR focal-updates universe \> /etc/apt/sources.list
26+
run_cmd echo deb-src $MIRROR focal-updates universe \> /etc/apt/sources.list
27+
run_cmd echo deb $MIRROR focal multiverse \> /etc/apt/sources.list
28+
run_cmd echo deb-src $MIRROR focal multiverse \> /etc/apt/sources.list
2929

3030
run_cmd "apt-get update"
3131

0 commit comments

Comments
 (0)