Adjust package lists for systemd-timesyncd conflicts

Align base-bullseye.lst and stx-std.lst to what is currently needed to
generate an ISO.

Comment out packages that we don't want downloaded or we are generating
but don't want included as they will generate a conflict.

Test Plan:
 - Wipe existing mirrors/aptly contents/build artifacts (i.e. a fresh
   build)
 - Download and re-populate binary/source mirrors
 - Build all packages
 - Build ISO
 - Install ISO

Change-Id: I19e26297eea165c3206a48889cf0f3d3e716b82d
Story: 2009101
Task: 43848
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2022-01-28 02:32:41 -05:00
parent aa6391190f
commit cab71ffbf1
2 changed files with 14 additions and 14 deletions

View File

@ -10,7 +10,7 @@ apt 2.2.4
apt-utils 2.2.4
augeas-lenses 1.12.0-2
base-files 11.1+deb11u2
bash 5.1-2+b3
#bash 5.1-2+b3
bash-completion 1:2.11-2
bsdextrautils 2.36.1-8
bsdutils 1:2.36.1-8
@ -93,11 +93,11 @@ gpg-wks-client 2.2.27-2
gpg-wks-server 2.2.27-2
grep 3.6-1
groff-base 1.22.4-6
grub2 2.04-20
grub2-common 2.04-20
grub-common 2.04-20
grub-pc 2.04-20
grub-pc-bin 2.04-20
#grub2 2.04-20
#grub2-common 2.04-20
#grub-common 2.04-20
#grub-pc 2.04-20
#grub-pc-bin 2.04-20
gsettings-desktop-schemas 3.38.0-2
gzip 1.10-4
hiera 3.2.0-2.1
@ -284,7 +284,7 @@ libnet1 1.1.6+dfsg-3.1
libnetfilter-conntrack3 1.0.8-3
libnetfilter-cthelper0 1.0.0-3
libnetfilter-queue1 1.0.5-2
libnet-ntp-perl 1.5-1.1
#libnet-ntp-perl 1.5-1.1
libnettle8 3.7.3-1
libnewt0.52 0.52.21-4+b3
libnfnetlink0 1.0.1-3+b1
@ -303,7 +303,7 @@ libnsl-dev 1.3.0-2
libodbc1 2.3.6-0.1+b1
libopenhpi3 3.8.0-2.1
libopenipmi0 2.0.29-0.1+b1
libopts25 1:5.18.16-4
#libopts25 1:5.18.16-4
libp11-kit0 0.23.22-1
libpam0g 1.4.0-9+deb11u1
libpam-ldap 186-4+b1
@ -432,12 +432,12 @@ nano 5.4-2
ncurses-base 6.2+20201114-2
ncurses-bin 6.2+20201114-2
netbase 6.3
net-tools 1.60+git20181103.0eebece-1
#net-tools 1.60+git20181103.0eebece-1
nfs-common 1:1.3.4-6
nftables 0.9.8-3.1
nscd 2.31-13+deb11u2
nslcd 0.9.11-1
ntpdate 1:4.2.8p15+dfsg-1
#ntpdate 1:4.2.8p15+dfsg-1
openssh-client 1:8.4p1-5
openssh-server 1:8.4p1-5
openssh-sftp-server 1:8.4p1-5

View File

@ -192,7 +192,7 @@ kubernetes-1.21.8-kubeadm
kubernetes-1.21.8-master
kubernetes-1.21.8-misc
kubernetes-1.21.8-node
kubernetes-1.21.8-unit-test
#kubernetes-1.21.8-unit-test # not needed
#kubernetes-unversioned
kubernetes-unversioned
@ -710,7 +710,7 @@ syslog-ng-config
#systemd
#libnss-myhostname-dbgsym # not used
#libnss-myhostname # not used
libnss-myhostname
#libnss-mymachines-dbgsym # not used
#libnss-mymachines # not used
#libnss-resolve-dbgsym # not used
@ -735,8 +735,8 @@ systemd-dbgsym
systemd-sysv
#systemd-tests-dbgsym # not used
#systemd-tests # not used
systemd-timesyncd-dbgsym
systemd-timesyncd
#systemd-timesyncd-dbgsym # not used
#systemd-timesyncd # not used
systemd
udev-dbgsym
udev