@@ -65,6 +65,9 @@ TARGETDIR=$(CURRENTDIR)target
6565# RPM Packaging path (where RPMs will be stored)
6666PATHRPMPKG =$(TARGETDIR ) /RPM
6767
68+ # RPM local database path (avoid host rpmdb permission issues)
69+ RPMDBPATH =$(PATHRPMPKG ) /.rpmdb
70+
6871# DEB Packaging path (where DEBs will be stored)
6972PATHDEBPKG =$(TARGETDIR ) /DEB
7073
@@ -141,10 +144,12 @@ codefix:
141144.PHONY : deb
142145deb :
143146 rm -rf $(PATHDEBPKG )
144- make install DESTDIR=$(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION )
147+ $( MAKE ) install DESTDIR=$(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION )
145148 rm -f $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /$(DOCPATH ) LICENSE
146149 tar -zcvf $(PATHDEBPKG ) /$(PKGNAME ) _$(VERSION ) .orig.tar.gz -C $(PATHDEBPKG ) / $(PKGNAME ) -$(VERSION )
147150 cp -rf ./resources/debian $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian
151+ find $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian/ -type f -name ' *.bak' -delete
152+ chmod 755 $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian/rules
148153 find $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian/ -type f -exec sed $(SEDINPLACE ) " s/~#DATE#~/` date -R` /" {} \;
149154 find $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian/ -type f -exec sed $(SEDINPLACE ) " s/~#VENDOR#~/$( VENDOR) /" {} \;
150155 find $(PATHDEBPKG ) /$(PKGNAME ) -$(VERSION ) /debian/ -type f -exec sed $(SEDINPLACE ) " s/~#PROJECT#~/$( PROJECT) /" {} \;
@@ -227,8 +232,11 @@ report: ensuretarget
227232.PHONY : rpm
228233rpm :
229234 rm -rf $(PATHRPMPKG )
235+ mkdir -p $(RPMDBPATH ) $(PATHRPMPKG ) /tmp
230236 rpmbuild \
231237 --define " _topdir $( PATHRPMPKG) " \
238+ --define " _dbpath $( RPMDBPATH) " \
239+ --define " _tmppath $( PATHRPMPKG) /tmp" \
232240 --define " _vendor $( VENDOR) " \
233241 --define " _owner $( OWNER) " \
234242 --define " _project $( PROJECT) " \
0 commit comments