Merge pull request #5901 from keszybz/mkosi-meson

Convert mkosi instructions to meson
This commit is contained in:
Lennart Poettering 2017-05-07 07:13:13 -04:00 committed by GitHub
commit 51cf831304
4 changed files with 10 additions and 15 deletions

View file

@ -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

View file

@ -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

View file

@ -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
@ -62,8 +61,8 @@ BuildPackages=
libtool
libxkbcommon-devel
libxslt
lz4
lz4-devel
make
pam-devel
pkgconfig
python3-devel

View file

@ -20,11 +20,11 @@
# 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
export LC_CTYPE=C.UTF-8
meson build
ninja -C build all
ninja -C build test
ninja -C build install
mkdir -p $DESTDIR/etc