From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Jul 2024 15:42:05 +0000 (+0000)
Subject: make.sh: Don't generate any documentation in the source directory
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b679964cd5b117e76d8e8f2040dc1e3d76b26607;p=people%2Fms%2Fipfire-2.x.git

make.sh: Don't generate any documentation in the source directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/.gitignore b/.gitignore
index 5e8ab8306..e177cf054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@
 /build_*
 /cache
 /ccache
-/doc/ChangeLog
-/doc/packages-list.txt
 /log
 /log_*
 /packages
diff --git a/lfs/cdrom b/lfs/cdrom
index fed69f171..e5c8a313b 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -170,10 +170,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > $(DIR_TMP)/cdrom/README.txt
 	cp $(DIR_SRC)/doc/COPYING $(DIR_TMP)/cdrom/
 
-	# Install documentation
-	-mkdir -pv $(DIR_TMP)/cdrom/doc
-	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt}	$(DIR_TMP)/cdrom/doc
-
 	mkdir -p $(DIR_TMP)/cdrom/boot/isolinux
 
 	cp /boot/vmlinuz-$(KVER)-ipfire $(DIR_TMP)/cdrom/boot/isolinux/vmlinuz
diff --git a/make.sh b/make.sh
index f7654b212..e15d35efa 100755
--- a/make.sh
+++ b/make.sh
@@ -2083,30 +2083,6 @@ build_system() {
 buildpackages() {
   local LOGFILE="${LOG_DIR}/_build.packages.log"
 
-  echo "... see detailed log in _build.*.log files" >> $LOGFILE
-
-
-  # Generating list of packages used
-  print_line "Generating packages list from logs"
-  rm -f $BASEDIR/doc/packages-list
-  for i in `ls -1tr $BASEDIR/log/[^_]*`; do
-	if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-		echo "* `basename $i`" >>$BASEDIR/doc/packages-list
-	fi
-  done
-  echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$\|install1$\|install2$\|pass1$\|pass2$\|pass3$' \
-	$BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
-  rm -f $BASEDIR/doc/packages-list
-  # packages-list.txt is ready to be displayed for wiki page
-  print_status DONE
-
-  # Update changelog
-  cd $BASEDIR
-  [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
-  [ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD"
-  git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog
-
   # Create images for install
   lfsmake2 cdrom