Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [928] trunk
|
From: <kr...@us...> - 2007-04-24 18:23:48
|
Revision: 928
http://svn.sourceforge.net/astlinux/?rev=928&view=rev
Author: krisk84
Date: 2007-04-24 11:23:47 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
merge AstLinux release support from s2s branch
Modified Paths:
--------------
trunk/makeimage.sh
trunk/target/device/Gumstix/Makefile.in
trunk/target/device/geni586/Makefile.in
trunk/target/device/net4801/Makefile.in
trunk/target/device/via/Makefile.in
trunk/target/device/wrap/Makefile.in
Added Paths:
-----------
trunk/toolchain/astrelease/
trunk/toolchain/astrelease/astrelease.mk
Removed Paths:
-------------
trunk/toolchain/astrelease/astrelease.mk
Modified: trunk/makeimage.sh
===================================================================
--- trunk/makeimage.sh 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/makeimage.sh 2007-04-24 18:23:47 UTC (rev 928)
@@ -33,9 +33,8 @@
if [ -f disk.img ]
then
-echo "You already have a disk.img"
-echo "You must remove it or move it to continue"
-exit 1
+echo "You already have a disk.img - exiting"
+exit 0
fi
if [ -d /dev/loop ]
Modified: trunk/target/device/Gumstix/Makefile.in
===================================================================
--- trunk/target/device/Gumstix/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/Gumstix/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -1,5 +1,6 @@
# Override the default uClibc configuration
ifeq ($(strip $(BR2_TARGET_GUMSTIX_BASIXCONNEX)),y)
+DEV_PATH=target/device/Gumstix/basix-connex
UCLIBC_CONFIG_FILE:=target/device/Gumstix/basix-connex/uClibc.config
BR2_PACKAGE_BUSYBOX_CONFIG:=target/device/Gumstix/basix-connex/busybox.config
TARGET_SKEL2_DIR=target/device/Gumstix/basix-connex/target_skeleton
Modified: trunk/target/device/geni586/Makefile.in
===================================================================
--- trunk/target/device/geni586/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/geni586/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
GENI586_PATH=target/device/geni586
ifeq ($(strip $(BR2_TARGET_GENI586)),y)
+DEV_PATH=$(GENI586_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(GENI586_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(GENI586_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(GENI586_PATH)/target_skeleton
Modified: trunk/target/device/net4801/Makefile.in
===================================================================
--- trunk/target/device/net4801/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/net4801/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
SOEKRIS_NET4801_PATH=target/device/net4801
ifeq ($(strip $(BR2_TARGET_SOEKRIS_NET4801)),y)
+DEV_PATH=$(SOEKRIS_NET4801_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(SOEKRIS_NET4801_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(SOEKRIS_NET4801_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(SOEKRIS_NET4801_PATH)/target_skeleton
Modified: trunk/target/device/via/Makefile.in
===================================================================
--- trunk/target/device/via/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/via/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
VIA_PATH=target/device/via
ifeq ($(strip $(BR2_TARGET_VIA)),y)
+DEV_PATH=$(VIA_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(VIA_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(VIA_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(VIA_PATH)/target_skeleton
Modified: trunk/target/device/wrap/Makefile.in
===================================================================
--- trunk/target/device/wrap/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/wrap/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -3,6 +3,7 @@
# We no longer use the same config as the net4801
ifeq ($(strip $(BR2_TARGET_PCENGINES_WRAP)),y)
+DEV_PATH=$(PCENGINES_WRAP_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(PCENGINES_WRAP_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(PCENGINES_WRAP_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(PCENGINES_WRAP_PATH)/target_skeleton
Copied: trunk/toolchain/astrelease (from rev 927, branches/s2s/toolchain/astrelease)
Deleted: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- branches/s2s/toolchain/astrelease/astrelease.mk 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-04-24 18:23:47 UTC (rev 928)
@@ -1,46 +0,0 @@
-######################################################################
-#
-# Make a release for AstLinux
-#
-######################################################################
-ASTVER=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
-IMGSIZE=48
-
-disk.img: grub
- sudo ./makeimage.sh $(IMGSIZE)
-
-$(ASTVER).tar.gz: ext2initrd squashfsroot disk.img
- mkdir -p $(ASTVER)
- cp disk.img $(ASTVER)/$(ASTVER).run
- (cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
- touch $(ASTVER)/astflag
- sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
- $(ASTVER)/$(ASTVER).run.conf
-ifneq ($(wildcard $(DEV_PATH)/runnix/initrd.img),)
- cp $(DEV_PATH)/runnix/initrd.img $(ASTVER)/initrd.img
-else
- cp $(INITRD_EXT2_BASE).gz $(ASTVER)/initrd.img
-endif
- tar -cvzf $(ASTVER).tar.gz $(ASTVER)
- touch -c $(ASTVER).tar.gz
-
-$(ASTVER).tar.gz.sha1: $(ASTVER).tar.gz
- sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
- touch -c $(ASTVER).tar.gz.sha1
-
-astrelease: $(ASTVER).tar.gz.sha1
-
-astrelease-source:
-
-astrelease-clean:
- -rm -f $(ASTVER).tar.gz
- -rm -f $(ASTVER).tar.gz.sha1
-
-astrelease-dirclean:
- -rm -rf $(ASTVER)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
Copied: trunk/toolchain/astrelease/astrelease.mk (from rev 927, branches/s2s/toolchain/astrelease/astrelease.mk)
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk (rev 0)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-04-24 18:23:47 UTC (rev 928)
@@ -0,0 +1,46 @@
+######################################################################
+#
+# Make a release for AstLinux
+#
+######################################################################
+ASTVER=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
+IMGSIZE=48
+
+disk.img: grub
+ sudo ./makeimage.sh $(IMGSIZE)
+
+$(ASTVER).tar.gz: ext2initrd squashfsroot disk.img
+ mkdir -p $(ASTVER)
+ cp disk.img $(ASTVER)/$(ASTVER).run
+ (cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
+ touch $(ASTVER)/astflag
+ sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
+ $(ASTVER)/$(ASTVER).run.conf
+ifneq ($(wildcard $(DEV_PATH)/runnix/initrd.img),)
+ cp $(DEV_PATH)/runnix/initrd.img $(ASTVER)/initrd.img
+else
+ cp $(INITRD_EXT2_BASE).gz $(ASTVER)/initrd.img
+endif
+ tar -cvzf $(ASTVER).tar.gz $(ASTVER)
+ touch -c $(ASTVER).tar.gz
+
+$(ASTVER).tar.gz.sha1: $(ASTVER).tar.gz
+ sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
+ touch -c $(ASTVER).tar.gz.sha1
+
+astrelease: $(ASTVER).tar.gz.sha1
+
+astrelease-source:
+
+astrelease-clean:
+ -rm -f $(ASTVER).tar.gz
+ -rm -f $(ASTVER).tar.gz.sha1
+
+astrelease-dirclean:
+ -rm -rf $(ASTVER)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
