Skip to content

Commit

Permalink
Directly Wget libncurses5
Browse files Browse the repository at this point in the history
  • Loading branch information
iBug committed Aug 27, 2024
1 parent c8e7f3a commit ff9a470
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
14 changes: 11 additions & 3 deletions labstrap
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ run sh -c 'dpkg --get-selections | cut -f1 | xargs apt-mark auto'
rm -f "$DST/etc/resolv.conf"
cp -f /etc/resolv.conf "$DST/etc/resolv.conf"
add_file /etc/apt/
chattr +i "$DST/etc/apt/sources.list" || true
run sed -i "s,%APT_SOURCE%,${APT_SOURCE:-https://mirrors.ustc.edu.cn},g" /etc/apt/sources.list.d/ubuntu.sources
run sed -i "s,%APT_SOURCE%,${APT_SOURCE:=https://mirrors.ustc.edu.cn},g" /etc/apt/sources.list.d/ubuntu.sources
run apt-get update
run apt-get -y dist-upgrade

Expand All @@ -83,12 +82,21 @@ add_package \
fcitx-frontend-all fcitx-frontend-gtk2 fcitx-frontend-gtk3 fcitx-frontend-qt5 \
fonts-droid-fallback language-pack-zh-hans language-pack-gnome-zh-hans-base texmaker pluma file-roller eom atril \
mate-tweak ubuntu-mate-core ubuntu-minimal vlab-vnc xserver-xorg slick-greeter ubuntu-mate-wallpapers light-themes \
caja-open-terminal libncurses5 \
caja-open-terminal \
bash-completion command-not-found cron curl dnsutils htop manpages-dev net-tools ssh vim wget \
ayatana-indicator-application ayatana-indicator-session ayatana-indicator-datetime ayatana-indicator-notifications \
firefox-vlab ssl-cert lrzsz vlab-earlyoom zenity \
gdb build-essential

# Add ncurses5 (Noble no longer packages it)
for f in \
"$APT_SOURCE/ubuntu/pool/universe/n/ncurses/libtinfo5_6.4-2_amd64.deb" \
"$APT_SOURCE/ubuntu/pool/universe/n/ncurses/libncurses5_6.4-2_amd64.deb"
do
run wget -O "/tmp/$(basename "$f")" "$f"
add_package "/tmp/$(basename "$f")"
done

# Regional settings (time & language)
ln -sf /usr/share/zoneinfo/Asia/Shanghai "$DST/etc/localtime"
run dpkg-reconfigure --frontend noninteractive tzdata
Expand Down
7 changes: 0 additions & 7 deletions rootfs/etc/apt/sources.list.d/ubuntu.sources
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,3 @@ URIs: %APT_SOURCE%/ubuntu/
Suites: noble noble-updates noble-security
Components: main restricted universe multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

# For libncurses5
Types: deb
URIs: %APT_SOURCE%/ubuntu/
Suites: jammy
Components: universe
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

0 comments on commit ff9a470

Please sign in to comment.