feat: update releases

``` | Package | Update | Change | |---|---|---| | [containerd/containerd](https://togithub.com/containerd/containerd) | minor | `v1.6.23` -> `v1.7.6` | | git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git | minor | `20230804` -> `20230919` | | git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | patch | `6.1.54` -> `6.1.55` | | git://git.openssl.org/openssl.git | patch | `1_1_1v` -> `3.1.3` | | https://github.com/google/gasket-driver.git | digest | `8aca235` -> `09385d4` | | https://github.com/ipxe/ipxe.git | digest | `9e99a55` -> `8b14652` | | [siderolabs/bldr](https://togithub.com/siderolabs/bldr) | patch | `v0.2.1` -> `v0.2.2` | ``` Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
siderolabs · Sep 26, 2023 · 0c84090 · 0c84090
1 parent 19cdf71
commit 0c84090
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ REGISTRY_AND_USERNAME := $(REGISTRY)/$(USERNAME)
 SOURCE_DATE_EPOCH ?= "1559424892"
 
 # Sync bldr image with Pkgfile
-BLDR_IMAGE := ghcr.io/siderolabs/bldr:v0.2.1
+BLDR_IMAGE := ghcr.io/siderolabs/bldr:v0.2.2
 BLDR ?= docker run --rm --volume $(PWD):/tools --entrypoint=/bldr \
 	$(BLDR_IMAGE) graph --root=/tools
 

diff --git a/Pkgfile b/Pkgfile
@@ -1,20 +1,20 @@
-# syntax = ghcr.io/siderolabs/bldr:v0.2.1
+# syntax = ghcr.io/siderolabs/bldr:v0.2.2
 
 format: v1alpha2
 
 vars:
-  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.6.0-alpha.0-1-gfa388de
+  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.6.0-alpha.0-3-g09023c1
 
   # renovate: datasource=github-releases depName=containernetworking/plugins
   cni_version: v1.3.0
   cni_sha256: f9871b9f6ccb51d2b264532e96521e44f926928f91434b56ce135c95becf2901
   cni_sha512: 87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10
 
   # renovate: datasource=github-tags depName=containerd/containerd
-  containerd_version: v1.6.23
-  containerd_ref: b69f1ad231b6d87eeb30504398075a92d615e83e
-  containerd_sha256: baca7a206e7b48e54c70b5aceafe0109d5b5a31dbc7602626afbbb705442c66f
-  containerd_sha512: 576ab87c07700054918ac8fa8e6c1f1ba971722ac7cad8f3d8ecccdb8cb162103fa826fa815f58f5f63d061b2a8dce8f2fbbee3def85cd4a4f8dbee124d2596a
+  containerd_version: v1.7.6
+  containerd_ref: 091922f03c2762540fd057fba91260237ff86acb
+  containerd_sha256: 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677
+  containerd_sha512: 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git
   cryptsetup_version: 2.6.1
@@ -43,9 +43,9 @@ vars:
   flannel_cni_sha512: cf2eb35bea94c1fe123d9f9871bb83ffe863c8375b10a8cffdb1c289b42296fdbb07fcb1e192ba7ed02930dc1163425883238b62a882836327adca9837438c19
 
   # renovate: datasource=git-refs versioning=git depName=https://github.com/google/gasket-driver.git
-  gasket_driver_ref: 8aca235839fb5ba4d5ef6cfbe783837667e381f1
-  gasket_driver_sha256: 608d465d78f1532c29e910f71e777dbfc845b974ec0162be55af21315de9573f
-  gasket_driver_sha512: f296d23723ac578d3224344a1ac2e8ed0cdecc0e506f507e56f30eb3dd5b77c739e757ce8e195527f4ef45e38f7e589ea0df5f59bc1f519f033c19d374b69e67
+  gasket_driver_ref: 09385d485812088e04a98a6e1227bf92663e0b59
+  gasket_driver_sha256: ccff41f1c344e6f6ff2f1961b580010c316043a6249f5b0572150031e0da0fa2
+  gasket_driver_sha512: 1a8862610acb1246bcb7e86a9516bf3254f2b3a796dddbcc1666e31207bf629214172d049a9171343417442a02b76070bbaa802ee02128a7f9ab7f4a54a04676
 
   # renovate: datasource=git-tags extractVersion=^grub-(?<version>.*)$ depName=git://git.savannah.gnu.org/grub.git
   grub_version: 2.06
@@ -63,14 +63,14 @@ vars:
   iptables_sha512: e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70
 
   # renovate: datasource=git-refs versioning=git depName=https://github.com/ipxe/ipxe.git
