Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (90455ac74927ba6030fe7ab90941e7c91b715c2f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (90455ac74927ba6030fe7ab90941e7c91b715c2f)
  • Date: Wed, 2 Mar 2016 20:54:50 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

disk/grub2/DEPENDS | 8 +++-----
disk/grub2/DETAILS | 27 ++++++++++++---------------
disk/grub2/HISTORY | 4 ++++
disk/grub2/PREPARE | 8 +++-----
disk/grub2/PRE_BUILD | 16 ++++++----------
5 files changed, 28 insertions(+), 35 deletions(-)

New commits:
commit 90455ac74927ba6030fe7ab90941e7c91b715c2f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

grub2: add beta version 2.02-beta3

diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 3f489cb..017ee69 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -3,11 +3,9 @@ depends gettext &&
depends gnupg &&
depends smgl-fhs &&

-if [[ "${GRUB2_SVN}" = 'y' ]]; then
- depends autoconf &&
- depends subversion &&
- depends RUBY
-fi &&
+if [[ "${GRUB2_RELEASE}" != "stable" ]]; then
+ depends autoconf
+fi &&

optional_depends lvm \
'--enable-device-mapper' \
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 5de72f6..36cc09f 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -1,25 +1,22 @@
SPELL=grub2
-#if [[ "${GRUB2_SVN}" = 'y' ]]; then
-#if [[ "${GRUB2_SVN_AUTOUPDATE}" = 'y' ]]; then
-# VERSION=$(date +%Y%m%d)
-#else
-# VERSION=svn
-#fi
-# SOURCE=$SPELL-svn.tar.bz2
-# FORCE_DOWNLOAD=on
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
-# SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
-# SOURCE_IGNORE=volatile
-#else
+case "$GRUB2_RELEASE" in
+ beta)
+ VERSION=2.02-beta3
+ SOURCE=grub-$VERSION.tar.xz
+ SOURCE_URL[0]=git://git.savannah.gnu.org/grub.git:grub-${VERSION}
+
SOURCE_HASH=sha512:1521b5c35e43b38bb7a1257b090ed73e47fbdf2de83e2088eaecc81d944a8bb94d5feca8e429d86948b7369ddc2b0521a3d2991a985dcdeb11a0c79150714ee9
+ ;;
+ stable|*)
VERSION=2.00
SOURCE=grub-$VERSION.tar.xz
- SOURCE2=grub-$VERSION.tar.xz.sig
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
+ SOURCE2=grub-$VERSION.tar.xz.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
SOURCE_GPG=gnu.gpg:${SOURCE2}:UPSTREAM_KEY
-#fi
+ ;;
+esac
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
WEB_SITE=http://www.gnu.org/software/grub/
ENTERED=20090808
LICENSE[0]=GPL
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index ffe9377..5600876 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,7 @@
+2016-03-02 Remko van der Vossen <wich AT sourcemage.org>
+ * PREPARE, DETAILS, DEPENDS, PRE_BUILD:
+ add beta version 2.02-beta3
+
2016-02-25 Remko van der Vossen <wich AT sourcemage.org>
* FINAL: no such thing as NORMAL_COLOR

diff --git a/disk/grub2/PREPARE b/disk/grub2/PREPARE
index 1440197..e465de7 100755
--- a/disk/grub2/PREPARE
+++ b/disk/grub2/PREPARE
@@ -1,5 +1,3 @@
-#config_query GRUB2_SVN "Build SCM version?" n &&
-#if [ "$GRUB2_SVN" == "y" ]; then
-# config_query GRUB2_SVN_AUTOUPDATE \
-# "Automatically update on every system update?" n
-#fi
+config_query_list GRUB2_RELEASE "Select whih release to build:" \
+ stable \
+ beta
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 70e263d..8ff2f81 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,15 +1,11 @@
default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&

-message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}" &&
-patch "${SOURCE_DIRECTORY}"/grub-core/gnulib/stdio.in.h \
- "${SPELL_DIRECTORY}"/glibc-2.16.patch &&
+if [[ "$GRUB2_RELEASE" == "stable" ]]; then
+ message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}"
&&
+ patch grub-core/gnulib/stdio.in.h "${SPELL_DIRECTORY}"/glibc-2.16.patch &&

-cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < ${SPELL_DIRECTORY}/grub-2.00-freetype-2.5.1.patch &&
-
-if [[ "${GRUB2_SVN}" = 'y' ]]; then
- ./autogen.sh
+ patch -p1 < ${SPELL_DIRECTORY}/grub-2.00-freetype-2.5.1.patch
else
- rm -rf autom4te.cache
+ ./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (90455ac74927ba6030fe7ab90941e7c91b715c2f), Remko van der Vossen, 03/02/2016

Archive powered by MHonArc 2.6.24.

Top of Page