Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8bc3be06707919590caf5a434a3e172cafd7e45c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8bc3be06707919590caf5a434a3e172cafd7e45c)
  • Date: Sat, 15 Feb 2014 04:44:26 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/glibc/DETAILS | 4 ++--
libs/glibc/HISTORY | 4 ++++
libs/glibc/PRE_BUILD | 19 ++++++++++---------
3 files changed, 16 insertions(+), 11 deletions(-)

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} &&

case ${HEADERS_VERSION} in
3.[1-9]*)
- message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
- bunzip2 -k $SOURCE_CACHE/$SOURCE3
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz}
+ message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
+ xz -d -k $SOURCE_CACHE/$SOURCE3
SOURCE3_ORI=$SOURCE3
- SOURCE3=${SOURCE3/.bz2}
+ SOURCE3=${SOURCE3/.xz}
unpack_file 3 || return 1
message "${MESSAGE_COLOR}rm
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
rm $SOURCE_CACHE/$SOURCE3
SOURCE3=$SOURCE3_ORI
;;
*)
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
unpack_file 3 || return 1
;;
esac
@@ -39,10 +40,10 @@ if [ "$GLIBC_NPTL" = "y" ]; then
cd $GLIBC_HEADERS_DIR &&
if [ ! -z $SOURCE7 ]; then
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
- message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
- bunzip2 -k ${SOURCE_CACHE}/$SOURCE7 &&
+ message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
+ xz -d -k ${SOURCE_CACHE}/$SOURCE7 &&
SOURCE7_ORI=${SOURCE7}
- SOURCE7=${SOURCE7/.bz2}
+ SOURCE7=${SOURCE7/.xz}
echo $SOURCE7_GPG
verify_file 7 || return 1
message "${MESSAGE_COLOR}rm $SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
@@ -51,9 +52,9 @@ if [ "$GLIBC_NPTL" = "y" ]; then
else
verify_file 7 || return 1
fi
- bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7/.bz2}
+ xzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7/.xz}
message "${MESSAGE_COLOR}Patching ${!patch}${DEFAULT_COLOR}" &&
- patch -p1 < ${SOURCE7/.bz2} &&
+ patch -p1 < ${SOURCE7/.xz} &&
if [[ $? != 0 ]]; then
message "${PROBLEM_COLOR}Patch ${!patch} failed${DEFAULT_COLOR}" &&
return 1



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8bc3be06707919590caf5a434a3e172cafd7e45c), Thomas Orgis, 02/15/2014

Archive powered by MHonArc 2.6.24.

Top of Page