-  ipxe_ref: 9e99a55b317f5da66f5110891b154084b337a031
-  ipxe_sha256: 244580fc8ac988b308abf5b6d9be3f2dbfef90a6419b30d4550dff7fdfa342c7
-  ipxe_sha512: 01bf9590ab4d62dcc8d89e71402ef7b97fcf62ffafa89d4ff300128c966d4d9418ead822c70ef7e8bedc707d1d3c1bf5891d6677e21b09fcfb1bfc010538a48f
+  ipxe_ref: 8b14652e506d99499cfbeaed0df07d6a83ec029e
+  ipxe_sha256: 48366ac6ea9f30a9caf90bcc974cbd4a946e49b17361963215d9717ba7c78c69
+  ipxe_sha512: 6a3d1cee4220e8ce4e2fbecc9854ee36753cc6144f8cdce12f81f0d375d792ba906a5920ca242b804f28e93febad9a2ac64197fc9a913e46e7e3a1cfb303ccd5
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.1.54
-  linux_sha256: a3181e46d407cd6ab15f412402e8220684ff9659b0262b7a3de7384405ce4e27
-  linux_sha512: fcdcddd3001be94737a06208be39dce4ba31a51ac3f05ef492bfee1827d18a0d73f9ce3cb1b01a253f148a525cd16fc1278a99d25eeffcdaef8da0b64821b171
+  linux_version: 6.1.55
+  linux_sha256: a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0
+  linux_sha512: 047d98b1aed8201d5d0d29228e6cbc0984cfb7b77e6f5584ad94431c644db8ce099445d63e7f5b6b6fd9b031176bf9448c3c99863273c9e178170af7cbe0d20f
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 30
@@ -113,9 +113,9 @@ vars:
   liburcu_sha512: 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f
 
   # renovate: datasource=git-tags depName=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-  linux_firmware_version: 20230804
-  linux_firmware_sha256: c09913f675bea9623798eebf8b238cda49b62dfa1729cc7c2c17193b0ab22ff7
-  linux_firmware_sha512: 79044fa88887f7cc648ab7f2a77a032cc4f20c21a09ba0e8c1ce2785cafc8eff69517ac21e710100a42d0e5e1a98bda6e357acd3b0edbf56f5e3b944df22d01e
+  linux_firmware_version: 20230919
+  linux_firmware_sha256: 1dac602218f83f2c81dd72e599ae6c926901b3d36babccce46cd84293a37e473
+  linux_firmware_sha512: ad43c233006560f226ecf8d5693506a55573fb00b062103538245cac276168dc130ca4b96ed0372796813c3c48c2be9cd6ba614381f72e79b062cd3ae51da285
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://sourceware.org/git/lvm2.git
   lvm2_version: 2_03_22
@@ -136,10 +136,10 @@ vars:
   nvidia_driver_sha256: 49ed408fc8bad50990fcc094fe3808975edd81490ac3c36be17a987c7cea4ee7
   nvidia_driver_sha512: 23fbaaa671f6f4bd92147c1ec0099cd006efc73297211ffba74d78310c14364de726f84e388c397716c42c854a302948f5bcf9e9bac65ae41f54d34e814cfb60
 
-  # renovate: datasource=git-tags extractVersion=^OpenSSL_(?<version>.*)$ versioning=loose depName=git://git.openssl.org/openssl.git
-  openssl_version: 1_1_1v
-  openssl_sha256: d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
-  openssl_sha512: 1a67340d99026aa62bf50ff89165d9f77fe4a6690fe30d1751b5021dd3f238391afd581b41724687c322c4e3af1770c44a63766a06e9b8cab6425101153e0c7e
+  # renovate: datasource=git-tags extractVersion=^openssl-(?<version>.*)$ depName=git://git.openssl.org/openssl.git
+  openssl_version: 3.1.3
+  openssl_sha256: f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6
+  openssl_sha512: 2388eaa8e99acf1e8af4691a645b9b9af456900c74959e82d4cb02808301e11dcfecc86954a922262b16fa4b664b459894d133ab7d35ec82e1633a33194b7b20
 
   # renovate: datasource=github-tags depName=raspberrypi/firmware
   raspberrypi_firmware_version: 1.20230405

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.54 Kernel Configuration
+# Linux/x86 6.1.55 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1641,8 +1641,6 @@ CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=y
-CONFIG_NET_CLS_RSVP6=y
 CONFIG_NET_CLS_FLOW=y
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=y

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.54 Kernel Configuration
+# Linux/arm64 6.1.55 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1683,8 +1683,6 @@ CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=y
-CONFIG_NET_CLS_RSVP6=y
 CONFIG_NET_CLS_FLOW=y
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=y

diff --git a/openssl/pkg.yaml b/openssl/pkg.yaml
@@ -23,7 +23,7 @@ steps:
           linux-${ARCH} \
           --prefix=/usr \
           --libdir=lib \
-          --openssldir=/etc/ssl1.1 \
+          --openssldir=/etc/ssl3.1 \
           shared \
           no-zlib \
           no-async \
@@ -34,12 +34,11 @@ steps:
           no-ec2m \
           no-sm2 \
           no-sm4 \
-          no-ssl2 \
           no-ssl3 \
           no-seed \
           no-weak-ssl-ciphers
 
-        make -j $(nproc)
+        make -j $(nproc) build_sw
     install:
       - |
         cd openssl