From 3ced8695afbc62b95b52d53be4ca64086a700e39 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 14:13:39 +0200 Subject: [PATCH] crda: move wireless-regdb to own package. update crda to 1.1.1. update wireless-regdb to 2011.04.28. --- config/rootfiles/common/crda | 2 - config/rootfiles/common/wireless-regdb | 5 ++ config/rootfiles/core/next/filelists/crda | 1 + .../core/next/filelists/wireless-regdb | 1 + lfs/crda | 16 ++-- lfs/wireless-regdb | 76 +++++++++++++++++++ make.sh | 1 + 7 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 config/rootfiles/common/wireless-regdb create mode 120000 config/rootfiles/core/next/filelists/crda create mode 120000 config/rootfiles/core/next/filelists/wireless-regdb create mode 100644 lfs/wireless-regdb diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda index abda70176e..3c932a154b 100644 --- a/config/rootfiles/common/crda +++ b/config/rootfiles/common/crda @@ -5,7 +5,5 @@ lib/udev/rules.d/85-regulatory.rules #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so sbin/crda sbin/regdbdump -#usr/lib/crda -usr/lib/crda/regulatory.bin #usr/share/man/man8/crda.8.gz #usr/share/man/man8/regdbdump.8.gz diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb new file mode 100644 index 0000000000..2dcdbca325 --- /dev/null +++ b/config/rootfiles/common/wireless-regdb @@ -0,0 +1,5 @@ +#usr/lib/crda +#usr/lib/crda/pubkeys +usr/lib/crda/pubkeys/linville.key.pub.pem +usr/lib/crda/regulatory.bin +#usr/share/man/man5/regulatory.bin.5.gz diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda new file mode 120000 index 0000000000..d68c46e55b --- /dev/null +++ b/config/rootfiles/core/next/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb new file mode 120000 index 0000000000..c9205b3cf2 --- /dev/null +++ b/config/rootfiles/core/next/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/lfs/crda b/lfs/crda index f97fdcb81e..521eb933df 100644 --- a/lfs/crda +++ b/lfs/crda @@ -24,12 +24,10 @@ include Config -VER = 20110202-git - -REGDB = regulatory-20110202 +VER = 1.1.1 THISAPP = crda-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -39,13 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(REGDB).tar.xz +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(REGDB).tar.xz = $(DL_FROM)/$(REGDB).tar.xz -$(DL_FILE)_MD5 = 1da048b854cca1f1087c1250df335ca8 -$(REGDB).tar.xz_MD5 = 620621172d18d6f8cdc2db423dcb6381 +$(DL_FILE)_MD5 = 5fc77af68b3e21736b8ef2f8b061c810 install : $(TARGET) @@ -74,9 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir /usr/lib/crda - tar Jxf $(DIR_DL)/$(REGDB).tar.xz -C /usr/lib/crda/ - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING) cd $(DIR_APP) && USE_OPENSSL=1 make install @rm -rf $(DIR_APP) diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb new file mode 100644 index 0000000000..2228c22b0a --- /dev/null +++ b/lfs/wireless-regdb @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team # +# # +# 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 = 2011.04.28 + +THISAPP = wireless-regdb-$(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 = 16b7fabd4d7761ccf206702a3f18cce9 + +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) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4a7e374613..ba25ec3b47 100755 --- a/make.sh +++ b/make.sh @@ -690,6 +690,7 @@ buildipfire() { ipfiremake parted ipfiremake swig ipfiremake python-m2crypto + ipfiremake wireless-regdb ipfiremake crda ipfiremake libsatsolver ipfiremake python-satsolver -- 2.39.2