diff options
Diffstat (limited to 'recipes-core/runx/runx')
-rw-r--r-- | recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch | 19 | ||||
-rw-r--r-- | recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch | 25 |
2 files changed, 19 insertions, 25 deletions
diff --git a/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch b/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch index c9fdc5d6..43c621e0 100644 --- a/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch +++ b/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch | |||
@@ -8,15 +8,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com> | |||
8 | kernel/make-initrd | 18 ++++++++++++++++-- | 8 | kernel/make-initrd | 18 ++++++++++++++++-- |
9 | 1 file changed, 16 insertions(+), 2 deletions(-) | 9 | 1 file changed, 16 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/kernel/make-initrd b/kernel/make-initrd | 11 | Index: git/initrd/make-initrd |
12 | index 4c299dc..9ef386f 100755 | 12 | =================================================================== |
13 | --- a/kernel/make-initrd | 13 | --- git.orig/initrd/make-initrd |
14 | +++ b/kernel/make-initrd | 14 | +++ git/initrd/make-initrd |
15 | @@ -16,8 +16,22 @@ mkdir -p $tmpdir/sys | 15 | @@ -23,8 +23,22 @@ |
16 | mkdir -p $tmpdir/lib | 16 | mkdir -p $tmpdir/lib |
17 | mkdir -p $tmpdir/var | 17 | mkdir -p $tmpdir/var |
18 | mkdir -p $tmpdir/mnt | 18 | mkdir -p $tmpdir/mnt |
19 | -cp `which busybox` $tmpdir/bin | 19 | -cp "$busybox" $tmpdir/bin/busybox |
20 | -$tmpdir/bin/busybox --install $tmpdir/bin | 20 | -$tmpdir/bin/busybox --install $tmpdir/bin |
21 | + | 21 | + |
22 | + | 22 | + |
@@ -35,8 +35,5 @@ index 4c299dc..9ef386f 100755 | |||
35 | + $tmpdir/bin/busybox --install $tmpdir/bin | 35 | + $tmpdir/bin/busybox --install $tmpdir/bin |
36 | +fi | 36 | +fi |
37 | 37 | ||
38 | cp $init $tmpdir/init | 38 | mkdir -p $tmpdir/etc/init.d |
39 | chmod +x $tmpdir/init | 39 | cp $init $tmpdir/etc/init.d/rcS |
40 | -- | ||
41 | 2.17.1 | ||
42 | |||
diff --git a/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch b/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch index 7d66f421..2821b61b 100644 --- a/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch +++ b/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch | |||
@@ -8,11 +8,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com> | |||
8 | kernel/make-kernel | 41 +++++++++++++++++++++++++++++++++-------- | 8 | kernel/make-kernel | 41 +++++++++++++++++++++++++++++++++-------- |
9 | 1 file changed, 33 insertions(+), 8 deletions(-) | 9 | 1 file changed, 33 insertions(+), 8 deletions(-) |
10 | 10 | ||
11 | diff --git a/kernel/make-kernel b/kernel/make-kernel | 11 | Index: git/kernel/make-kernel |
12 | index 33b7150..c684669 100755 | 12 | =================================================================== |
13 | --- a/kernel/make-kernel | 13 | --- git.orig/kernel/make-kernel |
14 | +++ b/kernel/make-kernel | 14 | +++ git/kernel/make-kernel |
15 | @@ -13,6 +13,7 @@ fi | 15 | @@ -13,6 +13,7 @@ |
16 | 16 | ||
17 | kernel_stuffdir=`readlink -f kernel` | 17 | kernel_stuffdir=`readlink -f kernel` |
18 | kernel_outpath=$kernel_stuffdir/out | 18 | kernel_outpath=$kernel_stuffdir/out |
@@ -20,9 +20,9 @@ index 33b7150..c684669 100755 | |||
20 | kernel_builddir=$kernel_stuffdir/build | 20 | kernel_builddir=$kernel_stuffdir/build |
21 | kernel_out=$kernel_outpath/kernel | 21 | kernel_out=$kernel_outpath/kernel |
22 | 22 | ||
23 | @@ -22,28 +23,52 @@ kernel_tarball="$kernel_name".tar.xz | 23 | @@ -22,28 +23,52 @@ |
24 | kernel_url=https://www.kernel.org/pub/linux/kernel/v4.x/"$kernel_tarball" | 24 | kernel_url=https://www.kernel.org/pub/linux/kernel/v5.x/"$kernel_tarball" |
25 | kernel_src_config="$kernel_stuffdir"/cutdown-config.$ARCH | 25 | kernel_src_config="$kernel_stuffdir"/cutdown-config."$ARCH" |
26 | kernel_patchesdir="$kernel_stuffdir"/patches | 26 | kernel_patchesdir="$kernel_stuffdir"/patches |
27 | -kernel_image="$kernel_builddir"/"$kernel_name"/arch/"$ARCH"/boot/"$image" | 27 | -kernel_image="$kernel_builddir"/"$kernel_name"/arch/"$ARCH"/boot/"$image" |
28 | +kernel_image="$kernel_builddir"/arch/"$ARCH"/boot/"$image" | 28 | +kernel_image="$kernel_builddir"/arch/"$ARCH"/boot/"$image" |
@@ -66,10 +66,10 @@ index 33b7150..c684669 100755 | |||
66 | do | 66 | do |
67 | patch -p1 < $i | 67 | patch -p1 < $i |
68 | done | 68 | done |
69 | - cp $kernel_src_config .config | ||
70 | fi | 69 | fi |
71 | -cd $kernel_builddir/$kernel_name | 70 | -cd $kernel_builddir/$kernel_name |
72 | -make -j4 $image | 71 | -cp $kernel_src_config .config |
72 | -make -j "$(getconf _NPROCESSORS_ONLN)" $image | ||
73 | +if [[ ! -f $kernel_builddir/.config ]] | 73 | +if [[ ! -f $kernel_builddir/.config ]] |
74 | +then | 74 | +then |
75 | + cp $kernel_src_config $kernel_builddir/.config | 75 | + cp $kernel_src_config $kernel_builddir/.config |
@@ -78,9 +78,6 @@ index 33b7150..c684669 100755 | |||
78 | + | 78 | + |
79 | +echo "building the kernel ..." | 79 | +echo "building the kernel ..." |
80 | +eval make O=$kernel_builddir $build_vars oldconfig | 80 | +eval make O=$kernel_builddir $build_vars oldconfig |
81 | +eval make -j4 O=$kernel_builddir $build_vars $image | 81 | +eval make -j "$(getconf _NPROCESSORS_ONLN)" O=$kernel_builddir $build_vars $image |
82 | 82 | ||
83 | cp $kernel_image $kernel_out | 83 | cp $kernel_image $kernel_out |
84 | -- | ||
85 | 2.17.1 | ||
86 | |||