Merge branch 'master' of vparabola:~/projects/abslibre

Conflicts:
	libre/icecat/PKGBUILD
	libre/kernel26-libre/PKGBUILD

2 files changed, 2 insertions, 23 deletions

diff --git a/libre/icecat/arch-linux-wiki.xml b/libre/icecat/arch-linux-wiki.xml
deleted file mode 100644
index 9e21b92e2..000000000
--- a/libre/icecat/arch-linux-wiki.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Arch Linux Wiki</os:ShortName>
-<os:Description>searches on the arch linux wiki</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII=</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png</IconUpdateUrl>
-<SearchForm>http://wiki.archlinux.org/index.php/Main_Page</SearchForm>
-<os:Url type="text/html" method="GET" template="http://wiki.archlinux.org/index.php/Special:Search?go=Go&amp;search={searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 55890ba16..d5a0644da 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -25,15 +25,6 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/li
         Kbuild
         Kbuild.platforms
         kernel26.install)
-md5sums=('4ddca7df15f92537b1914ab115cb4f8b'
-         'cff48db79d27731e46af0653788a186d'
-         '252cbddfd9a8bb97181c087fdd5e2377'
-         'd5c6c675662d98011513f6cbc81d66db'
-         '00e8553b44dac65fc093db60a1cde842'
-         '25584700a0a679542929c4bed31433b6'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         'fdfed5e8b46f289617ee6def01978090')
 
 build() {
   cd ${srcdir}/linux-$pkgver
@@ -72,7 +63,6 @@ build() {
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
   # get kernel version  
-  make oldconfig # using old config from previous kernel version
   make prepare
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
@@ -87,6 +77,7 @@ build() {
   #msg "Stopping build"
   #return 1
   ####################
+  yes "" | make config
   # build!
   #yes "" | make config
   if [ "$CARCH" == "mips64el" ]; then
@@ -295,7 +286,7 @@ conflicts=('kernel26-docs')
 
 cd ${srcdir}/linux-$pkgver
 mkdir -p $pkgdir/usr/src/linux-$_kernver
-cp -r Documentation $pkgdir/usr/src/linux-$_kernver/
+mv Documentation $pkgdir/usr/src/linux-$_kernver
 find $pkgdir -type f -exec chmod 444 {} \;
 find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package