andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: andrius:456847efa7c74a93965c021904797896e83925e8
Branches Tags
andrius:master
andrius:wip
andrius:ekaitz
andrius:mes-x86_64
...
compare: andrius:31caabdeef3b54aaac351ef5c1782b28cae229ac
Branches Tags
andrius:master
andrius:wip
andrius:ekaitz
andrius:mes-x86_64

4 Commits
456847efa7 ... 31caabdeef

Author SHA1 Message Date
Andrius Štikonas 31caabdeef
Merge pull request #110 from stikonas/indentation 
Fix indentation.
 2021-04-21 20:34:04 +01:00
Andrius Štikonas 135a38556e
Merge pull request #105 from bittorf/new_minikernel 
rootfs.py: minikernel:
 2021-04-21 20:33:17 +01:00
Bastian Bittorf 7e69dcc926 rootfs.py: minikernel: 
use branch v0.7 from kritis-linux and change settings
to be more i386-alike and add essential kernel feature
'flock' using latest kernel 3.18.140 from 3.18.x-branch

(+minor indentation fixes)
 2021-04-21 08:04:56 +00:00
Andrius Štikonas 3ddf5d096a Fix indentation. 2021-04-20 23:57:00 +01:00
2 changed files with 23 additions and 8 deletions
Show Stats Expand all files Collapse all files

25
rootfs.py
View File

@ -8,11 +8,13 @@ you can run bootstap inside chroot.
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021 Bastian Bittorf <bb@npl.de>
import argparse
import glob
import os
import subprocess
import shutil
from sysa import SysA
from lib.utils import run
@ -72,7 +74,7 @@ def make_initramfs(tmp_dir, initramfs_path):
with open(initramfs_path, "w") as initramfs:
cpio = subprocess.Popen(["cpio", "--format", "newc", "--create", "--directory", tmp_dir],
stdin=subprocess.PIPE, stdout=initramfs)
stdin=subprocess.PIPE, stdout=initramfs)
cpio.communicate(input='\n'.join(file_list).encode())
def bootstrap(args, tmp_dir, initramfs_path):
@ -84,10 +86,23 @@ def bootstrap(args, tmp_dir, initramfs_path):
return
if args.minikernel:
run('git', 'clone', '--depth', '1', '--branch', 'v0.4',
if os.path.isdir('kritis-linux'):
shutil.rmtree('kritis-linux')
run('git', 'clone',
'--depth', '1', '--branch', 'v0.7',
'https://github.com/bittorf/kritis-linux.git')
run('kritis-linux/ci_helper.sh', '--arch', 'x86_64', '--ramsize',
'-m', str(args.qemu_ram) + 'M', '--kernel', '5.10.8', '--initrd', initramfs_path)
run('kritis-linux/ci_helper.sh',
'--private',
'--multi', '1',
'--repeat', '1',
'--arch', args.arch,
'--qemucpu', '486',
'--kernel', '3.18.140',
'--features', 'kflock,highrestimers',
'--ramsize', str(args.qemu_ram) + 'M',
'--initrd', initramfs_path,
'--log', '/tmp/bootstrap.log')
return
run(args.qemu_cmd,
@ -99,5 +114,5 @@ def bootstrap(args, tmp_dir, initramfs_path):
'-initrd', initramfs_path,
'-append', "console=ttyS0")
if __name__=="__main__":
if __name__ == "__main__":
main()

6
sysa/binutils-2.14/binutils-2.14.sh
View File

@ -119,7 +119,7 @@ src_configure() {
--disable-64-bit-bfd \
--prefix="${PREFIX}" \
--libdir="${PREFIX}/lib/musl" \
--srcdir=.
--srcdir=.
cd ..
done
}
@ -127,12 +127,12 @@ src_configure() {
src_compile() {
make -C bfd headers
for dir in libiberty bfd opcodes binutils gas gprof ld; do
make -C $dir MAKEINFO=true
make -C $dir MAKEINFO=true
done
}
src_install() {
for dir in libiberty bfd opcodes binutils gas gprof ld; do
make -C $dir install MAKEINFO=true DESTDIR="${DESTDIR}"
make -C $dir install MAKEINFO=true DESTDIR="${DESTDIR}"
done
}