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/
|
Cache=/var/cache/pacman/pkg/
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
acl
|
acl
|
||||||
autoconf
|
|
||||||
automake
|
|
||||||
bzip2
|
bzip2
|
||||||
cryptsetup
|
cryptsetup
|
||||||
curl
|
curl
|
||||||
|
@ -58,7 +56,7 @@ BuildPackages=
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
libxslt
|
libxslt
|
||||||
lz4
|
lz4
|
||||||
make
|
meson
|
||||||
pam
|
pam
|
||||||
pkgconfig
|
pkgconfig
|
||||||
python
|
python
|
||||||
|
|
|
@ -32,8 +32,6 @@ RootSize=2G
|
||||||
[Packages]
|
[Packages]
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
acl
|
acl
|
||||||
autoconf
|
|
||||||
automake
|
|
||||||
diffutils
|
diffutils
|
||||||
docbook-xml
|
docbook-xml
|
||||||
docbook-xsl
|
docbook-xsl
|
||||||
|
@ -68,7 +66,7 @@ BuildPackages=
|
||||||
libsmartcols-dev
|
libsmartcols-dev
|
||||||
libtool
|
libtool
|
||||||
libxkbcommon-dev
|
libxkbcommon-dev
|
||||||
make
|
meson
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
python3-lxml
|
python3-lxml
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
[Distribution]
|
[Distribution]
|
||||||
Distribution=fedora
|
Distribution=fedora
|
||||||
Release=25
|
Release=26
|
||||||
|
|
||||||
[Output]
|
[Output]
|
||||||
Format=raw_btrfs
|
Format=raw_btrfs
|
||||||
|
@ -32,8 +32,7 @@ RootSize=3G
|
||||||
[Packages]
|
[Packages]
|
||||||
BuildPackages=
|
BuildPackages=
|
||||||
audit-libs-devel
|
audit-libs-devel
|
||||||
autoconf
|
meson
|
||||||
automake
|
|
||||||
bzip2-devel
|
bzip2-devel
|
||||||
cryptsetup-devel
|
cryptsetup-devel
|
||||||
dbus-devel
|
dbus-devel
|
||||||
|
@ -63,7 +62,6 @@ BuildPackages=
|
||||||
libxkbcommon-devel
|
libxkbcommon-devel
|
||||||
libxslt
|
libxslt
|
||||||
lz4-devel
|
lz4-devel
|
||||||
make
|
|
||||||
pam-devel
|
pam-devel
|
||||||
pkgconfig
|
pkgconfig
|
||||||
python3-devel
|
python3-devel
|
||||||
|
|
|
@ -20,11 +20,10 @@
|
||||||
# This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
|
# 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.
|
# Simply invoke "mkosi" in the project directory to build an OS image.
|
||||||
|
|
||||||
./autogen.sh c
|
meson build
|
||||||
make -j `nproc`
|
ninja -C build all
|
||||||
|
ninja -C build test
|
||||||
make check
|
ninja -C build install
|
||||||
make install
|
|
||||||
|
|
||||||
mkdir -p $DESTDIR/etc
|
mkdir -p $DESTDIR/etc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue