From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Sep 2011 21:09:36 +0000 (+0200)
Subject: Revert "Remove ChangeLog file from cdrom image."
X-Git-Tag: v2.9-core54~13^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8031af5f951cec5c49d38cab69f585484353c17;p=people%2Fms%2Fipfire-2.x.git

Revert "Remove ChangeLog file from cdrom image."

This reverts commit f005ef1d5f379704960e449d90ac2692b27d568f.

Conflicts:

	make.sh
---

diff --git a/lfs/cdrom b/lfs/cdrom
index 9645aae100..c61cd91bd5 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Other files
 	sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt
-	cp $(DIR_SRC)/doc/COPYING		/install/cdrom/
-	cp $(DIR_SRC)/doc/packages-list.txt	/install/cdrom/doc
+	cp $(DIR_SRC)/doc/COPYING				/install/cdrom/
+	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt}	/install/cdrom/doc
 
 	# Configuration
 	mkdir -p /install/cdrom/boot