Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Finn Haedicke (5dbf3ed41bcb81bcbb2f38ef25fcf285303ce751)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Finn Haedicke <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Finn Haedicke (5dbf3ed41bcb81bcbb2f38ef25fcf285303ce751)
  • Date: Tue, 22 Jun 2010 07:25:37 -0500

GIT changes to master grimoire by Finn Haedicke <finn_haedicke AT gmx.net>:

devel/llvm/CONFIGURE | 3 ++-
devel/llvm/DEPENDS | 7 +------
devel/llvm/DETAILS | 3 +++
devel/llvm/HISTORY | 4 ++++
devel/llvm/PRE_BUILD | 6 ++++++
net/wpa_supplicant/BUILD | 10 ++++++----
net/wpa_supplicant/DEPENDS | 8 ++++----
net/wpa_supplicant/HISTORY | 3 +++
shell-term-fm/busybox/HISTORY | 3 +++
shell-term-fm/busybox/busybox.config | 2 +-
smgl/linux-initramfs/DEPENDS | 3 ++-
smgl/linux-initramfs/HISTORY | 6 ++++++
smgl/linux-initramfs/mkinitrd | 24 ++++++++++++++++++++----
13 files changed, 61 insertions(+), 21 deletions(-)

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>

wpa_supplicant: fixed building of dbus support

diff --git a/devel/llvm/CONFIGURE b/devel/llvm/CONFIGURE
index 3e483c6..fe589b1 100755
--- a/devel/llvm/CONFIGURE
+++ b/devel/llvm/CONFIGURE
@@ -1,3 +1,4 @@
config_query_option LLVMJIT "Enable Just In Time compiling?" y \
"--enable-jit" \
- "--disable-jit"
+ "--disable-jit" &&
+config_query LLVM_WITH_CLANG "Enable clang compiler frontend?" n
diff --git a/devel/llvm/DEPENDS b/devel/llvm/DEPENDS
index 51176dd..e8cf646 100755
--- a/devel/llvm/DEPENDS
+++ b/devel/llvm/DEPENDS
@@ -4,9 +4,4 @@ depends g++ &&
optional_depends doxygen \
"--enable-doxygen" \
"--disable-doxygen" \
- "build doxygen documentation?" &&
-
-optional_depends gcc \
- "--enable-gcc-frontend" \
- "--disable-gcc-frontend" \
- "enable gcc frontend?"
+ "build doxygen documentation?"
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 21e209a..a10172e 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -3,6 +3,9 @@
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://${SPELL}.org/releases/${VERSION}/${SOURCE}

SOURCE_HASH=sha512:d0544893c5343b69a99f9cb336e0a0ee6c1fb94c24e7794f61190829543d424626868e1901a110c82987c0af8292cfa7d89a3a762a2b6f27b98a924ccecc4b6c
+ SOURCE2="clang-${VERSION}.tgz"
+ SOURCE2_URL[0]=http://${SPELL}.org/releases/${VERSION}/${SOURCE2}
+
SOURCE2_HASH=sha512:01822007c96374baa66d17f5807b96353bb9ebc57b43dcf78517d8f5bc9413c83daa0c9ff8a830071d90b86a6dcc6a7027fbf9b0ae7556ab1a736839162e67a7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://llvm.org "
LICENSE[0]=BSD
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index a8e3aff..9fd71e3 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2010-06-20 Finn Haedicke <finn AT sourcemage.org>
+ * CONFIGURE,DETAILS,PRE_BUILD : added support for clang
+ * DEPENDS: removed query for gcc backend (unused)
+
2010-06-10 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: updated spell to 2.7

diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
new file mode 100755
index 0000000..a75b139
--- /dev/null
+++ b/devel/llvm/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if [[ $LLVM_WITH_CLANG ]]; then
+ cd ${SOURCE_DIRECTORY}/tools &&
+ unpack_file 2 &&
+ mv clang-${VERSION} clang
+fi
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 686b569..29bee7b 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -7,9 +7,9 @@ fi &&
# anyway).
local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP CONFIG_L2_PACKET CONFIG_NO_WPA2 \
CONFIG_NO_STDOUT_DEBUG CONFIG_CTRL_IFACE CONFIG_DRIVER_HOSTAP \
- CONFIG_DRIVER_HERMES CONFIG_DRIVER_MADWIFI CONFIG_DRIVER_ATMEL \
+ CONFIG_DRIVER_ATMEL \
CONFIG_DRIVER_WEXT CONFIG_DRIVER_NDISWRAPPER \
- CONFIG_DRIVER_BROADCOM CONFIG_DRIVER_IPW CONFIG_DRIVER_WIRED \
+ CONFIG_DRIVER_IPW CONFIG_DRIVER_WIRED \
CONFIG_EAP_MD5 CONFIG_EAP_MSCHAPV2 CONFIG_EAP_TLS \
CONFIG_EAP_PEAP CONFIG_EAP_TTLS CONFIG_EAP_GTC CONFIG_EAP_OTP \
CONFIG_EAP_SIM CONFIG_EAP_AKA CONFIG_EAP_PSK CONFIG_EAP_PAX \
@@ -19,13 +19,15 @@ local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP
CONFIG_L2_PACKET CONFIG_NO_WPA2 \
VARS="$VARS CONFIG_TLS" &&

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()

function linuxrc_post()
{
+local rootdev;
+rootdev=$(awk '$2=="/" {print $1}' /etc/fstab)
cat <<-EOF
-exec /bin/kinit "\$@"
+/bin/mount $rootdev /root
+exec /bin/switch_root /root /sbin/init
EOF
}

@@ -1064,16 +1067,28 @@ function module_parts()
function klibc_parts()
{
local file
- for file in /usr/lib/klibc/bin/*
+ for file in $(find /usr/lib/klibc/bin/ )
do
+ echo "#file b"
echo "file /bin/$(basename $file) $file 0755 0 0"
done
for file in /usr/lib/klibc/lib/*
do
+ echo "#file i"
echo "file /lib/$(basename $file) $file 0755 0 0"
done
}

+function busybox_parts()
+{
+ local file
+ echo "file /bin/busybox /sbin/busybox 0755 0 0"
+ for file in pivot_root mount switch_root cat chroot cpio dd false
gzip halt insmod ln mkdir mknod sh less ls
+ do
+ echo "link /bin/$file /bin/busybox 0755 0 0"
+ done
+}
+
function raid_parts()
{
if $USE_RAID || $FORCE_RAID
@@ -1336,7 +1351,8 @@ fill_modules
dev_parts
dir_parts
module_parts
- klibc_parts
+ #klibc_parts
+ busybox_parts
raid_parts
crypto_parts
lvm_parts




Archive powered by MHonArc 2.6.24.

Top of Page