[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (786008a756f3e2639ba2b46b0cf794a0d8833d50)

Ladislav Hagara scm at sourcemage.org
Mon Jul 25 16:03:06 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 libs/glibc/DETAILS |   19 +++++++++++++++++++
 libs/glibc/HISTORY |    3 +++
 libs/glibc/PREPARE |    4 ++--
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 786008a756f3e2639ba2b46b0cf794a0d8833d50
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    glibc: linux 3 support added
    
    seems works ok with linux-3.0 headers

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index e632641..926e198 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -56,6 +56,24 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
     local LINUX_DIRECTORY
  LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
     . $LINUX_DIRECTORY/latest.defaults
+if  [[  $(uname -r)  =  3.*  ]];  then
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
+         SOURCE3=linux-${LATEST_3}.tar.bz2
+         SOURCE6="${SOURCE3}.sign"
+  SOURCE6_IGNORE=signature
+     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
+     SOURCE6_URL="${SOURCE3_URL}.sign"
+    if [[ $HEADERS_VERSION != $LATEST_3 ]]; then
+         SOURCE7=patch-${HEADERS_VERSION}.bz2
+         SOURCE8="${SOURCE7}.sign"
+  SOURCE8_IGNORE=signature
+     SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
+     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
+     SOURCE8_URL="${SOURCE7_URL}.sign"
+    fi
+else
  HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
  HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
          SOURCE3=linux-${LATEST_2_6}.tar.bz2
@@ -72,6 +90,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
      SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
      SOURCE8_URL="${SOURCE7_URL}.sign"
     fi
+fi
   fi
 fi
         WEB_SITE=http://www.gnu.org/software/libc
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index a843fff..245ab7a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2011-07-25 Ladislav Hagara <hgr at vabo.cz>
+	* PREPARE, DETAILS: linux 3 support added
+
 2011-07-14 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* INSTALL: install default nscd config if init script is installed
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index c9bbbe9..b946fbc 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,9 +1,9 @@
-if  [[  $(uname -r)  =  2.6.*  ]];  then
+if  [[  $(uname -r)  =  2.6.*  ]] || [[  $(uname -r)  =  3.*  ]];  then
   if  test  "$HOST" == "i386-pc-linux-gnu"; then
     message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported on i386; use i486 or higher.${DEFAULT} ]]" &&
     config_set_option GLIBC_NPTL n
   else
-    config_query  GLIBC_NPTL  "As you are running a 2.6 kernel, would you like to use the new nptl (Native Posix Thread Libary)?" y &&
+    config_query  GLIBC_NPTL  "As you are running a $(uname -r | cut -f1,2 -d.) kernel, would you like to use the new nptl (Native Posix Thread Libary)?" y &&
     if [[ "$GLIBC_NPTL" == "y" ]]; then
       config_query  GLIBC_CVS  "Do you want to install the latest unstable release (requires cvs)?"  n &&
       if [[ "$GLIBC_CVS" == "y" ]]; then


More information about the SM-Commit mailing list