[Runnix-commits] SF.net SVN: runnix: [49] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 49
          http://svn.sourceforge.net/runnix/?rev=49&view=rev
Author:   krisk84
Date:     2007-04-27 12:41:46 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
runnix actually compiles

Modified Paths:
--------------
    trunk/package/busybox/busybox.mk
    trunk/package/rsync/rsync.mk
    trunk/target/x86/syslinux/syslinux.mk

Added Paths:
-----------
    trunk/package/sed/
    trunk/package/sed/Config.in
    trunk/package/sed/sed.mk
    trunk/package/sed/sedcheck.sh

Modified: trunk/package/busybox/busybox.mk
===================================================================

--- trunk/package/busybox/busybox.mk	2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/package/busybox/busybox.mk	2007-04-27 19:41:46 UTC (rev 49)
@@ -133,11 +133,6 @@
 endif
 	# Just in case
 	-rm $(TARGET_DIR)/linuxrc
-	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/addgroup
-	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/adduser
-	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/delgroup
-	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/deluser
-	ln -sf ../sbin/astwrap $(TARGET_DIR)/usr/bin/passwd
 
 $(INITRD_DIR)/bin/busybox: $(BUSYBOX_DIR)-initrd/busybox
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \

Modified: trunk/package/rsync/rsync.mk
===================================================================
--- trunk/package/rsync/rsync.mk	2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/package/rsync/rsync.mk	2007-04-27 19:41:46 UTC (rev 49)
@@ -3,7 +3,7 @@
 # rsync
 #
 #############################################################
-RSYNC_VER:=2.6.8
+RSYNC_VER:=2.6.9
 RSYNC_SOURCE:=rsync-$(RSYNC_VER).tar.gz
 RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/
 RSYNC_DIR:=$(BUILD_DIR)/rsync-$(RSYNC_VER)

Added: trunk/package/sed/Config.in
===================================================================
--- trunk/package/sed/Config.in	                        (rev 0)
+++ trunk/package/sed/Config.in	2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SED
+	bool "sed"
+	default n
+	help
+	  Super-useful stream editor.
+
+	  http://sed.sourceforge.net/
+
+	  Most people will answer Y.

Added: trunk/package/sed/sed.mk
===================================================================
--- trunk/package/sed/sed.mk	                        (rev 0)
+++ trunk/package/sed/sed.mk	2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,158 @@
+#############################################################
+#
+# sed
+#
+#############################################################
+SED_VER:=4.1.4
+SED_SOURCE:=sed-$(SED_VER).tar.gz
+SED_SITE:=ftp://ftp.gnu.org/gnu/sed
+SED_CAT:=zcat
+SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER)
+SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER)
+SED_BINARY:=sed/sed
+SED_TARGET_BINARY:=bin/sed
+ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
+endif
+#HOST_SED_DIR:=$(STAGING_DIR)
+HOST_SED_DIR:=$(TOOL_BUILD_DIR)
+SED:=$(HOST_SED_DIR)/bin/sed -i -e
+HOST_SED_TARGET=$(shell package/sed/sedcheck.sh)
+
+$(DL_DIR)/$(SED_SOURCE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
+
+sed-source: $(DL_DIR)/$(SED_SOURCE)
+
+
+#############################################################
+#
+# build sed for use on the host system
+#
+#############################################################
+$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	mkdir -p $(HOST_SED_DIR)/bin;
+	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(SED_DIR1)/.unpacked
+
+$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
+	(cd $(SED_DIR1); rm -rf config.cache; \
+		./configure \
+		--prefix=$(HOST_SED_DIR) \
+		--prefix=/usr \
+	);
+	touch $(SED_DIR1)/.configured
+
+$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
+	$(MAKE) -C $(SED_DIR1)
+
+# This stuff is needed to work around GNU make deficiencies
+build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
+	@if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ] ; then \
+		rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi;
+	@if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
+	-ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+	    set -x; \
+	    mkdir -p $(HOST_SED_DIR)/bin; \
+	    $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
+	    mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
+	    rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \
+		    $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
+
+use-sed-host-binary:
+	@if [ -x /usr/bin/sed ] ; then \
+		SED="/usr/bin/sed" ; \
+	else \
+		if [ -x /bin/sed ] ; then \
+			SED="/bin/sed" ; \
+		fi \
+	fi ; \
+	if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
+		mkdir -p "$(HOST_SED_DIR)/bin"; \
+		rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
+		ln -sf "$$SED" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
+	fi
+
+host-sed: $(HOST_SED_TARGET)
+
+ifeq ($(HOST_SED_TARGET),build-sed-host-binary)
+host-sed-clean:
+	$(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) uninstall
+	-$(MAKE) -C $(SED_DIR1) clean
+
+host-sed-dirclean:
+	rm -rf $(SED_DIR1)
+
+else
+host-sed-clean host-sed-dirclean:
+
+endif
+
+#############################################################
+#
+# build sed for use on the target system
+#
+#############################################################
+$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(SED_DIR2)/.unpacked
+
+$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
+	(cd $(SED_DIR2); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="$(SED_CFLAGS)" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		$(DISABLE_NLS) \
+	);
+	touch $(SED_DIR2)/.configured
+
+$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
+
+# This stuff is needed to work around GNU make deficiencies
+sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
+	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
+		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi;
+
+	@if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
+	-ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
+	    set -x; \
+	    $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
+	    mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
+	    rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		    $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
+
+sed: uclibc sed-target_binary
+
+sed-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall
+	-$(MAKE) -C $(SED_DIR2) clean
+
+sed-dirclean:
+	rm -rf $(SED_DIR2)
+
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SED)),y)
+TARGETS+=sed
+endif

