[Astlinux-commits] SF.net SVN: astlinux: [1007] trunk

[<kr...@us...>]

Revision: 1007
          http://svn.sourceforge.net/astlinux/?rev=1007&view=rev
Author:   krisk84
Date:     2007-05-03 12:12:38 -0700 (Thu, 03 May 2007)

Log Message:
-----------
fixups for runnix/astrelease

Modified Paths:
--------------
    trunk/target/x86/runnix/runnix.mk
    trunk/toolchain/astrelease/astrelease.mk

Modified: trunk/target/x86/runnix/runnix.mk
===================================================================
--- trunk/target/x86/runnix/runnix.mk	2007-05-03 19:02:45 UTC (rev 1006)
+++ trunk/target/x86/runnix/runnix.mk	2007-05-03 19:12:38 UTC (rev 1007)
@@ -8,7 +8,7 @@
 RUNNIX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/runnix
 RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
 RUNNIX_CAT:=zcat
-RUNNIX_TARGET_DIR=$(BUILD_DIR)/runfs
+RUNFS_DIR=$(BUILD_DIR)/runfs
 
 $(DL_DIR)/$(RUNNIX_SOURCE):
 	$(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
@@ -17,19 +17,27 @@
 	$(RUNNIX_CAT) $(DL_DIR)/$(RUNNIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $(RUNNIX_DIR)/.unpacked
 
-$(RUNNIX_TARGET_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
-	mkdir -p $(RUNNIX_TARGET_DIR)
-	cp -a $(RUNNIX_DIR)/rootfs_vfat/* $(RUNNIX_TARGET_DIR)
-	touch -c $(RUNNIX_TARGET_DIR)/runnix
+$(RUNFS_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
+	mkdir -p $(RUNFS_DIR)
+	cp -a $(RUNNIX_DIR)/rootfs_vfat/* $(RUNFS_DIR)
+	touch -c $(RUNFS_DIR)/runnix
 
-runnix: $(RUNNIX_TARGET_DIR)/runnix
+runnix: $(RUNFS_DIR)/runnix
 
-runnix-clean:
-	-rm -rf $(RUNNIX_TARGET_DIR)
+runfs-dirclean:
+	-rm -rf $(RUNFS_DIR)
 
 runnix-dirclean:
 	-rm -rf $(RUNNIX_DIR)
 
+$(RUNFS_DIR)/os/ver:
+	cp $(ASTVER)/* $(RUNFS_DIR)/os/
+	-rm $(RUNFS_DIR)/*.sample
+	cp $(DEV_PATH)/runnix/syslinux.cfg $(RUNFS_DIR)/syslinux.cfg
+	echo $(ASTVER) > $(RUNFS_DIR)/os/ver
+
+runfs: astrelease runnix $(RUNFS_DIR)/os/ver
+
 #############################################################
 #
 # Toplevel Makefile options

Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk	2007-05-03 19:02:45 UTC (rev 1006)
+++ trunk/toolchain/astrelease/astrelease.mk	2007-05-03 19:12:38 UTC (rev 1007)
@@ -24,17 +24,8 @@
 	sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
 	touch -c $(ASTVER).tar.gz.sha1
 
-$(RUNNIX_TARGET_DIR)/os/ver:
-	cp $(ASTVER)/* $(RUNNIX_TARGET_DIR)/os/ 
-	cp $(DEV_PATH)/runnix/syslinux.cfg $(RUNNIX_TARGET_DIR)/syslinux.cfg
-	echo $(ASTVER) > $(RUNNIX_TARGET_DIR)/os/ver
-
 astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
 
-runfs: astrelease runnix $(RUNNIX_TARGET_DIR)/os/ver
-
-astrelease-source:
-
 astrelease-clean:
 	-rm -f $(ASTVER).tar.gz
 	-rm -f $(ASTVER).tar.gz.sha1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.