Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Daniel Goller (d9a003e23be02fa40c1e8620382e9e972a663100)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Daniel Goller <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Daniel Goller (d9a003e23be02fa40c1e8620382e9e972a663100)
  • Date: Tue, 15 Aug 2006 18:53:15 -0500

GIT changes to master grimoire by Daniel Goller <morfic AT sourcemage.org>:

ChangeLog | 3 +++
shell-term-fm/busybox/CONFIGURE | 1 +
shell-term-fm/busybox/DETAILS | 4 ++--
shell-term-fm/busybox/HISTORY | 6 ++++++
shell-term-fm/busybox/INSTALL | 7 ++++++-
shell-term-fm/busybox/PRE_BUILD | 5 +++++
shell-term-fm/busybox/bb.patch | 10 ++++++++++
7 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 6859d4397acca67c2252ed03f1f27ecbff87a718
Author: Daniel Goller <morfic AT sourcemage.org>
Commit: Daniel Goller <morfic AT sourcemage.org>

The ChangeLog never made it when adding filelight.

commit 4badc2653762b4f0119e3c6da06a74349de428d7
Author: Daniel Goller <morfic AT sourcemage.org>
Commit: Daniel Goller <morfic AT sourcemage.org>

busybox: Update to latest stable version, add bb applet (Rescue shell,
use with init=/sbin/bb in your boot loader's config)

busybox: Update to latest stable version, update to sha512, add bb applet
(Rescue Shell, use with init=/sbin/bb in your boot loader's config)

diff --git a/ChangeLog b/ChangeLog
index 05119b9..2902d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-15 Daniel Goller <morfic AT sourcemage.org>
+ * kde-apps/filelight: new spell, best way to find lost space on disk
via gui
+
2006-08-16 Anton Brondz <dinolinux AT gmail.com>
* kde-apps/klibido: new spell

diff --git a/shell-term-fm/busybox/CONFIGURE b/shell-term-fm/busybox/CONFIGURE
index c5cc70e..64e1bd1 100755
--- a/shell-term-fm/busybox/CONFIGURE
+++ b/shell-term-fm/busybox/CONFIGURE
@@ -1,5 +1,6 @@
config_query BB_CONFIG "Manually configure [for advanced users]?" n &&
config_query BB_RESET "Reset the config file?" n &&
+config_query BB_RESCUE "Enable building of /sbin/bb rescue shell?" n
&&

if [ "$BB_RESET" = "y" ] && [ $RECONFIGURE ] ; then
rm -f ${CONFIG_CACHE}/${SPELL}.config
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index aa0f19f..7a8d1ca 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,6 +1,6 @@
SPELL=busybox
- VERSION=1.01
- SOURCE_HASH='sha1:12b6e04e7e9e91c9aa0729c0748bb68789d71c26'
+ VERSION=1.2.1
+
SOURCE_HASH='sha512:0646f8f6090734287061ffbbcdff1e25f32f8b9e84a64da6223d697b2f1180fdc7229699b98281f6dab79389bb3c37931ae8f1d21fbb5ce6317c78717870f875'
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.busybox.net/downloads/$SOURCE
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index 3ae1a46..55c864f 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2006-08-15 Daniel Goller <morfic AT sourcemage.org>
+ * DETAILS: Update to latest stable version.
+ * CONFIGURE: Added config_query for bb applet.
+ * PRE_BUILD: Added logic to add bb applet if chosen with config_query
+ * INSTALL: conditionally install bb rescue shell
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/shell-term-fm/busybox/INSTALL b/shell-term-fm/busybox/INSTALL
index 1ab7cb9..0824b75 100755
--- a/shell-term-fm/busybox/INSTALL
+++ b/shell-term-fm/busybox/INSTALL
@@ -1,4 +1,9 @@
-install -m 755 busybox ${INSTALL_ROOT}/sbin
+install -m 755 busybox ${INSTALL_ROOT}/sbin &&
+
+if [ "$BB_RESCUE" = "y" ] ; then
+ mv busybox_unstripped bb &&
+ install -m 755 bb ${INSTALL_ROOT}/sbin
+fi

#
# This one is needed only when symlinks needed ...
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index e5b75ae..462ff19 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -11,5 +11,10 @@ if [[ "$BB_CONFIG" = "y" ]] && [[ $RE
VOYEUR="on" &&
make "menuconfig"
fi &&
+
+if [ "$BB_RESCUE" = "y" ] ; then
+ patch -p1 -F 5 < ${SCRIPT_DIRECTORY}/bb.patch
+fi &&
+

cp .config ${CONFIG_CACHE}/busybox.config
diff --git a/shell-term-fm/busybox/bb.patch b/shell-term-fm/busybox/bb.patch
new file mode 100644
index 0000000..255d5aa
--- /dev/null
+++ b/shell-term-fm/busybox/bb.patch
@@ -0,0 +1,10 @@
+--- busybox-1.2.0/include/applets.h
++++ busybox-1.2.0/include/applets.h
+@@ -56,6 +56,7 @@
+ USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_AWK(APPLET(awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
++USE_ASH(APPLET_NOUSAGE(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ /* Always enabled. */



  • [SM-Commit] GIT changes to master grimoire by Daniel Goller (d9a003e23be02fa40c1e8620382e9e972a663100), Daniel Goller, 08/15/2006

Archive powered by MHonArc 2.6.24.

Top of Page