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

[<dha...@us...>]

Revision: 1625
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1625&view=rev
Author:   dhartman
Date:     2008-03-06 06:48:30 -0800 (Thu, 06 Mar 2008)

Log Message:
-----------
apply a few fixes from Philip

Modified Paths:
--------------
    trunk/package/busybox/busybox.mk
    trunk/target/generic/target_skeleton/usr/sbin/genkd
    trunk/target/x86/runnix/runnix.mk

Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk	2008-03-06 05:05:38 UTC (rev 1624)
+++ trunk/package/busybox/busybox.mk	2008-03-06 14:48:30 UTC (rev 1625)
@@ -63,16 +63,16 @@
 		$(BUSYBOX_DIR)/.config ;
 endif
 ifeq ($(BR2_LARGEFILE),y)
-	$(SED) "s/^.*CONFIG_LFS=.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_LFS[ =].*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
 else
-	$(SED) "s/^.*CONFIG_LFS=.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_LFS[ =].*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
 	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
 endif
 ifeq ($(strip $(BR2_PACKAGE_VIM)),y)
-	$(SED) "s/^.*CONFIG_VI=.*/CONFIG_VI=n/" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_VI[ =].*/CONFIG_VI=n/" $(BUSYBOX_DIR)/.config
 endif
 ifeq ($(strip $(BR2_PACKAGE_WGET)),y)
-	$(SED) "s/^.*CONFIG_WGET=.*/CONFIG_WGET=n/" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_WGET[ =].*/CONFIG_WGET=n/" $(BUSYBOX_DIR)/.config
 endif
 ifeq ($(strip $(BR2_PACKAGE_MODULE_INIT_TOOLS)),y)
 	$(SED) "s/^.*(CONFIG_(INSMOD|RMMOD|LSMOD|MODPROBE))=.*/\1=n/" \
@@ -95,10 +95,10 @@
 		$(BUSYBOX_DIR)-initrd/.config ;
 endif
 ifeq ($(BR2_LARGEFILE),y)
-	$(SED) "s/^.*CONFIG_LFS=.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)-initrd/.config
+	$(SED) "s/^.*CONFIG_LFS[ =].*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)-initrd/.config
 else
-	$(SED) "s/^.*CONFIG_LFS=.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)-initrd/.config
-	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS=.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)-initrd/.config
+	$(SED) "s/^.*CONFIG_LFS[ =].*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)-initrd/.config
+	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS[ =].*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)-initrd/.config
 endif
 	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 	CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR)-initrd oldconfig

Modified: trunk/target/generic/target_skeleton/usr/sbin/genkd
===================================================================
--- trunk/target/generic/target_skeleton/usr/sbin/genkd	2008-03-06 05:05:38 UTC (rev 1624)
+++ trunk/target/generic/target_skeleton/usr/sbin/genkd	2008-03-06 14:48:30 UTC (rev 1625)
@@ -120,7 +120,7 @@
 
 if [ -d /stat/etc/arno-iptables-firewall ]
 then
-cp -a /stat/etc/arno-iptables-firewall /mnt/kd
+cp -a /stat/etc/arno-iptables-firewall /mnt/kd/
 else
 echo "You haven't installed the arno iptables firewall."
 fi

Modified: trunk/target/x86/runnix/runnix.mk
===================================================================
--- trunk/target/x86/runnix/runnix.mk	2008-03-06 05:05:38 UTC (rev 1624)
+++ trunk/target/x86/runnix/runnix.mk	2008-03-06 14:48:30 UTC (rev 1625)
@@ -8,7 +8,8 @@
 RUNNIX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/runnix
 RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
 RUNNIX_CAT:=zcat
-RUNFS_DIR=$(BUILD_DIR)/runfs
+RUNFS_DIR:=$(BUILD_DIR)/runfs
+RUNFS_CONF:=$(RUNFS_DIR)/os/$(ASTVER).run.conf
 
 $(DL_DIR)/$(RUNNIX_SOURCE):
 	$(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
@@ -34,16 +35,16 @@
 	cp $(ASTVER)/* $(RUNFS_DIR)/os/
 	@echo "Fixing up kernel parameters (astkd/asturw/noram)..."
 	if [ -n "$$ASTKD" ]; then \
-	  $(SED) "s@ astkd=[^ ]* @ astkd=$${ASTKD} @" \
-		$(RUNFS_DIR)/os/$(ASTVER).run.conf ; \
-	elif [ -n "$$ASTURW" ]; then \
-	  $(SED) "s@ astkd=[^ ]* @ asturw=$${ASTURW} @" \
-		$(RUNFS_DIR)/os/$(ASTVER).run.conf ; \
+	  $(SED) "s@ astkd=[^ ]* @ astkd=$${ASTKD} @" $(RUNFS_CONF) ; \
+	else \
+	  $(SED) "s@ astkd=[^ ]* @ @" $(RUNFS_CONF) ; \
 	fi ; \
+	if [ -n "$$ASTURW" ]; then \
+	  $(SED) "s@ astlive @ asturw=$${ASTURW} astlive @" $(RUNFS_CONF) ; \
+	fi ; \
 	megs=`du -s -m rootfs.i586.ext2 | awk '{ print $$1 }'` ; \
 	if [ "$$megs" -gt 90 ]; then \
-	  $(SED) "s@ astlive @ astlive noram @" \
-		$(RUNFS_DIR)/os/$(ASTVER).run.conf ; \
+	  $(SED) "s@ astlive @ astlive noram @" $(RUNFS_CONF) ; \
 	fi
 	rm -f $(RUNFS_DIR)/*.sample
 	cp $(TARGET_RUNNIX_DIR)/syslinux.cfg $(RUNFS_DIR)/syslinux.cfg


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