Added a function that walks through our software list and gives wiki output.

diff --git a/.gitignore b/.gitignore
index e32af3dc86f96b862f1db34ded388e62c0f6a7ec..76ce42700bcba0917ce1dbcabc7f901652263794 100644 (file)
--- 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 134e361a96985f65afcc6d48a1895e956f029a20..d623ddbd2daa394c9e7904e36f452cf9b5e437cb 100644 (file)
--- 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 (file)
index 3e48167..0000000
--- 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 f65942a402e547f4629183e6ab139b0484a1d010..f189d4ab9cbc07d61139414e9a34dc443804fda5 100644 (file)
--- 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 05f02d9266b4485d967bec49e573a9235ee7aca4..f5c40a47fbe808eca4c4659954f840556225befb 100644 (file)
--- 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 40e4c8d9a8e0d60762a0f0f80285c83483571807..4405e6bd3ba663aeadcd4cfe3754a1013c9a4b5c 100644 (file)
--- 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
        ;;