]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 5487c71)
Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
Conflicts:
config/rootfiles/core/37/filelists/files
config/rootfiles/packages/gutenprint
doc/packages-list.txt
src/pakfire/lib/functions.sh

config/rootfiles/oldcore/37/update.sh patch | blob | blame | history
config/rootfiles/packages/gutenprint patch | blob | blame | history
config/rootfiles/packages/ipfireseeder patch | blob | blame | history
lfs/compat-wireless patch | blob | blame | history
lfs/ipfireseeder patch | blob | blame | history
make.sh patch | blob | blame | history
src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch [new file with mode: 0644] patch | blob

diff --git a/config/rootfiles/oldcore/37/update.sh b/config/rootfiles/oldcore/37/update.sh
index e78621e34354250b8254e8d6aae27c859b151da9..67cd0c025e1bf6ce6a1b1a563ffbdd1941c39f99 100644 (file)
--- a/config/rootfiles/oldcore/37/update.sh
+++ b/config/rootfiles/oldcore/37/update.sh
@@ -25,21 +25,32 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
 #Stop services
-
+/etc/init.d/squid stop
 #
 #Extract files
 extract_files
 #
 #Start services
-
+/etc/init.d/squid start
+/etc/init.d/apache restart
+#
 #
 #Delete sensors config to force new scan
 rm -f /etc/sysconfig/lm_sensors
 
+#Create cyrus-sasl autostart links
+ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
+ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
+ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
+
 #
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+#
+#Fix permissions of update booster
+chown -R nobody:nobody /var/ipfire/updatexlrator
+
 #
 #Run depmod to rebuld module informations
 depmod 2.6.27.42-ipfire
diff --git a/config/rootfiles/packages/gutenprint b/config/rootfiles/packages/gutenprint
index e134882d2a61c89fbac9b67393b2ea97749898d1..a65efb46eef56f6d8e7219dff3c7e41bcb335770 100644 (file)
--- a/config/rootfiles/packages/gutenprint
+++ b/config/rootfiles/packages/gutenprint
@@ -544,4 +544,4 @@ usr/share/locale/de/gutenprint_de.po
 #usr/share/man/man8/cups-calibrate.8
 #usr/share/man/man8/cups-genppd.8
 #usr/share/man/man8/cups-genppdupdate.8
-var/ipfire/cups/command.types
+var/ipfire/cups/command.types
\ No newline at end of file
diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index dd96016bfc5bac923159060bde841d9554c16ff1..5a0ce0d2ddaca663a309b2f072941fdd4003f0ef 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.5.i586-full-core36.iso.torrent
+var/ipfire/seeder/ipfire-2.5.i586-full-core37.iso.torrent
 #var/log/seeder
 var/log/seeder/info
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 4ac81d200fa335702aacc778127676b86e856b10..ede37646e26462dc2fccaa463bde795de34cc8c3 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch
+
        cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
 
        # The makefile put the modules to a wrong place move back...
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index d74546c98400438b422e93415ae674595b25f8e0..8c7584849299d74607a474817f188216ee863768 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.5.i586-full-core36.iso.torrent
+DL_FILE    = ipfire-2.5.i586-full-core37.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c46a39464f4ec1f71913ddcb2b5a049e
+$(DL_FILE)_MD5 = 2f984c777a487f5f7642f3abbe6aee31
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 7121005e77c163130cbbcfa272b680a580150798..9c7369c7425ad389777e4c8ee53a89db4787bac4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.6"                                                  # Version number
-CORE="37"                                                      # Core Level (Filename)
-PAKFIRE_CORE="36"                                              # Core Level (PAKFIRE)
+CORE="38"                                                      # Core Level (Filename)
+PAKFIRE_CORE="37"                                              # 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
diff --git a/src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch b/src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch
new file mode 100644 (file)
index 0000000..fbe3098
--- /dev/null
+++ b/src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch
@@ -0,0 +1,75 @@
+diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
+index 66bcb50..ad4d446 100644
+--- a/drivers/net/wireless/ath/ath5k/ath5k.h
++++ b/drivers/net/wireless/ath/ath5k/ath5k.h
+@@ -535,7 +535,7 @@  struct ath5k_txq_info {
+       u32     tqi_cbr_period; /* Constant bit rate period */
+       u32     tqi_cbr_overflow_limit;
+       u32     tqi_burst_time;
+-      u32     tqi_ready_time; /* Not used */
++      u32     tqi_ready_time; /* Time queue waits after an event */
+ };
+ 
+ /*
+diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
+index b501537..535a6af 100644
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1516,7 +1516,8 @@  ath5k_beaconq_config(struct ath5k_softc *sc)
+ 
+       ret = ath5k_hw_get_tx_queueprops(ah, sc->bhalq, &qi);
+       if (ret)
+-              return ret;
++              goto err;
++
+       if (sc->opmode == NL80211_IFTYPE_AP ||
+               sc->opmode == NL80211_IFTYPE_MESH_POINT) {
+               /*
+@@ -1543,10 +1544,25 @@  ath5k_beaconq_config(struct ath5k_softc *sc)
+       if (ret) {
+               ATH5K_ERR(sc, "%s: unable to update parameters for beacon "
+                       "hardware queue!\n", __func__);
+-              return ret;
++              goto err;
+       }
++      ret = ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */
++      if (ret)
++              goto err;
+ 
+-      return ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */;
++      /* reconfigure cabq with ready time to 80% of beacon_interval */
++      ret = ath5k_hw_get_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi);
++      if (ret)
++              goto err;
++
++      qi.tqi_ready_time = (sc->bintval * 80) / 100;
++      ret = ath5k_hw_set_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi);
++      if (ret)
++              goto err;
++
++      ret = ath5k_hw_reset_tx_queue(ah, AR5K_TX_QUEUE_ID_CAB);
++err:
++      return ret;
+ }
+ 
+ static void
+diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
+index abe36c0..9122a85 100644
+--- a/drivers/net/wireless/ath/ath5k/qcu.c
++++ b/drivers/net/wireless/ath/ath5k/qcu.c
+@@ -408,12 +408,13 @@  int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
+                       break;
+ 
+               case AR5K_TX_QUEUE_CAB:
++                      /* XXX: use BCN_SENT_GT, if we can figure out how */
+                       AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),
+-                              AR5K_QCU_MISC_FRSHED_BCN_SENT_GT |
++                              AR5K_QCU_MISC_FRSHED_DBA_GT |
+                               AR5K_QCU_MISC_CBREXP_DIS |
+                               AR5K_QCU_MISC_CBREXP_BCN_DIS);
+ 
+-                      ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL -
++                      ath5k_hw_reg_write(ah, ((tq->tqi_ready_time -
+                               (AR5K_TUNE_SW_BEACON_RESP -
+                               AR5K_TUNE_DMA_BEACON_RESP) -
+                               AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |
Peter's tree of IPFire 2.x