From bebcd1b38a3248f8d4206dea3dacd3e3dc62e896 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 24 Jul 2008 12:23:01 +0200
Subject: [PATCH] Build core15 with dnsmasq 2.45

---
 config/rootfiles/cdrom_corever                        | 3 ++-
 config/rootfiles/core/15/files                        | 1 +
 config/rootfiles/core/{16 => 15}/meta                 | 0
 config/rootfiles/core/{16 => 15}/update.sh            | 0
 config/rootfiles/core/16/files                        | 0
 config/rootfiles/updater/filelists/{core15 => core16} | 0
 config/rootfiles/updater/update.sh                    | 4 ++--
 doc/packages-list.txt                                 | 2 +-
 lfs/dnsmasq                                           | 3 ++-
 lfs/updater                                           | 6 +++---
 10 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 config/rootfiles/core/15/files
 rename config/rootfiles/core/{16 => 15}/meta (100%)
 rename config/rootfiles/core/{16 => 15}/update.sh (100%)
 delete mode 100644 config/rootfiles/core/16/files
 rename config/rootfiles/updater/filelists/{core15 => core16} (100%)

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index 60d3b2f4a..b5794c5ec 100644
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1,2 @@
-15
+16
+
diff --git a/config/rootfiles/core/15/files b/config/rootfiles/core/15/files
new file mode 100644
index 000000000..52198eb0f
--- /dev/null
+++ b/config/rootfiles/core/15/files
@@ -0,0 +1 @@
+usr/sbin/dnsmasq
diff --git a/config/rootfiles/core/16/meta b/config/rootfiles/core/15/meta
similarity index 100%
rename from config/rootfiles/core/16/meta
rename to config/rootfiles/core/15/meta
diff --git a/config/rootfiles/core/16/update.sh b/config/rootfiles/core/15/update.sh
similarity index 100%
rename from config/rootfiles/core/16/update.sh
rename to config/rootfiles/core/15/update.sh
diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files
deleted file mode 100644
index e69de29bb..000000000
diff --git a/config/rootfiles/updater/filelists/core15 b/config/rootfiles/updater/filelists/core16
similarity index 100%
rename from config/rootfiles/updater/filelists/core15
rename to config/rootfiles/updater/filelists/core16
diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 215c98ef3..d720b0178 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -109,10 +109,10 @@ rm -f /opt/pakfire/db/lists/*list.db
 echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
 echo =================================== >> /etc/issue
 echo \\n running on \\s \\r \\m >> /etc/issue
-# Core 15 begin
+# Core 16 begin
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 /etc/init.d/mISDN config
-# Core 15 end
+# Core 16 end
 #
 # Remove obsolete packages
 #
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c8d676e7e..9f9d17c8d 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -72,7 +72,7 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dnsmasq-2.40
+* dnsmasq-2.45
 * dosfstools-2.11
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 354665904..4804c1d94 100644
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -70,10 +70,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -i -e 's|/usr/local|/usr|g' Makefile
 	cd $(DIR_APP)/src && sed -i \
 		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
 		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && PREFIX=/usr make install
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/updater b/lfs/updater
index e22cd3c95..f9d4cb5f0 100644
--- a/lfs/updater
+++ b/lfs/updater
@@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Other files
 	cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
 	chmod 755 /install/updater/update.sh
-	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-15.ipfire \
+	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-16.ipfire \
 		update.sh files ROOTFILES
 	rm -rf /install/updater
 
 	sed -e "s/NAME/core-upgrade/g" \
 		-e "s/VER/2.1/g" \
-		-e "s/RELEASE/15/g" \
+		-e "s/RELEASE/16/g" \
 		-e "s/DEPS/$(DEPS)/g" \
-		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-15.ipfire | awk '{ print $$5 }'`/g" \
+		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \
 		< /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-15
-- 
2.39.2