diff mbox

[04,of,13] kernel/linux: use generic custom infrastructure

Message ID 50674fe47431174aab80.1349931193@localhost.localdomain
State Accepted
Commit 63d108a39453
Headers show

Commit Message

David Holsgrove Oct. 11, 2012, 4:53 a.m. UTC 
# HG changeset patch
# User David Holsgrove <david.holsgrove@xilinx.com>
# Date 1349930380 -36000
# Node ID 50674fe47431174aab80d6c01460aa2d6c901306
# Parent  0bbaba9190a76ba97f723e9f90b708f7cf040b03
kernel/linux: use generic custom infrastructure

Config options remain the same as before, just generalised to be used by other
components also.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>


--
For unsubscribe information see http://sourceware.org/lists.html#faq

Comments

Yann E. MORIN Oct. 13, 2012, 10 p.m. UTC | #1 
David, All,

Your patch:
    kernel/linux: use generic custom infrastructure

has been applied as #63d108a39453. Thank you!

Regards,
Yann E. MORIN.



--
For unsubscribe information see http://sourceware.org/lists.html#faq
diff mbox

Patch

diff -r 0bbaba9190a7 -r 50674fe47431 scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh	Thu Oct 11 14:39:21 2012 +1000
+++ b/scripts/build/kernel/linux.sh	Thu Oct 11 14:39:40 2012 +1000
@@ -29,23 +29,8 @@ 
     fi
 
     if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then
-        if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
-            # Wee need to know the custom tarball extension,
-            # so we can create a properly-named symlink, which
-            # we use later on in 'extract'
-            case "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" in
-                *.tar.bz2)      custom_name="linux-custom.tar.bz2";;
-                *.tar.gz|*.tgz) custom_name="linux-custom.tar.gz";;
-                *.tar)          custom_name="linux-custom.tar";;
-                *)  CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";;
-            esac
-            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
-                                      "${CT_TARBALLS_DIR}/${custom_name}"
-        else
-            custom_name="linux-custom"
-            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
-                                      "${CT_SRC_DIR}/${custom_name}"
-        fi
+        CT_GetCustom "linux" "${CT_KERNEL_VERSION}" \
+        "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"
     else # Not a custom tarball
         case "${CT_KERNEL_VERSION}" in
             2.6.*.*|3.*.*)
@@ -75,7 +60,7 @@ 
 # Extract kernel
 do_kernel_extract() {
     if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \
-         -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
+         -o -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then
         return 0
     fi