r159 - in buildrom-devel/packages: busybox coreboot-v2 coreboot-v3 coreinfo etherboot filo gpxe grub2 kernel kexec-boot-loader kexec-tools libpayload lzma memtest mkelfimage ofw qemu tint uclibc unifdef utils wireless-tools

Author: ward
Date: 2008-04-24 21:51:11 +0200 (Thu, 24 Apr 2008)
New Revision: 159

Modified:
   buildrom-devel/packages/busybox/busybox.mk
   buildrom-devel/packages/coreboot-v2/coreboot.inc
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
   buildrom-devel/packages/coreinfo/coreinfo.mk
   buildrom-devel/packages/etherboot/etherboot.mk
   buildrom-devel/packages/filo/filo.mk
   buildrom-devel/packages/gpxe/gpxe.mk
   buildrom-devel/packages/grub2/grub2.mk
   buildrom-devel/packages/kernel/kernel.inc
   buildrom-devel/packages/kexec-boot-loader/kexec-boot-loader.mk
   buildrom-devel/packages/kexec-tools/kexec-tools.mk
   buildrom-devel/packages/libpayload/libpayload.mk
   buildrom-devel/packages/lzma/lzma.mk
   buildrom-devel/packages/memtest/memtest.mk
   buildrom-devel/packages/mkelfimage/mkelfimage.mk
   buildrom-devel/packages/ofw/ofw.mk
   buildrom-devel/packages/qemu/qemu.mk
   buildrom-devel/packages/tint/tint.mk
   buildrom-devel/packages/uclibc/uclibc.mk
   buildrom-devel/packages/unifdef/unifdef.mk
   buildrom-devel/packages/utils/nrv2b.mk
   buildrom-devel/packages/wireless-tools/wireless-tools.mk
Log:

Fix the various '-clean' targets so that they don't fail if the source has not
been unpacked. Also includes some cosmetic fixes.

Signed-off-by: Ward Vandewege 
Acked-by: Jordan Crouse

Modified: buildrom-devel/packages/busybox/busybox.mk
===================================================================
--- buildrom-devel/packages/busybox/busybox.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/busybox/busybox.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -66,7 +66,9 @@

busybox-clean:
    @ echo "Cleaning busybox..."
