diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2009-08-27 23:03:10 +0200 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2009-08-27 23:03:10 +0200 |
| commit | 267d245731cc6244de88bbe0289304234852d4cd (patch) | |
| tree | e943271b645d2b57fe7f92d5d4aa941adef5359e | |
| parent | 811b78c7273deadc86f7c1e8cc7b94741cd574cc (diff) | |
| parent | 5fbd288fe99b4e8e329a0af71cd2dab395f978f3 (diff) | |
| -rw-r--r-- | detail/main.makefile | 9 | ||||
| -rw-r--r-- | dxo-init | 2 | ||||
| -rwxr-xr-x | dxo-wip-make | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/detail/main.makefile b/detail/main.makefile index 053d284..aa26ff6 100644 --- a/detail/main.makefile +++ b/detail/main.makefile @@ -81,16 +81,17 @@ clean: $(patsubst %,repos/%.clean,$(AUTOCONF_DIRS)) build: $(DIRTARGETS) build_piglit build_piglit: - @make -j8 -C piglit/repo all + @make -C piglit/repo all kernel: - cd repos/kernel && CONCURRENCY_LEVEL=10 fakeroot make-kpkg --initrd --append-to-version=-custom kernel_image kernel_headers ke + cd repos/kernel && CONCURRENCY_LEVEL=1 fakeroot make-kpkg --initrd --append-to-version=-custom kernel_image kernel_headers + %.dir: @echo @echo "=======================================" @echo "Building and installing: $*" @echo "=======================================" - @make -j8 -C repos/$* install + @make -C repos/$* install @echo "=======================================" @echo @@ -99,5 +100,5 @@ pull: @cd repos; ${DXO_SCRIPTS}/detail/git_xorg.sh deadlights: - @cp repos/*.deb prefix/kernel + @find repos -name \*.deb -exec cp {} prefix/kernel \; @rsync -acR --stats --progress -e ssh prefix piglit/repo deadlights:/home/prefect/dev/xorg/ @@ -20,7 +20,7 @@ DXO_SCRIPTS=${DXO_PATH}/dxo ACLOCAL="aclocal -I ${DXO_PREFIX}/share/aclocal/" PKG_CONFIG_PATH=${DXO_PREFIX}/lib/pkgconfig PATH=/usr/lib/ccache:${DXO_SCRIPTS}:${PATH} -CCACHE_PREFIX=distcc +#CCACHE_PREFIX=distcc export ACLOCAL export CCACHE_PREFIX diff --git a/dxo-wip-make b/dxo-wip-make index ea71cfa..f0267f9 100755 --- a/dxo-wip-make +++ b/dxo-wip-make @@ -3,4 +3,12 @@ # Compiles the current project, makes a Work-in-Progress commit and upload # to deadlights -make -j10 install && git commit -a -m "WIP" && dxo-make deadlights +descr="$*" + +if [ "$descr" != "" ]; then + descr="WIP: $descr" +else + descr="WIP" +fi + +make -s && make -s install && git commit -a -m "$descr" && dxo-make deadlights |