Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (5b59e503e44868d26150a42cc5474d4af6364e89)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (5b59e503e44868d26150a42cc5474d4af6364e89)
  • Date: Thu, 12 Jul 2007 15:59:52 -0500

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

utils/util-linux/BUILD | 27 ---------------------------
utils/util-linux/HISTORY | 1 +
utils/util-linux/PRE_BUILD | 29 +++++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 27 deletions(-)

New commits:
commit 5b59e503e44868d26150a42cc5474d4af6364e89
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

util-linux: Moved patches & sedits from BUILD to PRE_BUILD

diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index a26f5d8..57a5b7d 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -2,33 +2,6 @@ OPTS="$OPTS --build=${BUILD}" &
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"

create_group tty &&
-patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch &&
-
-sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
-sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
-sedit "s/\$(OPT)//" MCONFIG &&
-# Stupid `make install` doesn't honor --prefix
-sedit "s:/dev:${TRACK_ROOT}/dev:" MCONFIG &&
-sedit "s:/etc:${TRACK_ROOT}/etc:" MCONFIG &&
-# Stupid people who use TABs in their files...
-sedit "s: /sbin: ${TRACK_ROOT}/sbin:" MCONFIG &&
-sedit "s:/usr:${TRACK_ROOT}/usr:g" MCONFIG &&
-sedit "s:BIN_DIR= /bin: BIN_DIR=${TRACK_ROOT}/bin:" MCONFIG &&
-sedit "s:= /var/:= ${TRACK_ROOT}/var:g" MCONFIG &&
-
-#ORIGINAL Below############################################
-#sedit "s: /sbin: ${INSTALL_ROOT}/sbin:" MCONFIG &&
-#sedit "s:/usr:${INSTALL_ROOT}/usr:g" MCONFIG &&
-#sedit "s: /bin: ${INSTALL_ROOT}/bin:" MCONFIG &&
-#sedit "s:/var:${INSTALL_ROOT}/var:g" MCONFIG &&
-############################################################
-
-if [ "$SELINUX" == "y" ]; then
- sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG &&
- message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
-fi &&

disable_pic &&

diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 8d94f25..92947c0 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -2,6 +2,7 @@
* BUILD, glibc-umount2.patch, glibc-fix.patch: Added from OE to
fix compile problems on arm. Applying patches regardless of
architecture, tested fine on i686
+ * BUILD, PRE_BUILD: moved patches & sedits to PRE_BUILD

2007-03-11 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: moved the create_group tty down so that it will break the
chain
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
new file mode 100644
index 0000000..56c11b7
--- /dev/null
+++ b/utils/util-linux/PRE_BUILD
@@ -0,0 +1,29 @@
+default_pre_build && cd $SOURCE_DIRECTORY
+
+patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch
+patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch
+patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch
+
+sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
+sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
+sedit "s/\$(OPT)//" MCONFIG &&
+# Stupid `make install` doesn't honor --prefix
+sedit "s:/dev:${TRACK_ROOT}/dev:" MCONFIG &&
+sedit "s:/etc:${TRACK_ROOT}/etc:" MCONFIG &&
+# Stupid people who use TABs in their files...
+sedit "s: /sbin: ${TRACK_ROOT}/sbin:" MCONFIG &&
+sedit "s:/usr:${TRACK_ROOT}/usr:g" MCONFIG &&
+sedit "s:BIN_DIR= /bin: BIN_DIR=${TRACK_ROOT}/bin:" MCONFIG &&
+sedit "s:= /var/:= ${TRACK_ROOT}/var:g" MCONFIG &&
+
+#ORIGINAL Below############################################
+#sedit "s: /sbin: ${INSTALL_ROOT}/sbin:" MCONFIG &&
+#sedit "s:/usr:${INSTALL_ROOT}/usr:g" MCONFIG &&
+#sedit "s: /bin: ${INSTALL_ROOT}/bin:" MCONFIG &&
+#sedit "s:/var:${INSTALL_ROOT}/var:g" MCONFIG &&
+############################################################
+
+if [ "$SELINUX" == "y" ]; then
+ sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG &&
+ message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
+fi



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (5b59e503e44868d26150a42cc5474d4af6364e89), Ethan Grammatikidis, 07/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page