From 421f4db04a321d07b2e7b6c3e5336c75c2f2ccaa Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Dec 2008 00:11:54 +0100
Subject: [PATCH] Added a function that walks through our software list and
 gives wiki output.

---
 .gitignore             |  1 +
 doc/make.sh-usage      |  3 ++-
 doc/packages-list.txt  |  1 -
 tools/make-beautify    | 13 +++++++++++++
 tools/make-include     |  1 +
 tools/make-interactive |  3 +++
 6 files changed, 20 insertions(+), 2 deletions(-)
 delete mode 100644 doc/packages-list.txt

diff --git a/.gitignore b/.gitignore
index e32af3dc8..76ce42700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /ccache
 /distcc
 /doc/ChangeLog
+/doc/packages-list.txt
 /log_*
 /tmp
 /*.diff
diff --git a/doc/make.sh-usage b/doc/make.sh-usage
index 134e361a9..d623ddbd2 100644
--- a/doc/make.sh-usage
+++ b/doc/make.sh-usage
@@ -9,7 +9,8 @@ Maintainer / advanced commands
 
      source    : _Source tarballs and patches_
       |`- get  : Download from source.ipfire.org.
-      `-- put  : Upload to source.ipfire.org.
+      |-- put  : Upload to source.ipfire.org.
+      `-- list : Show all used packages (wiki output).
 
      target    : _Images and packages_
        `- put  : Upload everything to the public ftp server.
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
deleted file mode 100644
index 3e48167f5..000000000
--- a/doc/packages-list.txt
+++ /dev/null
@@ -1 +0,0 @@
-== List of softwares used to build IPFire Version: 2.9 ==
diff --git a/tools/make-beautify b/tools/make-beautify
index f65942a40..f189d4ab9 100644
--- a/tools/make-beautify
+++ b/tools/make-beautify
@@ -212,3 +212,16 @@ dialogerror() {
 	[ -z "$LOGFILE" ] || \
 	echo "       Check $LOGFILE for errors if applicable"
 } # End of dialogerror()
+
+software_list() {
+	local DATA
+	DATA="$BASEDIR/log_${TARGET}/_build.00-software.log"
+
+	echo "====== List of softwares used to build $NAME Version: $VERSION ======"
+	echo
+
+	sort < $DATA | uniq | tr ";" " " | \
+		while read NAME VERSION; do
+			echo "  * $NAME-$VERSION"
+		done
+}
diff --git a/tools/make-include b/tools/make-include
index 05f02d926..f5c40a47f 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -626,6 +626,7 @@ puttarget() {
 	[ -e "${BASEDIR}/packages" ] && cp -al ${BASEDIR}/packages ${DIR}
 	[ -e "${BATCHLOG}" ] && \
 		python ${BASEDIR}/tools/alog2html < ${BATCHLOG} > ${DIR}/build_log.html
+	software_list > ${DIR}/packages-list.txt
 	git_export; cp -l ${BASEDIR}/${SNAME}-${VERSION}.source.tar.gz ${DIR}
 	git_diff >/dev/null && cp -l ${DIFF_NAME} ${DIR}
 	cp -l ${BASEDIR}/${IMAGENAME}.* ${DIR}
diff --git a/tools/make-interactive b/tools/make-interactive
index 40e4c8d9a..4405e6bd3 100644
--- a/tools/make-interactive
+++ b/tools/make-interactive
@@ -119,6 +119,9 @@ source|src)
 		put|push|upload)
 			putsource
 			;;
+		list)
+			software_list | tee -a $BASEDIR/doc/packages-list.txt
+			;;
 	esac
 	;;
 
-- 
2.39.2