Added: trunk/package/sed/sedcheck.sh
===================================================================
--- trunk/package/sed/sedcheck.sh	                        (rev 0)
+++ trunk/package/sed/sedcheck.sh	2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ -x /usr/bin/sed ]; then 
+    SED="/usr/bin/sed";
+else
+    if [ -x /bin/sed ]; then 
+	SED="/bin/sed";
+    fi;
+fi;
+
+echo "HELLO" > .sedtest
+$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
+
+if [ $? != 0 ] ; then
+	echo build-sed-host-binary
+else
+	echo use-sed-host-binary
+fi;
+rm -f .sedtest
+
+


Property changes on: trunk/package/sed/sedcheck.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/target/x86/syslinux/syslinux.mk
===================================================================
--- trunk/target/x86/syslinux/syslinux.mk	2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/target/x86/syslinux/syslinux.mk	2007-04-27 19:41:46 UTC (rev 49)
@@ -1,25 +1,23 @@
-ifeq ($(ARCH),i386)
 #############################################################
 #
 # syslinux to make target msdos/iso9660 filesystems bootable
 #
 #############################################################
 
-SYSLINUX_DIR=$(TOOL_BUILD_DIR)/syslinux-3.11
-SYSLINUX_SOURCE=syslinux-3.11.tar.bz2
+SYSLINUX_DIR=$(BUILD_DIR)/syslinux-3.35
+SYSLINUX_SOURCE=syslinux-3.35.tar.bz2
 SYSLINUX_SITE=http://www.kernel.org/pub/linux/utils/boot/syslinux/
 
 $(DL_DIR)/$(SYSLINUX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE)
 
-$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE)
-	bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
+	bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	touch -c $(SYSLINUX_DIR)/Makefile
 
 $(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile
-	$(MAKE) -C $(SYSLINUX_DIR)
+	$(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR)
 	touch -c $(SYSLINUX_DIR)/isolinux.bin
-	ln -s $(SYSLINUX_DIR) $(TOOL_BUILD_DIR)/syslinux
 
 syslinux: $(SYSLINUX_DIR)/isolinux.bin
 
@@ -29,8 +27,6 @@
 syslinux-dirclean:
 	rm -rf $(SYSLINUX_DIR)
 
-endif
-
 #############################################################
 #
 # Toplevel Makefile options


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


