New commits:
commit 5dbf3ed41bcb81bcbb2f38ef25fcf285303ce751
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
llvm: removed gcc optional_dependency (unused)
commit b40dfcbfe9ac1efb4c6390fb5a92a1a374790e3e
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
llvm: optional support for clang c/c++/objc compiler
commit f4a45971b290cafb7e1d319348f01d42cd1d3deb
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
linux-initramfs: use busybox instead of klibc
commit 08cc47c6618f894e04f60e30ba7bf53774bcf902
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
busybox: changed config to include switch_root by default
commit dcaa845b9df0eb31a64fa841f4dc2fabb3121d5f
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
for var in $VARS $OPTS; do
- if [[ ${!var} && ${!var} != n ]]; then
- echo "$var=${!var}" >> .config
+ if [[ ${!var} != n ]]; then
+ echo "$var=${!var:-y}" >> .config
fi
done &&
make &&
+
if is_depends_enabled $SPELL qt-x11; then
make wpa_gui
fi
+
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index 358ac8d..e9a308d 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -15,14 +15,14 @@ fi &&
if [[ $CONFIG_CTRL_IFACE != n ]]; then
optional_depends readline \
- CONFIG_READLINE=y \
- CONFIG_READLINE=n \
+ CONFIG_READLINE \
+ "" \
"for Readline support in CLI frontend" &&
optional_depends qt-x11 "" "" "to build wpa_gui, a Qt-based GUI frontend"
fi &&
optional_depends dbus \
- CONFIG_CTRL_IFACE_DBUS=y \
- CONFIG_CTRL_IFACE_DBUS=n \
+ CONFIG_CTRL_IFACE_DBUS \
+ "" \
"to enable D-Bus control interface"
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index ade4d2a..fbbec40 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Finn Haedicke <finn AT sourcemage.org>
+ * BUILD,DEPENDS: fixes to build dbus support
+
2010-02-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated stable & devel to 0.6.10
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index fe95f58..4172443 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,6 @@
+2010-06-20 Finn Haedicke <finn AT sourcemage.org>
+ * busybox.config: added option to build switch_root
+
2010-01-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15.3
diff --git a/shell-term-fm/busybox/busybox.config
b/shell-term-fm/busybox/busybox.config
index f09fc7b..ab2d0a2 100644
--- a/shell-term-fm/busybox/busybox.config
+++ b/shell-term-fm/busybox/busybox.config
@@ -483,7 +483,7 @@ CONFIG_PIVOT_ROOT=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
+CONFIG_SWITCH_ROOT=y
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/smgl/linux-initramfs/DEPENDS b/smgl/linux-initramfs/DEPENDS
index 67545ae..09e3cf1 100755
--- a/smgl/linux-initramfs/DEPENDS
+++ b/smgl/linux-initramfs/DEPENDS
@@ -1,2 +1,3 @@
optional_depends lvm "" "" "for lvm root" &&
-optional_depends cryptsetup-luks "" "" "for crypto root"
+optional_depends cryptsetup-luks "" "" "for crypto root" &&
+depends busybox
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 4a61b66..964226b 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,9 @@
+2010-06-20 Finn Haedicke <finn AT sourcemage.org>
+ * DEPENDS: depends on busybox instead of klibc
+ * mkinitrd: use busybox_parts instead of klibc_parts
+ * mkinitrd: use switch_root instead of pivot_root
+ * mkinitrd: detect root and init from /proc/cmdline
+
2009-08-03 Finn Haedicke <finn_haedicke AT gmx.net>
* mkinitrd: create devices /dev/random and /dev/uramdom (for
lvm/crypt)
* mkinitrd: mount /sys (for lvm/crypt)
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index c34886a..dfcaaaf 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -46,7 +46,7 @@ EOF
function linuxrc_pre()
{
cat <<-EOF
-#!/bin/sh.shared
+#!/bin/sh
for module in \`cat /modules.lst\`
do
@@ -107,8 +107,11 @@ function linuxrc_pre_kinit()