[Blends-commit] [SCM] blends-gsoc branch, master, updated. 8900111b84be9b75d6e70d9c6ef1ca3ba0918afc

[Emmanouil Kiagias]

The following commit has been merged in the master branch:
commit 8900111b84be9b75d6e70d9c6ef1ca3ba0918afc
Author: Emmanouil Kiagias <e.kiagias at gmail.com>
Date:   Mon Sep 2 15:26:54 2013 +0200

    comment out packages{-sorted}.txt/avoidpackages.txt rule in devtools/Makefile. note that by_vote rule link does not work(wget 404 not found)

diff --git a/devtools/Makefile b/devtools/Makefile
index 6522a00..ccb1d9a 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -15,6 +15,7 @@
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 
 VERSION  := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 GENCONTROL := /usr/share/blends-dev/sec-blend-gen-control
 TASKSDIFF := /usr/share/blends-dev/tasks_diff
@@ -76,23 +77,21 @@ else
 	echo "It is the first release, skip the changelog entry"
 endif
 
-##FIXME comment out for the moment
-#packages.txt: tasks/*
-#	$(GENCONTROL) -s $(TARGET_DIST) -a > packages.txt.$$$$ && mv packages.txt.$$$$ packages.txt
+packages.txt:
+	$(GENCONTROL) -a $(DEB_HOST_ARCH) > packages.txt.$$$$ && mv packages.txt.$$$$ packages.txt.$(DEB_HOST_ARCH)
 
-#avoidpackages.txt: tasks/* sources.list.$(TARGET_DIST)
-#	$(GENCONTROL) -s $(TARGET_DIST) -e > avoidpackages.txt.$$$$ && mv avoidpackages.txt.$$$$ avoidpackages.txt
+avoidpackages.txt:
+	$(GENCONTROL) -e > avoidpackages.txt.$$$$ && mv avoidpackages.txt.$$$$ avoidpackages.txt.$(DEB_HOST_ARCH)
 
 by_vote:
 	rm -f by_vote
 	wget http://developer.skolelinux.no/popcon/by_vote
 
-##FIXME comment out for the moment
-#packages-sorted.txt: packages.txt by_vote
-#	for pkg in `cat packages.txt` ; do \
-#		grep " $$pkg " by_vote ; \
-#	done | LANG=C sort -r -n -k 4 -k 3 > packages-sorted.txt
-#usage: packages-sorted.txt
+packages-sorted.txt: packages.txt by_vote
+	for pkg in `cat packages.txt` ; do \
+		grep " $$pkg " by_vote ; \
+	done | LANG=C sort -r -n -k 4 -k 3 > packages-sorted.txt.$(DEB_HOST_ARCH)
+usage: packages-sorted.txt
 
 clean: 
 	rm -rf tmp

-- 
Git repository for blends-gsoc code