2012-07-09 11:48:09

by Ozan Çağlayan

Subject: [PATCH] compat: Fix setting $TARGET

commit 61077651424add644401b927b52681a191bbd7f1 moved the list of
kernels above which broke the $TARGET substitutions in them.

Move the TARGET detection above of everything to fix this.

Signed-off-by: Ozan Çağlayan <[email protected]>
---
bin/get-compat-kernels | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/bin/get-compat-kernels b/bin/get-compat-kernels
index d80c0a7..99392b4 100755
--- a/bin/get-compat-kernels
+++ b/bin/get-compat-kernels
@@ -23,6 +23,23 @@ UNDERLINE="\033[02m"
KERNELS=""
KPATH="http://kernel.ubuntu.com/~kernel-ppa/mainline/"

+ARCH=$(uname -m)
+TARGET=""
+
+case $ARCH in
+ "x86_64")
+ TARGET="amd64"
+ ;;
+ "i686")
+ TARGET="i386"
+ ;;
+ *)
+ echo -e "Unsupported architecture"
+ exit
+ ;;
+esac
+
+
KERNELS="$KERNELS ${KPATH}/v2.6.24/linux-headers-2.6.24-020624_2.6.24-020624_all.deb"
KERNELS="$KERNELS ${KPATH}/v2.6.24/linux-headers-2.6.24-020624-generic_2.6.24-020624_${TARGET}.deb"
KERNELS="$KERNELS ${KPATH}/v2.6.24/linux-image-2.6.24-020624-generic_2.6.24-020624_${TARGET}.deb"
@@ -109,22 +126,6 @@ KERNELS="$KERNELS ${KPATH}/v3.4.4-quantal/linux-image-3.4.4-030404-generic_3.4.4

function get_ubuntu_kernels() {

- ARCH=$(uname -m)
- TARGET=""
-
- case $ARCH in
- "x86_64")
- TARGET="amd64"
- ;;
- "i686")
- TARGET="i386"
- ;;
- *)
- echo -e "Unsupported architecture"
- exit
- ;;
- esac
-
mkdir -p debs
cd debs

--
1.7.10.4

2012-07-10 12:16:31

by Ozan Çağlayan

Subject: Re: [PATCH] compat: Fix setting $TARGET

On Tue, Jul 10, 2012 at 1:11 PM, Ozan Çağlayan <[email protected]> wrote:
> On Mon, Jul 9, 2012 at 2:48 PM, Ozan Çağlayan <[email protected]> wrote:
>> commit 61077651424add644401b927b52681a191bbd7f1 moved the list of
>> kernels above which broke the $TARGET substitutions in them.
>>
>> Move the TARGET detection above of everything to fix this.
>>

Well if you apply my today's commit which dynamically generates ARCH
dependent deb names when downloading, you do not need to apply this
since wget is called after setting TARGET in get_ubuntu_kernels().




--
Ozan Çağlayan

2012-07-10 17:29:24

by Luis R. Rodriguez

Subject: Re: [PATCH] compat: Fix setting $TARGET

On Tue, Jul 10, 2012 at 5:16 AM, Ozan Çağlayan <[email protected]> wrote:
> On Tue, Jul 10, 2012 at 1:11 PM, Ozan Çağlayan <[email protected]> wrote:
>> On Mon, Jul 9, 2012 at 2:48 PM, Ozan Çağlayan <[email protected]> wrote:
>>> commit 61077651424add644401b927b52681a191bbd7f1 moved the list of
>>> kernels above which broke the $TARGET substitutions in them.
>>>
>>> Move the TARGET detection above of everything to fix this.
>>>
>
> Well if you apply my today's commit which dynamically generates ARCH
> dependent deb names when downloading, you do not need to apply this
> since wget is called after setting TARGET in get_ubuntu_kernels().

OK I applied the other one and skipped this one, thanks!

Luis

2012-07-10 10:11:04

by Ozan Çağlayan

Subject: Re: [PATCH] compat: Fix setting $TARGET

On Mon, Jul 9, 2012 at 2:48 PM, Ozan Çağlayan <[email protected]> wrote:
> commit 61077651424add644401b927b52681a191bbd7f1 moved the list of
> kernels above which broke the $TARGET substitutions in them.
>
> Move the TARGET detection above of everything to fix this.
>
> Signed-off-by: Ozan Çağlayan <[email protected]>

I think you missed this as you've pushed the other 2 patches :)