diff options
| author | Christian Rößler | 2013-08-28 14:22:37 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-08-28 14:22:37 +0200 |
| commit | 3d4ce18d809b86afe0c5a61f585b885a4ed29ee5 (patch) | |
| tree | 9b05b9641e7d3c18de867cbee303243daa4d63c2 /remote/modules | |
| parent | [vbox] addon-init for systemd service (diff) | |
| parent | [fileutil.inc] list_packet_files: Ignore output lines that do not start with ... (diff) | |
| download | tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.tar.gz tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.tar.xz tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.zip | |
Tried to amend single commentary for many files: New vbox module
[not complete]
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
helper/fileutil.inc
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kernel/kernel.build | 1 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.ubuntu | 58 |
2 files changed, 30 insertions, 29 deletions
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index 39077111..ae1b7694 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -75,6 +75,7 @@ build() { } post_copy() { + mkdir -p "$TARGET_BUILD_DIR/../kernel" cp -a "$MODULE_BUILD_DIR/kernel" "$TARGET_BUILD_DIR/../kernel/kernel" || perror "could not copy kernel to remote build dir" } diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu index 1712f520..a3be908f 100644 --- a/remote/modules/xorg/xorg.conf.ubuntu +++ b/remote/modules/xorg/xorg.conf.ubuntu @@ -1,36 +1,36 @@ REQUIRED_CONTENT_PACKAGES=" - xserver-xorg - xserver-xorg-core - libgl1-mesa-dri - libgl1-mesa-glx + xserver-xorg$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX + libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX + libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX xkb-data x11-xkb-utils x11-xserver-utils - xserver-xorg-input-evdev - xserver-xorg-input-mouse - xserver-xorg-input-vmmouse - xserver-xorg-video-intel - xserver-xorg-video-ati - xserver-xorg-video-vesa - xserver-xorg-video-mga - xserver-xorg-video-sis - xserver-xorg-video-vmware - xserver-xorg-video-fbdev - xserver-xorg-video-radeon - xserver-xorg-video-sisusb - xserver-xorg-video-nouveau - @xserver-xorg-video-openchrome - @xserver-xorg-video-savage - @xserver-xorg-video-trident - @xserver-xorg-video-mach64 - @xserver-xorg-video-qxl - @xserver-xorg-video-siliconmotion - @xserver-xorg-video-cirrus - @xserver-xorg-video-r128 - @xserver-xorg-video-neomagic - @xserver-xorg-video-geode - @xserver-xorg-video-s3 - @xserver-xorg-video-tdfx + xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-sis$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX " REQUIRED_BINARIES+=" xkbcomp |