mirror of
https://linux.maple.camp/git/ahill/maplelinux-bootstrap.git
synced 2026-02-11 10:13:35 +00:00
Built util-linux
This commit is contained in:
@@ -32,4 +32,4 @@ Maple Linux uses a slightly different filesystem hierarchy compared to most Linu
|
|||||||
- `/boot` - This is the mount point for the EFI System Partition
|
- `/boot` - This is the mount point for the EFI System Partition
|
||||||
- `/lib` - This is the canonical location for all system-level libraries. Paths such as `/usr/lib` and `/usr/libexec` should be considered legacy.
|
- `/lib` - This is the canonical location for all system-level libraries. Paths such as `/usr/lib` and `/usr/libexec` should be considered legacy.
|
||||||
|
|
||||||
Many of alternative paths are symlinked for compatibility's sake.
|
Many alternate/deprecated paths are symlinked for compatibility's sake.
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
| GNU tar | Free Software Foundation, Inc. | GNU General Public License version 3 | Copyleft |
|
| GNU tar | Free Software Foundation, Inc. | GNU General Public License version 3 | Copyleft |
|
||||||
| tinyramfs | illiliti | GNU General Public License version 3 | Copyleft |
|
| tinyramfs | illiliti | GNU General Public License version 3 | Copyleft |
|
||||||
| tinytoml | Fourier Transformer | MIT License | Free |
|
| tinytoml | Fourier Transformer | MIT License | Free |
|
||||||
|
| util-linux | Various | GNU General Public License version 2 | Copyleft |
|
||||||
| xz | Various | Mostly BSD 0-Clause License | Slightly Copyleft |
|
| xz | Various | Mostly BSD 0-Clause License | Slightly Copyleft |
|
||||||
| Zlib | Jean-loup Gailly and Mark Adler | Zlib License | Free |
|
| Zlib | Jean-loup Gailly and Mark Adler | Zlib License | Free |
|
||||||
| Zsh | The Zsh development group | Mostly MIT License (Modern Variant) | Slightly Copyleft |
|
| Zsh | The Zsh development group | Mostly MIT License (Modern Variant) | Slightly Copyleft |
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ Definitions:
|
|||||||
| `tar` | Yes | Yes |
|
| `tar` | Yes | Yes |
|
||||||
| `tinyramfs` | Yes | Yes |
|
| `tinyramfs` | Yes | Yes |
|
||||||
| `tinytoml` | Yes | Yes |
|
| `tinytoml` | Yes | Yes |
|
||||||
|
| `util-linux` | Yes | Yes |
|
||||||
| `xlibre-xserver` |
|
| `xlibre-xserver` |
|
||||||
| `xz` | Yes | Yes |
|
| `xz` | Yes | Yes |
|
||||||
| `zlib` | Yes | Yes |
|
| `zlib` | Yes | Yes |
|
||||||
|
|||||||
20
sources/util-linux/util-linux-byacc.patch
Normal file
20
sources/util-linux/util-linux-byacc.patch
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
--- vanilla/meson.build 2025-12-15 07:50:01.000000000 -0500
|
||||||
|
+++ maple/meson.build 2026-02-06 21:58:53.463319033 -0500
|
||||||
|
@@ -952,7 +952,7 @@
|
||||||
|
have = get_option('use-tty-group')
|
||||||
|
conf.set('USE_TTY_GROUP', have ? 1 : false)
|
||||||
|
|
||||||
|
-bison = find_program('bison')
|
||||||
|
+bison = find_program('byacc')
|
||||||
|
flex = find_program('flex')
|
||||||
|
sed = find_program('sed')
|
||||||
|
|
||||||
|
@@ -960,7 +960,7 @@
|
||||||
|
bison_gen = generator(
|
||||||
|
bison,
|
||||||
|
output : ['@BASENAME@.tab.c', '@BASENAME@.tab.h'],
|
||||||
|
- arguments : ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@'])
|
||||||
|
+ arguments : ['--defines', '@OUTPUT1@', '--output', '@OUTPUT0@', '@INPUT@'])
|
||||||
|
|
||||||
|
python_program = find_program('python3', 'python', native : true)
|
||||||
|
|
||||||
34
sources/util-linux/util-linux.spec
Normal file
34
sources/util-linux/util-linux.spec
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
# Maintainer: Alexander Hill <ahill@breadpudding.dev>
|
||||||
|
SRC_HASH="25dc2fd70c6b6bec1c0c97cb11636edd2d5b2645df2324eef4820db3677bd412"
|
||||||
|
SRC_NAME="util-linux"
|
||||||
|
SRC_URL="https://github.com/util-linux/util-linux/archive/refs/tags/v2.41.3.tar.gz"
|
||||||
|
SRC_VERSION="2.41.3"
|
||||||
|
|
||||||
|
SRC_FILENAME="util-linux-$SRC_VERSION.tar.gz"
|
||||||
|
SRC_PATCHES="
|
||||||
|
64867fc3cd34263137f8db91839fad44f0096f76602a4281b3e542e344ae97cc util-linux-byacc.patch
|
||||||
|
"
|
||||||
|
|
||||||
|
build() {
|
||||||
|
tar xf ../$SRC_FILENAME
|
||||||
|
cd util-linux-$SRC_VERSION/
|
||||||
|
# NOTE: util-linux is hard-coded to use bison, so we need to patch the build
|
||||||
|
# script to use byacc. In addition to the difference in name, byacc
|
||||||
|
# has slightly different arguments, resulting in an error later on in
|
||||||
|
# the build. Because of this, the command line arguments are patched
|
||||||
|
# as well. ~ahill
|
||||||
|
patch -p1 < ../util-linux-byacc.patch
|
||||||
|
# NOTE: I'm not sure why, but muon doesn't seem to be able to build libfdisk
|
||||||
|
# and libmount, so they are disabled for now. ~ahill
|
||||||
|
# NOTE: libsmartcols appears to rely on some bison-specific behavior that
|
||||||
|
# byacc seems to lack, so we aren't able to build the software at this
|
||||||
|
# time. ~ahill
|
||||||
|
muon setup $TT_MESON_COMMON \
|
||||||
|
-Dbuild-libfdisk=disabled \
|
||||||
|
-Dbuild-libmount=disabled \
|
||||||
|
-Dbuild-libsmartcols=disabled \
|
||||||
|
-Dbuild-python=disabled \
|
||||||
|
build
|
||||||
|
muon samu -C build
|
||||||
|
muon -C build install -d $TT_INSTALLDIR
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user