webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build core15 with dnsmasq 2.45

Browse Source
This commit is contained in:
Arne Fitzenreiter
2008-07-24 12:23:01 +02:00
parent fbbab534f4
commit bebcd1b38a
10 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/cdrom_corever
View File

@@ -1 +1,2 @@
15 16

1
config/rootfiles/core/15/files Normal file
View File

@@ -0,0 +1 @@
usr/sbin/dnsmasq

0
config/rootfiles/core/16/meta → config/rootfiles/core/15/meta
View File

0
config/rootfiles/core/16/update.sh → config/rootfiles/core/15/update.sh
View File

0
config/rootfiles/core/16/files
View File

0
config/rootfiles/updater/filelists/core15 → config/rootfiles/updater/filelists/core16
View File

4
config/rootfiles/updater/update.sh
View File

@@ -109,10 +109,10 @@ rm -f /opt/pakfire/db/lists/*list.db
echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
echo =================================== >> /etc/issue echo =================================== >> /etc/issue
echo \\n running on \\s \\r \\m >> /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" perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
/etc/init.d/mISDN config /etc/init.d/mISDN config
# Core 15 end # Core 16 end
# #
# Remove obsolete packages # Remove obsolete packages
# #

2
doc/packages-list.txt
View File

@@ -72,7 +72,7 @@
* dhcp-3.1.0 * dhcp-3.1.0
* dhcpcd-2.0.8 * dhcpcd-2.0.8
* diffutils-2.8.1 * diffutils-2.8.1
* dnsmasq-2.40 * dnsmasq-2.45
* dosfstools-2.11 * dosfstools-2.11
* e2fsprogs-1.39 * e2fsprogs-1.39
* ebtables-v2.0.8-2 * ebtables-v2.0.8-2

3
lfs/dnsmasq
View File

@@ -70,10 +70,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @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 \ cd $(DIR_APP)/src && sed -i \
-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \ -e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h -e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && PREFIX=/usr make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

6
lfs/updater
View File

@@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Other files # Other files
cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/ cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
chmod 755 /install/updater/update.sh 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 update.sh files ROOTFILES
rm -rf /install/updater rm -rf /install/updater
sed -e "s/NAME/core-upgrade/g" \ sed -e "s/NAME/core-upgrade/g" \
-e "s/VER/2.1/g" \ -e "s/VER/2.1/g" \
-e "s/RELEASE/15/g" \ -e "s/RELEASE/16/g" \
-e "s/DEPS/$(DEPS)/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 < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-15