Build core15 with dnsmasq 2.45

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index 60d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2..b5794c5ecfc769b4e206de0e70e6c8ca8dd07014 100644 (file)
--- 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 (file)
index 0000000..52198eb
--- /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 (file)
index e69de29..0000000

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 215c98ef324f4f742502b4840419cdbaad2572af..d720b01781ecfcadf94a8907a7f3128f02a045cd 100755 (executable)
--- 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 c8d676e7e7bc1d0d375e7077c1ebf3353576b530..9f9d17c8d4328980cf903e898d1f0e5534c154ec 100644 (file)
--- 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 354665904614f78db9316c292ac3b54dc7674e61..4804c1d9465956c78f51dc28106609e8b0f3f088 100644 (file)
--- 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 e22cd3c95b94e27565f72e6389c38bfa62ae69fa..f9d4cb5f060b802b05192c914d79d3faf7a890c9 100644 (file)
--- 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