Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by ruskie (5e5c0032c26f0a8ab67614ac1d94f52d43b6ce84)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: ruskie <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by ruskie (5e5c0032c26f0a8ab67614ac1d94f52d43b6ce84)
  • Date: Sun, 19 Nov 2006 09:19:42 -0600

GIT changes to master grimoire by ruskie <ruskie@omega.(none)>:

smgl/simpleinit-msb/BUILD | 4 +++-
smgl/simpleinit-msb/CONFIGURE | 7 +++++++
smgl/simpleinit-msb/DETAILS | 2 +-
smgl/simpleinit-msb/HISTORY | 8 ++++++++
smgl/simpleinit-msb/PRE_BUILD | 11 +++++++++--
smgl/simpleinit-msb/shutdown.nonls.diff | 12 ++++++++++++
smgl/simpleinit-msb/simpleinit.nonls.diff | 13 +++++++++++++
7 files changed, 53 insertions(+), 4 deletions(-)

New commits:
commit c1ea3981b8e3aeb19d90d0b17a93a9d9b0d85e04
Author: ruskie <ruskie@omega.(none)>
Commit: ruskie <ruskie@omega.(none)>

simpleinit-msb: fixes relevant to #7876 and #6305

diff --git a/smgl/simpleinit-msb/BUILD b/smgl/simpleinit-msb/BUILD
index 68f85d7..e91795a 100755
--- a/smgl/simpleinit-msb/BUILD
+++ b/smgl/simpleinit-msb/BUILD
@@ -1,3 +1,5 @@
./configure &&
-# sedit 's/CFLAGS.*:=/CFLAGS := -DDEBUG_GETPATH=1 /' mconfig &&
+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
new file mode 100755
index 0000000..27d8b03
--- /dev/null
+++ b/smgl/simpleinit-msb/CONFIGURE
@@ -0,0 +1,7 @@
+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/DETAILS b/smgl/simpleinit-msb/DETAILS
index 8086dad..923f1d0 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:e31b517d7da11c91b93d03808b5bec663973e4b4ea07b2451dcb9ccb6034eca8e79e1226ff62d527421070123d339106db354220e2c7a0393cd9c99d2a4e62e0
WEB_SITE=http://www.winterdrache.de/linux/newboot/
ENTERED=20030505
- UPDATED=20040919
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="smgl"
SHORT="Replacement for SysVinit"
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index b92b82d..794ea80 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,11 @@
+2006-11-19 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: added removal of NLS
+ * CONFIGURE: query for NLS static
+ * PRE_BUILD: patches for NLS and static
+ * DETAILS: PATCHLEVEL++
+ * shutdown.nonls.diff: added to remove nls support
+ * simpleinit.nonls.diff: added to remove nls support
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index ae862e3..6c5c5bd 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -2,5 +2,12 @@ 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 -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 &&
+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
+fi
diff --git a/smgl/simpleinit-msb/shutdown.nonls.diff
b/smgl/simpleinit-msb/shutdown.nonls.diff
new file mode 100644
index 0000000..8d767aa
--- /dev/null
+++ b/smgl/simpleinit-msb/shutdown.nonls.diff
@@ -0,0 +1,12 @@
+--- login-utils/shutdown.c.orig 2006-11-19 15:43:36.000000000 +0100
++++ login-utils/shutdown.c 2006-11-19 15:44:43.000000000 +0100
+@@ -197,9 +197,6 @@
+ }
+ sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM
*/
+ for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); /* unnecessary */
+- setlocale(LC_ALL, "");
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- textdomain(PACKAGE);
+
+ #ifndef DEBUGGING
+ if(setreuid (0, 0)) {
diff --git a/smgl/simpleinit-msb/simpleinit.nonls.diff
b/smgl/simpleinit-msb/simpleinit.nonls.diff
new file mode 100644
index 0000000..598c76c
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit.nonls.diff
@@ -0,0 +1,13 @@
+--- login-utils/simpleinit.c.orig 2006-11-19 15:42:20.000000000 +0100
++++ login-utils/simpleinit.c 2006-11-19 15:43:16.000000000 +0100
+@@ -408,10 +407,6 @@
+ my_reboot (LINUX_REBOOT_CMD_CAD_OFF);
+ }
+
+- setlocale(LC_ALL, "");
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- textdomain(PACKAGE);
+-
+ /* Find script to run. Command-line overrides config file overrides
+ built-in default */
+ for (i = 0; i < NUMCMD; i++) inittab[i].pid = -1;



  • [SM-Commit] GIT changes to master grimoire by ruskie (5e5c0032c26f0a8ab67614ac1d94f52d43b6ce84), ruskie, 11/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page