Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac1379c16778d65493acb026ace4fe15481904c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac1379c16778d65493acb026ace4fe15481904c2)
  • Date: Wed, 4 Jul 2012 07:36:25 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

dev/null |binary
disk/grub2/CONFIGURE | 7 ++++---
disk/grub2/DEPENDS | 5 +++++
disk/grub2/DETAILS | 8 +++-----
disk/grub2/HISTORY | 8 ++++++++
disk/grub2/PRE_BUILD | 3 +--
disk/grub2/fix-udev.patch | 21 ---------------------
libs/mpfr/BUILD | 1 +
libs/mpfr/DETAILS | 7 +++----
libs/mpfr/HISTORY | 5 +++++
libs/mpfr/PRE_BUILD | 4 ----
libs/mpfr/allpatches.bz2 | 0
12 files changed, 30 insertions(+), 39 deletions(-)

New commits:
commit ac1379c16778d65493acb026ace4fe15481904c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mpfr: => 3.1.1

commit f228ac9b482030331d36acb883a70b2cfc1145be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

grub2: => 2.00

diff --git a/disk/grub2/CONFIGURE b/disk/grub2/CONFIGURE
index ccc09ee..316d411 100755
--- a/disk/grub2/CONFIGURE
+++ b/disk/grub2/CONFIGURE
@@ -3,6 +3,9 @@
#
list_remove GRUB2_OPTS '--enable-grub-mkfont' &&
list_remove GRUB2_OPTS '--enable-grub-emu' &&
+# grub-emu-usb depends on LIBUSB
+list_remove GRUB2_OPTS '--enable-grub-emu-usb' &&
+list_remove GRUB2_OPTS '--disable-grub-emu-usb' &&
list_remove GRUB2_OPTS '--enable-grub-pe2elf' &&
# fstest is no longer an option as of 1.99
list_remove GRUB2_OPTS '--enable-grub-fstest' &&
@@ -11,9 +14,7 @@ list_remove GRUB2_OPTS '--disable-grub-fstest' &&
config_query_option GRUB2_OPTS 'include memory manger debugging?' n \
'--enable-mm-debug' \
'--disable-mm-debug' &&
-config_query_option GRUB2_OPTS 'build and install the grub-emu-usb debugging
utility?' n \
- '--enable-grub-emu-usb' \
- '--disable-grub-emu-usb' &&
+
config_query_option GRUB2_OPTS 'build and install the efiemu runtimes?' y \
'--enable-efiemu' \
'--disable-efiemu'
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 2f49052..3f489cb 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -21,6 +21,11 @@ optional_depends freetype2 \

optional_depends unifont '' '' 'for the default font (needed for gfxterm)'
&&

