X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpakfire;h=11608b36d13cb2186d82e4da6b75cf2e8c6b36ea;hb=7b906cb23ae0220adb9916cad34c2d90dbb7bdca;hp=01eed9f42c00c349d59421dde3ed4c2bbdd19216;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/pakfire b/lfs/pakfire
index 01eed9f42..11608b36d 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -30,6 +30,12 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
+else
+	PAKFIRE_VERSION = $(VERSION)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -52,14 +58,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-mkdir -p /opt/pakfire/{db/{meta,lists,rootfiles,installed,core},etc,lib,tmp} \
 		/var/log/pakfire /var/cache/pakfire
 	cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
-	mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
+	sed -e "s/@VERSION@/$(PAKFIRE_VERSION)/g" \
+		< $(DIR_APP)/pakfire.conf \
+		> $(DIR_APP)/etc/pakfire.conf
 	chown root.root $(DIR_APP) -R
 	chmod 755 $(DIR_APP)/pakfire
-	
-	-cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
-	ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update
-	
 	touch /var/log/pakfire.log
+	chown root.nobody /var/log/pakfire.log
+	chmod 664 /var/log/pakfire.log
 	ln -sf ../../var/log/pakfire /opt/pakfire/logs
 	ln -sf ../../var/cache/pakfire /opt/pakfire/cache
 	@$(POSTBUILD)