diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2012-10-11 17:39:09 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2012-10-11 17:39:09 -0200 |
| commit | 4a6a67cb189d4b5a867259ed6783845bc11a3de7 (patch) | |
| tree | f57c855bbe5ae2cb6f954d486073e36d8e1574cc | |
| parent | 4bc4b477ce80b006778fed0807e5f93a19ff1f15 (diff) | |
| parent | 603c6e15dbcc77f54fc348e70c5cfcef5e2d6db2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
70 files changed, 961 insertions, 388 deletions
diff --git a/kernels/linux-libre-lts-api-headers/PKGBUILD b/kernels/linux-libre-lts-api-headers/PKGBUILD new file mode 100755 index 000000000..6bf0e3ca6 --- /dev/null +++ b/kernels/linux-libre-lts-api-headers/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: $ +# Maintainer: André Silva <emulatorman@lavabit.com> + +pkgname=linux-libre-lts-api-headers +_basekernel=3.0 +_sublevel=44 +pkgver=${_basekernel}.${_sublevel} +pkgrel=1 +pkgdesc="Kernel libre lts headers sanitized for use in userspace - stable longtime supported kernel package suitable for servers" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/libc" +license=('GPL2') +provides=("linux-api-headers=3.5" "linux-libre-api-headers=3.5") +conflicts=('linux-api-headers' 'linux-libre-api-headers') +replaces=('linux-api-headers' 'linux-libre-api-headers') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") +md5sums=('5f64180fe7df4e574dac5911b78f5067' + '6daa8be01b49423178082ebf5f615a24') + +build() { + cd ${srcdir}/linux-${_basekernel} + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi + + make mrproper + make headers_check +} + +package() { + cd ${srcdir}/linux-${_basekernel} + make INSTALL_HDR_PATH=${pkgdir}/usr headers_install + + # use headers from libdrm + rm -rf ${pkgdir}/usr/include/drm + + # clean-up unnecessary files generated during install + find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete +} diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 64bcc5bb4..5afccbcfb 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=28 +pkgrel=31 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index 1c3cb4f8e..aa71a92ac 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 49e837e02..32be5dd3c 100755 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $ +# $Id: PKGBUILD 167924 2012-10-03 20:35:33Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2012.8 -pkgrel=1.2 +pkgver=2012.10 +pkgrel=1 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -90,13 +90,13 @@ package() { done ln -s ../man usr/local/share/man } -md5sums=('45940618da782cc391c59f88ab3333c3' +md5sums=('004013ac940ef3d3cdd8c596e7accfe1' '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' + '455b78cada80f40b6f6968f5cbd97a2e' 'b8355d9d2782f424f4cedcf682651be0' 'ca716f853860199c1286e7939b2f2666' '1745349eb24ed21b4cfaa6f423bddb76' @@ -105,7 +105,7 @@ md5sums=('45940618da782cc391c59f88ab3333c3' '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - 'f95416882cef800edef08382a1176b7d' + '677523dbe94b79299aa91b35ed8203b6' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130' '3674fcb22044d2946934e7826aa0c632' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index c8717f01b..34fcc0dee 100755 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -41,8 +41,10 @@ post_upgrade() { _addgroup scanner -g 96 _addgroup rfkill -g 24 _addgroup lock -g 54 + _addgroup uuidd -g 68 + _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin - # sync gshadow to group (fixes FS#19869 + # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 6e8e773d8..cfee1f23e 100755 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -20,6 +20,7 @@ smmsp:x:25: http:x:33: games:x:50: lock:x:54: +uuidd:x:68: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index c5c76354e..c5ac18581 100755 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -20,6 +20,7 @@ smmsp::: http::: games::: lock::: +uuidd:!:: network:x:: video:x:: audio::: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index a4a24e34f..cb9fec7ff 100755 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false mail:x:8:12:mail:/var/spool/mail:/bin/false ftp:x:14:11:ftp:/srv/ftp:/bin/false http:x:33:33:http:/srv/http:/bin/false +uuidd:x:68:68:uuidd:/:/sbin/nologin nobody:x:99:99:nobody:/:/bin/false diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index cde66e1db..1f68a6356 100755 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $ +# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2012.09.1 +pkgver=2012.10.5 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -16,21 +16,22 @@ provides=('initscripts-systemd') conflicts=('initscripts-systemd') replaces=('initscripts-systemd') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools') optdepends=('dhcpcd: DHCP network configuration' 'bridge-utils: Legacy network bridging support' 'net-tools: Legacy network support' - 'wireless_tools: Legacy wireless networking') + 'wireless_tools: Legacy wireless networking' + 'sysvinit: Legacy init support') makedepends=(asciidoc) install=initscripts.install source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig}) package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - # moved to filesystem - rm -rf ${pkgdir}/etc/profile.d + make DESTDIR=${pkgdir} install } md5sums=('16039aeb4c996194d9466a8c66a06f5a' '522804c7981c32c3c779964844d64377') +md5sums=('3be94446496bda58051141e0d3863a7b' + '3f03d3a5c7d8b7e1ddebb13334441440') diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff new file mode 100644 index 000000000..c0a6a4fd6 --- /dev/null +++ b/libre/initscripts/split-hwclock-calls.diff @@ -0,0 +1,21 @@ +diff --git a/rc.sysinit b/rc.sysinit +index eb49e2b..8f9727b 100755 +--- a/rc.sysinit ++++ b/rc.sysinit +@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid + + run_hook sysinit_start + +-HWCLOCK_PARAMS="--systz" + case $HARDWARECLOCK in + "") ;; + UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";; +@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then + + [[ $TIMEZONE ]] && export TZ=$TIMEZONE + +- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail ++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail + + unset TZ + fi diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index f69e561be..17fafa08c 100755 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f' +sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index ba6273763..bcf1c0922 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_lite.desktop') -sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec' +sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index e5fdb1ea6..ce44c6bcd 100755 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $ +# $Id: PKGBUILD 167425 2012-10-02 09:09:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0' +sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 7b7d47180..d5211499b 100755 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.1 -pkgrel=3 +pkgver=4.9.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') +sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') build() { cd "${srcdir}" diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index a71990231..68954e29b 100755 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91') +sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c') build() { cd "${srcdir}" diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index be5acfd2f..fcc53e9d9 100755 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD @@ -2,11 +2,11 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kile pkgname=kile-libre -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="A user friendly TeX/LaTeX frontend for KDE" arch=("i686" "x86_64") @@ -20,7 +20,7 @@ provides=('kile') install=${_pkgname}.install source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2" "no-acroread.patch") -sha1sums=('238a8fde4fca00e06b314c13671ff53e2ac4845c' +sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5' '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6') build() { diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index cf0ecaa08..582234b13 100755 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.8 -pkgrel=1.2 +pkgver=1.8.9 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('9dfbf5ff8bd91060bdea93d74c37a8a828a2edfe' +sha1sums=('35452b46d987ba37d5a81ea3e4c0f7199c9c0403' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index cf2fdca23..2aaf0e3fc 100755 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -6,7 +6,7 @@ pkgname=linux-libre-api-headers _basekernel=3.5 -_sublevel=1 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel libre headers sanitized for use in userspace" @@ -19,7 +19,7 @@ replaces=('linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '67b650dd355fbca16035510df063420b') + '2e138b46c5855fff8e0d7afe760a4150') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD new file mode 100644 index 000000000..57488f6de --- /dev/null +++ b/libre/linux-libre-firmware/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: André Silva <emulatorman@lavabit.com> +# Contributor: Márcio Silva <coadde@lavabit.com> + +pkgname=linux-libre-firmware +pkgver=3.6 +pkgrel=2 +pkgdesc='Free firmware files for Linux-libre' +arch=('any') +url='http://linux-libre.fsfla.org/' +license=('GPL2') +provides=('linux-firmware=20120625' + 'kernel26-firmware=2.6.34.99') +conflicts=('linux-firmware' + 'linux-firmware-git' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +replaces=('linux-firmware' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") +md5sums=('a2312edd0265b5b07bd4b50afae2b380') + +package() { + cd $srcdir/linux-$pkgver + + make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install + + # move WHENCE file to linux-libre-firmware license folder + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 77bc80f7d..4feb1ac6f 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=43 +_sublevel=45 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.44 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,9 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'c4b4e6d908e70fc6f991a1789a3ac620' - '2e7d5f58da4d66e87bbe2c9294c50aef' - '77608e2de7b30a08ecd8e422bf2b16bb' + '74df2b1ddb4f50eed20df1dbfda040cd' + 'aed25ab047e1c0b020a1516c235c6a74' + '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -40,7 +40,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '2c4870ef22f87ef885f3be392d1aaa90') + '31878a4cf1dd4083a61982199b4ee650') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -90,7 +90,7 @@ build() { # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README # and make USB storage support builtin (e.g. for booting from USB # disks without slowly loading an initramfs) - sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \ @@ -154,7 +154,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'kmod') + depends=('coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 74d543f70..823d65d18 100755 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -5069,7 +5069,7 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_GENERIC_ACL=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index e43cc343c..89eed9382 100755 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4811,7 +4811,7 @@ CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_GENERIC_ACL=y diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index d24939c13..843a3ce27 100755 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.43-1-LIBRE-LTS +KERNEL_VERSION=3.0.45-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 802800fa0..d3154ac86 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -4,11 +4,11 @@ pkgbase=linux-libre-tools pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') -_basekernel=3.5 +_basekernel=3.6 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=5 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'usbipd.conf' 'usbipd.rc' 'usbipd.service') -md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '18d5aa9e4c6bb23bb02bf65e155e0f0e' - '1d9214637968b91706b6e616a100d44b' +md5sums=('a2312edd0265b5b07bd4b50afae2b380' + '56883c159381ba89e50ab8ea65efec77' + '5fc1fcda4cef93f16e752b1931db23e3' 'c0d17b5295fe964623c772a2dd981771' '2450e8ff41b30eb58d43b5fffbfde1f4' 'e8fac9c45a628015644b4150b139278a' @@ -102,7 +102,7 @@ package_cpupower-libre() { pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') - replaces=('cpupower') + replaces=('cpupower' 'cpufrequtils') conflicts=('cpupower' 'cpufrequtils') provides=("cpupower=$pkgver") @@ -152,4 +152,4 @@ package_usbip-libre() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf index f4e9cc4c8..b5c522ea1 100755 --- a/libre/linux-libre-tools/cpupower.conf +++ b/libre/linux-libre-tools/cpupower.conf @@ -8,10 +8,11 @@ #max_freq="3GHz" # Specific frequency to be set. -# Requires userspace governor to be available and loaded. +# Requires userspace governor to be available. +# Do not set governor field if you use this one. #freq= -# Utilizes cores in one processor package/socket first before processes are +# Utilizes cores in one processor package/socket first before processes are # scheduled to other processor packages/sockets. # See man (1) CPUPOWER-SET for additional details. #mc_scheduler= diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc index 2c4441c4e..88edaf791 100755 --- a/libre/linux-libre-tools/cpupower.rc +++ b/libre/linux-libre-tools/cpupower.rc @@ -2,7 +2,6 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/${0##*/} case "$1" in start|restart) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0e350070c..61ba504a7 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,11 +9,11 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.5 -_sublevel=4 +_basekernel=3.6 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,23 +29,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'alsa-powersave-3.5.x.patch' - 'watchdog-3.5.x.patch' - 'i915-i2c-crash-3.5.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '51fd8205ef5bcebc8c777a30c57b1fa2' - 'd83444b46ed5088e47f38cce2641023c' - '1ca6f15729d07ae7b3969eea3b4d8cff' +md5sums=('a2312edd0265b5b07bd4b50afae2b380' + '62d272c8ec79bd2eb9cc56001aaf1042' + '8262778cb9c808d1c33f3e3c726e48e3' + 'e0ba119c57f72d467995e8e63a69b2ab' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - 'c1d58e712112cf8f95e7831012a1e67a' - 'ae13ed1e92bba07e9b17cf5c8d89683c' - 'ff4a203dd52e4dfb5d60948bb667d06d' - 'd5c5a9bb87544c9fbc19c661802f9020') + '5dd9f2e6717ed2639c1685cffe034b7f') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -65,14 +59,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix broken watchdog - # https://bugzilla.kernel.org/show_bug.cgi?id=44991 - patch -Np1 -i "${srcdir}/watchdog-3.5.x.patch" - - # fix i915 i2c crash - # https://bugzilla.kernel.org/show_bug.cgi?id=46381 - patch -Np1 -i "${srcdir}/i915-i2c-crash-3.5.x.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -154,7 +140,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'kmod') + depends=('coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") @@ -178,8 +164,7 @@ _package() { _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} - mkdir -p "${pkgdir}"/{usr/{lib/modules,lib/firmware},boot} - ln -s usr/lib "${pkgdir}"/lib + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install if [ "$CARCH" == "mips64el" ]; then @@ -214,22 +199,22 @@ _package() { fi # remove build and source links - rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build} + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware -# rm -rf "${pkgdir}/lib/firmware" + rm -rf "${pkgdir}/lib/firmware" # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" - echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" -# remove the symlink (conflicts with glibc) - rm ${pkgdir}/lib + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 64792e25e..e3598a3e0 100755 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.5.0-2 Kernel Configuration +# Linux/i386 3.6.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -134,10 +134,8 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set -CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +# CONFIG_MEMCG is not set +# CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -152,7 +150,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -230,6 +227,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y @@ -334,7 +332,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -443,6 +441,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y @@ -516,7 +515,7 @@ CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set -CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP_DEBUG=y # CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y @@ -604,6 +603,7 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_INTEL_IDLE=y # @@ -747,6 +747,7 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -838,6 +839,8 @@ CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -1298,6 +1301,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m @@ -1328,7 +1332,6 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -1343,6 +1346,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 @@ -1393,6 +1397,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set CONFIG_CONNECTOR=y @@ -1639,9 +1644,6 @@ CONFIG_EEPROM_93CX6=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y -CONFIG_IWMC3200TOP=m -# CONFIG_IWMC3200TOP_DEBUG is not set -# CONFIG_IWMC3200TOP_DEBUGFS is not set # # Texas Instruments shared transport line discipline @@ -1683,7 +1685,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1943,7 +1944,6 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2002,6 +2002,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m @@ -2287,6 +2288,7 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m CONFIG_NATIONAL_PHY=m @@ -2440,6 +2442,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m # # Debugging Options @@ -2457,9 +2460,6 @@ CONFIG_IWL3945=m # iwl3945 / iwl4965 Debugging Options # # CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWM=m -# CONFIG_IWM_DEBUG is not set -CONFIG_IWM_TRACING=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m @@ -2488,6 +2488,7 @@ CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y CONFIG_RT2800PCI_RT35XX=y CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m @@ -2514,6 +2515,7 @@ CONFIG_WL_TI=y CONFIG_WL1251=m CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m +CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y @@ -2529,8 +2531,6 @@ CONFIG_MWIFIEX_USB=m # CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -# CONFIG_WIMAX_IWMC3200_SDIO is not set CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set CONFIG_VMXNET3=m @@ -2809,11 +2809,13 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m CONFIG_TOUCHSCREEN_WACOM_I2C=m CONFIG_TOUCHSCREEN_MAX11801=m CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_HTCPEN=m CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m @@ -3041,6 +3043,7 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set @@ -3115,6 +3118,7 @@ CONFIG_GPIO_ICH=m # # I2C GPIO expanders: # +CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -3125,6 +3129,7 @@ CONFIG_GPIO_ICH=m # PCI GPIO expanders: # CONFIG_GPIO_CS5535=y +CONFIG_GPIO_AMD8111=m # CONFIG_GPIO_LANGWELL is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set @@ -3163,6 +3168,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_AVS=y CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3201,6 +3207,7 @@ CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m # CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -3384,6 +3391,7 @@ CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y # CONFIG_BCMA_DEBUG is not set # @@ -3400,6 +3408,10 @@ CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m # CONFIG_MFD_TMIO is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m @@ -3421,22 +3433,28 @@ CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_DVB_NET=y -CONFIG_VIDEO_MEDIA=m # -# Multimedia drivers +# Media drivers # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m -CONFIG_LIRC=m CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m @@ -3445,7 +3463,7 @@ CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m @@ -3456,6 +3474,7 @@ CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m CONFIG_MEDIA_ATTACH=y @@ -3483,6 +3502,8 @@ CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_VIDEO_V4L2=m @@ -3565,6 +3586,7 @@ CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m CONFIG_VIDEO_AK881X=m # @@ -3603,7 +3625,10 @@ CONFIG_VIDEO_THS7303=m CONFIG_VIDEO_M52790=m CONFIG_VIDEO_VIVI=m CONFIG_V4L_USB_DRIVERS=y -CONFIG_VIDEO_AU0828=m + +# +# Webcam devices +# CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m @@ -3653,15 +3678,32 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Webcam and/or TV USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# TV USB devices +# +CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y @@ -3671,14 +3713,6 @@ CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_USBVISION=m -CONFIG_USB_SN9C102=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m CONFIG_V4L_PCI_DRIVERS=y CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -3724,6 +3758,8 @@ CONFIG_I2C_SI470X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m @@ -3859,7 +3895,6 @@ CONFIG_DVB_DDBRIDGE=m # # Supported DVB Frontends # -# CONFIG_DVB_FE_CUSTOMISE is not set # # Multistandard (satellite) frontends @@ -3926,6 +3961,7 @@ CONFIG_DVB_EC100=m CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m # # DVB-C (cable) frontends @@ -4029,6 +4065,7 @@ CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_GMA500=m CONFIG_DRM_GMA600=y CONFIG_DRM_GMA3600=y @@ -4358,6 +4395,7 @@ CONFIG_AC97_BUS=m # CONFIG_HID=m CONFIG_HIDRAW=y +CONFIG_UHID=m CONFIG_HID_GENERIC=m # @@ -4388,6 +4426,7 @@ CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -4777,13 +4816,16 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM3556=m CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y # # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m @@ -4801,6 +4843,7 @@ CONFIG_EDAC=y # # Reporting subsystems # +CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_MCE_INJ=m @@ -4918,6 +4961,7 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y @@ -4948,14 +4992,14 @@ CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_MISC_DRIVERS=y CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_BOND=m CONFIG_COMEDI_TEST=m CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ISA_DRIVERS=y CONFIG_COMEDI_ACL7225B=m CONFIG_COMEDI_PCL711=m CONFIG_COMEDI_PCL724=m @@ -5001,7 +5045,7 @@ CONFIG_COMEDI_PCMMIO=m CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m -CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5053,13 +5097,16 @@ CONFIG_COMEDI_NI_6527=m CONFIG_COMEDI_NI_65XX=m CONFIG_COMEDI_NI_660X=m CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m CONFIG_COMEDI_S526=m CONFIG_COMEDI_S626=m CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y CONFIG_COMEDI_CB_DAS16_CS=m CONFIG_COMEDI_DAS08_CS=m CONFIG_COMEDI_NI_DAQ_700_CS=m @@ -5067,22 +5114,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m CONFIG_COMEDI_NI_LABPC_CS=m CONFIG_COMEDI_NI_MIO_CS=m CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_USB_DRIVERS=y CONFIG_COMEDI_DT9812=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_NI_COMMON=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_8255=m CONFIG_COMEDI_FC=m CONFIG_COMEDI_AMPLC_DIO200=m CONFIG_COMEDI_AMPLC_PC236=m CONFIG_COMEDI_AMPLC_PC263=m CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set @@ -5195,6 +5239,7 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5253,6 +5298,7 @@ CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y +CONFIG_OF_IOMMU=y CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set @@ -5273,9 +5319,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set +# CONFIG_PWM is not set # # Firmware Drivers @@ -5336,7 +5384,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y @@ -5351,7 +5399,7 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_GENERIC_ACL=y @@ -5446,6 +5494,8 @@ CONFIG_OMFS_FS=m # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set CONFIG_PSTORE_RAM=m # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m @@ -5456,10 +5506,11 @@ CONFIG_EXOFS_FS=m CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m -CONFIG_NFS_V2=y -CONFIG_NFS_V3=y +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set # CONFIG_NFS_V4_1 is not set CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -5637,7 +5688,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_LKDTM=m -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set # CONFIG_DEBUG_PAGEALLOC is not set @@ -5704,6 +5755,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set @@ -5788,6 +5840,8 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m # # Authenticated Encryption with Associated Data @@ -5893,6 +5947,7 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y CONFIG_VHOST_NET=m +CONFIG_TCM_VHOST=m CONFIG_LGUEST=m CONFIG_BINARY_PRINTF=y @@ -5958,6 +6013,7 @@ CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y CONFIG_CORDIC=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 14112f8c1..3263e4dca 100755 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.5.4-1 Kernel Configuration +# Linux/x86_64 3.6.0 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -136,10 +136,8 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set -CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +# CONFIG_MEMCG is not set +# CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -154,7 +152,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -231,6 +228,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y @@ -429,6 +427,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTREMOVE=y @@ -505,7 +504,7 @@ CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set -CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP_DEBUG=y # CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y @@ -577,6 +576,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_INTEL_IDLE=y # @@ -712,6 +712,7 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -803,6 +804,8 @@ CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -1255,6 +1258,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m @@ -1285,7 +1289,6 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -1300,6 +1303,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 @@ -1351,6 +1355,7 @@ CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -1575,9 +1580,6 @@ CONFIG_EEPROM_93CX6=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y -CONFIG_IWMC3200TOP=m -# CONFIG_IWMC3200TOP_DEBUG is not set -# CONFIG_IWMC3200TOP_DEBUGFS is not set # # Texas Instruments shared transport line discipline @@ -1619,7 +1621,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1854,7 +1855,6 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -1914,6 +1914,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m @@ -2170,6 +2171,7 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m CONFIG_NATIONAL_PHY=m @@ -2321,6 +2323,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m # # Debugging Options @@ -2338,9 +2341,6 @@ CONFIG_IWL3945=m # iwl3945 / iwl4965 Debugging Options # # CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWM=m -# CONFIG_IWM_DEBUG is not set -CONFIG_IWM_TRACING=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m @@ -2369,6 +2369,7 @@ CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y CONFIG_RT2800PCI_RT35XX=y CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m @@ -2395,6 +2396,7 @@ CONFIG_WL_TI=y CONFIG_WL1251=m CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m +CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y @@ -2410,8 +2412,6 @@ CONFIG_MWIFIEX_USB=m # CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -# CONFIG_WIMAX_IWMC3200_SDIO is not set CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set CONFIG_XEN_NETDEV_FRONTEND=m @@ -2671,10 +2671,12 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m CONFIG_TOUCHSCREEN_WACOM_I2C=m CONFIG_TOUCHSCREEN_MAX11801=m CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m @@ -2969,6 +2971,7 @@ CONFIG_GPIO_ICH=m # # I2C GPIO expanders: # +CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -2979,6 +2982,7 @@ CONFIG_GPIO_ICH=m # PCI GPIO expanders: # CONFIG_GPIO_CS5535=m +CONFIG_GPIO_AMD8111=m CONFIG_GPIO_LANGWELL=y # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set @@ -3015,6 +3019,7 @@ CONFIG_TEST_POWER=m # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_AVS=y CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3053,6 +3058,7 @@ CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m # CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -3229,12 +3235,13 @@ CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y # CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers # -CONFIG_MFD_CORE=m +CONFIG_MFD_CORE=y CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m @@ -3245,6 +3252,10 @@ CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m # CONFIG_MFD_TMIO is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m @@ -3266,22 +3277,28 @@ CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_DVB_NET=y -CONFIG_VIDEO_MEDIA=m # -# Multimedia drivers +# Media drivers # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m -CONFIG_LIRC=m CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m @@ -3290,7 +3307,7 @@ CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m @@ -3301,6 +3318,7 @@ CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m CONFIG_MEDIA_ATTACH=y @@ -3328,6 +3346,8 @@ CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_VIDEO_V4L2=m @@ -3410,6 +3430,7 @@ CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m CONFIG_VIDEO_AK881X=m # @@ -3448,7 +3469,10 @@ CONFIG_VIDEO_THS7303=m CONFIG_VIDEO_M52790=m CONFIG_VIDEO_VIVI=m CONFIG_V4L_USB_DRIVERS=y -CONFIG_VIDEO_AU0828=m + +# +# Webcam devices +# CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m @@ -3498,15 +3522,32 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Webcam and/or TV USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# TV USB devices +# +CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y @@ -3516,14 +3557,6 @@ CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_USBVISION=m -CONFIG_USB_SN9C102=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m CONFIG_V4L_PCI_DRIVERS=y CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -3569,6 +3602,8 @@ CONFIG_I2C_SI470X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m @@ -3703,7 +3738,6 @@ CONFIG_DVB_DDBRIDGE=m # # Supported DVB Frontends # -# CONFIG_DVB_FE_CUSTOMISE is not set # # Multistandard (satellite) frontends @@ -3770,6 +3804,7 @@ CONFIG_DVB_EC100=m CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m # # DVB-C (cable) frontends @@ -3867,6 +3902,7 @@ CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_GMA500=m CONFIG_DRM_GMA600=y CONFIG_DRM_GMA3600=y @@ -4156,6 +4192,7 @@ CONFIG_AC97_BUS=m # CONFIG_HID=m CONFIG_HIDRAW=y +CONFIG_UHID=m CONFIG_HID_GENERIC=m # @@ -4186,6 +4223,7 @@ CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -4574,13 +4612,16 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM3556=m CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y # # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m @@ -4598,6 +4639,7 @@ CONFIG_EDAC=y # # Reporting subsystems # +CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_MCE_INJ=m @@ -4713,6 +4755,7 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m @@ -4750,6 +4793,7 @@ CONFIG_XEN_TMEM=y CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_MCE_LOG is not set CONFIG_STAGING=y CONFIG_ET131X=m CONFIG_SLICOSS=m @@ -4764,14 +4808,14 @@ CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_MISC_DRIVERS=y CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_BOND=m CONFIG_COMEDI_TEST=m CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -4823,13 +4867,16 @@ CONFIG_COMEDI_NI_6527=m CONFIG_COMEDI_NI_65XX=m CONFIG_COMEDI_NI_660X=m CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m CONFIG_COMEDI_S526=m CONFIG_COMEDI_S626=m CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y CONFIG_COMEDI_CB_DAS16_CS=m CONFIG_COMEDI_DAS08_CS=m CONFIG_COMEDI_NI_DAQ_700_CS=m @@ -4837,22 +4884,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m CONFIG_COMEDI_NI_LABPC_CS=m CONFIG_COMEDI_NI_MIO_CS=m CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_USB_DRIVERS=y CONFIG_COMEDI_DT9812=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_NI_COMMON=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_8255=m CONFIG_COMEDI_FC=m CONFIG_COMEDI_AMPLC_DIO200=m CONFIG_COMEDI_AMPLC_PC236=m CONFIG_COMEDI_AMPLC_PC263=m CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set CONFIG_R8187SE=m @@ -4964,6 +5008,7 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5043,9 +5088,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set +# CONFIG_PWM is not set # # Firmware Drivers @@ -5122,7 +5169,7 @@ CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_GENERIC_ACL=y @@ -5217,6 +5264,8 @@ CONFIG_OMFS_FS=m # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set CONFIG_PSTORE_RAM=m # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m @@ -5227,10 +5276,11 @@ CONFIG_EXOFS_FS=m CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m -CONFIG_NFS_V2=y -CONFIG_NFS_V3=y +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set # CONFIG_NFS_V4_1 is not set CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -5407,7 +5457,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_LKDTM=m -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set # CONFIG_DEBUG_PAGEALLOC is not set @@ -5473,6 +5523,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set +# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y @@ -5558,6 +5609,8 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m # # Authenticated Encryption with Associated Data @@ -5628,11 +5681,13 @@ CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m # # Compression @@ -5665,6 +5720,7 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y CONFIG_VHOST_NET=m +CONFIG_TCM_VHOST=m CONFIG_BINARY_PRINTF=y # @@ -5728,6 +5784,7 @@ CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y CONFIG_CORDIC=m diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 8b449331b..389ab27c6 100755 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.5.4-1-LIBRE +KERNEL_VERSION=3.6.1-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index bcb82132a..d4d91c412 100755 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,32 +6,24 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=27 +pkgrel=31 epoch=1 -_extramodules=extramodules-3.5-LIBRE +_extramodules=extramodules-3.6-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.service lircm.service irexec.service + lirc.tmpfiles + ) build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" @@ -64,7 +56,7 @@ build() { package_lirc-libre() { pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" - depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5') + depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") @@ -88,11 +80,16 @@ package_lirc-utils-libre() { conflicts=('lirc-utils') provides=("lirc-utils=$pkgver") backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service + install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service + install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service + install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf cp -rp remotes "${pkgdir}/usr/share/lirc" chmod -R go-w "${pkgdir}/usr/share/lirc/" @@ -110,3 +107,18 @@ package_lirc-utils-libre() { # remove built modules rm -r "${pkgdir}/usr/lib/modules" } +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb' + 'dab8a73bcc5fd5479d8750493d8d97dc' + 'c2e20fe68b034df752dba2773db16ebe' + '07131d117fcfe9dcd50c453c3a5e9531' + 'febf25c154a7d36f01159e84f26c2d9a')
\ No newline at end of file diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service new file mode 100644 index 000000000..5d7915b29 --- /dev/null +++ b/libre/lirc-libre/irexec.service @@ -0,0 +1,11 @@ +[Unit] +Description=IR Exec +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/bin/irexec --daemon +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install new file mode 100644 index 000000000..293d1ed7c --- /dev/null +++ b/libre/lirc-libre/lirc-utils.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create lirc.conf +} + +post_upgrade() { + post_install +} diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index b39282da6..976f5ab8a 100755 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.5-LIBRE +EXTRAMODULES=extramodules-3.6-LIBRE post_install() { # updating module dependencies diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service new file mode 100644 index 000000000..953601fd3 --- /dev/null +++ b/libre/lirc-libre/lirc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Linux Infrared Remote Control + +[Service] +ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd +ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +Type=forking +PIDFile=/run/lirc/lircd.pid + +[Install] +WantedBy=multi-user.target diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles new file mode 100644 index 000000000..0b80e2e47 --- /dev/null +++ b/libre/lirc-libre/lirc.tmpfiles @@ -0,0 +1 @@ +d /run/lirc 0755 root root - diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service new file mode 100644 index 000000000..6b258e312 --- /dev/null +++ b/libre/lirc-libre/lircm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LIRC Mouse +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/sbin/lircmd -u +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index a360e113e..f418684b5 100755 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,59 +1,48 @@ -# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $ +# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +_pkgname=rp-pppoe pkgname=rp-pppoe-libre -pkgver=3.10 -pkgrel=7 +pkgver=3.11 +pkgrel=1 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed." arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') depends=('ppp>=2.4.5' 'sh' 'net-tools') +backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq + etc/ppp/pppoe-server-options) options=('!makeflags') -backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) -source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl - $pkgname.patch) -install=rp-pppoe.install provides=("rp-pppoe=$pkgver") replaces=('rp-pppoe') conflicts=('rp-pppoe') +install=rp-pppoe.install +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl adsl.service $pkgname.patch) +md5sums=('13b5900c56bd602df6cc526e5e520722' + '8fc724aa146dba52ef7b3fbe5b8784c6' + 'adace1ad441aa88dcb3db52fb7f9c97f' + 'af234125f956f3a356ab0d0fcaa9e8a2' + '3c53d550ac408608abb0b6cd6b76b6c2') -mksource() { - wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \ - -O - | tar xzf - - - pushd rp-pppoe-$pkgver >/dev/null - - patch -Np1 -i ../rp-pppoe-libre.patch - - popd >/dev/null - - mv -v rp-pppoe-$pkgver $pkgname-$pkgver +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ## Adding patch to remove unfree software recommendation (ServPoET) + patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/ -} + cd ./src -build() { - cd $srcdir/$pkgname-$pkgver/src ./configure --prefix=/usr --enable-plugin - make PLUGIN_DIR="/usr/lib/rp-pppoe" + make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } package() { - cd $srcdir/$pkgname-$pkgver/src - make DESTDIR=$pkgdir install - - #moving .so files to /usr/lib according to FS#13876 - mkdir -p ${pkgdir}/usr/lib/rp-pppoe - mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/ - #not necessary after moving the plugin - rm -rf ${pkgdir}/etc/ppp/plugins - #changing config to the new path - #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf + cd "$srcdir/$_pkgname-$pkgver/src" + make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl + install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } -md5sums=('2c4a678fa684269ff4579bb639674198' - 'adace1ad441aa88dcb3db52fb7f9c97f' - '9f0d49c3a550c5ad76bb70d65c9d97b2') diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service new file mode 100644 index 000000000..324164943 --- /dev/null +++ b/libre/rp-pppoe-libre/adsl.service @@ -0,0 +1,10 @@ +[Unit] +Description=ADSL Deamon + +[Service] +Type=forking +ExecStart=/usr/sbin/pppoe-start +ExecStop=/usr/sbin/pppoe-stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch index 4f2302496..9cf16d7d7 100755..100644 --- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch +++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch @@ -1,7 +1,7 @@ -diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec ---- rp-pppoe-3.10/rp-pppoe.spec 2008-06-30 11:00:41.000000000 -0300 -+++ rp-pppoe-3.10-libre//rp-pppoe.spec 2011-06-05 21:03:06.000000000 -0300 -@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT +diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec +--- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300 +@@ -55,7 +55,7 @@ %files %defattr(-,root,root) @@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec %config(noreplace) /etc/ppp/pppoe.conf %config(noreplace) /etc/ppp/pppoe-server-options %config(noreplace) /etc/ppp/firewall-masq -diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET ---- rp-pppoe-3.10/SERVPOET 2008-06-30 11:00:41.000000000 -0300 -+++ rp-pppoe-3.10-libre//SERVPOET 1969-12-31 21:00:00.000000000 -0300 +diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null +--- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300 ++++ /dev/null 2012-10-05 01:27:08.580078512 -0300 @@ -1,18 +0,0 @@ -# LIC: GPL - @@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET - --- -David F. Skoll <dfs@roaringpenguin.com> -diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in ---- rp-pppoe-3.10/src/Makefile.in 2008-06-30 11:00:42.000000000 -0300 -+++ rp-pppoe-3.10-libre//src/Makefile.in 2011-06-05 21:03:51.000000000 -0300 -@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@ +diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in +--- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300 +@@ -44,9 +44,6 @@ PPPOE_PATH=$(sbindir)/pppoe PPPD_PATH=@PPPD@ @@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in # Kernel-mode plugin gets installed here. PLUGIN_DIR=/etc/ppp/plugins PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so -@@ -151,7 +148,6 @@ install: all +@@ -152,7 +149,6 @@ $(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir) $(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir) $(install) -m 644 ../README $(DESTDIR)$(docdir) @@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) -mkdir -p $(DESTDIR)$(mandir)/man8 for i in $(TARGETS) ; do \ -@@ -209,25 +205,15 @@ install: all +@@ -210,25 +206,15 @@ @echo "" @echo "Type 'pppoe-setup' to configure the software." @@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ done mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui -@@ -282,10 +268,6 @@ rpms: tgz +@@ -286,10 +272,6 @@ /usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \ /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm @@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in - cd .. && rpm -ba servpoet.spec - clean: - rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ + rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true -@@ -300,15 +282,13 @@ distclean: clean +@@ -304,15 +286,13 @@ update-version: sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec @@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in licensed-only: - $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION) -+ $(MAKE) -C licensed-only all VERSION=$(VERSION) ++ $(MAKE) -C licensed-only all VERSION=$(VERSION) l2tp: libevent/libevent.a $(MAKE) -C l2tp all diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index add9fd496..4c8910c2b 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,13 +11,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=6 +pkgrel=9 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.5' 'linux-libre<3.6') -makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6') +depends=('linux-libre>=3.6' 'linux-libre<3.7') +makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 5fe1bab90..3662e7f34 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.5-ARCH +extramodules=/usr/lib/modules/extramodules-3.6-ARCH post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 0d01ae1e6..f35ba99c9 100755 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -2,17 +2,18 @@ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 -_extramodules=extramodules-3.5-LIBRE -pkgrel=9 +_extramodules=extramodules-3.6-LIBRE +pkgrel=12 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.5' 'linux-libre<3.6') +depends=('linux-libre>=3.6' 'linux-libre<3.7') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index b2a49a261..8bd740943 100755 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,6 @@ _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 13a37fe88..e5112c8a9 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -40,7 +40,8 @@ package_virtualbox-libre-host-modules-lts(){ install=virtualbox-libre-host-modules-lts.install _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS + _extraver=extramodules-3.0-LIBRE-LTS install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" @@ -59,7 +60,8 @@ package_virtualbox-libre-guest-modules-lts(){ install=virtualbox-libre-guest-modules-lts.install _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS + _extraver=extramodules-3.0-LIBRE-LTS install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 8d3f61b3a..3bd4616eb 100755 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.0 -pkgrel=2 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -32,7 +32,7 @@ build() { package_virtualbox-libre-host-modules(){ pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -51,7 +51,7 @@ package_virtualbox-libre-host-modules(){ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel libre modules for VirtualBox' license=('GPL') - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') @@ -64,7 +64,7 @@ package_virtualbox-libre-guest-modules(){ cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index c3419c991..caf59aa13 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 2f91afab0..8bd1c2022 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-utils' 'virtualbox-libre-guest-source') pkgver=4.2.0 -pkgrel=3.1 +pkgrel=3.2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -108,7 +108,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '67cc4c8611890038eb3e4114ae899525' - '5965e518e160169c2a443a2ca0668908') + '1ede8951f4bebac3b50a8e0b999aa348') #_extramodules=extramodules-3.5-LIBRE #_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index dd4ad637c..223aeeb16 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -500,8 +500,8 @@ 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-03 17:22:45.602287883 -0300 -@@ -44,45 +44,44 @@ ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-04 01:54:14.693582889 -0300 +@@ -44,45 +44,45 @@ static const osTypePattern gs_OSTypePattern[] = { @@ -535,23 +535,25 @@ - { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, - { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, - { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, -+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ -+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, -+ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" }, -+ { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, -+ { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, -+ { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, -+ { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, -+ { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, -+ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, -+ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, - +- - /* OS/2: */ - { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, - { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, ++ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, ++ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" }, ++ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" }, ++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, ++ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -583,7 +585,7 @@ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +89,7 @@ +@@ -90,7 +90,7 @@ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -592,7 +594,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +114,38 @@ +@@ -115,15 +115,38 @@ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -639,7 +641,7 @@ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +158,8 @@ +@@ -136,6 +159,8 @@ { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -650,10 +652,12 @@ --- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300 -@@ -3406,6 +3406,17 @@ +@@ -3405,7 +3405,18 @@ + { "netware", "Netware" }, { "solaris", "Solaris" }, { "opensolaris", "OpenSolaris" }, - { "l4", "L4" } +- { "l4", "L4" } ++ { "l4", "L4" }, + { "gnu", "GNU" }, + { "gnuhurd", "GNUHurd" }, + { "parabola", "Parabola" }, @@ -664,7 +668,7 @@ + { "musix", "Musix" }, + { "trisquel", "Trisquel" }, + { "dynebolic", "Dynebolic" }, -+ { "venenux", "Venenux" }, ++ { "venenux", "Venenux" } }; void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) @@ -981,3 +985,14 @@ }; +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300 +@@ -141,7 +141,7 @@ + #ifdef VBOX_WITH_VIDEOHWACCEL + /* Check if 2D video acceleration supported by the guest OS type: */ + QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); +- m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows"; ++ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs"; + #endif /* VBOX_WITH_VIDEOHWACCEL */ + #ifdef VBOX_WITH_CRHGSMI + /* Check if WDDM mode supported by the guest OS type: */ diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD new file mode 100644 index 000000000..9f03c48db --- /dev/null +++ b/pcr/debootstrap/PKGBUILD @@ -0,0 +1,20 @@ +# $Id$ +# Maintainer: André Silva <emulatorman@lavabit.com> + +pkgname=debootstrap +pkgver=1.0.26 +pkgrel=1 +pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt" +arch=('any') +license=('GPL') +url="http://www.gnewsense.org" +depends=('bash' 'wget') +source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb") +install="debootstrap.install" +md5sums=('2049317eac54c0fac6c3201a90fadc18') + +build(){ + tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/" + # doesn't work with gpg 2.x, patch to point to gpgv1 + sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" +} diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap/debootstrap.install new file mode 100644 index 000000000..85a99f160 --- /dev/null +++ b/pcr/debootstrap/debootstrap.install @@ -0,0 +1,14 @@ +post_install() { + if [ "$(uname -m)" = "x86_64" ]; then + darch="amd64" + elif [ "$(uname -m)" = "i386" ]; then + darch="i386" + else + darch="mips64el" + fi + echo "$darch" > /usr/share/debootstrap/arch +} + +pre_remove() { + rm -f /usr/share/debootstrap/arch +} diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD index 8d11e3747..18546b470 100755 --- a/pcr/minetest/PKGBUILD +++ b/pcr/minetest/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=minetest-git -pkgver=20120409 -pkgrel=1 +pkgver=20120918 +pkgrel=2 pkgdesc="An Infiniminer/Minecraft inspired game, git version." arch=('i686' 'x86_64') url="http://celeron.55.lt/~celeron55/minetest/" diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD index dbcd531f4..fce700054 100755 --- a/pcr/ryzom-client/PKGBUILD +++ b/pcr/ryzom-client/PKGBUILD @@ -1,42 +1,63 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=('ryzom-client') -pkgver=0.8.0 -pkgrel=7 +pkgname=ryzom-client-hg +pkgver=2691 +pkgrel=3 +pkgdesc='An awesome free software 3D MMORPG game' arch=('x86_64' 'i686') url="http://www.ryzom.com" license=('AGPL3') -pkgdesc="An awesome free software 3D MMORPG game" -depends=('ryzom-data' 'ryzom-nel' 'luabind') -conflicts=('ryzom-client') groups=('ryzom') +depends=('ryzom-data' 'ryzom-nel-hg' 'luabind') +makedepends=('mercurial' 'kervalasquish-hg' + 'cmake' 'bison' 'lua' 'luabind' + 'curl' 'libpng' 'libwww' + 'boost' 'ryzom-nel-hg') -makedepends=('kervalasquish-hg' 'cmake' 'bison' - 'lua' 'luabind' 'curl' 'libpng' 'libwww' - 'boost' 'ryzom-nel') +conflicts=('ryzom-client' 'ryzom-client-hg') +replaces=('ryzom-client') +backup=('etc/client_default.cfg') +source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg') +noextract=() -auser="shackra" -achangeset="56d1642e24ac" - -source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") +_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom +_hgrepo=ryzom build() { - cd "$srcdir/$auser-ryzom-$achangeset/code" - if [[ -d "ryzom-client" ]]; then - rm -rf "ryzom-client" - mkdir "ryzom-client" + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." else - mkdir "ryzom-client" + hg clone "$_hgroot" "$_hgrepo" fi - - cd "ryzom-client" - cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make -j3 + msg "Mercurial checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_hgrepo-build" + cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" + mkdir "$srcdir/$_hgrepo-build/code/ryzom-client" + cd "$srcdir/$_hgrepo-build/code/ryzom-client" + + # + # BUILD HERE + # + cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin + + make -j3 + + # Replacing client_default.cfg file + cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" + sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" + sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" } package() { - cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + cd "$srcdir/$_hgrepo-build/code/ryzom-client" make DESTDIR="$pkgdir" install } -sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') +sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f') diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD index b45bef098..bc9fa3199 100755 --- a/pcr/ryzom-nel/PKGBUILD +++ b/pcr/ryzom-nel/PKGBUILD @@ -1,53 +1,68 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname='ryzom-nel' -pkgver=0.8.0 -pkgrel=11 +pkgname=ryzom-nel-hg +pkgver=2687 +pkgrel=3 +pkgdesc='An awesome free software 3D MMORPG game, NeL engine' arch=('x86_64' 'i686') -conflicts=('ryzom-nel') -groups=('ryzom') - -pkgdesc="An awesome free software 3D MMORPG game, NeL engine" url="http://www.ryzom.com" license=('AGPL3') -depends=('freetype2' - 'libx11' - 'mesa' - 'libxxf86vm' - 'openal' - 'freealut' - 'libogg' - 'libvorbis' - 'libxml2' - 'libjpeg' - 'rrdtool' ) -makedepends=('cmake' 'bison' 'kervalasquish-hg') - -auser="shackra" -achangeset="56d1642e24ac" - -source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") +groups=('ryzom') +depends=('mercurial' + 'freetype2' + 'libx11' + 'mesa-git' + 'libxxf86vm' + 'openal' + 'freealut' + 'libogg' + 'libvorbis' + 'libxml2' + 'libjpeg-turbo' + 'rrdtool' + 'libgl-git') +makedepends=('mercurial' 'cmake' 'bison') + +conflicts=('ryzom-nel' 'ryzom-nel-hg') +replaces=('ryzom-nel') +backup=('etc/nel/build_ig_boxes.cfg' + 'etc/nel/build_indoor_rbank.cfg' + 'etc/nel/build_rbank.cfg' + 'etc/nel/make_sheet_id.cfg' + 'etc/nel/zviewer.cfg') + +_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom +_hgrepo=ryzom build() { - cd "$srcdir/$auser-ryzom-$achangeset/code" - - if [[ -d $pkgname ]]; then - rm -rf $pkgname - mkdir $pkgname + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [[ -d "$_hgrepo" ]]; then + cd "$_hgrepo" + hg pull -u + msg "The local files are updated." else - mkdir $pkgname + hg clone "$_hgroot" "$_hgrepo" fi - cd $pkgname + msg "Mercurial checkout done or server timeout" + msg "Starting build..." - #CMAKE_USE_RELATIVE_PATHS=true - cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel + rm -rf "$srcdir/$_hgrepo-build" + cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" + mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel" + cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - make -j3 + # + # BUILD HERE + # + cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel + + make -j3 } package() { - cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + cd "$srcdir/$_hgrepo-build/code/ryzom-nel" make DESTDIR="$pkgdir" install } -sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD index 01428fa27..e668cd3ae 100755..100644 --- a/pcr/yate/PKGBUILD +++ b/pcr/yate/PKGBUILD @@ -2,20 +2,21 @@ # Contributor: Yejun Yang <yejunx AT gmail DOT com> # Contributor: Biru Ionut <ionut@archlinux.ro> pkgname=yate - pkgver=4.1.0 + pkgver=4.2.0 pkgrel=1 pkgdesc="next-generation telephony engine" arch=('i686' 'x86_64') url="http://yate.null.ro" license=('GPL') depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \ - 'alsa-lib') + 'alsa-lib' 'qt') makedepends=('pkgconfig') - source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init) + source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init) options=(!makeflags) - md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5' - 'c0d344607046c47c1d75ac23d323817a') + md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68' + 'c0d344607046c47c1d75ac23d323817a') + build() { cd $srcdir/${pkgname} diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD index 98e64982d..7e2fe14aa 100644 --- a/social/netatalk/PKGBUILD +++ b/social/netatalk/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Farhan Yousaf <farhany at xaviya dot com> pkgname=netatalk -pkgver=3.0 -pkgrel=4 +pkgver=3.0.1 +pkgrel=1 pkgdesc='Open Source AFP fileserver' arch=('i686' 'x86_64') url='http://netatalk.sourceforge.net' @@ -54,3 +54,5 @@ package() { msg2 'Copying initscripts...' install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk } +md5sums=('5e92015b0d9ac77af4b598cca6cb435c' + 'b4f5c932b2ca99f5292bd6b6d69b3ebc') diff --git a/~lukeshu/etckeeper/.gitignore b/~lukeshu/etckeeper/.gitignore new file mode 100644 index 000000000..b4a9ca909 --- /dev/null +++ b/~lukeshu/etckeeper/.gitignore @@ -0,0 +1 @@ +etckeeper-0.63/ diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD index e243f29f0..a359500b5 100644 --- a/~lukeshu/etckeeper/PKGBUILD +++ b/~lukeshu/etckeeper/PKGBUILD @@ -5,7 +5,7 @@ pkgname=etckeeper pkgver=0.63 -pkgrel=2.1 +pkgrel=2.3 pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." arch=('any') backup=('etc/etckeeper/etckeeper.conf') @@ -15,7 +15,7 @@ provides=('etckeeper') depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') -source=("etckeeper-$pkgver.tar::git://git.kitenet.net/etckeeper#${pkgver}" +source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" etckeeper-archlinux.conf) build() { @@ -33,5 +33,5 @@ package() { make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install } -md5sums=('0373375e93cb7122bb0ae4749e63c0d9' +md5sums=('SKIP' '99d8d2838f49fa0f2f21c9e37948100d') diff --git a/~lukeshu/md/PKGBUILD b/~lukeshu/md/PKGBUILD new file mode 100644 index 000000000..7f74aaa2c --- /dev/null +++ b/~lukeshu/md/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=("md" "emacs-mdmua") +pkgver=0.81 +pkgrel=4 +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') + +makedepends=(python-distribute) + +#__gitbranch=1d69744 # This is the commit that is 0.81 +__gitbranch=455b6b4 # this is currently HEAD (has bugfixes) +source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}") + +build() { + cd "${srcdir}/nicferrier-md-${__gitbranch}" + + # fix typo + sed -i 's/pyprofyfs/pyproxyfs/' setup.py +} + +package_md() { + pkgdesc="A maildir client and library." + depends=('python' 'python-pyproxyfs') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +package_emacs-mdmua() { + pkgdesc="An Emacs mail user agent (MUA) build around md." + pkgver='0.72' + depends=("md=0.81" 'emacs>=24') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + cd useragents/emacs + install -d ${pkgdir}/usr/share/emacs/site-lisp + install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp +} + +md5sums=('452727348df2f51d7eddade709aceb1c') diff --git a/~lukeshu/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD index 5cbab45dc..885e06f0e 100755 --- a/~lukeshu/codeanalyst/PKGBUILD +++ b/~lukeshu/not-working/codeanalyst/PKGBUILD @@ -5,14 +5,13 @@ # The docs claim that the fork is just for adding support for # processors that aren't upstream yet (at the time, they are now that # 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well: -# * AMD also added a bunch of CodeAnalyst-specific code. Also some of -# the external. +# * AMD also added a bunch of CodeAnalyst-specific code. # * Several external variables/types have different names; the API is # incompatible. # * [extra]/oprofile-0.9.7-3 only includes about half of the headers. pkgbase=CodeAnalyst -pkgname=codeanalyst +pkgname=(codeanalyst codeanalyst-cakm) pkgver=3.3.18.0361 _pkgver="${pkgver//./_}" pkgrel=4.1 @@ -20,20 +19,24 @@ pkgdesc="AMD performance profiler. Includes a fork of oprofile." url="http://developer.amd.com/tools/${pkgbase}/" arch=('i686' 'x86_64') license=('GPL') -depends=('gcc' 'sudo' 'qt>=4.1' 'oprofile' 'libdwarf') +depends=('gcc' 'qt>=4.1' 'libdwarf') makedepends=('linux-headers' 'elfutils' 'findutils' 'file') -provides=('oprofile=0.9.6cvs') -conflicts=('oprofile') options=('!strip') install=codeanalyst.install source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz" 'gcc47.patch' 'skipSetup.patch' + 'kernel3.4.patch' 'codeanalyst.sudo' 'codeanalyst.desktop' 'codeanalyst.svg') build() { + build_codeanalyst + build_codeanalyst-cakm +} + +build_codeanalyst() { cd "${srcdir}/${pkgbase}-${_pkgver}-Public" patch -Np1 -i "${srcdir}/gcc47.patch" patch -Np1 -i "${srcdir}/skipSetup.patch" @@ -46,7 +49,18 @@ build() { make } -package() { +build_codeanalyst-cakm() { + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm + cp -r kernel2.6.38 kernel3.4 + cd kernel3.4 + patch -Np1 -i "${srcdir}/kernel3.4.patch" + make +} + +package_codeanalyst() { + provides=('oprofile=0.9.6cvs') + conflicts=('oprofile') + cd "${srcdir}/${pkgbase}-${_pkgver}-Public" make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial @@ -59,9 +73,19 @@ package() { install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop" } +package_codeanalyst-cakm() { + pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko" + depends=(codeanalyst) + provides=() + + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4 + install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko" +} + md5sums=('f1e29bc7c7da259df228ce59281ee1d7' '063d0fc9680641a92ce5e310ffe1c9c0' 'ce549e59c4a5916fd19e8d085e863627' + '3a5d820a43a0360d561bb0c4d67d9735' '3cc8f64fe84c5a886d0172ee8d99f690' '3a18d3f7fb01f199a8ed5ae2908c18e4' '1822a4157b82904b82e72fc1e9bcbd42') diff --git a/~lukeshu/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop index 56d54f884..56d54f884 100755 --- a/~lukeshu/codeanalyst/codeanalyst.desktop +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop diff --git a/~lukeshu/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install index 8edb4adc2..6ed1ac841 100755 --- a/~lukeshu/codeanalyst/codeanalyst.install +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.install @@ -1,5 +1,5 @@ post_install() { - getent group amdca &>/dev/null || /usr/bin/groupadd amdca &>/dev/null + getent group amdca &>/dev/null || groupadd amdca &>/dev/null echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group" echo " ie: gpasswd -a USERNAME amdca" @@ -24,9 +24,6 @@ post_install() { } post_remove() { - if getent group amdca &>/dev/null; then - groupdel amdca - fi - + getent group amdca &>/dev/null && groupdel amdca &>/dev/null update-desktop-database -q } diff --git a/~lukeshu/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo index 1c3173bdb..1c3173bdb 100755 --- a/~lukeshu/codeanalyst/codeanalyst.sudo +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo diff --git a/~lukeshu/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg index 8febf725b..8febf725b 100755 --- a/~lukeshu/codeanalyst/codeanalyst.svg +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.svg diff --git a/~lukeshu/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch index dfec4a0c4..dfec4a0c4 100755 --- a/~lukeshu/codeanalyst/gcc47.patch +++ b/~lukeshu/not-working/codeanalyst/gcc47.patch diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch new file mode 100644 index 000000000..589abc800 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/kernel3.4.patch @@ -0,0 +1,72 @@ +diff -ru kernel2.6.38/Makefile kernel3.4/Makefile +--- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400 +@@ -1,6 +1,6 @@ + TARGET = oprofile.ko + +-MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile) ++MDIR = arch/x86/oprofile + + DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \ + event_buffer.o oprofile_files.o \ +@@ -16,7 +16,8 @@ + CURRENT = $(shell uname -r) + ARCH = $(if $(shell uname -m | grep x86_64),64,32) + KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386) +-KDIR = /lib/modules/$(CURRENT)/build ++SYS_KDIR = /lib/modules/$(CURRENT)/build ++KDIR = $(PWD)/../build + PWD = $(shell pwd) + DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR) + USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0) +@@ -39,6 +40,8 @@ + all: default + + default: ++ rm -rf $(KDIR) ++ cp -r $(SYS_KDIR)/ $(KDIR) + make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH) + + install: +@@ -52,13 +55,12 @@ + + uninstall: + @echo "... Restore original oprofile.ko." +- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) ++ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) + + clean: + rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c + + prebuild: + cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko +- + +--include $(KDIR)/Rules.make ++-include $(SYS_KDIR)/Rules.make +Only in kernel3.4/: modules.order +Only in kernel3.4/: Module.symvers +diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c +--- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400 +@@ -16,7 +16,6 @@ + #include <linux/notifier.h> + #include <linux/smp.h> + #include "oprofile.h" +-#include <linux/sysdev.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) + #include <linux/syscore_ops.h> + #endif +diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c +--- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400 +@@ -244,7 +244,7 @@ + return -ENOMEM; + root_inode->i_op = &simple_dir_inode_operations; + root_inode->i_fop = &simple_dir_operations; +- root_dentry = d_alloc_root(root_inode); ++ root_dentry = d_make_root(root_inode); + if (!root_dentry) { + iput(root_inode); + return -ENOMEM; +Only in kernel3.4/: .tmp_versions diff --git a/~lukeshu/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch index fdc9bf42f..fdc9bf42f 100755 --- a/~lukeshu/codeanalyst/skipSetup.patch +++ b/~lukeshu/not-working/codeanalyst/skipSetup.patch diff --git a/~lukeshu/python-pyproxyfs/PKGBUILD b/~lukeshu/python-pyproxyfs/PKGBUILD new file mode 100644 index 000000000..b24c5682a --- /dev/null +++ b/~lukeshu/python-pyproxyfs/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=pyproxyfs +pkgname=python-$_pkgname +pkgver=0.8 +pkgrel=1 +pkgdesc="A proxy filesystem interface with a native filesystem implementation and a very simple test in-memory filesystem." +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') +groups=() +depends=('python') +makedepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=(!emptydirs) +install= +source=("http://pypi.python.org/packages/source/P/PyProxyFS/PyProxyFS-0.8.tar.gz") + +package() { + cd "${srcdir}/PyProxyFS-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +md5sums=('34f769e669877a9fdcfe5f8f93912b88') diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD new file mode 100644 index 000000000..e2e053f11 --- /dev/null +++ b/~lukeshu/xcalib/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) +# adpoted from mOLOk since pkgver=0.7 + +pkgname=xcalib +pkgver=0.8 +pkgrel=4 +pkgdesc="A tiny monitor calibration loader for X.org" +arch=(i686 x86_64) +url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/" +license=('GPL') +depends=(libxxf86vm) +source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz + makefile-ldflags.patch) +md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7' + '6c74457011515dd1cc7f2474af761142') + +build() { + cd "$srcdir/$pkgname-$pkgver/" + patch -p0 < ../makefile-ldflags.patch + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/" + install -Dm755 xcalib $pkgdir/usr/bin/xcalib + + for i in README *.icc *.icm; do + install -Dm644 $i $pkgdir/usr/share/xcalib/$i + done +} diff --git a/~lukeshu/xcalib/makefile-ldflags.patch b/~lukeshu/xcalib/makefile-ldflags.patch new file mode 100644 index 000000000..275c4c3ea --- /dev/null +++ b/~lukeshu/xcalib/makefile-ldflags.patch @@ -0,0 +1,22 @@ +--- Makefile 2007-08-26 23:30:34.000000000 +0200 ++++ Makefile.new 2012-08-20 10:50:27.000000000 +0200 +@@ -50,16 +50,16 @@ + # low overhead version (internal parser) + xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" +- $(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm + + fglrx_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX +- $(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm + + win_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI + windres.exe resource.rc resource.o +- $(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o ++ $(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o + + install: + cp ./xcalib $(DESTDIR)/usr/local/bin/ |
