refactor build scripts for improved directory handling and package in…

…stallation, fixing up rpm generation with newer rpmbuild versions
VirtualCable · Dec 3, 2024 · 386e227 · 386e227
1 parent 2390149
commit 386e227
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/linux/build-packages.sh b/linux/build-packages.sh
@@ -32,7 +32,7 @@ for pkg in udsactor-*$VERSION.spec; do
         mkdir -p rpm/$folder
     done
 
-    rpmbuild -v -bb --clean --buildroot=$top/rpm/BUILD/$pkg-root --target noarch $pkg 2>&1
+    rpmbuild -v -bb --clean --target noarch $pkg 2>&1
 done
 
 rpm --addsign ../*rpm

diff --git a/linux/debian/rules b/linux/debian/rules
@@ -32,7 +32,7 @@ binary-indep: build install
 	dh_installdocs
 	dh_installdebconf
 	dh_systemd_enable
-	dh_installinit --no-restart-on-upgrade --no-start --name=udsactor
+	dh_installinit --no-stop-on-upgrade --no-start --name=udsactor
 	dh_systemd_start
 	dh_python2=python
 	dh_compress

diff --git a/linux/udsactor-template.spec b/linux/udsactor-template.spec
@@ -16,20 +16,20 @@ Vendor: Virtual Cable S.L.U.
 URL: http://www.udsenterprise.com
 Provides: udsactor
 
-%define _rpmdir ../
+%define _rpmdir %{_topdir}/../../
 %define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 
 %install
 curdir=`pwd`
-cd ../..
+cd %{_topdir}/..
 make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor
 cd $curdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 curdir=`pwd`
-cd ../..
+cd %{_topdir}/..
 make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh clean
 cd $curdir
 

diff --git a/linux/udsactor-unmanaged-template.spec b/linux/udsactor-unmanaged-template.spec
@@ -16,20 +16,20 @@ Vendor: Virtual Cable S.L.U.
 URL: http://www.udsenterprise.com
 Provides: udsactor
 
-%define _rpmdir ../
+%define _rpmdir %{_topdir}/../../
 %define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 
 %install
 curdir=`pwd`
-cd ../..
+cd %{_topdir}/..
 make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh install-udsactor-unmanaged
 cd $curdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 curdir=`pwd`
-cd ../..
+cd %{_topdir}/..
 make DESTDIR=$RPM_BUILD_ROOT DISTRO=rh clean
 cd $curdir