+optional_depends LIBUSB \
+ '--enable-grub-emu-usb' \
+ '--disable-grub-emu-usb' \
+ 'build grub-emu debugging utility' &&
+
optional_depends sdl \
'--enable-grub-emu-sdl' \
'--disable-grub-emu-sdl' \
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 0395168..5de72f6 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -11,10 +11,9 @@
# SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
# SOURCE_IGNORE=volatile
#else
- VERSION=1.99
- PATCHLEVEL=1
- SOURCE=grub-$VERSION.tar.gz
- SOURCE2=grub-$VERSION.tar.gz.sig
+ VERSION=2.00
+ SOURCE=grub-$VERSION.tar.xz
+ SOURCE2=grub-$VERSION.tar.xz.sig
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
@@ -24,7 +23,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
WEB_SITE=http://www.gnu.org/software/grub/
ENTERED=20090808
LICENSE[0]=GPL
- VOYEUR="on"
SHORT="GNU GRUB2 bootloader"
cat << EOF
Install this package only after you have created, and tested, a rescue disk
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 15140c0..334fd19 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,11 @@
+2012-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.00
+ less versbosity
+ * DEPENDS: add LIBUSB
+ * CONFIGURE: remove --enable-grub-emu-usb
+ * fix-udev.patch: deleted
+ * PRE_BUILD: remove patch, it no longer applies
+
2012-01-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* fix-udev.patch: added
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 3cd048f..457375e 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -4,5 +4,4 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
else
rm -rf autom4te.cache
-fi &&
-patch -p0 <$SPELL_DIRECTORY/fix-udev.patch
+fi
diff --git a/disk/grub2/fix-udev.patch b/disk/grub2/fix-udev.patch
deleted file mode 100644
index fcfef34..0000000
--- a/disk/grub2/fix-udev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'grub-core/kern/emu/getroot.c'
---- grub-core/kern/emu/getroot.c 2011-05-21 05:03:55 +0000
-+++ grub-core/kern/emu/getroot.c 2011-05-30 23:56:40 +0000
-@@ -220,9 +220,17 @@ grub_find_root_device_from_mountinfo (co
- /* Now scan visible mounts for the ones we're interested in. */
- for (i = entry_len - 1; i >= 0; i--)
- {
-+ struct stat st;
-+
- if (!*entries[i].device)
- continue;
-
-+ if (stat (entries[i].device, &st) < 0)
-+ /* The root filesystem device recorded in mountinfo does not
-+ exist, perhaps due to a udev bug. Fall back to more primitive
-+ methods. */
-+ break;
-+
- ret = strdup (entries[i].device);
- if (relroot)
- *relroot = strdup (entries[i].enc_root);
diff --git a/libs/mpfr/BUILD b/libs/mpfr/BUILD
index e5dfe2f..2a6c0e6 100755
--- a/libs/mpfr/BUILD
+++ b/libs/mpfr/BUILD
@@ -1,2 +1,3 @@
OPTS="$MPFR_OPTS $OPTS" &&
+CFLAGS+=' -fno-fast-math' &&
default_build
diff --git a/libs/mpfr/DETAILS b/libs/mpfr/DETAILS
index 090dafd..dc84d1b 100755
--- a/libs/mpfr/DETAILS
+++ b/libs/mpfr/DETAILS
@@ -1,9 +1,8 @@
SPELL=mpfr
- VERSION=3.1.0
-
SOURCE_HASH=sha512:86083d8cf9dbcf1e33fcf1d73da8bd5b98fbc9187acf36b2d84c453fd18010aa659960a8026470e49d535d957f764941926a78acb31fe2869bf9a92524e0e81c
- PATCHLEVEL=8
+ VERSION=3.1.1
+
SOURCE_HASH=sha512:4fcc87e19a08622b3211a33807e708b78da6c8659f391003703a9e170c485f56e6ebfff48d42afca7b4edb14fd9487684c4d8fd6c9f805ed62b6d5259d5721a8
SECURITY_PATCH=2
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mpfr.org/mpfr-$VERSION/$SOURCE
WEB_SITE=http://www.mpfr.org/
diff --git a/libs/mpfr/HISTORY b/libs/mpfr/HISTORY
index d9e8c54..bff2a00 100644
--- a/libs/mpfr/HISTORY
+++ b/libs/mpfr/HISTORY
@@ -1,3 +1,8 @@
+2012-07-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.1
+ * PRE_BUILD, allpatches.bbz2: deleted
+ * BUILD: force -fno-fast-math, to avoid warning during configure
+
2012-05-06 Sukneet Basuta <sukneet AT sourcemage.org>
* INSTALL: if symlink already exists, rm it

diff --git a/libs/mpfr/PRE_BUILD b/libs/mpfr/PRE_BUILD
deleted file mode 100755
index 828253a..0000000
--- a/libs/mpfr/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# autoreconf -f -i --symlink
-bzcat $SPELL_DIRECTORY/allpatches.bz2 |patch -p1
diff --git a/libs/mpfr/allpatches.bz2 b/libs/mpfr/allpatches.bz2
deleted file mode 100644
index ac5c4c3..0000000
Binary files a/libs/mpfr/allpatches.bz2 and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac1379c16778d65493acb026ace4fe15481904c2), Treeve Jelbert, 07/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page