From 5bb73f7c126b3994419c92b69a14f023092c0876 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Mon, 20 Jan 2014 16:18:46 +0200 Subject: [PATCH] Makefile DEBUG flag for bigroot and debug packages --- Makefile | 4 ++-- build_image.sh | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9fe93de..2dd44bb 100644 --- a/Makefile +++ b/Makefile @@ -78,9 +78,9 @@ build_zfs_send.sh: $(BUILDSEND_MP)/miniroot.gz: $(MINIROOT_DEPS) if test -n "`zfs list -H -t snapshot $(BUILDSEND)/root@fixup 2>/dev/null`"; then \ - VERSION=$(VERSION) ./build_image.sh $(BUILDSEND) fixup ; \ + VERSION=$(VERSION) DEBUG=$(DEBUG) ./build_image.sh $(BUILDSEND) fixup ; \ else \ - VERSION=$(VERSION) ./build_image.sh $(BUILDSEND) begin ; \ + VERSION=$(VERSION) DEBUG=$(DEBUG) ./build_image.sh $(BUILDSEND) begin ; \ fi $(DESTDIR)/var/kayak/kayak/$(VERSION).zfs.bz2: $(BUILDSEND_MP)/kayak_$(VERSION).zfs.bz2 diff --git a/build_image.sh b/build_image.sh index cef4bba..0b84cc3 100755 --- a/build_image.sh +++ b/build_image.sh @@ -132,7 +132,7 @@ SYSTEM="system/boot/grub system/boot/real-mode system/boot/wanboot/internal system/prerequisite/gnu system/storage/luxadm system/storage/fibre-channel/port-utility" -#DEBUG="developer/debug/mdb system/dtrace developer/dtrace" +DEBUG_PKGS="developer/debug/mdb system/dtrace developer/dtrace" DRIVERS="driver/audio driver/crypto/dca driver/crypto/tpm driver/firewire driver/graphics/agpgart driver/graphics/atiatom driver/graphics/drm @@ -171,9 +171,12 @@ PARTS="release/name release/notices service/picl install/beadm SUNWcs SUNWcsd library/libidn shell/pipe-viewer text/less /network/ssh editor/vim developer/linker file/gnu-coreutils" -PKGS="$PARTS $SYSTEM $DRIVERS $DEBUG" +PKGS="$PARTS $SYSTEM $DRIVERS" -BIGROOT= +if [ -n "$DEBUG" ]; then + PKGS="$PKGS $DEBUG_PKGS" + BIGROOT=1 +fi CULL="perl python package/pkg snmp" RMRF="/var/pkg /usr/share/man /usr/lib/python2.6 /usr/lib/iconv" -- 2.11.4.GIT