| 1 |
commit: e11c2d0de7b0aec7157a3fd4d5344eb79304bd86 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 10 20:40:24 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 10 20:40:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=e11c2d0d |
| 7 |
|
| 8 |
grs/Netboot.py: use busybox built by genkernel |
| 9 |
|
| 10 |
grs/Netboot.py | 8 ++++++++ |
| 11 |
1 file changed, 8 insertions(+) |
| 12 |
|
| 13 |
diff --git a/grs/Netboot.py b/grs/Netboot.py |
| 14 |
index 1b3ea80..985bcfd 100644 |
| 15 |
--- a/grs/Netboot.py |
| 16 |
+++ b/grs/Netboot.py |
| 17 |
@@ -74,6 +74,13 @@ class Netboot(HashIt): |
| 18 |
Execute(cmd, timeout=600, logfile=self.logfile, shell=True) |
| 19 |
os.chdir(cwd) |
| 20 |
|
| 21 |
+ ''' The issue here was that busybox was build in the host env like the |
| 22 |
+ kernel and that means that we are using the host's ARCH and the cpuflags |
| 23 |
+ which are now poluting the initramfs. The better approach to building |
| 24 |
+ a kernel and initramfs is to drop the Kernel.py module altogether and |
| 25 |
+ emerge genkernel in the fledgeling system via the script directive, set |
| 26 |
+ genkernel.conf via the populate directive and then just run genkernel. |
| 27 |
+ |
| 28 |
# 2.5 Don't trust genkernel's busybox, but copy in our own version |
| 29 |
# built in the system chroot. This ensures it will work on the |
| 30 |
# target system. |
| 31 |
@@ -81,6 +88,7 @@ class Netboot(HashIt): |
| 32 |
busybox_src = os.path.join(self.portage_configroot, 'bin/busybox') |
| 33 |
busybox_dst = os.path.join(self.kernelroot, 'initramfs/bin/busybox') |
| 34 |
shutil.copy(busybox_src, busybox_dst) |
| 35 |
+ ''' |
| 36 |
|
| 37 |
# 3. Make the squashfs image in the tmpdir directory. |
| 38 |
squashfs_dir = os.path.join(initramfs_root, 'mnt/cdrom') |
Archives