# URLs that are common sources of downloads. If you're having trouble with
# a site you should change its URL to that of a suitable mirror site.
#
-URL_IPFIRE = http://source.ipfire.org/othersrc
-URL_TOOLCHAIN = http://source.ipfire.org/toolchain
+URL_IPFIRE = http://source.ipfire.org/source-2.x
+URL_TOOLCHAIN = http://source.ipfire.org/toolchains
# Default compiler optimizations.
#
define CHECK
@echo -e "$(MESSAGE)Check: $($(notdir $@))"
- wget -T 120 -t 1 --spider -nv $($(notdir $@)) -O /dev/null
+ wget -T 120 -t 1 --spider -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O /dev/null
@touch $(DIR_CHK)/$(notdir $@)
endef
define LOAD
@echo -e "$(MESSAGE)Download: $($(notdir $@))"
- wget -T 60 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
+ wget -T 60 -t 1 -c -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
[ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
endef
define PAK
# Bringing the files to their right place.
@rm -rf /install/packages/package
- @mkdir -p /install/packages/package
- if [ -e "/usr/src/src/paks $(PROG)" ]; then \
+ @mkdir -p /install/packages/package/tmp
+ if [ -e "/usr/src/src/paks/$(PROG)" ]; then \
cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \
/install/packages/package; \
else \
cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
/install/packages/package; \
fi
- sed -e "s/KVER/$(KVER)/g" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES
+ cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+ sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
chmod 755 /install/packages/package/{{,un}install,update}.sh
- cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*'
- -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES
+ cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
+ --preserve --numeric-owner
+ # Double tar to remove double files
+ tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
+ --preserve --numeric-owner
+ rm -f /install/packages/package/files.tmp
+ cd /install/packages/package/tmp/ && tar -c --preserve --numeric-owner -f /install/packages/package/files *
+ rm -r /install/packages/package/tmp
+ -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
+ mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files
rm -rf /install/packages/package
sed -e s/NAME/$(PROG)/g \