shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

Merge pull request #6349 from poettering/mkosi-builddir

Browse Source 
mkosi builddir support
This commit is contained in:
Lennart Poettering 2017-07-18 09:46:08 +02:00 committed by GitHub
commit 5230e31918
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -6,6 +6,7 @@
*.log *.log
*.o *.o
*.plist *.plist
*.py[co]
*.stamp *.stamp
*.swp *.swp
*.trs *.trs
@ -39,6 +40,8 @@
/exported-* /exported-*
/hostnamectl /hostnamectl
/image.raw /image.raw
/image.raw.cache-pre-dev
/image.raw.cache-pre-inst
/install-tree /install-tree
/journalctl /journalctl
/libtool /libtool
@ -46,6 +49,8 @@
/localectl /localectl
/loginctl /loginctl
/machinectl /machinectl
/mkosi.builddir/
/mkosi.cache/
/mtd_probe /mtd_probe
/networkctl /networkctl
/scsi_id /scsi_id
@ -182,7 +187,6 @@
/test-daemon /test-daemon
/test-date /test-date
/test-device-nodes /test-device-nodes
/test-dnssec-complex
/test-dhcp-client /test-dhcp-client
/test-dhcp-option /test-dhcp-option
/test-dhcp-server /test-dhcp-server
@ -191,6 +195,7 @@
/test-dns-domain /test-dns-domain
/test-dns-packet /test-dns-packet
/test-dnssec /test-dnssec
/test-dnssec-complex
/test-efi-disk.img /test-efi-disk.img
/test-ellipsize /test-ellipsize
/test-engine /test-engine
@ -252,9 +257,9 @@
/test-ndisc-rs /test-ndisc-rs
/test-netlink /test-netlink
/test-netlink-manual /test-netlink-manual
/test-networkd-conf
/test-network /test-network
/test-network-tables /test-network-tables
/test-networkd-conf
/test-ns /test-ns
/test-nss /test-nss
/test-parse-util /test-parse-util
@ -280,10 +285,10 @@
/test-seccomp /test-seccomp
/test-selinux /test-selinux
/test-set /test-set
/test-sizeof
/test-sigbus /test-sigbus
/test-signal-util /test-signal-util
/test-siphash24 /test-siphash24
/test-sizeof
/test-sleep /test-sleep
/test-socket-util /test-socket-util
/test-stat-util /test-stat-util
@ -316,7 +321,6 @@
/v4l_id /v4l_id
Makefile.in Makefile.in
__pycache__/ __pycache__/
*.py[co]
aclocal.m4 aclocal.m4
config.h config.h
config.h.in config.h.in

16
mkosi.build
View File

@ -20,15 +20,19 @@
# 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.
# If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
# as out-of-tree build dir. Otherwise, let's make up our own builddir.
[ -z "$BUILDDIR" ] && BUILDDIR=build
export LC_CTYPE=C.UTF-8 export LC_CTYPE=C.UTF-8
meson build test -f "$BUILDDIR"/build.ninja || meson "$BUILDDIR"
ninja -C build all ninja -C "$BUILDDIR" all
ninja -C build test ninja -C "$BUILDDIR" test
ninja -C build install ninja -C "$BUILDDIR" install
mkdir -p $DESTDIR/etc mkdir -p "$DESTDIR"/etc
cat > $DESTDIR/etc/issue <<EOF cat > "$DESTDIR"/etc/issue <<EOF
\S (built from systemd tree) \S (built from systemd tree)
Kernel \r on an \m (\l) Kernel \r on an \m (\l)