Skip to content

Commit 4af4b45

Browse files
authored
Merge pull request #1446 from flatcar/krnowak/sys-automation
Put sys-* packages under automation
2 parents 9b63891 + 9cc998d commit 4af4b45

File tree

78 files changed

+2385
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2385
-1182
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ app-text/build-docbook-catalog
126126
app-text/docbook-xml-dtd
127127
app-text/docbook-xsl-ns-stylesheets
128128
app-text/docbook-xsl-stylesheets
129+
app-text/mandoc
129130
app-text/manpager
130131
app-text/sgml-common
131132

@@ -455,6 +456,9 @@ sys-block/open-isns
455456
sys-block/parted
456457
sys-block/thin-provisioning-tools
457458

459+
sys-boot/efibootmgr
460+
sys-boot/gnu-efi
461+
458462
sys-devel/autoconf
459463
sys-devel/autoconf-archive
460464
sys-devel/autoconf-wrapper
@@ -490,11 +494,14 @@ sys-fs/lsscsi
490494
sys-fs/mtools
491495
sys-fs/multipath-tools
492496
sys-fs/quota
497+
sys-fs/squashfs-tools
493498
sys-fs/xfsprogs
494499

500+
sys-kernel/installkernel-gentoo
495501
sys-kernel/linux-headers
496502

497503
sys-libs/binutils-libs
504+
sys-libs/efivar
498505
sys-libs/gdbm
499506
sys-libs/ldb
500507
sys-libs/libcap
@@ -503,13 +510,17 @@ sys-libs/libnvme
503510
sys-libs/libseccomp
504511
sys-libs/libselinux
505512
sys-libs/libsepol
513+
sys-libs/libunwind
514+
sys-libs/liburing
506515
sys-libs/ncurses
507516
sys-libs/readline
508517
sys-libs/talloc
509518
sys-libs/tdb
510519
sys-libs/tevent
511520
sys-libs/zlib
512521

522+
sys-power/acpid
523+
513524
sys-process/lsof
514525
sys-process/procps
515526
sys-process/psmisc
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- acpid ([2.0.34](https://sourceforge.net/p/acpid2/code/ci/2.0.34/tree/Changelog))
2+
- efibootmgr ([18](https://github.com/rhboot/efibootmgr/releases/tag/18))
3+
- efivar ([38](https://github.com/rhboot/efivar/releases/tag/38))
4+
- ipvsadm ([1.31](https://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git/tag/?h=v1.31) (includes [1.28](https://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git/tag/?h=v1.28), [1.29](https://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git/tag/?h=v1.29) and [1.30](https://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git/tag/?h=v1.30)))
5+
- libunwind ([1.7.2](https://github.com/libunwind/libunwind/releases/tag/v1.7.2) (includes [1.7.0](https://github.com/libunwind/libunwind/releases/tag/v1.7.0)))
6+
- liburing ([2.3](https://github.com/axboe/liburing/blob/liburing-2.3/CHANGELOG))
7+
- squashfs-tools ([4.6.1](https://github.com/plougher/squashfs-tools/releases/tag/4.6.1) (includes [4.6](https://github.com/plougher/squashfs-tools/releases/tag/4.6)))

sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ DEPEND="
2525
app-eselect/eselect-python
2626
app-misc/jq
2727
app-shells/bash-completion
28+
app-text/mandoc
2829
coreos-base/hard-host-depends
2930
coreos-base/coreos-sb-keys
3031
coreos-devel/fero-client

sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-cluster/ipvsadm

Lines changed: 0 additions & 4 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From ca48d3964d26f5e3b38d73655f19b1836b16bd2d Mon Sep 17 00:00:00 2001
2+
From: Alexander Kanavin <alex@linutronix.de>
3+
Date: Tue, 18 Jan 2022 11:53:41 +0100
4+
Subject: [PATCH] src/Makefile: build util.c separately for makeguids
5+
6+
util.c needs to be built twice when cross-compiling:
7+
for the build machine to be able to link with
8+
makeguids which then runs during the same build,
9+
and then for the actual target.
10+
11+
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12+
---
13+
src/Makefile | 5 ++++-
14+
1 file changed, 4 insertions(+), 1 deletion(-)
15+
16+
diff --git a/src/Makefile b/src/Makefile
17+
index 0e423c4..a86abdc 100644
18+
--- a/src/Makefile
19+
+++ b/src/Makefile
20+
@@ -27,10 +27,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(pa
21+
EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c
22+
EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES)))
23+
GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c
24+
-MAKEGUIDS_SOURCES = makeguids.c util.c
25+
+MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c
26+
MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES)))
27+
MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES)
28+
29+
+util-makeguids.c : util.c
30+
+ cp util.c util-makeguids.c
31+
+
32+
ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \
33+
$(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \
34+
$(sort $(wildcard include/efivar/*.h))
35+
--
36+
2.34.1
37+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
The `0001-src-Makefile-build-util.c-separately-for-makeguids.patch`
2+
patch fixes a cross-compilation issue. We will ask Gentoo to include
3+
this patch too in their ebuild. Currently there is no release of
4+
efivar that has this patch.

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
=sys-apps/smartmontools-7.4 ~arm64
8383
=sys-block/thin-provisioning-tools-1.0.6 ~amd64
8484

85-
# Needed to force enable ipvsadm for arm64.
86-
=sys-cluster/ipvsadm-1.27-r1 **
85+
# Enable ipvsadm for arm64.
86+
=sys-cluster/ipvsadm-1.31-r1 ~arm64
8787

8888
# Keep versions on both arches in sync.
8989
=sys-firmware/edk2-aarch64-18.02 **
@@ -98,9 +98,6 @@
9898
# fixes.
9999
=sys-libs/readline-8.2_p1 ~amd64 ~arm64
100100

101-
# ?
102-
=sys-power/acpid-2.0.33 ~amd64 ~arm64
103-
104101
# Needed to fix CVE-2023-4016.
105102
=sys-process/procps-4.0.4 ~amd64 ~arm64
106103

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DIST ipvsadm-1.31.tar.xz 42396 BLAKE2B a42ceea834fb16e25ea34417227f6b632fe3b94c8a7ce5d3daff4375884fd47f14999551eab3bf7226d5eb02f25aef4c77a8287592b642946683bc5ddc6783da SHA512 1c7187405771e702eff0009d688fa697375b833a486ff88b41a4a0dcfaa3e9884c7e3bc34375efea5f6a2d025847c9fac9fd6ba694ec3bf2fc9d357eef2cb631

0 commit comments

Comments
 (0)