From 010c8a0a231f54df6ad44edac70e9a9e10bffa60 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 22 May 2024 15:44:05 -0400 Subject: [PATCH 1/2] Amend EL network bringup One issue is that there are multiple networkmanager connections, clean this up, though this seems not to be a functional issue. However, sometimes the lldpad usage screws up network configuration, disable the facility by forcibly disabling fcoe sincec that is what triggers lldpad. wq --- .../lib/dracut/hooks/cmdline/01-confluent.sh | 5 ++-- .../dracut/hooks/pre-trigger/01-confluent.sh | 26 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh index f441504e..bc327610 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh @@ -7,8 +7,8 @@ if ! grep console= /proc/cmdline >& /dev/null; then if [ -n "$autocons" ]; then echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf autocons=${autocons%,*} - echo $autocons > /tmp/01-autocons.devnode - echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons + echo $autocons > /tmp/01-autocons.devnode + echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons echo "Initializing auto detected console when installer starts" > $autocons fi fi @@ -16,4 +16,5 @@ if grep console=ttyS /proc/cmdline >& /dev/null; then echo "Serial console has been requested in the kernel arguments, the local video may not show progress" > /dev/tty1 fi . /lib/anaconda-lib.sh +echo rd.fcoe=0 > /etc/cmdline.d/nofcoe.conf wait_for_kickstart diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh index caa60997..8701cc7e 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh @@ -99,6 +99,10 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then fi fi done + for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do + ip addr flush dev $NICGUESS + ip link set $NICGUESS down + done NetworkManager --configure-and-quit=initrd --no-daemon hmackeyfile=/tmp/cnflnthmackeytmp echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile @@ -175,7 +179,7 @@ if [ ! -z "$autocons" ]; then errout="-e $autocons" fi while ! confluentpython /opt/confluent/bin/apiclient $errout /confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg; do - sleep 10 + sleep 10 done ifidx=$(cat /tmp/confluent.ifidx 2> /dev/null) if [ -z "$ifname" ]; then @@ -216,15 +220,15 @@ proto=${proto#protocol: } textconsole=$(grep ^textconsole: /etc/confluent/confluent.deploycfg) textconsole=${textconsole#textconsole: } if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; then - autocons=$(cat /tmp/01-autocons.devnode) - if [ ! -z "$autocons" ]; then - echo Auto-configuring installed system to use text console - echo Auto-configuring installed system to use text console > $autocons + autocons=$(cat /tmp/01-autocons.devnode) + if [ ! -z "$autocons" ]; then + echo Auto-configuring installed system to use text console + echo Auto-configuring installed system to use text console > $autocons /opt/confluent/bin/autocons -c > /dev/null - cp /tmp/01-autocons.conf /etc/cmdline.d/ - else - echo "Unable to automatically detect requested text console" - fi + cp /tmp/01-autocons.conf /etc/cmdline.d/ + else + echo "Unable to automatically detect requested text console" + fi fi . /etc/os-release @@ -327,4 +331,8 @@ if [ -e /lib/nm-lib.sh ]; then fi fi fi +for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do + ip addr flush dev $NICGUESS + ip link set $NICGUESS down +done From bab0a77cb6c3a9fec77dfc13e09d82620a6f251d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 23 May 2024 15:15:37 -0400 Subject: [PATCH 2/2] Refresh to CentOS stream 9 --- genesis/97genesis/install-base | 6 +- genesis/97genesis/install-python | 376 +++++++++++++++---------------- genesis/confluent-genesis.spec | 2 +- genesis/extracttmuxlicenses.py | 30 ++- genesis/getlicenses.py | 40 ++-- 5 files changed, 241 insertions(+), 213 deletions(-) diff --git a/genesis/97genesis/install-base b/genesis/97genesis/install-base index 5d43f9b8..7fe1a976 100644 --- a/genesis/97genesis/install-base +++ b/genesis/97genesis/install-base @@ -5,16 +5,16 @@ dracut_install tpm2_create tpm2_pcrread tpm2_createpolicy tpm2_createprimary dracut_install tpm2_load tpm2_unseal tpm2_getcap tpm2_evictcontrol dracut_install tpm2_pcrextend tpm2_policypcr tpm2_flushcontext tpm2_startauthsession dracut_install openssl tar ipmitool cpio xz gzip lsmod ethtool -dracut_install modprobe touch echo cut wc bash netstat uniq grep ip hostname +dracut_install modprobe touch echo cut wc bash uniq grep ip hostname dracut_install awk egrep dirname bc expr sort dracut_install ssh sshd vi reboot lspci parted tmux mkfs mkfs.ext4 mkfs.xfs xfs_db mkswap dracut_install efibootmgr dracut_install du df ssh-keygen scp clear dhclient lldpd lldpcli tee -dracut_install /lib64/libnss_dns-2.28.so /lib64/libnss_dns.so.2 /lib64/libnss_myhostname.so.2 +dracut_install /lib64/libnss_dns.so.2 /lib64/libnss_dns.so.2 /lib64/libnss_myhostname.so.2 dracut_install ldd uptime /usr/lib64/libnl-3.so.200 dracut_install poweroff date /etc/nsswitch.conf /etc/services /etc/protocols dracut_install /usr/share/terminfo/x/xterm /usr/share/terminfo/l/linux /usr/share/terminfo/v/vt100 /usr/share/terminfo/x/xterm-color /usr/share/terminfo/s/screen /usr/share/terminfo/x/xterm-256color /usr/share/terminfo/p/putty-256color /usr/share/terminfo/p/putty /usr/share/terminfo/d/dumb -dracut_install chmod ifconfig whoami route head tail basename /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids +dracut_install chmod whoami head tail basename /etc/redhat-release ping tr /usr/share/hwdata/usb.ids dracut_install dmidecode /usr/lib64/libstdc++.so.6 dracut_install ps free find inst /bin/bash /bin/sh diff --git a/genesis/97genesis/install-python b/genesis/97genesis/install-python index afc16a44..c5dd6db7 100644 --- a/genesis/97genesis/install-python +++ b/genesis/97genesis/install-python @@ -2,36 +2,35 @@ #strace /usr/libexec/platform-python -c 'import hashlib; import socket; import argparse; import socket; import os; import http.client; import http.cookies; import subprocess; import base64; import ctypes; import struct; import urllib.parse; import shlex; import configparser' dracut_install /usr/libexec/platform-python dracut_install /etc/localtime -dracut_install /lib64/libffi.so.6 -dracut_install /lib64/libssl.so.1.1 -dracut_install /usr/lib64/python3.6/os.py +dracut_install /lib64/libffi.so.8 +dracut_install /lib64/libssl.so.3 +dracut_install /usr/lib64/python3.9/os.py dracut_install /usr/lib64/gconv/gconv-modules.cache -dracut_install /usr/lib64/python3.6 -dracut_install /usr/lib64/python3.6/collections -dracut_install /usr/lib64/python3.6/ctypes -dracut_install /usr/lib64/python3.6/email -dracut_install /usr/lib64/python3.6/encodings -dracut_install /usr/lib64/python3.6/http -dracut_install /usr/lib64/python3.6/lib-dynload -dracut_install /usr/lib64/python3.6/lib-dynload/fcntl.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/binascii.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_bisect.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_blake2.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_ctypes.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_datetime.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_hashlib.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_heapq.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/math.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_posixsubprocess.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_random.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/select.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_sha3.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_socket.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_ssl.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/_struct.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/unicodedata.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/site-packages -dracut_install /usr/lib64/python3.6/urllib +dracut_install /usr/lib64/python3.9 +dracut_install /usr/lib64/python3.9/collections +dracut_install /usr/lib64/python3.9/ctypes +dracut_install /usr/lib64/python3.9/email +dracut_install /usr/lib64/python3.9/encodings +dracut_install /usr/lib64/python3.9/http +dracut_install /usr/lib64/python3.9/lib-dynload +dracut_install /usr/lib64/python3.9/lib-dynload/fcntl.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/binascii.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_bisect.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_blake2.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_ctypes.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_datetime.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_hashlib.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_heapq.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/math.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_posixsubprocess.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_random.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/select.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_socket.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_ssl.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/_struct.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/unicodedata.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/site-packages +dracut_install /usr/lib64/python3.9/urllib dracut_install /usr/lib/locale/en_US.utf8/LC_ADDRESS dracut_install /usr/lib/locale/en_US.utf8/LC_COLLATE dracut_install /usr/lib/locale/en_US.utf8/LC_CTYPE @@ -45,96 +44,94 @@ dracut_install /usr/lib/locale/en_US.utf8/LC_NUMERIC dracut_install /usr/lib/locale/en_US.utf8/LC_PAPER dracut_install /usr/lib/locale/en_US.utf8/LC_TELEPHONE dracut_install /usr/lib/locale/en_US.utf8/LC_TIME -dracut_install /usr/lib/python3.6/site-packages -dracut_install /usr/lib64/python3.6/argparse.py -dracut_install /usr/lib64/python3.6/codecs.py -dracut_install /usr/lib64/python3.6/encodings/aliases.py -dracut_install /usr/lib64/python3.6/encodings/utf_8.py -dracut_install /usr/lib64/python3.6/encodings/latin_1.py -dracut_install /usr/lib64/python3.6/encodings/ascii.py -dracut_install /usr/lib64/python3.6/encodings/idna.py -dracut_install /usr/lib64/python3.6/io.py -dracut_install /usr/lib64/python3.6/abc.py -dracut_install /usr/lib64/python3.6/_weakrefset.py -dracut_install /usr/lib64/python3.6/weakref.py -dracut_install /usr/lib64/python3.6/site.py -dracut_install /usr/lib64/python3.6/stat.py -dracut_install /usr/lib64/python3.6/posixpath.py -dracut_install /usr/lib64/python3.6/genericpath.py -dracut_install /usr/lib64/python3.6/_collections_abc.py -dracut_install /usr/lib64/python3.6/_sitebuiltins.py -dracut_install /usr/lib64/python3.6/sysconfig.py -dracut_install /usr/lib64/python3.6/_sysconfigdata_m_linux_x86_64-linux-gnu.py -dracut_install /usr/lib64/python3.6/encodings/__init__.py -dracut_install /usr/lib64/python3.6/socket.py -dracut_install /usr/lib64/python3.6/selectors.py +dracut_install /usr/lib/python3.9/site-packages +dracut_install /usr/lib64/python3.9/argparse.py +dracut_install /usr/lib64/python3.9/codecs.py +dracut_install /usr/lib64/python3.9/encodings/aliases.py +dracut_install /usr/lib64/python3.9/encodings/utf_8.py +dracut_install /usr/lib64/python3.9/encodings/latin_1.py +dracut_install /usr/lib64/python3.9/encodings/ascii.py +dracut_install /usr/lib64/python3.9/encodings/idna.py +dracut_install /usr/lib64/python3.9/io.py +dracut_install /usr/lib64/python3.9/abc.py +dracut_install /usr/lib64/python3.9/_weakrefset.py +dracut_install /usr/lib64/python3.9/weakref.py +dracut_install /usr/lib64/python3.9/site.py +dracut_install /usr/lib64/python3.9/stat.py +dracut_install /usr/lib64/python3.9/posixpath.py +dracut_install /usr/lib64/python3.9/genericpath.py +dracut_install /usr/lib64/python3.9/_collections_abc.py +dracut_install /usr/lib64/python3.9/_sitebuiltins.py +dracut_install /usr/lib64/python3.9/sysconfig.py +dracut_install /usr/lib64/python3.9/_sysconfigdata_d_linux_x86_64-linux-gnu.py +dracut_install /usr/lib64/python3.9/encodings/__init__.py +dracut_install /usr/lib64/python3.9/socket.py +dracut_install /usr/lib64/python3.9/selectors.py dracut_install /usr/share/locale/locale.alias -dracut_install /usr/lib64/python3.6/collections/__init__.py -dracut_install /usr/lib64/python3.6/operator.py -dracut_install /usr/lib64/python3.6/keyword.py -dracut_install /usr/lib64/python3.6/heapq.py -dracut_install /usr/lib64/python3.6/reprlib.py -dracut_install /usr/lib64/python3.6/enum.py -dracut_install /usr/lib64/python3.6/types.py -dracut_install /usr/lib64/python3.6/functools.py -dracut_install /usr/lib64/python3.6/collections/abc.py -dracut_install /usr/lib64/python3.6/http/client.py -dracut_install /usr/lib64/python3.6/email/parser.py -dracut_install /usr/lib64/python3.6/email/feedparser.py -dracut_install /usr/lib64/python3.6/re.py -dracut_install /usr/lib64/python3.6/sre_compile.py -dracut_install /usr/lib64/python3.6/sre_parse.py -dracut_install /usr/lib64/python3.6/sre_constants.py -dracut_install /usr/lib64/python3.6/copyreg.py -dracut_install /usr/lib64/python3.6/email/errors.py -dracut_install /usr/lib64/python3.6/email/_policybase.py -dracut_install /usr/lib64/python3.6/email/header.py -dracut_install /usr/lib64/python3.6/email/quoprimime.py -dracut_install /usr/lib64/python3.6/string.py -dracut_install /usr/lib64/python3.6/stringprep.py -dracut_install /usr/lib64/python3.6/email/base64mime.py -dracut_install /usr/lib64/python3.6/base64.py -dracut_install /usr/lib64/python3.6/struct.py -dracut_install /usr/lib64/python3.6/email/charset.py -dracut_install /usr/lib64/python3.6/email/encoders.py -dracut_install /usr/lib64/python3.6/quopri.py -dracut_install /usr/lib64/python3.6/email/utils.py -dracut_install /usr/lib64/python3.6/random.py -dracut_install /usr/lib64/python3.6/warnings.py -dracut_install /usr/lib64/python3.6/hashlib.py -dracut_install /usr/lib64/python3.6/bisect.py -dracut_install /usr/lib64/python3.6/datetime.py -dracut_install /usr/lib64/python3.6/urllib/parse.py -dracut_install /usr/lib64/python3.6/email/_parseaddr.py -dracut_install /usr/lib64/python3.6/calendar.py -dracut_install /usr/lib64/python3.6/locale.py -dracut_install /usr/lib64/python3.6/email/message.py -dracut_install /usr/lib64/python3.6/uu.py -dracut_install /usr/lib64/python3.6/email/_encoded_words.py -dracut_install /usr/lib64/python3.6/email/iterators.py -dracut_install /usr/lib64/python3.6/http/__init__.py -dracut_install /usr/lib64/python3.6/http/cookies.py -dracut_install /usr/lib64/python3.6/argparse.py -dracut_install /usr/lib64/python3.6/copy.py -dracut_install /usr/lib64/python3.6/textwrap.py -dracut_install /usr/lib64/python3.6/gettext.py -dracut_install /usr/lib64/python3.6/subprocess.py -dracut_install /usr/lib64/python3.6/signal.py -dracut_install /usr/lib64/python3.6/threading.py -dracut_install /usr/lib64/python3.6/traceback.py -dracut_install /usr/lib64/python3.6/dummy_threading.py -dracut_install /usr/lib64/python3.6/_dummy_thread.py -dracut_install /usr/lib64/python3.6/linecache.py -dracut_install /usr/lib64/python3.6/tokenize.py -dracut_install /usr/lib64/python3.6/token.py -dracut_install /usr/lib64/python3.6/shlex.py -dracut_install /usr/lib64/python3.6/configparser.py -dracut_install /usr/lib64/python3.6/lib-dynload/readline.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/ctypes/__init__.py -dracut_install /usr/lib64/python3.6/ctypes/_endian.py -dracut_install /usr/lib64/python3.6/ctypes/util.py -dracut_install /usr/lib64/python3.6/ssl.py -dracut_install /usr/lib64/python3.6/ipaddress.py +dracut_install /usr/lib64/python3.9/collections/__init__.py +dracut_install /usr/lib64/python3.9/operator.py +dracut_install /usr/lib64/python3.9/keyword.py +dracut_install /usr/lib64/python3.9/heapq.py +dracut_install /usr/lib64/python3.9/reprlib.py +dracut_install /usr/lib64/python3.9/enum.py +dracut_install /usr/lib64/python3.9/types.py +dracut_install /usr/lib64/python3.9/functools.py +dracut_install /usr/lib64/python3.9/collections/abc.py +dracut_install /usr/lib64/python3.9/http/client.py +dracut_install /usr/lib64/python3.9/email/parser.py +dracut_install /usr/lib64/python3.9/email/feedparser.py +dracut_install /usr/lib64/python3.9/re.py +dracut_install /usr/lib64/python3.9/sre_compile.py +dracut_install /usr/lib64/python3.9/sre_parse.py +dracut_install /usr/lib64/python3.9/sre_constants.py +dracut_install /usr/lib64/python3.9/copyreg.py +dracut_install /usr/lib64/python3.9/email/errors.py +dracut_install /usr/lib64/python3.9/email/_policybase.py +dracut_install /usr/lib64/python3.9/email/header.py +dracut_install /usr/lib64/python3.9/email/quoprimime.py +dracut_install /usr/lib64/python3.9/string.py +dracut_install /usr/lib64/python3.9/stringprep.py +dracut_install /usr/lib64/python3.9/email/base64mime.py +dracut_install /usr/lib64/python3.9/base64.py +dracut_install /usr/lib64/python3.9/struct.py +dracut_install /usr/lib64/python3.9/email/charset.py +dracut_install /usr/lib64/python3.9/email/encoders.py +dracut_install /usr/lib64/python3.9/quopri.py +dracut_install /usr/lib64/python3.9/email/utils.py +dracut_install /usr/lib64/python3.9/random.py +dracut_install /usr/lib64/python3.9/warnings.py +dracut_install /usr/lib64/python3.9/hashlib.py +dracut_install /usr/lib64/python3.9/bisect.py +dracut_install /usr/lib64/python3.9/datetime.py +dracut_install /usr/lib64/python3.9/urllib/parse.py +dracut_install /usr/lib64/python3.9/email/_parseaddr.py +dracut_install /usr/lib64/python3.9/calendar.py +dracut_install /usr/lib64/python3.9/locale.py +dracut_install /usr/lib64/python3.9/email/message.py +dracut_install /usr/lib64/python3.9/uu.py +dracut_install /usr/lib64/python3.9/email/_encoded_words.py +dracut_install /usr/lib64/python3.9/email/iterators.py +dracut_install /usr/lib64/python3.9/http/__init__.py +dracut_install /usr/lib64/python3.9/http/cookies.py +dracut_install /usr/lib64/python3.9/argparse.py +dracut_install /usr/lib64/python3.9/copy.py +dracut_install /usr/lib64/python3.9/textwrap.py +dracut_install /usr/lib64/python3.9/gettext.py +dracut_install /usr/lib64/python3.9/subprocess.py +dracut_install /usr/lib64/python3.9/signal.py +dracut_install /usr/lib64/python3.9/threading.py +dracut_install /usr/lib64/python3.9/traceback.py +dracut_install /usr/lib64/python3.9/linecache.py +dracut_install /usr/lib64/python3.9/tokenize.py +dracut_install /usr/lib64/python3.9/token.py +dracut_install /usr/lib64/python3.9/shlex.py +dracut_install /usr/lib64/python3.9/configparser.py +dracut_install /usr/lib64/python3.9/lib-dynload/readline.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/ctypes/__init__.py +dracut_install /usr/lib64/python3.9/ctypes/_endian.py +dracut_install /usr/lib64/python3.9/ctypes/util.py +dracut_install /usr/lib64/python3.9/ssl.py +dracut_install /usr/lib64/python3.9/ipaddress.py dracut_install /usr/lib/locale/en_US.utf8/LC_ADDRESS dracut_install /usr/lib/locale/en_US.utf8/LC_IDENTIFICATION dracut_install /usr/lib/locale/en_US.utf8/LC_MEASUREMENT @@ -147,78 +144,77 @@ dracut_install /usr/lib/locale/en_US.utf8/LC_CTYPE dracut_install /usr/lib/locale/en_US.utf8/LC_NAME dracut_install /usr/lib/locale/en_US.utf8/LC_NUMERIC dracut_install /usr/lib/locale/en_US.utf8/LC_PAPER -dracut_install /usr/lib64/python3.6/json/__init__.py /usr/lib64/python3.6/json/decoder.py /usr/lib64/python3.6/json/encoder.py /usr/lib64/python3.6/json/scanner.py /usr/lib64/python3.6/json/tool.py /usr/lib64/python3.6/lib-dynload/_json.cpython-36m-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/json/__init__.py /usr/lib64/python3.9/json/decoder.py /usr/lib64/python3.9/json/encoder.py /usr/lib64/python3.9/json/scanner.py /usr/lib64/python3.9/json/tool.py /usr/lib64/python3.9/lib-dynload/_json.cpython-39-x86_64-linux-gnu.so # ansible dependencies -dracut_install /usr/lib64/python3.6/runpy.py -dracut_install /usr/lib64/python3.6/importlib/__init__.py -dracut_install /usr/lib64/python3.6/importlib/_bootstrap.py -dracut_install /usr/lib64/python3.6/importlib/_bootstrap_external.py -dracut_install /usr/lib64/python3.6/importlib/abc.py -dracut_install /usr/lib64/python3.6/importlib/machinery.py -dracut_install /usr/lib64/python3.6/importlib/util.py -dracut_install /usr/lib64/python3.6/contextlib.py -dracut_install /usr/lib64/python3.6/pkgutil.py -dracut_install /usr/lib64/python3.6/shutil.py -dracut_install /usr/lib64/python3.6/fnmatch.py -dracut_install /usr/lib64/python3.6/tempfile.py -dracut_install /usr/lib64/python3.6/zipfile.py -dracut_install /usr/lib64/python3.6/encodings/cp437.py -dracut_install /usr/lib64/python3.6/lib-dynload/zlib.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/grp.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/lib-dynload/array.cpython-36m-x86_64-linux-gnu.so -dracut_install /usr/lib64/python3.6/__future__.py -dracut_install /usr/lib64/python3.6/platform.py -dracut_install /usr/lib64/python3.6/logging/__init__.py -dracut_install /usr/lib64/python3.6/logging/config.py -dracut_install /usr/lib64/python3.6/logging/handlers.py -dracut_install /usr/lib64/python3.6/optparse.py -dracut_install /usr/lib64/python3.6/ast.py -dracut_install /usr/lib64/python3.6/multiprocessing/__init__.py -dracut_install /usr/lib64/python3.6/multiprocessing/connection.py -dracut_install /usr/lib64/python3.6/multiprocessing/context.py -dracut_install /usr/lib64/python3.6/multiprocessing/dummy/__init__.py -dracut_install /usr/lib64/python3.6/multiprocessing/dummy/connection.py -dracut_install /usr/lib64/python3.6/multiprocessing/forkserver.py -dracut_install /usr/lib64/python3.6/multiprocessing/heap.py -dracut_install /usr/lib64/python3.6/multiprocessing/managers.py -dracut_install /usr/lib64/python3.6/multiprocessing/pool.py -dracut_install /usr/lib64/python3.6/multiprocessing/popen_fork.py -dracut_install /usr/lib64/python3.6/multiprocessing/popen_forkserver.py -dracut_install /usr/lib64/python3.6/multiprocessing/popen_spawn_posix.py -dracut_install /usr/lib64/python3.6/multiprocessing/popen_spawn_win32.py -dracut_install /usr/lib64/python3.6/multiprocessing/process.py -dracut_install /usr/lib64/python3.6/multiprocessing/queues.py -dracut_install /usr/lib64/python3.6/multiprocessing/reduction.py -dracut_install /usr/lib64/python3.6/multiprocessing/resource_sharer.py -dracut_install /usr/lib64/python3.6/multiprocessing/semaphore_tracker.py -dracut_install /usr/lib64/python3.6/multiprocessing/sharedctypes.py -dracut_install /usr/lib64/python3.6/multiprocessing/spawn.py -dracut_install /usr/lib64/python3.6/multiprocessing/synchronize.py -dracut_install /usr/lib64/python3.6/multiprocessing/util.py -dracut_install /usr/lib64/python3.6/pickle.py -dracut_install /usr/lib64/python3.6/_compat_pickle.py -dracut_install /usr/lib64/python3.6/queue.py -dracut_install /usr/lib64/python3.6/glob.py -dracut_install /usr/lib64/python3.6/distutils/__init__.py -dracut_install /usr/lib64/python3.6/distutils/archive_util.py -dracut_install /usr/lib64/python3.6/distutils/cmd.py -dracut_install /usr/lib64/python3.6/distutils/config.py -dracut_install /usr/lib64/python3.6/distutils/core.py -dracut_install /usr/lib64/python3.6/distutils/debug.py -dracut_install /usr/lib64/python3.6/distutils/dep_util.py -dracut_install /usr/lib64/python3.6/distutils/dir_util.py -dracut_install /usr/lib64/python3.6/distutils/errors.py -dracut_install /usr/lib64/python3.6/distutils/extension.py -dracut_install /usr/lib64/python3.6/distutils/fancy_getopt.py -dracut_install /usr/lib64/python3.6/distutils/file_util.py -dracut_install /usr/lib64/python3.6/distutils/filelist.py -dracut_install /usr/lib64/python3.6/distutils/log.py -dracut_install /usr/lib64/python3.6/distutils/spawn.py -dracut_install /usr/lib64/python3.6/distutils/sysconfig.py -dracut_install /usr/lib64/python3.6/distutils/text_file.py -dracut_install /usr/lib64/python3.6/distutils/util.py -dracut_install /usr/lib64/python3.6/distutils/version.py -dracut_install /usr/lib64/python3.6/distutils/versionpredicate.py -dracut_install /usr/lib64/python3.6/getpass.py +dracut_install /usr/lib64/python3.9/runpy.py +dracut_install /usr/lib64/python3.9/importlib/__init__.py +dracut_install /usr/lib64/python3.9/importlib/_bootstrap.py +dracut_install /usr/lib64/python3.9/importlib/_bootstrap_external.py +dracut_install /usr/lib64/python3.9/importlib/abc.py +dracut_install /usr/lib64/python3.9/importlib/machinery.py +dracut_install /usr/lib64/python3.9/importlib/util.py +dracut_install /usr/lib64/python3.9/contextlib.py +dracut_install /usr/lib64/python3.9/pkgutil.py +dracut_install /usr/lib64/python3.9/shutil.py +dracut_install /usr/lib64/python3.9/fnmatch.py +dracut_install /usr/lib64/python3.9/tempfile.py +dracut_install /usr/lib64/python3.9/zipfile.py +dracut_install /usr/lib64/python3.9/encodings/cp437.pyc +dracut_install /usr/lib64/python3.9/lib-dynload/zlib.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/grp.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/lib-dynload/array.cpython-39-x86_64-linux-gnu.so +dracut_install /usr/lib64/python3.9/__future__.py +dracut_install /usr/lib64/python3.9/platform.py +dracut_install /usr/lib64/python3.9/logging/__init__.py +dracut_install /usr/lib64/python3.9/logging/config.py +dracut_install /usr/lib64/python3.9/logging/handlers.py +dracut_install /usr/lib64/python3.9/optparse.py +dracut_install /usr/lib64/python3.9/ast.py +dracut_install /usr/lib64/python3.9/multiprocessing/__init__.py +dracut_install /usr/lib64/python3.9/multiprocessing/connection.py +dracut_install /usr/lib64/python3.9/multiprocessing/context.py +dracut_install /usr/lib64/python3.9/multiprocessing/dummy/__init__.py +dracut_install /usr/lib64/python3.9/multiprocessing/dummy/connection.py +dracut_install /usr/lib64/python3.9/multiprocessing/forkserver.py +dracut_install /usr/lib64/python3.9/multiprocessing/heap.py +dracut_install /usr/lib64/python3.9/multiprocessing/managers.py +dracut_install /usr/lib64/python3.9/multiprocessing/pool.py +dracut_install /usr/lib64/python3.9/multiprocessing/popen_fork.py +dracut_install /usr/lib64/python3.9/multiprocessing/popen_forkserver.py +dracut_install /usr/lib64/python3.9/multiprocessing/popen_spawn_posix.py +dracut_install /usr/lib64/python3.9/multiprocessing/popen_spawn_win32.py +dracut_install /usr/lib64/python3.9/multiprocessing/process.py +dracut_install /usr/lib64/python3.9/multiprocessing/queues.py +dracut_install /usr/lib64/python3.9/multiprocessing/reduction.py +dracut_install /usr/lib64/python3.9/multiprocessing/resource_sharer.py +dracut_install /usr/lib64/python3.9/multiprocessing/sharedctypes.py +dracut_install /usr/lib64/python3.9/multiprocessing/spawn.py +dracut_install /usr/lib64/python3.9/multiprocessing/synchronize.py +dracut_install /usr/lib64/python3.9/multiprocessing/util.py +dracut_install /usr/lib64/python3.9/pickle.py +dracut_install /usr/lib64/python3.9/_compat_pickle.py +dracut_install /usr/lib64/python3.9/queue.py +dracut_install /usr/lib64/python3.9/glob.py +dracut_install /usr/lib64/python3.9/distutils/__init__.py +dracut_install /usr/lib64/python3.9/distutils/archive_util.py +dracut_install /usr/lib64/python3.9/distutils/cmd.py +dracut_install /usr/lib64/python3.9/distutils/config.py +dracut_install /usr/lib64/python3.9/distutils/core.py +dracut_install /usr/lib64/python3.9/distutils/debug.py +dracut_install /usr/lib64/python3.9/distutils/dep_util.py +dracut_install /usr/lib64/python3.9/distutils/dir_util.py +dracut_install /usr/lib64/python3.9/distutils/errors.py +dracut_install /usr/lib64/python3.9/distutils/extension.py +dracut_install /usr/lib64/python3.9/distutils/fancy_getopt.py +dracut_install /usr/lib64/python3.9/distutils/file_util.py +dracut_install /usr/lib64/python3.9/distutils/filelist.py +dracut_install /usr/lib64/python3.9/distutils/log.py +dracut_install /usr/lib64/python3.9/distutils/spawn.py +dracut_install /usr/lib64/python3.9/distutils/sysconfig.py +dracut_install /usr/lib64/python3.9/distutils/text_file.py +dracut_install /usr/lib64/python3.9/distutils/util.py +dracut_install /usr/lib64/python3.9/distutils/version.py +dracut_install /usr/lib64/python3.9/distutils/versionpredicate.py +dracut_install /usr/lib64/python3.9/getpass.py dracut_install /usr/libexec/openssh/sftp-server diff --git a/genesis/confluent-genesis.spec b/genesis/confluent-genesis.spec index c1b7d45c..beaeb5cd 100644 --- a/genesis/confluent-genesis.spec +++ b/genesis/confluent-genesis.spec @@ -1,5 +1,5 @@ %define arch x86_64 -Version: 3.7.1 +Version: 3.10.0 Release: 1 Name: confluent-genesis-%{arch} BuildArch: noarch diff --git a/genesis/extracttmuxlicenses.py b/genesis/extracttmuxlicenses.py index 9c10922d..1a6eeba5 100644 --- a/genesis/extracttmuxlicenses.py +++ b/genesis/extracttmuxlicenses.py @@ -1,8 +1,18 @@ import glob +import os yearsbyname = {} namesbylicense = {} filesbylicense = {} -for source in glob.glob('*.c'): +allfiles = glob.glob('*.c') +allfiles.extend(glob.glob('*.y')) +allfiles.extend(glob.glob('compat/*.c')) +foundbin = False +for source in allfiles: # glob.glob('*.c'): + if 'cmd-parse.c' == source: + continue + if not os.path.exists(source.replace('.c', '.o')): + continue + foundbin = True with open(source, 'r') as sourcein: cap = False thelicense = '' @@ -19,13 +29,27 @@ for source in glob.glob('*.c'): line = line[3:] if line.startswith('Author: '): continue + + if line == 'Copyright (c) 1989, 1993\n': + name = 'The Regents of the University of California' + if name not in yearsbyname: + yearsbyname[name] = set([]) + yearsbyname[name].add('1989') + yearsbyname[name].add('1993') + continue if line.startswith('Copyright'): _, _, years, name = line.split(maxsplit=3) - name = name.split('>', 1)[0] + '>' + if '>' in name: + name = name.split('>', 1)[0] + '>' currnames.add(name) if name not in yearsbyname: yearsbyname[name] = set([]) - yearsbyname[name].add(years) + if '-' in years: + strt, end = years.split('-') + for x in range(int(strt), int(end) + 1): + print(str(x)) + else: + yearsbyname[name].add(years) continue thelicense += line if thelicense not in namesbylicense: diff --git a/genesis/getlicenses.py b/genesis/getlicenses.py index a0118c48..e87e2786 100644 --- a/genesis/getlicenses.py +++ b/genesis/getlicenses.py @@ -61,7 +61,7 @@ for lic in sorted(licenses): print(lic) manualrpms = [ 'ipmitool', - 'almalinux-release', + 'centos-stream-release', 'libaio', 'hwdata', 'snmp', @@ -92,7 +92,7 @@ manuallicenses = [ '/usr/share/licenses/bash/NOTICE', '/usr/share/licenses/libsepol/NOTICE', '/usr/share/licenses/perl/COPYING.regexec', # regexec.c - '/usr/share/doc/platform-python/README.rst', + '/usr/share/doc/python3/README.rst', '/usr/share/licenses/lz4/LICENSE', '/usr/share/licenses/lm_sensors/COPYING', '/usr/share/doc/libunistring/README', @@ -111,14 +111,6 @@ manuallicenses = [ '/usr/share/licenses/tmux/NOTICE', # built by extracttmuxlicenses.py '/usr/share/licenses/tmux/COPYING', # extracted from source '/usr/share/licenses/tmux/README', # extracted from source - '/usr/share/licenses/kernel-extra/exceptions/Linux-syscall-note', - '/usr/share/licenses/kernel-extra/other/Apache-2.0', - '/usr/share/licenses/kernel-extra/other/CC-BY-SA-4.0', - '/usr/share/licenses/kernel-extra/other/CDDL-1.0', - '/usr/share/licenses/kernel-extra/other/GPL-1.0', - '/usr/share/licenses/kernel-extra/other/Linux-OpenIB', - '/usr/share/licenses/kernel-extra/other/MPL-1.1', - '/usr/share/licenses/kernel-extra/other/X11', '/usr/share/licenses/kernel-extra/preferred/BSD-2-Clause', '/usr/share/licenses/kernel-extra/preferred/BSD-3-Clause', '/usr/share/licenses/kernel-extra/preferred/BSD-3-Clause-Clear', @@ -126,12 +118,25 @@ manuallicenses = [ '/usr/share/licenses/kernel-extra/preferred/LGPL-2.0', '/usr/share/licenses/kernel-extra/preferred/LGPL-2.1', '/usr/share/licenses/kernel-extra/preferred/MIT', + '/usr/share/licenses/kernel-extra/deprecated/GFDL-1.1', + '/usr/share/licenses/kernel-extra/deprecated/GFDL-1.2', + '/usr/share/licenses/kernel-extra/deprecated/GPL-1.0', + '/usr/share/licenses/kernel-extra/deprecated/ISC', + '/usr/share/licenses/kernel-extra/deprecated/Linux-OpenIB', + '/usr/share/licenses/kernel-extra/deprecated/X11', + '/usr/share/licenses/kernel-extra/deprecated/Zlib', + '/usr/share/licenses/kernel-extra/dual/Apache-2.0', + '/usr/share/licenses/kernel-extra/dual/CC-BY-4.0', + '/usr/share/licenses/kernel-extra/dual/CDDL-1.0', + '/usr/share/licenses/kernel-extra/dual/MPL-1.1', + '/usr/share/licenses/kernel-extra/exceptions/GCC-exception-2.0', + '/usr/share/licenses/kernel-extra/exceptions/Linux-syscall-note', '/usr/share/licenses/util-linux/COPYING.GPLv3', # extract from parse-date.c, from srpm - '/usr/share/licenses/kmod/tools/COPYING', # GPL not LGPL, must extract from kmod srpm + '/usr/share/licenses/kmod/COPYING', # GPL not LGPL, must extract from kmod srpm '/usr/share/licenses/krb5-libs/NOTICE', # copy it verbatim from LICENSE, exact same file '/usr/share/doc/less/README', - '/usr/share/almalinux-release/EULA', - '/usr/share/doc/almalinux-release/GPL', + '/usr/share/centos-release/EULA', + #'/usr/share/doc/almalinux-release/GPL', '/usr/share/licenses/libcap-ng-utils/COPYING', '/usr/share/licenses/libdb/copyright', # from libdb, db-5.3.28, lang/sql/odbc/debian/copyright '/usr/share/licenses/libgcrypt/LICENSES.ppc-aes-gcm', # libgcrypt license to carry forward @@ -140,6 +145,7 @@ manuallicenses = [ ] for lic in manuallicenses: print(lic) +missinglics = [] for rpm in rpmlist: if not rpm: continue @@ -148,7 +154,9 @@ for rpm in rpmlist: break else: if rpm not in licensesbyrpm: - raise Exception('Unresolved license info for ' + rpm) - print("UH OH: " + rpm) - + missinglics.append(rpm) +if missinglics: + for lic in missinglics: + print("Missing: " + lic) + raise Exception("Missing licenses: " + ','.join(missinglics))