* [PATCH 0 of 2] custom kernel directory (not prepared)
@ 2011-09-25 20:44 sinseman44
2011-09-25 20:44 ` [PATCH 2 of 2] correction of previous patch : use a " sinseman44
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: sinseman44 @ 2011-09-25 20:44 UTC (permalink / raw)
To: crossgcc; +Cc: sinseman44
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 2 of 2] correction of previous patch : use a custom kernel directory (not prepared)
2011-09-25 20:44 [PATCH 0 of 2] custom kernel directory (not prepared) sinseman44
@ 2011-09-25 20:44 ` sinseman44
2011-09-25 20:44 ` [PATCH 1 of 2] " sinseman44
2011-09-25 22:32 ` [PATCH 0 of 2] " Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: sinseman44 @ 2011-09-25 20:44 UTC (permalink / raw)
To: crossgcc; +Cc: sinseman44
# HG changeset patch
# User Sinseman44 <sinseman44@gmail.com>
# Date 1316983092 -7200
# Node ID 106357704d6aee847860584cba15dc10ab8f99d5
# Parent 7e4e1c6f74e1064fda7020b2b75fb54d57183f81
correction of previous patch : use a custom kernel directory (not prepared)
Signed-off-by: Vincent BENOIT <sinseman44@gmail.com>
diff -r 7e4e1c6f74e1 -r 106357704d6a config/kernel/linux.in
--- a/config/kernel/linux.in Thu Sep 22 22:49:38 2011 +0200
+++ b/config/kernel/linux.in Sun Sep 25 22:38:12 2011 +0200
@@ -144,9 +144,9 @@
help
Use a local tarball or local kernel directory of a complete kernel source tree.
-config KERNEL_LINUX_CUSTOM_TARBALL
+config KERNEL_LINUX_CUSTOM_LOCATION
string
- prompt "Path to custom tarball or directory"
+ prompt "Path to custom source, tarball or directory"
depends on KERNEL_LINUX_CUSTOM
help
Enter here the path to the tarball of your full kernel tree or
diff -r 7e4e1c6f74e1 -r 106357704d6a scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh Thu Sep 22 22:49:38 2011 +0200
+++ b/scripts/build/kernel/linux.sh Sun Sep 25 22:38:12 2011 +0200
@@ -25,21 +25,21 @@
fi
if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then
- # Wee need to know the custom tarball extension,
- # so we can cerate a properly-named symlink, which
- # we use later on in 'extract'
- if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
- case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" in
+ 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_TARBALL}'";;
+ *) CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";;
esac
- CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \
+ CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \
"${CT_TARBALLS_DIR}/${custom_name}"
else
custom_name="linux-custom"
- CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \
+ CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \
"${CT_SRC_DIR}/${custom_name}"
fi
@@ -72,7 +72,7 @@
# Extract kernel
do_kernel_extract() {
if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \
- -o -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
+ -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
return 0
fi
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1 of 2] use a custom kernel directory (not prepared)
2011-09-25 20:44 [PATCH 0 of 2] custom kernel directory (not prepared) sinseman44
2011-09-25 20:44 ` [PATCH 2 of 2] correction of previous patch : use a " sinseman44
@ 2011-09-25 20:44 ` sinseman44
2011-09-25 22:32 ` [PATCH 0 of 2] " Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: sinseman44 @ 2011-09-25 20:44 UTC (permalink / raw)
To: crossgcc; +Cc: sinseman44
# HG changeset patch
# User Sinseman44 <sinseman44@gmail.com>
# Date 1316724578 -7200
# Node ID 7e4e1c6f74e1064fda7020b2b75fb54d57183f81
# Parent 7df89370f80537d1b36b2fda70e3a1c6bc237a65
use a custom kernel directory (not prepared)
diff -r 7df89370f805 -r 7e4e1c6f74e1 config/kernel/linux.in
--- a/config/kernel/linux.in Wed Sep 21 22:42:35 2011 +0200
+++ b/config/kernel/linux.in Thu Sep 22 22:49:38 2011 +0200
@@ -140,16 +140,17 @@
config KERNEL_LINUX_CUSTOM
bool
- prompt "custom tarball"
+ prompt "custom tarball or directory"
help
- Use a local tarball of a complete kernel source tree.
+ Use a local tarball or local kernel directory of a complete kernel source tree.
config KERNEL_LINUX_CUSTOM_TARBALL
string
- prompt "Path to custom tarball"
+ prompt "Path to custom tarball or directory"
depends on KERNEL_LINUX_CUSTOM
help
- Enter here the path to the tarball of your full kernel tree.
+ Enter here the path to the tarball of your full kernel tree or
+ kernel directory
endchoice
diff -r 7df89370f805 -r 7e4e1c6f74e1 scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh Wed Sep 21 22:42:35 2011 +0200
+++ b/scripts/build/kernel/linux.sh Thu Sep 22 22:49:38 2011 +0200
@@ -28,14 +28,21 @@
# Wee need to know the custom tarball extension,
# so we can cerate a properly-named symlink, which
# we use later on in 'extract'
- case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" 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_TARBALL}'";;
- esac
- CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \
- "${CT_TARBALLS_DIR}/${custom_name}"
+ if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
+ case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" 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_TARBALL}'";;
+ esac
+ CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \
+ "${CT_TARBALLS_DIR}/${custom_name}"
+ else
+ custom_name="linux-custom"
+ CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \
+ "${CT_SRC_DIR}/${custom_name}"
+ fi
+
else # Not a custom tarball
case "${CT_KERNEL_VERSION}" in
2.6.*.*|3.*.*)
@@ -64,9 +71,11 @@
# Extract kernel
do_kernel_extract() {
- if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
+ if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \
+ -o -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
return 0
fi
+
# This also handles the custom tarball
CT_Extract "linux-${CT_KERNEL_VERSION}"
CT_Patch "linux" "${CT_KERNEL_VERSION}"
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 0 of 2] custom kernel directory (not prepared)
2011-09-25 20:44 [PATCH 0 of 2] custom kernel directory (not prepared) sinseman44
2011-09-25 20:44 ` [PATCH 2 of 2] correction of previous patch : use a " sinseman44
2011-09-25 20:44 ` [PATCH 1 of 2] " sinseman44
@ 2011-09-25 22:32 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2011-09-25 22:32 UTC (permalink / raw)
To: crossgcc; +Cc: sinseman44
Vincent, All,
I've pushed the folded patch as #b94e0f9d15a3. Thank you!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-25 22:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-25 20:44 [PATCH 0 of 2] custom kernel directory (not prepared) sinseman44
2011-09-25 20:44 ` [PATCH 2 of 2] correction of previous patch : use a " sinseman44
2011-09-25 20:44 ` [PATCH 1 of 2] " sinseman44
2011-09-25 22:32 ` [PATCH 0 of 2] " Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).