Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[8334] branches/1.0
|
From: <abe...@us...> - 2017-05-24 15:41:27
|
Revision: 8334
http://sourceforge.net/p/astlinux/code/8334
Author: abelbeck
Date: 2017-05-24 15:41:24 +0000 (Wed, 24 May 2017)
Log Message:
-----------
runnix, version bump to 0.5-8326, runnix-0.5 uses a PAE kernel for full RAM support, simplify and modernize build system
Note: For deprecated net5501/alix boards, building custom .run images is fine, though also building corresponding .img images including runnix-0.5 will not boot
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/boot/runnix/Config.in
branches/1.0/boot/runnix/runnix.mk
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/astlinux-ast11.config 2017-05-24 15:41:24 UTC (rev 8334)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8232-dirty Configuration
-# Sat Mar 25 20:00:20 2017
+# Buildroot astlinux-1.x-svn8333-dirty Configuration
+# Wed May 24 10:13:13 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -905,7 +905,6 @@
# BR2_TARGET_GRUB is not set
# BR2_TARGET_SYSLINUX is not set
BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
# BR2_TARGET_UBOOT is not set
#
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/astlinux-ast13.config 2017-05-24 15:41:24 UTC (rev 8334)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8232-dirty Configuration
-# Sat Mar 25 20:00:23 2017
+# Buildroot astlinux-1.x-svn8333-dirty Configuration
+# Wed May 24 10:13:13 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -905,7 +905,6 @@
# BR2_TARGET_GRUB is not set
# BR2_TARGET_SYSLINUX is not set
BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
# BR2_TARGET_UBOOT is not set
#
Modified: branches/1.0/boot/runnix/Config.in
===================================================================
--- branches/1.0/boot/runnix/Config.in 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/boot/runnix/Config.in 2017-05-24 15:41:24 UTC (rev 8334)
@@ -5,12 +5,5 @@
help
The runnix bootloader for x86 systems
- http://www.runnix.org
+ http://www.astlinux-project.org
-config BR2_TARGET_RUNNIX_NDEV
- string "runnix_ndev"
- default ""
- depends on BR2_TARGET_RUNNIX
- help
- Internet to boot from in os/default.conf (usually "eth0").
-
Modified: branches/1.0/boot/runnix/runnix.mk
===================================================================
--- branches/1.0/boot/runnix/runnix.mk 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/boot/runnix/runnix.mk 2017-05-24 15:41:24 UTC (rev 8334)
@@ -3,50 +3,26 @@
# runnix
#
#############################################################
-RUNNIX_VER:=0.4-8057
-RUNNIX_SOURCE:=runnix-$(RUNNIX_VER).tar.gz
-RUNNIX_SITE:=http://mirror.astlinux-project.org/runnix4
-RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
-RUNNIX_CAT:=zcat
-RUNFS_DIR:=$(BUILD_DIR)/runfs
-RUNNIX_NDEV:=$(patsubst "%",%,$(BR2_TARGET_RUNNIX_NDEV))
+RUNNIX_VERSION = 0.5-8326
+RUNNIX_SOURCE = runnix-$(RUNNIX_VERSION).tar.gz
+RUNNIX_SITE = http://mirror.astlinux-project.org/runnix5
-$(DL_DIR)/$(RUNNIX_SOURCE):
- $(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
+RUNFS_DIR = $(BUILD_DIR)/runfs
-$(RUNNIX_DIR)/.unpacked: $(DL_DIR)/$(RUNNIX_SOURCE) | host-fdisk
- $(RUNNIX_CAT) $(DL_DIR)/$(RUNNIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(RUNNIX_DIR)/.unpacked
-
-$(RUNFS_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
+define RUNNIX_RUNFS_EXTRACT
mkdir -p $(RUNFS_DIR)
- cp -af $(RUNNIX_DIR)/rootfs_vfat/* $(RUNFS_DIR)
+ cp -af $(@D)/rootfs_vfat/* $(RUNFS_DIR)
rm -f $(RUNFS_DIR)/*.sample
-ifneq ($(RUNNIX_NDEV),)
- ifneq ($(RUNNIX_NDEV),eth0)
- $(SED) 's/^NDEV="eth[0-9]"$$/NDEV="$(RUNNIX_NDEV)"/' \
- $(RUNFS_DIR)/os/default.conf
- endif
-endif
- touch -c $(RUNFS_DIR)/runnix
+endef
+RUNNIX_POST_EXTRACT_HOOKS += RUNNIX_RUNFS_EXTRACT
-runnix: $(RUNFS_DIR)/runnix
-
-runfs-dirclean:
+define RUNNIX_CLEAN_CMDS
rm -rf $(RUNFS_DIR)
+endef
-runnix-dirclean:
- rm -rf $(RUNNIX_DIR)
+$(eval $(call GENTARGETS,boot,runnix))
runfs: runnix
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_TARGET_RUNNIX)),y)
-TARGETS+=runnix
-endif
-
+runfs-clean: runnix-clean
+runfs-dirclean: runnix-dirclean
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-05-24 15:41:24 UTC (rev 8334)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8232-dirty Configuration
-# Sat Mar 25 20:00:44 2017
+# Buildroot astlinux-1.x-svn8333-dirty Configuration
+# Wed May 24 10:13:14 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -886,7 +886,6 @@
# BR2_TARGET_GRUB is not set
# BR2_TARGET_SYSLINUX is not set
BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
# BR2_TARGET_UBOOT is not set
#
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-05-24 13:54:18 UTC (rev 8333)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-05-24 15:41:24 UTC (rev 8334)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8232-dirty Configuration
-# Sat Mar 25 20:00:47 2017
+# Buildroot astlinux-1.x-svn8333-dirty Configuration
+# Wed May 24 10:13:14 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -886,7 +886,6 @@
# BR2_TARGET_GRUB is not set
# BR2_TARGET_SYSLINUX is not set
BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
# BR2_TARGET_UBOOT is not set
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
