Merge pull request #2865 from MichaIng/patch-1

Do not pre-install obsolete apt-transport-https
This commit is contained in:
lanefu 2021-05-31 20:24:14 -04:00 committed by GitHub
commit e6247c91fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -171,7 +171,7 @@ if [[ "${1}" == docker && -f /etc/debian_version && -z "$(command -v docker)" ]]
echo "deb [arch=amd64] https://download.docker.com/linux/${codeid} ${codename} edge" > /etc/apt/sources.list.d/docker.list
# minimal set of utilities that are needed for prep
packages=("curl" "gnupg" "apt-transport-https")
packages=("curl" "gnupg")
for i in "${packages[@]}"
do
[[ ! $(command -v "${i}") ]] && install_packages+=${i}" "

View File

@ -1,4 +1,4 @@
locales gnupg ifupdown apt-utils apt-transport-https ca-certificates bzip2 console-setup
locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup
cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd
linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail
wireless-regdb crda dmsetup rsync tzdata haveged fdisk

View File

@ -1,4 +1,4 @@
locales gnupg ifupdown apt-utils apt-transport-https ca-certificates bzip2 console-setup
locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup
cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd
linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail
wireless-regdb crda dmsetup rsync tzdata haveged fdisk

View File

@ -1,4 +1,4 @@
locales gnupg ifupdown apt-utils apt-transport-https ca-certificates bzip2 console-setup
locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup
cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd
linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail
wireless-regdb crda dmsetup rsync tzdata rng-tools fdisk

View File

@ -683,7 +683,7 @@ compile_armbian-config()
Maintainer: $MAINTAINER <$MAINTAINERMAIL>
Replaces: armbian-bsp, neofetch
Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, zip, \
debconf-utils, unzip, build-essential, html2text, apt-transport-https, html2text, dirmngr, software-properties-common, debconf, jq
debconf-utils, unzip, build-essential, html2text, html2text, dirmngr, software-properties-common, debconf, jq
Recommends: armbian-bsp
Suggests: libpam-google-authenticator, qrencode, network-manager, sunxi-tools
Section: utils