]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Revert "Remove ChangeLog file from cdrom image."
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Sep 2011 21:09:36 +0000 (23:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Sep 2011 21:09:36 +0000 (23:09 +0200)
This reverts commit f005ef1d5f379704960e449d90ac2692b27d568f.

Conflicts:

make.sh

lfs/cdrom

index 9645aae100cae8a39b039cf3e04134b10e95571c..c61cd91bd5a90fad63e20daf817fa500b9df0612 100644 (file)
--- 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