diff options
| author | Michael Neves | 2013-04-24 18:19:49 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-04-24 18:19:49 +0200 |
| commit | 97472f07e21c73e9d767de7960dc1e05ba48b53d (patch) | |
| tree | e4119718dbddd68664480436767fc12d4a319700 /remote/rootfs | |
| parent | fix rsyslog (diff) | |
| parent | We will require wpad for the future ... (diff) | |
| download | tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.tar.gz tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.tar.xz tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
5 files changed, 6 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build index 9030e972..19a5838a 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build @@ -22,6 +22,7 @@ post_copy() { generate_rootfs copy_kernel_modules copy_firmware + copy_kernel # copy busybox that has been under /openslx back to / cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}" diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf index 6d4af2c9..788ff8b3 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf @@ -1,4 +1,5 @@ -REQUIRED_MODULES=" busybox" +REQUIRED_MODULES=" busybox + kernel" REQUIRED_KERNEL_MODULES=" kernel/drivers/video/sis/sisfb.ko kernel/drivers/video/via/viafb.ko kernel/drivers/acpi/video.ko diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 8b056e1b..164a3464 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -105,6 +105,6 @@ post_copy() { else pinfo "Not copying firmware from system, as '${TARGET_BUILD_DIR}/lib/firmware' already exists." fi - + copy_kernel } diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index 1ff35bcb..d421cf1b 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -1,3 +1,4 @@ +REQUIRED_MODULES=" kernel" REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools whois xfsprogs" REQUIRED_BINARIES=" bash more diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index a8a8c1b3..c4c79d73 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -1,4 +1,5 @@ pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586" +REQUIRED_MODULES=" kernel" REQUIRED_DEPENDENCIES="nfs-client aufs squashfs" REQUIRED_PACKAGES="timezone" REQUIRED_BINARIES=" bash |