7:52 a.m.
Ramon Medeiros (3):
Remove empty directories after rpm -e kimchi on fedora
Don't let empty directories left on suse
Remove directories under /var/lib/kimchi if empty on ubuntu
contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++-
contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++-
contrib/make-deb.sh.in | 4 ++++
3 files changed, 43 insertions(+), 2 deletions(-)
--
1.8.3.1
7:52 a.m.
New subject: [PATCH 1/3] Remove empty directories after rpm -e kimchi on fedora
Some directories were not removed on rpm -e due no declaration on %files
section. Also, the directory was being created in runtime. Now, it is
being created on rpm build.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index c1929f8..37794e3 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -83,6 +83,16 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
%if 0%{?with_systemd}
+
+# create /var/lib/kimchi structure
+mkdir -p %{buildroot}/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
+touch %{buildroot}/var/lib/kimchi/objectstore
+
+# create /var/log/kimchi structure
+mkdir -p %{buildroot}/var/log/kimchi/
+touch %{buildroot}/var/log/kimchi/kimchi-access.log
+touch %{buildroot}/var/log/kimchi/kimchi-error.log
+
# Install the systemd scripts
install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service
install -Dm 0640 src/firewalld.xml
%{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml
@@ -148,7 +158,6 @@ exit 0
# Rollback SELinux rules
semanage permissive -d httpd_t
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -162,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/kimchi/xmlutils/*.py*
%{python_sitelib}/kimchi/API.json
%{python_sitelib}/kimchi/plugins/*.py*
+%{python_sitelib}/kimchi/
%{_datadir}/kimchi/doc/API.md
%{_datadir}/kimchi/doc/README.md
%{_datadir}/kimchi/doc/README-federation.md
@@ -170,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
%{_datadir}/kimchi/config/ui/*.xml
%{_datadir}/kimchi/ui/
+%{_datadir}/kimchi
%{_sysconfdir}/kimchi/kimchi.conf
%{_sysconfdir}/kimchi/nginx.conf.in
%{_sysconfdir}/kimchi/distros.d/debian.json
@@ -177,6 +188,14 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/kimchi/distros.d/opensuse.json
%{_sysconfdir}/kimchi/distros.d/ubuntu.json
%{_sysconfdir}/kimchi/distros.d/gentoo.json
+%{_sysconfdir}/kimchi/
+%{_sharedstatedir}/kimchi/debugreports/
+%{_sharedstatedir}/kimchi/screenshots/
+%{_sharedstatedir}/kimchi/vnc-tokens/
+%{_sharedstatedir}/kimchi/isos/
+%{_sharedstatedir}/kimchi/
+%{_localstatedir}/log/kimchi/*
+%{_localstatedir}/log/kimchi/
%if 0%{?with_systemd}
%{_unitdir}/kimchid.service
--
1.8.3.1
6:13 a.m.
New subject: [PATCH 1/3] Remove empty directories after rpm -e kimchi on fedora
On 12/12/2014 11:52 AM, Ramon Medeiros wrote:
+mkdir -p
%{buildroot}/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
+touch %{buildroot}/var/lib/kimchi/objectstore
Below you used the macro %{_sharedstatedir} to specify the dirs.
Use the same here to make consistence and avoid problems
Same here.
7:52 a.m.
New subject: [PATCH 2/3] Don't let empty directories left on suse
Some directories were not removed on rpm -e due no declaration on %files
section. Also, the directory was being created in runtime. Now, it is
being created on rpm build.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index be75590..b1679a8 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -52,10 +52,18 @@ make
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
+# create /var/lib/kimchi structure
+mkdir -p %{buildroot}/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
+touch %{buildroot}/var/lib/kimchi/objectstore
+
+# create /var/log/kimchi structure
+mkdir -p %{buildroot}/var/log/kimchi/
+touch %{buildroot}/var/log/kimchi/kimchi-access.log
+touch %{buildroot}/var/log/kimchi/kimchi-error.log
+
# Install the SysV init scripts
install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
-
%post
chkconfig kimchid on
@@ -75,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/kimchi/xmlutils/*.py*
%{python_sitelib}/kimchi/API.json
%{python_sitelib}/kimchi/plugins/*.py*
+%{python_sitelib}/kimchi/
%{_datadir}/kimchi/doc/API.md
%{_datadir}/kimchi/doc/README.md
%{_datadir}/kimchi/doc/README-federation.md
@@ -83,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
%{_datadir}/kimchi/config/ui/*.xml
%{_datadir}/kimchi/ui/
+%{_datadir}/kimchi
%{_sysconfdir}/kimchi/kimchi.conf
%{_sysconfdir}/kimchi/nginx.conf.in
%{_sysconfdir}/kimchi/distros.d/debian.json
@@ -91,6 +101,14 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/kimchi/distros.d/ubuntu.json
%{_sysconfdir}/kimchi/distros.d/gentoo.json
%{_initrddir}/kimchid
+%{_sysconfdir}/kimchi/
+%{_var}/lib/kimchi/debugreports/
+%{_var}/lib/kimchi/screenshots/
+%{_var}/lib/kimchi/vnc-tokens/
+%{_var}/lib/kimchi/isos/
+%{_var}/lib/kimchi/
+%{_localstatedir}/log/kimchi/*
+%{_localstatedir}/log/kimchi/
%changelog
* Tue Feb 11 2014 Crístian Viana <vianac(a)linux.vnet.ibm.com> 1.1.0
--
1.8.3.1
7:09 a.m.
New subject: [PATCH 2/3] Don't let empty directories left on suse
On 12/15/2014 10:14 AM, Aline Manera wrote:
I
can't use the %{_sharedstatedir} because this macro points to
/usr/share in suse. I search for a equivalent macro on suse, but did not
found.
--
Ramon Nunes Medeiros
RHEV-H Blue for Troy, Sparta, zBX, zHelix and zGryphon Focal Point
Software Engineer - Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn(a)br.ibm.com
7:52 a.m.
New subject: [PATCH 3/3] Remove directories under /var/lib/kimchi if empty on ubuntu
Add the directory structure in the buildroot. Dpkg automatically removes
empty directories.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
contrib/make-deb.sh.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/contrib/make-deb.sh.in b/contrib/make-deb.sh.in
index 5a6e56a..2939b96 100644
--- a/contrib/make-deb.sh.in
+++ b/contrib/make-deb.sh.in
@@ -10,6 +10,10 @@ fi
TMPDIR=`mktemp -d`
+# create /var/lib/kimchi structure
+mkdir -p $TMPDIR/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
+touch $TMPDIR/var/lib/kimchi/objectstore
+
make DESTDIR=$TMPDIR install-deb
dpkg-deb -b $TMPDIR kimchi-${VERSION}-${RELEASE}.noarch.deb
rm -rf $TMPDIR
--
1.8.3.1
6:16 a.m.
New subject: [PATCH 3/3] Remove directories under /var/lib/kimchi if empty on ubuntu
On 12/12/2014 11:52 AM, Ramon Medeiros wrote:
Move it to Makefile.am (deb target) and use the autoconf macros to
create the dirs.
And don't you need to modify contrib/DEBIAN/postrm script to remove the
dirs when needed?
make DESTDIR=$TMPDIR install-deb
dpkg-deb -b $TMPDIR kimchi-${VERSION}-${RELEASE}.noarch.deb
rm -rf $TMPDIR
7:10 a.m.
New subject: [PATCH 3/3] Remove directories under /var/lib/kimchi if empty on ubuntu
On 12/15/2014 10:16 AM, Aline Manera wrote:
ok
No, dpkg automatically remove directories only if they are empty. Tested
this on ubuntu 14.04
--
Ramon Nunes Medeiros
RHEV-H Blue for Troy, Sparta, zBX, zHelix and zGryphon Focal Point
Software Engineer - Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn(a)br.ibm.com
3752
days inactive
3769
days old
11 comments
2 participants
participants (2)
-
Aline Manera -
Ramon Medeiros