mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
mkosi: switch build to meson
For Fedora, the version is bumped to 26. In F25, ninja is still called ninja-build (while the package with the rename is going through QA).
This commit is contained in:
parent
a3645cc6dd
commit
6c3444cb03
@ -32,8 +32,6 @@ RootSize=2G
|
||||
Cache=/var/cache/pacman/pkg/
|
||||
BuildPackages=
|
||||
acl
|
||||
autoconf
|
||||
automake
|
||||
bzip2
|
||||
cryptsetup
|
||||
curl
|
||||
@ -58,7 +56,7 @@ BuildPackages=
|
||||
libxkbcommon
|
||||
libxslt
|
||||
lz4
|
||||
make
|
||||
meson
|
||||
pam
|
||||
pkgconfig
|
||||
python
|
||||
|
@ -32,8 +32,6 @@ RootSize=2G
|
||||
[Packages]
|
||||
BuildPackages=
|
||||
acl
|
||||
autoconf
|
||||
automake
|
||||
diffutils
|
||||
docbook-xml
|
||||
docbook-xsl
|
||||
@ -68,7 +66,7 @@ BuildPackages=
|
||||
libsmartcols-dev
|
||||
libtool
|
||||
libxkbcommon-dev
|
||||
make
|
||||
meson
|
||||
pkg-config
|
||||
python3
|
||||
python3-lxml
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
[Distribution]
|
||||
Distribution=fedora
|
||||
Release=25
|
||||
Release=26
|
||||
|
||||
[Output]
|
||||
Format=raw_btrfs
|
||||
@ -32,8 +32,7 @@ RootSize=3G
|
||||
[Packages]
|
||||
BuildPackages=
|
||||
audit-libs-devel
|
||||
autoconf
|
||||
automake
|
||||
meson
|
||||
bzip2-devel
|
||||
cryptsetup-devel
|
||||
dbus-devel
|
||||
@ -63,7 +62,6 @@ BuildPackages=
|
||||
libxkbcommon-devel
|
||||
libxslt
|
||||
lz4-devel
|
||||
make
|
||||
pam-devel
|
||||
pkgconfig
|
||||
python3-devel
|
||||
|
@ -20,11 +20,10 @@
|
||||
# This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
|
||||
# Simply invoke "mkosi" in the project directory to build an OS image.
|
||||
|
||||
./autogen.sh c
|
||||
make -j `nproc`
|
||||
|
||||
make check
|
||||
make install
|
||||
meson build
|
||||
ninja -C build all
|
||||
ninja -C build test
|
||||
ninja -C build install
|
||||
|
||||
mkdir -p $DESTDIR/etc
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user