From c5791116b57078f69a8e2031fe2ef694f6f816fe Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Tue, 8 Mar 2022 13:40:38 +0200
Subject: [PATCH] base-bullseye, stx-std: Update list of packages 8-Mar-2022

This work is part of Debian integration effort. This only affects
Debian.

Add gunicorn used by keystone and barbican after unlock.
Add bc used by keystone service after unlock.
Add memcached.
Add nmve-cli (as a helper, Related-Bug: #1903766).
Remove duplicate lines.
Remove commented packages we have a StarlingX package for.
Remove python3-{setuptools,pkg-resources} and enable the StarlingX
package.

Tests:
PASS: install added packages at runtime on live controller
PASS: downloader -b

Story: 2009101
Task: 43732
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Change-Id: I5dae54cd5d89082d788bf97254a9fa3f70ba55b2
---
 .../config/debian/common/base-bullseye.lst       | 16 +++++-----------
 .../config/debian/distro/stx-std.lst             |  5 +++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.lst b/debian-mirror-tools/config/debian/common/base-bullseye.lst
index 3a4c86306..8d7e3f5e9 100644
--- a/debian-mirror-tools/config/debian/common/base-bullseye.lst
+++ b/debian-mirror-tools/config/debian/common/base-bullseye.lst
@@ -11,8 +11,8 @@ 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-completion  1:2.11-2
+bc  1.07.1-2+b2
 bind9-host 1:9.16.22-1~deb11u1
 bind9-libs 1:9.16.22-1~deb11u1
 binutils  2.35.2-2
@@ -104,12 +104,8 @@ gpgsm  2.2.27-2
 gpgv  2.2.27-2
 grep  3.6-1
 groff-base  1.22.4-6
-#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
 gsettings-desktop-schemas  3.38.0-2
+gunicorn  20.1.0-1
 gzip  1.10-4
 haproxy 2.2.9-2+deb11u2
 hdparm  9.60+ds-1
@@ -188,8 +184,6 @@ libcap2  1:2.44-1
 libcap2-bin  1:2.44-1
 libcbor0  0.5.0+dfsg-2
 libcc1-0  10.2.1-6
-libc-dev-bin  2.31-13+deb11u2
-libc-l10n  2.31-13+deb11u2
 libcom-err2  1.46.2-2
 libcomps0 0.1.15-4
 libcpp-hocon0.3.0  0.3.0-1+b2
@@ -482,6 +476,7 @@ mariadb-common  1:10.5.12-0+deb11u1
 mawk  1.3.4.20200120-2
 mdadm  4.1-11
 media-types  4.0.0
+memcached  1.6.9+dfsg-1
 mime-support  3.66
 mksh  59c-9+b2
 mount  2.36.1-8
@@ -489,7 +484,6 @@ mysql-common  5.8+1.0.7
 nano  5.4-2
 ncurses-base  6.2+20201114-2
 ncurses-bin  6.2+20201114-2
-#net-tools  1.60+git20181103.0eebece-1
 netbase  6.3
 netcat-openbsd 1.217-3
 netfilter-persistent 1.0.15
@@ -500,6 +494,7 @@ nscd  2.31-13+deb11u2
 nslcd  0.9.11-1
 ntp  1:4.2.8p15+dfsg-1
 ntpdate  1:4.2.8p15+dfsg-1
+nvme-cli  1.12-5
 openssh-client  1:8.4p1-5
 openssh-server  1:8.4p1-5
 openssh-sftp-server  1:8.4p1-5
@@ -611,6 +606,7 @@ python3-futurist  2.3.0-2
 python3-google-auth  1.5.1-3
 python3-gpg 1.14.0-1+b2
 python3-greenlet  0.4.17-1+b1
+python3-gunicorn  20.1.0-1
 python3-hawkey 0.55.2-6
 python3-html5lib  1.1-3
 python3-httplib2  0.18.1-3
@@ -690,7 +686,6 @@ python3-pastescript  2.0.2-4
 python3-pbr  5.5.0-2
 python3-pecan  1.3.3-3
 python3-pexpect  4.8.0-2
-python3-pkg-resources  52.0.0-4
 python3-ply  3.11-4
 python3-prettytable  0.7.2-5
 python3-psutil  5.8.0-1
@@ -736,7 +731,6 @@ python3-scipy  1.6.0-2
 python3-scrypt  0.8.0-0.3+b3
 python3-secretstorage  3.3.1-1
 python3-semantic-version  2.8.5-1
-python3-setuptools  52.0.0-4
 python3-simplegeneric  0.8.1-3
 python3-simplejson  3.17.2-1
 python3-singledispatch  3.4.0.3-3
diff --git a/debian-mirror-tools/config/debian/distro/stx-std.lst b/debian-mirror-tools/config/debian/distro/stx-std.lst
index 91ec301a8..42ae7a2cc 100644
--- a/debian-mirror-tools/config/debian/distro/stx-std.lst
+++ b/debian-mirror-tools/config/debian/distro/stx-std.lst
@@ -792,6 +792,11 @@ python3-pankoclient
 #python-wsme
 python3-wsme
 
+#python3-setuptools
+#python-setuptools-doc
+python3-pkg-resources
+python3-setuptools
+
 #qat17
 qat1.7.l-dbgsym
 qat1.7.l