Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (37658724f298ab91aecb1a1e393b4c555257ae83)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (37658724f298ab91aecb1a1e393b4c555257ae83)
  • Date: Sun, 19 Nov 2006 10:45:35 -0600

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

smgl/simpleinit-msb/BUILD | 2 --
smgl/simpleinit-msb/CONFIGURE | 3 ---
smgl/simpleinit-msb/HISTORY | 2 +-
smgl/simpleinit-msb/PRE_BUILD | 16 +++++++---------
4 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 37658724f298ab91aecb1a1e393b4c555257ae83
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

simpleinit-msb: for alley_cat hath speaketh remove NLS query in all just
disable NLS

diff --git a/smgl/simpleinit-msb/BUILD b/smgl/simpleinit-msb/BUILD
index e91795a..f69e31d 100755
--- a/smgl/simpleinit-msb/BUILD
+++ b/smgl/simpleinit-msb/BUILD
@@ -1,5 +1,3 @@
./configure &&
-if [[ $SIMPLEINIT_NLS == y ]]; then
sedit 'd/#define HAVE_locale_h/' defines.h
-fi
make OPT="$CFLAGS"
diff --git a/smgl/simpleinit-msb/CONFIGURE b/smgl/simpleinit-msb/CONFIGURE
index 27d8b03..47207a2 100755
--- a/smgl/simpleinit-msb/CONFIGURE
+++ b/smgl/simpleinit-msb/CONFIGURE
@@ -1,6 +1,3 @@
-config_query SIMPLEINIT_NLS \
- "Disable NLS (advised if /usr is mounted separately)?" \
- n &&
config_query SIMPLEINIT_STATIC \
"Build a static init?" \
n
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 794ea80..542954c 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,6 +1,6 @@
2006-11-19 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* BUILD: added removal of NLS
- * CONFIGURE: query for NLS static
+ * CONFIGURE: query for static, removed NLS query
* PRE_BUILD: patches for NLS and static
* DETAILS: PATCHLEVEL++
* shutdown.nonls.diff: added to remove nls support
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 6c5c5bd..396bac9 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -1,12 +1,10 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/simpleinit.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/simpleinit-1000uid.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/simpleinit-msb-crypt.diff &&
-if [[ $SIMPLEINIT_NLS == y ]]; then
-patch -p0 < $SPELL_DIRECTORY/simpleinit.nonls.diff &&
-patch -p0 < $SPELL_DIRECTORY/shutdown.nonls.diff
-fi &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/simpleinit.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/simpleinit-1000uid.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/simpleinit-msb-crypt.diff &&
+patch -p0 < $SPELL_DIRECTORY/simpleinit.nonls.diff &&
+patch -p0 < $SPELL_DIRECTORY/shutdown.nonls.diff &&
if [[ $SIMPLEINIT_STATIC == y ]]; then
sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o#shutdown:
shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@
$^#' login-utils/Makefile &&
sedit 's:$(CC) $(LDFLAGS):$(CC) -static $(LDFLAGS):g' login-utils/Makefile



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (37658724f298ab91aecb1a1e393b4c555257ae83), Andra?? Levstik, 11/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page