Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

overlay sys-kernel/coreos-firmware: update to 20230625_p20230724 for flatcar-3665 #1039

Merged
merged 2 commits into from
Aug 3, 2023
Merged

overlay sys-kernel/coreos-firmware: update to 20230625_p20230724 for flatcar-3665 #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b00964f
overlay sys-kernel/coreos-firmware: update to 20230625_p20230724
dongsupark Aug 1, 2023
d13ff90
changelog: add security changelog for linux-firmware 20230625_p20230724
dongsupark Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/security/2023-08-01-linux-firmware-20230625_p20230724.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- linux-firmware ([CVE-2023-20593](https://nvd.nist.gov/vuln/detail/CVE-2023-20593))
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST linux-firmware-20230625.tar.xz 280854212 BLAKE2B 8ad8ce864e2a7b7d542569f5171ae0a7d9b05a1d55a04c507dbfb1939a60507ac8275eef24a165814aca8fdf93e6dbf3f7fbeaf25a8f46f022ca47b7b512401d SHA512 0e48aa7f63495485426d37491c7cb61843165625bd47f912c5d83628c6de871759f1a78be3af3d651f7c396bd87dff07e21ba7afc47896c1c143106d5f16d351
DIST linux-firmware-20230625_p20230724.tar.gz 441906566 BLAKE2B 5bed31d9ad78440bb12feeacb1ba27a07ad30b0eb8c7bfd03a4e7a7590012af1f9535a49fbf031abf79dd05ca90be79566f06db6f955910edfdca61281831c67 SHA512 daaf07422eb6f3e1b50f8a5dba5bfff747fe6750c0210ab798745f61d774eef7642ab45b9b404c668cf017d6b7fcf89c34bce9e6c77053b1b81f1a3498c5be18
0 ...-firmware/coreos-firmware-20230625.ebuild → ...coreos-firmware-20230625_p20230724.ebuild
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion ...src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ inherit linux-info savedconfig

# In case this is a real snapshot, fill in commit below.
# For normal, tagged releases, leave blank
MY_COMMIT=
MY_COMMIT="59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c"

if [[ ${PV} == 99999999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
else
if [[ -n "${MY_COMMIT}" ]]; then
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> linux-firmware-${PV}.tar.gz"
S="${WORKDIR}/${MY_COMMIT}"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PV}.tar.xz -> linux-firmware-${PV}.tar.xz"
fi
Expand Down Expand Up @@ -67,6 +68,11 @@ src_unpack() {
git-r3_src_unpack
else
default
# rename directory from git snapshot tarball
if [[ ${#MY_COMMIT} -gt 8 ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why this condition is as it is and not, e.g., -gt 0

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure.
I just want to keep it as similar as possible to Gentoo.
https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-kernel/linux-firmware/linux-firmware-20230625_p20230724.ebuild#n92

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing that strikes me as odd is that GIT_COMMIT does not show up anywhere else. There's MY_COMMIT, but not GIT_COMMIT. Maybe a bug in the ebuild?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing that strikes me as odd is that GIT_COMMIT does not show up anywhere else. There's MY_COMMIT, but not GIT_COMMIT.

Right. I was wondering about that yesterday. 🤷

mv ${MY_COMMIT}/ linux-firmware-${PV} || die
fi

# Upstream linux-firmware tarball does not contain
# symlinks for cxgb4 firmware files, but "modinfo
# cxgb4.ko" shows it requires t?fw.bin files. These
Expand Down
Loading