build: avoid downloading the kernel twice as .xz and .gz

Since the buildroot anyway downloads .xz archive of the kernel for linux-headers we can avoid downloading the gz archive for our kernel compilation. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

build: avoid downloading the kernel twice as .xz and .gz
Since the buildroot anyway downloads .xz archive of the kernel for linux-headers we can avoid downloading the gz archive for our kernel compilation. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
6294f4d4 · Adam Wujek · 4b6fa5ca · 6294f4d4 · 6294f4d4 · 6294f4d4
Commit 6294f4d4 authored Nov 02, 2016 by Adam Wujek 💬
Showing with 7 additions and 5 deletions

download-info build/download-info +2 -2

wrs_build_kernel build/scripts/wrs_build_kernel +3 -2

wrs_build-all build/wrs_build-all +1 -0

wrs-developer-manual.in doc/wrs-developer-manual.in +1 -1

No files found.
--- a/build/download-info
+++ b/build/download-info
@@ -15,8 +15,8 @@ barebox-2014.04.0.tar.bz2       e1f089fc24cc7f24478e663c0e3b91d9 \
   http://www.barebox.org/download/barebox-2014.04.0.tar.bz2

 # kernel
-linux-3.16.37.tar.gz            96f2dc8fa21624d63f7ab20147d4e563 \
-   https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.37.tar.gz
+linux-3.16.37.tar.xz            fc4e8c469cf852a128e160f2910c1f21 \
+   https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.37.tar.xz

 # our gateware binaries
 wrs-gw-v4.2-20150826.tar.gz 807117326f6d5b1b53ebc95ca093fc44 \

--- a/build/scripts/wrs_build_kernel
+++ b/build/scripts/wrs_build_kernel
@@ -12,7 +12,7 @@ wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- Linux kernel for switch"

-tarname="linux-${KVER}.tar.gz"
+tarname="linux-${KVER}.tar.xz"
 patchdir="${WRS_BASE_DIR}/../patches/kernel/v${KVER}"
 wrs_download $tarname

@@ -23,7 +23,8 @@ mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images"
 cd $WRS_OUTPUT_DIR/build
 dirname="linux-${KVER}"
 rm -rf $dirname
-tar xzf ${WRS_DOWNLOAD_DIR}/$tarname || wrs_die "untar $tarname"
+# xz archive, so use "J" for tar
+tar xJf ${WRS_DOWNLOAD_DIR}/$tarname || wrs_die "untar $tarname"

 # apply patches
 cd $dirname

--- a/build/wrs_build-all
+++ b/build/wrs_build-all
@@ -37,6 +37,7 @@ export PATH="$PATH:/usr/sbin"
 WRS_TOOLS="git gcc g++ ar as m4 msgfmt md5sum make"
 WRS_TOOLS="$WRS_TOOLS awk unzip patch bison flex ncursesw5-config"
 WRS_TOOLS="$WRS_TOOLS fakeroot makeinfo"
+WRS_TOOLS="$WRS_TOOLS xz"

 wrs_check_tools $WRS_TOOLS


--- a/doc/wrs-developer-manual.in
+++ b/doc/wrs-developer-manual.in
@@ -363,7 +363,7 @@ The messages of a download run are like the following ones:
    2016-06-02 17:10:46: --- Downloading base packages
    2016-06-02 17:10:50: Retrieved at91bootstrap-3-3.0.tar.gz from upstream
    2016-06-02 17:10:51: Retrieved barebox-2014.04.0.tar.bz2 from upstream
-    2016-06-02 17:11:21: Retrieved linux-2.6.39.tar.bz2 from upstream
+    2016-06-02 17:11:21: Retrieved linux-3.16.37.tar.xz from upstream
    2016-06-02 17:11:22: Retrieved wrs-gw-v4.2-20150826.tar.gz from upstream
    2016-06-02 17:11:27: Retrieved buildroot-2016.02.tar.bz2 from upstream
 @end smallexample