diff options
| author | Christian Rößler | 2014-03-24 16:01:42 +0100 |
|---|---|---|
| committer | Christian Rößler | 2014-03-24 16:01:42 +0100 |
| commit | 395f941fda040b0f6b4350869ab6992af10e0977 (patch) | |
| tree | b5f181d699ecd8dca4a4045de99a37761246818d /remote/rootfs | |
| parent | [vmware, chroot] vmware pseudo-deletions in case workstation is installed in (diff) | |
| parent | [kernel] remove forgotten pinfo used while dev'ing (diff) | |
| download | tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.gz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.xz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/modules/vmware/vmware.build
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.build | 4 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.build | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build index 3711e16d..34d954f4 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build @@ -20,7 +20,7 @@ build() { # generate drm module loading database pinfo "Generating PCI ID database for DRM drivers" - DRM_MODULES="$MODULES_DIR/kernel/build/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm" + DRM_MODULES="$KERNEL_BASE_DIR/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm" PCI_FILE="$MODULE_BUILD_DIR/drm.cfg" [ -d "$DRM_MODULES" ] || perror "DRM dir not found at $DRM_MODULES" cp "$MODULE_DIR/templates/drm.cfg" "$PCI_FILE" || perror "Could not copy drm.cfg from templates dir" @@ -53,7 +53,7 @@ post_copy() { # copy kernel, modules and firmware copy_kernel_modules copy_firmware - copy_kernel + #copy_kernel } # diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index bd6d3106..156d1afe 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -117,7 +117,7 @@ post_copy() { # copy kernel, modules and firmware copy_kernel_modules copy_firmware - copy_kernel + #copy_kernel # Try to fetch distro logo if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index d55bcfa8..34d3507a 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -3,7 +3,7 @@ REQUIRED_MODULES=" " REQUIRED_BINARIES=" bash - dmesg + dmesg curl less agetty |