From a463a50df4b56dfa7a27ca5bd60db0a2937de736 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Wed, 20 Nov 2024 17:52:55 +0530 Subject: [PATCH] feat: add e2fsprogs Add e2fsprogs. Part-of: https://github.com/siderolabs/talos/issues/9746 Signed-off-by: Noel Georgi --- .kres.yaml | 1 + Makefile | 3 ++- Pkgfile | 5 +++++ e2fsprogs/pkg.yaml | 47 ++++++++++++++++++++++++++++++++++++++++ reproducibility/pkg.yaml | 1 + 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 e2fsprogs/pkg.yaml diff --git a/.kres.yaml b/.kres.yaml index 5425d0ee..5be510da 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -10,6 +10,7 @@ spec: - containerd - cryptsetup - dosfstools + - e2fsprogs - fhs - flannel-cni - grub diff --git a/Makefile b/Makefile index d6a7d8ae..81c1fde1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-18T15:53:48Z by kres a8af16d. +# Generated on 2024-11-20T04:30:14Z by kres a8af16d. # common variables @@ -53,6 +53,7 @@ TARGETS += cni TARGETS += containerd TARGETS += cryptsetup TARGETS += dosfstools +TARGETS += e2fsprogs TARGETS += fhs TARGETS += flannel-cni TARGETS += grub diff --git a/Pkgfile b/Pkgfile index f2b21eef..bd2c95ee 100644 --- a/Pkgfile +++ b/Pkgfile @@ -31,6 +31,11 @@ vars: drbd_sha256: 016127238d5e0585130ec9558d991347e5360fb3c075283c62ea67f661bcd66b drbd_sha512: 437e50d588b37aece7583eed06236c82931a41ab69f6835853fbeaf05125e4d5e0d1a81f501971e6773f86703d71d604ee3e1f0634faa9a03c3379d8297ed1cc + # renovate: datasource=git-tags depName=git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git + e2fsprogs_version: v1.47.1 + e2fsprogs_sha256: db95ff1cb6ef741c9aa8875d9f3f52a34168360febba765b6377b80bada09a8c + e2fsprogs_sha512: 7e59746e14df9e29034693f415dc4bcbd405217712e2d9e594dcc755bbc1c9f3c4f66ba37e4289b022c337c5aae3d96561c0cd88fa21082ed1017d2a000d3b82 + # renovate: datasource=github-releases extractVersion=^v(?.*)$ depName=systemd/systemd systemd_version: 256.6 systemd_sha256: c085f162dec001407dd32f00abbf20b7e6ed7043dcfaf8ed954787d86707f409 diff --git a/e2fsprogs/pkg.yaml b/e2fsprogs/pkg.yaml new file mode 100644 index 00000000..d9598693 --- /dev/null +++ b/e2fsprogs/pkg.yaml @@ -0,0 +1,47 @@ +name: e2fsprogs +variant: scratch +shell: /toolchain/bin/bash +dependencies: + - stage: base + - stage: util-linux + #- stage: libattr + #- stage: libinih + #- stage: liburcu +steps: + - sources: + - url: https://github.com/tytso/e2fsprogs/archive/refs/tags/{{ .e2fsprogs_version}}.tar.gz + destination: e2fsprogs.tar.gz + sha256: "{{ .e2fsprogs_sha256 }}" + sha512: "{{ .e2fsprogs_sha512 }}" + prepare: + - | + tar xf e2fsprogs.tar.gz --strip-components=1 + + ./configure \ + --prefix=/usr \ + --localstatedir=/run \ + --enable-hardening \ + --enable-elf-shlibs \ + --enable-symlink-install \ + --disable-fsck \ + --disable-uuidd \ + --disable-libuuid \ + --disable-libblkid \ + --disable-nls \ + --disable-fuse2fs + build: + - | + make -j $(nproc) progs + install: + - | + make install DESTDIR=/rootfs-temp + + rm -rf /rootfs-temp/usr/{bin,etc,include,share} + + mkdir -p /rootfs/{sbin,usr/lib} + + cp -r /rootfs-temp/usr/lib /rootfs/usr + cp -r /rootfs-temp/usr/sbin/{e2fsck,fsck.*,mke2fs,mkfs.*,resize2fs,tune2fs} /rootfs/sbin +finalize: + - from: /rootfs + to: / diff --git a/reproducibility/pkg.yaml b/reproducibility/pkg.yaml index c785f4f2..0110e92e 100644 --- a/reproducibility/pkg.yaml +++ b/reproducibility/pkg.yaml @@ -10,6 +10,7 @@ dependencies: - stage: containerd - stage: cryptsetup - stage: dosfstools + - stage: e2fsprogs - stage: fhs - stage: flannel-cni - stage: grub