New commits:
commit 6c50d5bd52c60578cd5351f11e31ece084be5bb2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
glibc: Switch to .xz files for 3.x kernel headers (.bz2 files not present
for recent versions).
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index f3938b3..25649f1 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -58,7 +58,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
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
+ SOURCE3=linux-${LATEST_3}.tar.xz
SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
case $HEADERS_VERSION in
3.[1-9]*)
@@ -73,7 +73,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE6_IGNORE=signature
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
- SOURCE7=patch-${HEADERS_VERSION}.bz2
+ SOURCE7=patch-${HEADERS_VERSION}.xz
SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
SOURCE8="patch-${HEADERS_VERSION}.sign"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 478b6a5..245e5ad 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2014-02-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, PRE_BUILD: Use .xz files for 3.x kernels, .bz2 missing
+ for newer versions.
+
2013-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: TMPFS=off
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 99a69d6..84a75c6 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -12,20 +12,21 @@ if [ "$GLIBC_NPTL" = "y" ]; then
# Set GLIBC_HEADERS_DIR for use later
#
persistent_add GLIBC_HEADERS_DIR &&
- GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2} &&