From: Arne Fitzenreiter Date: Sat, 14 Aug 2010 18:07:30 +0000 (+0200) Subject: Change version to 2.8test. X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~115 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c5fdda6df055ed9308975028afc8d6d507672fd6;hp=f55e2865db62bb654a91943abd8016db2b7fd613 Change version to 2.8test. Removed unused lfs files. --- diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 6f9da0f3f6..b016352bc7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -1,4 +1,4 @@ -== List of softwares used to build IPFire Version: 2.7 == +== List of softwares used to build IPFire Version: 2.8test == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 diff --git a/lfs/busybox b/lfs/busybox deleted file mode 100644 index cdea9ef8c0..0000000000 --- a/lfs/busybox +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.2.2 - -THISAPP = busybox-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ae8a4c65b9464c8ece3483a3d3b9544c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - -mkdir -p /install/initrd/{{,s}bin,etc} - cd $(DIR_APP) && cp -f $(DIR_SRC)/config/uClibc/busybox.config .config - cd $(DIR_APP) && make oldconfig - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - mkdir -p /install/initrd/usr/share/udhcpc - cd $(DIR_APP) && install -m 0755 examples/udhcp/simple.script \ - /install/initrd/usr/share/udhcpc/default.script - ln -svf /tmp/resolv.conf /install/initrd/etc/resolv.conf - @rm -rf $(DIR_APP) /install/initrd/linuxrc - @$(POSTBUILD) diff --git a/lfs/uClibc b/lfs/uClibc deleted file mode 100644 index eeb197884c..0000000000 --- a/lfs/uClibc +++ /dev/null @@ -1,135 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9.28 - -THISAPP = uClibc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(PASS)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-pass1 -else -ifeq "$(PASS)" "2" - TARGET = $(DIR_INFO)/$(THISAPP)-pass2 -else - TARGET = $(DIR_INFO)/$(THISAPP)-pass3 -endif -endif - -STAGING_DIR=/opt/$(MACHINE)-uClibc - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) uClibc-locale-030818.tgz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -uClibc-locale-030818.tgz = $(DL_FROM)/uClibc-locale-030818.tgz - -$(DL_FILE)_MD5 = 1ada58d919a82561061e4741fb6abd29 -uClibc-locale-030818.tgz_MD5 = d75b2239b4e27c3c9cbed1c8f6eabba6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) -ifeq "$(PASS)" "1" - @rm -rf $(DIR_APP) - @mkdir -p /opt/$(MACHINE)-uClibc $(DIR_SRC)/uClibc_dev/usr/include $(DIR_SRC)/uClibc_dev/{,usr}/lib - @cd $(DIR_SRC) && tar xfj $(DIR_DL)/$(DL_FILE) - cp -f $(DIR_DL)/uClibc-locale-030818.tgz $(DIR_APP)/extra/locale/ - cp -f $(DIR_SRC)/config/uClibc/{locales,codesets}.txt $(DIR_APP)/extra/locale - cd $(DIR_APP)/extra/locale && patch -Np3 < $(DIR_SRC)/src/patches/uClibc-gcc4-genwctype.patch - cp -f $(DIR_SRC)/config/uClibc/uClibc.config-$(MACHINE) $(DIR_APP)/.config - cd $(DIR_APP) && make oldconfig - cd $(DIR_APP)/extra/locale && make - cd $(DIR_APP) && make PREFIX=$(DIR_SRC)/uClibc_dev \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(DIR_SRC)/uClibc_dev/ \ - pregen install_dev -else -ifeq "$(PASS)" "2" - cd $(DIR_APP) && make PREFIX= \ - DEVEL_PREFIX=/ \ - RUNTIME_PREFIX=/ \ - all - cd $(DIR_APP) && make PREFIX= \ - DEVEL_PREFIX=/opt/$(MACHINE)-uClibc/ \ - RUNTIME_PREFIX=/opt/$(MACHINE)-uClibc/ \ - install_runtime install_dev - - ## This is to fix a small bug - if [ ! -h /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib ]; then \ - mv -vf /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib/* /opt/$(MACHINE)-uClibc/lib/; \ - rm -rf /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib; \ - ln -sfv ../lib /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/lib; \ - fi - - cd $(DIR_APP) && make -C utils/ PREFIX=/opt/$(MACHINE)-uClibc \ - hostutils - cd $(DIR_APP) && make PREFIX=/install/initrd \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - install_runtime - cp -f /opt/$(MACHINE)-uClibc/lib/ld-uClibc-$(VER).so /lib - cp -f /opt/$(MACHINE)-uClibc/lib/libuClibc-$(VER).so /lib - cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0 - cd /lib && ln -sf libuClibc-$(VER).so libc.so.0 - cd /lib && ln -sf libc.so.0 libc.so - ln -sf /opt/$(MACHINE)-uClibc/lib/libm-$(VER).so /lib/libm.so.0 -else - cd $(DIR_APP) && make PREFIX=/install/initrd utils install_utils - chmod 755 /install/initrd/lib/libuClibc-$(VER).so - rm -f /install/initrd/lib/{libm*,libcrypt*,libutil*,librt*} - @rm -rf $(DIR_APP) -endif -endif - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7ee503b4a4..4aa71be018 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.7" # Version number +VERSION="2.8test" # Version number CORE="40" # Core Level (Filename) -PAKFIRE_CORE="39" # Core Level (PAKFIRE) +PAKFIRE_CORE="40" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir