[SM-Commit] GIT changes to master =?unknown-8bit?Q?gri?= =?unknown-8bit?Q?moire_by_Andra=C5?= =?unknown-8bit?Q?=BE?= Levstik (3eb84cc094464454ed344f4d44a3a49efec81258)
=?unknown-8bit?Q?Andra=C5=BE?= Levstik
scm at mail.sourcemage.org
Tue Sep 5 13:32:26 EDT 2006
GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:
libs/dietlibc/DETAILS | 3 ++-
libs/dietlibc/HISTORY | 4 ++++
libs/dietlibc/INSTALL | 2 +-
smgl/init.d/DETAILS | 2 +-
smgl/init.d/HISTORY | 4 ++++
smgl/init.d/init.d/mountall.sh | 4 +++-
6 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 0d22246a175bc62dd371c6d7e222f8c22624188e
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>
init.d: unlink any symlinks in /var/run before removing stuff
commit 0f2d0499ef5b4046828b2389dc50319a635eed02
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>
diatlibc: minor fix
diff --git a/libs/dietlibc/DETAILS b/libs/dietlibc/DETAILS
index ba3fdc1..ebd07d3 100755
--- a/libs/dietlibc/DETAILS
+++ b/libs/dietlibc/DETAILS
@@ -5,10 +5,11 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/dietlibc/$SOURCE
SOURCE2_URL[0]=http://www.kernel.org/pub/linux/libs/dietlibc/$SOURCE2
- SOURCE_GPG="kernel.gpg:${SOURCE2}"
+ SOURCE_GPG="kernel.gpg:${SOURCE2}:UPSTREAM_KEY"
WEB_SITE=http://www.fefe.de/dietlibc/
ENTERED=20040716
LICENSE[0]=GPL
+ PATCHLEVEL=1
DOCS="AUTHOR BUGS CAVEAT CHANGES FAQ COPYING"
KEYWORDS="libs"
SHORT="small and efficient libc"
diff --git a/libs/dietlibc/HISTORY b/libs/dietlibc/HISTORY
index 3592173..13eec26 100644
--- a/libs/dietlibc/HISTORY
+++ b/libs/dietlibc/HISTORY
@@ -1,3 +1,7 @@
+2006-09-04 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+ * INSTALL: made it copy the proper diet binary
+ * DETAILS: added patchlevel an UPSTREAM_KEY
+
2006-08-14 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
* INSTALL: removed the binary in /usr/bin breaks stuff
* BUILD: install to a FHS compatible location in this case
diff --git a/libs/dietlibc/INSTALL b/libs/dietlibc/INSTALL
index 76426f7..e09ad41 100755
--- a/libs/dietlibc/INSTALL
+++ b/libs/dietlibc/INSTALL
@@ -1,2 +1,2 @@
default_install &&
-cp bin-*/diet $INSTALL_ROOT/usr/bin
+cp -v $INSTALL_ROOT/opt/diet/bin/diet $INSTALL_ROOT/usr/bin/diet
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 8346b0c..cf6ac4d 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.2.0
LICENSE[0]=GPL
PATCHLEVEL=11
- BUILD_API=2
+ BUILD_API=3
KEYWORDS="smgl"
ENTERED=20030505
SHORT="This is the basic initalization system of SMGL"
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 49b7131..19134f9 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2006-09-05 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+ * init.d/mountall.sh: if symlinks unlink them before removing
+ * DETAILS: PATCHLEVEL++
+
2006-09-04 Thomas Orgis <sobukus at sourcemage.org>
* DETAILS: increased PATCHLEVEL for the last changes
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 5497019..3215c83 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -14,7 +14,9 @@ ESSENTIAL=yes
function recursive_rm() {
for file in "$@" ; do
- if [ -d $file ] ; then
+ if [ -h $file ] ; then
+ unlink $file
+ elif [ -d $file ] ; then
recursive_rm "$file"/*
else
rm -f "$file"
More information about the SM-Commit
mailing list