diff options
| author | Michael Pereira Neves | 2014-05-29 22:40:06 +0200 |
|---|---|---|
| committer | Michael Pereira Neves | 2014-05-29 22:40:06 +0200 |
| commit | 4f44c327eae14c1f9e43417bd39c9ceb10f7f25e (patch) | |
| tree | 448f8044e7f94f387e640a12cd882dc5eb5c6d95 /remote | |
| parent | [curitiba] some config changes (diff) | |
| parent | [cups] added 'gs' to REQUIRED_BINARIES (diff) | |
| download | tm-scripts-4f44c327eae14c1f9e43417bd39c9ceb10f7f25e.tar.gz tm-scripts-4f44c327eae14c1f9e43417bd39c9ceb10f7f25e.tar.xz tm-scripts-4f44c327eae14c1f9e43417bd39c9ceb10f7f25e.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/cups/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/cups/module.conf.ubuntu.14.04 | 4 | ||||
| -rw-r--r-- | remote/modules/printergui/module.build | 1 | ||||
| -rw-r--r-- | remote/modules/printergui/module.conf.ubuntu | 6 | ||||
| -rwxr-xr-x | remote/setup_target | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/remote/modules/cups/module.conf b/remote/modules/cups/module.conf index 586e0d12..2b904358 100644 --- a/remote/modules/cups/module.conf +++ b/remote/modules/cups/module.conf @@ -1,6 +1,7 @@ REQUIRED_BINARIES=" cupsd foomatic-rip + gs " REQUIRED_DIRECTORIES=" /usr/lib/cups/ diff --git a/remote/modules/cups/module.conf.ubuntu.14.04 b/remote/modules/cups/module.conf.ubuntu.14.04 index a46e5d3d..23dcf226 100644 --- a/remote/modules/cups/module.conf.ubuntu.14.04 +++ b/remote/modules/cups/module.conf.ubuntu.14.04 @@ -3,10 +3,14 @@ REQUIRED_INSTALLED_PACKAGES=" cups-daemon cups-filters cups-core-drivers + cups-filters-core-drivers + ghostscript " REQUIRED_CONTENT_PACKAGES=" cups cups-daemon cups-filters cups-core-drivers + cups-filters-core-drivers + ghostscript " diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build index 869e8716..4b1b663f 100644 --- a/remote/modules/printergui/module.build +++ b/remote/modules/printergui/module.build @@ -21,6 +21,7 @@ build() { pinfo "Running make" make || perror "'make' failed." chmod 0700 "$DESTDIR/printpwgui" # So picky cupsd won't drop privileges to lp + } post_copy() { : diff --git a/remote/modules/printergui/module.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu index 2f679912..54123003 100644 --- a/remote/modules/printergui/module.conf.ubuntu +++ b/remote/modules/printergui/module.conf.ubuntu @@ -1,7 +1,7 @@ REQUIRED_INSTALLED_PACKAGES=" -libcups2-dev -libqt4-dev + libcups2-dev + libqt4-dev " REQUIRED_CONTENT_PACKAGES=" -libcups2-dev + libcups2-dev " diff --git a/remote/setup_target b/remote/setup_target index bd1c69d0..84575353 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -426,6 +426,7 @@ process_module() { pinfo "## Copying static module files" copy_static_data fi + # TODO: automatic copy of REQUIRED_CONTENT_PACKAGES pinfo "## Post copy" cd "${MODULE_DIR}" || perror "cd to '${MODULE_DIR}' failed." post_copy |