Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 libs/glibc/BUILD     |    2 +-
 libs/glibc/DETAILS   |   48 ++++++------------------------------------------
 libs/glibc/HISTORY   |    8 ++++++++
 libs/glibc/PRE_BUILD |    9 ++++++---
 4 files changed, 21 insertions(+), 46 deletions(-)

New commits:
commit de7fbfdf8d711c6412247588e925fcbd770dc797
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    glibc: Update default header to 2.6.29
    Use upstream kernel sources (similar to sanitized headers, but with a
    statically defined release) for our kernel headers.
    
    This avoids having to make our own headers package for each release and
    for each architecture. Same benefit as using sanitized headers, but now
    we have a stable release we may test against and update, hopefully, for
    each kernel revision 'z' in x.y.z.a

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 1bed77c..e041599 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -67,7 +67,7 @@ unset  LD_LIBRARY_PATH  &&
 # Setup sanitised glibc-kernel-headers for the glibc compile
 # ...as well as other arch-dependend specialties
 #
-if [[ ${GLIBC_NPTL} == y ]] && [[ ${GLIBC_SANITIZE_HEADERS} == y ]]; then
+if [[ ${GLIBC_NPTL} == y ]]; then
   cd ${GLIBC_HEADERS_DIR} &&
   GL_ARCH=${SMGL_COMPAT_ARCHS[1]}  &&
   if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index aab14a9..f7c66ad 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -44,48 +44,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       PATCHLEVEL=2
   fi
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.25
-case "${SMGL_COMPAT_ARCHS[1]}" in
-  ia32)
-         SOURCE3=linux-headers-${HEADERS_VERSION}-x86.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-  ;;
-  x86_64)
-        SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-  ;;
-  ppc)
-        SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-  ;;
-  alpha)
-         SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-  ;;
-  sparc)
-    if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
-    then
-         SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-    else
-         SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
-         SOURCE6=${SOURCE3}.sig
-     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
-    fi
-  ;;
-  *)
-         SOURCE3=UNKNOWN
-         message "${PROBLEM_COLOR}You have an unknown architecture, you 
should file a bug for this${DEFAULT_COLOR}"
-         return 222
-  ;;
-esac
-  
SOURCE3_URL[0]=http://download.sourcemage.org/distro/kernel/headers/$SOURCE3
-  SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
+ HEADERS_VERSION=2.6.29
+         SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
+         SOURCE6=${SOURCE3}.sign
+     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+  SOURCE3_URL[0]="$KERNEL_URL/pub/linux/kernel/v2.6/$SOURCE3"
+  SOURCE6_URL[0]="${SOURCE3_URL[0]}.sign"
   else
     local LINUX_DIRECTORY
  LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index e6f6f4d..73fa428 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,11 @@
+2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Update default headers to 2.6.29
+         Use standard kernel source for headers to avoid packaging per
+         release and per architecture
+       * PRE_BUILD: Unpack default header SOURCE3 and prepare for use
+       * BUILD: Update GLIBC_HEADERS_DIR identically for sanitized and
+         non-sanitized headers
+
 2009-03-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: fixed a typo for the kernel's sources
 
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 7726aa5..561adb4 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -16,9 +16,12 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
 
   unpack_file 3                         &&
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
-    cd  $GLIBC_HEADERS_DIR/usr/include                  &&
-    chmod  -R  +r  *                                    &&
-    find  .  -type  d  -exec  chmod  +x  '{}'  ';'
+    cd  $GLIBC_HEADERS_DIR &&
+    if [ ! -z $SOURCE3 ]; then
+      verify_file 3 || return 1 &&
+      bzcat ${SOURCE_CACHE}/$SOURCE3 > ${SOURCE3%.bz2}
+    fi  &&
+    make mrproper
   else
     cd  $GLIBC_HEADERS_DIR &&
     if [ ! -z $SOURCE7 ]; then