Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2015-12-04 21:56:05
|
Revision: 7368
http://sourceforge.net/p/astlinux/code/7368
Author: abelbeck
Date: 2015-12-04 21:56:02 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
kernel-reboot, ignore terminating signals and add automatic support to the web interface
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2015-12-04 17:25:25 UTC (rev 7367)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2015-12-04 21:56:02 UTC (rev 7368)
@@ -168,7 +168,7 @@
function systemREBOOT($myself, $result, $setup = FALSE) {
global $global_prefs;
- $count_down_secs = 150;
+ $count_down_secs = 120;
if (($adjust = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) !== '') {
$count_down_secs += (int)$adjust;
@@ -178,8 +178,14 @@
if ($arch === 'net4801' || $arch === 'wrap') {
$count_down_secs += 20;
}
+
+ $cmd = '/sbin/kernel-reboot';
+ if (! is_executable($cmd)) {
+ $cmd = '/sbin/reboot';
+ $count_down_secs += 30;
+ }
- shell('/sbin/reboot -d4 >/dev/null 2>/dev/null &', $status);
+ shell($cmd.' -d4 >/dev/null 2>/dev/null &', $status);
if ($status == 0) {
if ($setup) {
$count_down_secs += 50;
Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot 2015-12-04 17:25:25 UTC (rev 7367)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot 2015-12-04 21:56:02 UTC (rev 7368)
@@ -188,4 +188,7 @@
sleep $DELAY
fi
+# Ignore terminating signals from here on
+trap '' HUP INT TERM
+
do_reboot >/dev/console 2>&1 &
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-08 15:07:14
|
Revision: 7385
http://sourceforge.net/p/astlinux/code/7385
Author: abelbeck
Date: 2015-12-08 15:07:11 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
acpid, version bump to 2.0.25, add K01acpid runlevel
Modified Paths:
--------------
branches/1.0/package/acpid/acpid.init
branches/1.0/package/acpid/acpid.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid
Modified: branches/1.0/package/acpid/acpid.init
===================================================================
--- branches/1.0/package/acpid/acpid.init 2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.init 2015-12-08 15:07:11 UTC (rev 7385)
@@ -10,7 +10,7 @@
start () {
- if [ -x /usr/sbin/acpid -a -f /proc/acpi/event ]; then
+ if [ -x /usr/sbin/acpid -a -e /proc/acpi/event ]; then
echo "Starting acpid..."
/usr/sbin/acpid -p $PIDFILE
Modified: branches/1.0/package/acpid/acpid.mk
===================================================================
--- branches/1.0/package/acpid/acpid.mk 2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.mk 2015-12-08 15:07:11 UTC (rev 7385)
@@ -4,16 +4,26 @@
#
#############################################################
-ACPID_VERSION = 2.0.23
+ACPID_VERSION = 2.0.25
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
-define ACPID_SET_EVENTS
+define ACPID_SET_EVENTS_FILES
mkdir -p $(TARGET_DIR)/etc/acpi/events
/bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
$(INSTALL) -D -m 755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
+ ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/S24acpid
+ ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/K01acpid
endef
-ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS
+ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS_FILES
+define ACPID_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/acpid
+ rm -f $(TARGET_DIR)/usr/bin/acpi_listen
+ rm -f $(TARGET_DIR)/etc/init.d/acpid
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S24acpid
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K01acpid
+endef
+
$(eval $(call AUTOTARGETS,package,acpid))
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid 2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid 2015-12-08 15:07:11 UTC (rev 7385)
@@ -1 +0,0 @@
-link ../../init.d/acpid
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-12 21:48:43
|
Revision: 7398
http://sourceforge.net/p/astlinux/code/7398
Author: abelbeck
Date: 2015-12-12 21:48:41 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
build system, move '--no-check-certificate' to getter_script.sh when needed, and cleanup pevious hacks
Modified Paths:
--------------
branches/1.0/package/iperf3/iperf3.mk
branches/1.0/package/ntp/ntp.mk
branches/1.0/package/perl/perl.mk
branches/1.0/toolchain/getter_script.sh
Modified: branches/1.0/package/iperf3/iperf3.mk
===================================================================
--- branches/1.0/package/iperf3/iperf3.mk 2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/iperf3/iperf3.mk 2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,6 +6,6 @@
IPERF3_VERSION = 3.0.11
IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
-IPERF3_SITE = --no-check-certificate https://iperf.fr/download/iperf_3.0
+IPERF3_SITE = https://iperf.fr/download/iperf_3.0
$(eval $(call AUTOTARGETS,package,iperf3))
Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk 2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/ntp/ntp.mk 2015-12-12 21:48:41 UTC (rev 7398)
@@ -5,7 +5,7 @@
#############################################################
NTP_VERSION = 4.2.8p4
NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = --no-check-certificate https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
NTP_DEPENDENCIES = host-bison host-flex host-pkg-config
NTP_CONF_OPT = \
Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk 2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/perl/perl.mk 2015-12-12 21:48:41 UTC (rev 7398)
@@ -18,7 +18,7 @@
PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
PERL_CROSS_VERSION = 1.0.1
-#PERL_CROSS_SITE = --no-check-certificate https://raw.github.com/arsv/perl-cross/releases
+#PERL_CROSS_SITE = https://raw.github.com/arsv/perl-cross/releases
PERL_CROSS_SITE = http://files.astlinux.org
PERL_CROSS_SOURCE = perl-$(PERL_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh 2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/toolchain/getter_script.sh 2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,18 +6,29 @@
WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
-wget $WGET_ARGS $@ || (
- echo Retrying from astlinux alternate site...
- index=$#-1
- # Copy all params into an array
- for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
- # Chop all but filename from last param and prepend out URL
- a[$index]=${a[index]/*\//http:\/\/$SITE/}
- # Now wget that from our server
- wget $WGET_ARGS ${a[@]}
-)
+wget $WGET_ARGS $@
+wget_rtn=$?
+# SSL verification failure
+if [ $wget_rtn -eq 5 ]; then
+ wget --no-check-certificate $WGET_ARGS $@
+ wget_rtn=$?
+fi
+# Alternate site on error
+if [ $wget_rtn -ne 0 ]; then
+ echo "Retrying from AstLinux alternate site..."
+ (
+ index=$#-1
+ # Copy all params into an array
+ for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
+ # Chop all but filename from last param and prepend out URL
+ a[$index]=${a[index]/*\//http:\/\/$SITE/}
+ # Now wget that from our server
+ wget $WGET_ARGS ${a[@]}
+ )
+fi
+
for i in $@; do
URL="$i"
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-13 23:03:17
|
Revision: 7403
http://sourceforge.net/p/astlinux/code/7403
Author: abelbeck
Date: 2015-12-13 23:03:15 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, fix build reproducibility in Make 3.82 (upstream Buildroot)
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.
This patch sort results of wildcards to ensure reproducibility.
Additionally, in fs/common.mk remove any pre-existing rootfs images for build reproducibility
Modified Paths:
--------------
branches/1.0/Makefile
branches/1.0/boot/common.mk
branches/1.0/fs/common.mk
branches/1.0/package/games/games.mk
branches/1.0/package/java/java.mk
branches/1.0/package/matchbox/matchbox.mk
branches/1.0/package/multimedia/multimedia.mk
Modified: branches/1.0/Makefile
===================================================================
--- branches/1.0/Makefile 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/Makefile 2015-12-13 23:03:15 UTC (rev 7403)
@@ -309,7 +309,7 @@
include toolchain/toolchain-crosstool-ng.mk
endif
-include package/*/*.mk
+include $(sort $(wildcard package/*/*.mk))
include boot/common.mk
include target/Makefile.in
Modified: branches/1.0/boot/common.mk
===================================================================
--- branches/1.0/boot/common.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/boot/common.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include boot/*/*.mk
\ No newline at end of file
+include $(sort $(wildcard boot/*/*.mk))
Modified: branches/1.0/fs/common.mk
===================================================================
--- branches/1.0/fs/common.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/fs/common.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -44,6 +44,7 @@
$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
+ rm -f $$@
rm -f $(FAKEROOT_SCRIPT)
touch $(BUILD_DIR)/.fakeroot.00000
cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
@@ -81,4 +82,4 @@
$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
endef
-include fs/*/*.mk
+include $(sort $(wildcard fs/*/*.mk))
Modified: branches/1.0/package/games/games.mk
===================================================================
--- branches/1.0/package/games/games.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/games/games.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/games/*/*.mk
+include $(sort $(wildcard package/games/*/*.mk))
Modified: branches/1.0/package/java/java.mk
===================================================================
--- branches/1.0/package/java/java.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/java/java.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/java/*/*.mk
+include $(sort $(wildcard package/java/*/*.mk))
Modified: branches/1.0/package/matchbox/matchbox.mk
===================================================================
--- branches/1.0/package/matchbox/matchbox.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/matchbox/matchbox.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -1,4 +1,4 @@
ifeq ($(BR2_PACKAGE_MATCHBOX),y)
-include package/matchbox/*/*.mk
+include $(sort $(wildcard package/matchbox/*/*.mk))
TARGETS+=matchbox-lib matchbox-wm
endif
Modified: branches/1.0/package/multimedia/multimedia.mk
===================================================================
--- branches/1.0/package/multimedia/multimedia.mk 2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/multimedia/multimedia.mk 2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/multimedia/*/*.mk
+include $(sort $(wildcard package/multimedia/*/*.mk))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-14 20:38:35
|
Revision: 7405
http://sourceforge.net/p/astlinux/code/7405
Author: abelbeck
Date: 2015-12-14 20:38:32 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
build system, change the default legacy SourceForge download mirror to 'iweb.dl.sourceforge.net'
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux-ast11.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux-ast13.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux18.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/initrd.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/runnix-uclibc.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/runnix.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux18.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/initrd.config 2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-16 03:58:28
|
Revision: 7409
http://sourceforge.net/p/astlinux/code/7409
Author: abelbeck
Date: 2015-12-16 03:58:25 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
astlinux-makeimage, build our own HOST fdisk that is compatible with our './scripts/bximage' binary blob
Modified Paths:
--------------
branches/1.0/boot/runnix/runnix.mk
branches/1.0/scripts/astlinux-makeimage
Added Paths:
-----------
branches/1.0/package/fdisk/
branches/1.0/package/fdisk/fdisk.mk
Modified: branches/1.0/boot/runnix/runnix.mk
===================================================================
--- branches/1.0/boot/runnix/runnix.mk 2015-12-15 00:29:22 UTC (rev 7408)
+++ branches/1.0/boot/runnix/runnix.mk 2015-12-16 03:58:25 UTC (rev 7409)
@@ -15,7 +15,7 @@
$(DL_DIR)/$(RUNNIX_SOURCE):
$(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
-$(RUNNIX_DIR)/.unpacked: $(DL_DIR)/$(RUNNIX_SOURCE)
+$(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
Added: branches/1.0/package/fdisk/fdisk.mk
===================================================================
--- branches/1.0/package/fdisk/fdisk.mk (rev 0)
+++ branches/1.0/package/fdisk/fdisk.mk 2015-12-16 03:58:25 UTC (rev 7409)
@@ -0,0 +1,48 @@
+#############################################################
+#
+# fdisk - HOST-Only
+#
+# Used by: ./scripts/astlinux-makeimage
+#
+#############################################################
+FDISK_VERSION = $(FDISK_VERSION_MAJOR).1
+FDISK_VERSION_MAJOR = 2.20
+FDISK_SOURCE = util-linux-$(FDISK_VERSION).tar.bz2
+FDISK_SITE = http://www.kernel.org/pub/linux/utils/util-linux/v$(FDISK_VERSION_MAJOR)
+
+HOST_FDISK_DEPENDENCIES = host-pkg-config
+HOST_FDISK_CONF_ENV = scanf_cv_type_modifier=no
+
+HOST_FDISK_CONF_OPT += --disable-rpath --disable-makeinstall-chown --without-ncurses
+
+HOST_FDISK_CONF_OPT += \
+ --disable-agetty \
+ --disable-arch \
+ --disable-cramfs \
+ --disable-ddate \
+ --disable-fallocate \
+ --disable-fsck \
+ --disable-kill \
+ --disable-libblkid \
+ --disable-libmount \
+ --disable-libuuid \
+ --disable-last \
+ --disable-mesg \
+ --disable-mount \
+ --disable-partx \
+ --disable-pivot_root \
+ --disable-raw \
+ --disable-rename \
+ --disable-reset \
+ --disable-schedutils \
+ --disable-switch_root \
+ --disable-unshare \
+ --disable-uuidd \
+ --disable-wall \
+ --disable-write
+
+define HOST_FDISK_INSTALL_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/fdisk/fdisk $(HOST_DIR)/usr/sbin/fdisk
+endef
+
+$(eval $(call AUTOTARGETS,package,fdisk,host))
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2015-12-15 00:29:22 UTC (rev 7408)
+++ branches/1.0/scripts/astlinux-makeimage 2015-12-16 03:58:25 UTC (rev 7409)
@@ -7,8 +7,13 @@
PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-REQUIRED_CMDS="which sudo mkdosfs mkfs fdisk losetup gzip"
+HOST_BIN="./output/host/usr/sbin"
+# Package host-fdisk builds:
+REQUIRED_HOST_CMDS="fdisk"
+
+REQUIRED_CMDS="which sudo mkdosfs mkfs losetup gzip"
+
RUNNIX_VER="$(awk -F'=' '/^RUNNIX_VER/ { print $2; exit }' boot/runnix/runnix.mk)"
RUNNIX_DIR="output/build/runnix-${RUNNIX_VER// /}"
@@ -60,6 +65,12 @@
fi
error=0
+for i in $REQUIRED_HOST_CMDS; do
+ if [ ! -x "$HOST_BIN/$i" ]; then
+ error=1
+ echo "astlinux-makeimage: Required HOST command \"$i\" is missing." >&2
+ fi
+done
for i in $REQUIRED_CMDS; do
if ! which $i >/dev/null 2>&1; then
error=1
@@ -154,14 +165,14 @@
echo -e "n\np\n1\n\n\nt\n6\na\n1"
fi
echo "w"
-) | sudo fdisk -C $CYL -H $HEADS -S $SECTORS ${LOOPD}0
+) | sudo $HOST_BIN/fdisk -c=dos -u=cylinders -C $CYL -H $HEADS -S $SECTORS ${LOOPD}0
temp="${LOOPD}0"
PREFIXLEN=${#temp}
PREFIX="^${temp//\//\/}"
# need to filter out bootable marker ('*') so it doesn't show up as $2
-eval $(sudo fdisk -u -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")
+eval $(sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")
if [ -z "$p1" -o \( $AST_SIZE -gt 0 -a -z "$p2" \) ]; then
echo "Couldn't extract partition offsets." >&2
@@ -223,7 +234,7 @@
fi
if [ -n "$DUMP_PARTITIONS" ]; then
- sudo fdisk -l -u ${LOOPD}0
+ sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0
fi
sudo losetup -d ${LOOPD}0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-01 12:51:18
|
Revision: 7492
http://sourceforge.net/p/astlinux/code/7492
Author: abelbeck
Date: 2016-02-01 12:51:16 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
build system, remove uclibc support for build-runnix
Modified Paths:
--------------
branches/1.0/scripts/build-runnix
Removed Paths:
-------------
branches/1.0/runnix-uclibc.config
Deleted: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2016-02-01 12:46:08 UTC (rev 7491)
+++ branches/1.0/runnix-uclibc.config 2016-02-01 12:51:16 UTC (rev 7492)
@@ -1,1115 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:41 2015
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_bfin is not set
-BR2_i386=y
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-# BR2_x86_pentiumpro is not set
-# BR2_x86_pentium_mmx is not set
-# BR2_x86_pentium_m is not set
-# BR2_x86_pentium2 is not set
-# BR2_x86_pentium3 is not set
-# BR2_x86_pentium4 is not set
-# BR2_x86_prescott is not set
-# BR2_x86_nocona is not set
-# BR2_x86_core2 is not set
-# BR2_x86_k6 is not set
-# BR2_x86_k6_2 is not set
-# BR2_x86_athlon is not set
-# BR2_x86_athlon_4 is not set
-# BR2_x86_opteron is not set
-# BR2_x86_opteron_sse3 is not set
-# BR2_x86_barcelona is not set
-# BR2_x86_geode is not set
-# BR2_x86_c3 is not set
-# BR2_x86_c32 is not set
-# BR2_x86_winchip_c6 is not set
-# BR2_x86_winchip2 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="i586"
-BR2_GCC_TARGET_ARCH="i586"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn"
-BR2_BZR="bzr"
-BR2_GIT="git"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_XZCAT="xzcat"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(TOPDIR)/dl"
-BR2_HOST_DIR="$(BASE_DIR)/host"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="iweb"
-BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
-BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
-BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_JLEVEL=1
-# BR2_CCACHE is not set
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-BR2_STRIP_strip=y
-# BR2_STRIP_sstrip is not set
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Toolchain
-#
-BR2_TOOLCHAIN_BUILDROOT=y
-# BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_CTNG is not set
-
-#
-# Kernel Header Options
-#
-BR2_KERNEL_HEADERS_2_6_35=y
-# BR2_KERNEL_HEADERS_2_6_36 is not set
-# BR2_KERNEL_HEADERS_2_6_37 is not set
-# BR2_KERNEL_HEADERS_2_6_38 is not set
-# BR2_KERNEL_HEADERS_2_6_39 is not set
-# BR2_KERNEL_HEADERS_3_0 is not set
-# BR2_KERNEL_HEADERS_VERSION is not set
-# BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.35.14"
-
-#
-# uClibc Options
-#
-# BR2_UCLIBC_VERSION_0_9_31 is not set
-BR2_UCLIBC_VERSION_0_9_32=y
-# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.32"
-BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.32.config"
-# BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
-
-#
-# Binutils Options
-#
-# BR2_BINUTILS_VERSION_2_20 is not set
-# BR2_BINUTILS_VERSION_2_20_1 is not set
-# BR2_BINUTILS_VERSION_2_21 is not set
-BR2_BINUTILS_VERSION_2_21_1=y
-BR2_BINUTILS_VERSION="2.21.1"
-BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
-
-#
-# GCC Options
-#
-# BR2_GCC_VERSION_4_2_4 is not set
-BR2_GCC_VERSION_4_3_X=y
-# BR2_GCC_VERSION_4_4_X is not set
-# BR2_GCC_VERSION_4_5_X is not set
-# BR2_GCC_VERSION_4_6_X is not set
-# BR2_GCC_VERSION_SNAP is not set
-BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.3.6"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_INSTALL_OBJC is not set
-# BR2_INSTALL_FORTRAN is not set
-BR2_GCC_SHARED_LIBGCC=y
-BR2_GCC_ENABLE_TLS=y
-# BR2_GCC_ENABLE_OPENMP is not set
-
-#
-# Gdb Options
-#
-
-#
-# Gdb debugger for the target needs WCHAR support in toolchain
-#
-# BR2_PACKAGE_GDB_SERVER is not set
-# BR2_PACKAGE_GDB_HOST is not set
-BR2_TOOLCHAIN_HAS_THREADS=y
-BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_NEEDS_GETTEXT=y
-BR2_USE_MMU=y
-BR2_TARGET_OPTIMIZATION="-pipe -Os"
-BR2_TARGET_LDFLAGS=""
-
-#
-# Toolchain Options
-#
-# BR2_TOOLCHAIN_BUILDROOT_LARGEFILE is not set
-# BR2_TOOLCHAIN_BUILDROOT_INET_IPV6 is not set
-# BR2_TOOLCHAIN_BUILDROOT_INET_RPC is not set
-# BR2_TOOLCHAIN_BUILDROOT_WCHAR is not set
-# BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
-# BR2_TOOLCHAIN_BUILDROOT_USE_SSP is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-# BR2_PTHREADS_OLD is not set
-BR2_PTHREADS_NATIVE=y
-
-#
-# System configuration
-#
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE=""
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV is not set
-BR2_ROOTFS_DEVICE_TABLE="project/runnix/device_table.txt"
-BR2_ROOTFS_STATIC_DEVICE_TABLE="project/runnix/device_table_dev.txt"
-# BR2_ROOTFS_SKELETON_DEFAULT is not set
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/runnix/target_skeleton"
-BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/runnix-post-build"
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_16_X is not set
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-# BR2_BUSYBOX_VERSION_1_18_X is not set
-BR2_BUSYBOX_VERSION_1_19_X=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.19.4"
-BR2_PACKAGE_BUSYBOX_CONFIG="project/runnix/busybox.config"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Asterisk, XMPP and telephony applications
-#
-# BR2_PACKAGE_ASTERISK is not set
-# BR2_PACKAGE_DAHDI_LINUX is not set
-# BR2_PACKAGE_DAHDI_TOOLS is not set
-# BR2_PACKAGE_FONULATOR is not set
-# BR2_PACKAGE_FREESWITCH is not set
-# BR2_PACKAGE_CLIX is not set
-# BR2_PACKAGE_KAMAILIO is not set
-# BR2_PACKAGE_OPENSIPS is not set
-# BR2_PACKAGE_PROSODY is not set
-# BR2_PACKAGE_RTPPROXY is not set
-# BR2_PACKAGE_RHINO is not set
-# BR2_PACKAGE_WANPIPE is not set
-
-#
-# Audio and video libraries and applications
-#
-# BR2_PACKAGE_ALSA_LIB is not set
-
-#
-# alsa-utils requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_AUMIX is not set
-# BR2_PACKAGE_BEEP is not set
-# BR2_PACKAGE_FAAD2 is not set
-# BR2_PACKAGE_FLAC is not set
-
-#
-# ffmpeg requires a toolchain with LARGEFILE and IPV6 support
-#
-
-#
-# gstreamer requires a toolchain with WCHAR support
-#
-
-#
-# gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support
-#
-# BR2_PACKAGE_LAME is not set
-# BR2_PACKAGE_LIBAO is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBCUE is not set
-# BR2_PACKAGE_LIBCUEFILE is not set
-
-#
-# libdvdread requires a toolchain with LARGEFILE support
-#
-
-#
-# libdvdnav requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
-
-#
-# libmms requires a toolchain with WCHAR support
-#
-
-#
-# libmpd requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_LIBMPEG2 is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBREPLAYGAIN is not set
-# BR2_PACKAGE_LIBSAMPLERATE is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-
-#
-# Live555 needs C++ compiler
-#
-# BR2_PACKAGE_MADPLAY is not set
-
-#
-# mpd requires a toolchain with C++ and WCHAR support
-#
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_MUSEPACK is not set
-# BR2_PACKAGE_SOX is not set
-# BR2_PACKAGE_SPEEX is not set
-
-#
-# swfdec requires a toolchain with WCHAR and C++ support
-#
-
-#
-# taglib requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VORBIS_TOOLS is not set
-# BR2_PACKAGE_WAVPACK is not set
-
-#
-# Compressors and decompressors
-#
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_GZIP is not set
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ is not set
-
-#
-# Debugging, profiling and benchmark
-#
-
-#
-# bonnie++ requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_DHRYSTONE is not set
-# BR2_PACKAGE_DMALLOC is not set
-BR2_PACKAGE_KEXEC=y
-# BR2_PACKAGE_KEXEC_ZLIB is not set
-
-#
-# lmbench requires a toolchain with RPC support
-#
-
-#
-# lsof requires a toolchain with RPC support
-#
-# BR2_PACKAGE_LTP_TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NETPERF is not set
-
-#
-# oprofile requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_STRACE is not set
-# BR2_PACKAGE_WHETSTONE is not set
-# BR2_PACKAGE_VALGRIND is not set
-
-#
-# Development tools
-#
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BINUTILS is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CCACHE is not set
-
-#
-# coreutils requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_DIFFUTILS is not set
-# BR2_PACKAGE_DISTCC is not set
-
-#
-# findutils requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_FLEX is not set
-# BR2_PACKAGE_FOSSIL is not set
-
-#
-# gcc needs development files in target filesystem
-#
-
-#
-# gettext requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_GMP is not set
-
-#
-# gperf requires a toolchain with C++ support enabled
-#
-
-#
-# grep needs a toolchain with WCHAR support
-#
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_MPC is not set
-# BR2_PACKAGE_MPFR is not set
-# BR2_PACKAGE_LIBTOOL is not set
-# BR2_PACKAGE_M4 is not set
-
-#
-# patch needs a toolchain with WCHAR support
-#
-
-#
-# pkg-config requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_SSTRIP is not set
-
-#
-# tar requires a toolchain with WCHAR support
-#
-
-#
-# Games
-#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-
-#
-# rrdtool requires a toolchain with WCHAR support
-#
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBSET is not set
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
-
-#
-# other GUIs
-#
-
-#
-# qt requires a toolchain with C++ support enabled
-#
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-
-#
-# Network Interface Kernel Drivers
-#
-# BR2_PACKAGE_E1000E is not set
-# BR2_PACKAGE_IGB is not set
-# BR2_PACKAGE_R8168 is not set
-# BR2_PACKAGE_TG3 is not set
-
-#
-# Other Hardware
-#
-# BR2_PACKAGE_ACPID is not set
-# BR2_PACKAGE_BFDETECT is not set
-
-#
-# cdrkit requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_CRAMFS is not set
-# BR2_PACKAGE_DBUS is not set
-# BR2_PACKAGE_DMIDECODE is not set
-
-#
-# dmraid requires a toolchain with LARGEFILE support
-#
-
-#
-# dosfstools requires a toolchain with LARGEFILE and WCHAR support
-#
-
-#
-# e2fsprogs requires a toolchain with LARGEFILE + WCHAR support
-#
-# BR2_PACKAGE_EEPROG is not set
-# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIS is not set
-# BR2_PACKAGE_FLASHROM is not set
-# BR2_PACKAGE_FXLOAD is not set
-# BR2_PACKAGE_GADGETFS_TEST is not set
-
-#
-# gdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled
-#
-# BR2_PACKAGE_GENEXT2FS is not set
-# BR2_PACKAGE_GENROMFS is not set
-# BR2_PACKAGE_GPSD is not set
-
-#
-# gvfs requires a toolchain with LARGEFILE and WCHAR support
-#
-
-#
-# hdparm requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_HWDATA is not set
-# BR2_PACKAGE_I2C_TOOLS is not set
-# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
-# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
-# BR2_PACKAGE_KBD is not set
-
-#
-# libv4l requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LM_SENSORS is not set
-# BR2_PACKAGE_LSUIO is not set
-
-#
-# lvm2 requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_MAKEDEVS is not set
-# BR2_PACKAGE_MDADM is not set
-BR2_PACKAGE_MEMTEST=y
-
-#
-# memtester requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_MONIT is not set
-# BR2_PACKAGE_MTD is not set
-
-#
-# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
-#
-
-#
-# ntfsprogs requires a toolchain with WCHAR and LARGEFILE support
-#
-# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SDPARM is not set
-# BR2_PACKAGE_SETSERIAL is not set
-
-#
-# smartmontools requires a toolchain with C++ support enabled
-#
-
-#
-# squashfs requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_SREDIRD is not set
-
-#
-# sshfs requires a toolchain with LARGEFILE and WCHAR support
-#
-# BR2_PACKAGE_STATSERIAL is not set
-# BR2_PACKAGE_SYSSTAT is not set
-# BR2_PACKAGE_TI_UTILS is not set
-# BR2_PACKAGE_UBOOT_TOOLS is not set
-
-#
-# udev requires /dev mgmnt set to udev under System configuration
-#
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBUTILS is not set
-# BR2_PACKAGE_WIPE is not set
-
-#
-# xfsprogs requires a toolchain with LARGEFILE + WCHAR support
-#
-# BR2_PACKAGE_ZABBIX is not set
-
-#
-# Interpreter languages and scripting
-#
-# BR2_PACKAGE_BC is not set
-# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_PERL is not set
-# BR2_PACKAGE_MICROPERL is not set
-# BR2_PACKAGE_PHP is not set
-
-#
-# python requires a toolchain with WCHAR support
-#
-
-#
-# ruby requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_TCL is not set
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-
-#
-# libarchive requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_SPANDSP is not set
-BR2_PACKAGE_ZLIB=y
-
-#
-# Crypto
-#
-# BR2_PACKAGE_BEECRYPT is not set
-# BR2_PACKAGE_GNUTLS is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-
-#
-# libnss requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_OPENSSL is not set
-# BR2_PACKAGE_LIBSODIUM is not set
-# BR2_PACKAGE_LIBSRTP is not set
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-
-#
-# Mysql client requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_SQLITE is not set
-# BR2_PACKAGE_UNIXODBC is not set
-
-#
-# Filesystem
-#
-
-#
-# gamin requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-
-#
-# libfuse requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LIBLOCKFILE is not set
-# BR2_PACKAGE_LIBSYSFS is not set
-
-#
-# Graphics
-#
-
-#
-# atk requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_JPEG is not set
-# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBEXIF is not set
-
-#
-# libgtk2 requires a toolchain with WCHAR and C++ support
-#
-# BR2_PACKAGE_LIBPNG is not set
-
-#
-# libraw requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
-
-#
-# pango requires a toolchain with WCHAR and C++ support
-#
-# BR2_PACKAGE_PIXMAN is not set
-# BR2_PACKAGE_TIFF is not set
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_TSLIB is not set
-# BR2_PACKAGE_LIBHID is not set
-# BR2_PACKAGE_LIBIQRF is not set
-# BR2_PACKAGE_LIBUSB is not set
-
-#
-# Networking
-#
-# BR2_PACKAGE_LIBCGI is not set
-
-#
-# libcgicc requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBIDN is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_NEON is not set
-
-#
-# libmnl requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LIBNET is not set
-# BR2_PACKAGE_LIBNFNETLINK is not set
-# BR2_PACKAGE_LIBNL is not set
-# BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_PJSIP is not set
-# BR2_PACKAGE_LIBOSIP2 is not set
-# BR2_PACKAGE_LIBRSYNC is not set
-
-#
-# libsoup requires a toolchain with WCHAR support
-#
-
-#
-# libupnp requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LIBURIPARSER is not set
-# BR2_PACKAGE_LINUX_ATM is not set
-
-#
-# Other
-#
-# BR2_PACKAGE_LIBARGTABLE2 is not set
-# BR2_PACKAGE_ARGP_STANDALONE is not set
-# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
-# BR2_PACKAGE_LIBELF is not set
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFB is not set
-# BR2_PACKAGE_LIBFFI is not set
-
-#
-# libglib2 requires a toolchain with WCHAR support
-#
-
-#
-# libical requires a toolchain with WCHAR support
-#
-
-#
-# libnspr requires a toolchain with LARGEFILE support
-#
-
-#
-# libsigc++ requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_ORC is not set
-
-#
-# Text and terminal handling
-#
-
-#
-# enchant requires a toolchain with C++ and WCHAR support enabled
-#
-
-#
-# icu requires a toolchain with C++ support and WCHAR enabled
-#
-BR2_PACKAGE_LIBICONV=y
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-# BR2_PACKAGE_NEWT is not set
-# BR2_PACKAGE_PCRE is not set
-# BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_READLINE is not set
-# BR2_PACKAGE_SLANG is not set
-
-#
-# JSON/XML
-#
-# BR2_PACKAGE_EXPAT is not set
-# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_JANSSON is not set
-# BR2_PACKAGE_LIBROXML is not set
-# BR2_PACKAGE_LIBXML2 is not set
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_LIBYAML is not set
-# BR2_PACKAGE_MXML is not set
-
-#
-# xerces-c++ requires a toolchain with C++ and WCHAR support enabled
-#
-# BR2_PACKAGE_YAJL is not set
-
-#
-# Miscellaneous
-#
-# BR2_PACKAGE_HTPASSWD is not set
-# BR2_PACKAGE_MAC2VENDOR is not set
-
-#
-# shared-mime-info requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_ZONEINFO is not set
-
-#
-# Networking applications
-#
-# BR2_PACKAGE_APCUPSD is not set
-# BR2_PACKAGE_ARGUS is not set
-# BR2_PACKAGE_ARNOFW is not set
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
-
-#
-# bluez-utils require a toolchain with WCHAR support
-#
-# BR2_PACKAGE_BOA is not set
-
-#
-# bind requires a toolchain with LARGEFILE support
-#
-
-#
-# bmon requires a toolchain with IPv6 support
-#
-# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_BWM_NG is not set
-# BR2_PACKAGE_CAN_UTILS is not set
-
-#
-# ctorrent requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_CUPS is not set
-# BR2_PACKAGE_DARKSTAT is not set
-# BR2_PACKAGE_DHCP is not set
-# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_DIBBLER is not set
-# BR2_PACKAGE_DNSCRYPT_PROXY is not set
-# BR2_PACKAGE_DNSMASQ is not set
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
-BR2_PACKAGE_DROPBEAR_SMALL=y
-
-#
-# ebtables requires a toolchain with IPv6 support
-#
-# BR2_PACKAGE_ETHTOOL is not set
-# BR2_PACKAGE_FPING is not set
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IFTOP is not set
-# BR2_PACKAGE_INADYN is not set
-
-#
-# iperf requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_IPERF3 is not set
-# BR2_PACKAGE_IPROUTE2 is not set
-# BR2_PACKAGE_IPSEC_TOOLS is not set
-
-#
-# ipset requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_IPTABLES is not set
-# BR2_PACKAGE_IW is not set
-
-#
-# Kismet requires a toolchain with C++ support enabled
-#
-# BR2_PACKAGE_XL2TP is not set
-# BR2_PACKAGE_LIGHTTPD is not set
-# BR2_PACKAGE_LINKS is not set
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MII_DIAG is not set
-# BR2_PACKAGE_MINIUPNPD is not set
-# BR2_PACKAGE_MROUTED is not set
-# BR2_PACKAGE_MSMTP is not set
-# BR2_PACKAGE_MTR is not set
-
-#
-# mutt requires a toolchain with WCHAR support
-#
-
-#
-# nbd requires a toolchain with WCHAR support
-#
-
-#
-# ncftp requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_NETCAT is not set
-
-#
-# netkitbase requires a toolchain with RPC support
-#
-
-#
-# netkittelnet requires a toolchain with RPC support
-#
-# BR2_PACKAGE_NETPLUG is not set
-# BR2_PACKAGE_NETSNMP is not set
-# BR2_PACKAGE_NETSTAT_NAT is not set
-
-#
-# nfs-utils requires a toolchain with RPC and LARGEFILE support
-#
-# BR2_PACKAGE_NGIRCD is not set
-# BR2_PACKAGE_NGREP is not set
-# BR2_PACKAGE_NMAP is not set
-# BR2_PACKAGE_NTP is not set
-# BR2_PACKAGE_NUT is not set
-# BR2_PACKAGE_NUTTCP is not set
-
-#
-# olsr requires a toolchain with IPv6 support
-#
-# BR2_PACKAGE_OPENLDAP is not set
-# BR2_PACKAGE_OPENNTPD is not set
-# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENVPN is not set
-# BR2_PACKAGE_P910ND is not set
-
-#
-# portmap requires a toolchain with 'Enable RPC' selected
-#
-# BR2_PACKAGE_PPPD is not set
-# BR2_PACKAGE_PPTP_LINUX is not set
-# BR2_PACKAGE_PPTPD is not set
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSH_REDONE is not set
-# BR2_PACKAGE_RSYNC is not set
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-# BR2_PACKAGE_SIPGREP is not set
-# BR2_PACKAGE_SIPSAK is not set
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-
-#
-# Squid requires a toolchain with C++ and IPv6 support enabled
-#
-# BR2_PACKAGE_STUNNEL is not set
-# BR2_PACKAGE_TCPDUMP is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TFTPD is not set
-# BR2_PACKAGE_THTTPD is not set
-# BR2_PACKAGE_TINYHTTPD is not set
-# BR2_PACKAGE_TINYPROXY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-
-#
-# udpcast requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_UW_IMAP is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
-# BR2_PACKAGE_VTUN is not set
-
-#
-# wget requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# rpm requires libneon with SSL, XML and ZLIB support
-#
-
-#
-# xz payload support requires a toolchain with c++ support
-#
-
-#
-# Shell and utilities
-#
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_BASH is not set
-# BR2_PACKAGE_DASH is not set
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_FILE is not set
-
-#
-# inotify-tools requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-
-#
-# logrotate requires a toolchain with WCHAR support
-#
-# BR2_PACKAGE_SCREEN is not set
-# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_XMLSTARLET is not set
-
-#
-# System tools
-#
-
-#
-# acl requires a toolchain with LARGEFILE support
-#
-
-#
-# attr requires a toolchain with LARGEFILE support
-#
-
-#
-# bootutils requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_HTOP is not set
-# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
-# BR2_PACKAGE_PROCPS is not set
-# BR2_PACKAGE_PSMISC is not set
-# BR2_PACKAGE_RSYSLOG is not set
-
-#
-# syslogd requires a toolchain with LARGEFILE support
-#
-# BR2_PACKAGE_SYSVINIT is not set
-
-#
-# util-linux requires a toolchain with LARGEFILE + WCHAR support
-#
-
-#
-# Text editors and viewers
-#
-# BR2_PACKAGE_ED is not set
-# BR2_PACKAGE_EX_VI is not set
-# BR2_PACKAGE_JOE is not set
-# BR2_PACKAGE_LESS is not set
-# BR2_PACKAGE_NANO is not set
-# BR2_PACKAGE_UEMACS is not set
-# BR2_PACKAGE_VIM is not set
-
-#
-# Filesystem images
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
-BR2_TARGET_ROOTFS_EXT2_INODES=0
-BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
-# BR2_TARGET_ROOTFS_EXT2_NONE is not set
-BR2_TARGET_ROOTFS_EXT2_GZIP=y
-# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
-# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-# BR2_TARGET_ROOTFS_SQUASHFS is not set
-# BR2_TARGET_ROOTFS_TAR is not set
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_ISO9660 is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
-# BR2_TARGET_GRUB is not set
-BR2_TARGET_SYSLINUX=y
-# BR2_TARGET_SYSLINUX_ISOLINUX is not set
-# BR2_TARGET_SYSLINUX_PXELINUX is not set
-# BR2_TARGET_RUNNIX is not set
-# BR2_TARGET_UBOOT is not set
-
-#
-# Kernel
-#
-BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_39 is not set
-# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
-# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
-BR2_LINUX_KERNEL_VERSION="custom"
-BR2_LINUX_KERNEL_PATCH=""
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/runnix/geni586/linux.config"
-BR2_LINUX_KERNEL_BZIMAGE=y
-# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
-# BR2_LINUX_KERNEL_INSTALL_TARGET is not set
Modified: branches/1.0/scripts/build-runnix
===================================================================
--- branches/1.0/scripts/build-runnix 2016-02-01 12:46:08 UTC (rev 7491)
+++ branches/1.0/scripts/build-runnix 2016-02-01 12:51:16 UTC (rev 7492)
@@ -1,13 +1,9 @@
#!/bin/bash
#
-# build-runnix [ uclibc ]
+# build-runnix
#
-if [ "$1" = "uclibc" ]; then
- CONFIG="runnix-uclibc.config"
-else
- CONFIG="runnix.config"
-fi
+CONFIG="runnix.config"
ROOTFS_EXT2_GZ="output/images/rootfs.ext2.gz"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-01 18:59:19
|
Revision: 7494
http://sourceforge.net/p/astlinux/code/7494
Author: abelbeck
Date: 2016-02-01 18:59:16 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
runnix-iso, new sub-project to generate a 'Linux bootable' ISO image, most useful for VM installs
Added Paths:
-----------
branches/1.0/project/runnix-iso/
branches/1.0/project/runnix-iso/busybox.config
branches/1.0/project/runnix-iso/device_table.txt
branches/1.0/project/runnix-iso/device_table_dev.txt
branches/1.0/project/runnix-iso/files/
branches/1.0/project/runnix-iso/files/rootfs_vfat/
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/boot.msg
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/default.conf
branches/1.0/project/runnix-iso/geni586/
branches/1.0/project/runnix-iso/geni586/linux.config
branches/1.0/project/runnix-iso/target_skeleton/
branches/1.0/project/runnix-iso/target_skeleton/bin/
branches/1.0/project/runnix-iso/target_skeleton/boot/
branches/1.0/project/runnix-iso/target_skeleton/dev/
branches/1.0/project/runnix-iso/target_skeleton/etc/
branches/1.0/project/runnix-iso/target_skeleton/etc/group
branches/1.0/project/runnix-iso/target_skeleton/etc/hostname
branches/1.0/project/runnix-iso/target_skeleton/etc/inittab
branches/1.0/project/runnix-iso/target_skeleton/etc/issue
branches/1.0/project/runnix-iso/target_skeleton/etc/passwd
branches/1.0/project/runnix-iso/target_skeleton/etc/profile
branches/1.0/project/runnix-iso/target_skeleton/etc/resolv.conf
branches/1.0/project/runnix-iso/target_skeleton/etc/runnix-release
branches/1.0/project/runnix-iso/target_skeleton/etc/shadow
branches/1.0/project/runnix-iso/target_skeleton/etc/udhcpc.script
branches/1.0/project/runnix-iso/target_skeleton/image/
branches/1.0/project/runnix-iso/target_skeleton/lib/
branches/1.0/project/runnix-iso/target_skeleton/mnt/
branches/1.0/project/runnix-iso/target_skeleton/mnt/base/
branches/1.0/project/runnix-iso/target_skeleton/mnt/cdrom/
branches/1.0/project/runnix-iso/target_skeleton/mnt/root/
branches/1.0/project/runnix-iso/target_skeleton/mnt/tmp/
branches/1.0/project/runnix-iso/target_skeleton/new/
branches/1.0/project/runnix-iso/target_skeleton/proc/
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/project/runnix-iso/target_skeleton/sbin/
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
branches/1.0/project/runnix-iso/target_skeleton/sys/
branches/1.0/project/runnix-iso/target_skeleton/tmp/
branches/1.0/project/runnix-iso/target_skeleton/usr/
branches/1.0/project/runnix-iso/target_skeleton/var/
branches/1.0/project/runnix-iso/target_skeleton/var/log
branches/1.0/runnix-iso.config
branches/1.0/scripts/build-runnix-iso
branches/1.0/scripts/runnix-iso-post-build
Added: branches/1.0/project/runnix-iso/busybox.config
===================================================================
--- branches/1.0/project/runnix-iso/busybox.config (rev 0)
+++ branches/1.0/project/runnix-iso/busybox.config 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,1005 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.19.4
+# Thu Jan 23 16:45:14 2014
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_UNICODE_SUPPORT is not set
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+# CONFIG_FEATURE_DEVPTS is not set
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+# CONFIG_FEATURE_SYSTEMD is not set
+# CONFIG_FEATURE_RTMINMAX is not set
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=255
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
+# CONFIG_MONOTONIC_SYSCALL is not set
+# CONFIG_IOCTL_HEX2STR_ERROR is not set
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+# CONFIG_CPIO is not set
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
+# CONFIG_CAL is not set
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+CONFIG_READLINK=y
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+# CONFIG_SHA256SUM is not set
+# CONFIG_SHA512SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+CONFIG_STAT=y
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_WHOAMI is not set
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+# CONFIG_DUMPKMAP is not set
+# CONFIG_KBD_MODE is not set
+# CONFIG_LOADFONT is not set
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+# CONFIG_FEATURE_LOADFONT_RAW is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_MKTEMP is not set
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+# CONFIG_PATCH is not set
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+# CONFIG_FEATURE_VI_8BIT is not set
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
+# CONFIG_FEATURE_ALLOW_EXEC is not set
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+# CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_CRYPT is not set
+# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+CONFIG_SULOGIN=y
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODINFO is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+# CONFIG_INSMOD is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_MODUTILS_ALIAS is not set
+# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_DEFAULT_MODULES_DIR=""
+CONFIG_DEFAULT_DEPMOD_FILE=""
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+# CONFIG_FEATURE_DMESG_PRETTY is not set
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+# CONFIG_FEATURE_GETOPT_LONG is not set
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+CONFIG_FEATURE_LESS_DASHCMD=y
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+# CONFIG_DNSD is not set
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_TELNET is not set
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+CONFIG_FEATURE_UDHCP_PORT=y
+CONFIG_UDHCP_DEBUG=9
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+# CONFIG_ASH_BASH_COMPAT is not set
+# CONFIG_ASH_IDLE_TIMEOUT is not set
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_BUILTIN_PRINTF is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
+
+#
+# System Logging Utilities
+#
+# CONFIG_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_KLOGD is not set
+# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
+# CONFIG_LOGGER is not set
Added: branches/1.0/project/runnix-iso/device_table.txt
===================================================================
--- branches/1.0/project/runnix-iso/device_table.txt (rev 0)
+++ branches/1.0/project/runnix-iso/device_table.txt 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,23 @@
+# See package/makedevs/README for details
+#
+# This device table is used to assign proper ownership and permissions
+# on various files. It doesn't create any device file, as it is used
+# in both static device configurations (where /dev/ is static) and in
+# dynamic configurations (where devtmpfs, mdev or udev are used).
+#
+# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+/dev d 755 0 0 - - - - -
+/dev/pts d 755 0 0 - - - - -
+/dev/shm d 755 0 0 - - - - -
+/tmp d 1777 0 0 - - - - -
+/etc d 755 0 0 - - - - -
+#/home/default d 2755 1000 1000 - - - - -
+/bin/busybox f 4755 0 0 - - - - -
+/etc/shadow f 600 0 0 - - - - -
+/etc/passwd f 644 0 0 - - - - -
+#/etc/network/if-up.d d 755 0 0 - - - - -
+#/etc/network/if-pre-up.d d 755 0 0 - - - - -
+#/etc/network/if-down.d d 755 0 0 - - - - -
+#/etc/network/if-post-down.d d 755 0 0 - - - - -
+#/usr/share/udhcpc/default.script f 755 0 0 - - - - -
+
Added: branches/1.0/project/runnix-iso/device_table_dev.txt
===================================================================
--- branches/1.0/project/runnix-iso/device_table_dev.txt (rev 0)
+++ branches/1.0/project/runnix-iso/device_table_dev.txt 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,156 @@
+# When building a target filesystem, it is desirable to not have to
+# become root and then run 'mknod' a thousand times. Using a device
+# table you can create device nodes and directories "on the fly".
+#
+# This is a sample device table file for use with genext2fs. You can
+# do all sorts of interesting things with a device table file. For
+# example, if you want to adjust the permissions on a particular file
+# you can just add an entry like:
+# /sbin/foobar f 2755 0 0 - - - - -
+# and (assuming the file /sbin/foobar exists) it will be made setuid
+# root (regardless of what its permissions are on the host filesystem.
+# Furthermore, you can use a single table entry to create a many device
+# minors. For example, if I wanted to create /dev/hda and /dev/hda[0-15]
+# I could just use the following two table entries:
+# /dev/hda b 640 0 0 3 0 0 0 -
+# /dev/hda b 640 0 0 3 1 1 1 15
+#
+# Device table entries take the form of:
+# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+# where name is the file name, type can be one of:
+# f A regular file
+# d Directory
+# c Character special device file
+# b Block special device file
+# p Fifo (named pipe)
+# uid is the user id for the target file, gid is the group id for the
+# target file. The rest of the entries (major, minor, etc) apply only
+# to device special files.
+
+# Have fun
+# -Erik Andersen <and...@co...>
+#
+
+#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+# uncomment this to allow starting x as non-root
+#/usr/X11R6/bin/Xfbdev f 4755 0 0 - - - - -
+# Normal system devices
+/dev/mem c 640 0 0 1 1 0 0 -
+/dev/kmem c 640 0 0 1 2 0 0 -
+/dev/null c 666 0 0 1 3 0 0 -
+/dev/zero c 666 0 0 1 5 0 0 -
+/dev/random c 666 0 0 1 8 0 0 -
+/dev/urandom c 666 0 0 1 9 0 0 -
+/dev/ram b 640 0 0 1 1 0 0 -
+/dev/ram b 640 0 0 1 0 0 1 4
+/dev/loop b 640 0 0 7 0 0 1 2
+/dev/rtc c 640 0 0 10 135 - - -
+/dev/console c 666 0 0 5 1 - - -
+/dev/tty c 666 0 0 5 0 - - -
+/dev/tty c 666 0 0 4 0 0 1 8
+/dev/ttyp c 666 0 0 3 0 0 1 10
+/dev/ptyp c 666 0 0 2 0 0 1 10
+/dev/ptmx c 666 0 0 5 2 - - -
+/dev/ttyP c 666 0 0 57 0 0 1 4
+/dev/ttyS c 666 0 0 4 64 0 1 4
+#/dev/fb c 640 0 5 29 0 0 32 4
+#/dev/ttySA c 666 0 0 204 5 0 1 3
+#/dev/psaux c 666 0 0 10 1 0 0 -
+#/dev/ppp c 666 0 0 108 0 - - -
+
+# Input stuff
+#/dev/input d 755 0 0 - - - - -
+#/dev/input/mice c 640 0 0 13 63 0 0 -
+#/dev/input/mouse c 660 0 0 13 32 0 1 4
+#/dev/input/event c 660 0 0 13 64 0 1 4
+#/dev/input/js c 660 0 0 13 0 0 1 4
+
+
+# MTD stuff
+#/dev/mtd c 640 0 0 90 0 0 2 4
+#/dev/mtdblock b 640 0 0 31 0 0 1 4
+
+#Tun/tap driver
+#/dev/net d 755 0 0 - - - - -
+#/dev/net/tun c 660 0 0 10 200 - - -
+
+# Audio stuff
+#/dev/audio c 666 0 29 14 4 - - -
+#/dev/audio1 c 666 0 29 14 20 - - -
+#/dev/dsp c 666 0 29 14 3 - - -
+#/dev/dsp1 c 666 0 29 14 19 - - -
+#/dev/sndstat c 666 0 29 14 6 - - -
+
+# User-mode Linux stuff
+#/dev/ubda b 640 0 0 98 0 0 0 -
+#/dev/ubda b 640 0 0 98 1 1 1 15
+
+# IDE Devices
+#/dev/hda b 640 0 0 3 0 0 0 -
+#/dev/hda b 640 0 0 3 1 1 1 15
+#/dev/hdb b 640 0 0 3 64 0 0 -
+#/dev/hdb b 640 0 0 3 65 1 1 15
+#/dev/hdc b 640 0 0 22 0 0 0 -
+#/dev/hdc b 640 0 0 22 1 1 1 15
+#/dev/hdd b 640 0 0 22 64 0 0 -
+#/dev/hdd b 640 0 0 22 65 1 1 15
+#/dev/hde b 640 0 0 33 0 0 0 -
+#/dev/hde b 640 0 0 33 1 1 1 15
+#/dev/hdf b 640 0 0 33 64 0 0 -
+#/dev/hdf b 640 0 0 33 65 1 1 15
+#/dev/hdg b 640 0 0 34 0 0 0 -
+#/dev/hdg b 640 0 0 34 1 1 1 15
+#/dev/hdh b 640 0 0 34 64 0 0 -
+#/dev/hdh b 640 0 0 34 65 1 1 15
+
+# SCSI Devices
+/dev/sda b 640 0 0 8 0 0 0 -
+/dev/sda b 640 0 0 8 1 1 1 15
+/dev/sdb b 640 0 0 8 16 0 0 -
+/dev/sdb b 640 0 0 8 17 1 1 15
+/dev/sdc b 640 0 0 8 32 0 0 -
+/dev/sdc b 640 0 0 8 33 1 1 15
+/dev/sdd b 640 0 0 8 48 0 0 -
+/dev/sdd b 640 0 0 8 49 1 1 15
+/dev/sde b 640 0 0 8 64 0 0 -
+/dev/sde b 640 0 0 8 65 1 1 15
+/dev/sdf b 640 0 0 8 80 0 0 -
+/dev/sdf b 640 0 0 8 81 1 1 15
+/dev/sdg b 640 0 0 8 96 0 0 -
+/dev/sdg b 640 0 0 8 97 1 1 15
+/dev/sdh b 640 0 0 8 112 0 0 -
+/dev/sdh b 640 0 0 8 113 1 1 15
+#/dev/sg c 640 0 0 21 0 0 1 15
+/dev/sr b 640 0 0 11 0 0 1 15
+#/dev/st c 640 0 0 9 0 0 1 8
+#/dev/nst c 640 0 0 9 128 0 1 8
+#/dev/st c 640 0 0 9 32 1 1 4
+#/dev/st c 640 0 0 9 64 1 1 4
+#/dev/st c 640 0 0 9 96 1 1 4
+
+# Floppy disk devices
+#/dev/fd b 640 0 0 2 0 0 1 2
+#/dev/fd0d360 b 640 0 0 2 4 0 0 -
+#/dev/fd1d360 b 640 0 0 2 5 0 0 -
+#/dev/fd0h1200 b 640 0 0 2 8 0 0 -
+#/dev/fd1h1200 b 640 0 0 2 9 0 0 -
+#/dev/fd0u1440 b 640 0 0 2 28 0 0 -
+#/dev/fd1u1440 b 640 0 0 2 29 0 0 -
+#/dev/fd0u2880 b 640 0 0 2 32 0 0 -
+#/dev/fd1u2880 b 640 0 0 2 33 0 0 -
+
+# All the proprietary cdrom devices in the world
+#/dev/aztcd b 640 0 0 29 0 0 0 -
+#/dev/bpcd b 640 0 0 41 0 0 0 -
+#/dev/capi20 c 640 0 0 68 0 0 1 2
+#/dev/cdu31a b 640 0 0 15 0 0 0 -
+#/dev/cdu535 b 640 0 0 24 0 0 0 -
+#/dev/cm206cd b 640 0 0 32 0 0 0 -
+#/dev/sjcd b 640 0 0 18 0 0 0 -
+#/dev/sonycd b 640 0 0 15 0 0 0 -
+#/dev/gscd b 640 0 0 16 0 0 0 -
+#/dev/sbpcd b 640 0 0 25 0 0 0 -
+#/dev/sbpcd b 640 0 0 25 0 0 1 4
+#/dev/mcd b 640 0 0 23 0 0 0 -
+#/dev/optcd b 640 0 0 17 0 0 0 -
+
Added: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/boot.msg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/boot.msg (rev 0)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/boot.msg 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,8 @@
+
+##################################
+# AstLinux ISO Installer #
+##################################
+
+install) Install Menu (default)
+
+
Added: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg (rev 0)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,9 @@
+default install
+timeout 10
+prompt 0
+display /isolinux/boot.msg
+
+label install
+ kernel /runnix
+ append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ibata.dma=3 rootdelay=5
+
Added: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
===================================================================
Added: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/default.conf
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/os/default.conf (rev 0)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/os/default.conf 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,46 @@
+# Default runnix config file
+#
+# This is the config file that runnix will read
+# before it attempts to do any upgrades, find
+# images, etc. This is where you define the
+# behavior of these features.
+
+# initramfs support
+# If your kernel uses initramfs set this to yes
+# This gets parsed immediately after this file
+#INITRAMFS="yes"
+
+# Network support
+# Runnix can upgrade your .run files from a
+# network
+# Configure the network interface here
+# Device connected to network
+NDEV="eth0"
+
+# IP address - use "dhcp" or undefined for DHCP support
+IP="dhcp"
+
+# Netmask if using static IP
+# Ignored if IP=dhcp
+#NM="255.255.255.0"
+
+# Default gateway if using static IP
+# Ignored if IP=dhcp
+#GW="192.168.0.1"
+
+# DNS Servers is using static IP
+# Ignored if IP=dhcp
+# You can specify multiple servers with spaces
+#DNS="192.168.0.1 192.168.0.2"
+
+# MAC address spoofing for the interface above
+#MAC="00:11:22:33:44:55"
+
+# If a boot fails, and both NDEV and SSHPORT are defined,
+# a SSH client/server will be started listening on port SSHPORT
+#SSHPORT="2222"
+
+# Set to "yes" to verify local run images on every boot
+# Note: Upgrades via a URL are always verified
+#VERIFY_LOCAL="yes"
+
Added: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config (rev 0)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2016-02-01 18:59:16 UTC (rev 7494)
@@ -0,0 +1,1938 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.2.66 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION="-astlinux"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TINY_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_TRACE is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_CGROUPS is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+# CONFIG_FREEZER is not set
+
+#
+# Processor type and features
+#
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+# CONFIG_SMP is not set
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_WANT_INTEL_MID is not set
+# CONFIG_X86_RDC321X is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_X86_32_IRIS is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+CONFIG_M586MMX=y
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+# CONFIG_HPET_TIMER is not set
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_NR_CPUS=1
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_INTEL is not set
+# CONFIG_X86_MCE_AMD is not set
+# CONFIG_X86_ANCIENT_MCE is not set
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_VM86=y
+# CONFIG_X86_16BIT is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+CONFIG_X86_REBOOTFIXUPS=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_HIGHPTE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ACPI=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+# CONFIG_ACPI_BUTTON is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_PROCESSOR is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_SFI is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+# CONFIG_INTEL_IDLE is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_OLPC is not set
+# CONFIG_ALIX is not set
+CONFIG_AMD_NB=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+# CONFIG_BATMAN_ADV is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+# CONFIG_ISAPNP is not set
+# CONFIG_PNPBIOS is not set
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not...
[truncated message content] |
|
From: <abe...@us...> - 2016-02-02 18:00:59
|
Revision: 7498
http://sourceforge.net/p/astlinux/code/7498
Author: abelbeck
Date: 2016-02-02 18:00:56 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add Hybrid ISO support so the .iso can also be dd'ed to a USB drive if desired
Modified Paths:
--------------
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/isoflag
Removed Paths:
-------------
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
Modified: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-02 18:00:56 UTC (rev 7498)
@@ -5,5 +5,5 @@
label install
kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ibata.dma=3 rootdelay=5
+ append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
Deleted: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
===================================================================
Copied: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/isoflag (from rev 7497, branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag)
===================================================================
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 18:00:56 UTC (rev 7498)
@@ -6,8 +6,10 @@
RUNVER="$(cat /etc/runnix-release)"
-DRIVES="sr0 sr1 sr2 sr3"
+CDROM_DRIVES="sr0 sr1 sr2 sr3"
+DRIVES="sda sdb sdc sdd sde sdf sdg sdh"
+
setup_network () {
if [ -z "$NDEV" -a -n "$1" ]; then
@@ -120,10 +122,12 @@
CMDLINE="$(cat /proc/cmdline)"
-for x in $DRIVES; do
+DEVICE=""
+
+for x in $CDROM_DRIVES; do
if mount -t iso9660 -o ro /dev/${x} $BASE 2>/dev/null; then
- if [ -f $BASE/os/astflag ]; then
- DEVICE=${x}
+ if [ -f $BASE/os/isoflag ]; then
+ DEVICE="${x}"
break
else
umount /dev/${x}
@@ -131,6 +135,19 @@
fi
done
+if [ -z "$DEVICE" ]; then
+ for x in $DRIVES; do
+ if mount -t iso9660 -o ro /dev/${x}1 $BASE 2>/dev/null; then
+ if [ -f $BASE/os/isoflag ]; then
+ DEVICE="${x}"
+ break
+ else
+ umount /dev/${x}1
+ fi
+ fi
+ done
+fi
+
hostname runnix
# Loader not found
@@ -140,6 +157,8 @@
# reboot
fi
+echo "$DEVICE" >/tmp/boot_disk
+
echo "Menu..."
/sbin/installer-menu
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-02 18:00:56 UTC (rev 7498)
@@ -113,6 +113,14 @@
do_install()
{
+ local boot_disk
+
+ if [ -f /tmp/boot_disk ]; then
+ boot_disk="$(cat /tmp/boot_disk)"
+ else
+ boot_disk=""
+ fi
+
IMAGES="$(ls -1 $IMAGE_DIR/*.img.gz 2>/dev/null)"
if [ -z "$IMAGES" ]; then
@@ -131,7 +139,7 @@
return 1
fi
- DISKS="$(fdisk -l 2>/dev/null | grep '^Disk */dev/sd[a-h]:')"
+ DISKS="$(fdisk -l 2>/dev/null | grep '^Disk */dev/sd[a-h]:' | grep -v "^Disk */dev/${boot_disk}:")"
if [ -z "$DISKS" ]; then
display_msg "No suitable disk found.\nExiting, no action performed."
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-02 18:00:56 UTC (rev 7498)
@@ -50,6 +50,7 @@
rm -f ${ISO_NAME}
+ echo "Generating ISO..."
sudo genisoimage \
-o ${ISO_NAME} \
-b isolinux/isolinux.bin \
@@ -61,6 +62,13 @@
-boot-info-table \
-input-charset utf-8 \
${RUNDIR}
+
+ if [ -x "${SYSLINUX_DIR}/utils/isohybrid" ]; then
+ echo "Blessing as Hybrid ISO..."
+ sudo "${SYSLINUX_DIR}/utils/isohybrid" "${ISO_NAME}"
+ else
+ echo "Error: No Hybrid ISO support."
+ fi
}
save_state()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-02 21:25:20
|
Revision: 7499
http://sourceforge.net/p/astlinux/code/7499
Author: abelbeck
Date: 2016-02-02 21:25:17 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add support for a serial console via 'build-runnix-iso install_image.img.gz serial'
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/configs/
branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
Added: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg (rev 0)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-02 21:25:17 UTC (rev 7499)
@@ -0,0 +1,11 @@
+serial 0 19200
+console 0
+default install
+timeout 10
+prompt 0
+display /isolinux/boot.msg
+
+label install
+ kernel /runnix
+ append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
+
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 21:25:17 UTC (rev 7499)
@@ -159,6 +159,11 @@
echo "$DEVICE" >/tmp/boot_disk
+if [ -f $BASE/os/serialflag ]; then
+ export DIALOGOPTS="--ascii-lines"
+ export TERM="vt100"
+fi
+
echo "Menu..."
/sbin/installer-menu
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-02 21:25:17 UTC (rev 7499)
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# build-runnix-iso install_image.img.gz
+# build-runnix-iso install_image.img.gz [serial]
#
REQUIRED_CMDS="which sudo genisoimage"
@@ -41,7 +41,11 @@
rm -rf ${RUNDIR}
mkdir ${RUNDIR}
cp -a project/runnix-iso/files/rootfs_vfat/* ${RUNDIR}/
- find ${RUNDIR} -type d -name .svn | xargs rm -rf
+ find ${RUNDIR} -type d -name '.svn' | xargs rm -rf
+ if [ "$SERIAL" = "serial" ]; then
+ cp -p project/runnix-iso/files/configs/isolinux-serial.cfg ${RUNDIR}/isolinux/isolinux.cfg
+ touch ${RUNDIR}/os/serialflag
+ fi
cp -p ${SYSLINUX_DIR}/core/isolinux.bin ${RUNDIR}/isolinux/isolinux.bin
cp -p ${KERNEL} ${RUNDIR}/runnix
cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
@@ -107,10 +111,17 @@
ISO_NAME="${ISO_FILE##*/}"
ISO_NAME="${ISO_NAME%.img.gz}.iso"
else
- echo "Usage: ./scripts/build-runnix-iso install_image.img.gz"
+ echo "Usage: ./scripts/build-runnix-iso install_image.img.gz [serial]"
exit 1
fi
+if [ "$2" = "serial" ]; then
+ SERIAL="$2"
+ ISO_NAME="${ISO_NAME%.iso}-serial.iso"
+else
+ SERIAL=""
+fi
+
if [ ! -f "$ISO_FILE" ]; then
echo "build-runnix-iso: The $ISO_FILE file does not exist, exiting." >&2
exit 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 14:20:08
|
Revision: 7503
http://sourceforge.net/p/astlinux/code/7503
Author: abelbeck
Date: 2016-02-03 14:20:05 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, generate install-image '.sha1' files and validate them on install
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
branches/1.0/scripts/build-runnix-iso
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-03 14:20:05 UTC (rev 7503)
@@ -75,9 +75,22 @@
12 60 3 $(menu_disk)
}
+validate_image_file()
+{
+ local image="$1"
+
+ cd "$(dirname "$image")"
+
+ if sha1sum -cs "${image}.sha1" 2>/dev/null; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
install_disk()
{
- local disk="$1" image="$2"
+ local disk="$1" image="$2" valid
if [ ! -e "$disk" ]; then
display_msg "Disk '$disk' does not exist.\nExiting, no action performed."
@@ -89,16 +102,30 @@
return 1
fi
- display_progress "Step 1 of 2: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+ if [ ! -f "${image}.sha1" ]; then
+ display_msg "SHA1 '${image##*/}.sha1' does not exist.\nExiting, no action performed."
+ return 1
+ fi
+
+ display_progress "Step 1 of 3: Validating AstLinux Image..."
sleep 1
+ valid="$(validate_image_file "$image")"
+ if [ "$valid" != "true" ]; then
+ display_msg "Error validating AstLinux Image.\nExiting, no action performed."
+ return 1
+ fi
+
+ display_progress "Step 2 of 3: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+ sleep 1
+
dd if=/dev/zero of=$disk bs=64k count=16000 >/dev/null 2>/dev/null
if [ $? -ne 0 ]; then
display_msg "Error zero'ing first 1 GB.\nInstall failed !"
return 1
fi
- display_progress "Step 2 of 2: Writing AstLinux Image to '$disk'\nThis may take a long time..."
+ display_progress "Step 3 of 3: Writing AstLinux Image to '$disk'\nThis may take a long time..."
sleep 1
zcat "$image" | dd of=$disk bs=64k >/dev/null 2>/dev/null
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-03 14:20:05 UTC (rev 7503)
@@ -3,7 +3,7 @@
# build-runnix-iso install_image.img.gz|install_image_dir [serial]
#
-REQUIRED_CMDS="which sudo genisoimage"
+REQUIRED_CMDS="which sudo genisoimage sha1sum"
CONFIG="runnix-iso.config"
@@ -15,6 +15,20 @@
SYSLINUX_DIR="output/build/syslinux-${SYSLINUX_VERSION// /}"
+gen_image_sha1_files()
+{
+ local dir="$1" image images IFS
+ (
+ cd "$dir"
+ images="$(ls -1 *.img.gz 2>/dev/null)"
+
+ IFS=$'\n'
+ for image in $images; do
+ sha1sum "${image}" > "${image}.sha1"
+ done
+ )
+}
+
make_release_version()
{
RUNBASE="1.0"
@@ -55,6 +69,7 @@
elif [ -n "$ISO_FILE" ]; then
cp "$ISO_FILE" ${RUNDIR}/os/
fi
+ gen_image_sha1_files ${RUNDIR}/os
rm -f ${ISO_NAME}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 16:01:19
|
Revision: 7504
http://sourceforge.net/p/astlinux/code/7504
Author: abelbeck
Date: 2016-02-03 16:01:17 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, include ChangeLog.txt as <ISO_NAME>.txt and move runnix files to a directory
Modified Paths:
--------------
branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/rootfs_vfat/runnix/
Modified: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-03 16:01:17 UTC (rev 7504)
@@ -6,6 +6,6 @@
display /isolinux/boot.msg
label install
- kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
+ kernel /runnix/runnix
+ append initrd=/runnix/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
Modified: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-03 16:01:17 UTC (rev 7504)
@@ -4,6 +4,6 @@
display /isolinux/boot.msg
label install
- kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
+ kernel /runnix/runnix
+ append initrd=/runnix/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-03 16:01:17 UTC (rev 7504)
@@ -61,8 +61,8 @@
touch ${RUNDIR}/os/serialflag
fi
cp -p ${SYSLINUX_DIR}/core/isolinux.bin ${RUNDIR}/isolinux/isolinux.bin
- cp -p ${KERNEL} ${RUNDIR}/runnix
- cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
+ cp -p ${KERNEL} ${RUNDIR}/runnix/runnix
+ cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix/runnix.img
if [ -n "$ISO_DIR" ]; then
cp "$ISO_DIR"/*.img.gz ${RUNDIR}/os/
@@ -71,11 +71,13 @@
fi
gen_image_sha1_files ${RUNDIR}/os
- rm -f ${ISO_NAME}
+ cp -p docs/ChangeLog.txt "${RUNDIR}/${ISO_NAME%.iso}.txt"
+ rm -f "${ISO_NAME}"
+
echo "Generating ISO '${ISO_NAME}' ..."
sudo genisoimage \
- -o ${ISO_NAME} \
+ -o "${ISO_NAME}" \
-b isolinux/isolinux.bin \
-c isolinux/boot.cat \
-V 'AstLinux ISO' \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-09 19:15:18
|
Revision: 7511
http://sourceforge.net/p/astlinux/code/7511
Author: abelbeck
Date: 2016-02-09 19:15:16 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
add ddclient package, no longer use inadyn package
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/inadyn/Config.in
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/package/webinterface/altweb/common/version.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/ddclient/
branches/1.0/package/ddclient/Config.in
branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
branches/1.0/package/ddclient/ddclient.conf
branches/1.0/package/ddclient/ddclient.mk
branches/1.0/package/ddclient/dynamicdns.init
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:38 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:48 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:39 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:51 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:36 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:45 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:43 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -570,6 +570,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -457,6 +457,7 @@
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
source "package/darkstat/Config.in"
+source "package/ddclient/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dhcp/Config.in"
endif
Added: branches/1.0/package/ddclient/Config.in
===================================================================
--- branches/1.0/package/ddclient/Config.in (rev 0)
+++ branches/1.0/package/ddclient/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_DDCLIENT
+ bool "ddclient"
+ select BR2_PACKAGE_PERL
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_CURL
+ default n
+ help
+ DDclient is a Perl client used to update dynamic DNS entries for
+ accounts on a Dynamic DNS Network Service Provider.
+
+ http://sourceforge.net/projects/ddclient/
+
Added: branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,6 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -1,3 +1,2 @@
+ #!/usr/bin/perl -w
+-#!/usr/local/bin/perl -w
+ ######################################################################
Added: branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,11 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -3072,7 +3072,7 @@
+ $status_text = $var{'TEXT'} if exists $var{'TEXT'};
+ $status_ip = $var{'IP'} if exists $var{'IP'};
+
+- if ($status eq 'SUCCESS' || ($status eq 'ERROR' && $var{'CODE'} eq '707')) {
++ if ($status eq 'SUCCESS' || ($status eq 'ERROR' && ($var{'CODE'} eq '707' || $var{'CODE'} eq '702'))) {
+ $config{$h}{'ip'} = $status_ip;
+ $config{$h}{'mtime'} = $now;
+ $config{$h}{'status'} = 'good';
Added: branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,38 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:00:02.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:00:51.000000000 -0500
+@@ -1916,7 +1916,7 @@
+ if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) {
+ $use_ssl = 1;
+ $default_port = 443;
+- load_ssl_support;
++ #load_ssl_support;
+ } else {
+ $use_ssl = 0;
+ $default_port = 80;
+@@ -1953,14 +1953,18 @@
+ debug("skipped network connection");
+ verbose("SENDING:", "%s", $request);
+ } elsif ($use_ssl) {
+- $sd = IO::Socket::SSL->new(
+- PeerAddr => $peer,
+- PeerPort => $port,
+- Proto => 'tcp',
+- MultiHomed => 1,
+- Timeout => opt('timeout'),
+- );
+- defined $sd or warning("cannot connect to $peer:$port socket: $@ " . IO::Socket::SSL::errstr());
++ $0 = sprintf("%s - curl sending to %s port %s", $program, $peer, $port);
++ my $timeout = opt('timeout');
++
++ $reply = <<`CURL_SSL`;
++/usr/bin/curl -ksi0 --user '${login}:${password}' --user-agent '${program}/${version}' \\
++ --connect-timeout $timeout --max-time $timeout \\
++ --url 'https://${server}/${url}' 2>/dev/null
++CURL_SSL
++
++ if (! $reply) {
++ warning("curl cannot connect to $peer:$port");
++ }
+ } else {
+ $sd = IO::Socket::INET->new(
+ PeerAddr => $peer,
Added: branches/1.0/package/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/ddclient/ddclient.conf (rev 0)
+++ branches/1.0/package/ddclient/ddclient.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,106 @@
+daemon=@DELAY@
+@USE_WEB@use=web, web=@WEB_STR@
+@USE_IF@use=if, if=@EXTIF@
+#@zoneedit@>
+#@zoneedit@>## ZoneEdit
+#@zoneedit@>ssl=yes
+#@zoneedit@>server=dynamic.zoneedit.com
+#@zoneedit@>protocol=zoneedit1
+#@zoneedit@>login=@DDUSER@
+#@zoneedit@>password=@DDPASS@
+#@zoneedit@>@DDHOST@
+#@dyndns@>
+#@dyndns@>## dyndns.org dynamic addresses
+#@dyndns@>server=members.dyndns.org
+#@dyndns@>protocol=dyndns2
+#@dyndns@>login=@DDUSER@
+#@dyndns@>password=@DDPASS@
+#@dyndns@>@DDHOST@
+#@dyndns-static@>
+#@dyndns-static@>## dyndns.org static addresses
+#@dyndns-static@>server=members.dyndns.org
+#@dyndns-static@>protocol=dyndns2
+#@dyndns-static@>login=@DDUSER@
+#@dyndns-static@>password=@DDPASS@
+#@dyndns-static@>static=yes, @DDHOST@
+#@dyndns-custom@>
+#@dyndns-custom@>## dyndns.org custom addresses
+#@dyndns-custom@>server=members.dyndns.org
+#@dyndns-custom@>protocol=dyndns2
+#@dyndns-custom@>login=@DDUSER@
+#@dyndns-custom@>password=@DDPASS@
+#@dyndns-custom@>custom=yes, @DDHOST@
+#@no-ip@>
+#@no-ip@>## No-IP
+#@no-ip@>server=dynupdate.no-ip.com
+#@no-ip@>protocol=noip
+#@no-ip@>login=@DDUSER@
+#@no-ip@>password=@DDPASS@
+#@no-ip@>@DDHOST@
+#@freedns@>
+#@freedns@>## FreeDNS
+#@freedns@>server=freedns.afraid.org
+#@freedns@>protocol=freedns
+#@freedns@>login=@DDUSER@
+#@freedns@>password=@DDPASS@
+#@freedns@>@DDHOST@
+#@dnsomatic@>
+#@dnsomatic@>## DNS-O-MATIC
+#@dnsomatic@>ssl=yes
+#@dnsomatic@>server=updates.dnsomatic.com
+#@dnsomatic@>protocol=dyndns2
+#@dnsomatic@>login=@DDUSER@
+#@dnsomatic@>password=@DDPASS@
+#@dnsomatic@>@DDHOST@
+#@pairnic@>
+#@pairnic@>## pairNIC
+#@pairnic@>ssl=yes
+#@pairnic@>server=dynamic.pairnic.com
+#@pairnic@>protocol=dyndns2
+#@pairnic@>login=@DDUSER@
+#@pairnic@>password=@DDPASS@
+#@pairnic@>@DDHOST@
+#@nsupdate-ipv4@>
+#@nsupdate-ipv4@>## nsupdate.info
+#@nsupdate-ipv4@>ssl=yes
+#@nsupdate-ipv4@>server=ipv4.nsupdate.info
+#@nsupdate-ipv4@>protocol=dyndns2
+#@nsupdate-ipv4@>login=@DDUSER@
+#@nsupdate-ipv4@>password=@DDPASS@
+#@nsupdate-ipv4@>@DDHOST@
+#@easydns@>
+#@easydns@>## EasyDNS
+#@easydns@>server=members.easydns.com
+#@easydns@>protocol=easydns
+#@easydns@>login=@DDUSER@
+#@easydns@>password=@DDPASS@
+#@easydns@>@DDHOST@
+#@dnspark@>
+#@dnspark@>## dnspark.com
+#@dnspark@>server=www.dnspark.com
+#@dnspark@>protocol=dnspark
+#@dnspark@>login=@DDUSER@
+#@dnspark@>password=@DDPASS@
+#@dnspark@>@DDHOST@
+#@namecheap@>
+#@namecheap@>## NameCheap
+#@namecheap@>server=dynamicdns.park-your-domain.com
+#@namecheap@>protocol=namecheap
+#@namecheap@>login=@DDUSER@
+#@namecheap@>password=@DDPASS@
+#@namecheap@>@DDHOST@
+#@changeip@>
+#@changeip@>## ChangeIP
+#@changeip@>server=nic.changeip.com
+#@changeip@>protocol=changeip
+#@changeip@>login=@DDUSER@
+#@changeip@>password=@DDPASS@
+#@changeip@>@DDHOST@
+#@dtdns@>
+#@dtdns@>## DtDNS
+#@dtdns@>server=www.dtdns.com
+#@dtdns@>protocol=dtdns
+#@dtdns@>client=ddclient
+#@dtdns@>password=@DDPASS@
+#@dtdns@>@DDHOST@
+
Added: branches/1.0/package/ddclient/ddclient.mk
===================================================================
--- branches/1.0/package/ddclient/ddclient.mk (rev 0)
+++ branches/1.0/package/ddclient/ddclient.mk 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,23 @@
+#############################################################
+#
+# ddclient
+#
+#############################################################
+DDCLIENT_VERSION = 3.8.3
+DDCLIENT_SOURCE = ddclient-$(DDCLIENT_VERSION).tar.gz
+DDCLIENT_SITE = http://downloads.sourceforge.net/project/ddclient/ddclient/ddclient-$(DDCLIENT_VERSION)
+
+define DDCLIENT_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D package/ddclient/dynamicdns.init $(TARGET_DIR)/etc/init.d/dynamicdns
+ $(INSTALL) -m 0755 -D $(@D)/ddclient $(TARGET_DIR)/usr/sbin/ddclient
+ $(INSTALL) -m 0644 -D package/ddclient/ddclient.conf $(TARGET_DIR)/stat/etc/ddclient.conf
+ ln -sf /tmp/etc/ddclient.conf $(TARGET_DIR)/etc/ddclient.conf
+endef
+
+define DDCLIENT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/dynamicdns
+ rm -f $(TARGET_DIR)/usr/sbin/ddclient
+ rm -f $(TARGET_DIR)/stat/etc/ddclient.conf
+endef
+
+$(eval $(call GENTARGETS,package,ddclient))
Added: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init (rev 0)
+++ branches/1.0/package/ddclient/dynamicdns.init 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+gen_ddclient_conf()
+{
+ local use_web="" use_if="#" web_str delay service
+
+ if [ ! -x /usr/sbin/ddclient ]; then
+ echo "dynamicdns: Script \"/usr/sbin/ddclient\" not found, exiting." >&2
+ exit 1
+ fi
+
+ delay="360"
+
+ if [ -z "$DDGETIP" ]; then
+ web_str="myip.dnsomatic.com/"
+ elif [ "$DDGETIP" = "interface" ]; then
+ use_web="#"
+ use_if=""
+ web_str="$DDGETIP/"
+ delay="120"
+ elif [ "$DDGETIP" = "checkip.dyndns.org" -o "$DDGETIP" = "checkip.dyndns.com" ]; then
+ web_str="$DDGETIP/, web-skip='IP Address'"
+ else
+ web_str="$DDGETIP/"
+ fi
+
+ # Handle Service Types
+ case "$DDSERVICE" in
+ 'de...@zo...') service="zoneedit" ;;
+ 'dy...@dy...') service="dyndns" ;;
+ 'st...@dy...') service="dyndns-static" ;;
+ 'cu...@dy...') service="dyndns-custom" ;;
+ 'de...@no...') service="no-ip" ;;
+ 'de...@fr...') service="freedns" ;;
+ 'de...@dn...') service="dnsomatic" ;;
+ 'de...@pa...') service="pairnic" ;;
+ 'de...@ns...') service="nsupdate-ipv4" ;;
+ *) service="$(echo "$DDSERVICE" | tr -d '^$*[]|"')" ;; # sanitize for sed regex
+ esac
+
+ if [ -n "$DDUSER" -a -n "$DDPASS" -a -n "$DDHOST" ]; then
+
+ # Genearate /etc/ddclient.conf configuration file
+ if [ -f /mnt/kd/ddclient.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/ddclient.conf file.
+" >/tmp/etc/ddclient.conf
+ cat /mnt/kd/ddclient.conf >>/tmp/etc/ddclient.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated ddclient config will use /mnt/kd/ddclient.conf if it exists.
+" >/tmp/etc/ddclient.conf
+ cat /stat/etc/ddclient.conf >>/tmp/etc/ddclient.conf
+ fi
+
+ sed -i -e "s|^#@${service}@>||" \
+ -e '/^#@/ d' \
+ /tmp/etc/ddclient.conf
+
+ sed -i -e "s|@DDUSER@|${DDUSER}|g" \
+ -e "s|@DDPASS@|${DDPASS}|g" \
+ -e "s|@DDHOST@|${DDHOST}|g" \
+ -e "s|@EXTIF@|${EXTIF}|g" \
+ -e "s|@EXT2IF@|${EXT2IF}|g" \
+ -e "s|@DELAY@|${delay}|g" \
+ -e "s|@USE_WEB@|${use_web}|g" \
+ -e "s|@USE_IF@|${use_if}|g" \
+ -e "s|@WEB_STR@|${web_str}|g" \
+ /tmp/etc/ddclient.conf
+
+ chmod 600 /tmp/etc/ddclient.conf
+ fi
+}
+
+init () {
+
+ if [ -f /tmp/etc/ddclient.conf ]; then
+ rm /tmp/etc/ddclient.conf
+ fi
+
+ if [ "$DDCLIENT" = "ddclient" -o "$DDCLIENT" = "inadyn" -o -z "$DDCLIENT" ]; then # unset default for backward compatibility
+ gen_ddclient_conf
+ fi
+}
+
+start () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ echo "Starting dynamicdns (ddclient)..."
+ ddclient -syslog -file /etc/ddclient.conf -cache /var/db/ddclient.cache -pid /var/run/ddclient.pid
+ fi
+}
+
+stop () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ if [ -f /var/run/ddclient.pid ]; then
+ echo "Stopping dynamicdns (ddclient)..."
+ kill $(cat /var/run/ddclient.pid) >/dev/null 2>&1
+ fi
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Property changes on: branches/1.0/package/ddclient/dynamicdns.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/inadyn/Config.in
===================================================================
--- branches/1.0/package/inadyn/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/inadyn/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_INADYN
+ depends on !BR2_PACKAGE_DDCLIENT
bool "inadyn"
default n
help
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -82,11 +82,16 @@
$select_dyndns = array (
'User Defined >>>' => '',
+ 'ChangeIP' => 'changeip',
'DNS-O-Matic' => 'de...@dn...',
+ 'DNS Park' => 'dnspark',
+ 'DtDNS' => 'dtdns',
'DynDNS' => 'dy...@dy...',
'DynDNS [custom]' => 'cu...@dy...',
'DynDNS [static]' => 'st...@dy...',
+ 'EasyDNS' => 'easydns',
'FreeDNS' => 'de...@fr...',
+ 'NameCheap' => 'namecheap',
'No-IP' => 'de...@no...',
'nsupdate.info' => 'de...@ns...',
'pairNIC' => 'de...@pa...',
@@ -1951,15 +1956,13 @@
putHtml('<strong>Dynamic DNS Update:</strong>');
if (($dd_client = getVARdef($db, 'DDCLIENT', $cur_db)) === '') {
if (getVARdef($db, 'DDUSER', $cur_db) !== '' && getVARdef($db, 'DDPASS', $cur_db) !== '') {
- $dd_client = 'inadyn';
+ $dd_client = 'ddclient';
}
}
putHtml('<select name="dd_client">');
putHtml('<option value="none">disabled</option>');
- $sel = ($dd_client === 'inadyn') ? ' selected="selected"' : '';
- putHtml('<option value="inadyn"'.$sel.'>inadyn</option>');
- $sel = ($dd_client === 'ddclient') ? ' selected="selected"' : '';
- putHtml('<option value="ddclient"'.$sel.'>ddclient</option>');
+ $sel = ($dd_client === 'ddclient' || $dd_client === 'inadyn') ? ' selected="selected"' : '';
+ putHtml('<option value="ddclient"'.$sel.'>enabled</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -105,7 +105,7 @@
if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd' || $process === 'kamailio') {
$path .= $process.'/';
} elseif ($process === 'dynamicdns') {
- if (is_file($path.'ddclient.pid') || is_file($path.'inadyn.pid')) {
+ if (is_file($path.'ddclient.pid')) {
$str = $running;
} else {
$str = $stopped;
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.35';
+$GUI_VERSION = '1.8.36';
?>
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -200,9 +200,9 @@
#PPPOE_RESTART_DELAY=2
## Dynamic DNS Support
-## Both "inadyn" and "ddclient" clients are supported.
-## For a list of valid DDSERVICE names, see the ouput of "inadyn".
-#DDCLIENT="ddclient" # "none", "inadyn" or "ddclient", unset defaults to "inadyn" for backward compatibility
+## The "ddclient" client is supported.
+## For a list of valid DDSERVICE names, issue "ddclient -help".
+#DDCLIENT="ddclient" # "none", "ddclient", unset defaults to "ddclient" for backward compatibility
#DDSERVICE=
#DDUSER=
#DDPASS=
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix-iso.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7496 Configuration
-# Mon Feb 1 17:42:11 2016
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:09 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -599,6 +599,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:40 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:03 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -600,6 +600,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:21 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:23 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:14 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7339 Configuration
-# Sun Nov 22 15:51:12 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:26 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -551,6 +551,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-13 00:28:45
|
Revision: 7528
http://sourceforge.net/p/astlinux/code/7528
Author: abelbeck
Date: 2016-02-13 00:28:43 +0000 (Sat, 13 Feb 2016)
Log Message:
-----------
arp-scan, new package, patched to share mac2vendor OUI database, only adds 55 KB uncompressed
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/arp-scan/
branches/1.0/package/arp-scan/Config.in
branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch
branches/1.0/package/arp-scan/arp-scan.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux-ast11.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:48 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux-ast13.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:51 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux18.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:45 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/initrd.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:57 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -559,6 +559,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/package/Config.in 2016-02-13 00:28:43 UTC (rev 7528)
@@ -443,6 +443,7 @@
source "package/apcupsd/Config.in"
source "package/argus/Config.in"
source "package/arnofw/Config.in"
+source "package/arp-scan/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
source "package/bluez_utils/Config.in"
Added: branches/1.0/package/arp-scan/Config.in
===================================================================
--- branches/1.0/package/arp-scan/Config.in (rev 0)
+++ branches/1.0/package/arp-scan/Config.in 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_ARP_SCAN
+ bool "arp-scan"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ # mac2vendor is only a runtime dependency
+ select BR2_PACKAGE_MAC2VENDOR
+ help
+ The ARP scanner
+
+ https://github.com/royhills/arp-scan/
+
+ http://linux.die.net/man/1/arp-scan
+
Added: branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch
===================================================================
--- branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch (rev 0)
+++ branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,54 @@
+--- arp-scan-1.9/arp-scan.c.orig 2016-02-12 16:06:08.000000000 -0600
++++ arp-scan-1.9/arp-scan.c 2016-02-12 16:48:27.000000000 -0600
+@@ -331,32 +331,21 @@
+ * Create MAC/Vendor hash table if quiet if not in effect.
+ */
+ if (!quiet_flag) {
+- char *fn;
++ const char *list = "0123456789ABCDEF";
++ const char *cp;
++ char fn[32];
+ int count;
+
+ if ((hash_table = hash_new()) == NULL)
+ err_sys("hash_new");
+
+- fn = get_mac_vendor_filename(ouifilename, DATADIR, OUIFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d IEEE OUI/Vendor entries from %s.",
+- count, fn);
+- free(fn);
+-
+- fn = get_mac_vendor_filename(iabfilename, DATADIR, IABFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d IEEE IAB/Vendor entries from %s.",
+- count, fn);
+- free(fn);
+-
+- fn = get_mac_vendor_filename(macfilename, DATADIR, MACFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d MAC/Vendor entries from %s.",
+- count, fn);
+- free(fn);
++ for (cp = list; *cp != '\0'; cp++) {
++ snprintf(fn, 32, "/usr/share/oui-db/xxxxx%c", *cp);
++ count = add_mac_vendor(hash_table, fn);
++ if (verbose > 1 && count > 0)
++ warn_msg("DEBUG: Loaded %d IEEE OUI/Vendor entries from %s.",
++ count, fn);
++ }
+ }
+ /*
+ * Populate the list from the specified file if --file was specified, or
+@@ -2269,7 +2258,7 @@
+ add_mac_vendor(struct hash_control *table, const char *map_filename) {
+ static int first_call=1;
+ FILE *fp; /* MAC/Vendor file handle */
+- static const char *oui_pat_str = "([^\t]+)\t[\t ]*([^\t\r\n]+)";
++ static const char *oui_pat_str = "([^~]+)~[\t ]*([^\t\r\n]+)";
+ static regex_t oui_pat;
+ regmatch_t pmatch[3];
+ size_t key_len;
Added: branches/1.0/package/arp-scan/arp-scan.mk
===================================================================
--- branches/1.0/package/arp-scan/arp-scan.mk (rev 0)
+++ branches/1.0/package/arp-scan/arp-scan.mk 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,20 @@
+################################################################################
+#
+# arp-scan
+#
+################################################################################
+ARP_SCAN_VERSION = 1.9
+ARP_SCAN_SOURCE = arp-scan-$(ARP_SCAN_VERSION).tar.gz
+ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION)
+
+ARP_SCAN_DEPENDENCIES = libpcap
+
+define ARP_SCAN_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/arp-scan $(TARGET_DIR)/usr/bin/arp-scan
+endef
+
+define ARP_SCAN_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/arp-scan
+endef
+
+$(eval $(call AUTOTARGETS,package,arp-scan))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/runnix-iso.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:09 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -587,6 +587,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/runnix.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:03 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -588,6 +588,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:21 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:23 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:14 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:26 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -540,6 +540,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-17 18:49:10
|
Revision: 7537
http://sourceforge.net/p/astlinux/code/7537
Author: abelbeck
Date: 2016-02-17 18:49:08 +0000 (Wed, 17 Feb 2016)
Log Message:
-----------
eglibc toolchain, security fixes: CVE-2015-7547, CVE-2015-1472, CVE-2014-9402, CVE-2015-1781, CVE-2014-8121 and a couple important bug fixes to allow the security patches to apply cleanly
Note: At this time we are not able to demonstate Google's proof-of-concept for CVE-2015-7547 with previously un-patched eglibc
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/README
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/initrd.config
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/100-CVE-2014-8121.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/101-CVE-2014-9402.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/102-CVE-2015-1472.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/103-CVE-2015-1781.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/110-submitted-resolv-first-query-failure.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/120-gethostbyname4-memory-leak.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/122-resolv-reuse-fd.patch
branches/1.0/crosstool-ng-src/patches/eglibc/2_18/130-CVE-2015-7547-getaddrinfo.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/astlinux-ast11.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/astlinux-ast13.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/astlinux18.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/crosstool-ng-src/README 2016-02-17 18:49:08 UTC (rev 7537)
@@ -3,7 +3,7 @@
## http://crosstool-ng.org
##
## Building the eglibc toolchain for AstLinux 1.x using Buildroot
-## The resulting toolchain is output to $HOME/astlinux/x-tools-1.20.0-3.2
+## The resulting toolchain is output to $HOME/astlinux/x-tools-1.20.0-3.2p1
## Make sure you have a $HOME/astlinux/ directory.
##
## Note: If "crosstool-ng-1.20.0" is already installed, jump to "## Build i586 32-bit toolchain ##"
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -25,7 +25,7 @@
#
CT_LOCAL_TARBALLS_DIR=""
CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.20.0-3.2/${CT_TARGET}"
+CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.20.0-3.2p1/${CT_TARGET}"
CT_INSTALL_DIR="${CT_PREFIX_DIR}"
CT_RM_RF_PREFIX_DIR=y
CT_REMOVE_DOCS=y
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -25,7 +25,7 @@
#
CT_LOCAL_TARBALLS_DIR=""
CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.20.0-3.2/${CT_TARGET}"
+CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.20.0-3.2p1/${CT_TARGET}"
CT_INSTALL_DIR="${CT_PREFIX_DIR}"
CT_RM_RF_PREFIX_DIR=y
CT_REMOVE_DOCS=y
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/100-CVE-2014-8121.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/100-CVE-2014-8121.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/100-CVE-2014-8121.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,17 @@
+2015-04-29 Florian Weimer <fw...@re...>
+
+ [BZ #18007]
+ * nss/nss_files/files-XXX.c (CONCAT): Always enable stayopen.
+ (CVE-2014-8121)
+
+--- a/nss/nss_files/files-XXX.c
++++ b/nss/nss_files/files-XXX.c
+@@ -134,7 +134,7 @@ CONCAT(_nss_files_set,ENTNAME) (int stayopen)
+
+ __libc_lock_lock (lock);
+
+- status = internal_setent (stayopen);
++ status = internal_setent (1);
+
+ if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
+ {
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/101-CVE-2014-9402.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/101-CVE-2014-9402.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/101-CVE-2014-9402.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,19 @@
+2014-12-16 Florian Weimer <fw...@re...>
+
+ [BZ #17630]
+ * resolv/nss_dns/dns-network.c (getanswer_r): Iterate over alias
+ names.
+
+--- a/resolv/nss_dns/dns-network.c
++++ b/resolv/nss_dns/dns-network.c
+@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
+
+ case BYNAME:
+ {
+- char **ap = result->n_aliases++;
+- while (*ap != NULL)
++ char **ap;
++ for (ap = result->n_aliases; *ap != NULL; ++ap)
+ {
+ /* Check each alias name for being of the forms:
+ 4.3.2.1.in-addr.arpa = net 1.2.3.4
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/102-CVE-2015-1472.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/102-CVE-2015-1472.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/102-CVE-2015-1472.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,82 @@
+2015-02-05 Paul Pluzhnikov <ppl...@go...>
+
+ [BZ #16618]
+ * stdio-common/tst-sscanf.c (main): Test for buffer overflow.
+ * stdio-common/vfscanf.c (_IO_vfscanf_internal): Compute needed
+ size in bytes. Store needed elements in wpmax. Use needed size
+ in bytes for extend_alloca.
+
+--- a/stdio-common/tst-sscanf.c
++++ b/stdio-common/tst-sscanf.c
+@@ -232,5 +232,38 @@
+ }
+ }
+
++ /* BZ #16618
++ The test will segfault during SSCANF if the buffer overflow
++ is not fixed. The size of `s` is such that it forces the use
++ of malloc internally and this triggers the incorrect computation.
++ Thus the value for SIZE is arbitrariy high enough that malloc
++ is used. */
++ {
++#define SIZE 131072
++ CHAR *s = malloc ((SIZE + 1) * sizeof (*s));
++ if (s == NULL)
++ abort ();
++ for (size_t i = 0; i < SIZE; i++)
++ s[i] = L('0');
++ s[SIZE] = L('\0');
++ int i = 42;
++ /* Scan multi-digit zero into `i`. */
++ if (SSCANF (s, L("%d"), &i) != 1)
++ {
++ printf ("FAIL: bug16618: SSCANF did not read one input item.\n");
++ result = 1;
++ }
++ if (i != 0)
++ {
++ printf ("FAIL: bug16618: Value of `i` was not zero as expected.\n");
++ result = 1;
++ }
++ free (s);
++ if (result != 1)
++ printf ("PASS: bug16618: Did not crash.\n");
++#undef SIZE
++ }
++
++
+ return result;
+ }
+--- a/stdio-common/vfscanf.c
++++ b/stdio-common/vfscanf.c
+@@ -272,9 +272,10 @@
+ if (__builtin_expect (wpsize == wpmax, 0)) \
+ { \
+ CHAR_T *old = wp; \
+- size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \
+- ? UCHAR_MAX + 1 : 2 * wpmax); \
+- if (use_malloc || !__libc_use_alloca (newsize)) \
++ bool fits = __builtin_expect (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 2, 1); \
++ size_t wpneed = MAX (UCHAR_MAX + 1, 2 * wpmax); \
++ size_t newsize = fits ? wpneed * sizeof (CHAR_T) : SIZE_MAX; \
++ if (!__libc_use_alloca (newsize)) \
+ { \
+ wp = realloc (use_malloc ? wp : NULL, newsize); \
+ if (wp == NULL) \
+@@ -286,14 +287,13 @@
+ } \
+ if (! use_malloc) \
+ MEMCPY (wp, old, wpsize); \
+- wpmax = newsize; \
++ wpmax = wpneed; \
+ use_malloc = true; \
+ } \
+ else \
+ { \
+ size_t s = wpmax * sizeof (CHAR_T); \
+- wp = (CHAR_T *) extend_alloca (wp, s, \
+- newsize * sizeof (CHAR_T)); \
++ wp = (CHAR_T *) extend_alloca (wp, s, newsize); \
+ wpmax = s / sizeof (CHAR_T); \
+ if (old != NULL) \
+ MEMCPY (wp, old, wpsize); \
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/103-CVE-2015-1781.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/103-CVE-2015-1781.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/103-CVE-2015-1781.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,18 @@
+2015-04-21 Arjun Shankar <arj...@lo...>
+
+ [BZ #18287]
+ * resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
+ based on padding. (CVE-2015-1781)
+
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
+ int have_to_map = 0;
+ uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
+ buffer += pad;
+- if (__builtin_expect (buflen < sizeof (struct host_data) + pad, 0))
++ buflen = buflen > pad ? buflen - pad : 0;
++ if (__builtin_expect (buflen < sizeof (struct host_data), 0))
+ {
+ /* The buffer is too small. */
+ too_small:
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/110-submitted-resolv-first-query-failure.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/110-submitted-resolv-first-query-failure.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/110-submitted-resolv-first-query-failure.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,40 @@
+eglibc-2.13/debian/patches/any/submitted-resolv-first-query-failure.diff
+@@ -0,0 +1,38 @@
+2012-02-02 Aurelien Jarno <au...@de...>
+
+ * resolv/res_query.c(__libc_res_nsearch): succeed if the first
+ query fails, but the second query succeeds.
+
+---
+ resolv/res_query.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -378,7 +378,7 @@
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2);
+- if (ret > 0 || trailing_dot)
++ if (ret > 0 || (ret == 0 && *resplen2 > 0) || trailing_dot)
+ return (ret);
+ saved_herrno = h_errno;
+ tried_as_is++;
+@@ -418,7 +418,7 @@
+ answer, anslen, answerp,
+ answerp2, nanswerp2,
+ resplen2);
+- if (ret > 0)
++ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+
+ if (answerp && *answerp != answer) {
+@@ -487,7 +487,7 @@
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2);
+- if (ret > 0)
++ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+ }
+
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/120-gethostbyname4-memory-leak.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/120-gethostbyname4-memory-leak.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/120-gethostbyname4-memory-leak.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,449 @@
+eglibc-2.13/debian/patches/any/cvs-gethostbyname4-memory-leak.diff
+@@ -0,0 +1,447 @@
+2014-02-18 Andreas Schwab <sc...@su...>
+
+ [BZ #16574]
+ * resolv/res_send.c (send_vc): Add parameter ansp2_malloced.
+ Store non-zero if the second buffer was newly allocated.
+ (send_dg): Likewise.
+ (__libc_res_nsend): Add parameter ansp2_malloced and pass it down
+ to send_vc and send_dg.
+ (res_nsend): Pass NULL for ansp2_malloced.
+ * resolv/res_query.c (__libc_res_nquery): Add parameter
+ answerp2_malloced and pass it down to __libc_res_nsend.
+ (res_nquery): Pass additional NULL to __libc_res_nquery.
+ (__libc_res_nsearch): Add parameter answerp2_malloced and pass it
+ down to __libc_res_nquery and __libc_res_nquerydomain. Deallocate
+ second answer buffer if answerp2_malloced was set.
+ (res_nsearch): Pass additional NULL to __libc_res_nsearch.
+ (__libc_res_nquerydomain): Add parameter
+ answerp2_malloced and pass it down to __libc_res_nquery.
+ (res_nquerydomain): Pass additional NULL to
+ __libc_res_nquerydomain.
+ * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r): Pass
+ additional NULL to __libc_res_nsend and __libc_res_nquery.
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Pass
+ additional NULL to __libc_res_nsearch.
+ (_nss_dns_gethostbyname4_r): Revert last change. Use new
+ parameter of __libc_res_nsearch to check for separately allocated
+ second buffer.
+ (_nss_dns_gethostbyaddr2_r): Pass additional NULL to
+ __libc_res_nquery.
+ * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Pass
+ additional NULL to __libc_res_nquery.
+ * resolv/gethnamaddr.c (gethostbyname2): Pass additional NULL to
+ __libc_res_nsearch.
+ (gethostbyaddr): Pass additional NULL to __libc_res_nquery.
+ * include/resolv.h: Update prototypes of __libc_res_nquery,
+ __libc_res_nsearch, __libc_res_nsend.
+
+2014-02-13 Andreas Schwab <sc...@su...>
+
+ [BZ #16574]
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname4_r): Free the
+ second answer buffer if it was separately allocated.
+
+--- a/include/resolv.h
++++ b/include/resolv.h
+@@ -58,11 +58,11 @@
+ libc_hidden_proto (__res_state)
+
+ int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,
+- u_char **, u_char **, int *, int *);
++ u_char **, u_char **, int *, int *, int *);
+ int __libc_res_nsearch (res_state, const char *, int, int, u_char *, int,
+- u_char **, u_char **, int *, int *);
++ u_char **, u_char **, int *, int *, int *);
+ int __libc_res_nsend (res_state, const u_char *, int, const u_char *, int,
+- u_char *, int, u_char **, u_char **, int *, int *)
++ u_char *, int, u_char **, u_char **, int *, int *, int *)
+ attribute_hidden;
+
+ libresolv_hidden_proto (_sethtent)
+--- a/resolv/gethnamaddr.c
++++ b/resolv/gethnamaddr.c
+@@ -621,7 +621,7 @@
+ buf.buf = origbuf = (querybuf *) alloca (1024);
+
+ if ((n = __libc_res_nsearch(&_res, name, C_IN, type, buf.buf->buf, 1024,
+- &buf.ptr, NULL, NULL, NULL)) < 0) {
++ &buf.ptr, NULL, NULL, NULL, NULL)) < 0) {
+ if (buf.buf != origbuf)
+ free (buf.buf);
+ Dprintf("res_nsearch failed (%d)\n", n);
+@@ -716,12 +716,12 @@
+ buf.buf = orig_buf = (querybuf *) alloca (1024);
+
+ n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf, 1024,
+- &buf.ptr, NULL, NULL, NULL);
++ &buf.ptr, NULL, NULL, NULL, NULL);
+ if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0) {
+ strcpy(qp, "ip6.int");
+ n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf,
+ buf.buf != orig_buf ? MAXPACKET : 1024,
+- &buf.ptr, NULL, NULL, NULL);
++ &buf.ptr, NULL, NULL, NULL, NULL);
+ }
+ if (n < 0) {
+ if (buf.buf != orig_buf)
+--- a/resolv/nss_dns/dns-canon.c
++++ b/resolv/nss_dns/dns-canon.c
+@@ -62,7 +62,7 @@
+ {
+ int r = __libc_res_nquery (&_res, name, ns_c_in, qtypes[i],
+ buf, sizeof (buf), &ansp.ptr, NULL, NULL,
+- NULL);
++ NULL, NULL);
+ if (r > 0)
+ {
+ /* We need to decode the response. Just one question record.
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -195,7 +195,7 @@
+ host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024);
+
+ n = __libc_res_nsearch (&_res, name, C_IN, type, host_buffer.buf->buf,
+- 1024, &host_buffer.ptr, NULL, NULL, NULL);
++ 1024, &host_buffer.ptr, NULL, NULL, NULL, NULL);
+ if (n < 0)
+ {
+ switch (errno)
+@@ -225,7 +225,7 @@
+ n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf->buf,
+ host_buffer.buf != orig_host_buffer
+ ? MAXPACKET : 1024, &host_buffer.ptr,
+- NULL, NULL, NULL);
++ NULL, NULL, NULL, NULL);
+
+ if (n < 0)
+ {
+@@ -308,12 +308,13 @@
+ u_char *ans2p = NULL;
+ int nans2p = 0;
+ int resplen2 = 0;
++ int ans2p_malloced = 0;
+
+ int olderr = errno;
+ enum nss_status status;
+ int n = __libc_res_nsearch (&_res, name, C_IN, T_UNSPEC,
+ host_buffer.buf->buf, 2048, &host_buffer.ptr,
+- &ans2p, &nans2p, &resplen2);
++ &ans2p, &nans2p, &resplen2, &ans2p_malloced);
+ if (n < 0)
+ {
+ switch (errno)
+@@ -340,6 +341,10 @@
+ resplen2, name, pat, buffer, buflen,
+ errnop, herrnop, ttlp);
+
++ /* Check whether ans2p was separately allocated. */
++ if (ans2p_malloced)
++ free (ans2p);
++
+ if (host_buffer.buf != orig_host_buffer)
+ free (host_buffer.buf);
+
+@@ -448,7 +453,7 @@
+ strcpy (qp, "].ip6.arpa");
+ n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR,
+ host_buffer.buf->buf, 1024, &host_buffer.ptr,
+- NULL, NULL, NULL);
++ NULL, NULL, NULL, NULL);
+ if (n >= 0)
+ goto got_it_already;
+ }
+@@ -469,14 +474,14 @@
+ }
+
+ n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
+- 1024, &host_buffer.ptr, NULL, NULL, NULL);
++ 1024, &host_buffer.ptr, NULL, NULL, NULL, NULL);
+ if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0)
+ {
+ strcpy (qp, "ip6.int");
+ n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
+ host_buffer.buf != orig_host_buffer
+ ? MAXPACKET : 1024, &host_buffer.ptr,
+- NULL, NULL, NULL);
++ NULL, NULL, NULL, NULL);
+ }
+ if (n < 0)
+ {
+--- a/resolv/nss_dns/dns-network.c
++++ b/resolv/nss_dns/dns-network.c
+@@ -130,7 +130,7 @@
+ net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
+
+ anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
+- 1024, &net_buffer.ptr, NULL, NULL, NULL);
++ 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
+ if (anslen < 0)
+ {
+ /* Nothing found. */
+@@ -206,7 +206,7 @@
+ net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
+
+ anslen = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
+- 1024, &net_buffer.ptr, NULL, NULL, NULL);
++ 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
+ if (anslen < 0)
+ {
+ /* Nothing found. */
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -98,7 +98,7 @@
+ __libc_res_nquerydomain(res_state statp, const char *name, const char *domain,
+ int class, int type, u_char *answer, int anslen,
+ u_char **answerp, u_char **answerp2, int *nanswerp2,
+- int *resplen2);
++ int *resplen2, int *answerp2_malloced);
+
+ /*
+ * Formulate a normal query, send, and await answer.
+@@ -119,7 +119,8 @@
+ u_char **answerp, /* if buffer needs to be enlarged */
+ u_char **answerp2,
+ int *nanswerp2,
+- int *resplen2)
++ int *resplen2,
++ int *answerp2_malloced)
+ {
+ HEADER *hp = (HEADER *) answer;
+ HEADER *hp2;
+@@ -224,7 +225,8 @@
+ }
+ assert (answerp == NULL || (void *) *answerp == (void *) answer);
+ n = __libc_res_nsend(statp, query1, nquery1, query2, nquery2, answer,
+- anslen, answerp, answerp2, nanswerp2, resplen2);
++ anslen, answerp, answerp2, nanswerp2, resplen2,
++ answerp2_malloced);
+ if (use_malloc)
+ free (buf);
+ if (n < 0) {
+@@ -316,7 +318,7 @@
+ int anslen) /* size of answer buffer */
+ {
+ return __libc_res_nquery(statp, name, class, type, answer, anslen,
+- NULL, NULL, NULL, NULL);
++ NULL, NULL, NULL, NULL, NULL);
+ }
+ libresolv_hidden_def (res_nquery)
+
+@@ -335,7 +337,8 @@
+ u_char **answerp,
+ u_char **answerp2,
+ int *nanswerp2,
+- int *resplen2)
++ int *resplen2,
++ int *answerp2_malloced)
+ {
+ const char *cp, * const *domain;
+ HEADER *hp = (HEADER *) answer;
+@@ -360,7 +363,7 @@
+ if (!dots && (cp = res_hostalias(statp, name, tmp, sizeof tmp))!= NULL)
+ return (__libc_res_nquery(statp, cp, class, type, answer,
+ anslen, answerp, answerp2,
+- nanswerp2, resplen2));
++ nanswerp2, resplen2, answerp2_malloced));
+
+ #ifdef DEBUG
+ if (statp->options & RES_DEBUG)
+@@ -377,7 +380,8 @@
+ if (dots >= statp->ndots || trailing_dot) {
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+- answerp2, nanswerp2, resplen2);
++ answerp2, nanswerp2, resplen2,
++ answerp2_malloced);
+ if (ret > 0 || (ret == 0 && *resplen2 > 0) || trailing_dot)
+ return (ret);
+ saved_herrno = h_errno;
+@@ -386,11 +390,11 @@
+ answer = *answerp;
+ anslen = MAXPACKET;
+ }
+- if (answerp2
+- && (*answerp2 < answer || *answerp2 >= answer + anslen))
++ if (answerp2 && *answerp2_malloced)
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *answerp2_malloced = 0;
+ }
+ }
+
+@@ -417,7 +421,7 @@
+ class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2,
+- resplen2);
++ resplen2, answerp2_malloced);
+ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+
+@@ -425,12 +429,11 @@
+ answer = *answerp;
+ anslen = MAXPACKET;
+ }
+- if (answerp2
+- && (*answerp2 < answer
+- || *answerp2 >= answer + anslen))
++ if (answerp2 && *answerp2_malloced)
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *answerp2_malloced = 0;
+ }
+
+ /*
+@@ -486,7 +489,8 @@
+ && !(tried_as_is || root_on_list)) {
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+- answerp2, nanswerp2, resplen2);
++ answerp2, nanswerp2, resplen2,
++ answerp2_malloced);
+ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+ }
+@@ -498,10 +502,11 @@
+ * else send back meaningless H_ERRNO, that being the one from
+ * the last DNSRCH we did.
+ */
+- if (answerp2 && (*answerp2 < answer || *answerp2 >= answer + anslen))
++ if (answerp2 && *answerp2_malloced)
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *answerp2_malloced = 0;
+ }
+ if (saved_herrno != -1)
+ RES_SET_H_ERRNO(statp, saved_herrno);
+@@ -521,7 +526,7 @@
+ int anslen) /* size of answer */
+ {
+ return __libc_res_nsearch(statp, name, class, type, answer,
+- anslen, NULL, NULL, NULL, NULL);
++ anslen, NULL, NULL, NULL, NULL, NULL);
+ }
+ libresolv_hidden_def (res_nsearch)
+
+@@ -539,7 +544,8 @@
+ u_char **answerp,
+ u_char **answerp2,
+ int *nanswerp2,
+- int *resplen2)
++ int *resplen2,
++ int *answerp2_malloced)
+ {
+ char nbuf[MAXDNAME];
+ const char *longname = nbuf;
+@@ -577,7 +583,7 @@
+ }
+ return (__libc_res_nquery(statp, longname, class, type, answer,
+ anslen, answerp, answerp2, nanswerp2,
+- resplen2));
++ resplen2, answerp2_malloced));
+ }
+
+ int
+@@ -589,7 +595,8 @@
+ int anslen) /* size of answer */
+ {
+ return __libc_res_nquerydomain(statp, name, domain, class, type,
+- answer, anslen, NULL, NULL, NULL, NULL);
++ answer, anslen, NULL, NULL, NULL, NULL,
++ NULL);
+ }
+ libresolv_hidden_def (res_nquerydomain)
+
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -186,12 +186,12 @@
+ static int send_vc(res_state, const u_char *, int,
+ const u_char *, int,
+ u_char **, int *, int *, int, u_char **,
+- u_char **, int *, int *);
++ u_char **, int *, int *, int *);
+ static int send_dg(res_state, const u_char *, int,
+ const u_char *, int,
+ u_char **, int *, int *, int,
+ int *, int *, u_char **,
+- u_char **, int *, int *);
++ u_char **, int *, int *, int *);
+ #ifdef DEBUG
+ static void Aerror(const res_state, FILE *, const char *, int,
+ const struct sockaddr *);
+@@ -343,7 +343,7 @@
+ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ const u_char *buf2, int buflen2,
+ u_char *ans, int anssiz, u_char **ansp, u_char **ansp2,
+- int *nansp2, int *resplen2)
++ int *nansp2, int *resplen2, int *ansp2_malloced)
+ {
+ int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
+
+@@ -546,7 +546,8 @@
+ try = statp->retry;
+ n = send_vc(statp, buf, buflen, buf2, buflen2,
+ &ans, &anssiz, &terrno,
+- ns, ansp, ansp2, nansp2, resplen2);
++ ns, ansp, ansp2, nansp2, resplen2,
++ ansp2_malloced);
+ if (n < 0)
+ return (-1);
+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+@@ -556,7 +557,7 @@
+ n = send_dg(statp, buf, buflen, buf2, buflen2,
+ &ans, &anssiz, &terrno,
+ ns, &v_circuit, &gotsomewhere, ansp,
+- ansp2, nansp2, resplen2);
++ ansp2, nansp2, resplen2, ansp2_malloced);
+ if (n < 0)
+ return (-1);
+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+@@ -646,7 +647,7 @@
+ const u_char *buf, int buflen, u_char *ans, int anssiz)
+ {
+ return __libc_res_nsend(statp, buf, buflen, NULL, 0, ans, anssiz,
+- NULL, NULL, NULL, NULL);
++ NULL, NULL, NULL, NULL, NULL);
+ }
+ libresolv_hidden_def (res_nsend)
+
+@@ -657,7 +658,7 @@
+ const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+ u_char **ansp, int *anssizp,
+ int *terrno, int ns, u_char **anscp, u_char **ansp2, int *anssizp2,
+- int *resplen2)
++ int *resplen2, int *ansp2_malloced)
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+@@ -823,6 +824,8 @@
+ }
+ *thisanssizp = MAXPACKET;
+ *thisansp = newp;
++ if (thisansp == ansp2)
++ *ansp2_malloced = 1;
+ anhp = (HEADER *) newp;
+ len = rlen;
+ } else {
+@@ -1000,7 +1003,7 @@
+ const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+ u_char **ansp, int *anssizp,
+ int *terrno, int ns, int *v_circuit, int *gotsomewhere, u_char **anscp,
+- u_char **ansp2, int *anssizp2, int *resplen2)
++ u_char **ansp2, int *anssizp2, int *resplen2, int *ansp2_malloced)
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+@@ -1175,6 +1178,8 @@
+ if (newp != NULL) {
+ *anssizp = MAXPACKET;
+ *thisansp = ans = newp;
++ if (thisansp == ansp2)
++ *ansp2_malloced = 1;
+ }
+ }
+ HEADER *anhp = (HEADER *) *thisansp;
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/122-resolv-reuse-fd.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/122-resolv-reuse-fd.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/122-resolv-reuse-fd.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,16 @@
+2014-06-03 Andreas Schwab <sc...@su...>
+
+ [BZ #15946]
+ * resolv/res_send.c (send_dg): Reload file descriptor after
+ calling reopen.
+
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1410,6 +1410,7 @@ send_dg(res_state statp,
+ retval = reopen (statp, terrno, ns);
+ if (retval <= 0)
+ return retval;
++ pfd[0].fd = EXT(statp).nssocks[ns];
+ }
+ }
+ goto wait;
Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/130-CVE-2015-7547-getaddrinfo.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/130-CVE-2015-7547-getaddrinfo.patch (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/130-CVE-2015-7547-getaddrinfo.patch 2016-02-17 18:49:08 UTC (rev 7537)
@@ -0,0 +1,540 @@
+eglibc-2.13/debian/patches/any/local-CVE-2015-7547.diff
+@@ -0,0 +1,538 @@
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -1036,7 +1036,10 @@
+ int h_namelen = 0;
+
+ if (ancount == 0)
+- return NSS_STATUS_NOTFOUND;
++ {
++ *h_errnop = HOST_NOT_FOUND;
++ return NSS_STATUS_NOTFOUND;
++ }
+
+ while (ancount-- > 0 && cp < end_of_message && had_error == 0)
+ {
+@@ -1205,7 +1208,14 @@
+ /* Special case here: if the resolver sent a result but it only
+ contains a CNAME while we are looking for a T_A or T_AAAA record,
+ we fail with NOTFOUND instead of TRYAGAIN. */
+- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
++ if (canon != NULL)
++ {
++ *h_errnop = HOST_NOT_FOUND;
++ return NSS_STATUS_NOTFOUND;
++ }
++
++ *h_errnop = NETDB_INTERNAL;
++ return NSS_STATUS_TRYAGAIN;
+ }
+
+
+@@ -1219,11 +1229,101 @@
+
+ enum nss_status status = NSS_STATUS_NOTFOUND;
+
++ /* Combining the NSS status of two distinct queries requires some
++ compromise and attention to symmetry (A or AAAA queries can be
++ returned in any order). What follows is a breakdown of how this
++ code is expected to work and why. We discuss only SUCCESS,
++ TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns
++ that apply (though RETURN and MERGE exist). We make a distinction
++ between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable).
++ A recoverable TRYAGAIN is almost always due to buffer size issues
++ and returns ERANGE in errno and the caller is expected to retry
++ with a larger buffer.
++
++ Lastly, you may be tempted to make significant changes to the
++ conditions in this code to bring about symmetry between responses.
++ Please don't change anything without due consideration for
++ expected application behaviour. Some of the synthesized responses
++ aren't very well thought out and sometimes appear to imply that
++ IPv4 responses are always answer 1, and IPv6 responses are always
++ answer 2, but that's not true (see the implemetnation of send_dg
++ and send_vc to see response can arrive in any order, particlarly
++ for UDP). However, we expect it holds roughly enough of the time
++ that this code works, but certainly needs to be fixed to make this
++ a more robust implementation.
++
++ ----------------------------------------------
++ | Answer 1 Status / | Synthesized | Reason |
++ | Answer 2 Status | Status | |
++ |--------------------------------------------|
++ | SUCCESS/SUCCESS | SUCCESS | [1] |
++ | SUCCESS/TRYAGAIN | TRYAGAIN | [5] |
++ | SUCCESS/TRYAGAIN' | SUCCESS | [1] |
++ | SUCCESS/NOTFOUND | SUCCESS | [1] |
++ | SUCCESS/UNAVAIL | SUCCESS | [1] |
++ | TRYAGAIN/SUCCESS | TRYAGAIN | [2] |
++ | TRYAGAIN/TRYAGAIN | TRYAGAIN | [2] |
++ | TRYAGAIN/TRYAGAIN' | TRYAGAIN | [2] |
++ | TRYAGAIN/NOTFOUND | TRYAGAIN | [2] |
++ | TRYAGAIN/UNAVAIL | TRYAGAIN | [2] |
++ | TRYAGAIN'/SUCCESS | SUCCESS | [3] |
++ | TRYAGAIN'/TRYAGAIN | TRYAGAIN | [3] |
++ | TRYAGAIN'/TRYAGAIN' | TRYAGAIN' | [3] |
++ | TRYAGAIN'/NOTFOUND | TRYAGAIN' | [3] |
++ | TRYAGAIN'/UNAVAIL | UNAVAIL | [3] |
++ | NOTFOUND/SUCCESS | SUCCESS | [3] |
++ | NOTFOUND/TRYAGAIN | TRYAGAIN | [3] |
++ | NOTFOUND/TRYAGAIN' | TRYAGAIN' | [3] |
++ | NOTFOUND/NOTFOUND | NOTFOUND | [3] |
++ | NOTFOUND/UNAVAIL | UNAVAIL | [3] |
++ | UNAVAIL/SUCCESS | UNAVAIL | [4] |
++ | UNAVAIL/TRYAGAIN | UNAVAIL | [4] |
++ | UNAVAIL/TRYAGAIN' | UNAVAIL | [4] |
++ | UNAVAIL/NOTFOUND | UNAVAIL | [4] |
++ | UNAVAIL/UNAVAIL | UNAVAIL | [4] |
++ ----------------------------------------------
++
++ [1] If the first response is a success we return success.
++ This ignores the state of the second answer and in fact
++ incorrectly sets errno and h_errno to that of the second
++ answer. However because the response is a success we ignore
++ *errnop and *h_errnop (though that means you touched errno on
++ success). We are being conservative here and returning the
++ likely IPv4 response in the first answer as a success.
++
++ [2] If the first response is a recoverable TRYAGAIN we return
++ that instead of looking at the second response. The
++ expectation here is that we have failed to get an IPv4 response
++ and should retry both queries.
++
++ [3] If the first response was not a SUCCESS and the second
++ response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN,
++ or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the
++ result from the second response, otherwise the first responses
++ status is used. Again we have some odd side-effects when the
++ second response is NOTFOUND because we overwrite *errnop and
++ *h_errnop that means that a first answer of NOTFOUND might see
++ its *errnop and *h_errnop values altered. Whether it matters
++ in practice that a first response NOTFOUND has the wrong
++ *errnop and *h_errnop is undecided.
++
++ [4] If the first response is UNAVAIL we return that instead of
++ looking at the second response. The expectation here is that
++ it will have failed similarly e.g. configuration failure.
++
++ [5] Testing this code is complicated by the fact that truncated
++ second response buffers might be returned as SUCCESS if the
++ first answer is a SUCCESS. To fix this we add symmetry to
++ TRYAGAIN with the second response. If the second response
++ is a recoverable error we now return TRYAGIN even if the first
++ response was SUCCESS. */
++
+ if (anslen1 > 0)
+ status = gaih_getanswer_slice(answer1, anslen1, qname,
+ &pat, &buffer, &buflen,
+ errnop, h_errnop, ttlp,
+ &first);
++
+ if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND
+ || (status == NSS_STATUS_TRYAGAIN
+ /* We want to look at the second answer in case of an
+@@ -1233,8 +1333,15 @@
+ &pat, &buffer, &buflen,
+ errnop, h_errnop, ttlp,
+ &first);
++ /* Use the second response status in some cases. */
+ if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
+ status = status2;
++ /* Do not return a truncated second response (unless it was
++ unavoidable e.g. unrecoverable TRYAGAIN). */
++ if (status == NSS_STATUS_SUCCESS
++ && (status2 == NSS_STATUS_TRYAGAIN
++ && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
++ status = NSS_STATUS_TRYAGAIN;
+ }
+
+ return status;
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -394,6 +394,7 @@
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+ }
+@@ -433,6 +434,7 @@
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+
+@@ -506,6 +508,7 @@
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+ if (saved_herrno != -1)
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1,3 +1,20 @@
++/* Copyright (C) 2016 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
+ /*
+ * Copyright (c) 1985, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+@@ -360,6 +377,8 @@
+ #ifdef USE_HOOKS
+ if (__builtin_expect (statp->qhook || statp->rhook, 0)) {
+ if (anssiz < MAXPACKET && ansp) {
++ /* Always allocate MAXPACKET, callers expect
++ this specific size. */
+ u_char *buf = malloc (MAXPACKET);
+ if (buf == NULL)
+ return (-1);
+@@ -653,6 +672,77 @@
+
+ /* Private */
+
++/* The send_vc function is responsible for sending a DNS query over TCP
++ to the nameserver numbered NS from the res_state STATP i.e.
++ EXT(statp).nssocks[ns]. The function supports sending both IPv4 and
++ IPv6 queries at the same serially on the same socket.
++
++ Please note that for TCP there is no way to disable sending both
++ queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP
++ and sends the queries serially and waits for the result after each
++ sent query. This implemetnation should be corrected to honour these
++ options.
++
++ Please also note that for TCP we send both queries over the same
++ socket one after another. This technically violates best practice
++ since the server is allowed to read the first query, respond, and
++ then close the socket (to service another client). If the server
++ does this, then the remaining second query in the socket data buffer
++ will cause the server to send the client an RST which will arrive
++ asynchronously and the client's OS will likely tear down the socket
++ receive buffer resulting in a potentially short read and lost
++ response data. This will force the client to retry the query again,
++ and this process may repeat until all servers and connection resets
++ are exhausted and then the query will fail. It's not known if this
++ happens with any frequency in real DNS server implementations. This
++ implementation should be corrected to use two sockets by default for
++ parallel queries.
++
++ The query stored in BUF of BUFLEN length is sent first followed by
++ the query stored in BUF2 of BUFLEN2 length. Queries are sent
++ serially on the same socket.
++
++ Answers to the query are stored firstly in *ANSP up to a max of
++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP
++ is non-NULL (to indicate that modifying the answer buffer is allowed)
++ then malloc is used to allocate a new response buffer and ANSCP and
++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes
++ are needed but ANSCP is NULL, then as much of the response as
++ possible is read into the buffer, but the results will be truncated.
++ When truncation happens because of a small answer buffer the DNS
++ packets header feild TC will bet set to 1, indicating a truncated
++ message and the rest of the socket data will be read and discarded.
++
++ Answers to the query are stored secondly in *ANSP2 up to a max of
++ *ANSSIZP2 bytes, with the actual response length stored in
++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2
++ is non-NULL (required for a second query) then malloc is used to
++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer
++ size and *ANSP2_MALLOCED is set to 1.
++
++ The ANSP2_MALLOCED argument will eventually be removed as the
++ change in buffer pointer can be used to detect the buffer has
++ changed and that the caller should use free on the new buffer.
++
++ Note that the answers may arrive in any order from the server and
++ therefore the first and second answer buffers may not correspond to
++ the first and second queries.
++
++ It is not supported to call this function with a non-NULL ANSP2
++ but a NULL ANSCP. Put another way, you can call send_vc with a
++ single unmodifiable buffer or two modifiable buffers, but no other
++ combination is supported.
++
++ It is the caller's responsibility to free the malloc allocated
++ buffers by detecting that the pointers have changed from their
++ original values i.e. *ANSCP or *ANSP2 has changed.
++
++ If errors are encountered then *TERRNO is set to an appropriate
++ errno value and a zero result is returned for a recoverable error,
++ and a less-than zero result is returned for a non-recoverable error.
++
++ If no errors are encountered then *TERRNO is left unmodified and
++ a the length of the first response in bytes is returned. */
+ static int
+ send_vc(res_state statp,
+ const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+@@ -662,11 +752,7 @@
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+- u_char *ans = *ansp;
+- int orig_anssizp = *anssizp;
+- // XXX REMOVE
+- // int anssiz = *anssizp;
+- HEADER *anhp = (HEADER *) ans;
++ HEADER *anhp = (HEADER *) *ansp;
+ struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
+ int truncating, connreset, resplen, n;
+ struct iovec iov[4];
+@@ -742,6 +828,8 @@
+ * Receive length & response
+ */
+ int recvresp1 = 0;
++ /* Skip the second response if there is no second query.
++ To do that we mark the second response as received. */
+ int recvresp2 = buf2 == NULL;
+ uint16_t rlen16;
+ read_len:
+@@ -778,33 +866,14 @@
+ u_char **thisansp;
+ int *thisresplenp;
+ if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
++ /* We have not received any responses
++ yet or we only have one response to
++ receive. */
+ thisanssizp = anssizp;
+ thisansp = anscp ?: ansp;
+ assert (anscp != NULL || ansp2 == NULL);
+ thisresplenp = &resplen;
+ } else {
+- if (*anssizp != MAXPACKET) {
+- /* No buffer allocated for the first
+- reply. We can try to use the rest
+- of the user-provided buffer. */
+-#ifdef _STRING_ARCH_unaligned
+- *anssizp2 = orig_anssizp - resplen;
+- *ansp2 = *ansp + resplen;
+-#else
+- int aligned_resplen
+- = ((resplen + __alignof__ (HEADER) - 1)
+- & ~(__alignof__ (HEADER) - 1));
+- *anssizp2 = orig_anssizp - aligned_resplen;
+- *ansp2 = *ansp + aligned_resplen;
+-#endif
+- } else {
+- /* The first reply did not fit into the
+- user-provided buffer. Maybe the second
+- answer will. */
+- *anssizp2 = orig_anssizp;
+- *ansp2 = *ansp;
+- }
+-
+ thisanssizp = anssizp2;
+ thisansp = ansp2;
+ thisresplenp = resplen2;
+@@ -812,10 +881,14 @@
+ anhp = (HEADER *) *thisansp;
+
+ *thisresplenp = rlen;
+- if (rlen > *thisanssizp) {
+- /* Yes, we test ANSCP here. If we have two buffers
+- both will be allocatable. */
+- if (__builtin_expect (anscp != NULL, 1)) {
++ /* Is the answer buffer too small? */
++ if (*thisanssizp < rlen) {
++ /* If the current buffer is non-NULL and it's not
++ pointing at the static user-supplied buffer then
++ we can reallocate it. */
++ if (thisansp != NULL && thisansp != ansp) {
++ /* Always allocate MAXPACKET, callers expect
++ this specific size. */
+ u_char *newp = malloc (MAXPACKET);
+ if (newp == NULL) {
+ *terrno = ENOMEM;
+@@ -827,6 +900,9 @@
+ if (thisansp == ansp2)
+ *ansp2_malloced = 1;
+ anhp = (HEADER *) newp;
++ /* A uint16_t can't be larger than MAXPACKET
++ thus it's safe to allocate MAXPACKET but
++ read RLEN bytes instead. */
+ len = rlen;
+ } else {
+ Dprint(statp->options & RES_DEBUG,
+@@ -998,6 +1074,66 @@
+ return 1;
+ }
+
++/* The send_dg function is responsible for sending a DNS query over UDP
++ to the nameserver numbered NS from the res_state STATP i.e.
++ EXT(statp).nssocks[ns]. The function supports IPv4 and IPv6 queries
++ along with the ability to send the query in parallel for both stacks
++ (default) or serially (RES_SINGLKUP). It also supports serial lookup
++ with a close and reopen of the socket used to talk to the server
++ (RES_SNGLKUPREOP) to work around broken name servers.
++
++ The query stored in BUF of BUFLEN length is sent first followed by
++ the query stored in BUF2 of BUFLEN2 length. Queries are sent
++ in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP).
++
++ Answers to the query are stored firstly in *ANSP up to a max of
++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP
++ is non-NULL (to indicate that modifying the answer buffer is allowed)
++ then malloc is used to allocate a new response buffer and ANSCP and
++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes
++ are needed but ANSCP is NULL, then as much of the response as
++ possible is read into the buffer, but the results will be truncated.
++ When truncation happens because of a small answer buffer the DNS
++ packets header feild TC will bet set to 1, indicating a truncated
++ message, while the rest of the UDP packet is discarded.
++
++ Answers to the query are stored secondly in *ANSP2 up to a max of
++ *ANSSIZP2 bytes, with the actual response length stored in
++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2
++ is non-NULL (required for a second query) then malloc is used to
++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer
++ size and *ANSP2_MALLOCED is set to 1.
++
++ The ANSP2_MALLOCED argument will eventually be removed as the
++ change in buffer pointer can be used to detect the buffer has
++ changed and that the caller should use free on the new buffer.
++
++ Note that the answers may arrive in any order from the server and
++ therefore the first and second answer buffers may not correspond to
++ the first and second queries.
++
++ It is not supported to call this function with a non-NULL ANSP2
++ but a NULL ANSCP. Put another way, you can call send_vc with a
++ single unmodifiable buffer or two modifiable buffers, but no other
++ combination is supported.
++
++ It is the caller's responsibility to free the malloc allocated
++ buffers by detecting that the pointers have changed from their
++ original values i.e. *ANSCP or *ANSP2 has changed.
++
++ If an answer is truncated because of UDP datagram DNS limits then
++ *V_CIRCUIT is set to 1 and the return value non-zero to indicate to
++ the caller to retry with TCP. The value *GOTSOMEWHERE is set to 1
++ if any progress was made reading a response from the nameserver and
++ is used by the caller to distinguish between ECONNREFUSED and
++ ETIMEDOUT (the latter if *GOTSOMEWHERE is 1).
++
++ If errors are encountered then *TERRNO is set to an appropriate
++ errno value and a zero result is returned for a recoverable error,
++ and a less-than zero result is returned for a non-recoverable error.
++
++ If no errors are encountered then *TERRNO is left unmodified and
++ a the length of the first response in bytes is returned. */
+ static int
+ send_dg(res_state statp,
+ const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+@@ -1007,8 +1143,6 @@
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+- u_char *ans = *ansp;
+- int orig_anssizp = *anssizp;
+ struct timespec now, timeout, finish;
+ struct pollfd pfd[1];
+ int ptimeout;
+@@ -1040,6 +1174,8 @@
+ int need_recompute = 0;
+ int nwritten = 0;
+ int recvresp1 = 0;
++ /* Skip the second response if there is no second query.
++ To do that we mark the second response as received. */
+ int recvresp2 = buf2 == NULL;
+ pfd[0].fd = EXT(statp).nssocks[ns];
+ pfd[0].events = POLLOUT;
+@@ -1136,52 +1272,53 @@
+ int *thisresplenp;
+
+ if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
++ /* We have not received any responses
++ yet or we only have one response to
++ receive. */
+ thisanssizp = anssizp;
+ thisansp = anscp ?: ansp;
+ assert (anscp != NULL || ansp2 == NULL);
+ thisresplenp = &resplen;
+ } else {
+- if (*anssizp != MAXPACKET) {
+- /* No buffer allocated for the first
+- reply. We can try to use the rest
+- of the user-provided buffer. */
+-#ifdef _STRING_ARCH_unaligned
+- *anssizp2 = orig_anssizp - resplen;
+- *ansp2 = *ansp + resplen;
+-#else
+- int aligned_resplen
+- = ((resplen + __alignof__ (HEADER) - 1)
+- & ~(__alignof__ (HEADER) - 1));
+- *anssizp2 = orig_anssizp - aligned_resplen;
+- *ansp2 = *ansp + aligned_resplen;
+-#endif
+- } else {
+- /* The first reply did not fit into the
+- user-provided buffer. Maybe the second
+- answer will. */
+- *anssizp2 = orig_anssizp;
+- *ansp2 = *ansp;
+- }
+-
+ thisanssizp = anssizp2;
+ thisansp = ansp2;
+ thisresplenp = resplen2;
+ }
+
+ if (*thisanssizp < MAXPACKET
+- /* Yes, we test ANSCP here. If we have two buffers
+- both will be allocatable. */
+- && anscp
++ /* If the current buffer is non-NULL and it's not
++ pointing at the static user-supplied buffer then
++ we can reallocate it. */
++ && (thisansp != NULL && thisansp != ansp)
++ /* Is the size too small? */
+ && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
+ || *thisanssizp < *thisresplenp)) {
++ /* Always allocate MAXPACKET, callers expect
++ this specific size. */
+ u_char *newp = malloc (MAXPACKET);
+ if (newp != NULL) {
+- *anssizp = MAXPACKET;
+- *thisansp = ans = newp;
++ *thisanssizp = MAXPACKET;
++ *thisansp = newp;
+ if (thisansp == ansp2)
+ *ansp2_malloced = 1;
+ }
+ }
++ /* We could end up with truncation if anscp was NULL
++ (not allowed to change caller's buffer) and the
++ response buffer size is too small. This isn't a
++ reliable way to detect truncation because the ioctl
++ may be an inaccurate report of the UDP message size.
++ Therefore we use this only to issue debug output.
++ To do truncation accurately with UDP we need
++ MSG_TRUNC which is only available on Linux. We
++ can abstract out the Linux-specific feature in the
++ future to detect truncation. */
++ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
++ Dprint(statp->options & RES_DEBUG,
++ (stdout, ";; response may be truncated (UDP)\n")
++ );
++ }
++
+ HEADER *anhp = (HEADER *) *thisansp;
+ socklen_t fromlen = sizeof(struct sockaddr_in6);
+ assert (sizeof(from) <= fromlen);
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/initrd.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/runnix-iso.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/runnix.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -78,7 +78,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -78,7 +78,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -78,7 +78,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-16 22:55:38 UTC (rev 7536)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-17 18:49:08 UTC (rev 7537)
@@ -78,7 +78,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="x86_64-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-18 23:12:40
|
Revision: 7540
http://sourceforge.net/p/astlinux/code/7540
Author: abelbeck
Date: 2016-02-18 23:12:38 +0000 (Thu, 18 Feb 2016)
Log Message:
-----------
bfdetect, version bump to 'Version: 3.0'
Modified Paths:
--------------
branches/1.0/package/bfdetect/Config.in
branches/1.0/package/bfdetect/bfdetect.mk
branches/1.0/toolchain/file_exclude
Modified: branches/1.0/package/bfdetect/Config.in
===================================================================
--- branches/1.0/package/bfdetect/Config.in 2016-02-18 17:17:04 UTC (rev 7539)
+++ branches/1.0/package/bfdetect/Config.in 2016-02-18 23:12:38 UTC (rev 7540)
@@ -5,7 +5,5 @@
help
Simple app that detects a Beronet Berofix card
- See:
- http://www.beronet.com/content/view/95/28/lang,en/
- http://www.beronet.com/download/berofix/
+ http://wiki.beronet.com/index.php/Download
Modified: branches/1.0/package/bfdetect/bfdetect.mk
===================================================================
--- branches/1.0/package/bfdetect/bfdetect.mk 2016-02-18 17:17:04 UTC (rev 7539)
+++ branches/1.0/package/bfdetect/bfdetect.mk 2016-02-18 23:12:38 UTC (rev 7540)
@@ -3,30 +3,32 @@
# bfdetect
#
##############################################################
-BFDETECT_SOURCE:=bfdetect.tar.gz
-BFDETECT_SITE:=http://www.beronet.com/download/berofix/tools/
+BFDETECT_SOURCE:=bfdetect_src.tar.gz
+BFDETECT_SITE:=http://www.beronet.com/downloads/berofix/tools
BFDETECT_DIR := $(BUILD_DIR)/bfdetect
BFDETECT_CAT:=zcat
BFDETECT_BINARY := bfdetect
BFDETECT_TARGET_BINARY = usr/bin/$(BFDETECT_BINARY)
$(DL_DIR)/$(BFDETECT_SOURCE):
- $(WGET) -P $(DL_DIR) $(BFDETECT_SITE)/$(BFDETECT_SOURCE)
+ $(WGET) -P $(DL_DIR) $(BFDETECT_SITE)/$(BFDETECT_SOURCE)
$(BFDETECT_DIR)/.unpacked: $(DL_DIR)/$(BFDETECT_SOURCE)
- $(BFDETECT_CAT) $(DL_DIR)/$(BFDETECT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ mkdir -p $(BFDETECT_DIR)
+ $(BFDETECT_CAT) $(DL_DIR)/$(BFDETECT_SOURCE) | tar -C $(BFDETECT_DIR) $(TAR_OPTIONS) -
touch $(BFDETECT_DIR)/.unpacked
-
+
$(BFDETECT_DIR)/.configured: $(BFDETECT_DIR)/.unpacked
touch $(BFDETECT_DIR)/.configured
$(BFDETECT_DIR)/$(BFDETECT_BINARY): $(BFDETECT_DIR)/.configured
+ $(SED) 's/^[[:space:]]*strip /#strip /' $(BFDETECT_DIR)/Makefile
$(MAKE) CC=$(TARGET_CC) CFLAGS='$(TARGET_CFLAGS)' -C $(BFDETECT_DIR)
-
+
$(TARGET_DIR)/$(BFDETECT_TARGET_BINARY): $(BFDETECT_DIR)/$(BFDETECT_BINARY)
$(INSTALL) -D -m 0755 $(BFDETECT_DIR)/$(BFDETECT_BINARY) $(TARGET_DIR)/$(BFDETECT_TARGET_BINARY)
-
+
bfdetect: $(TARGET_DIR)/$(BFDETECT_TARGET_BINARY)
bfdetect-source: $(BFDETECT_DIR)/bfdetect.c
Modified: branches/1.0/toolchain/file_exclude
===================================================================
--- branches/1.0/toolchain/file_exclude 2016-02-18 17:17:04 UTC (rev 7539)
+++ branches/1.0/toolchain/file_exclude 2016-02-18 23:12:38 UTC (rev 7540)
@@ -2,6 +2,6 @@
nProbe-4.9.4.tar.gz
dialog.tar.gz
oui.txt
-bfdetect.tar.gz
+bfdetect_src.tar.gz
fop2-2.27-debian-i386.tgz
memtest86+-4.20.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-19 16:55:24
|
Revision: 7544
http://sourceforge.net/p/astlinux/code/7544
Author: abelbeck
Date: 2016-02-19 16:55:22 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
htop, enable for standard builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/project/astlinux/target_skeleton/etc/profile
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/astlinux-ast11.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -830,7 +830,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/astlinux-ast13.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -830,7 +830,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/astlinux18.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -830,7 +830,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
Modified: branches/1.0/project/astlinux/target_skeleton/etc/profile
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/profile 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/project/astlinux/target_skeleton/etc/profile 2016-02-19 16:55:22 UTC (rev 7544)
@@ -43,6 +43,11 @@
export FOSSIL_HOME="/mnt/kd/fossil"
fi
+# Set persistant htop settings
+if [ -d /mnt/kd/home ]; then
+ export HTOPRC="/mnt/kd/home/.htoprc"
+fi
+
# Set UTF-8 character type for vi
if [ -f /usr/lib/locale/.locale ]; then
alias vi="LC_CTYPE=$(cat /usr/lib/locale/.locale) vi"
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -811,7 +811,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -811,7 +811,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-19 01:11:46 UTC (rev 7543)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-19 16:55:22 UTC (rev 7544)
@@ -811,7 +811,7 @@
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
+BR2_PACKAGE_HTOP=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_UTIL_LINUX=y
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-20 17:41:02
|
Revision: 7548
http://sourceforge.net/p/astlinux/code/7548
Author: abelbeck
Date: 2016-02-20 17:41:00 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
runnix and runnix-iso, our target skeleton copying does not include dot-files, this was 'fixed' in upstream Buildroot (several times) by using rsync, so keep it simple and add the dot-files in the 'post-build' scripts. All this to remove warning with dropbear at runtime
Modified Paths:
--------------
branches/1.0/project/runnix/target_skeleton/runnix
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/scripts/runnix-iso-post-build
branches/1.0/scripts/runnix-post-build
Removed Paths:
-------------
branches/1.0/project/runnix/target_skeleton/.ssh
branches/1.0/project/runnix-iso/target_skeleton/.ssh
Deleted: branches/1.0/project/runnix/target_skeleton/.ssh
===================================================================
--- branches/1.0/project/runnix/target_skeleton/.ssh 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/project/runnix/target_skeleton/.ssh 2016-02-20 17:41:00 UTC (rev 7548)
@@ -1 +0,0 @@
-link /tmp/.ssh
\ No newline at end of file
Modified: branches/1.0/project/runnix/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix/target_skeleton/runnix 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/project/runnix/target_skeleton/runnix 2016-02-20 17:41:00 UTC (rev 7548)
@@ -63,6 +63,7 @@
mount -t devpts devpts /dev/pts
mkdir /tmp/etc/dropbear
+ mkdir /tmp/.ssh
echo "Generating keys..."
dropbearkey -t rsa -f /tmp/etc/dropbear/dropbear_rsa_host_key -s 1024
Deleted: branches/1.0/project/runnix-iso/target_skeleton/.ssh
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/.ssh 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/project/runnix-iso/target_skeleton/.ssh 2016-02-20 17:41:00 UTC (rev 7548)
@@ -1 +0,0 @@
-link /tmp/.ssh
\ No newline at end of file
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-20 17:41:00 UTC (rev 7548)
@@ -62,6 +62,7 @@
mount -t devpts devpts /dev/pts
mkdir /tmp/etc/dropbear
+ mkdir /tmp/.ssh
echo "Generating keys..."
dropbearkey -t rsa -f /tmp/etc/dropbear/dropbear_rsa_host_key -s 1024
Modified: branches/1.0/scripts/runnix-iso-post-build
===================================================================
--- branches/1.0/scripts/runnix-iso-post-build 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/scripts/runnix-iso-post-build 2016-02-20 17:41:00 UTC (rev 7548)
@@ -20,6 +20,10 @@
fi
}
+## Our target skeleton copying does not include dot-files
+## Do it here:
+ln -snf "/tmp/.ssh" "$target/.ssh"
+
make_release_version
echo ${RUNVER} > "$target/etc/runnix-release"
Modified: branches/1.0/scripts/runnix-post-build
===================================================================
--- branches/1.0/scripts/runnix-post-build 2016-02-20 15:54:46 UTC (rev 7547)
+++ branches/1.0/scripts/runnix-post-build 2016-02-20 17:41:00 UTC (rev 7548)
@@ -20,6 +20,10 @@
fi
}
+## Our target skeleton copying does not include dot-files
+## Do it here:
+ln -snf "/tmp/.ssh" "$target/.ssh"
+
make_release_version
echo ${RUNVER} > "$target/etc/runnix-release"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-22 16:46:27
|
Revision: 7553
http://sourceforge.net/p/astlinux/code/7553
Author: abelbeck
Date: 2016-02-22 16:46:25 +0000 (Mon, 22 Feb 2016)
Log Message:
-----------
openssh, add sshd rc.conf variables: SSHD_PASS_AUTH, SSHD_ALLOW_USERS
Modified Paths:
--------------
branches/1.0/package/openssh/sshd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openssh/sshd.init
===================================================================
--- branches/1.0/package/openssh/sshd.init 2016-02-20 23:08:28 UTC (rev 7552)
+++ branches/1.0/package/openssh/sshd.init 2016-02-22 16:46:25 UTC (rev 7553)
@@ -12,7 +12,6 @@
fi
PORT="${SSHDPORT:-22}"
- RSTAT="${SSHDROOT:-yes}"
if [ -f /mnt/kd/sshd.conf ]; then
cp /mnt/kd/sshd.conf /tmp/etc/ssh/sshd_config
@@ -30,7 +29,8 @@
echo "ListenAddress 0.0.0.0" >> /tmp/etc/ssh/sshd_config
echo "
-PermitRootLogin $RSTAT
+PermitRootLogin ${SSHDROOT:-yes}
+PasswordAuthentication ${SSHD_PASS_AUTH:-yes}
IPQoS cs2 af41
@@ -39,6 +39,9 @@
if [ -f /etc/issue.net ]; then
echo "Banner /etc/issue.net" >> /tmp/etc/ssh/sshd_config
fi
+ if [ -n "$SSHD_ALLOW_USERS" ]; then
+ echo "AllowUsers $SSHD_ALLOW_USERS" >> /tmp/etc/ssh/sshd_config
+ fi
fi
# if it's not a link (to /mnt/kd) then populate it from /stat/etc/ssh
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-20 23:08:28 UTC (rev 7552)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-22 16:46:25 UTC (rev 7553)
@@ -464,11 +464,11 @@
## SMTP port to connect to SMTP_SERVER on. Defaults to 25
#SMTP_PORT="25"
-## SSHd Server
-#SSHDPORT=22
-##
-## Allow sshd root logins? Yes or no are acceptable.
-#SSHDROOT="yes"
+## SSH Server
+#SSHDPORT="22" # TCP Port for local SSH server, defaults to 22
+#SSHDROOT="yes" # PermitRootLogin, yes|no, defaults to "yes"
+#SSHD_PASS_AUTH="yes" # PasswordAuthentication, yes|no, defaults to "yes"
+#SSHD_ALLOW_USERS="root" # AllowUsers, space separated list of users, defaults to any user
## Stunnel support.
## Listen on a TCP port using SSL, then relay that connection to a non-SSL TCP service. (STUNNEL_SERVERS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-25 18:44:36
|
Revision: 7556
http://sourceforge.net/p/astlinux/code/7556
Author: abelbeck
Date: 2016-02-25 18:44:34 +0000 (Thu, 25 Feb 2016)
Log Message:
-----------
master-tag script, automatically add the release date
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/scripts/master-tag
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-02-24 01:23:01 UTC (rev 7555)
+++ branches/1.0/docs/ChangeLog.txt 2016-02-25 18:44:34 UTC (rev 7556)
@@ -8,7 +8,7 @@
Additions for AstLinux 1.2.6:
=============================
-Released **TBD**
+Released @TBD@
** System
@@ -73,7 +73,7 @@
Additions for AstLinux 1.2.5:
=============================
-Released 2015-02-10
+Released 2016-02-10
** Build System
Modified: branches/1.0/scripts/master-tag
===================================================================
--- branches/1.0/scripts/master-tag 2016-02-24 01:23:01 UTC (rev 7555)
+++ branches/1.0/scripts/master-tag 2016-02-25 18:44:34 UTC (rev 7556)
@@ -13,14 +13,32 @@
ASTLINUX_RELEASE="project/astlinux/target_skeleton/etc/astlinux-release"
+ASTLINUX_CHANGELOG="docs/ChangeLog.txt"
+
mark_release()
{
echo "$RELEASE" > "$ASTLINUX_RELEASE"
+
+ sed -i "s/^Released @TBD@/Released $(date +%Y-%m-%d)/" "$ASTLINUX_CHANGELOG"
}
mark_svn()
{
+ local error="$1"
+
echo "svn" > "$ASTLINUX_RELEASE"
+
+ if [ "$error" = "error" ]; then
+ sed -i "s/^Released $(date +%Y-%m-%d)/Released @TBD@/" "$ASTLINUX_CHANGELOG"
+ else
+ sed -i '8 i\
+Additions for AstLinux '$TVER'.'$(($(echo "$RELEASE" | cut -d'.' -f3)+1))':\
+=============================\
+\
+Released @TBD@\
+\
+' "$ASTLINUX_CHANGELOG"
+ fi
}
REPO_ROOT="$(LANG=C svn info | awk -F': ' '/^Repository Root:/ { print $2 }')"
@@ -45,7 +63,7 @@
svn ci -m "mark release '$RELEASE'"
if [ $? -ne 0 ]; then
- mark_svn
+ mark_svn error
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-26 14:41:25
|
Revision: 7557
http://sourceforge.net/p/astlinux/code/7557
Author: abelbeck
Date: 2016-02-26 14:41:23 +0000 (Fri, 26 Feb 2016)
Log Message:
-----------
mark release 'astlinux-1.2.6'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-02-25 18:44:34 UTC (rev 7556)
+++ branches/1.0/docs/ChangeLog.txt 2016-02-26 14:41:23 UTC (rev 7557)
@@ -8,7 +8,7 @@
Additions for AstLinux 1.2.6:
=============================
-Released @TBD@
+Released 2016-02-26
** System
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-02-25 18:44:34 UTC (rev 7556)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-02-26 14:41:23 UTC (rev 7557)
@@ -1 +1 @@
-svn
+astlinux-1.2.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-26 14:41:40
|
Revision: 7559
http://sourceforge.net/p/astlinux/code/7559
Author: abelbeck
Date: 2016-02-26 14:41:37 +0000 (Fri, 26 Feb 2016)
Log Message:
-----------
return to release 'svn'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-02-26 14:41:31 UTC (rev 7558)
+++ branches/1.0/docs/ChangeLog.txt 2016-02-26 14:41:37 UTC (rev 7559)
@@ -5,6 +5,12 @@
=== docs/ChangeLog.txt
=========================================================
+Additions for AstLinux 1.2.7:
+=============================
+
+Released @TBD@
+
+
Additions for AstLinux 1.2.6:
=============================
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-02-26 14:41:31 UTC (rev 7558)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-02-26 14:41:37 UTC (rev 7559)
@@ -1 +1 @@
-astlinux-1.2.6
+svn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-27 23:30:34
|
Revision: 7564
http://sourceforge.net/p/astlinux/code/7564
Author: abelbeck
Date: 2016-02-27 23:30:31 +0000 (Sat, 27 Feb 2016)
Log Message:
-----------
add qemu package, a favor for David Kerr for a project he is working on
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/libffi/libffi.mk
branches/1.0/package/libglib2/Config.in
branches/1.0/package/libglib2/libglib2.mk
branches/1.0/package/pixman/pixman.mk
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch
branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch
branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch
branches/1.0/package/pixman/pixman-0001-Disable-tests.patch
branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch
branches/1.0/package/qemu/
branches/1.0/package/qemu/Config.in
branches/1.0/package/qemu/qemu.mk
Removed Paths:
-------------
branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch
branches/1.0/package/libglib2/libglib2-optional-ipv6.patch
branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/astlinux-ast11.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:26 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -670,6 +670,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/astlinux-ast13.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:26 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -670,6 +670,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/astlinux18.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:26 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -670,6 +670,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/initrd.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:26 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -550,6 +550,7 @@
#
# BR2_PACKAGE_HTPASSWD is not set
# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_ZONEINFO is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/Config.in 2016-02-27 23:30:31 UTC (rev 7564)
@@ -435,6 +435,7 @@
menu "Miscellaneous"
source "package/htpasswd/Config.in"
source "package/mac2vendor/Config.in"
+source "package/qemu/Config.in"
source "package/shared-mime-info/Config.in"
source "package/zoneinfo/Config.in"
endmenu
Added: branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch
===================================================================
--- branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch (rev 0)
+++ branches/1.0/package/libffi/libffi-0001-Fix-installation-location-of-libffi.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,54 @@
+From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <tho...@fr...>
+Date: Thu, 7 Feb 2013 22:26:56 +0100
+Subject: [PATCH] Fix installation location of libffi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The libffi is currently declared as toolexeclib_LTLIBRARIES. In many
+cases, toolexeclib libraries will be installed in /usr/lib, so it
+doesn't make any difference.
+
+However, with multilib toolchains, they get installed in a
+subdirectory of /usr/lib/. For example, with a Sourcery CodeBench
+PowerPC toolchain, if the e500mc multilib variant is used, the libffi
+library gets installed in /usr/lib/te500mc/. This is due to the
+following code in the configure script:
+
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+ *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+ esac
+
+Once the library is installed in /usr/lib/te500mc/, nothing works
+because this installation location is inconsistent with the
+installation location declared in libffi.pc.
+
+So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use
+the more standard lib_LTLIBRARIES, which ensures that the libffi
+library is always installed in /usr/lib.
+
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+[unfuzz for 3.2.1]
+Signed-off-by: Jörg Krause <joe...@em...cks>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0e40451..309474c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
+ MAKEOVERRIDES=
+
+-toolexeclib_LTLIBRARIES = libffi.la
++lib_LTLIBRARIES = libffi.la
+ noinst_LTLIBRARIES = libffi_convenience.la
+
+ libffi_la_SOURCES = src/prep_cif.c src/types.c \
+--
+2.5.3
Modified: branches/1.0/package/libffi/libffi.mk
===================================================================
--- branches/1.0/package/libffi/libffi.mk 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/libffi/libffi.mk 2016-02-27 23:30:31 UTC (rev 7564)
@@ -4,30 +4,33 @@
#
#############################################################
-LIBFFI_VERSION = 3.0.9
-LIBFFI_SITE = ftp://sources.redhat.com/pub/libffi/
+LIBFFI_VERSION = 3.2.1
+LIBFFI_SITE = ftp://sourceware.org/pub/libffi
LIBFFI_INSTALL_STAGING = YES
+LIBFFI_AUTORECONF = YES
# Move the headers to the usual location, and adjust the .pc file
# accordingly
-define LIBFFI_MOVE_STAGING_HEADERS
- mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
- sed -i '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
- rm -rf $(TARGET_DIR)/usr/lib/libffi-*
+define LIBFFI_MOVE_HEADERS
+ mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/
+ $(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
+ $(1)/usr/lib/pkgconfig/libffi.pc
+ rm -rf $(1)/usr/lib/libffi-*
endef
+LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR))
LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
-# Similar for target headers
-define LIBFFI_MOVE_TARGET_HEADERS
- install -d $(TARGET_DIR)/usr/include/
- mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/
- sed -i '/^includedir.*/d' $(TARGET_DIR)/usr/lib/pkgconfig/libffi.pc
- rm -rf $(TARGET_DIR)/usr/lib/libffi-*
+HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR))
+HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_MOVE_HOST_HEADERS
+
+# Remove headers that are not at the usual location from the target
+define LIBFFI_REMOVE_TARGET_HEADERS
+ rm -rf $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)
endef
-LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
+LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_REMOVE_TARGET_HEADERS
$(eval $(call AUTOTARGETS,package,libffi))
-
+$(eval $(call AUTOTARGETS,package,libffi,host))
Modified: branches/1.0/package/libglib2/Config.in
===================================================================
--- branches/1.0/package/libglib2/Config.in 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/libglib2/Config.in 2016-02-27 23:30:31 UTC (rev 7564)
@@ -3,6 +3,7 @@
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_ZLIB
depends on BR2_USE_WCHAR # gettext
help
Added: branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch
===================================================================
--- branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch (rev 0)
+++ branches/1.0/package/libglib2/libglib2-0001-fix-compile-time-atomic-detection.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,27 @@
+[PATCH] Fix compilation issues on architectures with limited atomic support
+
+Improved compile-time detection of atomic support in the compiler.
+
+Upstream-Status: submitted
+See : https://bugzilla.gnome.org/show_bug.cgi?id=752731
+
+Signed-off-by: Brendan Heading <bre...@gm...>
+---
+ glib/gthread-posix.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
+index ae5d805..8db8557 100644
+--- a/glib/gthread-posix.c
++++ b/glib/gthread-posix.c
+@@ -67,7 +67,7 @@
+ #endif
+
+ /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
+-#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__)
++#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__)
+ #define USE_NATIVE_MUTEX
+ #endif
+
+--
+2.4.3
Added: branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch
===================================================================
--- branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch (rev 0)
+++ branches/1.0/package/libglib2/libglib2-0002-disable-tests.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,43 @@
+Disable tests, some of them need python and sometimes host-python
+gets mixed with distro python leading to build failures.
+
+Signed-off-by: Gustavo Zacarias <gus...@fr...>
+
+diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am
+--- glib-2.46.1.orig/gio/Makefile.am 2015-10-20 16:59:03.042212468 -0300
++++ glib-2.46.1/gio/Makefile.am 2015-10-20 17:32:26.763146133 -0300
+@@ -233,7 +233,7 @@
+ platform_deps += win32/libgiowin32.la
+ endif
+
+-SUBDIRS += . tests
++SUBDIRS += .
+
+ if HAVE_FAM
+ SUBDIRS += fam
+diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am
+--- glib-2.46.1.orig/glib/Makefile.am 2015-10-20 16:59:03.066213318 -0300
++++ glib-2.46.1/glib/Makefile.am 2015-10-20 17:33:23.537155988 -0300
+@@ -33,8 +33,8 @@
+ MAYBE_PCRE = pcre
+ endif
+
+-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
+-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
++DIST_SUBDIRS = libcharset gnulib pcre update-pcre
+
+ AM_CPPFLAGS = \
+ $(glib_INCLUDES) \
+diff -Nura glib-2.46.1.orig/Makefile.am glib-2.46.1/Makefile.am
+--- glib-2.46.1.orig/Makefile.am 2015-10-20 16:59:03.003211087 -0300
++++ glib-2.46.1/Makefile.am 2015-10-20 17:32:20.923939420 -0300
+@@ -6,7 +6,7 @@
+
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
+
+ bin_SCRIPTS = glib-gettextize
Deleted: branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch
===================================================================
--- branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,25 +0,0 @@
-From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <lla...@gm...>
-Date: Sat, 6 Nov 2010 14:56:15 +0100
-Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers
-
-Signed-off-by: Lionel Landwerlin <lla...@gm...>
----
- glib/gatomic.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/glib/gatomic.c b/glib/gatomic.c
-index 845c866..01468ce 100644
---- a/glib/gatomic.c
-+++ b/glib/gatomic.c
-@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi
- #endif /* DEFINE_WITH_WIN32_INTERLOCKED */
-
- #ifdef DEFINE_WITH_MUTEXES
-+# include "gthread.h"
- /* We have to use the slow, but safe locking method */
- static GMutex *g_atomic_mutex;
-
---
-1.7.2.3
-
Deleted: branches/1.0/package/libglib2/libglib2-optional-ipv6.patch
===================================================================
--- branches/1.0/package/libglib2/libglib2-optional-ipv6.patch 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/libglib2/libglib2-optional-ipv6.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,53 +0,0 @@
-[PATCH]: fix build on uClibc without IPv6 support
-
-Signed-off-by: Peter Korsgaard <ja...@su...>
----
- gio/ginetaddress.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: glib-2.26.0/gio/ginetaddress.c
-===================================================================
---- glib-2.26.0.orig/gio/ginetaddress.c
-+++ glib-2.26.0/gio/ginetaddress.c
-@@ -21,6 +21,7 @@
- * Samuel Cormier-Iijima <sci...@gm...>
- */
-
-+#include <features.h>
- #include <config.h>
-
- #include <string.h>
-@@ -434,7 +435,11 @@
- return NULL;
- }
-
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
-+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#else
- #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#endif
-
- /**
- * g_inet_address_new_from_bytes:
-@@ -483,8 +488,10 @@
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
- else
- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+#endif
- }
-
- /**
-@@ -510,8 +517,10 @@
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
- else
- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+#endif
- }
-
-
Modified: branches/1.0/package/libglib2/libglib2.mk
===================================================================
--- branches/1.0/package/libglib2/libglib2.mk 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/libglib2/libglib2.mk 2016-02-27 23:30:31 UTC (rev 7564)
@@ -3,64 +3,104 @@
# libglib2
#
#############################################################
-LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 8
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
-LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
+LIBGLIB2_VERSION_MAJOR = 2.46
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
+LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_INSTALL_STAGING = YES
-LIBGLIB2_INSTALL_TARGET = YES
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-LIBGLIB2_CONF_ENV = \
- ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
- glib_cv_uscore=no ac_cv_func_strtod=yes \
- ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
- ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
- ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
- vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
- jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
- ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
- ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
- ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
- ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
- utils_cv_func_mkdir_trailing_slash_bug=no \
- jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
- ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
- ac_use_included_regex=no gl_cv_c_restrict=no \
- ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
- ac_cv_func_posix_getgrgid_r=no \
- gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
+LIBGLIB2_CONF_ENV = \
+ ac_cv_func_posix_getpwuid_r=yes \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_func_strtod=yes \
+ ac_fsusage_space=yes \
+ fu_cv_sys_stat_statfs2_bsize=yes \
+ ac_cv_func_closedir_void=no \
+ ac_cv_func_getloadavg=no \
+ ac_cv_lib_util_getloadavg=no \
+ ac_cv_lib_getloadavg_getloadavg=no \
+ ac_cv_func_getgroups=yes \
+ ac_cv_func_getgroups_works=yes \
+ ac_cv_func_chown_works=yes \
+ ac_cv_have_decl_euidaccess=no \
+ ac_cv_func_euidaccess=no \
+ ac_cv_have_decl_strnlen=yes \
+ ac_cv_func_strnlen_working=yes \
+ ac_cv_func_lstat_dereferences_slashed_symlink=yes \
+ ac_cv_func_lstat_empty_string_bug=no \
+ ac_cv_func_stat_empty_string_bug=no \
+ vb_cv_func_rename_trailing_slash_bug=no \
+ ac_cv_have_decl_nanosleep=yes \
+ jm_cv_func_nanosleep_works=yes \
+ gl_cv_func_working_utimes=yes \
+ ac_cv_func_utime_null=yes \
+ ac_cv_have_decl_strerror_r=yes \
+ ac_cv_func_strerror_r_char_p=no \
+ jm_cv_func_svid_putenv=yes \
+ ac_cv_func_getcwd_null=yes \
+ ac_cv_func_getdelim=yes \
+ ac_cv_func_mkstemp=yes \
+ utils_cv_func_mkstemp_limitations=no \
+ utils_cv_func_mkdir_trailing_slash_bug=no \
+ jm_cv_func_gettimeofday_clobber=no \
+ gl_cv_func_working_readdir=yes \
+ jm_ac_cv_func_link_follows_symlink=no \
+ utils_cv_localtime_cache=no \
+ ac_cv_struct_st_mtim_nsec=no \
+ gl_cv_func_tzset_clobber=no \
+ gl_cv_func_getcwd_null=yes \
+ gl_cv_func_getcwd_path_max=yes \
+ ac_cv_func_fnmatch_gnu=yes \
+ am_getline_needs_run_time_check=no \
+ am_cv_func_working_getline=yes \
+ gl_cv_func_mkdir_trailing_slash_bug=no \
+ gl_cv_func_mkstemp_limitations=no \
+ ac_cv_func_working_mktime=yes \
+ jm_cv_func_working_re_compile_pattern=yes \
+ ac_use_included_regex=no \
+ gl_cv_c_restrict=no \
+ ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \
+ ac_cv_prog_F77=no \
+ ac_cv_func_posix_getgrgid_r=no \
+ glib_cv_long_long_format=ll \
+ ac_cv_func_printf_unix98=yes \
+ ac_cv_func_vsnprintf_c99=yes \
+ ac_cv_func_newlocale=no \
+ ac_cv_func_uselocale=no \
+ ac_cv_func_strtod_l=no \
+ ac_cv_func_strtoll_l=no \
+ ac_cv_func_strtoull_l=no \
+ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
HOST_LIBGLIB2_CONF_OPT = \
- --disable-gtk-doc \
- --enable-debug=no \
+ --disable-coverage \
+ --disable-dtrace \
+ --disable-fam \
+ --disable-libelf \
+ --disable-selinux \
+ --disable-systemtap \
+ --disable-xattr
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
-HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
ifneq ($(BR2_ENABLE_LOCALE),y)
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
endif
+LIBGLIB2_CONF_OPT += --disable-libelf
+
ifeq ($(BR2_PACKAGE_LIBICONV),y)
LIBGLIB2_CONF_OPT += --with-libiconv=gnu
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
endif
+LIBGLIB2_CONF_OPT += --with-pcre=internal
+
define LIBGLIB2_REMOVE_DEV_FILES
rm -rf $(TARGET_DIR)/usr/lib/glib-2.0
rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gettext
@@ -68,9 +108,7 @@
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report)
endef
-ifneq ($(BR2_HAVE_DEVFILES),y)
LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
-endif
define LIBGLIB2_REMOVE_GDB_FILES
rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb
Deleted: branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch
===================================================================
--- branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/pixman/pixman-0.10.0-no-tests.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in 2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER
Added: branches/1.0/package/pixman/pixman-0001-Disable-tests.patch
===================================================================
--- branches/1.0/package/pixman/pixman-0001-Disable-tests.patch (rev 0)
+++ branches/1.0/package/pixman/pixman-0001-Disable-tests.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,28 @@
+From 9b8132738c364fc3c886e81e7d383aaff80dc867 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yan...@fr...>
+Date: Sat, 5 Dec 2015 12:00:53 +0100
+Subject: [PATCH] Disable tests
+
+Tests are causing build failures on some architectures that are missing
+a proper fenv.h, so just disable them.
+
+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+
+---
+Status: Buildroot specific, not suitable for upstream in this state.
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5137c9e..eae79fd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman demos
+
+ pkgconfigdir=$(libdir)/pkgconfig
+ pkgconfig_DATA=pixman-1.pc
+--
+1.9.1
Added: branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch
===================================================================
--- branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch (rev 0)
+++ branches/1.0/package/pixman/pixman-0002-pixman-private-include-float.h-only-in-C-code.patch 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,45 @@
+From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <tho...@fr...>
+Date: Sun, 17 Jan 2016 14:14:28 +0100
+Subject: [PATCH] pixman-private: include <float.h> only in C code
+
+<float.h> is included unconditionally by pixman-private.h, which in
+turn gets included by assembler files. Unfortunately, with certain C
+libraries (like the musl C library), <float.h> cannot be included in
+assembler files:
+
+ CCLD libpixman-arm-simd.la
+/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
+/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
+/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
+/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
+
+It turns out however that <float.h> is not needed by assembly files,
+so we move its inclusion within the #ifndef __ASSEMBLER__ condition,
+which solves the problem.
+
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ pixman/pixman-private.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index 73108a0..73a5414 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -1,5 +1,3 @@
+-#include <float.h>
+-
+ #ifndef PIXMAN_PRIVATE_H
+ #define PIXMAN_PRIVATE_H
+
+@@ -30,6 +28,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stddef.h>
++#include <float.h>
+
+ #include "pixman-compiler.h"
+
+--
+2.6.4
Modified: branches/1.0/package/pixman/pixman.mk
===================================================================
--- branches/1.0/package/pixman/pixman.mk 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/package/pixman/pixman.mk 2016-02-27 23:30:31 UTC (rev 7564)
@@ -3,11 +3,19 @@
# pixman
#
################################################################################
-PIXMAN_VERSION = 0.17.6
-PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
-PIXMAN_SITE = http://cairographics.org/releases/
-PIXMAN_AUTORECONF = NO
+
+PIXMAN_VERSION = 0.34.0
+PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2
+PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
+
PIXMAN_INSTALL_STAGING = YES
+PIXMAN_DEPENDENCIES = host-pkg-config
+# For 0001-Disable-tests.patch
+PIXMAN_AUTORECONF = YES
+
+# don't build gtk based demos
+PIXMAN_CONF_OPT = --disable-gtk
+
$(eval $(call AUTOTARGETS,package,pixman))
$(eval $(call AUTOTARGETS,package,pixman,host))
Added: branches/1.0/package/qemu/Config.in
===================================================================
--- branches/1.0/package/qemu/Config.in (rev 0)
+++ branches/1.0/package/qemu/Config.in 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,98 @@
+comment "QEMU requires a toolchain with wchar, threads"
+ depends on BR2_USE_MMU
+ depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
+
+config BR2_PACKAGE_QEMU
+ bool "QEMU"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_WCHAR # gettext
+ depends on BR2_USE_MMU # fork()
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_PIXMAN
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ help
+ QEMU is a generic and open source machine emulator and virtualizer.
+
+ When used as a machine emulator, QEMU can run OSes and programs made
+ for one machine (e.g. an ARM board) on a different machine (e.g.
+ your own PC). By using dynamic translation, it achieves very good
+ performance.
+
+ When used as a virtualizer, QEMU achieves near native performances
+ by executing the guest code directly on the host CPU. QEMU supports
+ virtualization when executing under the Xen hypervisor or using the
+ KVM kernel module in Linux. When using KVM, QEMU can virtualize x86,
+ server and embedded PowerPC, and S390 guests.
+
+ http://qemu.org/
+
+if BR2_PACKAGE_QEMU
+
+comment "QEMU Emulators selection"
+
+config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
+ string "Enable specific targets"
+ default "x86_64-softmmu"
+ help
+ Enter here the list of QEMU targets you want to build. For example:
+
+ System emulation | User-land emulation
+ ----------------------+-----------------------
+ i386-softmmu | i386-linux-user
+ arm-softmmu | ppc-linux-user
+ x86_64-softmmu | sparc-bsd-user
+ ... | ...
+
+config QEMU_FOO
+ bool # To break the indentation
+
+if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = ""
+
+comment "... or you can select emulator families to enable, below:"
+
+config BR2_PACKAGE_QEMU_SYSTEM
+ bool "Enable all systems emulation"
+ help
+ Say 'y' to build all system emulators/virtualisers that QEMU supports.
+
+config BR2_PACKAGE_QEMU_LINUX_USER
+ bool "Enable all Linux user-land emulation"
+ help
+ Say 'y' to build all Linux user-land emulators that QEMU supports.
+
+# Note: bsd-user can not be build on Linux
+
+endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == ""
+
+config BR2_PACKAGE_QEMU_HAS_EMULS
+ def_bool y
+ depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != ""
+
+if BR2_PACKAGE_QEMU_HAS_EMULS
+
+comment "QEMU Frontends"
+
+config BR2_PACKAGE_QEMU_SDL
+ bool "Enable SDL frontend"
+ select BR2_PACKAGE_SDL
+ help
+ Say 'y' to enable the SDL frontend, that is, a graphical window
+ presenting the VM's display.
+
+endif # BR2_PACKAGE_QEMU_HAS_EMULS
+
+comment "QEMU System Options"
+
+config BR2_PACKAGE_QEMU_SYSTEM_TOOLS
+ bool "Enable system tools"
+ help
+ Say 'y' to build qemu-img, qemu-nbd and qemu-io tools.
+
+config BR2_PACKAGE_QEMU_SYSTEM_VNC
+ bool "Enable system VNC"
+ help
+ Say 'y' to build VNC display.
+
+endif # BR2_PACKAGE_QEMU
Added: branches/1.0/package/qemu/qemu.mk
===================================================================
--- branches/1.0/package/qemu/qemu.mk (rev 0)
+++ branches/1.0/package/qemu/qemu.mk 2016-02-27 23:30:31 UTC (rev 7564)
@@ -0,0 +1,116 @@
+################################################################################
+#
+# qemu
+#
+################################################################################
+
+QEMU_VERSION = 2.5.0
+QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
+QEMU_SITE = http://wiki.qemu.org/download
+
+QEMU_DEPENDENCIES = host-pkg-config libglib2 zlib pixman util-linux
+
+# Need the LIBS variable because librt and libm are
+# not automatically pulled. :-(
+QEMU_LIBS = -lrt -lm
+
+QEMU_OPTS =
+
+QEMU_VARS = \
+ LIBTOOL=$(HOST_DIR)/usr/bin/libtool
+
+# If we want to specify only a subset of targets, we must still enable all
+# of them, so that QEMU properly builds its list of default targets, from
+# which it then checks if the specified sub-set is valid. That's what we
+# do in the first part of the if-clause.
+# Otherwise, if we do not want to pass a sub-set of targets, we then need
+# to either enable or disable -user and/or -system emulation appropriately.
+# That's what we do in the else-clause.
+ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),)
+QEMU_OPTS += --enable-system --enable-linux-user
+QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))"
+else
+
+ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y)
+QEMU_OPTS += --enable-system
+else
+QEMU_OPTS += --disable-system
+endif
+
+ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y)
+QEMU_OPTS += --enable-linux-user
+else
+QEMU_OPTS += --disable-linux-user
+endif
+
+endif
+
+ifeq ($(BR2_PACKAGE_QEMU_SDL),y)
+QEMU_OPTS += --enable-sdl
+QEMU_DEPENDENCIES += sdl
+QEMU_VARS += SDL_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl-config
+else
+QEMU_OPTS += --disable-sdl
+endif
+
+QEMU_OPTS += --disable-fdt
+
+ifeq ($(BR2_PACKAGE_QEMU_SYSTEM_TOOLS),y)
+QEMU_OPTS += --enable-tools
+else
+QEMU_OPTS += --disable-tools
+endif
+
+ifeq ($(BR2_PACKAGE_QEMU_SYSTEM_VNC),y)
+QEMU_OPTS += --enable-vnc
+else
+QEMU_OPTS += --disable-vnc
+endif
+
+define QEMU_CONFIGURE_CMDS
+ ( cd $(@D); \
+ LIBS='$(QEMU_LIBS)' \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(QEMU_VARS) \
+ ./configure \
+ --prefix=/usr \
+ --cross-prefix=$(TARGET_CROSS) \
+ --with-system-pixman \
+ --audio-drv-list= \
+ --enable-kvm \
+ --enable-attr \
+ --enable-vhost-net \
+ --enable-uuid \
+ --disable-bsd-user \
+ --disable-xen \
+ --disable-slirp \
+ --disable-virtfs \
+ --disable-brlapi \
+ --disable-curses \
+ --disable-curl \
+ --disable-bluez \
+ --disable-vde \
+ --disable-linux-aio \
+ --disable-cap-ng \
+ --disable-docs \
+ --disable-spice \
+ --disable-rbd \
+ --disable-libiscsi \
+ --disable-usb-redir \
+ --disable-strip \
+ --disable-seccomp \
+ --disable-sparse \
+ $(QEMU_OPTS) \
+ )
+endef
+
+define QEMU_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QEMU_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS,package,qemu))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/runnix-iso.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:27 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -578,6 +578,7 @@
#
# BR2_PACKAGE_HTPASSWD is not set
# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_ZONEINFO is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/runnix.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:26 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -579,6 +579,7 @@
#
# BR2_PACKAGE_HTPASSWD is not set
# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_ZONEINFO is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:27 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -651,6 +651,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:27 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:07:00 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -651,6 +651,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:27 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:06:59 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -651,6 +651,7 @@
#
BR2_PACKAGE_HTPASSWD=y
BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
BR2_PACKAGE_ZONEINFO=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-27 14:55:12 UTC (rev 7563)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-27 23:30:31 UTC (rev 7564)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7527-dirty Configuration
-# Fri Feb 12 18:21:27 2016
+# Buildroot 2011.08-svn7563-dirty Configuration
+# Sat Feb 27 17:07:00 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -531,6 +531,7 @@
#
# BR2_PACKAGE_HTPASSWD is not set
# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_ZONEINFO is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-28 00:11:41
|
Revision: 7565
http://sourceforge.net/p/astlinux/code/7565
Author: abelbeck
Date: 2016-02-28 00:11:39 +0000 (Sun, 28 Feb 2016)
Log Message:
-----------
Bump the tmpfs limits for upgrade-run-image and upgrade-asterisk-sounds
Modified Paths:
--------------
branches/1.0/package/asterisk/upgrade-asterisk-sounds
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
Modified: branches/1.0/package/asterisk/upgrade-asterisk-sounds
===================================================================
--- branches/1.0/package/asterisk/upgrade-asterisk-sounds 2016-02-27 23:30:31 UTC (rev 7564)
+++ branches/1.0/package/asterisk/upgrade-asterisk-sounds 2016-02-28 00:11:39 UTC (rev 7565)
@@ -41,7 +41,7 @@
mount_tmpfs_snd() {
mkdir /tmp/snd >/dev/null
- if ! mount -t tmpfs -o size=64m none /tmp/snd >/dev/null; then
+ if ! mount -t tmpfs -o size=76m none /tmp/snd >/dev/null; then
rmdir /tmp/snd
return 1
fi
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2016-02-27 23:30:31 UTC (rev 7564)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2016-02-28 00:11:39 UTC (rev 7565)
@@ -32,7 +32,7 @@
mount_tmpfs_up() {
mkdir /tmp/up >/dev/null
- if ! mount -t tmpfs -o size=56m none /tmp/up >/dev/null; then
+ if ! mount -t tmpfs -o size=76m none /tmp/up >/dev/null; then
rmdir /tmp/up
return 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-03 17:56:50
|
Revision: 7570
http://sourceforge.net/p/astlinux/code/7570
Author: abelbeck
Date: 2016-03-03 17:56:47 +0000 (Thu, 03 Mar 2016)
Log Message:
-----------
build system, allow RUNNIX to be built on a 64-bit system and still allow 'astlinux-makeimage' to work on 32-bit system
Modified Paths:
--------------
branches/1.0/boot/syslinux/syslinux.mk
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/boot/syslinux/syslinux.mk
===================================================================
--- branches/1.0/boot/syslinux/syslinux.mk 2016-03-01 16:49:16 UTC (rev 7569)
+++ branches/1.0/boot/syslinux/syslinux.mk 2016-03-03 17:56:47 UTC (rev 7570)
@@ -13,6 +13,8 @@
SYSLINUX_DEPENDENCIES = host-nasm
+HOST_SYSLINUX_DEPENDENCIES = host-nasm
+
define SYSLINUX_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D)
endef
@@ -26,4 +28,13 @@
done
endef
+define HOST_SYSLINUX_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_SYSLINUX_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/linux/syslinux $(HOST_DIR)/usr/sbin/syslinux
+endef
+
$(eval $(call GENTARGETS,boot,syslinux))
+$(eval $(call GENTARGETS,boot,syslinux,host))
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2016-03-01 16:49:16 UTC (rev 7569)
+++ branches/1.0/scripts/astlinux-makeimage 2016-03-03 17:56:47 UTC (rev 7570)
@@ -9,8 +9,15 @@
HOST_BIN="./output/host/usr/sbin"
-# Package host-fdisk builds:
-REQUIRED_HOST_CMDS="fdisk"
+#
+# If the RUNNIX package was built on a x86_64 system, ./syslinux is not executable on a 32-bit build system.
+# In such a case, we need to locally build host-syslinux for 32-bit systems, host-fdisk is always needed.
+#
+if [ "$(uname -m)" != "x86_64" ]; then
+ REQUIRED_HOST_CMDS="fdisk syslinux"
+else
+ REQUIRED_HOST_CMDS="fdisk"
+fi
REQUIRED_CMDS="which sudo mkdosfs mkfs losetup gzip"
@@ -64,6 +71,12 @@
exit 1
fi
+for i in $REQUIRED_HOST_CMDS; do
+ if [ ! -x "$HOST_BIN/$i" ]; then
+ make host-$i
+ fi
+done
+
error=0
for i in $REQUIRED_HOST_CMDS; do
if [ ! -x "$HOST_BIN/$i" ]; then
@@ -195,10 +208,16 @@
##
"
+if [ -x $HOST_BIN/syslinux ]; then
+ SYSLINUX="$(pwd)/$HOST_BIN/syslinux"
+else
+ SYSLINUX="./syslinux"
+fi
+
# run syslinux and copy the master boot record
(
cd ${RUNNIX_DIR}
- sudo ./syslinux ${LOOPD}1
+ sudo ${SYSLINUX} ${LOOPD}1
sudo bash -c "cat mbr.bin > ${LOOPD}0"
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X