diff --git a/.packer.json b/.packer.json index 7d61363b22b02333cbd482f35966fe8998e9454d..bf2cc115e38a2f7553311879b3b21d7def3d2dfd 100644 --- a/.packer.json +++ b/.packer.json @@ -5,9 +5,9 @@ "mkdir -p /sources", "cd /ring-daemon", "cp ring-daemon.spec ..", + "git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master", "cd ..", "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec", - "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"", "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"", "cp -R /root/rpmbuild/RPMS/x86_64/* /output" ], @@ -15,9 +15,9 @@ "mkdir -p /sources", "cd /ring-daemon", "cp ring-daemon.spec ..", + "git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master", "cd ..", "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec", - "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"", "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"", "cp -R /root/rpmbuild/RPMS/i686/* /output" ], @@ -25,9 +25,9 @@ "mkdir -p /sources", "cd /ring-daemon", "cp ring-daemon.spec ..", + "git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master", "cd ..", "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec", - "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"", "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"", "cp -R /root/rpmbuild/RPMS/x86_64/* /output" ], diff --git a/debian/rules b/debian/rules index 5b16e1a117ef2aad1c1bf219dc026d4c7e461e7d..07838757e44b04f68360744bbb770c3d18e52ca7 100755 --- a/debian/rules +++ b/debian/rules @@ -21,13 +21,13 @@ override_dh_auto_configure: @echo "Contribs built" #./autogen.sh && ./configure --prefix=/usr --with-contrib=yes CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" ./autogen.sh && ./configure --prefix=/usr - rm -rf .git dh_auto_configure override_dh_auto_test: override_dh_auto_build: make -j2 + rm -rf .git override_dh_auto_clean: # [ -d daemon/contrib/native ] && cd daemon/contrib/native && $(MAKE) distclean diff --git a/ring-daemon.spec b/ring-daemon.spec index b0e0f24cf26b90e1c96602e2329e125f6fbb17d3..15fa93c8f65a2aa1d7993b10566ad794f4a9baa8 100644 --- a/ring-daemon.spec +++ b/ring-daemon.spec @@ -59,8 +59,8 @@ cd ../.. echo "Contribs built" ./autogen.sh %configure --prefix=/usr CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" -rm -rf .git make -j %{?_smp_mflags} +rm -rf .git %install mkdir -p %{buildroot}/ring-daemon