This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 6b696830535fd20ba0dc22e2615548e124c3328d (commit) via 9306852543de7991f1cb0c1ce0a6022c477ba1d8 (commit) via 28998509ec1727dd5e981d0a1a6134b160e58f30 (commit) via 362acbabe51fe15147c58d78364a3fa22e7e1c55 (commit) via b8fab202926680747f87cad2cb0b4ec4126b1c59 (commit) via de78a2bfa8f8eb65256be01b5648a41a61acdaf1 (commit) via 8c85098a875f4b5554ed481cf9e6d6db3cbf3042 (commit) via 4bf0d575277842efbadc5255b6c1a67fd49477ba (commit) via 2fb7787f35d7467e4ff73edc877b7b9a886fd9a9 (commit) via c8de0070487948992f1ec776bab7e18f6a3dd9e1 (commit) via 8602108e6c71295034cb1c64168fe212b1211128 (commit) via f345b2831cc25643a01117b4536e02d2f53399d0 (commit) via 1f84d624fd00d5d1895c024db939f40faaa5d4a6 (commit) via f7da2c950cc828174ebe80935dcbd1177a6d62fb (commit) via ca666e151216fea6d1b5defcd926cad2b98cc145 (commit) via 80e4980761a9ef222c278e048c059dee806584fa (commit) via 741fa41c6ce99a23662ed90b174e6752732d91ad (commit) via 027825e99eee32c3b0fad6c5280069c7d93c5dcf (commit) via d1c1fa5d049f4cb51a5d4c21cbce72864ccc51db (commit) via 638c64e7fa3886f7f2d63c7d123b34bccb50ef40 (commit) via 29e74f0476f549047f4620a33b6a3baecfa93c23 (commit) from e0eb52dbd52ee7caa2f2ec7ea12e923f5eb8df69 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6b696830535fd20ba0dc22e2615548e124c3328d Merge: e0eb52d 9306852 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 22 23:44:39 2015 +0100
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/lib/firmware/brcm/brcmfmac4329-sdio.txt | 68 ----- config/lib/firmware/brcm/brcmfmac4330-sdio.txt | 122 --------- config/rootfiles/common/stage2 | 2 - config/rootfiles/core/{86 => 87}/exclude | 3 + .../77 => core/87}/filelists/armv5tel/glibc | 0 .../core/{86 => 87}/filelists/armv5tel/initscripts | 0 .../{86 => 87}/filelists/armv5tel/linux-kirkwood | 0 .../core/{86 => 87}/filelists/armv5tel/linux-multi | 0 .../core/{86 => 87}/filelists/armv5tel/linux-rpi | 0 .../core/{86 => 87}/filelists/armv5tel/swconfig | 0 .../core/{86 => 87}/filelists/armv5tel/u-boot | 0 config/rootfiles/core/{86 => 87}/filelists/bash | 0 .../rootfiles/core/{86 => 87}/filelists/coreutils | 0 config/rootfiles/core/{86 => 87}/filelists/crda | 0 config/rootfiles/core/{86 => 87}/filelists/dracut | 0 config/rootfiles/core/{86 => 87}/filelists/files | 1 + .../rootfiles/core/{86 => 87}/filelists/fireinfo | 0 .../{oldcore/44 => core/87}/filelists/hwdata | 0 .../rootfiles/core/{86 => 87}/filelists/i586/glibc | 0 .../rootfiles/core/{86 => 87}/filelists/i586/grub | 0 .../core/{86 => 87}/filelists/i586/initscripts | 0 .../rootfiles/core/{86 => 87}/filelists/i586/linux | 0 .../core/{86 => 87}/filelists/i586/linux-initrd | 0 config/rootfiles/core/{86 => 87}/filelists/iw | 0 config/rootfiles/core/{86 => 87}/filelists/kbd | 0 config/rootfiles/core/{86 => 87}/filelists/libcap | 0 .../rootfiles/core/{86 => 87}/filelists/libsmooth | 0 config/rootfiles/core/{86 => 87}/filelists/lvm2 | 0 config/rootfiles/core/{86 => 87}/filelists/mdadm | 0 .../rootfiles/core/{86 => 87}/filelists/misc-progs | 0 .../core/{86 => 87}/filelists/multipath-tools | 0 config/rootfiles/core/{86 => 87}/filelists/newt | 0 config/rootfiles/core/{86 => 87}/filelists/ntp | 0 config/rootfiles/core/{86 => 87}/filelists/openssl | 0 .../core/{86 => 87}/filelists/openssl-compat | 0 config/rootfiles/core/{86 => 87}/filelists/openvpn | 0 config/rootfiles/core/{86 => 87}/filelists/parted | 0 config/rootfiles/core/{86 => 87}/filelists/patch | 0 config/rootfiles/core/{86 => 87}/filelists/pigz | 0 config/rootfiles/core/{86 => 87}/filelists/setup | 0 config/rootfiles/core/{86 => 87}/filelists/slang | 0 .../rootfiles/core/{86 => 87}/filelists/strongswan | 0 config/rootfiles/core/{86 => 87}/filelists/tzdata | 0 .../core/{86 => 87}/filelists/updated-firmwares | 2 - .../core/{86 => 87}/filelists/wireless-regdb | 0 .../core/{86 => 87}/filelists/wpa_supplicant | 0 .../rootfiles/core/{86 => 87}/filelists/xfsprogs | 0 config/rootfiles/core/{86 => 87}/meta | 0 config/rootfiles/core/{86 => 87}/update.sh | 73 +++-- config/rootfiles/{core => oldcore}/85/exclude | 0 .../rootfiles/{core => oldcore}/85/filelists/files | 0 .../{core => oldcore}/85/filelists/openssl | 0 .../{core => oldcore}/85/filelists/openssl-compat | 0 config/rootfiles/{core => oldcore}/85/meta | 0 config/rootfiles/{core => oldcore}/85/update.sh | 0 config/u-boot/uEnv.txt | 7 +- config/xen-image/README | 4 +- config/xen-image/xen-image-maker.sh | 17 +- lfs/linux | 22 +- make.sh | 4 +- src/paks/linux-pae/install.sh | 83 +++--- src/paks/linux-pae/uninstall.sh | 8 +- src/paks/linux-pae/update.sh | 8 +- .../linux-3.10-compulab-utilite-support.patch | 96 ------- .../linux-3.14.x-lamobo-r1-fix-sata-pwr.patch | 49 ++++ src/patches/linux-3.14.x-update_banana_dts.patch | 301 --------------------- src/scripts/backupiso | 4 +- 67 files changed, 191 insertions(+), 683 deletions(-) delete mode 100644 config/lib/firmware/brcm/brcmfmac4329-sdio.txt delete mode 100644 config/lib/firmware/brcm/brcmfmac4330-sdio.txt rename config/rootfiles/core/{86 => 87}/exclude (84%) copy config/rootfiles/{oldcore/77 => core/87}/filelists/armv5tel/glibc (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/initscripts (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/swconfig (100%) rename config/rootfiles/core/{86 => 87}/filelists/armv5tel/u-boot (100%) rename config/rootfiles/core/{86 => 87}/filelists/bash (100%) rename config/rootfiles/core/{86 => 87}/filelists/coreutils (100%) rename config/rootfiles/core/{86 => 87}/filelists/crda (100%) rename config/rootfiles/core/{86 => 87}/filelists/dracut (100%) rename config/rootfiles/core/{86 => 87}/filelists/files (92%) rename config/rootfiles/core/{86 => 87}/filelists/fireinfo (100%) copy config/rootfiles/{oldcore/44 => core/87}/filelists/hwdata (100%) rename config/rootfiles/core/{86 => 87}/filelists/i586/glibc (100%) rename config/rootfiles/core/{86 => 87}/filelists/i586/grub (100%) rename config/rootfiles/core/{86 => 87}/filelists/i586/initscripts (100%) rename config/rootfiles/core/{86 => 87}/filelists/i586/linux (100%) rename config/rootfiles/core/{86 => 87}/filelists/i586/linux-initrd (100%) rename config/rootfiles/core/{86 => 87}/filelists/iw (100%) rename config/rootfiles/core/{86 => 87}/filelists/kbd (100%) rename config/rootfiles/core/{86 => 87}/filelists/libcap (100%) rename config/rootfiles/core/{86 => 87}/filelists/libsmooth (100%) rename config/rootfiles/core/{86 => 87}/filelists/lvm2 (100%) rename config/rootfiles/core/{86 => 87}/filelists/mdadm (100%) rename config/rootfiles/core/{86 => 87}/filelists/misc-progs (100%) rename config/rootfiles/core/{86 => 87}/filelists/multipath-tools (100%) rename config/rootfiles/core/{86 => 87}/filelists/newt (100%) rename config/rootfiles/core/{86 => 87}/filelists/ntp (100%) rename config/rootfiles/core/{86 => 87}/filelists/openssl (100%) rename config/rootfiles/core/{86 => 87}/filelists/openssl-compat (100%) rename config/rootfiles/core/{86 => 87}/filelists/openvpn (100%) rename config/rootfiles/core/{86 => 87}/filelists/parted (100%) rename config/rootfiles/core/{86 => 87}/filelists/patch (100%) rename config/rootfiles/core/{86 => 87}/filelists/pigz (100%) rename config/rootfiles/core/{86 => 87}/filelists/setup (100%) rename config/rootfiles/core/{86 => 87}/filelists/slang (100%) rename config/rootfiles/core/{86 => 87}/filelists/strongswan (100%) rename config/rootfiles/core/{86 => 87}/filelists/tzdata (100%) rename config/rootfiles/core/{86 => 87}/filelists/updated-firmwares (98%) rename config/rootfiles/core/{86 => 87}/filelists/wireless-regdb (100%) rename config/rootfiles/core/{86 => 87}/filelists/wpa_supplicant (100%) rename config/rootfiles/core/{86 => 87}/filelists/xfsprogs (100%) rename config/rootfiles/core/{86 => 87}/meta (100%) rename config/rootfiles/core/{86 => 87}/update.sh (85%) rename config/rootfiles/{core => oldcore}/85/exclude (100%) rename config/rootfiles/{core => oldcore}/85/filelists/files (100%) rename config/rootfiles/{core => oldcore}/85/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/85/filelists/openssl-compat (100%) rename config/rootfiles/{core => oldcore}/85/meta (100%) rename config/rootfiles/{core => oldcore}/85/update.sh (100%) delete mode 100644 src/patches/kernel/utilite/linux-3.10-compulab-utilite-support.patch create mode 100644 src/patches/linux-3.14.x-lamobo-r1-fix-sata-pwr.patch delete mode 100644 src/patches/linux-3.14.x-update_banana_dts.patch
Difference in files: diff --git a/config/lib/firmware/brcm/brcmfmac4329-sdio.txt b/config/lib/firmware/brcm/brcmfmac4329-sdio.txt deleted file mode 100644 index 3832006..0000000 --- a/config/lib/firmware/brcm/brcmfmac4329-sdio.txt +++ /dev/null @@ -1,68 +0,0 @@ -# bcm4329 NVRAM file for Wandboard Dual - -sromrev=3 -vendid=0x14e4 -devid=0x432f -boardtype=0x53e - -boardrev=0x41 - -#boardflags=0x1200 -boardflags=0x200 - -# Specify the xtalfreq if it is otherthan 38.4MHz -xtalfreq=37400 - -aa2g=3 -aa5g=0 - -ag0=255 -#tri2g=0x64 - -# 11g paparams -pa0b0=5542,5542,5542 -pa0b1=64244,64244,64244 -pa0b2=65202,65202,65202 - -pa0itssit=62 -pa0maxpwr=74 -opo=0 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 - -# 11g rssi params -rssismf2g=0xa,0xa,0xa -rssismc2g=0xb,0xb,0xb -rssisav2g=0x3,0x3,0x3 -bxa2g=0 - -# country code -ccode=ALL -cctl=0x0 -cckdigfilttype=0 -ofdmdigfilttype=1 - -rxpo2g=0 - -boardnum=1 -macaddr=DE:AD:BE:EF:00:00 - -# xtal pu and pd time control variable -# pu time is driver default (0x1501) -#r13t=0x1501 - -####### -nocrc=1 - -#for mfgc -otpimagesize=182 - -# sdio extra configs -hwhdr=0x05ffff031030031003100000 - -#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. -#RAW1=80 02 fe ff - -#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. -RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A -nvramver=4.218.214.0 diff --git a/config/lib/firmware/brcm/brcmfmac4330-sdio.txt b/config/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index c5c2611..0000000 --- a/config/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,122 +0,0 @@ -# bcm4330 NVRAM file for Wandboard Quad - -manfid=0x2d0 -prodid=0x0532 -vendid=0x14e4 -devid=0x4360 -boardtype=0x0532 -boardrev=0x20 -boardflags=0x10080201 - -nocrc=1 -xtalfreq=37400 -xtalmode=0x20,0x4,0 -boardnum=22 -macaddr=DE:AD:BE:EF:00:00 -ag0=252 -ag1=252 -aa2g=1 -aa5g=1 -ccode=EU -regrev=5 - -#for BT-coexistence -btc_params80=0 -btc_params6=10 -btc_params8=10000 - -sd_gpout=0 -# sd_oobonly=1 -muxenab=0x10 - -# 2G PA param_B42R 110927 -pa0b0=0x12E4 -pa0b1=0xFE09 -pa0b2=0xFF9A -#pa0itssit=62 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 - -# rssi params for 5GHz B42R_110803 -#rssismf5g=0x4 -rssismf5g=0xa -rssismc5g=0x7 -rssisav5g=0x1 -#PA parameters for lower band -pa1lob0=0x144F -pa1lob1=0xFD6B -pa1lob2=0xFF3B -#PA parameters for midband -pa1b0=0x139C -pa1b1=0xFD87 -pa1b2=0xFF4F -#PA parameters for high band -pa1hib0=0x12CA -pa1hib1=0xFD9A -pa1hib2=0xFF4E - -# 2G PA offset -maxp2ga0=64 -sromrev=3 -cckpo=0 -ofdm2gpo=0x66666666 -mcs2gpo0=0xaaaa -mcs2gpo1=0xaaaa - -# 5G PA offset -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -ofdm5gpo=0x22222222 -ofdm5glpo=0x11111111 -ofdm5ghpo=0x22222222 -mcs5gpo0=0x6666 -mcs5gpo1=0x6666 -mcs5glpo0=0x5555 -mcs5glpo1=0x5555 -mcs5ghpo0=0x6666 -mcs5ghpo1=0x6666 - -cckPwrOffset=4 -cckdigfilttype=22 -ofdmdigfilttype=2 -extpagain5g=2 -#wl0id=0x431b - -# For 2GHz Tx EVM/SM -rfreg033=0x19 -rfreg033_cck=0x1d -pacalidx2g=65 -dacrate2g=160 -txalpfbyp2g=1 -bphyscale=17 - -# 5GHz LOFT and IQ CAL -txgaintbl5g=1 -txiqlopapu5g=1 -txiqlopag5g=0x10 -iqlocalidx5g=24 - -# 5GHz Noise CAL parameter -noise_cal_po_5g=5 -noise_cal_enable_5g=0 - -# 2GHz RxPER at low rates -noise_cal_ref_2g=56 -noise_cal_po_bias_2g=-4 -noise_cal_enable_2g=1 - -# Max input level on a-band -triso5g=9 - -# Tx power control, especially temp. -tssitime=1 - -#fc+1.7GHz Spur Elimination -loidacmode5g=1 - -swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff -swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 - - diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 663aef5..44f24b4 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -48,8 +48,6 @@ home/nobody #lib #lib/firmware #lib/firmware/brcm -lib/firmware/brcm/brcmfmac4329-sdio.txt -lib/firmware/brcm/brcmfmac4330-sdio.txt lib/firmware/brcm/brcmfmac43362-sdio.txt #media media/cdrom diff --git a/config/rootfiles/core/85/exclude b/config/rootfiles/core/85/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/85/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/85/filelists/files b/config/rootfiles/core/85/filelists/files deleted file mode 100644 index 9cf259c..0000000 --- a/config/rootfiles/core/85/filelists/files +++ /dev/null @@ -1,4 +0,0 @@ -etc/system-release -etc/issue -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -var/ipfire/langs diff --git a/config/rootfiles/core/85/filelists/openssl b/config/rootfiles/core/85/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/85/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/85/filelists/openssl-compat b/config/rootfiles/core/85/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/85/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/85/meta b/config/rootfiles/core/85/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/85/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/85/update.sh b/config/rootfiles/core/85/update.sh deleted file mode 100644 index ec9ac63..0000000 --- a/config/rootfiles/core/85/update.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=85 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# Remove old files - -# Extract files -extract_files - -# Start services - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -sync - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/86/exclude b/config/rootfiles/core/86/exclude deleted file mode 100644 index 37c2aaa..0000000 --- a/config/rootfiles/core/86/exclude +++ /dev/null @@ -1,23 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/time -var/ipfire/ovpn/ccd.conf -var/ipfire/ovpn/ccdroute -var/ipfire/ovpn/ccdroute2 -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/86/filelists/armv5tel/initscripts b/config/rootfiles/core/86/filelists/armv5tel/initscripts deleted file mode 120000 index af1d762..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/initscripts +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-multi b/config/rootfiles/core/86/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-rpi b/config/rootfiles/core/86/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/swconfig b/config/rootfiles/core/86/filelists/armv5tel/swconfig deleted file mode 120000 index e5606ed..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/swconfig +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/swconfig \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/u-boot b/config/rootfiles/core/86/filelists/armv5tel/u-boot deleted file mode 120000 index 3df31a8..0000000 --- a/config/rootfiles/core/86/filelists/armv5tel/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/bash b/config/rootfiles/core/86/filelists/bash deleted file mode 120000 index de970cb..0000000 --- a/config/rootfiles/core/86/filelists/bash +++ /dev/null @@ -1 +0,0 @@ -../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/coreutils b/config/rootfiles/core/86/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/86/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/crda b/config/rootfiles/core/86/filelists/crda deleted file mode 120000 index d68c46e..0000000 --- a/config/rootfiles/core/86/filelists/crda +++ /dev/null @@ -1 +0,0 @@ -../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/dracut b/config/rootfiles/core/86/filelists/dracut deleted file mode 120000 index 1608699..0000000 --- a/config/rootfiles/core/86/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files deleted file mode 100644 index 5bdca35..0000000 --- a/config/rootfiles/core/86/filelists/files +++ /dev/null @@ -1,13 +0,0 @@ -etc/system-release -etc/issue -etc/modprobe.d/btmrvl_sdio.conf -etc/rc.d/init.d/collectd -etc/rc.d/init.d/leds -opt/pakfire/etc/pakfire.conf -usr/lib/firewall/rules.pl -usr/local/bin/update-bootloader -usr/local/share/GeoIP/GeoIP.dat -var/ipfire/header.pl -var/ipfire/langs -var/ipfire/lang.pl -var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/86/filelists/fireinfo b/config/rootfiles/core/86/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/86/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/glibc b/config/rootfiles/core/86/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/86/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/grub b/config/rootfiles/core/86/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/86/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/initscripts b/config/rootfiles/core/86/filelists/i586/initscripts deleted file mode 120000 index 12d8770..0000000 --- a/config/rootfiles/core/86/filelists/i586/initscripts +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/linux b/config/rootfiles/core/86/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/86/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/linux-initrd b/config/rootfiles/core/86/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6..0000000 --- a/config/rootfiles/core/86/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/iw b/config/rootfiles/core/86/filelists/iw deleted file mode 120000 index 7c58a20..0000000 --- a/config/rootfiles/core/86/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/kbd b/config/rootfiles/core/86/filelists/kbd deleted file mode 120000 index 9b85839..0000000 --- a/config/rootfiles/core/86/filelists/kbd +++ /dev/null @@ -1 +0,0 @@ -../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/libcap b/config/rootfiles/core/86/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/86/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/libsmooth b/config/rootfiles/core/86/filelists/libsmooth deleted file mode 120000 index 6164182..0000000 --- a/config/rootfiles/core/86/filelists/libsmooth +++ /dev/null @@ -1 +0,0 @@ -../../../common/libsmooth \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/lvm2 b/config/rootfiles/core/86/filelists/lvm2 deleted file mode 120000 index d640870..0000000 --- a/config/rootfiles/core/86/filelists/lvm2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/mdadm b/config/rootfiles/core/86/filelists/mdadm deleted file mode 120000 index 465808b..0000000 --- a/config/rootfiles/core/86/filelists/mdadm +++ /dev/null @@ -1 +0,0 @@ -../../../common/mdadm \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/misc-progs b/config/rootfiles/core/86/filelists/misc-progs deleted file mode 120000 index 7223cad..0000000 --- a/config/rootfiles/core/86/filelists/misc-progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/multipath-tools b/config/rootfiles/core/86/filelists/multipath-tools deleted file mode 120000 index 9ff6323..0000000 --- a/config/rootfiles/core/86/filelists/multipath-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/multipath-tools \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/newt b/config/rootfiles/core/86/filelists/newt deleted file mode 120000 index fb3eb20..0000000 --- a/config/rootfiles/core/86/filelists/newt +++ /dev/null @@ -1 +0,0 @@ -../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/ntp b/config/rootfiles/core/86/filelists/ntp deleted file mode 100644 index aacdb25..0000000 --- a/config/rootfiles/core/86/filelists/ntp +++ /dev/null @@ -1,287 +0,0 @@ -etc/ntp -etc/ntp.conf -etc/rc.d/rc0.d/K46ntpd -etc/rc.d/rc3.d/S26ntpd -etc/rc.d/rc6.d/K46ntpd -usr/bin/calc_tickadj -usr/bin/ntp-keygen -usr/bin/ntp-wait -usr/bin/ntpd -usr/bin/ntpdate -usr/bin/ntpdc -usr/bin/ntpq -usr/bin/ntptime -usr/bin/ntptrace -usr/bin/sntp -usr/bin/tickadj -#usr/include/event2 -#usr/share/doc/ntp4 -#usr/share/doc/ntp4/html -#usr/share/doc/ntp4/html/access.html -#usr/share/doc/ntp4/html/accopt.html -#usr/share/doc/ntp4/html/assoc.html -#usr/share/doc/ntp4/html/audio.html -#usr/share/doc/ntp4/html/authentic.html -#usr/share/doc/ntp4/html/authopt.html -#usr/share/doc/ntp4/html/autokey.html -#usr/share/doc/ntp4/html/bugs.html -#usr/share/doc/ntp4/html/build.html -#usr/share/doc/ntp4/html/clock.html -#usr/share/doc/ntp4/html/clockopt.html -#usr/share/doc/ntp4/html/cluster.html -#usr/share/doc/ntp4/html/comdex.html -#usr/share/doc/ntp4/html/config.html -#usr/share/doc/ntp4/html/confopt.html -#usr/share/doc/ntp4/html/copyright.html -#usr/share/doc/ntp4/html/debug.html -#usr/share/doc/ntp4/html/decode.html -#usr/share/doc/ntp4/html/discipline.html -#usr/share/doc/ntp4/html/discover.html -#usr/share/doc/ntp4/html/drivers -#usr/share/doc/ntp4/html/drivers/driver1.html -#usr/share/doc/ntp4/html/drivers/driver10.html -#usr/share/doc/ntp4/html/drivers/driver11.html -#usr/share/doc/ntp4/html/drivers/driver12.html -#usr/share/doc/ntp4/html/drivers/driver16.html -#usr/share/doc/ntp4/html/drivers/driver18.html -#usr/share/doc/ntp4/html/drivers/driver19.html -#usr/share/doc/ntp4/html/drivers/driver20.html -#usr/share/doc/ntp4/html/drivers/driver22.html -#usr/share/doc/ntp4/html/drivers/driver26.html -#usr/share/doc/ntp4/html/drivers/driver27.html -#usr/share/doc/ntp4/html/drivers/driver28.html -#usr/share/doc/ntp4/html/drivers/driver29.html -#usr/share/doc/ntp4/html/drivers/driver3.html -#usr/share/doc/ntp4/html/drivers/driver30.html -#usr/share/doc/ntp4/html/drivers/driver31.html -#usr/share/doc/ntp4/html/drivers/driver32.html -#usr/share/doc/ntp4/html/drivers/driver33.html -#usr/share/doc/ntp4/html/drivers/driver34.html -#usr/share/doc/ntp4/html/drivers/driver35.html -#usr/share/doc/ntp4/html/drivers/driver36.html -#usr/share/doc/ntp4/html/drivers/driver37.html -#usr/share/doc/ntp4/html/drivers/driver38.html -#usr/share/doc/ntp4/html/drivers/driver39.html -#usr/share/doc/ntp4/html/drivers/driver4.html -#usr/share/doc/ntp4/html/drivers/driver40.html -#usr/share/doc/ntp4/html/drivers/driver42.html -#usr/share/doc/ntp4/html/drivers/driver43.html -#usr/share/doc/ntp4/html/drivers/driver44.html -#usr/share/doc/ntp4/html/drivers/driver45.html -#usr/share/doc/ntp4/html/drivers/driver46.html -#usr/share/doc/ntp4/html/drivers/driver5.html -#usr/share/doc/ntp4/html/drivers/driver6.html -#usr/share/doc/ntp4/html/drivers/driver7.html -#usr/share/doc/ntp4/html/drivers/driver8.html -#usr/share/doc/ntp4/html/drivers/driver9.html -#usr/share/doc/ntp4/html/drivers/icons -#usr/share/doc/ntp4/html/drivers/icons/home.gif -#usr/share/doc/ntp4/html/drivers/icons/mail2.gif -#usr/share/doc/ntp4/html/drivers/mx4200data.html -#usr/share/doc/ntp4/html/drivers/oncore-shmem.html -#usr/share/doc/ntp4/html/drivers/scripts -#usr/share/doc/ntp4/html/drivers/scripts/footer.txt -#usr/share/doc/ntp4/html/drivers/scripts/style.css -#usr/share/doc/ntp4/html/drivers/tf582_4.html -#usr/share/doc/ntp4/html/extern.html -#usr/share/doc/ntp4/html/filter.html -#usr/share/doc/ntp4/html/hints -#usr/share/doc/ntp4/html/hints.html -#usr/share/doc/ntp4/html/hints/a-ux -#usr/share/doc/ntp4/html/hints/aix -#usr/share/doc/ntp4/html/hints/bsdi -#usr/share/doc/ntp4/html/hints/changes -#usr/share/doc/ntp4/html/hints/decosf1 -#usr/share/doc/ntp4/html/hints/decosf2 -#usr/share/doc/ntp4/html/hints/freebsd -#usr/share/doc/ntp4/html/hints/hpux -#usr/share/doc/ntp4/html/hints/linux -#usr/share/doc/ntp4/html/hints/mpeix -#usr/share/doc/ntp4/html/hints/notes-xntp-v3 -#usr/share/doc/ntp4/html/hints/parse -#usr/share/doc/ntp4/html/hints/refclocks -#usr/share/doc/ntp4/html/hints/rs6000 -#usr/share/doc/ntp4/html/hints/sco.html -#usr/share/doc/ntp4/html/hints/sgi -#usr/share/doc/ntp4/html/hints/solaris-dosynctodr.html -#usr/share/doc/ntp4/html/hints/solaris.html -#usr/share/doc/ntp4/html/hints/solaris.xtra.4023118 -#usr/share/doc/ntp4/html/hints/solaris.xtra.4095849 -#usr/share/doc/ntp4/html/hints/solaris.xtra.S99ntpd -#usr/share/doc/ntp4/html/hints/solaris.xtra.patchfreq -#usr/share/doc/ntp4/html/hints/sun4 -#usr/share/doc/ntp4/html/hints/svr4-dell -#usr/share/doc/ntp4/html/hints/svr4_package -#usr/share/doc/ntp4/html/hints/todo -#usr/share/doc/ntp4/html/hints/vxworks.html -#usr/share/doc/ntp4/html/hints/winnt.html -#usr/share/doc/ntp4/html/history.html -#usr/share/doc/ntp4/html/howto.html -#usr/share/doc/ntp4/html/huffpuff.html -#usr/share/doc/ntp4/html/icons -#usr/share/doc/ntp4/html/icons/home.gif -#usr/share/doc/ntp4/html/icons/mail2.gif -#usr/share/doc/ntp4/html/icons/sitemap.png -#usr/share/doc/ntp4/html/index.html -#usr/share/doc/ntp4/html/kern.html -#usr/share/doc/ntp4/html/kernpps.html -#usr/share/doc/ntp4/html/keygen.html -#usr/share/doc/ntp4/html/leap.html -#usr/share/doc/ntp4/html/miscopt.html -#usr/share/doc/ntp4/html/monopt.html -#usr/share/doc/ntp4/html/msyslog.html -#usr/share/doc/ntp4/html/ntp-wait.html -#usr/share/doc/ntp4/html/ntp_conf.html -#usr/share/doc/ntp4/html/ntpd.html -#usr/share/doc/ntp4/html/ntpdate.html -#usr/share/doc/ntp4/html/ntpdc.html -#usr/share/doc/ntp4/html/ntpdsim.html -#usr/share/doc/ntp4/html/ntpdsim_new.html -#usr/share/doc/ntp4/html/ntpq.html -#usr/share/doc/ntp4/html/ntptime.html -#usr/share/doc/ntp4/html/ntptrace.html -#usr/share/doc/ntp4/html/orphan.html -#usr/share/doc/ntp4/html/parsedata.html -#usr/share/doc/ntp4/html/parsenew.html -#usr/share/doc/ntp4/html/pic -#usr/share/doc/ntp4/html/pic/9400n.jpg -#usr/share/doc/ntp4/html/pic/alice11.gif -#usr/share/doc/ntp4/html/pic/alice13.gif -#usr/share/doc/ntp4/html/pic/alice15.gif -#usr/share/doc/ntp4/html/pic/alice23.gif -#usr/share/doc/ntp4/html/pic/alice31.gif -#usr/share/doc/ntp4/html/pic/alice32.gif -#usr/share/doc/ntp4/html/pic/alice35.gif -#usr/share/doc/ntp4/html/pic/alice38.gif -#usr/share/doc/ntp4/html/pic/alice44.gif -#usr/share/doc/ntp4/html/pic/alice47.gif -#usr/share/doc/ntp4/html/pic/alice51.gif -#usr/share/doc/ntp4/html/pic/alice61.gif -#usr/share/doc/ntp4/html/pic/barnstable.gif -#usr/share/doc/ntp4/html/pic/beaver.gif -#usr/share/doc/ntp4/html/pic/boom3.gif -#usr/share/doc/ntp4/html/pic/boom3a.gif -#usr/share/doc/ntp4/html/pic/boom4.gif -#usr/share/doc/ntp4/html/pic/broad.gif -#usr/share/doc/ntp4/html/pic/bustardfly.gif -#usr/share/doc/ntp4/html/pic/c51.jpg -#usr/share/doc/ntp4/html/pic/description.jpg -#usr/share/doc/ntp4/html/pic/discipline.gif -#usr/share/doc/ntp4/html/pic/dogsnake.gif -#usr/share/doc/ntp4/html/pic/driver29.gif -#usr/share/doc/ntp4/html/pic/driver43_1.gif -#usr/share/doc/ntp4/html/pic/driver43_2.jpg -#usr/share/doc/ntp4/html/pic/fg6021.gif -#usr/share/doc/ntp4/html/pic/fg6039.jpg -#usr/share/doc/ntp4/html/pic/fig_3_1.gif -#usr/share/doc/ntp4/html/pic/flatheads.gif -#usr/share/doc/ntp4/html/pic/flt1.gif -#usr/share/doc/ntp4/html/pic/flt2.gif -#usr/share/doc/ntp4/html/pic/flt3.gif -#usr/share/doc/ntp4/html/pic/flt4.gif -#usr/share/doc/ntp4/html/pic/flt5.gif -#usr/share/doc/ntp4/html/pic/flt6.gif -#usr/share/doc/ntp4/html/pic/flt7.gif -#usr/share/doc/ntp4/html/pic/flt8.gif -#usr/share/doc/ntp4/html/pic/flt9.gif -#usr/share/doc/ntp4/html/pic/freq1211.gif -#usr/share/doc/ntp4/html/pic/gadget.jpg -#usr/share/doc/ntp4/html/pic/gps167.jpg -#usr/share/doc/ntp4/html/pic/group.gif -#usr/share/doc/ntp4/html/pic/hornraba.gif -#usr/share/doc/ntp4/html/pic/igclock.gif -#usr/share/doc/ntp4/html/pic/neoclock4x.gif -#usr/share/doc/ntp4/html/pic/offset1211.gif -#usr/share/doc/ntp4/html/pic/oncore_evalbig.gif -#usr/share/doc/ntp4/html/pic/oncore_remoteant.jpg -#usr/share/doc/ntp4/html/pic/oncore_utplusbig.gif -#usr/share/doc/ntp4/html/pic/oz2.gif -#usr/share/doc/ntp4/html/pic/panda.gif -#usr/share/doc/ntp4/html/pic/pd_om006.gif -#usr/share/doc/ntp4/html/pic/pd_om011.gif -#usr/share/doc/ntp4/html/pic/peer.gif -#usr/share/doc/ntp4/html/pic/pogo.gif -#usr/share/doc/ntp4/html/pic/pogo1a.gif -#usr/share/doc/ntp4/html/pic/pogo3a.gif -#usr/share/doc/ntp4/html/pic/pogo4.gif -#usr/share/doc/ntp4/html/pic/pogo5.gif -#usr/share/doc/ntp4/html/pic/pogo6.gif -#usr/share/doc/ntp4/html/pic/pogo7.gif -#usr/share/doc/ntp4/html/pic/pogo8.gif -#usr/share/doc/ntp4/html/pic/pzf509.jpg -#usr/share/doc/ntp4/html/pic/pzf511.jpg -#usr/share/doc/ntp4/html/pic/rabbit.gif -#usr/share/doc/ntp4/html/pic/radio2.jpg -#usr/share/doc/ntp4/html/pic/sheepb.jpg -#usr/share/doc/ntp4/html/pic/stack1a.jpg -#usr/share/doc/ntp4/html/pic/stats.gif -#usr/share/doc/ntp4/html/pic/sx5.gif -#usr/share/doc/ntp4/html/pic/thunderbolt.jpg -#usr/share/doc/ntp4/html/pic/time1.gif -#usr/share/doc/ntp4/html/pic/tonea.gif -#usr/share/doc/ntp4/html/pic/tribeb.gif -#usr/share/doc/ntp4/html/pic/wingdorothy.gif -#usr/share/doc/ntp4/html/poll.html -#usr/share/doc/ntp4/html/pps.html -#usr/share/doc/ntp4/html/prefer.html -#usr/share/doc/ntp4/html/quick.html -#usr/share/doc/ntp4/html/rate.html -#usr/share/doc/ntp4/html/rdebug.html -#usr/share/doc/ntp4/html/refclock.html -#usr/share/doc/ntp4/html/release.html -#usr/share/doc/ntp4/html/scripts -#usr/share/doc/ntp4/html/scripts/accopt.txt -#usr/share/doc/ntp4/html/scripts/audio.txt -#usr/share/doc/ntp4/html/scripts/authopt.txt -#usr/share/doc/ntp4/html/scripts/clockopt.txt -#usr/share/doc/ntp4/html/scripts/command.txt -#usr/share/doc/ntp4/html/scripts/config.txt -#usr/share/doc/ntp4/html/scripts/confopt.txt -#usr/share/doc/ntp4/html/scripts/external.txt -#usr/share/doc/ntp4/html/scripts/footer.txt -#usr/share/doc/ntp4/html/scripts/hand.txt -#usr/share/doc/ntp4/html/scripts/install.txt -#usr/share/doc/ntp4/html/scripts/manual.txt -#usr/share/doc/ntp4/html/scripts/misc.txt -#usr/share/doc/ntp4/html/scripts/miscopt.txt -#usr/share/doc/ntp4/html/scripts/monopt.txt -#usr/share/doc/ntp4/html/scripts/refclock.txt -#usr/share/doc/ntp4/html/scripts/special.txt -#usr/share/doc/ntp4/html/scripts/style.css -#usr/share/doc/ntp4/html/select.html -#usr/share/doc/ntp4/html/sitemap.html -#usr/share/doc/ntp4/html/sntp.html -#usr/share/doc/ntp4/html/stats.html -#usr/share/doc/ntp4/html/tickadj.html -#usr/share/doc/ntp4/html/warp.html -#usr/share/doc/ntp4/html/xleave.html -#usr/share/doc/ntp4/ntp-keygen.html -#usr/share/doc/ntp4/ntp-wait.html -#usr/share/doc/ntp4/ntp.conf.html -#usr/share/doc/ntp4/ntp.keys.html -#usr/share/doc/ntp4/ntpd.html -#usr/share/doc/ntp4/ntpdc.html -#usr/share/doc/ntp4/ntpq.html -#usr/share/doc/ntp4/ntpsnmpd.html -#usr/share/doc/ntp4/ntpsweep.html -#usr/share/doc/ntp4/ntptrace.html -#usr/share/doc/sntp -#usr/share/doc/sntp/sntp.html -#usr/share/man/man1/calc_tickadj.1 -#usr/share/man/man1/ntp-keygen.1 -#usr/share/man/man1/ntp-wait.1 -#usr/share/man/man1/ntpd.1 -#usr/share/man/man1/ntpdc.1 -#usr/share/man/man1/ntpq.1 -#usr/share/man/man1/ntptrace.1 -#usr/share/man/man1/sntp.1 -#usr/share/man/man5/ntp.conf.5 -#usr/share/man/man5/ntp.keys.5 -#usr/share/ntp -#usr/share/ntp/lib -#usr/share/ntp/lib/NTP -#usr/share/ntp/lib/NTP/Util.pm -var/ipfire/time/counter.conf -var/ipfire/time/enable -var/ipfire/time/settime.conf -var/ipfire/time/settings diff --git a/config/rootfiles/core/86/filelists/openssl b/config/rootfiles/core/86/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/86/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/openssl-compat b/config/rootfiles/core/86/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/86/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/openvpn b/config/rootfiles/core/86/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/86/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/parted b/config/rootfiles/core/86/filelists/parted deleted file mode 120000 index 89195d8..0000000 --- a/config/rootfiles/core/86/filelists/parted +++ /dev/null @@ -1 +0,0 @@ -../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/patch b/config/rootfiles/core/86/filelists/patch deleted file mode 120000 index 27a3825..0000000 --- a/config/rootfiles/core/86/filelists/patch +++ /dev/null @@ -1 +0,0 @@ -../../../common/patch \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/pigz b/config/rootfiles/core/86/filelists/pigz deleted file mode 120000 index 696f8f8..0000000 --- a/config/rootfiles/core/86/filelists/pigz +++ /dev/null @@ -1 +0,0 @@ -../../../common/pigz \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/setup b/config/rootfiles/core/86/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/86/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/slang b/config/rootfiles/core/86/filelists/slang deleted file mode 120000 index 228e45e..0000000 --- a/config/rootfiles/core/86/filelists/slang +++ /dev/null @@ -1 +0,0 @@ -../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/strongswan b/config/rootfiles/core/86/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/86/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/tzdata b/config/rootfiles/core/86/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/86/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/updated-firmwares b/config/rootfiles/core/86/filelists/updated-firmwares deleted file mode 100644 index f923b15..0000000 --- a/config/rootfiles/core/86/filelists/updated-firmwares +++ /dev/null @@ -1,205 +0,0 @@ -lib/firmware/amd-ucode/microcode_amd_fam15h.bin -lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc -lib/firmware/amd-ucode/microcode_amd_fam16h.bin -lib/firmware/amd-ucode/microcode_amd_fam16h.bin.asc -lib/firmware/as102_data1_st.hex -lib/firmware/as102_data2_st.hex -lib/firmware/bnx2x/bnx2x-e1-7.10.51.0.fw -lib/firmware/bnx2x/bnx2x-e1-7.8.19.0.fw -lib/firmware/bnx2x/bnx2x-e1h-7.10.51.0.fw -lib/firmware/bnx2x/bnx2x-e1h-7.8.19.0.fw -lib/firmware/bnx2x/bnx2x-e2-7.10.51.0.fw -lib/firmware/bnx2x/bnx2x-e2-7.8.19.0.fw -lib/firmware/brcm/brcmfmac43143.bin -lib/firmware/brcm/brcmfmac43143-sdio.bin -lib/firmware/brcm/brcmfmac43362-sdio.bin -lib/firmware/brcm/brcmfmac4354-sdio.bin -lib/firmware/cmmb_vega_12mhz.inp -lib/firmware/cmmb_venice_12mhz.inp -lib/firmware/cxgb4/t4fw-1.12.25.0.bin -lib/firmware/cxgb4/t4fw.bin -lib/firmware/cxgb4/t5fw-1.12.25.0.bin -lib/firmware/cxgb4/t5fw.bin -lib/firmware/dvb-fe-drxj-mc-1.0.8.fw -lib/firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw -lib/firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw -lib/firmware/dvb-fe-xc4000-1.4.1.fw -lib/firmware/dvb-fe-xc5000c-4.1.30.7.fw -lib/firmware/dvb_nova_12mhz_b0.inp -lib/firmware/dvb_nova_12mhz.inp -lib/firmware/dvb-usb-it9135-01.fw -lib/firmware/dvb-usb-it9135-02.fw -lib/firmware/emi62/bitstream.fw -lib/firmware/intel/fw_sst_0f28.bin -lib/firmware/intel/fw_sst_0f28.bin-48kHz_i2s_master -lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq -lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq -lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq -lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq -lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq -lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq -lib/firmware/intel/ibt-hw-37.8.bseq -lib/firmware/intel/IntcSST2.bin -lib/firmware/isdbt_nova_12mhz_b0.inp -lib/firmware/isdbt_nova_12mhz.inp -lib/firmware/isdbt_rio.inp -lib/firmware/iwlwifi-3160-10.ucode -lib/firmware/iwlwifi-3160-8.ucode -lib/firmware/iwlwifi-3160-9.ucode -lib/firmware/iwlwifi-7260-10.ucode -lib/firmware/iwlwifi-7260-8.ucode -lib/firmware/iwlwifi-7260-9.ucode -lib/firmware/iwlwifi-7265-10.ucode -lib/firmware/iwlwifi-7265-8.ucode -lib/firmware/iwlwifi-7265-9.ucode -lib/firmware/iwlwifi-7265D-10.ucode -lib/firmware/LICENCE.Abilis -lib/firmware/LICENCE.chelsio_firmware -lib/firmware/LICENCE.fw_sst_0f28 -lib/firmware/LICENCE.ibt_firmware -lib/firmware/LICENCE.IntcSST2 -lib/firmware/LICENCE.it913x -lib/firmware/LICENCE.iwlwifi_firmware -lib/firmware/LICENCE.qat_dh895xcc_firmware -lib/firmware/LICENCE.r8a779x_usb3 -lib/firmware/LICENCE.siano -lib/firmware/LICENCE.xc4000 -lib/firmware/LICENCE.xc5000c -lib/firmware/LICENSE.amd-ucode -lib/firmware/LICENSE.radeon -lib/firmware/myri10ge_eth_big_z8e.dat -lib/firmware/myri10ge_ethp_big_z8e.dat -lib/firmware/myri10ge_ethp_z8e.dat -lib/firmware/myri10ge_eth_z8e.dat -lib/firmware/myri10ge_rss_eth_big_z8e.dat -lib/firmware/myri10ge_rss_ethp_big_z8e.dat -lib/firmware/myri10ge_rss_ethp_z8e.dat -lib/firmware/myri10ge_rss_eth_z8e.dat -lib/firmware/qat_895xcc.bin -lib/firmware/ql2400_fw.bin -lib/firmware/ql2500_fw.bin -lib/firmware/r8a779x_usb3_v1.dlmem -lib/firmware/radeon/bonaire_ce.bin -lib/firmware/radeon/BONAIRE_mc2.bin -lib/firmware/radeon/bonaire_mc.bin -lib/firmware/radeon/bonaire_me.bin -lib/firmware/radeon/bonaire_mec.bin -lib/firmware/radeon/bonaire_pfp.bin -lib/firmware/radeon/bonaire_rlc.bin -lib/firmware/radeon/bonaire_sdma.bin -lib/firmware/radeon/bonaire_smc.bin -lib/firmware/radeon/BONAIRE_vce.bin -lib/firmware/radeon/hainan_ce.bin -lib/firmware/radeon/HAINAN_mc2.bin -lib/firmware/radeon/hainan_mc.bin -lib/firmware/radeon/hainan_me.bin -lib/firmware/radeon/hainan_pfp.bin -lib/firmware/radeon/hainan_rlc.bin -lib/firmware/radeon/hainan_smc.bin -lib/firmware/radeon/hawaii_ce.bin -lib/firmware/radeon/HAWAII_ce.bin -lib/firmware/radeon/HAWAII_mc2.bin -lib/firmware/radeon/hawaii_mc.bin -lib/firmware/radeon/HAWAII_mc.bin -lib/firmware/radeon/hawaii_me.bin -lib/firmware/radeon/HAWAII_me.bin -lib/firmware/radeon/hawaii_mec.bin -lib/firmware/radeon/HAWAII_mec.bin -lib/firmware/radeon/hawaii_pfp.bin -lib/firmware/radeon/HAWAII_pfp.bin -lib/firmware/radeon/hawaii_rlc.bin -lib/firmware/radeon/HAWAII_rlc.bin -lib/firmware/radeon/hawaii_sdma.bin -lib/firmware/radeon/HAWAII_sdma.bin -lib/firmware/radeon/hawaii_smc.bin -lib/firmware/radeon/HAWAII_smc.bin -lib/firmware/radeon/kabini_ce.bin -lib/firmware/radeon/kabini_me.bin -lib/firmware/radeon/kabini_mec.bin -lib/firmware/radeon/kabini_pfp.bin -lib/firmware/radeon/kabini_rlc.bin -lib/firmware/radeon/kabini_sdma.bin -lib/firmware/radeon/kaveri_ce.bin -lib/firmware/radeon/kaveri_me.bin -lib/firmware/radeon/kaveri_mec2.bin -lib/firmware/radeon/kaveri_mec.bin -lib/firmware/radeon/kaveri_pfp.bin -lib/firmware/radeon/kaveri_rlc.bin -lib/firmware/radeon/kaveri_sdma.bin -lib/firmware/radeon/mullins_ce.bin -lib/firmware/radeon/MULLINS_ce.bin -lib/firmware/radeon/mullins_me.bin -lib/firmware/radeon/MULLINS_me.bin -lib/firmware/radeon/mullins_mec.bin -lib/firmware/radeon/MULLINS_mec.bin -lib/firmware/radeon/mullins_pfp.bin -lib/firmware/radeon/MULLINS_pfp.bin -lib/firmware/radeon/mullins_rlc.bin -lib/firmware/radeon/MULLINS_rlc.bin -lib/firmware/radeon/mullins_sdma.bin -lib/firmware/radeon/MULLINS_sdma.bin -lib/firmware/radeon/oland_ce.bin -lib/firmware/radeon/OLAND_mc2.bin -lib/firmware/radeon/oland_mc.bin -lib/firmware/radeon/oland_me.bin -lib/firmware/radeon/oland_pfp.bin -lib/firmware/radeon/oland_rlc.bin -lib/firmware/radeon/oland_smc.bin -lib/firmware/radeon/pitcairn_ce.bin -lib/firmware/radeon/PITCAIRN_mc2.bin -lib/firmware/radeon/pitcairn_mc.bin -lib/firmware/radeon/pitcairn_me.bin -lib/firmware/radeon/pitcairn_pfp.bin -lib/firmware/radeon/pitcairn_rlc.bin -lib/firmware/radeon/pitcairn_smc.bin -lib/firmware/radeon/R600_uvd.bin -lib/firmware/radeon/RS780_uvd.bin -lib/firmware/radeon/RV770_uvd.bin -lib/firmware/radeon/tahiti_ce.bin -lib/firmware/radeon/TAHITI_mc2.bin -lib/firmware/radeon/tahiti_mc.bin -lib/firmware/radeon/tahiti_me.bin -lib/firmware/radeon/tahiti_pfp.bin -lib/firmware/radeon/tahiti_rlc.bin -lib/firmware/radeon/tahiti_smc.bin -lib/firmware/radeon/verde_ce.bin -lib/firmware/radeon/VERDE_mc2.bin -lib/firmware/radeon/verde_mc.bin -lib/firmware/radeon/verde_me.bin -lib/firmware/radeon/verde_pfp.bin -lib/firmware/radeon/verde_rlc.bin -lib/firmware/radeon/verde_smc.bin -lib/firmware/README -lib/firmware/rsi_91x.fw -lib/firmware/rtl_nic/rtl8107e-1.fw -lib/firmware/rtl_nic/rtl8107e-2.fw -lib/firmware/rtl_nic/rtl8168h-1.fw -lib/firmware/rtl_nic/rtl8168h-2.fw -lib/firmware/rtlwifi/rtl8192cfw.bin -lib/firmware/rtlwifi/rtl8192cfwU_B.bin -lib/firmware/rtlwifi/rtl8192defw.bin -lib/firmware/rtlwifi/rtl8192eefw.bin -lib/firmware/rtlwifi/rtl8723aufw_A.bin -lib/firmware/rtlwifi/rtl8723aufw_B.bin -lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin -lib/firmware/rtlwifi/rtl8723befw.bin -lib/firmware/rtlwifi/rtl8821aefw.bin -lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin -lib/firmware/s5p-mfc.fw -lib/firmware/s5p-mfc-v6.fw -lib/firmware/s5p-mfc-v6-v2.fw -lib/firmware/s5p-mfc-v7.fw -lib/firmware/s5p-mfc-v8.fw -lib/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw -lib/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw -lib/firmware/sms1xxx-nova-a-dvbt-01.fw -lib/firmware/sms1xxx-nova-b-dvbt-01.fw -lib/firmware/sms1xxx-stellar-dvbt-01.fw -lib/firmware/tdmb_nova_12mhz.inp -lib/firmware/ti-connectivity/wl18xx-fw-3.bin -lib/firmware/ti-connectivity/wl18xx-fw-4.bin -lib/firmware/v4l-cx23885-enc-broken.fw -lib/firmware/WHENCE -lib/firmware/brcm/brcmfmac4329-sdio.txt -lib/firmware/brcm/brcmfmac4330-sdio.txt -lib/firmware/brcm/brcmfmac43362-sdio.txt diff --git a/config/rootfiles/core/86/filelists/wireless-regdb b/config/rootfiles/core/86/filelists/wireless-regdb deleted file mode 120000 index c9205b3..0000000 --- a/config/rootfiles/core/86/filelists/wireless-regdb +++ /dev/null @@ -1 +0,0 @@ -../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/wpa_supplicant b/config/rootfiles/core/86/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/86/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/xfsprogs b/config/rootfiles/core/86/filelists/xfsprogs deleted file mode 120000 index 9103296..0000000 --- a/config/rootfiles/core/86/filelists/xfsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/xfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/86/meta b/config/rootfiles/core/86/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/86/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/update.sh deleted file mode 100644 index ab72e68..0000000 --- a/config/rootfiles/core/86/update.sh +++ /dev/null @@ -1,245 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# -# Remove old core updates from pakfire cache to save space... -core=86 -for (( i=1; i<=${core}; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - i?86) - # Backup old grub config - if [ -f /boot/grub/grub.conf ]; then - cp -vf /boot/grub/grub.conf /boot/old-grub-config - fi - if [ -f /boot/grub/menu.lst ]; then - cp -vf /boot/grub/menu.lst /boot/old-grub-config - fi - if [ -f /boot/grub/grub.cfg ]; then - cp -vf /boot/grub/grub.cfg /boot/old-grub-config - fi - - # Remove all files that belong to GRUB-legacy - rm -rfv /boot/grub - ;; - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - ;; -esac - -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# -#restart init because glibc was updated. -telinit u - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Add nobody to group dialout -usermod -a -G dialout nobody - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -case "$(uname -m)" in - i?86) - # - # Update to GRUB2 - # - echo - echo Update grub configuration ... - if grep -qE "^serial" /boot/old-grub-config; then - sed -i /etc/default/grub \ - -e "s|panic=10|& console=ttyS0,115200n8|g" - echo "GRUB_TERMINAL="serial"" >> /etc/default/grub - echo "GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200"" >> /etc/default/grub - fi - - if ! /usr/local/bin/update-bootloader; then - logger -p syslog.emerg -t ipfire \ - "Could not update the bootloader!" - fi - ;; -esac - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae - fi -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -# Update Package list for addon installation -/opt/pakfire/pakfire update -y --force - -echo -echo Please wait until pakfire has ended... -echo - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/87/exclude b/config/rootfiles/core/87/exclude new file mode 100644 index 0000000..5be5371 --- /dev/null +++ b/config/rootfiles/core/87/exclude @@ -0,0 +1,26 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/time +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/87/filelists/armv5tel/glibc b/config/rootfiles/core/87/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/initscripts b/config/rootfiles/core/87/filelists/armv5tel/initscripts new file mode 120000 index 0000000..af1d762 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/initscripts @@ -0,0 +1 @@ +../../../../common/armv5tel/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/87/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/linux-multi b/config/rootfiles/core/87/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/linux-rpi b/config/rootfiles/core/87/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/swconfig b/config/rootfiles/core/87/filelists/armv5tel/swconfig new file mode 120000 index 0000000..e5606ed --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/swconfig @@ -0,0 +1 @@ +../../../../common/armv5tel/swconfig \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/armv5tel/u-boot b/config/rootfiles/core/87/filelists/armv5tel/u-boot new file mode 120000 index 0000000..3df31a8 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/bash b/config/rootfiles/core/87/filelists/bash new file mode 120000 index 0000000..de970cb --- /dev/null +++ b/config/rootfiles/core/87/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/coreutils b/config/rootfiles/core/87/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/core/87/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/crda b/config/rootfiles/core/87/filelists/crda new file mode 120000 index 0000000..d68c46e --- /dev/null +++ b/config/rootfiles/core/87/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/dracut b/config/rootfiles/core/87/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/core/87/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/files b/config/rootfiles/core/87/filelists/files new file mode 100644 index 0000000..f0c3708 --- /dev/null +++ b/config/rootfiles/core/87/filelists/files @@ -0,0 +1,14 @@ +etc/system-release +etc/issue +etc/modprobe.d/btmrvl_sdio.conf +etc/rc.d/init.d/collectd +etc/rc.d/init.d/leds +opt/pakfire/etc/pakfire.conf +usr/lib/firewall/rules.pl +usr/local/bin/backupiso +usr/local/bin/update-bootloader +usr/local/share/GeoIP/GeoIP.dat +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/87/filelists/fireinfo b/config/rootfiles/core/87/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/87/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/hwdata b/config/rootfiles/core/87/filelists/hwdata new file mode 120000 index 0000000..ced9116 --- /dev/null +++ b/config/rootfiles/core/87/filelists/hwdata @@ -0,0 +1 @@ +../../../common/hwdata \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/i586/glibc b/config/rootfiles/core/87/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/87/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/i586/grub b/config/rootfiles/core/87/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/core/87/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/i586/initscripts b/config/rootfiles/core/87/filelists/i586/initscripts new file mode 120000 index 0000000..12d8770 --- /dev/null +++ b/config/rootfiles/core/87/filelists/i586/initscripts @@ -0,0 +1 @@ +../../../../common/i586/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/i586/linux b/config/rootfiles/core/87/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/87/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/i586/linux-initrd b/config/rootfiles/core/87/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/core/87/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/iw b/config/rootfiles/core/87/filelists/iw new file mode 120000 index 0000000..7c58a20 --- /dev/null +++ b/config/rootfiles/core/87/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/kbd b/config/rootfiles/core/87/filelists/kbd new file mode 120000 index 0000000..9b85839 --- /dev/null +++ b/config/rootfiles/core/87/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/libcap b/config/rootfiles/core/87/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/core/87/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/libsmooth b/config/rootfiles/core/87/filelists/libsmooth new file mode 120000 index 0000000..6164182 --- /dev/null +++ b/config/rootfiles/core/87/filelists/libsmooth @@ -0,0 +1 @@ +../../../common/libsmooth \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/lvm2 b/config/rootfiles/core/87/filelists/lvm2 new file mode 120000 index 0000000..d640870 --- /dev/null +++ b/config/rootfiles/core/87/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/mdadm b/config/rootfiles/core/87/filelists/mdadm new file mode 120000 index 0000000..465808b --- /dev/null +++ b/config/rootfiles/core/87/filelists/mdadm @@ -0,0 +1 @@ +../../../common/mdadm \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/misc-progs b/config/rootfiles/core/87/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/core/87/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/multipath-tools b/config/rootfiles/core/87/filelists/multipath-tools new file mode 120000 index 0000000..9ff6323 --- /dev/null +++ b/config/rootfiles/core/87/filelists/multipath-tools @@ -0,0 +1 @@ +../../../common/multipath-tools \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/newt b/config/rootfiles/core/87/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/core/87/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/ntp b/config/rootfiles/core/87/filelists/ntp new file mode 100644 index 0000000..aacdb25 --- /dev/null +++ b/config/rootfiles/core/87/filelists/ntp @@ -0,0 +1,287 @@ +etc/ntp +etc/ntp.conf +etc/rc.d/rc0.d/K46ntpd +etc/rc.d/rc3.d/S26ntpd +etc/rc.d/rc6.d/K46ntpd +usr/bin/calc_tickadj +usr/bin/ntp-keygen +usr/bin/ntp-wait +usr/bin/ntpd +usr/bin/ntpdate +usr/bin/ntpdc +usr/bin/ntpq +usr/bin/ntptime +usr/bin/ntptrace +usr/bin/sntp +usr/bin/tickadj +#usr/include/event2 +#usr/share/doc/ntp4 +#usr/share/doc/ntp4/html +#usr/share/doc/ntp4/html/access.html +#usr/share/doc/ntp4/html/accopt.html +#usr/share/doc/ntp4/html/assoc.html +#usr/share/doc/ntp4/html/audio.html +#usr/share/doc/ntp4/html/authentic.html +#usr/share/doc/ntp4/html/authopt.html +#usr/share/doc/ntp4/html/autokey.html +#usr/share/doc/ntp4/html/bugs.html +#usr/share/doc/ntp4/html/build.html +#usr/share/doc/ntp4/html/clock.html +#usr/share/doc/ntp4/html/clockopt.html +#usr/share/doc/ntp4/html/cluster.html +#usr/share/doc/ntp4/html/comdex.html +#usr/share/doc/ntp4/html/config.html +#usr/share/doc/ntp4/html/confopt.html +#usr/share/doc/ntp4/html/copyright.html +#usr/share/doc/ntp4/html/debug.html +#usr/share/doc/ntp4/html/decode.html +#usr/share/doc/ntp4/html/discipline.html +#usr/share/doc/ntp4/html/discover.html +#usr/share/doc/ntp4/html/drivers +#usr/share/doc/ntp4/html/drivers/driver1.html +#usr/share/doc/ntp4/html/drivers/driver10.html +#usr/share/doc/ntp4/html/drivers/driver11.html +#usr/share/doc/ntp4/html/drivers/driver12.html +#usr/share/doc/ntp4/html/drivers/driver16.html +#usr/share/doc/ntp4/html/drivers/driver18.html +#usr/share/doc/ntp4/html/drivers/driver19.html +#usr/share/doc/ntp4/html/drivers/driver20.html +#usr/share/doc/ntp4/html/drivers/driver22.html +#usr/share/doc/ntp4/html/drivers/driver26.html +#usr/share/doc/ntp4/html/drivers/driver27.html +#usr/share/doc/ntp4/html/drivers/driver28.html +#usr/share/doc/ntp4/html/drivers/driver29.html +#usr/share/doc/ntp4/html/drivers/driver3.html +#usr/share/doc/ntp4/html/drivers/driver30.html +#usr/share/doc/ntp4/html/drivers/driver31.html +#usr/share/doc/ntp4/html/drivers/driver32.html +#usr/share/doc/ntp4/html/drivers/driver33.html +#usr/share/doc/ntp4/html/drivers/driver34.html +#usr/share/doc/ntp4/html/drivers/driver35.html +#usr/share/doc/ntp4/html/drivers/driver36.html +#usr/share/doc/ntp4/html/drivers/driver37.html +#usr/share/doc/ntp4/html/drivers/driver38.html +#usr/share/doc/ntp4/html/drivers/driver39.html +#usr/share/doc/ntp4/html/drivers/driver4.html +#usr/share/doc/ntp4/html/drivers/driver40.html +#usr/share/doc/ntp4/html/drivers/driver42.html +#usr/share/doc/ntp4/html/drivers/driver43.html +#usr/share/doc/ntp4/html/drivers/driver44.html +#usr/share/doc/ntp4/html/drivers/driver45.html +#usr/share/doc/ntp4/html/drivers/driver46.html +#usr/share/doc/ntp4/html/drivers/driver5.html +#usr/share/doc/ntp4/html/drivers/driver6.html +#usr/share/doc/ntp4/html/drivers/driver7.html +#usr/share/doc/ntp4/html/drivers/driver8.html +#usr/share/doc/ntp4/html/drivers/driver9.html +#usr/share/doc/ntp4/html/drivers/icons +#usr/share/doc/ntp4/html/drivers/icons/home.gif +#usr/share/doc/ntp4/html/drivers/icons/mail2.gif +#usr/share/doc/ntp4/html/drivers/mx4200data.html +#usr/share/doc/ntp4/html/drivers/oncore-shmem.html +#usr/share/doc/ntp4/html/drivers/scripts +#usr/share/doc/ntp4/html/drivers/scripts/footer.txt +#usr/share/doc/ntp4/html/drivers/scripts/style.css +#usr/share/doc/ntp4/html/drivers/tf582_4.html +#usr/share/doc/ntp4/html/extern.html +#usr/share/doc/ntp4/html/filter.html +#usr/share/doc/ntp4/html/hints +#usr/share/doc/ntp4/html/hints.html +#usr/share/doc/ntp4/html/hints/a-ux +#usr/share/doc/ntp4/html/hints/aix +#usr/share/doc/ntp4/html/hints/bsdi +#usr/share/doc/ntp4/html/hints/changes +#usr/share/doc/ntp4/html/hints/decosf1 +#usr/share/doc/ntp4/html/hints/decosf2 +#usr/share/doc/ntp4/html/hints/freebsd +#usr/share/doc/ntp4/html/hints/hpux +#usr/share/doc/ntp4/html/hints/linux +#usr/share/doc/ntp4/html/hints/mpeix +#usr/share/doc/ntp4/html/hints/notes-xntp-v3 +#usr/share/doc/ntp4/html/hints/parse +#usr/share/doc/ntp4/html/hints/refclocks +#usr/share/doc/ntp4/html/hints/rs6000 +#usr/share/doc/ntp4/html/hints/sco.html +#usr/share/doc/ntp4/html/hints/sgi +#usr/share/doc/ntp4/html/hints/solaris-dosynctodr.html +#usr/share/doc/ntp4/html/hints/solaris.html +#usr/share/doc/ntp4/html/hints/solaris.xtra.4023118 +#usr/share/doc/ntp4/html/hints/solaris.xtra.4095849 +#usr/share/doc/ntp4/html/hints/solaris.xtra.S99ntpd +#usr/share/doc/ntp4/html/hints/solaris.xtra.patchfreq +#usr/share/doc/ntp4/html/hints/sun4 +#usr/share/doc/ntp4/html/hints/svr4-dell +#usr/share/doc/ntp4/html/hints/svr4_package +#usr/share/doc/ntp4/html/hints/todo +#usr/share/doc/ntp4/html/hints/vxworks.html +#usr/share/doc/ntp4/html/hints/winnt.html +#usr/share/doc/ntp4/html/history.html +#usr/share/doc/ntp4/html/howto.html +#usr/share/doc/ntp4/html/huffpuff.html +#usr/share/doc/ntp4/html/icons +#usr/share/doc/ntp4/html/icons/home.gif +#usr/share/doc/ntp4/html/icons/mail2.gif +#usr/share/doc/ntp4/html/icons/sitemap.png +#usr/share/doc/ntp4/html/index.html +#usr/share/doc/ntp4/html/kern.html +#usr/share/doc/ntp4/html/kernpps.html +#usr/share/doc/ntp4/html/keygen.html +#usr/share/doc/ntp4/html/leap.html +#usr/share/doc/ntp4/html/miscopt.html +#usr/share/doc/ntp4/html/monopt.html +#usr/share/doc/ntp4/html/msyslog.html +#usr/share/doc/ntp4/html/ntp-wait.html +#usr/share/doc/ntp4/html/ntp_conf.html +#usr/share/doc/ntp4/html/ntpd.html +#usr/share/doc/ntp4/html/ntpdate.html +#usr/share/doc/ntp4/html/ntpdc.html +#usr/share/doc/ntp4/html/ntpdsim.html +#usr/share/doc/ntp4/html/ntpdsim_new.html +#usr/share/doc/ntp4/html/ntpq.html +#usr/share/doc/ntp4/html/ntptime.html +#usr/share/doc/ntp4/html/ntptrace.html +#usr/share/doc/ntp4/html/orphan.html +#usr/share/doc/ntp4/html/parsedata.html +#usr/share/doc/ntp4/html/parsenew.html +#usr/share/doc/ntp4/html/pic +#usr/share/doc/ntp4/html/pic/9400n.jpg +#usr/share/doc/ntp4/html/pic/alice11.gif +#usr/share/doc/ntp4/html/pic/alice13.gif +#usr/share/doc/ntp4/html/pic/alice15.gif +#usr/share/doc/ntp4/html/pic/alice23.gif +#usr/share/doc/ntp4/html/pic/alice31.gif +#usr/share/doc/ntp4/html/pic/alice32.gif +#usr/share/doc/ntp4/html/pic/alice35.gif +#usr/share/doc/ntp4/html/pic/alice38.gif +#usr/share/doc/ntp4/html/pic/alice44.gif +#usr/share/doc/ntp4/html/pic/alice47.gif +#usr/share/doc/ntp4/html/pic/alice51.gif +#usr/share/doc/ntp4/html/pic/alice61.gif +#usr/share/doc/ntp4/html/pic/barnstable.gif +#usr/share/doc/ntp4/html/pic/beaver.gif +#usr/share/doc/ntp4/html/pic/boom3.gif +#usr/share/doc/ntp4/html/pic/boom3a.gif +#usr/share/doc/ntp4/html/pic/boom4.gif +#usr/share/doc/ntp4/html/pic/broad.gif +#usr/share/doc/ntp4/html/pic/bustardfly.gif +#usr/share/doc/ntp4/html/pic/c51.jpg +#usr/share/doc/ntp4/html/pic/description.jpg +#usr/share/doc/ntp4/html/pic/discipline.gif +#usr/share/doc/ntp4/html/pic/dogsnake.gif +#usr/share/doc/ntp4/html/pic/driver29.gif +#usr/share/doc/ntp4/html/pic/driver43_1.gif +#usr/share/doc/ntp4/html/pic/driver43_2.jpg +#usr/share/doc/ntp4/html/pic/fg6021.gif +#usr/share/doc/ntp4/html/pic/fg6039.jpg +#usr/share/doc/ntp4/html/pic/fig_3_1.gif +#usr/share/doc/ntp4/html/pic/flatheads.gif +#usr/share/doc/ntp4/html/pic/flt1.gif +#usr/share/doc/ntp4/html/pic/flt2.gif +#usr/share/doc/ntp4/html/pic/flt3.gif +#usr/share/doc/ntp4/html/pic/flt4.gif +#usr/share/doc/ntp4/html/pic/flt5.gif +#usr/share/doc/ntp4/html/pic/flt6.gif +#usr/share/doc/ntp4/html/pic/flt7.gif +#usr/share/doc/ntp4/html/pic/flt8.gif +#usr/share/doc/ntp4/html/pic/flt9.gif +#usr/share/doc/ntp4/html/pic/freq1211.gif +#usr/share/doc/ntp4/html/pic/gadget.jpg +#usr/share/doc/ntp4/html/pic/gps167.jpg +#usr/share/doc/ntp4/html/pic/group.gif +#usr/share/doc/ntp4/html/pic/hornraba.gif +#usr/share/doc/ntp4/html/pic/igclock.gif +#usr/share/doc/ntp4/html/pic/neoclock4x.gif +#usr/share/doc/ntp4/html/pic/offset1211.gif +#usr/share/doc/ntp4/html/pic/oncore_evalbig.gif +#usr/share/doc/ntp4/html/pic/oncore_remoteant.jpg +#usr/share/doc/ntp4/html/pic/oncore_utplusbig.gif +#usr/share/doc/ntp4/html/pic/oz2.gif +#usr/share/doc/ntp4/html/pic/panda.gif +#usr/share/doc/ntp4/html/pic/pd_om006.gif +#usr/share/doc/ntp4/html/pic/pd_om011.gif +#usr/share/doc/ntp4/html/pic/peer.gif +#usr/share/doc/ntp4/html/pic/pogo.gif +#usr/share/doc/ntp4/html/pic/pogo1a.gif +#usr/share/doc/ntp4/html/pic/pogo3a.gif +#usr/share/doc/ntp4/html/pic/pogo4.gif +#usr/share/doc/ntp4/html/pic/pogo5.gif +#usr/share/doc/ntp4/html/pic/pogo6.gif +#usr/share/doc/ntp4/html/pic/pogo7.gif +#usr/share/doc/ntp4/html/pic/pogo8.gif +#usr/share/doc/ntp4/html/pic/pzf509.jpg +#usr/share/doc/ntp4/html/pic/pzf511.jpg +#usr/share/doc/ntp4/html/pic/rabbit.gif +#usr/share/doc/ntp4/html/pic/radio2.jpg +#usr/share/doc/ntp4/html/pic/sheepb.jpg +#usr/share/doc/ntp4/html/pic/stack1a.jpg +#usr/share/doc/ntp4/html/pic/stats.gif +#usr/share/doc/ntp4/html/pic/sx5.gif +#usr/share/doc/ntp4/html/pic/thunderbolt.jpg +#usr/share/doc/ntp4/html/pic/time1.gif +#usr/share/doc/ntp4/html/pic/tonea.gif +#usr/share/doc/ntp4/html/pic/tribeb.gif +#usr/share/doc/ntp4/html/pic/wingdorothy.gif +#usr/share/doc/ntp4/html/poll.html +#usr/share/doc/ntp4/html/pps.html +#usr/share/doc/ntp4/html/prefer.html +#usr/share/doc/ntp4/html/quick.html +#usr/share/doc/ntp4/html/rate.html +#usr/share/doc/ntp4/html/rdebug.html +#usr/share/doc/ntp4/html/refclock.html +#usr/share/doc/ntp4/html/release.html +#usr/share/doc/ntp4/html/scripts +#usr/share/doc/ntp4/html/scripts/accopt.txt +#usr/share/doc/ntp4/html/scripts/audio.txt +#usr/share/doc/ntp4/html/scripts/authopt.txt +#usr/share/doc/ntp4/html/scripts/clockopt.txt +#usr/share/doc/ntp4/html/scripts/command.txt +#usr/share/doc/ntp4/html/scripts/config.txt +#usr/share/doc/ntp4/html/scripts/confopt.txt +#usr/share/doc/ntp4/html/scripts/external.txt +#usr/share/doc/ntp4/html/scripts/footer.txt +#usr/share/doc/ntp4/html/scripts/hand.txt +#usr/share/doc/ntp4/html/scripts/install.txt +#usr/share/doc/ntp4/html/scripts/manual.txt +#usr/share/doc/ntp4/html/scripts/misc.txt +#usr/share/doc/ntp4/html/scripts/miscopt.txt +#usr/share/doc/ntp4/html/scripts/monopt.txt +#usr/share/doc/ntp4/html/scripts/refclock.txt +#usr/share/doc/ntp4/html/scripts/special.txt +#usr/share/doc/ntp4/html/scripts/style.css +#usr/share/doc/ntp4/html/select.html +#usr/share/doc/ntp4/html/sitemap.html +#usr/share/doc/ntp4/html/sntp.html +#usr/share/doc/ntp4/html/stats.html +#usr/share/doc/ntp4/html/tickadj.html +#usr/share/doc/ntp4/html/warp.html +#usr/share/doc/ntp4/html/xleave.html +#usr/share/doc/ntp4/ntp-keygen.html +#usr/share/doc/ntp4/ntp-wait.html +#usr/share/doc/ntp4/ntp.conf.html +#usr/share/doc/ntp4/ntp.keys.html +#usr/share/doc/ntp4/ntpd.html +#usr/share/doc/ntp4/ntpdc.html +#usr/share/doc/ntp4/ntpq.html +#usr/share/doc/ntp4/ntpsnmpd.html +#usr/share/doc/ntp4/ntpsweep.html +#usr/share/doc/ntp4/ntptrace.html +#usr/share/doc/sntp +#usr/share/doc/sntp/sntp.html +#usr/share/man/man1/calc_tickadj.1 +#usr/share/man/man1/ntp-keygen.1 +#usr/share/man/man1/ntp-wait.1 +#usr/share/man/man1/ntpd.1 +#usr/share/man/man1/ntpdc.1 +#usr/share/man/man1/ntpq.1 +#usr/share/man/man1/ntptrace.1 +#usr/share/man/man1/sntp.1 +#usr/share/man/man5/ntp.conf.5 +#usr/share/man/man5/ntp.keys.5 +#usr/share/ntp +#usr/share/ntp/lib +#usr/share/ntp/lib/NTP +#usr/share/ntp/lib/NTP/Util.pm +var/ipfire/time/counter.conf +var/ipfire/time/enable +var/ipfire/time/settime.conf +var/ipfire/time/settings diff --git a/config/rootfiles/core/87/filelists/openssl b/config/rootfiles/core/87/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/87/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/openssl-compat b/config/rootfiles/core/87/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/87/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/openvpn b/config/rootfiles/core/87/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/87/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/parted b/config/rootfiles/core/87/filelists/parted new file mode 120000 index 0000000..89195d8 --- /dev/null +++ b/config/rootfiles/core/87/filelists/parted @@ -0,0 +1 @@ +../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/patch b/config/rootfiles/core/87/filelists/patch new file mode 120000 index 0000000..27a3825 --- /dev/null +++ b/config/rootfiles/core/87/filelists/patch @@ -0,0 +1 @@ +../../../common/patch \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/pigz b/config/rootfiles/core/87/filelists/pigz new file mode 120000 index 0000000..696f8f8 --- /dev/null +++ b/config/rootfiles/core/87/filelists/pigz @@ -0,0 +1 @@ +../../../common/pigz \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/setup b/config/rootfiles/core/87/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/87/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/slang b/config/rootfiles/core/87/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/core/87/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/strongswan b/config/rootfiles/core/87/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/87/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/tzdata b/config/rootfiles/core/87/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/87/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/updated-firmwares b/config/rootfiles/core/87/filelists/updated-firmwares new file mode 100644 index 0000000..172312f --- /dev/null +++ b/config/rootfiles/core/87/filelists/updated-firmwares @@ -0,0 +1,203 @@ +lib/firmware/amd-ucode/microcode_amd_fam15h.bin +lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc +lib/firmware/amd-ucode/microcode_amd_fam16h.bin +lib/firmware/amd-ucode/microcode_amd_fam16h.bin.asc +lib/firmware/as102_data1_st.hex +lib/firmware/as102_data2_st.hex +lib/firmware/bnx2x/bnx2x-e1-7.10.51.0.fw +lib/firmware/bnx2x/bnx2x-e1-7.8.19.0.fw +lib/firmware/bnx2x/bnx2x-e1h-7.10.51.0.fw +lib/firmware/bnx2x/bnx2x-e1h-7.8.19.0.fw +lib/firmware/bnx2x/bnx2x-e2-7.10.51.0.fw +lib/firmware/bnx2x/bnx2x-e2-7.8.19.0.fw +lib/firmware/brcm/brcmfmac43143.bin +lib/firmware/brcm/brcmfmac43143-sdio.bin +lib/firmware/brcm/brcmfmac43362-sdio.bin +lib/firmware/brcm/brcmfmac4354-sdio.bin +lib/firmware/cmmb_vega_12mhz.inp +lib/firmware/cmmb_venice_12mhz.inp +lib/firmware/cxgb4/t4fw-1.12.25.0.bin +lib/firmware/cxgb4/t4fw.bin +lib/firmware/cxgb4/t5fw-1.12.25.0.bin +lib/firmware/cxgb4/t5fw.bin +lib/firmware/dvb-fe-drxj-mc-1.0.8.fw +lib/firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw +lib/firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw +lib/firmware/dvb-fe-xc4000-1.4.1.fw +lib/firmware/dvb-fe-xc5000c-4.1.30.7.fw +lib/firmware/dvb_nova_12mhz_b0.inp +lib/firmware/dvb_nova_12mhz.inp +lib/firmware/dvb-usb-it9135-01.fw +lib/firmware/dvb-usb-it9135-02.fw +lib/firmware/emi62/bitstream.fw +lib/firmware/intel/fw_sst_0f28.bin +lib/firmware/intel/fw_sst_0f28.bin-48kHz_i2s_master +lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq +lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq +lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq +lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq +lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq +lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq +lib/firmware/intel/ibt-hw-37.8.bseq +lib/firmware/intel/IntcSST2.bin +lib/firmware/isdbt_nova_12mhz_b0.inp +lib/firmware/isdbt_nova_12mhz.inp +lib/firmware/isdbt_rio.inp +lib/firmware/iwlwifi-3160-10.ucode +lib/firmware/iwlwifi-3160-8.ucode +lib/firmware/iwlwifi-3160-9.ucode +lib/firmware/iwlwifi-7260-10.ucode +lib/firmware/iwlwifi-7260-8.ucode +lib/firmware/iwlwifi-7260-9.ucode +lib/firmware/iwlwifi-7265-10.ucode +lib/firmware/iwlwifi-7265-8.ucode +lib/firmware/iwlwifi-7265-9.ucode +lib/firmware/iwlwifi-7265D-10.ucode +lib/firmware/LICENCE.Abilis +lib/firmware/LICENCE.chelsio_firmware +lib/firmware/LICENCE.fw_sst_0f28 +lib/firmware/LICENCE.ibt_firmware +lib/firmware/LICENCE.IntcSST2 +lib/firmware/LICENCE.it913x +lib/firmware/LICENCE.iwlwifi_firmware +lib/firmware/LICENCE.qat_dh895xcc_firmware +lib/firmware/LICENCE.r8a779x_usb3 +lib/firmware/LICENCE.siano +lib/firmware/LICENCE.xc4000 +lib/firmware/LICENCE.xc5000c +lib/firmware/LICENSE.amd-ucode +lib/firmware/LICENSE.radeon +lib/firmware/myri10ge_eth_big_z8e.dat +lib/firmware/myri10ge_ethp_big_z8e.dat +lib/firmware/myri10ge_ethp_z8e.dat +lib/firmware/myri10ge_eth_z8e.dat +lib/firmware/myri10ge_rss_eth_big_z8e.dat +lib/firmware/myri10ge_rss_ethp_big_z8e.dat +lib/firmware/myri10ge_rss_ethp_z8e.dat +lib/firmware/myri10ge_rss_eth_z8e.dat +lib/firmware/qat_895xcc.bin +lib/firmware/ql2400_fw.bin +lib/firmware/ql2500_fw.bin +lib/firmware/r8a779x_usb3_v1.dlmem +lib/firmware/radeon/bonaire_ce.bin +lib/firmware/radeon/BONAIRE_mc2.bin +lib/firmware/radeon/bonaire_mc.bin +lib/firmware/radeon/bonaire_me.bin +lib/firmware/radeon/bonaire_mec.bin +lib/firmware/radeon/bonaire_pfp.bin +lib/firmware/radeon/bonaire_rlc.bin +lib/firmware/radeon/bonaire_sdma.bin +lib/firmware/radeon/bonaire_smc.bin +lib/firmware/radeon/BONAIRE_vce.bin +lib/firmware/radeon/hainan_ce.bin +lib/firmware/radeon/HAINAN_mc2.bin +lib/firmware/radeon/hainan_mc.bin +lib/firmware/radeon/hainan_me.bin +lib/firmware/radeon/hainan_pfp.bin +lib/firmware/radeon/hainan_rlc.bin +lib/firmware/radeon/hainan_smc.bin +lib/firmware/radeon/hawaii_ce.bin +lib/firmware/radeon/HAWAII_ce.bin +lib/firmware/radeon/HAWAII_mc2.bin +lib/firmware/radeon/hawaii_mc.bin +lib/firmware/radeon/HAWAII_mc.bin +lib/firmware/radeon/hawaii_me.bin +lib/firmware/radeon/HAWAII_me.bin +lib/firmware/radeon/hawaii_mec.bin +lib/firmware/radeon/HAWAII_mec.bin +lib/firmware/radeon/hawaii_pfp.bin +lib/firmware/radeon/HAWAII_pfp.bin +lib/firmware/radeon/hawaii_rlc.bin +lib/firmware/radeon/HAWAII_rlc.bin +lib/firmware/radeon/hawaii_sdma.bin +lib/firmware/radeon/HAWAII_sdma.bin +lib/firmware/radeon/hawaii_smc.bin +lib/firmware/radeon/HAWAII_smc.bin +lib/firmware/radeon/kabini_ce.bin +lib/firmware/radeon/kabini_me.bin +lib/firmware/radeon/kabini_mec.bin +lib/firmware/radeon/kabini_pfp.bin +lib/firmware/radeon/kabini_rlc.bin +lib/firmware/radeon/kabini_sdma.bin +lib/firmware/radeon/kaveri_ce.bin +lib/firmware/radeon/kaveri_me.bin +lib/firmware/radeon/kaveri_mec2.bin +lib/firmware/radeon/kaveri_mec.bin +lib/firmware/radeon/kaveri_pfp.bin +lib/firmware/radeon/kaveri_rlc.bin +lib/firmware/radeon/kaveri_sdma.bin +lib/firmware/radeon/mullins_ce.bin +lib/firmware/radeon/MULLINS_ce.bin +lib/firmware/radeon/mullins_me.bin +lib/firmware/radeon/MULLINS_me.bin +lib/firmware/radeon/mullins_mec.bin +lib/firmware/radeon/MULLINS_mec.bin +lib/firmware/radeon/mullins_pfp.bin +lib/firmware/radeon/MULLINS_pfp.bin +lib/firmware/radeon/mullins_rlc.bin +lib/firmware/radeon/MULLINS_rlc.bin +lib/firmware/radeon/mullins_sdma.bin +lib/firmware/radeon/MULLINS_sdma.bin +lib/firmware/radeon/oland_ce.bin +lib/firmware/radeon/OLAND_mc2.bin +lib/firmware/radeon/oland_mc.bin +lib/firmware/radeon/oland_me.bin +lib/firmware/radeon/oland_pfp.bin +lib/firmware/radeon/oland_rlc.bin +lib/firmware/radeon/oland_smc.bin +lib/firmware/radeon/pitcairn_ce.bin +lib/firmware/radeon/PITCAIRN_mc2.bin +lib/firmware/radeon/pitcairn_mc.bin +lib/firmware/radeon/pitcairn_me.bin +lib/firmware/radeon/pitcairn_pfp.bin +lib/firmware/radeon/pitcairn_rlc.bin +lib/firmware/radeon/pitcairn_smc.bin +lib/firmware/radeon/R600_uvd.bin +lib/firmware/radeon/RS780_uvd.bin +lib/firmware/radeon/RV770_uvd.bin +lib/firmware/radeon/tahiti_ce.bin +lib/firmware/radeon/TAHITI_mc2.bin +lib/firmware/radeon/tahiti_mc.bin +lib/firmware/radeon/tahiti_me.bin +lib/firmware/radeon/tahiti_pfp.bin +lib/firmware/radeon/tahiti_rlc.bin +lib/firmware/radeon/tahiti_smc.bin +lib/firmware/radeon/verde_ce.bin +lib/firmware/radeon/VERDE_mc2.bin +lib/firmware/radeon/verde_mc.bin +lib/firmware/radeon/verde_me.bin +lib/firmware/radeon/verde_pfp.bin +lib/firmware/radeon/verde_rlc.bin +lib/firmware/radeon/verde_smc.bin +lib/firmware/README +lib/firmware/rsi_91x.fw +lib/firmware/rtl_nic/rtl8107e-1.fw +lib/firmware/rtl_nic/rtl8107e-2.fw +lib/firmware/rtl_nic/rtl8168h-1.fw +lib/firmware/rtl_nic/rtl8168h-2.fw +lib/firmware/rtlwifi/rtl8192cfw.bin +lib/firmware/rtlwifi/rtl8192cfwU_B.bin +lib/firmware/rtlwifi/rtl8192defw.bin +lib/firmware/rtlwifi/rtl8192eefw.bin +lib/firmware/rtlwifi/rtl8723aufw_A.bin +lib/firmware/rtlwifi/rtl8723aufw_B.bin +lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin +lib/firmware/rtlwifi/rtl8723befw.bin +lib/firmware/rtlwifi/rtl8821aefw.bin +lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin +lib/firmware/s5p-mfc.fw +lib/firmware/s5p-mfc-v6.fw +lib/firmware/s5p-mfc-v6-v2.fw +lib/firmware/s5p-mfc-v7.fw +lib/firmware/s5p-mfc-v8.fw +lib/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw +lib/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw +lib/firmware/sms1xxx-nova-a-dvbt-01.fw +lib/firmware/sms1xxx-nova-b-dvbt-01.fw +lib/firmware/sms1xxx-stellar-dvbt-01.fw +lib/firmware/tdmb_nova_12mhz.inp +lib/firmware/ti-connectivity/wl18xx-fw-3.bin +lib/firmware/ti-connectivity/wl18xx-fw-4.bin +lib/firmware/v4l-cx23885-enc-broken.fw +lib/firmware/WHENCE +lib/firmware/brcm/brcmfmac43362-sdio.txt diff --git a/config/rootfiles/core/87/filelists/wireless-regdb b/config/rootfiles/core/87/filelists/wireless-regdb new file mode 120000 index 0000000..c9205b3 --- /dev/null +++ b/config/rootfiles/core/87/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/wpa_supplicant b/config/rootfiles/core/87/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/87/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/xfsprogs b/config/rootfiles/core/87/filelists/xfsprogs new file mode 120000 index 0000000..9103296 --- /dev/null +++ b/config/rootfiles/core/87/filelists/xfsprogs @@ -0,0 +1 @@ +../../../common/xfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/87/meta b/config/rootfiles/core/87/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/87/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/87/update.sh b/config/rootfiles/core/87/update.sh new file mode 100644 index 0000000..172d854 --- /dev/null +++ b/config/rootfiles/core/87/update.sh @@ -0,0 +1,284 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# +# Remove old core updates from pakfire cache to save space... +core=87 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + i?86) + # Backup old grub config + if [ -f /boot/grub/grub.conf ]; then + cp -vf /boot/grub/grub.conf /boot/old-grub-config + fi + if [ -f /boot/grub/menu.lst ]; then + cp -vf /boot/grub/menu.lst /boot/old-grub-config + fi + if [ -f /boot/grub/grub.cfg ]; then + cp -vf /boot/grub/grub.cfg /boot/old-grub-config + fi + + # Remove all files that belong to GRUB-legacy + rm -rfv /boot/grub + ;; + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# +#restart init because glibc was updated. +telinit u + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Add nobody to group dialout +usermod -a -G dialout nobody + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case "$(uname -m)" in + i?86) + case "$(find_device "/")" in + xvd* ) + echo Skip remove grub2 files, because pygrub fail. + rm -f /boot/grub/* + echo config will recreated by linux-pae install. + ;; + * ) + # + # Update to GRUB2 + # + echo + echo Update grub configuration ... + if grep -qE "^serial" /boot/old-grub-config; then + sed -i /etc/default/grub \ + -e "s|panic=10|& console=ttyS0,115200n8|g" + echo "GRUB_TERMINAL="serial"" >> /etc/default/grub + echo "GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200"" >> /etc/default/grub + fi + + if ! /usr/local/bin/update-bootloader; then + logger -p syslog.emerg -t ipfire \ + "Could not update the bootloader!" + fi + ;; + esac +esac + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +# Update Package list for addon installation +/opt/pakfire/pakfire update -y --force + +echo +echo Please wait until pakfire has ended... +echo + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/85/exclude b/config/rootfiles/oldcore/85/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/85/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/85/filelists/files b/config/rootfiles/oldcore/85/filelists/files new file mode 100644 index 0000000..9cf259c --- /dev/null +++ b/config/rootfiles/oldcore/85/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +var/ipfire/langs diff --git a/config/rootfiles/oldcore/85/filelists/openssl b/config/rootfiles/oldcore/85/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/85/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/85/filelists/openssl-compat b/config/rootfiles/oldcore/85/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/85/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/85/meta b/config/rootfiles/oldcore/85/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/85/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/85/update.sh b/config/rootfiles/oldcore/85/update.sh new file mode 100644 index 0000000..ec9ac63 --- /dev/null +++ b/config/rootfiles/oldcore/85/update.sh @@ -0,0 +1,56 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=85 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt index bc3facc..66ab24f 100755 --- a/config/u-boot/uEnv.txt +++ b/config/u-boot/uEnv.txt @@ -1,4 +1,5 @@ -uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootbananapi; fi; KVER=xxxKVERxxx -bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile}; setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro; bootz 0x82000000 - ${fdtaddr}; -bootbananapi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/sun7i-a20-bananapi.dtb; setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait; bootz 0x46000000 - 0x49000000; +DTBSUNXI=sun7i-a20-bananapi.dtb +uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootsunxi; fi; +bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile}; setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3; bootz 0x82000000 - ${fdtaddr}; +bootsunxi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/${DTBSUNXI}; fatload mmc 0:1 0x49100000 uInit-ipfire-multi; setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait; bootz 0x46000000 0x49100000 0x49000000; diff --git a/config/xen-image/README b/config/xen-image/README index a23491f..159b036 100644 --- a/config/xen-image/README +++ b/config/xen-image/README @@ -20,6 +20,6 @@ other usefull commands from the Dom0: - look what is going on: "xm top" or "xm list"
This script can also build a Citrix XenCenter xva image. (Need xz-aware -xen version. Tested with Citrix Xen Server 6.2.5 beta) +xen version. Tested with Citrix Xen Server 6.5) - run "XEN_IMG_TYPE=xva bash xen-image-maker.sh" to build an xva image. -- import the vm with "xe vm-import file=ipfire.xva" +- import the vm with "xe vm-import filename=ipfire.xva" diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 4f63280..28f005d 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -116,7 +116,7 @@ mount -o loop $IMGboot $MNThdd/boot mount -o loop $IMGvar $MNThdd/var
# Install IPFire without kernel modules -xz -d < $ISODIR/$SNAME-$VERSION.tlz > $TMPDIR/$SNAME-$VERSION.tar +xz -d < $ISODIR/distro.img > $TMPDIR/$SNAME-$VERSION.tar tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner
@@ -130,9 +130,9 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE ro" \ +echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf -echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf +echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf
ln -s grub.conf $MNThdd/boot/grub/menu.lst @@ -159,12 +159,13 @@ mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys chroot $MNThdd /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -sed -i -e "s|DEVICE1|/dev/$P1|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE2|/dev/$P2|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE3|/dev/$P3|g" $MNThdd/etc/fstab -sed -i -e "s|DEVICE4|/dev/$P4|g" $MNThdd/etc/fstab
-sed -i -e "s|FSTYPE|$FSTYPE|g" $MNThdd/etc/fstab +# create fstab +echo "/dev/$P1 /boot auto defaults 1 3" > $MNThdd/etc/fstab +echo "/dev/$P2 swap swap defaults 0 0" >> $MNThdd/etc/fstab +echo "/dev/$P3 / auto defaults 1 1" >> $MNThdd/etc/fstab +echo "/dev/$P4 /var auto defaults 1 2" >> $MNThdd/etc/fstab +
#Remove root / fstab check rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab diff --git a/lfs/linux b/lfs/linux index d92bdfe..ef30fa6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,11 +24,11 @@
include Config
-VER = 3.14.32 +VER = 3.14.33
-RPI_PATCHES = 3.14.32-grsec-ipfire1 -A7M_PATCHES = 3.14.32-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.0-3.14.32-201502062101.patch.xz +RPI_PATCHES = 3.14.33-grsec-ipfire1 +A7M_PATCHES = 3.14.33-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.0-3.14.33-201502180832.patch.xz
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
-$(DL_FILE)_MD5 = 3178fb8f6f1eafcffdd730fec68754f8 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 375dc501711ff3ffeffdfc9848675d26 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = efcfe5889f120d879387dd4ebe881587 -$(GRS_PATCHES)_MD5 = c1565eb2a630a673f3ace31a6901e251 +$(DL_FILE)_MD5 = c19feb0646fde7e96602ac313fb7e5d6 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = e423c8b3a408f23b9a26f8f0f4384c50 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = f147ce7c81889d2c5134304f3a6e60e3 +$(GRS_PATCHES)_MD5 = 119943451628ff5a62437637d60a585d
install : $(TARGET)
@@ -175,11 +175,11 @@ ifeq "$(KCFG)" "-multi" # Apply Arm7-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1
- # Update Banana Pi, Lamobo-R1 and add Banana Pro dtb - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-update_banana_dts.patch - # Install switch api userspace header cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/ + + # Fix Lamobo-R1 SATA Power + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-lamobo-r1-fix-sata-pwr.patch endif
ifeq "$(KCFG)" "-rpi" diff --git a/make.sh b/make.sh index 42655ab..90b7272 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="87-rc1" # Core Level (Filename) -PAKFIRE_CORE="86" # Core Level (PAKFIRE) +CORE="87" # Core Level (Filename) +PAKFIRE_CORE="87" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 3d59d70..c980a01 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -22,49 +22,29 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_files -# -KVER=xxxKVERxxx -ROOT=`mount | grep " / " | cut -d" " -f1` -ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` -if [ ! -z $ROOTUUID ]; then - ROOT="UUID=$ROOTUUID" -fi
-if [ -f /boot/grub/grub.conf ]; then -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi
-ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $ENTRY > /dev/null -let ENTRY=$_+1 +function find_partition() { + local mountpoint="${1}"
-#Check if the system use serial console... -if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then - console="" -else - console=" console=ttyS0,115200n8" -fi + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue
+ if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + echo ${root} + return 0 +} + +extract_files # -# backup grub.conf -# -cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae_install.conf -# -# Add new Entry to grub.conf -# -echo "" >> /boot/grub/grub.conf -echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10$console $MOUNT" >> /boot/grub/grub.conf -echo " initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf -echo " savedefault $ENTRY" >> /boot/grub/grub.conf -fi +KVER=xxxKVERxxx
# # Create new module depency @@ -75,10 +55,29 @@ depmod -a $KVER-ipfire-pae # /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
-# -# Update grub2 config -# -grub-mkconfig > /boot/grub/grub.cfg + +ROOT="$(find_partition "/")" +case $ROOT in + xvd* ) + # + # We are on XEN so create new grub.conf / menu.lst for pygrub + # + echo "timeout 10" > /boot/grub/grub.conf + echo "default 0" >> /boot/grub/grub.conf + echo "title IPFire (pae-kernel)" >> /boot/grub/grub.conf + echo " kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \ + >> /boot/grub/grub.conf + echo " initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf + echo "# savedefault 0" >> /boot/grub/grub.conf + ln -s grub.conf $MNThdd/boot/grub/menu.lst + ;; + * ) + # + # Update grub2 config + # + grub-mkconfig > /boot/grub/grub.cfg + ;; +esac
# request a reboot if pae is supported if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh index 443328b..03a4b61 100644 --- a/src/paks/linux-pae/uninstall.sh +++ b/src/paks/linux-pae/uninstall.sh @@ -22,13 +22,13 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +if [ -f /boot/grub/grub.conf ]; then + echo "Error! Connot remove linux-pae because we are on XEN." + exit 1 +fi remove_files rm -rf /boot/initramfs-*-pae.img rm -rf /boot/vmlinuz-*-pae rm -rf /lib/modules/*-ipfire-pae -if [ -f /boot/grub/grub.conf ]; then - cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf - sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf -fi grub-mkconfig > /boot/grub/grub.cfg sync && sync diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh index 00a3c78..7df354d 100644 --- a/src/paks/linux-pae/update.sh +++ b/src/paks/linux-pae/update.sh @@ -22,5 +22,11 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -./uninstall.sh +remove_files +rm -rf /boot/initramfs-*-pae.img +rm -rf /boot/vmlinuz-*-pae +rm -rf /lib/modules/*-ipfire-pae +if [ ! -f /boot/grub/grub.conf ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi ./install.sh diff --git a/src/patches/kernel/utilite/linux-3.10-compulab-utilite-support.patch b/src/patches/kernel/utilite/linux-3.10-compulab-utilite-support.patch deleted file mode 100644 index 3d7f676..0000000 --- a/src/patches/kernel/utilite/linux-3.10-compulab-utilite-support.patch +++ /dev/null @@ -1,96 +0,0 @@ -Add initial support for cm-fx6 module. - -cm-fx6 is a module based on mx6q SoC with the following features: -- Up to 4GB of DDR3 -- 1 LCD/DVI output port -- 1 HDMI output port -- 2 LVDS LCD ports -- Gigabit Ethernet -- Analog Audio -- CAN -- SATA -- NAND -- PCIE - -This patch allows to boot up the module, configures the serial console, -the Ethernet adapter and the heartbeat led. - -cm-fx6 is embedded inside the Utilite computer. - -Signed-off-by: Valentin Raevsky valentin@compulab.co.il -Signed-off-by: Igor Grinberg grinberg@compulab.co.il ---- - -Shawn, can this still be applied for 3.13 ? - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index f0895c5..7521a34 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -117,6 +117,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6dl-sabresd.dtb \ - imx6dl-wandboard.dtb \ - imx6q-arm2.dtb \ -+ imx6q-cm-fx6.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ -diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts -new file mode 100644 -index 0000000..2419751 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts -@@ -0,0 +1,53 @@ -+/* -+ * Copyright 2013 CompuLab Ltd. -+ * -+ * Author: Valentin Raevsky valentin@compulab.co.il -+ * -+ * The code contained herein is licensed under the GNU General Public -+ * License. You may obtain a copy of the GNU General Public License -+ * Version 2 or later at the following locations: -+ * -+ * http://www.opensource.org/licenses/gpl-license.html -+ * http://www.gnu.org/copyleft/gpl.html -+ */ -+ -+/dts-v1/; -+#include "imx6q.dtsi" -+ -+/ { -+ model = "CompuLab CM-FX6"; -+ compatible = "compulab,cm-fx6", "fsl,imx6q"; -+ -+ memory { -+ reg = <0x10000000 0x80000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ heartbeat-led { -+ label = "Heartbeat"; -+ gpios = <&gpio2 31 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+}; -+ -+&fec { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_enet_1>; -+ phy-mode = "rgmii"; -+ status = "okay"; -+}; -+ -+&gpmi { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_gpmi_nand_1>; -+ status = "okay"; -+}; -+ -+&uart4 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart4_1>; -+ status = "okay"; -+}; diff --git a/src/patches/linux-3.14.x-lamobo-r1-fix-sata-pwr.patch b/src/patches/linux-3.14.x-lamobo-r1-fix-sata-pwr.patch new file mode 100644 index 0000000..1c0f994 --- /dev/null +++ b/src/patches/linux-3.14.x-lamobo-r1-fix-sata-pwr.patch @@ -0,0 +1,49 @@ +From 7f558e6e8abee42cc966e2cb64be0de875797e07 Mon Sep 17 00:00:00 2001 +From: Arne Fitzenreiter arne_f@ipfire.org +Date: Fri, 20 Feb 2015 10:01:26 +0100 +Subject: [PATCH] sun7i: dts: lamobo-r1: fix sata pwr regulator pin. + +Lamobo-R1 use PB3 instead of PB8 for controlling the SATA power regulator. +--- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +index 1eb6c9b..d634d2f 100644 +--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts ++++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +@@ -166,6 +166,16 @@ + reg = <1>; + }; + }; ++ ++ pio: pinctrl@01c20800 { ++ ahci_pwr_pin_a: ahci_pwr_pin@0 { ++ allwinner,pins = "PB3"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = <0>; ++ allwinner,pull = <0>; ++ }; ++ }; ++ + }; + + leds { +@@ -181,6 +191,14 @@ + }; + + reg_ahci_5v: ahci-5v { ++ compatible = "regulator-fixed"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ahci_pwr_pin_a>; ++ regulator-name = "ahci-5v"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ enable-active-high; ++ gpio = <&pio 1 3 0>; + status = "okay"; + }; + +-- +1.8.5.2 + diff --git a/src/patches/linux-3.14.x-update_banana_dts.patch b/src/patches/linux-3.14.x-update_banana_dts.patch deleted file mode 100644 index 309416b..0000000 --- a/src/patches/linux-3.14.x-update_banana_dts.patch +++ /dev/null @@ -1,301 +0,0 @@ -diff -Naur linux-3.14.30.org/arch/arm/boot/dts/Makefile linux-3.14.30/arch/arm/boot/dts/Makefile ---- linux-3.14.30.org/arch/arm/boot/dts/Makefile 2015-01-29 19:56:17.000000000 +0100 -+++ linux-3.14.30/arch/arm/boot/dts/Makefile 2015-01-29 20:41:06.598335182 +0100 -@@ -304,6 +304,7 @@ - sun5i-a13-olinuxino-micro.dtb \ - sun6i-a31-colombus.dtb \ - sun7i-a20-bananapi.dtb \ -+ sun7i-a20-bananapro.dtb \ - sun7i-a20-cubieboard2.dtb \ - sun7i-a20-cubietruck.dtb \ - sun7i-a20-lamobo-r1.dtb \ -diff -Naur linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-bananapi.dts linux-3.14.30/arch/arm/boot/dts/sun7i-a20-bananapi.dts ---- linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-bananapi.dts 2015-01-29 19:56:17.000000000 +0100 -+++ linux-3.14.30/arch/arm/boot/dts/sun7i-a20-bananapi.dts 2015-01-29 20:33:18.143334959 +0100 -@@ -199,7 +199,7 @@ - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; -- startup-delay-us = <50000>; -+ startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 7 23 0>; - status = "okay"; -diff -Naur linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-bananapro.dts linux-3.14.30/arch/arm/boot/dts/sun7i-a20-bananapro.dts ---- linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-bananapro.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.30/arch/arm/boot/dts/sun7i-a20-bananapro.dts 2015-01-29 20:40:45.153335172 +0100 -@@ -0,0 +1,262 @@ -+/* -+ * Copyright 2015 Arne Fitzenreiter -+ * Arne Fitzenreiter arne_f@ipfire.org -+ * -+ * The code contained herein is licensed under the GNU General Public -+ * License. You may obtain a copy of the GNU General Public License -+ * Version 2 or later at the following locations: -+ * -+ * http://www.opensource.org/licenses/gpl-license.html -+ * http://www.gnu.org/copyleft/gpl.html -+ */ -+ -+/dts-v1/; -+/include/ "sun7i-a20.dtsi" -+/include/ "sunxi-common-regulators.dtsi" -+#include <dt-bindings/input/input.h> -+ -+/ { -+ model = "LeMaker Banana Pro"; -+ compatible = "lemaker,bananapro", "allwinner,sun7i-a20"; -+ -+ aliases { -+ spi0 = &spi1; -+ spi1 = &spi2; -+ }; -+ -+ soc@01c00000 { -+ spi1: spi@01c06000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi1_pins_a>; -+ status = "okay"; -+ }; -+ -+ spi2: spi@01c17000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi2_pins_a>; -+ status = "okay"; -+ }; -+ -+ mmc0: mmc@01c0f000 { -+ pinctrl-names = "default", "default"; -+ pinctrl-0 = <&mmc0_pins_a>; -+ pinctrl-1 = <&mmc0_cd_pin_bananapi>; -+ cd-gpios = <&pio 7 10 0>; /* PH10 */ -+ status = "okay"; -+ }; -+ -+ mmc3: mmc@01c12000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc3_pins_a>; -+ vmmc-supply = <®_vmmc3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ }; -+ -+ usbphy: phy@01c13400 { -+ usb1_vbus-supply = <®_usb1_vbus>; -+ usb2_vbus-supply = <®_usb2_vbus>; -+ status = "okay"; -+ }; -+ -+ ehci0: usb@01c14000 { -+ status = "okay"; -+ }; -+ -+ ohci0: usb@01c14400 { -+ status = "okay"; -+ }; -+ -+ ahci: sata@01c18000 { -+ target-supply = <®_ahci_5v>; -+ status = "okay"; -+ }; -+ -+ ehci1: usb@01c1c000 { -+ status = "okay"; -+ }; -+ -+ ohci1: usb@01c1c400 { -+ status = "okay"; -+ }; -+ -+ pinctrl@01c20800 { -+ usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { -+ allwinner,pins = "PH0"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ -+ usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { -+ allwinner,pins = "PH1"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ -+ led_pins_bananapi: led_pins@0 { -+ allwinner,pins = "PH24", "PG2"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ -+ mmc0_cd_pin_bananapi: mmc0_cd_pin@0 { -+ allwinner,pins = "PH10"; -+ allwinner,function = "gpio_in"; -+ allwinner,drive = <0>; -+ allwinner,pull = <1>; -+ }; -+ -+ vmmc3_pin_bananapro: vmmc3_pin@0 { -+ allwinner,pins = "PH22"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ -+ gmac_power_pin_bananapi: gmac_power_pin@0 { -+ allwinner,pins = "PH23"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ }; -+ -+ lradc: lradc@01c22800 { -+ allwinner,chan0-step = <200>; -+ linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN -+ KEY_MENU KEY_SEARCH KEY_HOME -+ KEY_ESC KEY_ENTER>; -+ status = "okay"; -+ }; -+ -+ ir0: ir@01c21800 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ir0_pins_a>; -+ status = "okay"; -+ }; -+ -+ uart0: serial@01c28000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins_a>; -+ status = "okay"; -+ }; -+ -+ uart2: serial@01c28800 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart2_pins_a>; -+ status = "okay"; -+ }; -+ -+ uart6: serial@01c29800 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart6_pins_a>; -+ status = "okay"; -+ }; -+ -+ uart7: serial@01c29c00 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart7_pins_a>; -+ status = "okay"; -+ }; -+ -+ i2c0: i2c@01c2ac00 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c0_pins_a>; -+ status = "okay"; -+ -+ axp: axp20x@34 { -+ reg = <0x34>; -+ interrupt-parent = <&nmi_intc>; -+ interrupts = <0 8>; -+ axp,system-power-controller; -+ /include/ "x-powers-axp209.dtsi" -+ }; -+ }; -+ -+ i2c1: i2c@01c2b000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins_a>; -+ status = "okay"; -+ }; -+ -+ i2c2: i2c@01c2b400 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c2_pins_a>; -+ status = "okay"; -+ }; -+ -+ gmac: ethernet@01c50000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&gmac_pins_rgmii_a>; -+ phy = <&phy1>; -+ phy-mode = "rgmii"; -+ phy-supply = <®_gmac_3v3>; -+ status = "okay"; -+ -+ phy1: ethernet-phy@1 { -+ reg = <1>; -+ }; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&led_pins_bananapi>; -+ -+ green { -+ label = "bananapi:green:usr"; -+ gpios = <&pio 7 24 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ blue { -+ label = "bananapi:blue:usr"; -+ gpios = <&pio 6 2 0>; -+ linux,default-trigger = "mmc0"; -+ }; -+ }; -+ -+ reg_ahci_5v: ahci-5v { -+ status = "okay"; -+ }; -+ -+ reg_usb1_vbus: usb1-vbus { -+ pinctrl-0 = <&usb1_vbus_pin_bananapro>; -+ gpio = <&pio 7 0 0>; /* PH0 */ -+ status = "okay"; -+ }; -+ -+ reg_usb2_vbus: usb2-vbus { -+ pinctrl-0 = <&usb2_vbus_pin_bananapro>; -+ gpio = <&pio 7 1 0>; /* PH1 */ -+ status = "okay"; -+ }; -+ -+ reg_gmac_3v3: gmac-3v3 { -+ compatible = "regulator-fixed"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&gmac_power_pin_bananapi>; -+ regulator-name = "gmac-3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <100000>; -+ enable-active-high; -+ gpio = <&pio 7 23 0>; -+ status = "okay"; -+ }; -+ -+ reg_vmmc3: vmmc3 { -+ compatible = "regulator-fixed"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vmmc3_pin_bananapro>; -+ regulator-name = "vmmc3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ enable-active-high; -+ gpio = <&pio 7 22 0>; -+ }; -+}; -diff -Naur linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts linux-3.14.30/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts ---- linux-3.14.30.org/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts 2015-01-29 19:56:17.000000000 +0100 -+++ linux-3.14.30/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts 2015-01-30 00:00:01.678340873 +0100 -@@ -199,7 +199,7 @@ - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; -- startup-delay-us = <50000>; -+ startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 7 23 0>; - status = "okay"; diff --git a/src/scripts/backupiso b/src/scripts/backupiso index fb203bd..08fba1a 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,8 +2,8 @@
COREVER=$(cat /opt/pakfire/db/core/mine) # FIXME: edit this lines before release -URL="http://download.ipfire.org/releases/ipfire-2.x/2.15-core$COREVER/" -ISO="ipfire-2.15.i586-full-core$COREVER.iso" +URL="http://download.ipfire.org/releases/ipfire-2.x/2.17-core$COREVER/" +ISO="ipfire-2.17.i586-full-core$COREVER.iso"
if [ -z $1 ]; then echo usage: $0 backup-file
hooks/post-receive -- IPFire 2.x development tree