Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (253496b93cffc59512b9231e076de62a2fd0e4ec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (253496b93cffc59512b9231e076de62a2fd0e4ec)
  • Date: Tue, 1 Dec 2009 10:03:20 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

shell-term-fm/busybox/CONFIGURE | 1 -
shell-term-fm/busybox/DETAILS | 4 ++--
shell-term-fm/busybox/HISTORY | 6 ++++++
shell-term-fm/busybox/PRE_BUILD | 7 -------
shell-term-fm/busybox/applets.patch | 20 --------------------
shell-term-fm/busybox/bb.patch | 10 ----------
6 files changed, 8 insertions(+), 40 deletions(-)

New commits:
commit 39fc66e1931a7889deb50d750e0d3de876c663f4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

busybox: version 1.15.2, removed patches (IMHO the normal configuration
procedure should be used for the bb rescue shell).

diff --git a/shell-term-fm/busybox/CONFIGURE b/shell-term-fm/busybox/CONFIGURE
index 64e1bd1..c5cc70e 100755
--- a/shell-term-fm/busybox/CONFIGURE
+++ b/shell-term-fm/busybox/CONFIGURE
@@ -1,6 +1,5 @@
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 9a0b16b..e313539 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,6 +1,6 @@
SPELL=busybox
- VERSION=1.8.2
-
SOURCE_HASH=sha512:4924e32cd08623fb8401296f5b56ee1e8d36fa8e301027720ed3948505a45f3006818aa16e24b8d3eb875bcb522dad68d012c6ab942e006c04e7b581aa6565bc
+ VERSION=1.15.2
+
SOURCE_HASH=sha512:9eb1399e2e14f5b2b5112d39a944378683555bb43d12853d7aa441b632aeef1ed98e84cd10d16296cdc52c016d7ab760ce4b2c0cbfcb29fa4909ebf096ec0a6e
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 782393f..0aef112 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2009-11-29 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 1.15.2
+ * PRE_BUILD,applets.patch, bb.patch: patches no longer needed.
+ if bb is going to be build shouldn be configured by the config
+ file instead of the spell.
+
2008-01-17 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.8.2
* applets.patch: added to remove warning
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index c1746e7..f13b26e 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p0 < ${SCRIPT_DIRECTORY}/applets.patch
-
if [ -f $CONFIG_CACHE/busybox.config ]; then
cp ${CONFIG_CACHE}/busybox.config .config
else
@@ -14,9 +12,4 @@ if [[ "$BB_CONFIG" = "y" ]] && [[ $RECONFIGURE ]] ; then
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/applets.patch
b/shell-term-fm/busybox/applets.patch
deleted file mode 100644
index d67676c..0000000
--- a/shell-term-fm/busybox/applets.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- applets/applets.c 2007-11-10 02:40:53.000000000 +0100
-+++ applets/applets.c-fixed 2008-01-18 01:25:01.000000000 +0100
-@@ -10,17 +10,6 @@
- #include <assert.h>
- #include "busybox.h"
-
--/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
--#if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)
--#warning Static linking against glibc produces buggy executables
--#warning (glibc does not cope well with ld --gc-sections).
--#warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
--#warning Note that glibc is unsuitable for static linking anyway.
--#warning If you still want to do it, remove -Wl,--gc-sections
--#warning from top-level Makefile and remove this warning.
--#error Aborting compilation.
--#endif
--
- #if ENABLE_BUILD_LIBBUSYBOX
- int main(int argc, char **argv)
- {
diff --git a/shell-term-fm/busybox/bb.patch b/shell-term-fm/busybox/bb.patch
deleted file mode 100644
index 255d5aa..0000000
--- a/shell-term-fm/busybox/bb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 Arjan Bouter (253496b93cffc59512b9231e076de62a2fd0e4ec), Arjan Bouter, 12/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page