Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c4e807f2af12c27885f521748e6e9bb695a1596b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c4e807f2af12c27885f521748e6e9bb695a1596b)
  • Date: Wed, 20 Dec 2006 14:59:47 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

database/mysql/BUILD | 14 +++++++++++++-
database/mysql/FINAL | 2 +-
database/mysql/HISTORY | 6 ++++++
database/mysql/INSTALL | 4 ++--
database/mysql/POST_REMOVE | 2 +-
database/mysql/PREPARE | 3 +--
disk/grub/BUILD | 21 ++++++++++-----------
disk/grub/DEPENDS | 3 +--
disk/grub/DETAILS | 3 +--
disk/grub/HISTORY | 9 +++++++++
disk/grub/INSTALL | 10 +++++-----
disk/grub/PRE_BUILD | 1 +
disk/grub/configure.ac.patch | 16 ++++++++++++++++
13 files changed, 67 insertions(+), 27 deletions(-)

New commits:
commit 667e589771913afb256a68314553200e55d25e4f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

disk/grub:

PRE_BUILD, configure.ac.patch: added a patch to get rid of
automake-1.9, works with automake now
DEPENDS: switched to automake, no need in gcc34, builds fine with
gcc 4.1.1
DETAILS: removed GCC_VERSION, UPDATED, added PATCHLEVEL
BUILD: using automake now, install_rootifying, removed invoke_gcc
INSTALL: install and track_rootifying

commit 281496dccdc6924c77b2598313535d2680d4d328
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

database/mysql:

BUILD: added --without options to disable engines, install_rootifying
/var/lib/mysql
FINAL, INSTALL, POST_REMOVE: track_rootifying
PREPARE: removed needless true

diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index c86789c..bfe76e4 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -1,20 +1,30 @@
if list_find "$MSQL_ENGINES" "ARCHIVE" ; then
OPTS="--with-archive-storage-engine $OPTS"
+else
+ OPTS="--without-archive-storage-engine $OPTS"
fi &&
if ! list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
OPTS="--without-berkeley-db $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "BLACKHOLE" ; then
OPTS="--with-blackhole-storage-engine $OPTS"
+else
+ OPTS="--without-blackhole-storage-engine $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "CSV" ; then
OPTS="--with-csv-storage-engine $OPTS"
+else
+ OPTS="--without-csv-storage-engine $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "EXAMPLE" ; then
OPTS="--with-example-storage-engine $OPTS"
+else
+ OPTS="--without-example-storage-engine $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "FEDERATED" ; then
OPTS="--with-federated-storage-engine $OPTS"
+else
+ OPTS="--without-federated-storage-engine $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "InnoDB" ; then
OPTS="--with-innodb $OPTS"
@@ -23,6 +33,8 @@ else
fi &&
if list_find "$MSQL_ENGINES" "ndbcluster" ; then
OPTS="--with-ndbcluster $OPTS"
+else
+ OPTS="--without-ndbcluster $OPTS"
fi &&

OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS" &&
@@ -38,7 +50,7 @@ if glibc_is_nptl; then
export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
fi &&
OPTS="$OPTS --with-mysqld-user=mysql --without-bench \
- --localstatedir=/var/lib/mysql \
+ --localstatedir=${INSTALL_ROOT}/var/lib/mysql \
--enable-assembler --enable-thread-safe-client" &&
default_build &&

diff --git a/database/mysql/FINAL b/database/mysql/FINAL
index b0dc543..d112be2 100755
--- a/database/mysql/FINAL
+++ b/database/mysql/FINAL
@@ -1,5 +1,5 @@
if [[ "$MSQL_INSTDB" == "y" && \
"$MSQL_SERVER" != "--without-server" ]]; then
mysql_install_db
- chown -R mysql.mysql /var/lib/mysql
+ chown -R mysql.mysql ${TRACK_ROOT}/var/lib/mysql
fi
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 287386d..621b5ba 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2006-12-20 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: added --without options to disable engines,
install_rootifying
+ /var/lib/mysql
+ * FINAL, INSTALL, POST_REMOVE: track_rootifying
+ * PREPARE: removed needless true
+
2006-10-29 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 5.0.27

diff --git a/database/mysql/INSTALL b/database/mysql/INSTALL
index 067004f..f226c7d 100755
--- a/database/mysql/INSTALL
+++ b/database/mysql/INSTALL
@@ -1,2 +1,2 @@
-make pkglibdir=/usr/lib install &&
-rm -rf /usr/mysql-test
+make pkglibdir=${TRACK_ROOT}/usr/lib install &&
+rm -rf ${TRACK_ROOT}/usr/mysql-test
diff --git a/database/mysql/POST_REMOVE b/database/mysql/POST_REMOVE
index 4741430..0677e90 100755
--- a/database/mysql/POST_REMOVE
+++ b/database/mysql/POST_REMOVE
@@ -1 +1 @@
-install-info --delete mysql --info-dir /usr/share/info
+install-info --delete mysql --info-dir ${TRACK_ROOT}/usr/share/info
diff --git a/database/mysql/PREPARE b/database/mysql/PREPARE
index 045261e..5938681 100755
--- a/database/mysql/PREPARE
+++ b/database/mysql/PREPARE
@@ -1,2 +1 @@
-config_query OLD "Build 4.1.X series?" n
-true
+config_query OLD "Build 4.1.X series?" n
diff --git a/disk/grub/BUILD b/disk/grub/BUILD
index bd6e126..6351e17 100755
--- a/disk/grub/BUILD
+++ b/disk/grub/BUILD
@@ -313,15 +313,14 @@ fi &&
# End setting up OPTS

