diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md index 4e2d4243cc..849e9f6a80 100644 --- a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md +++ b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md @@ -21,5 +21,5 @@ The Edge Microvisor Toolkit SPEC files originated from a variety of sources with | OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-junit
antlr
aopalliance
apache-commons-beanutils
apache-commons-cli
apache-commons-codec
apache-commons-collections
apache-commons-collections4
apache-commons-compress
apache-commons-daemon
apache-commons-dbcp
apache-commons-digester
apache-commons-httpclient
apache-commons-io
apache-commons-jexl
apache-commons-lang
apache-commons-lang3
apache-commons-logging
apache-commons-net
apache-commons-pool
apache-commons-pool2
apache-commons-validator
apache-commons-vfs2
apache-parent
args4j
atinject
base64coder
bcel
bea-stax
beust-jcommander
bsf
byaccj
cal10n
cdparanoia
cglib
cni
containerized-data-importer
cpulimit
cri-o
ecj
fillup
flux
gd
geronimo-specs
glassfish-annotation-api
gnu-getopt
gnu-regexp
golang-packaging
guava
hamcrest
hawtjni-runtime
httpcomponents-core
influx-cli
influxdb
jakarta-taglibs-standard
jansi
jarjar
java-cup
java-cup-bootstrap
javacc
javacc-bootstrap
javassist
jboss-interceptors-1.2-api
jdepend
jflex
jflex-bootstrap
jlex
jline
jna
jsch
jsoup
jsr-305
jtidy
junit
junitperf
jzlib
kubevirt
kured
libcontainers-common
libtheora
libva
libvdpau
lynx
multus
objectweb-anttask
objectweb-asm
objenesis
oro
osgi-annotation
osgi-compendium
osgi-core
patterns-ceph-containers
plexus-classworlds
plexus-interpolation
plexus-utils
proj
psl-make-dafsa
publicsuffix
qdox
regexp
relaxngDatatype
rhino
ripgrep
servletapi4
servletapi5
shapelib
slf4j
trilead-ssh2
virtiofsd
xalan-j2
xbean
xcursor-themes
xerces-j2
xml-commons-apis
xml-commons-resolver
xmldb-api
xmlrpc-c
xmlunit
xpp2
xpp3
xz-java | | Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd
ethtool
expat
expect
fcgi
file
filesystem
findutils
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.23
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-64k
kernel-headers
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-event
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-pkcs11
tpm2-pytss
tpm2-tools
tpm2-tss
traceroute
tree
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | | RPM software management source | [GPLv2+ License](https://github.com/rpm-software-management/dnf5/blob/main/COPYING.md) | dnf5 | -| Source project | Same as the source project. | python-nocaselist | +| Source project | Same as the source project. | k3s
python-nocaselist
yq | | Sysbench source | [GPLv2+ License](https://github.com/akopytov/sysbench/blob/master/COPYING) | sysbench | diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json index 70bfff5f81..a182799b61 100644 --- a/LICENSES-AND-NOTICES/SPECS/data/licenses.json +++ b/LICENSES-AND-NOTICES/SPECS/data/licenses.json @@ -3200,7 +3200,9 @@ "Source project": { "license": "Same as the source project.", "specs": [ - "python-nocaselist" + "k3s", + "python-nocaselist", + "yq" ] }, "Sysbench source": { diff --git a/SPECS/k3s/flannel.patch b/SPECS/k3s/flannel.patch new file mode 100644 index 0000000000..721ebf7dcc --- /dev/null +++ b/SPECS/k3s/flannel.patch @@ -0,0 +1,66 @@ +# This patch is for the k3s build system to use the flannel package. +--- build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel.go ++++ build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel.go +@@ -16,7 +16,7 @@ + // the data from flannel generated subnet file and then invokes a plugin + // like bridge or ipvlan to do the real work. + +-package main ++package flannel + + import ( + "bufio" +@@ -325,7 +325,7 @@ + return doCmdDel(args, nc) + } + +-func main() { ++func Main() { + fullVer := fmt.Sprintf("CNI Plugin %s version %s (%s/%s) commit %s built on %s", Program, Version, runtime.GOOS, runtime.GOARCH, Commit, buildDate) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, cni.All, fullVer) + } +--- build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_linux.go ++++ build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_linux.go +@@ -16,7 +16,7 @@ + // the data from flannel generated subnet file and then invokes a plugin + // like bridge or ipvlan to do the real work. + +-package main ++package flannel + + import ( + "context" +--- build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_linux_test.go ++++ build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_linux_test.go +@@ -11,7 +11,7 @@ + // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + // See the License for the specific language governing permissions and + // limitations under the License. +-package main ++package flannel + + import ( + "encoding/json" +--- build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_suite_test.go ++++ build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_suite_test.go +@@ -11,7 +11,7 @@ + // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + // See the License for the specific language governing permissions and + // limitations under the License. +-package main ++package flannel + + import ( + . "github.com/onsi/ginkgo/v2" +--- build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_windows.go ++++ build/src/github.com/containernetworking/plugins/plugins/meta/flannel/flannel_windows.go +@@ -16,7 +16,7 @@ + // the data from flannel generated subnet file and then invokes a plugin + // like bridge or ipvlan to do the real work. + +-package main ++package flannel + + import ( + "context" + diff --git a/SPECS/k3s/k3s-build.patch b/SPECS/k3s/k3s-build.patch new file mode 100644 index 0000000000..0a23213e66 --- /dev/null +++ b/SPECS/k3s/k3s-build.patch @@ -0,0 +1,31 @@ +# This patch removes git repo cloning for rancher plugins and flannel cni, they are included as build sources. +--- scripts/build ++++ scripts/build +@@ -57,7 +57,7 @@ + if [ -n "${DEBUG}" ]; then + GCFLAGS="-N -l" + else +- LDFLAGS="-w -s" ++ LDFLAGS="" + fi + + STATIC="" +@@ -159,15 +159,10 @@ + if [ ! -x ${INSTALLBIN}/cni${BINARY_POSTFIX} ]; then + ( + echo Building cni +- TMPDIR=$(mktemp -d) + trap cleanup EXIT +- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins +- git clone --single-branch --depth=1 --branch=$VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR +- cd $WORKDIR +- rm -rf plugins/meta/flannel +- git clone --single-branch --depth=1 --branch=$VERSION_FLANNEL_PLUGIN https://github.com/flannel-io/cni-plugin.git plugins/meta/flannel +- sed -i 's/package main/package flannel/; s/func main/func Main/' plugins/meta/flannel/*.go +- GO111MODULE=off GOPATH=$TMPDIR CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -gcflags="all=${GCFLAGS}" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o $INSTALLBIN/cni${BINARY_POSTFIX} ++ BUILD_PATH=$(realpath build) ++ cd build/src/github.com/containernetworking/plugins ++ GO111MODULE=off GOPATH=$BUILD_PATH CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -gcflags="all=${GCFLAGS}" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o $INSTALLBIN/cni${BINARY_POSTFIX} + ) + fi + diff --git a/SPECS/k3s/k3s-package-cli.patch b/SPECS/k3s/k3s-package-cli.patch new file mode 100644 index 0000000000..9a70091e3b --- /dev/null +++ b/SPECS/k3s/k3s-package-cli.patch @@ -0,0 +1,11 @@ +# This patch removes the -w -s flags from the LDFLAGS in package-cli, as they are not needed for the k3s build. +--- scripts/package-cli ++++ scripts/package-cli +@@ -75,7 +75,6 @@ + LDFLAGS=" + -X github.com/k3s-io/k3s/pkg/version.Version=$VERSION + -X github.com/k3s-io/k3s/pkg/version.GitCommit=${COMMIT:0:8} +- -w -s + " + TAGS="urfave_cli_no_docs" + STATIC="-extldflags '-static'" diff --git a/SPECS/k3s/k3s.signatures.json b/SPECS/k3s/k3s.signatures.json new file mode 100644 index 0000000000..65fab0fb5d --- /dev/null +++ b/SPECS/k3s/k3s.signatures.json @@ -0,0 +1,14 @@ +{ + "Signatures": { + "k3s-v1.32.4.tar.gz": "69ae56c0edb0390f9e98b7b93955f4e066165bf9800b9ce41ed489e8410f9ce6", + "k3s-airgap-images-v1.32.4.tar.zst": "2c27bf09b90459947dff497ca5028adefa8f8f3d2ae96a3164c11b8a5ed3bb86", + "k3s-vendor-v1.32.4.tar.gz": "23957cf399b52515d3bd06b2974a016d9fbfb587c737d2dc9a7f194834083c7e", + "k3s-root-amd64.tar": "70d40a9a2ccdbf084b70b7421bedb23aad48b122fffbeecdeb589a8696ac1b64", + "runc-v1.2.5.tar.gz": "1ae11980477b789732915dfd7ba4246f5babe5ff76a31021d36365007d9713b0", + "containerd-v2.0.4-k3s2.tar.gz": "c0975e2271a9f10a9d49b8a889206ef464df158f9a3b3809dbdf4f2d1b6c48ac", + "traefik-crd-34.2.1+up34.2.0.tgz": "3f5d2bc3de48539d81c48bb208e4f612417147b403df6ddb634cbbbec29ddb2e", + "traefik-34.2.1+up34.2.0.tgz": "dcff72625d4e9d453a15715c367444536ec2dd147ca43af2246c0acbacf0929a", + "rancher-plugins-v1.6.0-k3s1.tar.gz": "4a1316e5146700d96b574252e6e343f13a55aea73bc009e4da56e24c2bf02f8c", + "flannel-v1.6.0-flannel1.tar.gz": "0e10509115074af3b05d02c01987523bd95aecc3939fc24d86ad7c910eabf3ee" + } +} \ No newline at end of file diff --git a/SPECS/k3s/k3s.spec b/SPECS/k3s/k3s.spec new file mode 100644 index 0000000000..03db8faa22 --- /dev/null +++ b/SPECS/k3s/k3s.spec @@ -0,0 +1,87 @@ +Name: k3s +Summary: K3s - Lightweight Kubernetes +Version: 1.32.4 +Release: 1%{?dist} +License: ASL 2.0 +Vendor: Intel Corporation +Distribution: Edge Microvisor Toolkit +Group: System Environment/Base +URL: https://k3s.io/ +Source0: https://github.com/k3s-io/k3s/archive/refs/tags/v%{version}+k3s1.tar.gz#/%{name}-v%{version}.tar.gz +Source1: https://github.com/k3s-io/k3s/releases/download/v%{version}+k3s1/k3s-airgap-images-amd64.tar.zst#/%{name}-airgap-images-v%{version}.tar.zst +Source2: %{name}-vendor-v%{version}.tar.gz +Source3: https://github.com/k3s-io/k3s-root/releases/download/v0.14.1/k3s-root-amd64.tar +Source4: https://github.com/opencontainers/runc/archive/refs/tags/v1.2.5.tar.gz#/runc-v1.2.5.tar.gz +Source5: https://github.com/k3s-io/containerd/archive/refs/tags/v2.0.4-k3s2.tar.gz#/containerd-v2.0.4-k3s2.tar.gz +Source6: https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz +Source7: https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz +Source8: https://github.com/rancher/plugins/archive/refs/tags/v1.6.0-k3s1.tar.gz#/rancher-plugins-v1.6.0-k3s1.tar.gz +Source9: https://github.com/flannel-io/cni-plugin/archive/refs/tags/v1.6.0-flannel1.tar.gz#/flannel-v1.6.0-flannel1.tar.gz +Patch0: k3s-build.patch +Patch1: k3s-package-cli.patch +Patch2: flannel.patch +BuildRequires: yq +BuildRequires: golang +BuildRequires: libseccomp-devel + +%description +K3s - Lightweight Kubernetes %{version} + +%prep +%setup -n %{name}-%{version}-k3s1 +mkdir -p build/src/github.com/opencontainers/runc build/src/github.com/containerd/containerd build/static/charts build/src/github.com/containernetworking/plugins bin dist +tar -xf %{SOURCE2} --no-same-owner +tar -xf %{SOURCE3} --no-same-owner +tar -xf %{SOURCE4} --no-same-owner --strip-components 1 -C build/src/github.com/opencontainers/runc +tar -xf %{SOURCE5} --no-same-owner --strip-components 1 -C build/src/github.com/containerd/containerd +mv %{SOURCE6} build/static/charts/ +mv %{SOURCE7} build/static/charts/ +tar -xf %{SOURCE8} --no-same-owner --strip-components 1 -C build/src/github.com/containernetworking/plugins +rm -rf build/src/github.com/containernetworking/plugins/plugins/meta/flannel/* +tar -xf %{SOURCE9} --no-same-owner --strip-components 1 -C build/src/github.com/containernetworking/plugins/plugins/meta/flannel +%autopatch -v -p0 + +%build +./scripts/build +./scripts/package-cli + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 0755 dist/artifacts/k3s %{buildroot}%{_bindir} + +mkdir %{buildroot}/opt +install -m 0755 install.sh %{buildroot}/opt/install.sh + +mkdir -p %{buildroot}/var/lib/rancher/k3s/agent/images +install -m 0644 %{SOURCE2} %{buildroot}/var/lib/rancher/k3s/agent/images/k3s-airgap-images-amd64.tar.zst + +%files + %{_bindir}/k3s +/opt/install.sh +/var/lib/rancher/k3s/agent/images/k3s-airgap-images-amd64.tar.zst + +%changelog +* Tue Jun 17 2025 Eoghan Lawless - 1.32.4-1 +- Initial Edge Microvisor Toolkit import from the source project (license: same as "License" tag). + +* Wed Apr 23 2025 Rafael <32229014+rafaelbreno@users.noreply.github.com> - v1.32.4+k3s1 +- Update to v1.32.4 (#12209) + +* Fri Mar 21 2025 Derek Nola - v1.32.3+k3s1 +- [Release-1.32] Fix upgrade test container version (#12000) +- Fix upgrade test container version +- Force docker test cleanup in CI +- Bump skew test deployment times +- Bump skew test timeout + +* Fri Feb 21 2025 Brad Davidson - v1.32.2+k3s1 +- Bump containerd for go-cni deadlock fix + +* Thu Jan 23 2025 Brad Davidson - v1.32.1+k3s1 +- Update tests +- Also add an ordinal to subtests so its easier to figure out which one is failing + +* Tue Jan 7 2025 Hussein Galal - v1.32.0+k3s1 +- Load kernel modules for nft in agent setup (#11527) +- Initial Azure Linux import from the source project (license: same as "License" tag) +- License verified diff --git a/SPECS/yq/yq.signatures.json b/SPECS/yq/yq.signatures.json new file mode 100644 index 0000000000..3b2dcfa138 --- /dev/null +++ b/SPECS/yq/yq.signatures.json @@ -0,0 +1,6 @@ +{ + "Signatures": { + "yq-v4.45.4.tar.gz": "e06b9b219ad885b08cf983a7ce5ff6d946587ab4ffc62de4538655bb50e39111", + "yq-vendor-v4.45.4.tar.gz": "2993042362b513ced2143c6b7842ec6fe421a84f2cd373424f5b5173cd4b0936" + } +} \ No newline at end of file diff --git a/SPECS/yq/yq.spec b/SPECS/yq/yq.spec new file mode 100644 index 0000000000..ecb1234c0c --- /dev/null +++ b/SPECS/yq/yq.spec @@ -0,0 +1,34 @@ +Name: yq +Summary: yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor. +Version: 4.45.4 +Release: 1%{?dist} +License: MIT +Vendor: Intel Corporation +Distribution: Edge Microvisor Toolkit +Group: Applications/System +URL: https://mikefarah.gitbook.io/yq +Source0: https://github.com/mikefarah/yq/archive/refs/tags/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz +Source1: %{name}-vendor-v%{version}.tar.gz +BuildRequires: golang + +%description +yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor. + +%prep +%setup -n %{name}-%{version} +tar -xf %{SOURCE1} --no-same-owner + +%build +go build + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 0755 yq %{buildroot}%{_bindir} + +%files + %{_bindir}/yq + +%changelog +* Sun May 11 2025 Mike Farah - 4.45.4-1 +- Initial Edge Microvisor Toolkit import from the source project (license: same as "License" tag) +- License verified diff --git a/cgmanifest.json b/cgmanifest.json index 626c476d9e..51cf5b50dd 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8356,6 +8356,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "k3s", + "version": "1.32.4", + "downloadUrl": "https://github.com/k3s-io/k3s/archive/refs/tags/v1.32.4+k3s1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -31764,6 +31774,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "yq", + "version": "4.45.4", + "downloadUrl": "https://github.com/mikefarah/yq/archive/refs/tags/v4.45.4.tar.gz" + } + } + }, { "component": { "type": "other", diff --git a/toolkit/imageconfigs/edge-image-dev.json b/toolkit/imageconfigs/edge-image-dev.json index 55084c8c1a..ba64aa3755 100644 --- a/toolkit/imageconfigs/edge-image-dev.json +++ b/toolkit/imageconfigs/edge-image-dev.json @@ -2,7 +2,7 @@ "Disks": [ { "PartitionTableType": "gpt", - "MaxSize": 2248, + "MaxSize": 2548, "Artifacts": [ { "Name": "edge-readonly-dev", @@ -30,14 +30,14 @@ "Name": "rootfs", "ID": "rootfs", "Start": 300, - "End": 1736, + "End": 2036, "FsType": "ext4", "Type": "linux-root-amd64" }, { "Name": "edge_persistent", "ID": "opt", - "Start": 1736, + "Start": 2036, "End": 0, "FsType": "ext4" } @@ -76,7 +76,8 @@ "packagelists/intel-wireless.json", "packagelists/os-ab-update.json", "packagelists/vpro-amt-packages.json", - "packagelists/docker.json" + "packagelists/docker.json", + "packagelists/k3s.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image-rt-dev.json b/toolkit/imageconfigs/edge-image-rt-dev.json index d19e977d4a..78e7048812 100644 --- a/toolkit/imageconfigs/edge-image-rt-dev.json +++ b/toolkit/imageconfigs/edge-image-rt-dev.json @@ -2,7 +2,7 @@ "Disks": [ { "PartitionTableType": "gpt", - "MaxSize": 2248, + "MaxSize": 2548, "Artifacts": [ { "Name": "edge-readonly-rt-dev", @@ -30,14 +30,14 @@ "Name": "rootfs", "ID": "rootfs", "Start": 300, - "End": 1736, + "End": 2036, "FsType": "ext4", "Type": "linux-root-amd64" }, { "Name": "edge_persistent", "ID": "opt", - "Start": 1736, + "Start": 2036, "End": 0, "FsType": "ext4" } @@ -76,7 +76,8 @@ "packagelists/intel-wireless.json", "packagelists/os-ab-update.json", "packagelists/vpro-amt-packages.json", - "packagelists/docker.json" + "packagelists/docker.json", + "packagelists/k3s.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image-rt.json b/toolkit/imageconfigs/edge-image-rt.json index 4f00498194..a5aa6008d8 100644 --- a/toolkit/imageconfigs/edge-image-rt.json +++ b/toolkit/imageconfigs/edge-image-rt.json @@ -2,7 +2,7 @@ "Disks": [ { "PartitionTableType": "gpt", - "MaxSize": 2248, + "MaxSize": 2548, "Artifacts": [ { "Name": "edge-readonly-rt", @@ -30,14 +30,14 @@ "Name": "rootfs", "ID": "rootfs", "Start": 300, - "End": 1736, + "End": 2036, "FsType": "ext4", "Type": "linux-root-amd64" }, { "Name": "edge_persistent", "ID": "opt", - "Start": 1736, + "Start": 2036, "End": 0, "FsType": "ext4" } @@ -76,7 +76,8 @@ "packagelists/intel-wireless.json", "packagelists/os-ab-update.json", "packagelists/vpro-amt-packages.json", - "packagelists/docker.json" + "packagelists/docker.json", + "packagelists/k3s.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image.json b/toolkit/imageconfigs/edge-image.json index 1237fc15dc..b8fe6c499e 100644 --- a/toolkit/imageconfigs/edge-image.json +++ b/toolkit/imageconfigs/edge-image.json @@ -2,7 +2,7 @@ "Disks": [ { "PartitionTableType": "gpt", - "MaxSize": 2248, + "MaxSize": 2548, "Artifacts": [ { "Name": "edge-readonly", @@ -30,14 +30,14 @@ "Name": "rootfs", "ID": "rootfs", "Start": 300, - "End": 1736, + "End": 2036, "FsType": "ext4", "Type": "linux-root-amd64" }, { "Name": "edge_persistent", "ID": "opt", - "Start": 1736, + "Start": 2036, "End": 0, "FsType": "ext4" } @@ -76,7 +76,8 @@ "packagelists/intel-wireless.json", "packagelists/os-ab-update.json", "packagelists/vpro-amt-packages.json", - "packagelists/docker.json" + "packagelists/docker.json", + "packagelists/k3s.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/packagelists/k3s.json b/toolkit/imageconfigs/packagelists/k3s.json new file mode 100644 index 0000000000..743e77fad9 --- /dev/null +++ b/toolkit/imageconfigs/packagelists/k3s.json @@ -0,0 +1,6 @@ +{ + "packages": [ + "k3s" + ], + "_comment": "K3s packages for lightweight Kubernetes deployment." +} diff --git a/toolkit/scripts/spec_source_attributions.py b/toolkit/scripts/spec_source_attributions.py index 6020fc30e8..604b686443 100755 --- a/toolkit/scripts/spec_source_attributions.py +++ b/toolkit/scripts/spec_source_attributions.py @@ -25,7 +25,7 @@ "Photon": r'\n-\s+Initial (Edge Microvisor Toolkit|CBL-Mariner|Azure Linux) import from Photon \(license: Apache2\)(\.|\n|$)', "Sysbench source": r'\n-\s+Initial (Edge Microvisor Toolkit|CBL-Mariner|Azure Linux) import from Sysbench source \(license: GPLv2\+\)(\.|\n|$)', "RPM software management source": r'\n-\s+Initial (Edge Microvisor Toolkit|CBL-Mariner|Azure Linux) import from RPM software management source \(license: GPLv2\+\)(\.|\n|$)', - "Source project": r'\n-\s+Initial Azure Linux import from the source project \(license: same as "License" tag\)(\.|\n|$)', + "Source project": r'\n-\s+Initial (Edge Microvisor Toolkit|Azure Linux) import from the source project \(license: same as "License" tag\)(\.|\n|$)', }