[scl-utils/f20] Sync with upstream
Jan Zeleny
jzeleny at fedoraproject.org
Fri Dec 12 10:06:10 UTC 2014
commit 5583df6e894b18692fab8f60d0c27ed4d27b51fa
Author: Jan Zeleny <jzeleny at redhat.com>
Date: Fri Dec 12 10:47:26 2014 +0100
Sync with upstream
- add support for register/deregister scriptlets
- add support %nfsmountable macro
0002-Add-support-for-nfsmountable-macro.patch | 49 ++++++
...r-and-deregister-scriptlets-during-the-re.patch | 166 ++++++++++++++++++++
scl-utils.spec | 7 +-
3 files changed, 221 insertions(+), 1 deletions(-)
---
diff --git a/0002-Add-support-for-nfsmountable-macro.patch b/0002-Add-support-for-nfsmountable-macro.patch
new file mode 100644
index 0000000..4b6c28a
--- /dev/null
+++ b/0002-Add-support-for-nfsmountable-macro.patch
@@ -0,0 +1,49 @@
+From acf0985e22e8ce49513bdbfa504dd132fe1a8624 Mon Sep 17 00:00:00 2001
+From: Jan Zeleny <jzeleny at redhat.com>
+Date: Thu, 11 Dec 2014 13:17:18 +0100
+Subject: [PATCH 1/2] Add support for %nfsmountable macro
+
+If the macro is set in the collection, the layout of the collection changes:
+- the configuration is moved out of /opt to /etc/opt
+- the data are moved from /opt to /var/opt
+
+Along with this change, another one is necessary. For the sake of conformance
+with FHS, let's not make the _scl_base configurable. Having collections
+anywhere outside /opt would not make much sense and more importantly, it would
+likely cause troubles (having /etc/usr/lib instead of /etc/opt and similar).
+---
+ macros.scl | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/macros.scl b/macros.scl
+index 094bde95d390640fb070424b50d31b0a495c732c..aaa7a809ab33f266f915554275a4566abf3505e3 100644
+--- a/macros.scl
++++ b/macros.scl
+@@ -42,7 +42,7 @@ package or when debugging this package.
+ %global pkg_name %1
+ %global scl_name %{scl}
+ %global scl_runtime %{scl}-runtime
+-%{!?scl_basedir: %global scl_basedir /opt}
++%global scl_basedir /opt
+ %{!?scl_vendor: %global scl_vendor rh}
+ %{!?_scl_prefix: %global _scl_prefix %{scl_basedir}/%{scl_vendor}}
+ %global _scl_scripts %{_scl_prefix}/%{scl}
+@@ -67,9 +67,12 @@ package or when debugging this package.
+ %global _sbindir %{_exec_prefix}/sbin
+ %global _libexecdir %{_exec_prefix}/libexec
+ %global _datadir %{_prefix}/share
+-%global _sysconfdir %{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}
+-%global _sharedstatedir %{_root_localstatedir}/opt/%{scl_vendor}/scls/%{scl}/lib
+-%global _localstatedir %{_root_localstatedir}/opt/%{scl_vendor}/scls/%{scl}
++%global _sysconfdir %{_scl_root}/etc
++%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
++%global _sharedstatedir %{_scl_root}/var/lib
++%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
++%global _localstatedir %{_scl_root}/var
++%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
+ %global _libdir %{_exec_prefix}/%{_lib}
+ %global _includedir %{_prefix}/include
+ %global _infodir %{_datadir}/info
+--
+1.9.3
+
diff --git a/0003-Run-register-and-deregister-scriptlets-during-the-re.patch b/0003-Run-register-and-deregister-scriptlets-during-the-re.patch
new file mode 100644
index 0000000..2c096fc
--- /dev/null
+++ b/0003-Run-register-and-deregister-scriptlets-during-the-re.patch
@@ -0,0 +1,166 @@
+From 67f6024e0c7f045b5519276fae64af8b605a614c Mon Sep 17 00:00:00 2001
+From: Jan Zeleny <jzeleny at redhat.com>
+Date: Thu, 11 Dec 2014 13:27:35 +0100
+Subject: [PATCH 2/2] Run register and deregister scriptlets during the
+ respective operations
+
+---
+ scl.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 77 insertions(+), 3 deletions(-)
+
+diff --git a/scl.c b/scl.c
+index c933855e149466221bab87ef7e4acd7bff6bd135..0da6d7041a0e1d54d109123c15d51b31cdaaf51e 100644
+--- a/scl.c
++++ b/scl.c
+@@ -85,6 +85,7 @@ static int check_directory(const char *dir_name, struct stat *sb, int *count, st
+
+ if ((*count = scandir(dir_name, nl, 0, alphasort)) < 0) {
+ perror("scandir");
++ fprintf(stderr, "%s\n", dir_name);
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+@@ -109,12 +110,14 @@ static int get_collection_dir_path(char *col_name, char **_col_dir) {
+
+ if (stat(file_path, &st) != 0) {
+ perror("Unable to get file status");
++ fprintf(stderr, "%s\n", file_path);
+ goto done;
+ }
+
+ fd = open(file_path, O_RDONLY);
+ if (fd < 0) {
+ perror("Unable to open file");
++ fprintf(stderr, "%s\n", file_path);
+ goto done;
+ }
+
+@@ -398,6 +401,44 @@ static int check_valid_collection(char *col_dir) {
+ return missing_root || missing_enable;
+ }
+
++static int run_script(char *script_path, char *script_name) {
++ char *script = NULL;
++ char *cmd = NULL;
++ int status;
++ int ret = EXIT_FAILURE;
++
++ if (script_path[strlen(script_path) - 1] == '/') {
++ check_asprintf(&script, "%s%s", script_path, script_name);
++ } else {
++ check_asprintf(&script, "%s/%s", script_path, script_name);
++ }
++
++ if (!access(script, F_OK)) {
++ check_asprintf(&cmd, "/bin/bash %s", script);
++ status = system(cmd);
++ if (status == -1) {
++ perror("Unable to execute script\n");
++ fprintf(stderr, "%s\n", script);
++ goto done;
++ }
++ if (!WIFEXITED(status)) {
++ fprintf(stderr, "Script %s didn't terminate normally\n", script);
++ goto done;
++ }
++ if (WEXITSTATUS(status)) {
++ fprintf(stderr, "Script %s returned nonzero return code\n", script);
++ goto done;
++ }
++ }
++
++ ret = EXIT_SUCCESS;
++
++done:
++ free(script);
++ free(cmd);
++ return ret;
++}
++
+ static int register_collection(char *col_path) {
+ FILE *f;
+ char *col = NULL;
+@@ -410,7 +451,8 @@ static int register_collection(char *col_path) {
+ }
+
+ if (access(col_path, F_OK)) {
+- perror("Unable to register collection");
++ perror("Directory doesn't exist");
++ fprintf(stderr, "%s\n", col_path);
+ return EXIT_FAILURE;
+ }
+
+@@ -438,15 +480,29 @@ static int register_collection(char *col_path) {
+ f = fopen(new_file, "w+");
+ if (f == NULL) {
+ perror("Unable to open file");
++ fprintf(stderr, "%s\n", new_file);
+ free(col);
+ free(new_file);
+ return EXIT_FAILURE;
+ }
+
+ fprintf(f, "%s\n", col);
++ fclose(f);
++
++ if (run_script(col_path, "register")) {
++ fprintf(stderr, "Execution of register script failed\n");
++ if (unlink(new_file)) {
++ perror("Unable to remove file: ");
++ fprintf(stderr, "%s\n", new_file);
++ fprintf(stderr, "Remove this file manually before a new try to register collection!\n");
++ }
++ free(new_file);
++ free(col);
++ return EXIT_FAILURE;
++ }
++
+ printf("Collection succesfully registered.\n"
+ "The collection can now be enabled using 'scl enable %s <command>'\n", name);
+- fclose(f);
+ free(new_file);
+ free(col);
+
+@@ -473,6 +529,7 @@ static int check_package(char *file_path, int *_status) {
+ static int deregister_collection(char *col_path, bool force) {
+ char *col = NULL;
+ char *col_name = NULL;
++ char *col_dir = NULL;
+
+ if (get_collection_conf_path(col_path, &col_name)) {
+ free(col);
+@@ -496,13 +553,30 @@ static int deregister_collection(char *col_path, bool force) {
+ }
+ }
+
++ if (get_collection_dir_path(col_path, &col_dir)) {
++ free(col_name);
++ free(col);
++ return EXIT_FAILURE;
++ }
++
++ if (run_script(col_dir, "deregister")) {
++ fprintf(stderr, "Execution of deregister script failed\n");
++ free(col_dir);
++ free(col_name);
++ free(col);
++ return EXIT_FAILURE;
++ }
++
+ if (remove(col_name)) {
+- perror("Unable to deregister collection");
++ perror("Unable to delete file");
++ fprintf(stderr, "%s\n", col_name);
++ free(col_dir);
+ free(col_name);
+ free(col);
+ return EXIT_FAILURE;
+ }
+ printf("Collection successfully deregistered.\n");
++ free(col_dir);
+ free(col_name);
+ free(col);
+ return EXIT_SUCCESS;
+--
+1.9.3
+
diff --git a/scl-utils.spec b/scl-utils.spec
index 5653617..b9d6ed4 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -1,7 +1,7 @@
Summary: Utilities for alternative packaging
Name: scl-utils
Version: 20140815
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/File
URL: https://fedorahosted.org/SoftwareCollections/
@@ -71,6 +71,11 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog
+* Fri Dec 12 2014 Jan Zeleny <jzeleny at redhat.com> - 20140815-3
+- add support for register/deregister scriptlets
+- add support %nfsmountable macro
+- fix some paths in %scl_files and %scl_install
+
* Wed Aug 27 2014 Jan Zeleny <jzeleny at redhat.com> - 20140815-2
- fixed the paths in /etc/opt and /var/opt (missing /scls/)
- adjust the spec so all patches are automatically applied
More information about the scm-commits
mailing list