# Launch automake tools to get the patchs options integrated
-aclocal-1.9 &&
-automake-1.9 &&
-autoconf &&
-
-./configure --build=$BUILD \
- --prefix=/usr \
- --sbindir=/sbin \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- $OPTS &&
-invoke_gcc &&
+aclocal &&
+automake &&
+autoconf &&
+
+./configure --build=$BUILD \
+ --prefix=${INSTALL_ROOT}/usr \
+ --sbindir=${INSTALL_ROOT}/sbin \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
make
diff --git a/disk/grub/DEPENDS b/disk/grub/DEPENDS
index 91315f2..8bfcc96 100755
--- a/disk/grub/DEPENDS
+++ b/disk/grub/DEPENDS
@@ -1,5 +1,4 @@
-depends automake-1.9 &&
-depends gcc34 &&
+depends automake &&
depends gnupg &&
depends smgl-fhs &&

diff --git a/disk/grub/DETAILS b/disk/grub/DETAILS
index 1e004b5..eb1b895 100755
--- a/disk/grub/DETAILS
+++ b/disk/grub/DETAILS
@@ -8,8 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
WEB_SITE=http://www.gnu.org/software/grub/
ENTERED=20020403
- UPDATED=20050513
- GCC_VERSION=3.4
+ PATCHLEVEL=1
LICENSE[0]=GPL
VOYEUR="on"
SHORT="GNU GRUB bootloader"
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 47c5754..61d1cf1 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,12 @@
+2006-12-20 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, configure.ac.patch: added a patch to get rid of
+ automake-1.9, works with automake now
+ * DEPENDS: switched to automake, no need in gcc34, builds fine with
+ gcc 4.1.1
+ * DETAILS: removed GCC_VERSION, UPDATED, added PATCHLEVEL
+ * BUILD: using automake now, install_rootifying, removed invoke_gcc
+ * INSTALL: install and track_rootifying
+
2006-11-05 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, BUILD: using automake-1.9

diff --git a/disk/grub/INSTALL b/disk/grub/INSTALL
index 281337d..e49a39c 100755
--- a/disk/grub/INSTALL
+++ b/disk/grub/INSTALL
@@ -1,12 +1,12 @@
-if [ ! -e /boot/grub ]; then
- mkdir /boot/grub
+if [ ! -e ${TRACK_ROOT}/boot/grub ]; then
+ mkdir -p ${INSTALL_ROOT}/boot/grub
fi &&

-make install &&
-chmod 750 /sbin/grub* &&
+make install &&
+chmod 750 ${TRACK_ROOT}/sbin/grub* &&

# Sample image, replace with SMGL image
mkdir -p /boot/grub/images &&
cp ${SCRIPT_DIRECTORY}/smgl-splash.xpm.gz \
- /boot/grub/images
+ ${INSTALL_ROOT}/boot/grub/images
# this will create a sensible menu.lst.skel in the future
diff --git a/disk/grub/PRE_BUILD b/disk/grub/PRE_BUILD
index 7cb9238..0cb46e2 100755
--- a/disk/grub/PRE_BUILD
+++ b/disk/grub/PRE_BUILD
@@ -5,6 +5,7 @@ patch -p1 < ${SCRIPT_DIRECTORY}/grub-
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.96-i2o-raid.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-PIC.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-nxstack.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/configure.ac.patch &&

if [ "$GRUB_REISER4" = "y" ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-reiser4-20050808.patch
&&
diff --git a/disk/grub/configure.ac.patch b/disk/grub/configure.ac.patch
new file mode 100644
index 0000000..6e9e630
--- /dev/null
+++ b/disk/grub/configure.ac.patch
@@ -0,0 +1,16 @@
+--- configure.ac.orig 2005-05-08 07:36:03.000000000 +0500
++++ configure.ac 2006-12-20 19:32:23.000000000 +0500
+@@ -56,11 +56,13 @@
+
+ AC_CHECK_TOOL(CC, gcc)
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ # We need this for older versions of Autoconf.
+ _AM_DEPENDENCIES(CC)
+
+ dnl Because recent automake complains about AS, set it here.
+ CCAS="$CC"
++AM_PROG_AS
+ AC_SUBST(CCAS)
+
+ AC_ARG_WITH(binutils,



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c4e807f2af12c27885f521748e6e9bb695a1596b), Pol Vinogradov, 12/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page