+ifneq ($(wildcard "$(BUSYBOX_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(BUSYBOX_SRC_DIR) clean > /dev/null 2>&1
+endif

busybox-distclean:
    @ rm -rf $(BUSYBOX_DIR)/*

Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc
===================================================================
--- buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-04-24 19:51:11 UTC (rev 159)
@@ -109,9 +109,9 @@
 generic-coreboot-clean:
    @ echo "Cleaning coreboot..."
    @ rm -f $(CBV2_PAYLOAD_TARGET)
-	@ if [ -d $(CBV2_BUILD_DIR) ];then \
-	$(MAKE) -C $(CBV2_BUILD_DIR) clean > /dev/null 2>&1; \
-	fi	
+ifneq ($(wildcard "$(CBV2_BUILD_DIR)/Makefile"),)
+	$(MAKE) -C $(CBV2_BUILD_DIR) clean > /dev/null 2>&1;
+endif
    @ rm -f $(CBV2_OUTPUT)

generic-coreboot-distclean:

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -90,7 +90,9 @@

coreboot-v3-clean:
    @ echo "Cleaning coreboot v3..."
+ifneq ($(wildcard "$(CBV3_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(CBV3_SRC_DIR) clean > /dev/null 2>&1
+endif

coreboot-v3-distclean:
    @ rm -rf $(CBV3_DIR)/*

Modified: buildrom-devel/packages/coreinfo/coreinfo.mk
===================================================================
--- buildrom-devel/packages/coreinfo/coreinfo.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/coreinfo/coreinfo.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -50,7 +50,9 @@

coreinfo-clean:
    @ echo "Cleaning coreinfo..."
+ifneq ($(wildcard "$(COREINFO_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(COREINFO_SRC_DIR) clean > /dev/null 2>&1
+endif
    @ rm -f $(COREINFO_STAMP_DIR)/.installed

coreinfo-distclean:

Modified: buildrom-devel/packages/etherboot/etherboot.mk
===================================================================
--- buildrom-devel/packages/etherboot/etherboot.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/etherboot/etherboot.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -57,7 +57,9 @@

etherboot-clean:
    @ echo "Cleaning etherboot..."
+ifneq ($(wildcard "$(ETHERBOOT_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(ETHERBOOT_SRC_DIR) clean > /dev/null 2>&1
+endif

etherboot-distclean:
    @ rm -rf $(ETHERBOOT_DIR)/*

Modified: buildrom-devel/packages/filo/filo.mk
===================================================================
--- buildrom-devel/packages/filo/filo.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/filo/filo.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -66,7 +66,9 @@

filo-clean:
    @ echo "Cleaning filo..."
+ifneq ($(wildcard "$(FILO_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(FILO_SRC_DIR) clean > /dev/null 2>&1
+endif
    @ rm -f $(FILO_STAMP_DIR)/.copied

filo-distclean:

Modified: buildrom-devel/packages/gpxe/gpxe.mk
===================================================================
--- buildrom-devel/packages/gpxe/gpxe.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/gpxe/gpxe.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -66,7 +66,9 @@

gpxe-clean:
    @ echo "Cleaning GPXE..."
+ifneq ($(wildcard "$(GPXE_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(GPXE_SRC_DIR) clean > /dev/null 2>&1
+endif

gpxe-distclean:
    @ rm -rf $(GPXE_DIR)/*

Modified: buildrom-devel/packages/grub2/grub2.mk
===================================================================
--- buildrom-devel/packages/grub2/grub2.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/grub2/grub2.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -69,9 +69,9 @@
    @ rm -f $(GRUB2_DIR)/grub2.elf
    @ rm -f $(GRUB2_STAMP_DIR)/.copied
    @ rm -f $(GRUB2_STAMP_DIR)/.installed
-	@ if [ -f $(GRUB2_SRC_DIR)/Makefile ]; then \
-		make -C $(GRUB2_SRC_DIR) clean > /dev/null 2>&1; \
-	fi
+ifneq ($(wildcard "$(GRUB_SRC_DIR)/Makefile"),)
+	@ $(MAKE) -C $(GRUB2_SRC_DIR) clean > /dev/null 2>&1; \
+endif

grub2-distclean:
    @ rm -rf $(GRUB2_DIR)/*

Modified: buildrom-devel/packages/kernel/kernel.inc
===================================================================
--- buildrom-devel/packages/kernel/kernel.inc	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/kernel/kernel.inc	2008-04-24 19:51:11 UTC (rev 159)
@@ -88,9 +88,9 @@

generic-kernel-clean:
    @ echo "Cleaning kernel..."
-	@ if [ -d $(KERNEL_SRC_DIR) ]; then \
-	$(MAKE) -C $(KERNEL_SRC_DIR) clean > /dev/null 2>&1; \
-	fi
+ifneq ($(wildcard "$(KERNEL_SRC_DIR)/Makefile"),)
+	$(MAKE) -C $(KERNEL_SRC_DIR) clean > /dev/null 2>&1;
+endif

generic-kernel-distclean:
    @ rm -rf $(KERNEL_DIR)

Modified: buildrom-devel/packages/kexec-boot-loader/kexec-boot-loader.mk
===================================================================
--- buildrom-devel/packages/kexec-boot-loader/kexec-boot-loader.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/kexec-boot-loader/kexec-boot-loader.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -56,7 +56,9 @@

kexec-boot-loader-clean:
    @ echo "Cleaning kexec-boot-loader..."
+ifneq ($(wildcard "$(KBL_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(KBL_SRC_DIR) clean > /dev/null 2>&1
+endif

kexec-boot-loader-distclean:
    @ rm -rf $(KBL_DIR)/*

Modified: buildrom-devel/packages/kexec-tools/kexec-tools.mk
===================================================================
--- buildrom-devel/packages/kexec-tools/kexec-tools.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/kexec-tools/kexec-tools.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -32,7 +32,9 @@
 kexec-tools: $(KEXEC_STAMP_DIR) $(INITRD_DIR)/sbin/kexec-tools

kexec-tools-clean:
+ifneq ($(wildcard "$(KEXEC_SRC_DIR)/Makefile"),)
    $(MAKE) -C $(KEXEC_SRC_DIR) clean
+endif
    rm -f $(KEXEC_SRC_DIR)/.config

kexec-tools-distclean:

Modified: buildrom-devel/packages/libpayload/libpayload.mk
===================================================================
--- buildrom-devel/packages/libpayload/libpayload.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/libpayload/libpayload.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -65,7 +65,9 @@

libpayload-clean:
    @ echo "Cleaning libpayload..."
+ifneq ($(wildcard "$(LIBPAYLOAD_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(LIBPAYLOAD_SRC_DIR) clean > /dev/null 2>&1
+endif
    @ rm -f $(LIBPAYLOAD_STAMP_DIR)/.installed

libpayload-distclean:

Modified: buildrom-devel/packages/lzma/lzma.mk
===================================================================
--- buildrom-devel/packages/lzma/lzma.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/lzma/lzma.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -40,7 +40,9 @@

lzma-clean:
    @ echo "Cleaning lzma..."
+ifneq ($(wildcard "$(LZMA_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(LZMA_SRC_DIR)/C/7zip/Compress/LZMA_Alone -f makefile.gcc clean > /dev/null 2>&1
+endif

lzma-distclean:
    @ rm -rf $(LZMA_DIR)/*

Modified: buildrom-devel/packages/memtest/memtest.mk
===================================================================
--- buildrom-devel/packages/memtest/memtest.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/memtest/memtest.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -47,7 +47,9 @@

memtest-clean:
    @ echo "Cleaning memtest..."
+ifneq ($(wildcard "$(MEMTEST_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(MEMTEST_SRC_DIR) clean > /dev/null 2>&1
+endif

memtest-distclean:
    @ rm -rf $(MEMTEST_DIR)/*

Modified: buildrom-devel/packages/mkelfimage/mkelfimage.mk
===================================================================
--- buildrom-devel/packages/mkelfimage/mkelfimage.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/mkelfimage/mkelfimage.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -51,7 +51,9 @@
 mkelfimage: $(STAGING_DIR)/sbin/mkelfImage

mkelfimage-clean:
+ifneq ($(wildcard "$(MKELFIMAGE_SRC_DIR)/Makefile"),)
    $(MAKE) -C $(MKELFIMAGE_SRC_DIR) clean 
+endif

mkelfimage-distclean:
    @ rm -rf $(MKELFIMAGE_DIR)/*

Modified: buildrom-devel/packages/ofw/ofw.mk
===================================================================
--- buildrom-devel/packages/ofw/ofw.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/ofw/ofw.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -52,7 +52,9 @@

ofw-clean:
    @ echo "Cleaning Openfirmware..."
+ifneq ($(wildcard "$(OFW_BUILD_DIR)/Makefile"),)
    @ $(MAKE) -C $(OFW_BUILD_DIR) clean > /dev/null 2>&1
+endif

ofw-distclean:
    @ rm -rf $(OFW_DIR)/*

Modified: buildrom-devel/packages/qemu/qemu.mk
===================================================================
--- buildrom-devel/packages/qemu/qemu.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/qemu/qemu.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -45,7 +45,9 @@
 qemu: $(QEMU_STAMP_DIR) $(QEMU_LOG_DIR) $(QEMU_SRC_DIR)/i386-softmmu/qemu

qemu-clean:
+ifneq ($(wildcard "$(QEMU_SRC_DIR)/Makefile"),)
    $(MAKE) -C $(QEMU_SRC_DIR) clean 
+endif

qemu-distclean:
    @ rm -rf $(QEMU_DIR)/*

Modified: buildrom-devel/packages/tint/tint.mk
===================================================================
--- buildrom-devel/packages/tint/tint.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/tint/tint.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -46,9 +46,9 @@

tint-clean:
    @ echo "Cleaning TINT..."
-	@ if [ -d $(TINT_SRC_DIR) ]; then \
-		make -C $(TINT_SRC_DIR) clean; \
-	fi
+ifneq ($(wildcard "$(TINT_SRC_DIR)/Makefile"),)
+	@ $(MAKE) -C $(TINT_SRC_DIR) clean; \
+endif
    @ rm -f $(TINT_STAMP_DIR)/.copied

tint-distclean:

Modified: buildrom-devel/packages/uclibc/uclibc.mk
===================================================================
--- buildrom-devel/packages/uclibc/uclibc.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/uclibc/uclibc.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -80,7 +80,9 @@

uclibc-clean:
    @ echo "Cleaning uclibc..."
+ifneq ($(wildcard "$(UCLIBC_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(UCLIBC_SRC_DIR) clean > /dev/null 2>&1
+endif

uclibc-distclean:
    @ rm -rf $(UCLIBC_DIR)/*

Modified: buildrom-devel/packages/unifdef/unifdef.mk
===================================================================
--- buildrom-devel/packages/unifdef/unifdef.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/unifdef/unifdef.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -38,7 +38,9 @@
 unifdef: $(STAGING_DIR)/host/bin/unifdef

unifdef-clean:
+ifneq ($(wildcard "$(UNIFDEF_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(UNIFDEF_SRC_DIR) clean > /dev/null 2>&1
+endif

unifdef-distclean:
    @ rm -rf $(UNIFDEF_DIR)/*

Modified: buildrom-devel/packages/utils/nrv2b.mk
===================================================================
--- buildrom-devel/packages/utils/nrv2b.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/utils/nrv2b.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -16,7 +16,7 @@
 endif

$(SOURCE_DIR)/$(NRV2B_TARBALL):
-	mkdir -p $(SOURCE_DIR)/nrv2b
+	@ mkdir -p $(SOURCE_DIR)/nrv2b
    @ $(BIN_DIR)/fetchsvn.sh $(NRV2B_URL) $(SOURCE_DIR)/nrv2b \
    $(NRV2B_TAG) $@ > $(NRV2B_FETCH_LOG) 2>&1

@@ -40,7 +40,9 @@

nrv2b-clean:
    @ echo "Cleaning nrv2b..."
+ifneq ($(wildcard "$(NRV2B_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(NRV2B_SRC_DIR) clean > /dev/null 2>&1
+endif

nrv2b-distclean:
    @ rm -rf $(NRV2B_DIR)

Modified: buildrom-devel/packages/wireless-tools/wireless-tools.mk
===================================================================
--- buildrom-devel/packages/wireless-tools/wireless-tools.mk	2008-04-24 18:55:48 UTC (rev 158)
+++ buildrom-devel/packages/wireless-tools/wireless-tools.mk	2008-04-24 19:51:11 UTC (rev 159)
@@ -51,7 +51,9 @@

wireless-tools-clean:
    @ echo "Cleaning wireless-tools..."
+ifneq ($(wildcard "$(WIRELESS_SRC_DIR)/Makefile"),)
    @ $(MAKE) -C $(WIRELESS_SRC_DIR) realclean > /dev/null 2>&1
+endif
    @ rm -f $(WIRELESS_SRC_DIR)/.config

wireless-tools-distclean: