diff options
| author | Manuel Schneider | 2014-09-30 15:01:05 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-30 15:01:05 +0200 |
| commit | 930cd28a80eaaf66d499efc72a5f938d6b9d5e6d (patch) | |
| tree | 4056c08a5fa07e117ca05eac223a0e6e2445b76c /remote/modules/cups | |
| parent | [cups] Do not accept color jobs on BW printers (diff) | |
| parent | [alsa] Disable alsa config generation - breaks vmware mic input (diff) | |
| download | tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.tar.gz tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.tar.xz tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/cups')
| -rw-r--r-- | remote/modules/cups/module.build | 5 | ||||
| -rw-r--r-- | remote/modules/cups/module.conf | 2 | ||||
| -rw-r--r-- | remote/modules/cups/module.conf.ubuntu.14 | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/remote/modules/cups/module.build b/remote/modules/cups/module.build index 0238f1bd..0128c3e6 100644 --- a/remote/modules/cups/module.build +++ b/remote/modules/cups/module.build @@ -5,12 +5,17 @@ fetch_source() { } build() { + local COPYLIST file COPYLIST="list_dpkg_output" [ -e "$COPYLIST" ] && rm "$COPYLIST" list_packet_files >> "$COPYLIST" tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + # cups insists on overriding PATH, so we need to fix any scripts + for file in "${MODULE_BUILD_DIR}"/usr/lib/cups/{filter,backend}/*; do + head -n 1 "$file" | grep -q '^#!/' && sed -i '/^#!\//a . \/etc\/environment' "$file" + done } post_copy() { diff --git a/remote/modules/cups/module.conf b/remote/modules/cups/module.conf index 2b904358..513389b5 100644 --- a/remote/modules/cups/module.conf +++ b/remote/modules/cups/module.conf @@ -6,5 +6,7 @@ REQUIRED_BINARIES=" REQUIRED_DIRECTORIES=" /usr/lib/cups/ /usr/share/cups/ + /usr/share/ghostscript/ + /usr/bin/ " REQUIRED_FILES="" diff --git a/remote/modules/cups/module.conf.ubuntu.14 b/remote/modules/cups/module.conf.ubuntu.14 index 23dcf226..23207e5b 100644 --- a/remote/modules/cups/module.conf.ubuntu.14 +++ b/remote/modules/cups/module.conf.ubuntu.14 @@ -5,6 +5,7 @@ REQUIRED_INSTALLED_PACKAGES=" cups-core-drivers cups-filters-core-drivers ghostscript + libgs9-common " REQUIRED_CONTENT_PACKAGES=" cups @@ -13,4 +14,5 @@ REQUIRED_CONTENT_PACKAGES=" cups-core-drivers cups-filters-core-drivers ghostscript + libgs9-common " |