Skip to content

Commit

Permalink
feat: upgrade xfsprogs to the latest version
Browse files Browse the repository at this point in the history
This requires libinih, which in turn depends on meson, etc.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Feb 21, 2022
1 parent 3af05f6 commit 0a3b5e3
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -19,7 +19,7 @@ COMMON_ARGS += --build-arg=https_proxy=$(https_proxy)
empty :=
space = $(empty) $(empty)

TARGETS = ca-certificates cni containerd cryptsetup dosfstools eudev fhs flannel-cni grub ipmitool iptables ipxe kernel kmod libaio libjson-c liblzma libpopt libressl libseccomp linux-firmware lvm2 musl open-iscsi open-isns raspberrypi-firmware runc socat syslinux u-boot util-linux xfsprogs
TARGETS = ca-certificates cni containerd cryptsetup dosfstools eudev fhs flannel-cni grub libinih liburcu ipmitool iptables ipxe kernel kmod libaio libjson-c liblzma libpopt libressl libseccomp linux-firmware lvm2 musl open-iscsi open-isns raspberrypi-firmware runc socat syslinux u-boot util-linux xfsprogs
NONFREE_TARGETS = nonfree-kmod-nvidia

all: $(TARGETS) ## Builds all known pkgs.
Expand Down
51 changes: 51 additions & 0 deletions libinih/pkg.yaml
@@ -0,0 +1,51 @@
name: libinih
variant: scratch
shell: /toolchain/bin/bash
dependencies:
- stage: base
steps:
- sources:
- url: https://github.com/benhoyt/inih/archive/refs/tags/r53.tar.gz
destination: inih.tar.gz
sha256: 01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241
sha512: 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
prepare:
- |
tar -xzf inih.tar.gz --strip-components=1
LD_LIBRARY_PATH=/toolchain/lib pip3 install ninja
meson \
--prefix=/usr \
--libdir=/usr/lib \
--libexecdir=/usr/libexec \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--includedir=/usr/include \
--datadir=/usr/share \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localedir=/usr/share/locale \
--sysconfdir=/etc \
--localstatedir=/var \
--sharedstatedir=/var/lib \
--buildtype=plain \
--auto-features=auto \
--wrap-mode=nodownload \
-Ddefault_library=both \
-Ddistro_install=true \
-Dwith_INIReader=false \
-Dmulti-line_entries=true \
-Dutf-8_bom=true \
-Dinline_comments=true \
-Duse_heap=false \
. output
build:
- |
meson compile -j 1 -C output
install:
- |
DESTDIR="/rootfs" meson install --no-rebuild -C output
finalize:
- from: /rootfs
to: /
25 changes: 25 additions & 0 deletions liburcu/pkg.yaml
@@ -0,0 +1,25 @@
name: liburcu
variant: scratch
shell: /toolchain/bin/bash
dependencies:
- stage: base
steps:
- sources:
- url: https://lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2
destination: liburcu.tar.bz2
sha256: 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083
sha512: c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
prepare:
- |
tar -xjf liburcu.tar.bz2 --strip-components=1
./configure --prefix=/usr
build:
- |
make -j $(nproc)
install:
- |
make DESTDIR=/rootfs install
finalize:
- from: /rootfs
to: /
10 changes: 7 additions & 3 deletions xfsprogs/pkg.yaml
Expand Up @@ -4,12 +4,16 @@ shell: /toolchain/bin/bash
dependencies:
- stage: base
- stage: util-linux
- stage: libinih
- stage: liburcu
steps:
- sources:
- url: https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.9.0.tar.xz
- url: https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.14.2.tar.xz
destination: xfsprogs.tar.xz
sha256: bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1
sha512: 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce
sha256: 01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8
sha512: cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e
env:
DEBUG: "-DNDEBUG"
prepare:
- |
tar -xJf xfsprogs.tar.xz --strip-components=1
Expand Down

0 comments on commit 0a3b5e3

Please sign in to comment.