Skip to content

Commit d68a768

Browse files
authored
Merge pull request #455 from piyush-jena/neuron-cert
Default to v4 package verification for neuron kmods and Bump SDK version
2 parents eefaa97 + c18478d commit d68a768

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

Twoliter.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project-vendor = "Bottlerocket"
44

55
[sdk]
66
name = "bottlerocket-sdk"
7-
version = "0.74.0"
7+
version = "0.75.0"
88
vendor = "bottlerocket"
9-
source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.74.0"
10-
digest = "JkyAeKTcFAbrjNJKA9yuKbZcAP8kgv9phwX5jkFbFhk="
9+
source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.75.0"
10+
digest = "7l4qkyh/nqq6Z+tq/4Bwh2EPba8BfsKfVlnnNwclWzM="

Twoliter.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ registry = "public.ecr.aws/bottlerocket"
77

88
[sdk]
99
name = "bottlerocket-sdk"
10-
version = "0.74.0"
10+
version = "0.75.0"
1111
vendor = "bottlerocket"

packages/kmod-6.1-neuron/kmod-6.1-neuron.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Requires: %{name}
5757
tar -xf %{_cross_datadir}/bottlerocket/kernel-devel.tar.xz
5858

5959
rpmkeys --import %{S:3} --dbpath "${PWD}/rpmdb"
60-
rpmkeys --checksig %{S:1} --dbpath "${PWD}/rpmdb"
61-
rpmkeys --checksig %{S:2} --dbpath "${PWD}/rpmdb"
60+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:1} --dbpath "${PWD}/rpmdb"
61+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:2} --dbpath "${PWD}/rpmdb"
6262
rm -rf "${PWD}/rpmdb"
6363

6464
rpm2cpio %{S:1} | cpio -idmu './usr/src/aws-neuronx-*'

packages/kmod-6.12-neuron/kmod-6.12-neuron.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ Requires: %{name}
7070

7171
%prep
7272
rpmkeys --import %{S:6} --dbpath "${PWD}/rpmdb"
73-
rpmkeys --checksig %{S:1} --dbpath "${PWD}/rpmdb"
74-
rpmkeys --checksig %{S:2} --dbpath "${PWD}/rpmdb"
75-
rpmkeys --checksig %{S:3} --dbpath "${PWD}/rpmdb"
76-
rpmkeys --checksig %{S:4} --dbpath "${PWD}/rpmdb"
77-
rpmkeys --checksig %{S:5} --dbpath "${PWD}/rpmdb"
73+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:1} --dbpath "${PWD}/rpmdb"
74+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:2} --dbpath "${PWD}/rpmdb"
75+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:3} --dbpath "${PWD}/rpmdb"
76+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:4} --dbpath "${PWD}/rpmdb"
77+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:5} --dbpath "${PWD}/rpmdb"
7878
rm -rf "${PWD}/rpmdb"
7979

8080
rpm2cpio %{S:1} | cpio -idmu './usr/src/aws-neuronx-*'

packages/kmod-6.18-neuron/kmod-6.18-neuron.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ Requires: %{name}
7979

8080
%prep
8181
rpmkeys --import %{S:9} --dbpath "${PWD}/rpmdb"
82-
rpmkeys --checksig %{S:1} --dbpath "${PWD}/rpmdb"
83-
rpmkeys --checksig %{S:2} --dbpath "${PWD}/rpmdb"
84-
rpmkeys --checksig %{S:3} --dbpath "${PWD}/rpmdb"
85-
rpmkeys --checksig %{S:4} --dbpath "${PWD}/rpmdb"
86-
rpmkeys --checksig %{S:5} --dbpath "${PWD}/rpmdb"
87-
rpmkeys --checksig %{S:6} --dbpath "${PWD}/rpmdb"
88-
rpmkeys --checksig %{S:7} --dbpath "${PWD}/rpmdb"
89-
rpmkeys --checksig %{S:8} --dbpath "${PWD}/rpmdb"
82+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:1} --dbpath "${PWD}/rpmdb"
83+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:2} --dbpath "${PWD}/rpmdb"
84+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:3} --dbpath "${PWD}/rpmdb"
85+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:4} --dbpath "${PWD}/rpmdb"
86+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:5} --dbpath "${PWD}/rpmdb"
87+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:6} --dbpath "${PWD}/rpmdb"
88+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:7} --dbpath "${PWD}/rpmdb"
89+
rpmkeys --define "_pkgverify_flags 0x0" --checksig %{S:8} --dbpath "${PWD}/rpmdb"
9090
rm -rf "${PWD}/rpmdb"
9191

9292
rpm2cpio %{S:1} | cpio -idmu './usr/src/aws-neuronx-*'

0 commit comments

Comments
 (0)