core updated.
This commit is contained in:
@@ -0,0 +1,102 @@
|
|||||||
|
|
||||||
|
(0001/185) Calculating build dep of busybox
|
||||||
|
(0002/185) Calculating build dep of libuser
|
||||||
|
(0004/185) Calculating build dep of libpipeline
|
||||||
|
(0005/185) Calculating build dep of liblogging
|
||||||
|
(0006/185) Calculating build dep of alternatives
|
||||||
|
(0003/185) Calculating build dep of less
|
||||||
|
(0007/185) Calculating build dep of kbd
|
||||||
|
(0008/185) Calculating build dep of spidermonkey ---> borks in 'check-devel'
|
||||||
|
|
||||||
|
(0009/185) Calculating build dep of sysvinit
|
||||||
|
(0010/185) Calculating build dep of findutils ---> borks in 'libX11-devel'
|
||||||
|
|
||||||
|
(0011/185) Calculating build dep of rsyslog
|
||||||
|
(0012/185) Calculating build dep of popt
|
||||||
|
(0013/185) Calculating build dep of gdbm
|
||||||
|
(0014/185) Calculating build dep of python-pyliblzma
|
||||||
|
(0015/185) Calculating build dep of gobject-introspection ---> borks in 'cairo-devel'
|
||||||
|
|
||||||
|
(0016/185) Calculating build dep of pisilinux-python ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0017/185) Calculating build dep of mingetty
|
||||||
|
(0018/185) Calculating build dep of scons ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0019/185) Calculating build dep of grub2 ---> borks in 'gc-devel'
|
||||||
|
|
||||||
|
(0020/185) Calculating build dep of snappy ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0021/185) Calculating build dep of gnuconfig
|
||||||
|
(0022/185) Calculating build dep of dejavu-fonts ---> borks in 'fontforge'
|
||||||
|
|
||||||
|
(0023/185) Calculating build dep of os-prober
|
||||||
|
(0024/185) Calculating build dep of gmp ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0025/185) Calculating build dep of baselayout ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0026/185) Calculating build dep of swig
|
||||||
|
(0027/185) Calculating build dep of flex ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0028/185) Calculating build dep of python-setuptools
|
||||||
|
(0029/185) Calculating build dep of unzip
|
||||||
|
(0030/185) Calculating build dep of libusb-compat ---> borks in 'libX11-devel'
|
||||||
|
|
||||||
|
(0031/185) Calculating build dep of python
|
||||||
|
(0032/185) Calculating build dep of libidn
|
||||||
|
(0033/185) Calculating build dep of db
|
||||||
|
(0034/185) Calculating build dep of cpio
|
||||||
|
(0035/185) Calculating build dep of ca-certificates
|
||||||
|
(0036/185) Calculating build dep of lzo ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0037/185) Calculating build dep of libseccomp
|
||||||
|
(0038/185) Calculating build dep of shadow ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0039/185) Calculating build dep of util-linux ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0040/185) Calculating build dep of dhcpcd
|
||||||
|
(0041/185) Calculating build dep of attr ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0042/185) Calculating build dep of python-psutil ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0043/185) Calculating build dep of nspr
|
||||||
|
(0044/185) Calculating build dep of dbus ---> borks in 'libX11-devel'
|
||||||
|
|
||||||
|
(0045/185) Calculating build dep of comar-api
|
||||||
|
(0046/185) Calculating build dep of patch ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0047/185) Calculating build dep of psmisc ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0048/185) Calculating build dep of bison ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0049/185) Calculating build dep of net-tools
|
||||||
|
(0050/185) Calculating build dep of help2man ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0051/185) Calculating build dep of man-pages ---> borks in 'libX11-devel'
|
||||||
|
|
||||||
|
(0052/185) Calculating build dep of kernel ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0053/185) Calculating build dep of quilt
|
||||||
|
(0054/185) Calculating build dep of json-c
|
||||||
|
(0055/185) Calculating build dep of udev ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0056/185) Calculating build dep of yacc
|
||||||
|
(0057/185) Calculating build dep of util-macros
|
||||||
|
(0058/185) Calculating build dep of sed
|
||||||
|
(0059/185) Calculating build dep of intltool ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0060/185) Calculating build dep of tcp-wrappers
|
||||||
|
(0061/185) Calculating build dep of gperftools
|
||||||
|
(0062/185) Calculating build dep of mdadm
|
||||||
|
(0063/185) Calculating build dep of klibc
|
||||||
|
(0064/185) Calculating build dep of mailcap
|
||||||
|
(0065/185) Calculating build dep of kmod ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0066/185) Calculating build dep of nss-mdns
|
||||||
|
(0067/185) Calculating build dep of pisi ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0068/185) Calculating build dep of libunistring
|
||||||
|
(0069/185) Calculating build dep of glibc ---> borks in 'xmlto'
|
||||||
|
|
||||||
|
(0070/185) Calculating build dep of libestr
|
||||||
|
(0071/185) Calculating build dep of piksemel ---> borks in 'cython'
|
||||||
|
|
||||||
Executable
+193
@@ -0,0 +1,193 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
#
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Copyright (C) 2008, TUBITAK/UEKAE
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify it under
|
||||||
|
# the terms of the GNU General Public License as published by the Free
|
||||||
|
# Software Foundation; either version 2 of the License, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
#
|
||||||
|
# Please read the COPYING file.
|
||||||
|
#
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import multiprocessing
|
||||||
|
|
||||||
|
import urllib2
|
||||||
|
import bz2
|
||||||
|
import lzma
|
||||||
|
|
||||||
|
import piksemel
|
||||||
|
|
||||||
|
import pisi
|
||||||
|
import pisi.dependency as dependency
|
||||||
|
from pisi.graph import CycleException
|
||||||
|
|
||||||
|
|
||||||
|
class SourceDB:
|
||||||
|
def __init__(self, index):
|
||||||
|
|
||||||
|
self.__source_nodes = {}
|
||||||
|
self.__pkgstosrc = {}
|
||||||
|
|
||||||
|
doc = piksemel.parseString(index)
|
||||||
|
self.__source_nodes, self.__pkgstosrc = self.__generate_sources(doc)
|
||||||
|
|
||||||
|
def __generate_sources(self, doc):
|
||||||
|
sources = {}
|
||||||
|
pkgstosrc = {}
|
||||||
|
|
||||||
|
for spec in doc.tags("SpecFile"):
|
||||||
|
src_name = spec.getTag("Source").getTagData("Name")
|
||||||
|
sources[src_name] = spec.toString()
|
||||||
|
for package in spec.tags("Package"):
|
||||||
|
pkgstosrc[package.getTagData("Name")] = src_name
|
||||||
|
|
||||||
|
return sources, pkgstosrc
|
||||||
|
|
||||||
|
def has_spec(self, name):
|
||||||
|
return self.__source_nodes.has_key(name)
|
||||||
|
|
||||||
|
def get_spec(self, name):
|
||||||
|
src = self.__source_nodes[name]
|
||||||
|
spec = pisi.specfile.SpecFile()
|
||||||
|
spec.parse(src)
|
||||||
|
return spec
|
||||||
|
|
||||||
|
def list_specs(self):
|
||||||
|
return self.__source_nodes.keys()
|
||||||
|
|
||||||
|
def pkgtosrc(self, name):
|
||||||
|
return self.__pkgstosrc[name]
|
||||||
|
|
||||||
|
def find_circle(sourcedb, A):
|
||||||
|
|
||||||
|
G_f = pisi.graph.Digraph()
|
||||||
|
|
||||||
|
def get_spec(name):
|
||||||
|
if sourcedb.has_spec(name):
|
||||||
|
return sourcedb.get_spec(name)
|
||||||
|
else:
|
||||||
|
raise Exception('Cannot find source package: %s' % name)
|
||||||
|
|
||||||
|
def get_src(name):
|
||||||
|
return get_spec(name).source
|
||||||
|
|
||||||
|
def add_src(src):
|
||||||
|
if not str(src.name) in G_f.vertices():
|
||||||
|
G_f.add_vertex(str(src.name), (src.version, src.release))
|
||||||
|
|
||||||
|
def pkgtosrc(pkg):
|
||||||
|
try:
|
||||||
|
tmp = sourcedb.pkgtosrc(pkg)
|
||||||
|
except KeyError, e:
|
||||||
|
# this is a bad hack but after we hit a problem we need to continue
|
||||||
|
tmp = "e3"
|
||||||
|
print "---> borks in ", e
|
||||||
|
|
||||||
|
return tmp
|
||||||
|
|
||||||
|
B = A
|
||||||
|
|
||||||
|
install_list = set()
|
||||||
|
|
||||||
|
while len(B) > 0:
|
||||||
|
Bp = set()
|
||||||
|
for x in B:
|
||||||
|
sf = get_spec(x)
|
||||||
|
src = sf.source
|
||||||
|
add_src(src)
|
||||||
|
|
||||||
|
# add dependencies
|
||||||
|
|
||||||
|
def process_dep(dep):
|
||||||
|
srcdep = pkgtosrc(dep.package)
|
||||||
|
if not srcdep in G_f.vertices():
|
||||||
|
Bp.add(srcdep)
|
||||||
|
add_src(get_src(srcdep))
|
||||||
|
if not src.name == srcdep: # firefox - firefox-devel thing
|
||||||
|
G_f.add_edge(src.name, srcdep)
|
||||||
|
|
||||||
|
for builddep in src.buildDependencies:
|
||||||
|
process_dep(builddep)
|
||||||
|
|
||||||
|
for pkg in sf.packages:
|
||||||
|
for rtdep in pkg.packageDependencies:
|
||||||
|
process_dep(rtdep)
|
||||||
|
B = Bp
|
||||||
|
|
||||||
|
try:
|
||||||
|
order_build = G_f.topological_sort()
|
||||||
|
order_build.reverse()
|
||||||
|
except CycleException, cycle:
|
||||||
|
return str(cycle)
|
||||||
|
|
||||||
|
return ""
|
||||||
|
|
||||||
|
def getIndex(uri):
|
||||||
|
try:
|
||||||
|
if "://" in uri:
|
||||||
|
rawdata = urllib2.urlopen(uri).read()
|
||||||
|
else:
|
||||||
|
rawdata = open(uri, "r").read()
|
||||||
|
except IOError:
|
||||||
|
print "could not fetch %s" % uri
|
||||||
|
return None
|
||||||
|
|
||||||
|
if uri.endswith("bz2"):
|
||||||
|
data = bz2.decompress(rawdata)
|
||||||
|
elif uri.endswith("xz") or uri.endswith("lzma"):
|
||||||
|
data = lzma.decompress(rawdata)
|
||||||
|
else:
|
||||||
|
data = rawdata
|
||||||
|
|
||||||
|
return data
|
||||||
|
|
||||||
|
def processPackage(pkg, sourcesLength, counter):
|
||||||
|
global sourcedb
|
||||||
|
|
||||||
|
sys.stdout.write("\r(%04d/%d) Calculating build dep of %s " % (counter, sourcesLength, pkg))
|
||||||
|
sys.stdout.flush()
|
||||||
|
|
||||||
|
return find_circle(sourcedb, [pkg])
|
||||||
|
|
||||||
|
def updateStatus(circleResult):
|
||||||
|
global cycles
|
||||||
|
cycles.add(circleResult)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
|
||||||
|
if len(sys.argv) < 2:
|
||||||
|
print "Usage: circlefinder.py <source repo pisi-index.xml file>"
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
rawIndex = getIndex(sys.argv[1])
|
||||||
|
sourcedb = SourceDB(rawIndex)
|
||||||
|
sources = sourcedb.list_specs()
|
||||||
|
|
||||||
|
sourcesLength = len(sources)
|
||||||
|
counter = 0
|
||||||
|
|
||||||
|
global cycles
|
||||||
|
cycles = set()
|
||||||
|
|
||||||
|
pool = multiprocessing.Pool()
|
||||||
|
|
||||||
|
for pkg in sources:
|
||||||
|
counter += 1
|
||||||
|
pool.apply_async(processPackage, (pkg, sourcesLength, counter), callback=updateStatus)
|
||||||
|
|
||||||
|
pool.close()
|
||||||
|
pool.join()
|
||||||
|
|
||||||
|
if len(cycles):
|
||||||
|
print
|
||||||
|
for cycle in cycles:
|
||||||
|
print cycle
|
||||||
|
else:
|
||||||
|
print "No circular dep found"
|
||||||
|
|
||||||
|
|
||||||
+22
-33
@@ -792,6 +792,17 @@
|
|||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
</Maintainer>
|
</Maintainer>
|
||||||
</Component>
|
</Component>
|
||||||
|
<Component>
|
||||||
|
<Name>desktop.toolkit.qt5</Name>
|
||||||
|
<LocalName xml:lang="en">FIXME</LocalName>
|
||||||
|
<Summary xml:lang="en">FIXME</Summary>
|
||||||
|
<Description xml:lang="en">FIXME</Description>
|
||||||
|
<Group>programming</Group>
|
||||||
|
<Maintainer>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Maintainer>
|
||||||
|
</Component>
|
||||||
<Component>
|
<Component>
|
||||||
<Name>desktop.toolkit.motif</Name>
|
<Name>desktop.toolkit.motif</Name>
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
<LocalName xml:lang="en">FIXME</LocalName>
|
||||||
@@ -1210,39 +1221,6 @@
|
|||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
</Maintainer>
|
</Maintainer>
|
||||||
</Component>
|
</Component>
|
||||||
<Component>
|
|
||||||
<Name>desktop.lxde</Name>
|
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
|
||||||
<Summary xml:lang="en">FIXME</Summary>
|
|
||||||
<Description xml:lang="en">FIXME</Description>
|
|
||||||
<Group>lxde.desktop</Group>
|
|
||||||
<Maintainer>
|
|
||||||
<Name>PisiLinux Community</Name>
|
|
||||||
<Email>admins@pisilinux.org</Email>
|
|
||||||
</Maintainer>
|
|
||||||
</Component>
|
|
||||||
<Component>
|
|
||||||
<Name>desktop.lxde.addon</Name>
|
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
|
||||||
<Summary xml:lang="en">FIXME</Summary>
|
|
||||||
<Description xml:lang="en">FIXME</Description>
|
|
||||||
<Group>lxde.addon</Group>
|
|
||||||
<Maintainer>
|
|
||||||
<Name>PisiLinux Community</Name>
|
|
||||||
<Email>admins@pisilinux.org</Email>
|
|
||||||
</Maintainer>
|
|
||||||
</Component>
|
|
||||||
<Component>
|
|
||||||
<Name>desktop.lxde.base</Name>
|
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
|
||||||
<Summary xml:lang="en">FIXME</Summary>
|
|
||||||
<Description xml:lang="en">FIXME</Description>
|
|
||||||
<Group>lxde.desktop</Group>
|
|
||||||
<Maintainer>
|
|
||||||
<Name>PisiLinux Community</Name>
|
|
||||||
<Email>admins@pisilinux.org</Email>
|
|
||||||
</Maintainer>
|
|
||||||
</Component>
|
|
||||||
<Component>
|
<Component>
|
||||||
<Name>desktop.lxqt</Name>
|
<Name>desktop.lxqt</Name>
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
<LocalName xml:lang="en">FIXME</LocalName>
|
||||||
@@ -1298,6 +1276,17 @@
|
|||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
</Maintainer>
|
</Maintainer>
|
||||||
</Component>
|
</Component>
|
||||||
|
<Component>
|
||||||
|
<Name>kernel.tools</Name>
|
||||||
|
<LocalName xml:lang="en">Kernel Tools</LocalName>
|
||||||
|
<Summary xml:lang="en">Kernel Tools; perf, cpupowertools</Summary>
|
||||||
|
<Description xml:lang="en">FIXME</Description>
|
||||||
|
<Group>system</Group>
|
||||||
|
<Maintainer>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Maintainer>
|
||||||
|
</Component>
|
||||||
<Component>
|
<Component>
|
||||||
<Name>x11</Name>
|
<Name>x11</Name>
|
||||||
<LocalName xml:lang="en">FIXME</LocalName>
|
<LocalName xml:lang="en">FIXME</LocalName>
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>desktop</Name>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>desktop.font</Name>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Licensed under the GNU General Public License, version 3.
|
||||||
|
# See the file http://www.gnu.org/licenses/gpl-3.0.txt
|
||||||
|
|
||||||
|
from pisi.actionsapi import shelltools
|
||||||
|
from pisi.actionsapi import pisitools
|
||||||
|
from pisi.actionsapi import autotools
|
||||||
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
|
|
||||||
|
def build():
|
||||||
|
autotools.make('FC-LANG="" BLOCKS="/usr/share/unicode/ucd/Blocks.txt" UNICODEDATA="/usr/share/unicode/ucd/UnicodeData.txt"')
|
||||||
|
|
||||||
|
def check():
|
||||||
|
autotools.make("check")
|
||||||
|
|
||||||
|
def install():
|
||||||
|
pisitools.insinto("/usr/share/fonts/dejavu", "build/*.ttf")
|
||||||
|
|
||||||
|
# Create symlinks for fontconfig files
|
||||||
|
for conf in shelltools.ls("fontconfig"):
|
||||||
|
pisitools.insinto("/etc/fonts/conf.avail", "fontconfig/%s" % conf)
|
||||||
|
pisitools.dosym("/etc/fonts/conf.avail/%s" % conf, "/etc/fonts/conf.d/%s" % conf)
|
||||||
|
|
||||||
|
|
||||||
|
pisitools.dosym("/usr/share/fonts/dejavu" , "/etc/X11/fontpath.d/dejavu")
|
||||||
|
|
||||||
|
pisitools.dodoc("AUTHORS", "LICENSE", "NEWS", "README")
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>dejavu-fonts</Name>
|
||||||
|
<Homepage>http://www.dejavu-fonts.org</Homepage>
|
||||||
|
<Packager>
|
||||||
|
<Name>Sezai Yeniay</Name>
|
||||||
|
<Email>sezaiyeniay@pisilinux.org</Email>
|
||||||
|
</Packager>
|
||||||
|
<License>as-is</License>
|
||||||
|
<IsA>data:font</IsA>
|
||||||
|
<Summary>DejaVu fonts</Summary>
|
||||||
|
<Description>Contains DejaVu fonts that are based on Bitstream fonts, with improvements.</Description>
|
||||||
|
<Archive sha1sum="27e428fc723934c050cfcfc86d1b1ff2273d146e" type="tarbz2">mirrors://sourceforge/dejavu/dejavu-fonts-2.34.tar.bz2</Archive>
|
||||||
|
<BuildDependencies>
|
||||||
|
<Dependency>fontforge</Dependency>
|
||||||
|
<Dependency>perl-Font-TTF</Dependency>
|
||||||
|
<Dependency>unicode-ucd</Dependency>
|
||||||
|
</BuildDependencies>
|
||||||
|
</Source>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>dejavu-fonts</Name>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="config">/etc/fonts</Path>
|
||||||
|
<Path fileType="data">/etc/X11/fontpath.d/dejavu</Path>
|
||||||
|
<Path fileType="data">/usr/share/fonts</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<History>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2014-01-27</Date>
|
||||||
|
<Version>2.34</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Serdar Soytetir</Name>
|
||||||
|
<Email>kaptan@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="2">
|
||||||
|
<Date>2012-05-24</Date>
|
||||||
|
<Version>2.33.2514</Version>
|
||||||
|
<Comment>First release</Comment>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="1">
|
||||||
|
<Date>2012-05-24</Date>
|
||||||
|
<Version>2.33</Version>
|
||||||
|
<Comment>First release</Comment>
|
||||||
|
<Name>Sezai Yeniay</Name>
|
||||||
|
<Email>sezaiyeniay@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
</History>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>dejavu-fonts</Name>
|
||||||
|
<Summary xml:lang="tr">DejaVu yazıtipleri</Summary>
|
||||||
|
<Description xml:lang="tr">DejaVu yazıtipleri</Description>
|
||||||
|
<Description xml:lang="fr">Les fontes DejaVu basées sur des fontes Bitstream avec des améliorations.</Description>
|
||||||
|
<Summary xml:lang="nl">DejaVu fonts</Summary>
|
||||||
|
<Description xml:lang="nl">Bevat de DejaVu fonts die zijn gebasserd op de Bitstream fonts, met verbeteringen.</Description>
|
||||||
|
</Source>
|
||||||
|
</PISI>
|
||||||
@@ -10,7 +10,8 @@ from pisi.actionsapi import shelltools
|
|||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
autotools.configure("-disable-static")
|
autotools.configure("--disable-static \
|
||||||
|
--with-harfbuzz=no")
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
autotools.make()
|
autotools.make()
|
||||||
@@ -13,18 +13,12 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>A high-quality and portable font engine</Summary>
|
<Summary>A high-quality and portable font engine</Summary>
|
||||||
<Description>FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well.</Description>
|
<Description>FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well.</Description>
|
||||||
<Archive sha1sum="d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46" type="tarbz2">mirrors://sourceforge/freetype/freetype-2.5.3.tar.bz2</Archive>
|
<Archive sha1sum="7b7460ef51a8fdb17baae53c6658fc1ad000a1c2" type="tarbz2">mirrors://sourceforge/freetype/freetype-2.5.5.tar.bz2</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>zlib-devel</Dependency>
|
<Dependency>zlib-devel</Dependency>
|
||||||
<Dependency>bzip2</Dependency>
|
<Dependency>bzip2</Dependency>
|
||||||
<Dependency>libpng-devel</Dependency>
|
<Dependency>libpng-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
|
||||||
<Patch level="1">freetype-2.2.1-enable-valid.patch</Patch>
|
|
||||||
<Patch level="1">freetype-2.5.1-enable-sph.patch</Patch>
|
|
||||||
<Patch level="1">freetype-2.5.1-enable-spr.patch</Patch>
|
|
||||||
<Patch level="0">fix_segfault_with_harfbuzz.diff</Patch>
|
|
||||||
</Patches>
|
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -43,11 +37,10 @@
|
|||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
<Name>freetype-devel</Name>
|
<Name>freetype-devel</Name>
|
||||||
<PartOf>system.devel</PartOf>
|
|
||||||
<Summary>Development files for freetype</Summary>
|
<Summary>Development files for freetype</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">freetype</Dependency>
|
<Dependency>zlib-devel</Dependency>
|
||||||
<Dependency>harfbuzz-devel</Dependency>
|
<Dependency>libpng-devel</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="executable">/usr/bin</Path>
|
<Path fileType="executable">/usr/bin</Path>
|
||||||
@@ -66,10 +59,9 @@
|
|||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>zlib-32bit</Dependency>
|
<Dependency>zlib-32bit</Dependency>
|
||||||
<Dependency>libpng-32bit</Dependency>
|
<Dependency>libpng-32bit</Dependency>
|
||||||
<Dependency>harfbuzz-32bit</Dependency>
|
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">freetype</Dependency>
|
<Dependency>glibc-32bit</Dependency>
|
||||||
<Dependency>zlib-32bit</Dependency>
|
<Dependency>zlib-32bit</Dependency>
|
||||||
<Dependency>libpng-32bit</Dependency>
|
<Dependency>libpng-32bit</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
@@ -79,6 +71,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="10">
|
||||||
|
<Date>2015-03-11</Date>
|
||||||
|
<Version>2.5.5</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ayhan Yalçınsoy</Name>
|
||||||
|
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="9">
|
<Update release="9">
|
||||||
<Date>2014-05-11</Date>
|
<Date>2014-05-11</Date>
|
||||||
<Version>2.5.3</Version>
|
<Version>2.5.3</Version>
|
||||||
@@ -8,6 +8,9 @@
|
|||||||
<Type>Core</Type>
|
<Type>Core</Type>
|
||||||
<BinaryName>PisiLinux</BinaryName>
|
<BinaryName>PisiLinux</BinaryName>
|
||||||
<Obsoletes>
|
<Obsoletes>
|
||||||
|
<Package>xorg-video-modesetting</Package>
|
||||||
|
<Package>glamor-egl</Package>
|
||||||
|
<Package>glamor-egl-devel</Package>
|
||||||
<Package>kdeadmin</Package>
|
<Package>kdeadmin</Package>
|
||||||
<Package>kdenetwork</Package>
|
<Package>kdenetwork</Package>
|
||||||
<Package>kdenetwork-devel</Package>
|
<Package>kdenetwork-devel</Package>
|
||||||
@@ -363,5 +366,39 @@
|
|||||||
<Package>libusbx-devel</Package>
|
<Package>libusbx-devel</Package>
|
||||||
<Package>libusbx-32bit</Package>
|
<Package>libusbx-32bit</Package>
|
||||||
<Package>labltk</Package>
|
<Package>labltk</Package>
|
||||||
|
<Package>udev</Package>
|
||||||
|
<Package>libudev</Package>
|
||||||
|
<Package>libgudev1</Package>
|
||||||
|
<Package>libudev-devel</Package>
|
||||||
|
<Package>libgudev1-devel</Package>
|
||||||
|
<Package>libudev-32bit</Package>
|
||||||
|
<Package>libgudev1-32bit</Package>
|
||||||
|
<Package>mdbtools-gui</Package>
|
||||||
|
<Package>module-nvidia96</Package>
|
||||||
|
<Package>xorg-video-nvidia96</Package>
|
||||||
|
<Package>module-nvidia173</Package>
|
||||||
|
<Package>xorg-video-nvidia173</Package>
|
||||||
|
<Package>libfm</Package>
|
||||||
|
<Package>libfm-devel</Package>
|
||||||
|
<Package>lxappearance</Package>
|
||||||
|
<Package>lxappearance-devel</Package>
|
||||||
|
<Package>lxappearance-obconf</Package>
|
||||||
|
<Package>lxde-common</Package>
|
||||||
|
<Package>lxde-menu-cache</Package>
|
||||||
|
<Package>lxde-menu-cache-devel</Package>
|
||||||
|
<Package>lxinput</Package>
|
||||||
|
<Package>lxmenu-data</Package>
|
||||||
|
<Package>lxpanel</Package>
|
||||||
|
<Package>lxpanel-devel</Package>
|
||||||
|
<Package>lxpolkit</Package>
|
||||||
|
<Package>lxrandr</Package>
|
||||||
|
<Package>lxsession</Package>
|
||||||
|
<Package>lxtask</Package>
|
||||||
|
<Package>lxterminal</Package>
|
||||||
|
<Package>pcmanfm</Package>
|
||||||
|
<Package>pcmanfm-devel</Package>
|
||||||
|
<Package>gpicview</Package>
|
||||||
|
<Package>lxlauncher</Package>
|
||||||
|
<Package>screengrab</Package>
|
||||||
</Obsoletes>
|
</Obsoletes>
|
||||||
</PISI>
|
</PISI>
|
||||||
|
|||||||
+6
-22
@@ -288,30 +288,14 @@
|
|||||||
<LocalName xml:lang="es">Escritorio Razor-qt</LocalName>
|
<LocalName xml:lang="es">Escritorio Razor-qt</LocalName>
|
||||||
<Icon>razor-qt</Icon>
|
<Icon>razor-qt</Icon>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
|
||||||
<Name>lxde.desktop</Name>
|
|
||||||
<LocalName xml:lang="en">LXDE Desktop</LocalName>
|
|
||||||
<LocalName xml:lang="nl">LXDE Desktop</LocalName>
|
|
||||||
<LocalName xml:lang="sv">Skrivbord, LXDE</LocalName>
|
|
||||||
<LocalName xml:lang="tr">LXDE Masaüstü</LocalName>
|
|
||||||
<LocalName xml:lang="fr">Bureau LXDE</LocalName>
|
|
||||||
<LocalName xml:lang="es">Escritorio LXDE</LocalName>
|
|
||||||
<Icon>preferences-desktop</Icon>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
|
||||||
<Name>lxde.addon</Name>
|
|
||||||
<LocalName xml:lang="en">Lxde Desktop Addons</LocalName>
|
|
||||||
<LocalName xml:lang="tr">Lxde Masaüstü Araçları</LocalName>
|
|
||||||
<Icon>preferences-desktop</Icon>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
<Group>
|
||||||
<Name>lxqt.desktop</Name>
|
<Name>lxqt.desktop</Name>
|
||||||
<LocalName xml:lang="en">LXQT Desktop</LocalName>
|
<LocalName xml:lang="en">Lxqt Desktop</LocalName>
|
||||||
<LocalName xml:lang="nl">LXQT Desktop</LocalName>
|
<LocalName xml:lang="nl">Lxqt Desktop</LocalName>
|
||||||
<LocalName xml:lang="sv">Skrivbord, LXQT</LocalName>
|
<LocalName xml:lang="sv">Skrivbord, Lxqt</LocalName>
|
||||||
<LocalName xml:lang="tr">LXQT Masaüstü</LocalName>
|
<LocalName xml:lang="tr">Lxqt Masaüstü</LocalName>
|
||||||
<LocalName xml:lang="fr">Bureau LXQT</LocalName>
|
<LocalName xml:lang="fr">Bureau Lxqt</LocalName>
|
||||||
<LocalName xml:lang="es">Escritorio LXQT</LocalName>
|
<LocalName xml:lang="es">Escritorio Lxqt</LocalName>
|
||||||
<Icon>preferences-desktop</Icon>
|
<Icon>preferences-desktop</Icon>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>hardware</Name>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>hardware.disk</Name>
|
||||||
|
</PISI>
|
||||||
@@ -11,11 +11,13 @@ from pisi.actionsapi import shelltools
|
|||||||
|
|
||||||
def builddiet():
|
def builddiet():
|
||||||
pisitools.flags.add("-fno-lto")
|
pisitools.flags.add("-fno-lto")
|
||||||
|
shelltools.export("LIBS","-lpthread -luuid")
|
||||||
#dietCC = "diet %s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS())
|
#dietCC = "diet %s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS())
|
||||||
dietCC = "%s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS())
|
dietCC = "%s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS())
|
||||||
shelltools.export("CC", dietCC)
|
shelltools.export("CC", dietCC)
|
||||||
|
|
||||||
autotools.make("distclean")
|
autotools.make("distclean")
|
||||||
|
|
||||||
autotools.autoreconf("-fi")
|
autotools.autoreconf("-fi")
|
||||||
autotools.configure('ac_cv_lib_dl_dlopen=no \
|
autotools.configure('ac_cv_lib_dl_dlopen=no \
|
||||||
--with-staticdir="/sbin" \
|
--with-staticdir="/sbin" \
|
||||||
@@ -31,6 +33,7 @@ def builddiet():
|
|||||||
--enable-cmdlib \
|
--enable-cmdlib \
|
||||||
--enable-pkgconfig \
|
--enable-pkgconfig \
|
||||||
--enable-udev_rules \
|
--enable-udev_rules \
|
||||||
|
--with-systemdsystemunitdir=no \
|
||||||
--enable-udev_sync' % get.CFLAGS())
|
--enable-udev_sync' % get.CFLAGS())
|
||||||
|
|
||||||
pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
|
pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>lvm2</Name>
|
||||||
|
<Homepage>http://sources.redhat.com/lvm/</Homepage>
|
||||||
|
<Packager>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Packager>
|
||||||
|
<License>GPLv2</License>
|
||||||
|
<IsA>app:console</IsA>
|
||||||
|
<Summary>Userland logical volume management tools</Summary>
|
||||||
|
<Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
|
||||||
|
<Archive sha1sum="4f45406eb122443a0a9a3f2d338d5203d94d93de" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz</Archive>
|
||||||
|
<BuildDependencies>
|
||||||
|
<Dependency releaseFrom="9">libutil-linux-devel</Dependency>
|
||||||
|
<Dependency>eudev-devel</Dependency>
|
||||||
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<!--<Patch level="1">lvm2-2.02.63-always-make-static-libdm.patch</Patch>
|
||||||
|
<Patch level="1">lvm2-2.02.92-dynamic-static-ldflags.patch</Patch>
|
||||||
|
<Patch level="1">lvm2-2.02.105-pthread-pkgconfig.patch</Patch>
|
||||||
|
<Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
|
||||||
|
</Patches>
|
||||||
|
</Source>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>device-mapper</Name>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency>eudev</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Summary>Light-weight kernel component can support user-space tools for logical volume management</Summary>
|
||||||
|
<Description>Device-mapper includes the driver enables the definition of new block devices composed of ranges of sectors of existing devices to define disk partitions or logical volumes.</Description>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/usr/sbin/dmsetup</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper.a</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper.so*</Path>
|
||||||
|
<Path fileType="data">/lib/udev/rules.d/10-dm.rules</Path>
|
||||||
|
<Path fileType="data">/lib/udev/rules.d/13-dm-disk.rules</Path>
|
||||||
|
<Path fileType="data">/lib/udev/rules.d/95-dm-notify.rules</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc/VERSION_DM</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc/WHATS_NEW_DM</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/dmsetup.8</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>device-mapper-devel</Name>
|
||||||
|
<PartOf>system.devel</PartOf>
|
||||||
|
<Summary>Development libraries and headers for device-mapper</Summary>
|
||||||
|
<Description>Device-mapper-devel contains files needed to develop applications that use the device-mapper libraries.</Description>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency release="current" >device-mapper</Dependency>
|
||||||
|
<Dependency>eudev-devel</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="header">/usr/include/libdevmapper.h</Path>
|
||||||
|
<Path fileType="data">/usr/lib/pkgconfig/devmapper.pc</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>device-mapper-event</Name>
|
||||||
|
<Summary>Device-mapper event daemon</Summary>
|
||||||
|
<Description>This package contains the dmeventd daemon for monitoring the state of device-mapper devices.</Description>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency release="current" >device-mapper</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/usr/sbin/dmeventd</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event.a</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2thin.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/device-mapper/libdevmapper-event-lvm2thin.so</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/dmeventd.8</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>device-mapper-event-devel</Name>
|
||||||
|
<PartOf>system.devel</PartOf>
|
||||||
|
<Summary>Development libraries and headers for the device-mapper event daemon</Summary>
|
||||||
|
<Description>This contains contains files needed to develop applications that use the device-mapper event library.</Description>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency release="current" >device-mapper-event</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="header">/usr/include/libdevmapper-event.h</Path>
|
||||||
|
<Path fileType="data">/usr/lib/pkgconfig/devmapper-event.pc</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>lvm2</Name>
|
||||||
|
<Summary>Userland logical volume management tools</Summary>
|
||||||
|
<Description>LVM2 includes all of the support for handling read/write operations on physical volumes,creating volume groups from one or more physical volumes and creating one or more logical volumes in volume groups.</Description>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency release="current">device-mapper</Dependency>
|
||||||
|
<Dependency release="current">device-mapper-event</Dependency>
|
||||||
|
<Dependency>libutil-linux</Dependency>
|
||||||
|
<Dependency>eudev</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/sbin/lvmconf</Path>
|
||||||
|
<Path fileType="executable">/usr/sbin/blkdeactivate</Path>
|
||||||
|
<Path fileType="executable">/usr/sbin/fsadm</Path>
|
||||||
|
<Path fileType="executable">/usr/sbin/lv*</Path>
|
||||||
|
<Path fileType="executable">/usr/sbin/vg*</Path>
|
||||||
|
<Path fileType="executable">/usr/sbin/pv*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/liblvm2app.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/liblvm2cmd.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/device-mapper/libdevmapper-event-lvm2mirror.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/device-mapper/libdevmapper-event-lvm2snapshot.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2mirror.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2snapshot.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2raid.so</Path>
|
||||||
|
<Path fileType="library">/usr/lib/device-mapper/libdevmapper-event-lvm2raid.so</Path>
|
||||||
|
<Path fileType="config">/etc/lvm</Path>
|
||||||
|
<Path fileType="data">/etc/lvm/archive</Path>
|
||||||
|
<Path fileType="data">/etc/lvm/backup</Path>
|
||||||
|
<Path fileType="data">/etc/lvm/cache</Path>
|
||||||
|
<Path fileType="data">/var/lock/lvm</Path>
|
||||||
|
<Path fileType="data">/lib/udev/rules.d/11-dm-lvm.rules</Path>
|
||||||
|
<Path fileType="data">/usr/lib/tmpfiles.d/lvm2.conf</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man5/lvm.conf.5</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man7</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/fsadm.8</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/blkdeactivate.8</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/*pv*</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/*lv*</Path>
|
||||||
|
<Path fileType="man">/usr/share/man/man8/*vg*</Path>
|
||||||
|
</Files>
|
||||||
|
<AdditionalFiles>
|
||||||
|
<AdditionalFile owner="root" permission="0644" target="/usr/lib/tmpfiles.d/lvm2.conf">tmpfiles.conf</AdditionalFile>
|
||||||
|
</AdditionalFiles>
|
||||||
|
<Provides>
|
||||||
|
<COMAR script="package.py">System.Package</COMAR>
|
||||||
|
</Provides>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>lvm2-devel</Name>
|
||||||
|
<PartOf>system.devel</PartOf>
|
||||||
|
<Summary>Development libraries and headers</Summary>
|
||||||
|
<Description>This package contains files needed to develop applications that use the lvm2 libraries.</Description>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency>libutil-linux-devel</Dependency>
|
||||||
|
<Dependency release="current">lvm2</Dependency>
|
||||||
|
<Dependency release="current">device-mapper-devel</Dependency>
|
||||||
|
<Dependency release="current">device-mapper-event-devel</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="header">/usr/include/lvm2cmd.h</Path>
|
||||||
|
<Path fileType="header">/usr/include/lvm2app.h</Path>
|
||||||
|
<Path fileType="data">/usr/lib/pkgconfig/lvm2app.pc</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>dietlibc-libdevmapper</Name>
|
||||||
|
<PartOf>system.devel</PartOf>
|
||||||
|
<Summary>Static devmapper library built with dietlibc</Summary>
|
||||||
|
<Description>device mapper contains ioctl library and utilities for use with logical volume management (LVM2) built with dietlibc</Description>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="library">/usr/lib/dietlibc/lib-i386/libdevmapper.a</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>device-mapper-static</Name>
|
||||||
|
<Summary>Staticaly linked Device-mapper library and utility</Summary>
|
||||||
|
<Description>device mapper contains statically linked libraries and utility for initramfs.</Description>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/sbin/dmsetup.static</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>lvm2-static</Name>
|
||||||
|
<Summary>Staticaly linked Logical Volume Management utilities</Summary>
|
||||||
|
<Description>Number of utilities for creating, checking, and repairing logical volumes - statically linked for initramfs.</Description>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/sbin/lvm.static</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2015-05-02</Date>
|
||||||
|
<Version>2.02.118</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2014-09-04</Date>
|
||||||
|
<Version>2.02.111</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="5">
|
||||||
|
<Date>2014-05-09</Date>
|
||||||
|
<Version>2.02.106</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2014-04-07</Date>
|
||||||
|
<Version>2.02.105</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2013-11-09</Date>
|
||||||
|
<Version>2.02.103</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="2">
|
||||||
|
<Date>2013-07-26</Date>
|
||||||
|
<Version>2.02.98</Version>
|
||||||
|
<Comment>Fix dep, release bump.</Comment>
|
||||||
|
<Name>Serdar Soytetir</Name>
|
||||||
|
<Email>kaptanan@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="1">
|
||||||
|
<Date>2012-11-14</Date>
|
||||||
|
<Version>2.02.98</Version>
|
||||||
|
<Comment>First release</Comment>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
</History>
|
||||||
|
</PISI>
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<PISI>
|
<PISI>
|
||||||
<Source>
|
<Source>
|
||||||
<Name>lvm2</Name>
|
<Name>lvm2</Name>
|
||||||
<Homepage>http://sources.redhat.com/lvm/</Homepage>
|
<Homepage>https://www.sourceware.org/lvm2/</Homepage>
|
||||||
<Packager>
|
<Packager>
|
||||||
<Name>PisiLinux Community</Name>
|
<Name>PisiLinux Community</Name>
|
||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
@@ -12,16 +12,15 @@
|
|||||||
<IsA>app:console</IsA>
|
<IsA>app:console</IsA>
|
||||||
<Summary>Userland logical volume management tools</Summary>
|
<Summary>Userland logical volume management tools</Summary>
|
||||||
<Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
|
<Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
|
||||||
<Archive sha1sum="2e7b5d48d55aaf4aba1214c3211a194e4c13aa3e" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.111.tgz</Archive>
|
<Archive sha1sum="4f45406eb122443a0a9a3f2d338d5203d94d93de" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency releaseFrom="6">libuuid-devel</Dependency>
|
<Dependency releaseFrom="9">libutil-linux-devel</Dependency>
|
||||||
<Dependency releaseFrom="6">libblkid-devel</Dependency>
|
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">lvm2-2.02.63-always-make-static-libdm.patch</Patch>
|
<Patch level="1">lvm2-make-sockets-static.patch</Patch>
|
||||||
<Patch level="1">lvm2-2.02.92-dynamic-static-ldflags.patch</Patch>
|
<!--<Patch level="1">lvm2-2.02.92-dynamic-static-ldflags.patch</Patch>
|
||||||
<Patch level="1">lvm2-2.02.105-pthread-pkgconfig.patch</Patch>
|
<Patch level="1">lvm2-2.02.105-pthread-pkgconfig.patch</Patch>
|
||||||
<Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>
|
<Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -97,8 +96,7 @@
|
|||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">device-mapper</Dependency>
|
<Dependency release="current">device-mapper</Dependency>
|
||||||
<Dependency release="current">device-mapper-event</Dependency>
|
<Dependency release="current">device-mapper-event</Dependency>
|
||||||
<Dependency>libudev</Dependency>
|
<Dependency>libutil-linux</Dependency>
|
||||||
<Dependency>libblkid</Dependency>
|
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="executable">/sbin/lvmconf</Path>
|
<Path fileType="executable">/sbin/lvmconf</Path>
|
||||||
@@ -186,6 +184,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2015-04-30</Date>
|
||||||
|
<Version>2.02.118</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2014-09-04</Date>
|
<Date>2014-09-04</Date>
|
||||||
<Version>2.02.111</Version>
|
<Version>2.02.111</Version>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Licensed under the GNU General Public License, version 3.
|
||||||
|
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||||
|
|
||||||
|
from pisi.actionsapi import get
|
||||||
|
from pisi.actionsapi import autotools
|
||||||
|
from pisi.actionsapi import pisitools
|
||||||
|
from pisi.actionsapi import shelltools
|
||||||
|
|
||||||
|
def builddiet():
|
||||||
|
autotools.make("clean")
|
||||||
|
shelltools.export("CC", "diet %s %s %s %s -DHAVE_STDINT_H -Os -static" % (get.CC(), get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS()))
|
||||||
|
autotools.make("mdadm.static")
|
||||||
|
autotools.make("mdassemble.static")
|
||||||
|
|
||||||
|
pisitools.insinto("/sbin", "mdadm.static")
|
||||||
|
pisitools.insinto("/sbin", "mdassemble.static")
|
||||||
|
|
||||||
|
def build():
|
||||||
|
# fix build with gcc-4.9.0
|
||||||
|
pisitools.dosed("Makefile", "(Wall) -Werror", "\\1")
|
||||||
|
# Not sure about MDASSEMBLE_AUTO=1. Need to investigate.
|
||||||
|
autotools.make("SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdassemble mdadm mdmon" % get.confDIR())
|
||||||
|
|
||||||
|
def install():
|
||||||
|
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||||
|
|
||||||
|
# Remove the udev file as its shipped with udev package
|
||||||
|
pisitools.remove("/lib/udev/rules.d/*")
|
||||||
|
|
||||||
|
# Install config file
|
||||||
|
pisitools.insinto("/etc", "mdadm.conf-example", "mdadm.conf")
|
||||||
|
|
||||||
|
builddiet()
|
||||||
|
|
||||||
|
pisitools.dodoc("TODO", "ChangeLog", "COPYING", "mdadm.conf-example", "misc/*")
|
||||||
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
from comar.service import *
|
||||||
|
|
||||||
|
serviceType = "server"
|
||||||
|
serviceDesc = _({"en": "RAID monitor daemon",
|
||||||
|
"tr": "RAID izleme servisi"})
|
||||||
|
serviceConf = "mdadm"
|
||||||
|
|
||||||
|
MSG_ERR_STRTSRVC = {"en": "Couldn't start service.Please edit mdadm.conf file.",
|
||||||
|
"tr": "Servis başlatılamadı.Lütfen mdadm.conf dosyasını düzenleyiniz.",
|
||||||
|
}
|
||||||
|
|
||||||
|
def check():
|
||||||
|
try:
|
||||||
|
f = file("/etc/mdadm.conf")
|
||||||
|
confLines = [a.lstrip() for a in f]
|
||||||
|
confLines = filter(lambda x: not (x.startswith("\#") or x == ""), confLines)
|
||||||
|
check = False
|
||||||
|
for line in confLines:
|
||||||
|
if "MAILADDR" or "PROGRAM" in line.split():
|
||||||
|
check = True
|
||||||
|
if not check:
|
||||||
|
fail(MSG_ERR_STRTSRVC)
|
||||||
|
except:
|
||||||
|
fail(MSG_ERR_STRTSRVC)
|
||||||
|
finally:
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
@synchronized
|
||||||
|
def start():
|
||||||
|
check()
|
||||||
|
startService(command="/sbin/mdadm",
|
||||||
|
args="--monitor --scan --daemonise --pid-file /run/mdadm.pid %s" % config.get("MDADM_OPTS"),
|
||||||
|
pidfile="/run/mdadm.pid",
|
||||||
|
donotify=True)
|
||||||
|
|
||||||
|
@synchronized
|
||||||
|
def stop():
|
||||||
|
stopService(pidfile="/run/mdadm.pid",
|
||||||
|
donotify=True)
|
||||||
|
|
||||||
|
def status():
|
||||||
|
return isServiceRunning("/run/mdadm.pid")
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# config file for mdadm
|
||||||
|
|
||||||
|
# Misc options to pass to mdadm in monitor mode.
|
||||||
|
# For more info, run `mdadm --monitor --help` or see
|
||||||
|
# the mdadm(8) manpage.
|
||||||
|
|
||||||
|
MDADM_OPTS="--syslog"
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# This file causes block devices with Linux RAID (mdadm) signatures to
|
||||||
|
# automatically cause mdadm to be run.
|
||||||
|
# See udev(8) for syntax
|
||||||
|
|
||||||
|
SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
|
||||||
|
IMPORT{program}="/sbin/mdadm --examine --export $tempnode", \
|
||||||
|
RUN+="/bin/bash -c '[ ! -f /dev/.in_sysinit ] && mdadm -I $env{DEVNAME}'"
|
||||||
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=MDADM Event Monitor
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/sbin/mdadm --monitor --scan
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
d /run/mdadm 0710 root root -
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for dev in `grep "^md.*: active" /proc/mdstat | cut -f 1 -d ' '`; do
|
||||||
|
echo "repair" > /sys/block/$dev/md/sync_action
|
||||||
|
done
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
[[ -f /proc/mdstat ]] || exit 0
|
||||||
|
|
||||||
|
# Try to make sure the devices exist before we use them
|
||||||
|
create_devs() {
|
||||||
|
local node dir minor
|
||||||
|
for node in $@ ; do
|
||||||
|
[[ ${node} != /dev/* ]] && node=/dev/${node}
|
||||||
|
[[ -e ${node} ]] && continue
|
||||||
|
|
||||||
|
dir=${node%/*}
|
||||||
|
[[ ! -d ${dir} ]] && mkdir -p "${dir}"
|
||||||
|
|
||||||
|
minor=${node##*/}
|
||||||
|
mknod "${node}" b ${MAJOR} ${minor##*md} &> /dev/null
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
|
||||||
|
if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
|
||||||
|
devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' ${mdadm_conf})
|
||||||
|
if [[ -n ${devs} ]] ; then
|
||||||
|
create_devs ${devs}
|
||||||
|
ebegin "Starting up RAID devices (mdadm)"
|
||||||
|
output=$(mdadm -As 2>&1)
|
||||||
|
ret=$?
|
||||||
|
[[ ${ret} -ne 0 ]] && echo "${output}"
|
||||||
|
eend ${ret}
|
||||||
|
fi
|
||||||
|
fi
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
[[ -f /proc/mdstat ]] || exit 0
|
||||||
|
|
||||||
|
[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
|
||||||
|
if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
|
||||||
|
ebegin "Shutting down RAID devices (mdadm)"
|
||||||
|
output=$(mdadm -Ss 2>&1)
|
||||||
|
ret=$?
|
||||||
|
[[ ${ret} -ne 0 ]] && echo "${output}"
|
||||||
|
eend ${ret}
|
||||||
|
fi
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>mdadm</Name>
|
||||||
|
<Homepage>http://www.kernel.org/pub/linux/utils/raid/mdadm</Homepage>
|
||||||
|
<Packager>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Packager>
|
||||||
|
<License>GPLv2</License>
|
||||||
|
<IsA>app:console</IsA>
|
||||||
|
<Summary>Utility to control Linux MD devices (software RAID arrays)</Summary>
|
||||||
|
<Description>mdadm is used to create, manage, and monitor Linux MD (software RAID) devices.</Description>
|
||||||
|
<Archive sha1sum="c649601d84553501c2f3b452cf93d1fbc53f976a" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.3.2.tar.xz</Archive>
|
||||||
|
</Source>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>mdadm</Name>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/sbin/mdadm</Path>
|
||||||
|
<Path fileType="executable">/sbin/mdmon</Path>
|
||||||
|
<Path fileType="data">/lib/udev/rules.d</Path>
|
||||||
|
<Path fileType="data">/usr/lib/tmpfiles.d</Path>
|
||||||
|
<Path fileType="man">/usr/share/man</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
|
<Path fileType="config">/etc</Path>
|
||||||
|
</Files>
|
||||||
|
<AdditionalFiles>
|
||||||
|
<AdditionalFile owner="root" permission="0644" target="/usr/lib/tmpfiles.d/mdadm.conf">mdadm.tmpfiles.conf</AdditionalFile>
|
||||||
|
<!-- Add a cron job to run a weekly repair of the array to correct bad sectors -->
|
||||||
|
<AdditionalFile owner="root" permission="0755" target="/etc/cron.weekly/raid-check">scripts/raid-check</AdditionalFile>
|
||||||
|
|
||||||
|
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/mdadm">mdadm.confd</AdditionalFile>
|
||||||
|
|
||||||
|
<!-- Udev rules file for device assembly. This is different than the mdadm rules file shipped with udev -->
|
||||||
|
<AdditionalFile owner="root" permission="0644" target="/lib/udev/rules.d/65-md-incremental.rules">mdadm.rules</AdditionalFile>
|
||||||
|
</AdditionalFiles>
|
||||||
|
<Provides>
|
||||||
|
<COMAR script="service.py">System.Service</COMAR>
|
||||||
|
</Provides>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>mdadm-static</Name>
|
||||||
|
<PartOf>system.base</PartOf>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="executable">/sbin/mdadm.static</Path>
|
||||||
|
<Path fileType="executable">/sbin/mdassemble.static</Path>
|
||||||
|
</Files>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<History>
|
||||||
|
<Update release="5">
|
||||||
|
<Date>2014-12-13</Date>
|
||||||
|
<Version>3.3.2</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Yusuf Aydemir</Name>
|
||||||
|
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2014-05-17</Date>
|
||||||
|
<Version>3.3</Version>
|
||||||
|
<Comment>Rebuild. Fixed service.py file</Comment>
|
||||||
|
<Name>Aydın Demirel</Name>
|
||||||
|
<Email>aydin.demirel@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2014-04-13</Date>
|
||||||
|
<Version>3.3</Version>
|
||||||
|
<Comment>mdadm-static is a part of system.base now.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="2">
|
||||||
|
<Date>2014-01-31</Date>
|
||||||
|
<Version>3.3</Version>
|
||||||
|
<Comment>Ver. bump, rebuild</Comment>
|
||||||
|
<Name>Kamil Atlı</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="1">
|
||||||
|
<Date>2012-11-14</Date>
|
||||||
|
<Version>3.2.6</Version>
|
||||||
|
<Comment>First release</Comment>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
</History>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>mdadm</Name>
|
||||||
|
<Summary xml:lang="tr">MD aygıtlarını (Yazılımsal RAID) denetleme aracı</Summary>
|
||||||
|
<Description xml:lang="tr">mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır.</Description>
|
||||||
|
</Source>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>mdadm-static</Name>
|
||||||
|
<Summary xml:lang="tr">Statik linklemiş Raid denetleme aracı</Summary>
|
||||||
|
<Description xml:lang="tr">mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır.</Description>
|
||||||
|
</Package>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>hardware.firmware</Name>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Licensed under the GNU General Public License, version 3.
|
||||||
|
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||||
|
|
||||||
|
from pisi.actionsapi import shelltools
|
||||||
|
from pisi.actionsapi import autotools
|
||||||
|
from pisi.actionsapi import pisitools
|
||||||
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
|
WorkDir = "linux-firmware"
|
||||||
|
|
||||||
|
def setup():
|
||||||
|
# Remove source files
|
||||||
|
shelltools.unlink("usbdux/*dux")
|
||||||
|
shelltools.unlink("*/*.asm")
|
||||||
|
|
||||||
|
# These + a lot of other firmware are shipped within alsa-firmware
|
||||||
|
for fw in ("ess", "korg", "sb16", "yamaha"):
|
||||||
|
shelltools.unlinkDir(fw)
|
||||||
|
|
||||||
|
def build():
|
||||||
|
autotools.make()
|
||||||
|
|
||||||
|
|
||||||
|
def install():
|
||||||
|
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||||
|
pisitools.insinto("/lib/firmware", "mix/*")
|
||||||
|
|
||||||
|
# Remove installed and LIC* files from /lib/firmware
|
||||||
|
pisitools.remove("/lib/firmware/GPL-3")
|
||||||
|
pisitools.remove("/lib/firmware/LICENCE*")
|
||||||
|
pisitools.remove("/lib/firmware/LICENSE*")
|
||||||
|
pisitools.remove("/lib/firmware/configure")
|
||||||
|
pisitools.remove("/lib/firmware/Makefile")
|
||||||
|
pisitools.removeDir("/lib/firmware/mix")
|
||||||
|
#conflict on alsa-firmware
|
||||||
|
#pisitools.remove("/lib/firmware/ctefx.bin")
|
||||||
|
pisitools.remove("/lib/firmware/ctspeq.bin")
|
||||||
|
|
||||||
|
# Install LICENSE files
|
||||||
|
pisitools.dodoc("WHENCE", "LICENCE.*", "LICENSE.*", "GPL-3")
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
KVER=$1
|
||||||
|
|
||||||
|
if [ -z $KVER ]; then
|
||||||
|
KVER=`uname -r`
|
||||||
|
fi
|
||||||
|
|
||||||
|
MODPATH=/lib/modules/$KVER
|
||||||
|
|
||||||
|
for mod in `find $MODPATH -name "*.ko"`; do
|
||||||
|
for fw in `modinfo -F firmware $mod`; do
|
||||||
|
if [ ! -e "/lib/firmware/$fw" ]; then
|
||||||
|
echo "`basename $mod` requires $fw which is missing."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
Binary file not shown.
@@ -0,0 +1,168 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>linux-firmware</Name>
|
||||||
|
<Homepage>http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/</Homepage>
|
||||||
|
<Packager>
|
||||||
|
<Name>PisiLinux Community</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Packager>
|
||||||
|
<License>ipw2100-fw</License>
|
||||||
|
<License>ipw2200-fw</License>
|
||||||
|
<License>freedist</License>
|
||||||
|
<License>GPLv2+</License>
|
||||||
|
<License>GPLv2</License>
|
||||||
|
<License>MIT</License>
|
||||||
|
<IsA>data</IsA>
|
||||||
|
<Summary>Firmware files used by the Linux kernel</Summary>
|
||||||
|
<Description>linux-firmware contains different firmware files required for some devices to operate correctly.</Description>
|
||||||
|
<!-- linux-firmware commit: commit f404336ba808cbd57547196e13367079a23b822c 2015-03-20 -->
|
||||||
|
<Archive sha1sum="9df35c158a52394419e2c7bb7f0582c5c9253ca4" type="tarbz2">http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150320.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/common-fw.tar.xz</Archive>
|
||||||
|
<Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware-ipw.tar.xz</Archive>
|
||||||
|
<Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/firmware-nonfreebox-2-tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ar9170.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ipw2x00-firmware.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/aic94xx-seq.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="9be626663e9b9d15278f2b5cd1c916570eb62727" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/zd12x1-firmware.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/accessrunner-firmware.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/rtl8192se-firmware.tar.bz2</Archive>
|
||||||
|
<Archive sha1sum="5d333e75f02a57861565337c14f6944090a242a8" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz</Archive>
|
||||||
|
<AdditionalFiles>
|
||||||
|
<AdditionalFile target="intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq">fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq</AdditionalFile>
|
||||||
|
</AdditionalFiles>
|
||||||
|
<!--<BuildDependencies>
|
||||||
|
<Dependency>rpm2targz</Dependency>
|
||||||
|
</BuildDependencies>-->
|
||||||
|
<Patches>
|
||||||
|
<!-- Remove all patches, all dead :) -->
|
||||||
|
</Patches>
|
||||||
|
</Source>
|
||||||
|
|
||||||
|
<Package>
|
||||||
|
<Name>linux-firmware</Name>
|
||||||
|
<Files>
|
||||||
|
<Path fileType="data">/lib/firmware</Path>
|
||||||
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
|
</Files>
|
||||||
|
<BuildFlags>
|
||||||
|
<Flag>noDelta</Flag>
|
||||||
|
</BuildFlags>
|
||||||
|
</Package>
|
||||||
|
|
||||||
|
<History>
|
||||||
|
<Update release="16">
|
||||||
|
<Date>2015-03-26</Date>
|
||||||
|
<Version>20150320</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="15">
|
||||||
|
<Date>2015-02-14</Date>
|
||||||
|
<Version>20150214</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="14">
|
||||||
|
<Date>2014-12-16</Date>
|
||||||
|
<Version>20141216</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="13">
|
||||||
|
<Date>2014-11-07</Date>
|
||||||
|
<Version>20141107</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="12">
|
||||||
|
<Date>2014-07-23</Date>
|
||||||
|
<Version>20140603</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin.bojara@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="11">
|
||||||
|
<Date>2014-04-02</Date>
|
||||||
|
<Version>20140316</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="10">
|
||||||
|
<Date>2014-03-01</Date>
|
||||||
|
<Version>20140217</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Serdar Soytetir</Name>
|
||||||
|
<Email>kaptan@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="9">
|
||||||
|
<Date>2013-11-30</Date>
|
||||||
|
<Version>20131013</Version>
|
||||||
|
<Comment>Remove unneeded build dep,fix unpack problem.</Comment>
|
||||||
|
<Name>Ertuğrul Erata</Name>
|
||||||
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="8">
|
||||||
|
<Date>2013-11-23</Date>
|
||||||
|
<Version>20131013</Version>
|
||||||
|
<Comment>Version bump to 20131013 git.</Comment>
|
||||||
|
<Name>Serdar Soytetir</Name>
|
||||||
|
<Email>kaptan@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2013-09-30</Date>
|
||||||
|
<Version>20130811</Version>
|
||||||
|
<Comment>add update Intel-Bluetooth patchs</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2013-08-11</Date>
|
||||||
|
<Version>20130811</Version>
|
||||||
|
<Comment>add update patchs</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="5">
|
||||||
|
<Date>2013-07-19</Date>
|
||||||
|
<Version>20130609</Version>
|
||||||
|
<Comment>add update patchs</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2013-06-09</Date>
|
||||||
|
<Version>20130609</Version>
|
||||||
|
<Comment>bump</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2013-04-07</Date>
|
||||||
|
<Version>20130421</Version>
|
||||||
|
<Comment>bump</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="2">
|
||||||
|
<Date>2013-03-07</Date>
|
||||||
|
<Version>20130224</Version>
|
||||||
|
<Comment>bump</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
<Update release="1">
|
||||||
|
<Date>2012-12-12</Date>
|
||||||
|
<Version>20121212</Version>
|
||||||
|
<Comment>First release</Comment>
|
||||||
|
<Name>Erdinç Gültekin</Name>
|
||||||
|
<Email>erdincgultekin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
|
</History>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<PISI>
|
||||||
|
<Source>
|
||||||
|
<Name>linux-firmware</Name>
|
||||||
|
<Summary xml:lang="tr">Linux çekirdeği tarafından kullanılan firmware dosyaları</Summary>
|
||||||
|
<Description xml:lang="tr">linux-firmware, bazı aygıtların düzgün çalışabilmesi için gerekli firmware dosyalarını içerir.</Description>
|
||||||
|
</Source>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<PISI>
|
||||||
|
<Name>kernel</Name>
|
||||||
|
</PISI>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Licensed under the GNU General Public License, version 3.
|
||||||
|
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||||
|
|
||||||
|
from pisi.actionsapi import kerneltools
|
||||||
|
from pisi.actionsapi import shelltools
|
||||||
|
from pisi.actionsapi import autotools
|
||||||
|
from pisi.actionsapi import pisitools
|
||||||
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
|
NoStrip = ["/lib", "/boot"]
|
||||||
|
|
||||||
|
shelltools.export("KBUILD_BUILD_USER", "pisilinux")
|
||||||
|
shelltools.export("KBUILD_BUILD_HOST", "buildfarm")
|
||||||
|
shelltools.export("PYTHONDONTWRITEBYTECODE", "1")
|
||||||
|
|
||||||
|
#cpupower_arch = get.ARCH().replace("i686", "i386")
|
||||||
|
|
||||||
|
def setup():
|
||||||
|
kerneltools.configure()
|
||||||
|
|
||||||
|
def build():
|
||||||
|
kerneltools.build(debugSymbols=False)
|
||||||
|
|
||||||
|
def install():
|
||||||
|
kerneltools.install()
|
||||||
|
|
||||||
|
# Install kernel headers needed for out-of-tree module compilation
|
||||||
|
kerneltools.installHeaders()
|
||||||
|
|
||||||
|
kerneltools.installLibcHeaders()
|
||||||
|
|
||||||
|
# Generate some module lists to use within mkinitramfs
|
||||||
|
shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix()))
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
def read_file(path):
|
||||||
|
with open(path) as f:
|
||||||
|
return f.read().strip()
|
||||||
|
|
||||||
|
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
|
||||||
|
gcf = "/boot/grub2/grub.cfg"
|
||||||
|
if not os.path.isfile(gcf): return
|
||||||
|
|
||||||
|
if os.path.isfile("/etc/mudur/locale"): os.environ["LANG"] = read_file("/etc/mudur/locale").split("\n")[0]
|
||||||
|
os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
os.system("grub2-mkconfig -o %s" % gcf)
|
||||||
|
|
||||||
|
# Update GRUB entry
|
||||||
|
#if os.path.exists("/boot/grub/grub.conf"):
|
||||||
|
# call("grub", "Boot.Loader", "updateKernelEntry", (KVER, ""))
|
||||||
|
|
||||||
|
def preRemove():
|
||||||
|
pass
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,11 @@
|
|||||||
|
--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200
|
||||||
|
+++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */
|
||||||
|
#define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */
|
||||||
|
#define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */
|
||||||
|
-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */
|
||||||
|
+#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */
|
||||||
|
#define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */
|
||||||
|
#define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */
|
||||||
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
index dd9d6190b08d..181e42bd85d3 100644
|
||||||
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
@@ -85,6 +85,7 @@
|
||||||
|
#include <linux/syscore_ops.h>
|
||||||
|
|
||||||
|
#include <asm/microcode.h>
|
||||||
|
+#include <asm/microcode_intel.h>
|
||||||
|
#include <asm/processor.h>
|
||||||
|
#include <asm/cpu_device_id.h>
|
||||||
|
#include <asm/perf_event.h>
|
||||||
|
@@ -465,6 +466,8 @@ static void mc_bp_resume(void)
|
||||||
|
|
||||||
|
if (uci->valid && uci->mc)
|
||||||
|
microcode_ops->apply_microcode(cpu);
|
||||||
|
+ else if (!uci->mc)
|
||||||
|
+ load_ucode_intel_ap();
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct syscore_ops mc_syscore_ops = {
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
From: Anthony G. Basile <blueness@gentoo.org>
|
||||||
|
|
||||||
|
This patch adds support for a restricted user-controlled namespace on
|
||||||
|
tmpfs filesystem used to house PaX flags. The namespace must be of the
|
||||||
|
form user.pax.* and its value cannot exceed a size of 8 bytes.
|
||||||
|
|
||||||
|
This is needed even on all Gentoo systems so that XATTR_PAX flags
|
||||||
|
are preserved for users who might build packages using portage on
|
||||||
|
a tmpfs system with a non-hardened kernel and then switch to a
|
||||||
|
hardened kernel with XATTR_PAX enabled.
|
||||||
|
|
||||||
|
The namespace is added to any user with Extended Attribute support
|
||||||
|
enabled for tmpfs. Users who do not enable xattrs will not have
|
||||||
|
the XATTR_PAX flags preserved.
|
||||||
|
|
||||||
|
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
|
||||||
|
index e4629b9..6958086 100644
|
||||||
|
--- a/include/uapi/linux/xattr.h
|
||||||
|
+++ b/include/uapi/linux/xattr.h
|
||||||
|
@@ -63,5 +63,9 @@
|
||||||
|
#define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
|
||||||
|
#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
|
||||||
|
|
||||||
|
+/* User namespace */
|
||||||
|
+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
|
||||||
|
+#define XATTR_PAX_FLAGS_SUFFIX "flags"
|
||||||
|
+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
|
||||||
|
|
||||||
|
#endif /* _UAPI_LINUX_XATTR_H */
|
||||||
|
diff --git a/mm/shmem.c b/mm/shmem.c
|
||||||
|
index 1c44af7..f23bb1b 100644
|
||||||
|
--- a/mm/shmem.c
|
||||||
|
+++ b/mm/shmem.c
|
||||||
|
@@ -2201,6 +2201,7 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
|
||||||
|
static int shmem_xattr_validate(const char *name)
|
||||||
|
{
|
||||||
|
struct { const char *prefix; size_t len; } arr[] = {
|
||||||
|
+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
|
||||||
|
{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
|
||||||
|
{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
|
||||||
|
};
|
||||||
|
@@ -2256,6 +2257,12 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
|
||||||
|
+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
|
||||||
|
+ return -EOPNOTSUPP;
|
||||||
|
+ if (size > 8)
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
return simple_xattr_set(&info->xattrs, name, value, size, flags);
|
||||||
|
}
|
||||||
|
|
||||||
+22
@@ -0,0 +1,22 @@
|
|||||||
|
From: Ben Hutchings <ben@decadent.org.uk>
|
||||||
|
Subject: fs: Enable link security restrictions by default
|
||||||
|
Date: Fri, 02 Nov 2012 05:32:06 +0000
|
||||||
|
Bug-Debian: https://bugs.debian.org/609455
|
||||||
|
Forwarded: not-needed
|
||||||
|
|
||||||
|
This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
|
||||||
|
('VFS: don't do protected {sym,hard}links by default').
|
||||||
|
|
||||||
|
--- a/fs/namei.c
|
||||||
|
+++ b/fs/namei.c
|
||||||
|
@@ -651,8 +651,8 @@ static inline void put_link(struct namei
|
||||||
|
path_put(link);
|
||||||
|
}
|
||||||
|
|
||||||
|
-int sysctl_protected_symlinks __read_mostly = 0;
|
||||||
|
-int sysctl_protected_hardlinks __read_mostly = 0;
|
||||||
|
+int sysctl_protected_symlinks __read_mostly = 1;
|
||||||
|
+int sysctl_protected_hardlinks __read_mostly = 1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* may_follow_link - Check symlink following for unsafe situations
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
|
||||||
|
index cb96296..6c242ed 100644
|
||||||
|
--- a/drivers/acpi/blacklist.c
|
||||||
|
+++ b/drivers/acpi/blacklist.c
|
||||||
|
@@ -269,6 +276,61 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
|
||||||
|
},
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * The following Lenovo models have a broken workaround in the
|
||||||
|
+ * acpi_video backlight implementation to meet the Windows 8
|
||||||
|
+ * requirement of 101 backlight levels. Reverting to pre-Win8
|
||||||
|
+ * behavior fixes the problem.
|
||||||
|
+ */
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad L430",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L430"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad T430s",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad T530",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad W530",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad X1 Carbon",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X1 Carbon"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .callback = dmi_disable_osi_win8,
|
||||||
|
+ .ident = "Lenovo ThinkPad X230",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
|
||||||
|
* Linux ignores it, except for the machines enumerated below.
|
||||||
|
*/
|
||||||
|
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
--- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400
|
||||||
|
+++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400
|
||||||
|
@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
|
||||||
|
va_start(args, fmt);
|
||||||
|
vsprintf(buf, fmt, args);
|
||||||
|
va_end(args);
|
||||||
|
- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
|
||||||
|
+ if (saved_root_name[0])
|
||||||
|
+ fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
|
||||||
|
+ else
|
||||||
|
+ fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
|
||||||
|
if (fd >= 0) {
|
||||||
|
sys_ioctl(fd, FDEJECT, 0);
|
||||||
|
sys_close(fd);
|
||||||
|
@@ -527,8 +530,13 @@ void __init mount_root(void)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_BLOCK
|
||||||
|
- create_dev("/dev/root", ROOT_DEV);
|
||||||
|
- mount_block_root("/dev/root", root_mountflags);
|
||||||
|
+ if (saved_root_name[0]) {
|
||||||
|
+ create_dev(saved_root_name, ROOT_DEV);
|
||||||
|
+ mount_block_root(saved_root_name, root_mountflags);
|
||||||
|
+ } else {
|
||||||
|
+ create_dev("/dev/root", ROOT_DEV);
|
||||||
|
+ mount_block_root("/dev/root", root_mountflags);
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
diff --git a/kernel/kmod.c b/kernel/kmod.c
|
||||||
|
index fb32636..d968882 100644
|
||||||
|
--- a/kernel/kmod.c
|
||||||
|
+++ b/kernel/kmod.c
|
||||||
|
@@ -575,7 +575,8 @@
|
||||||
|
call_usermodehelper_freeinfo(sub_info);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
- helper_lock();
|
||||||
|
+ if (!(current->flags & PF_FREEZER_SKIP))
|
||||||
|
+ helper_lock();
|
||||||
|
if (!khelper_wq || usermodehelper_disabled) {
|
||||||
|
retval = -EBUSY;
|
||||||
|
goto out;
|
||||||
|
@@ -611,7 +612,8 @@ wait_done:
|
||||||
|
out:
|
||||||
|
call_usermodehelper_freeinfo(sub_info);
|
||||||
|
unlock:
|
||||||
|
- helper_unlock();
|
||||||
|
+ if (!(current->flags & PF_FREEZER_SKIP))
|
||||||
|
+ helper_unlock();
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(call_usermodehelper_exec);
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,143 @@
|
|||||||
|
--- a/Kconfig
|
||||||
|
+++ b/Kconfig
|
||||||
|
@@ -8,4 +8,6 @@ config SRCARCH
|
||||||
|
string
|
||||||
|
option env="SRCARCH"
|
||||||
|
|
||||||
|
+source "distro/Kconfig"
|
||||||
|
+
|
||||||
|
source "arch/$SRCARCH/Kconfig"
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/distro/Kconfig
|
||||||
|
@@ -0,0 +1,131 @@
|
||||||
|
+menu "Gentoo Linux"
|
||||||
|
+
|
||||||
|
+config GENTOO_LINUX
|
||||||
|
+ bool "Gentoo Linux support"
|
||||||
|
+
|
||||||
|
+ default y
|
||||||
|
+
|
||||||
|
+ help
|
||||||
|
+ In order to boot Gentoo Linux a minimal set of config settings needs to
|
||||||
|
+ be enabled in the kernel; to avoid the users from having to enable them
|
||||||
|
+ manually as part of a Gentoo Linux installation or a new clean config,
|
||||||
|
+ we enable these config settings by default for convenience.
|
||||||
|
+
|
||||||
|
+ See the settings that become available for more details and fine-tuning.
|
||||||
|
+
|
||||||
|
+config GENTOO_LINUX_UDEV
|
||||||
|
+ bool "Linux dynamic and persistent device naming (userspace devfs) support"
|
||||||
|
+
|
||||||
|
+ depends on GENTOO_LINUX
|
||||||
|
+ default y if GENTOO_LINUX
|
||||||
|
+
|
||||||
|
+ select DEVTMPFS
|
||||||
|
+ select TMPFS
|
||||||
|
+
|
||||||
|
+ select MMU
|
||||||
|
+ select SHMEM
|
||||||
|
+
|
||||||
|
+ help
|
||||||
|
+ In order to boot Gentoo Linux a minimal set of config settings needs to
|
||||||
|
+ be enabled in the kernel; to avoid the users from having to enable them
|
||||||
|
+ manually as part of a Gentoo Linux installation or a new clean config,
|
||||||
|
+ we enable these config settings by default for convenience.
|
||||||
|
+
|
||||||
|
+ Currently this only selects TMPFS, DEVTMPFS and their dependencies.
|
||||||
|
+ TMPFS is enabled to maintain a tmpfs file system at /dev/shm, /run and
|
||||||
|
+ /sys/fs/cgroup; DEVTMPFS to maintain a devtmpfs file system at /dev.
|
||||||
|
+
|
||||||
|
+ Some of these are critical files that need to be available early in the
|
||||||
|
+ boot process; if not available, it causes sysfs and udev to malfunction.
|
||||||
|
+
|
||||||
|
+ To ensure Gentoo Linux boots, it is best to leave this setting enabled;
|
||||||
|
+ if you run a custom setup, you could consider whether to disable this.
|
||||||
|
+
|
||||||
|
+config GENTOO_LINUX_PORTAGE
|
||||||
|
+ bool "Select options required by Portage features"
|
||||||
|
+
|
||||||
|
+ depends on GENTOO_LINUX
|
||||||
|
+ default y if GENTOO_LINUX
|
||||||
|
+
|
||||||
|
+ select CGROUPS
|
||||||
|
+ select NAMESPACES
|
||||||
|
+ select IPC_NS
|
||||||
|
+ select NET_NS
|
||||||
|
+
|
||||||
|
+ help
|
||||||
|
+ This enables options required by various Portage FEATURES.
|
||||||
|
+ Currently this selects:
|
||||||
|
+
|
||||||
|
+ CGROUPS (required for FEATURES=cgroup)
|
||||||
|
+ IPC_NS (required for FEATURES=ipc-sandbox)
|
||||||
|
+ NET_NS (required for FEATURES=network-sandbox)
|
||||||
|
+
|
||||||
|
+ It is highly recommended that you leave this enabled as these FEATURES
|
||||||
|
+ are, or will soon be, enabled by default.
|
||||||
|
+
|
||||||
|
+menu "Support for init systems, system and service managers"
|
||||||
|
+ visible if GENTOO_LINUX
|
||||||
|
+
|
||||||
|
+config GENTOO_LINUX_INIT_SCRIPT
|
||||||
|
+ bool "OpenRC, runit and other script based systems and managers"
|
||||||
|
+
|
||||||
|
+ default y if GENTOO_LINUX
|
||||||
|
+
|
||||||
|
+ depends on GENTOO_LINUX
|
||||||
|
+
|
||||||
|
+ select BINFMT_SCRIPT
|
||||||
|
+
|
||||||
|
+ help
|
||||||
|
+ The init system is the first thing that loads after the kernel booted.
|
||||||
|
+
|
||||||
|
+ These config settings allow you to select which init systems to support;
|
||||||
|
+ instead of having to select all the individual settings all over the
|
||||||
|
+ place, these settings allows you to select all the settings at once.
|
||||||
|
+
|
||||||
|
+ This particular setting enables all the known requirements for OpenRC,
|
||||||
|
+ runit and similar script based systems and managers.
|
||||||
|
+
|
||||||
|
+ If you are unsure about this, it is best to leave this setting enabled.
|
||||||
|
+
|
||||||
|
+config GENTOO_LINUX_INIT_SYSTEMD
|
||||||
|
+ bool "systemd"
|
||||||
|
+
|
||||||
|
+ default n
|
||||||
|
+
|
||||||
|
+ depends on GENTOO_LINUX && GENTOO_LINUX_UDEV
|
||||||
|
+
|
||||||
|
+ select AUTOFS4_FS
|
||||||
|
+ select BLK_DEV_BSG
|
||||||
|
+ select CGROUPS
|
||||||
|
+ select DEVPTS_MULTIPLE_INSTANCES
|
||||||
|
+ select EPOLL
|
||||||
|
+ select FANOTIFY
|
||||||
|
+ select FHANDLE
|
||||||
|
+ select INOTIFY_USER
|
||||||
|
+ select NET
|
||||||
|
+ select NET_NS
|
||||||
|
+ select PROC_FS
|
||||||
|
+ select SIGNALFD
|
||||||
|
+ select SYSFS
|
||||||
|
+ select TIMERFD
|
||||||
|
+
|
||||||
|
+ select ANON_INODES
|
||||||
|
+ select BLOCK
|
||||||
|
+ select EVENTFD
|
||||||
|
+ select FSNOTIFY
|
||||||
|
+ select INET
|
||||||
|
+ select NLATTR
|
||||||
|
+
|
||||||
|
+ help
|
||||||
|
+ The init system is the first thing that loads after the kernel booted.
|
||||||
|
+
|
||||||
|
+ These config settings allow you to select which init systems to support;
|
||||||
|
+ instead of having to select all the individual settings all over the
|
||||||
|
+ place, these settings allows you to select all the settings at once.
|
||||||
|
+
|
||||||
|
+ This particular setting enables all the known requirements for systemd;
|
||||||
|
+ it also enables suggested optional settings, as the package suggests to.
|
||||||
|
+
|
||||||
|
+endmenu
|
||||||
|
+
|
||||||
|
+endmenu
|
||||||
+104
@@ -0,0 +1,104 @@
|
|||||||
|
From a828d56aebc0735676be23734cccf31e279c0d1b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Valente <paolo.valente@unimore.it>
|
||||||
|
Date: Mon, 8 Dec 2014 16:04:25 +0100
|
||||||
|
Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.19
|
||||||
|
|
||||||
|
Update Kconfig.iosched and do the related Makefile changes to include
|
||||||
|
kernel configuration options for BFQ. Also add the bfqio controller
|
||||||
|
to the cgroups subsystem.
|
||||||
|
|
||||||
|
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
|
||||||
|
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||||||
|
---
|
||||||
|
block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++
|
||||||
|
block/Makefile | 1 +
|
||||||
|
include/linux/cgroup_subsys.h | 4 ++++
|
||||||
|
3 files changed, 37 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
|
||||||
|
index 421bef9..0ee5f0f 100644
|
||||||
|
--- a/block/Kconfig.iosched
|
||||||
|
+++ b/block/Kconfig.iosched
|
||||||
|
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
|
||||||
|
---help---
|
||||||
|
Enable group IO scheduling in CFQ.
|
||||||
|
|
||||||
|
+config IOSCHED_BFQ
|
||||||
|
+ tristate "BFQ I/O scheduler"
|
||||||
|
+ default n
|
||||||
|
+ ---help---
|
||||||
|
+ The BFQ I/O scheduler tries to distribute bandwidth among
|
||||||
|
+ all processes according to their weights.
|
||||||
|
+ It aims at distributing the bandwidth as desired, independently of
|
||||||
|
+ the disk parameters and with any workload. It also tries to
|
||||||
|
+ guarantee low latency to interactive and soft real-time
|
||||||
|
+ applications. If compiled built-in (saying Y here), BFQ can
|
||||||
|
+ be configured to support hierarchical scheduling.
|
||||||
|
+
|
||||||
|
+config CGROUP_BFQIO
|
||||||
|
+ bool "BFQ hierarchical scheduling support"
|
||||||
|
+ depends on CGROUPS && IOSCHED_BFQ=y
|
||||||
|
+ default n
|
||||||
|
+ ---help---
|
||||||
|
+ Enable hierarchical scheduling in BFQ, using the cgroups
|
||||||
|
+ filesystem interface. The name of the subsystem will be
|
||||||
|
+ bfqio.
|
||||||
|
+
|
||||||
|
choice
|
||||||
|
prompt "Default I/O scheduler"
|
||||||
|
default DEFAULT_CFQ
|
||||||
|
@@ -52,6 +73,16 @@ choice
|
||||||
|
config DEFAULT_CFQ
|
||||||
|
bool "CFQ" if IOSCHED_CFQ=y
|
||||||
|
|
||||||
|
+ config DEFAULT_BFQ
|
||||||
|
+ bool "BFQ" if IOSCHED_BFQ=y
|
||||||
|
+ help
|
||||||
|
+ Selects BFQ as the default I/O scheduler which will be
|
||||||
|
+ used by default for all block devices.
|
||||||
|
+ The BFQ I/O scheduler aims at distributing the bandwidth
|
||||||
|
+ as desired, independently of the disk parameters and with
|
||||||
|
+ any workload. It also tries to guarantee low latency to
|
||||||
|
+ interactive and soft real-time applications.
|
||||||
|
+
|
||||||
|
config DEFAULT_NOOP
|
||||||
|
bool "No-op"
|
||||||
|
|
||||||
|
@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
|
||||||
|
string
|
||||||
|
default "deadline" if DEFAULT_DEADLINE
|
||||||
|
default "cfq" if DEFAULT_CFQ
|
||||||
|
+ default "bfq" if DEFAULT_BFQ
|
||||||
|
default "noop" if DEFAULT_NOOP
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
diff --git a/block/Makefile b/block/Makefile
|
||||||
|
index 00ecc97..1ed86d5 100644
|
||||||
|
--- a/block/Makefile
|
||||||
|
+++ b/block/Makefile
|
||||||
|
@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
|
||||||
|
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
|
||||||
|
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
|
||||||
|
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
|
||||||
|
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
|
||||||
|
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
|
||||||
|
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
|
||||||
|
index 98c4f9b..13b010d 100644
|
||||||
|
--- a/include/linux/cgroup_subsys.h
|
||||||
|
+++ b/include/linux/cgroup_subsys.h
|
||||||
|
@@ -35,6 +35,10 @@ SUBSYS(net_cls)
|
||||||
|
SUBSYS(blkio)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
|
||||||
|
+SUBSYS(bfqio)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if IS_ENABLED(CONFIG_CGROUP_PERF)
|
||||||
|
SUBSYS(perf_event)
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.3.0
|
||||||
|
|
||||||
+6966
File diff suppressed because it is too large
Load Diff
+6966
File diff suppressed because it is too large
Load Diff
+1222
File diff suppressed because it is too large
Load Diff
+387
@@ -0,0 +1,387 @@
|
|||||||
|
WARNING - this version of the patch works with version 4.9+ of gcc and with
|
||||||
|
kernel version 3.15.x+ and should NOT be applied when compiling on older
|
||||||
|
versions due to name changes of the flags with the 4.9 release of gcc.
|
||||||
|
Use the older version of this patch hosted on the same github for older
|
||||||
|
versions of gcc. For example:
|
||||||
|
|
||||||
|
corei7 --> nehalem
|
||||||
|
corei7-avx --> sandybridge
|
||||||
|
core-avx-i --> ivybridge
|
||||||
|
core-avx2 --> haswell
|
||||||
|
|
||||||
|
For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
|
||||||
|
|
||||||
|
It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
|
||||||
|
Note that upstream is using the deprecated 'match=atom' flags when I believe it
|
||||||
|
should use the newer 'march=bonnell' flag for atom processors.
|
||||||
|
|
||||||
|
I have made that change to this patch set as well. See the following kernel
|
||||||
|
bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
|
||||||
|
|
||||||
|
This patch will expand the number of microarchitectures to include new
|
||||||
|
processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
|
||||||
|
14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
|
||||||
|
Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
|
||||||
|
i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
|
||||||
|
Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
|
||||||
|
Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
|
||||||
|
|
||||||
|
Small but real speed increases are measurable using a make endpoint comparing
|
||||||
|
a generic kernel to one built with one of the respective microarchs.
|
||||||
|
|
||||||
|
See the following experimental evidence supporting this statement:
|
||||||
|
https://github.com/graysky2/kernel_gcc_patch
|
||||||
|
|
||||||
|
REQUIREMENTS
|
||||||
|
linux version >=3.15
|
||||||
|
gcc version >=4.9
|
||||||
|
|
||||||
|
--- a/arch/x86/include/asm/module.h 2014-08-03 18:25:02.000000000 -0400
|
||||||
|
+++ b/arch/x86/include/asm/module.h 2014-09-13 09:37:16.721385247 -0400
|
||||||
|
@@ -15,6 +15,20 @@
|
||||||
|
#define MODULE_PROC_FAMILY "586MMX "
|
||||||
|
#elif defined CONFIG_MCORE2
|
||||||
|
#define MODULE_PROC_FAMILY "CORE2 "
|
||||||
|
+#elif defined CONFIG_MNATIVE
|
||||||
|
+#define MODULE_PROC_FAMILY "NATIVE "
|
||||||
|
+#elif defined CONFIG_MNEHALEM
|
||||||
|
+#define MODULE_PROC_FAMILY "NEHALEM "
|
||||||
|
+#elif defined CONFIG_MWESTMERE
|
||||||
|
+#define MODULE_PROC_FAMILY "WESTMERE "
|
||||||
|
+#elif defined CONFIG_MSANDYBRIDGE
|
||||||
|
+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
|
||||||
|
+#elif defined CONFIG_MIVYBRIDGE
|
||||||
|
+#define MODULE_PROC_FAMILY "IVYBRIDGE "
|
||||||
|
+#elif defined CONFIG_MHASWELL
|
||||||
|
+#define MODULE_PROC_FAMILY "HASWELL "
|
||||||
|
+#elif defined CONFIG_MBROADWELL
|
||||||
|
+#define MODULE_PROC_FAMILY "BROADWELL "
|
||||||
|
#elif defined CONFIG_MATOM
|
||||||
|
#define MODULE_PROC_FAMILY "ATOM "
|
||||||
|
#elif defined CONFIG_M686
|
||||||
|
@@ -33,6 +47,20 @@
|
||||||
|
#define MODULE_PROC_FAMILY "K7 "
|
||||||
|
#elif defined CONFIG_MK8
|
||||||
|
#define MODULE_PROC_FAMILY "K8 "
|
||||||
|
+#elif defined CONFIG_MK8SSE3
|
||||||
|
+#define MODULE_PROC_FAMILY "K8SSE3 "
|
||||||
|
+#elif defined CONFIG_MK10
|
||||||
|
+#define MODULE_PROC_FAMILY "K10 "
|
||||||
|
+#elif defined CONFIG_MBARCELONA
|
||||||
|
+#define MODULE_PROC_FAMILY "BARCELONA "
|
||||||
|
+#elif defined CONFIG_MBOBCAT
|
||||||
|
+#define MODULE_PROC_FAMILY "BOBCAT "
|
||||||
|
+#elif defined CONFIG_MBULLDOZER
|
||||||
|
+#define MODULE_PROC_FAMILY "BULLDOZER "
|
||||||
|
+#elif defined CONFIG_MPILEDRIVER
|
||||||
|
+#define MODULE_PROC_FAMILY "PILEDRIVER "
|
||||||
|
+#elif defined CONFIG_MJAGUAR
|
||||||
|
+#define MODULE_PROC_FAMILY "JAGUAR "
|
||||||
|
#elif defined CONFIG_MELAN
|
||||||
|
#define MODULE_PROC_FAMILY "ELAN "
|
||||||
|
#elif defined CONFIG_MCRUSOE
|
||||||
|
--- a/arch/x86/Kconfig.cpu 2014-08-03 18:25:02.000000000 -0400
|
||||||
|
+++ b/arch/x86/Kconfig.cpu 2014-09-13 09:37:16.721385247 -0400
|
||||||
|
@@ -137,9 +137,8 @@ config MPENTIUM4
|
||||||
|
-Paxville
|
||||||
|
-Dempsey
|
||||||
|
|
||||||
|
-
|
||||||
|
config MK6
|
||||||
|
- bool "K6/K6-II/K6-III"
|
||||||
|
+ bool "AMD K6/K6-II/K6-III"
|
||||||
|
depends on X86_32
|
||||||
|
---help---
|
||||||
|
Select this for an AMD K6-family processor. Enables use of
|
||||||
|
@@ -147,7 +146,7 @@ config MK6
|
||||||
|
flags to GCC.
|
||||||
|
|
||||||
|
config MK7
|
||||||
|
- bool "Athlon/Duron/K7"
|
||||||
|
+ bool "AMD Athlon/Duron/K7"
|
||||||
|
depends on X86_32
|
||||||
|
---help---
|
||||||
|
Select this for an AMD Athlon K7-family processor. Enables use of
|
||||||
|
@@ -155,12 +154,62 @@ config MK7
|
||||||
|
flags to GCC.
|
||||||
|
|
||||||
|
config MK8
|
||||||
|
- bool "Opteron/Athlon64/Hammer/K8"
|
||||||
|
+ bool "AMD Opteron/Athlon64/Hammer/K8"
|
||||||
|
---help---
|
||||||
|
Select this for an AMD Opteron or Athlon64 Hammer-family processor.
|
||||||
|
Enables use of some extended instructions, and passes appropriate
|
||||||
|
optimization flags to GCC.
|
||||||
|
|
||||||
|
+config MK8SSE3
|
||||||
|
+ bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
|
||||||
|
+ Enables use of some extended instructions, and passes appropriate
|
||||||
|
+ optimization flags to GCC.
|
||||||
|
+
|
||||||
|
+config MK10
|
||||||
|
+ bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
|
||||||
|
+ Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
|
||||||
|
+ Enables use of some extended instructions, and passes appropriate
|
||||||
|
+ optimization flags to GCC.
|
||||||
|
+
|
||||||
|
+config MBARCELONA
|
||||||
|
+ bool "AMD Barcelona"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for AMD Barcelona and newer processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=barcelona
|
||||||
|
+
|
||||||
|
+config MBOBCAT
|
||||||
|
+ bool "AMD Bobcat"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for AMD Bobcat processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=btver1
|
||||||
|
+
|
||||||
|
+config MBULLDOZER
|
||||||
|
+ bool "AMD Bulldozer"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for AMD Bulldozer processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver1
|
||||||
|
+
|
||||||
|
+config MPILEDRIVER
|
||||||
|
+ bool "AMD Piledriver"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for AMD Piledriver processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver2
|
||||||
|
+
|
||||||
|
+config MJAGUAR
|
||||||
|
+ bool "AMD Jaguar"
|
||||||
|
+ ---help---
|
||||||
|
+ Select this for AMD Jaguar processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=btver2
|
||||||
|
+
|
||||||
|
config MCRUSOE
|
||||||
|
bool "Crusoe"
|
||||||
|
depends on X86_32
|
||||||
|
@@ -251,8 +300,17 @@ config MPSC
|
||||||
|
using the cpu family field
|
||||||
|
in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
|
||||||
|
|
||||||
|
+config MATOM
|
||||||
|
+ bool "Intel Atom"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Atom platform. Intel Atom CPUs have an
|
||||||
|
+ in-order pipelining architecture and thus can benefit from
|
||||||
|
+ accordingly optimized code. Use a recent GCC with specific Atom
|
||||||
|
+ support in order to fully benefit from selecting this option.
|
||||||
|
+
|
||||||
|
config MCORE2
|
||||||
|
- bool "Core 2/newer Xeon"
|
||||||
|
+ bool "Intel Core 2"
|
||||||
|
---help---
|
||||||
|
|
||||||
|
Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
|
||||||
|
@@ -260,14 +318,55 @@ config MCORE2
|
||||||
|
family in /proc/cpuinfo. Newer ones have 6 and older ones 15
|
||||||
|
(not a typo)
|
||||||
|
|
||||||
|
-config MATOM
|
||||||
|
- bool "Intel Atom"
|
||||||
|
+ Enables -march=core2
|
||||||
|
+
|
||||||
|
+config MNEHALEM
|
||||||
|
+ bool "Intel Nehalem"
|
||||||
|
---help---
|
||||||
|
|
||||||
|
- Select this for the Intel Atom platform. Intel Atom CPUs have an
|
||||||
|
- in-order pipelining architecture and thus can benefit from
|
||||||
|
- accordingly optimized code. Use a recent GCC with specific Atom
|
||||||
|
- support in order to fully benefit from selecting this option.
|
||||||
|
+ Select this for 1st Gen Core processors in the Nehalem family.
|
||||||
|
+
|
||||||
|
+ Enables -march=nehalem
|
||||||
|
+
|
||||||
|
+config MWESTMERE
|
||||||
|
+ bool "Intel Westmere"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Westmere formerly Nehalem-C family.
|
||||||
|
+
|
||||||
|
+ Enables -march=westmere
|
||||||
|
+
|
||||||
|
+config MSANDYBRIDGE
|
||||||
|
+ bool "Intel Sandy Bridge"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for 2nd Gen Core processors in the Sandy Bridge family.
|
||||||
|
+
|
||||||
|
+ Enables -march=sandybridge
|
||||||
|
+
|
||||||
|
+config MIVYBRIDGE
|
||||||
|
+ bool "Intel Ivy Bridge"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for 3rd Gen Core processors in the Ivy Bridge family.
|
||||||
|
+
|
||||||
|
+ Enables -march=ivybridge
|
||||||
|
+
|
||||||
|
+config MHASWELL
|
||||||
|
+ bool "Intel Haswell"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for 4th Gen Core processors in the Haswell family.
|
||||||
|
+
|
||||||
|
+ Enables -march=haswell
|
||||||
|
+
|
||||||
|
+config MBROADWELL
|
||||||
|
+ bool "Intel Broadwell"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ Select this for 5th Gen Core processors in the Broadwell family.
|
||||||
|
+
|
||||||
|
+ Enables -march=broadwell
|
||||||
|
|
||||||
|
config GENERIC_CPU
|
||||||
|
bool "Generic-x86-64"
|
||||||
|
@@ -276,6 +375,19 @@ config GENERIC_CPU
|
||||||
|
Generic x86-64 CPU.
|
||||||
|
Run equally well on all x86-64 CPUs.
|
||||||
|
|
||||||
|
+config MNATIVE
|
||||||
|
+ bool "Native optimizations autodetected by GCC"
|
||||||
|
+ ---help---
|
||||||
|
+
|
||||||
|
+ GCC 4.2 and above support -march=native, which automatically detects
|
||||||
|
+ the optimum settings to use based on your processor. -march=native
|
||||||
|
+ also detects and applies additional settings beyond -march specific
|
||||||
|
+ to your CPU, (eg. -msse4). Unless you have a specific reason not to
|
||||||
|
+ (e.g. distcc cross-compiling), you should probably be using
|
||||||
|
+ -march=native rather than anything listed below.
|
||||||
|
+
|
||||||
|
+ Enables -march=native
|
||||||
|
+
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
config X86_GENERIC
|
||||||
|
@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
|
||||||
|
config X86_L1_CACHE_SHIFT
|
||||||
|
int
|
||||||
|
default "7" if MPENTIUM4 || MPSC
|
||||||
|
- default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
|
||||||
|
+ default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
|
||||||
|
default "4" if MELAN || M486 || MGEODEGX1
|
||||||
|
default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
|
||||||
|
|
||||||
|
@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
|
||||||
|
|
||||||
|
config X86_INTEL_USERCOPY
|
||||||
|
def_bool y
|
||||||
|
- depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
|
||||||
|
+ depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
|
||||||
|
|
||||||
|
config X86_USE_PPRO_CHECKSUM
|
||||||
|
def_bool y
|
||||||
|
- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
|
||||||
|
+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
|
||||||
|
|
||||||
|
config X86_USE_3DNOW
|
||||||
|
def_bool y
|
||||||
|
@@ -359,17 +471,17 @@ config X86_P6_NOP
|
||||||
|
|
||||||
|
config X86_TSC
|
||||||
|
def_bool y
|
||||||
|
- depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
|
||||||
|
+ depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
|
||||||
|
|
||||||
|
config X86_CMPXCHG64
|
||||||
|
def_bool y
|
||||||
|
- depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
|
||||||
|
+ depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
|
||||||
|
|
||||||
|
# this should be set for all -march=.. options where the compiler
|
||||||
|
# generates cmov.
|
||||||
|
config X86_CMOV
|
||||||
|
def_bool y
|
||||||
|
- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
|
||||||
|
+ depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
|
||||||
|
|
||||||
|
config X86_MINIMUM_CPU_FAMILY
|
||||||
|
int
|
||||||
|
--- a/arch/x86/Makefile 2014-08-03 18:25:02.000000000 -0400
|
||||||
|
+++ b/arch/x86/Makefile 2014-09-13 09:37:16.721385247 -0400
|
||||||
|
@@ -92,13 +92,33 @@ else
|
||||||
|
KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
|
||||||
|
|
||||||
|
# FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
|
||||||
|
+ cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
|
||||||
|
cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
|
||||||
|
+ cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
|
||||||
|
+ cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
|
||||||
|
+ cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
|
||||||
|
+ cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
|
||||||
|
+ cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
|
||||||
|
+ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
|
||||||
|
+ cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
|
||||||
|
cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
|
||||||
|
|
||||||
|
cflags-$(CONFIG_MCORE2) += \
|
||||||
|
- $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
|
||||||
|
- cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
|
||||||
|
- $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
|
||||||
|
+ $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
|
||||||
|
+ cflags-$(CONFIG_MNEHALEM) += \
|
||||||
|
+ $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
|
||||||
|
+ cflags-$(CONFIG_MWESTMERE) += \
|
||||||
|
+ $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
|
||||||
|
+ cflags-$(CONFIG_MSANDYBRIDGE) += \
|
||||||
|
+ $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
|
||||||
|
+ cflags-$(CONFIG_MIVYBRIDGE) += \
|
||||||
|
+ $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
|
||||||
|
+ cflags-$(CONFIG_MHASWELL) += \
|
||||||
|
+ $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
|
||||||
|
+ cflags-$(CONFIG_MBROADWELL) += \
|
||||||
|
+ $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
|
||||||
|
+ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
|
||||||
|
+ $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
|
||||||
|
cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
|
||||||
|
KBUILD_CFLAGS += $(cflags-y)
|
||||||
|
|
||||||
|
--- a/arch/x86/Makefile_32.cpu 2014-08-03 18:25:02.000000000 -0400
|
||||||
|
+++ b/arch/x86/Makefile_32.cpu 2014-09-13 09:37:16.721385247 -0400
|
||||||
|
@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6) += -march=k6
|
||||||
|
# Please note, that patches that add -march=athlon-xp and friends are pointless.
|
||||||
|
# They make zero difference whatsosever to performance at this time.
|
||||||
|
cflags-$(CONFIG_MK7) += -march=athlon
|
||||||
|
+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
|
||||||
|
cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2,-march=athlon)
|
||||||
|
+cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2,-march=athlon)
|
||||||
|
cflags-$(CONFIG_MCRUSOE) += -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
|
||||||
|
cflags-$(CONFIG_MEFFICEON) += -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
|
||||||
|
cflags-$(CONFIG_MWINCHIPC6) += $(call cc-option,-march=winchip-c6,-march=i586)
|
||||||
|
@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII) += $(call cc-
|
||||||
|
cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686)
|
||||||
|
cflags-$(CONFIG_MVIAC7) += -march=i686
|
||||||
|
cflags-$(CONFIG_MCORE2) += -march=i686 $(call tune,core2)
|
||||||
|
-cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
|
||||||
|
- $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
|
||||||
|
+cflags-$(CONFIG_MNEHALEM) += -march=i686 $(call tune,nehalem)
|
||||||
|
+cflags-$(CONFIG_MWESTMERE) += -march=i686 $(call tune,westmere)
|
||||||
|
+cflags-$(CONFIG_MSANDYBRIDGE) += -march=i686 $(call tune,sandybridge)
|
||||||
|
+cflags-$(CONFIG_MIVYBRIDGE) += -march=i686 $(call tune,ivybridge)
|
||||||
|
+cflags-$(CONFIG_MHASWELL) += -march=i686 $(call tune,haswell)
|
||||||
|
+cflags-$(CONFIG_MBROADWELL) += -march=i686 $(call tune,broadwell)
|
||||||
|
+cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
|
||||||
|
+ $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
|
||||||
|
|
||||||
|
# AMD Elan support
|
||||||
|
cflags-$(CONFIG_MELAN) += -march=i486
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,181 @@
|
|||||||
|
|
||||||
|
3rdparty/mkbuild.pl | 92 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
Documentation/3rdparty.txt | 76 +++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 168 insertions(+)
|
||||||
|
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/mkbuild.pl linux-2.6.37.3rdparty/3rdparty/mkbuild.pl
|
||||||
|
--- linux-2.6.37/3rdparty/mkbuild.pl 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/mkbuild.pl 2004-04-23 14:59:03.000000000 +0300
|
||||||
|
@@ -0,0 +1,92 @@
|
||||||
|
+#!/usr/bin/perl -w
|
||||||
|
+#
|
||||||
|
+# Version 1.0
|
||||||
|
+#
|
||||||
|
+# Copyright 2001 Jeff Garzik <jgarzik@mandrakesoft.com>
|
||||||
|
+# Copyright 2002 Juan Quintela <quintela@mandrakesoft.com>
|
||||||
|
+# Copyright 2003 Nicolas Planel <nplanel@mandrakesoft.com>
|
||||||
|
+#
|
||||||
|
+# This software may be used and distributed according to the terms
|
||||||
|
+# of the GNU General Public License, incorporated herein by reference.
|
||||||
|
+#
|
||||||
|
+#
|
||||||
|
+# Run "mkbuild.pl"
|
||||||
|
+#
|
||||||
|
+# This program generates the following files
|
||||||
|
+# Makefile
|
||||||
|
+# Makefile.drivers
|
||||||
|
+# Config.in
|
||||||
|
+# using the information in the subdirs of this directory.
|
||||||
|
+#
|
||||||
|
+# subdirs need to have:
|
||||||
|
+# a Config.in file
|
||||||
|
+# a Makefile with a O_TARGET/L_TARGET targets
|
||||||
|
+# The config.in should set a CONFIG_<module_dir_name> to m/y.
|
||||||
|
+
|
||||||
|
+use strict;
|
||||||
|
+
|
||||||
|
+opendir(THISDIR, ".");
|
||||||
|
+# get dirs without . and .. garbage
|
||||||
|
+my (@modules) = grep(!/\.\.?$/,grep(-d, readdir(THISDIR)));
|
||||||
|
+closedir(THISDIR);
|
||||||
|
+
|
||||||
|
+generate_kconfig(@modules);
|
||||||
|
+generate_makefile(@modules);
|
||||||
|
+exit(0);
|
||||||
|
+
|
||||||
|
+##########################################################################
|
||||||
|
+
|
||||||
|
+sub generate_makefile {
|
||||||
|
+ my (@modules) = @_;
|
||||||
|
+
|
||||||
|
+ local *F;
|
||||||
|
+ open F, "> Makefile" or die "Cannot create new Makefile: $!\n";
|
||||||
|
+ print F <<'EOM';
|
||||||
|
+#
|
||||||
|
+# THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT.
|
||||||
|
+#
|
||||||
|
+
|
||||||
|
+EOM
|
||||||
|
+ printf F "obj- := 3rdparty.o # Dummy rule to force built-in.o to be made\n";
|
||||||
|
+ printf F "obj-\$(%s) += %s\n", to_CONFIG($_), $_ . '/' foreach @modules;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+sub generate_kconfig {
|
||||||
|
+ my (@modules) = @_;
|
||||||
|
+
|
||||||
|
+ local *F;
|
||||||
|
+ open F, "> Kconfig" or die "Cannot create Kconfig: $!\n";
|
||||||
|
+ print F <<"EOM";
|
||||||
|
+#
|
||||||
|
+# THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT.
|
||||||
|
+#
|
||||||
|
+
|
||||||
|
+menu "Unofficial 3rd party kernel additions"
|
||||||
|
+
|
||||||
|
+EOM
|
||||||
|
+
|
||||||
|
+ foreach (@modules) {
|
||||||
|
+ die "No Kconfig in $_.\n" if ! -r "$_/Kconfig";
|
||||||
|
+ print F "source 3rdparty/$_/Kconfig\n";
|
||||||
|
+ }
|
||||||
|
+ print F "\n\nendmenu\n";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+sub to_CONFIG {
|
||||||
|
+ local $_ = $_[0];
|
||||||
|
+ tr/a-z/A-Z/;
|
||||||
|
+ s/[\-\. ]/_/g;
|
||||||
|
+ "CONFIG_$_";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+sub find_target {
|
||||||
|
+ my ($module_dir) = @_;
|
||||||
|
+
|
||||||
|
+ local *F;
|
||||||
|
+ open(F, "$module_dir/Makefile") or die "$module_dir/Makefile: $!\n";
|
||||||
|
+ while (<F>) {
|
||||||
|
+ chomp;
|
||||||
|
+ return $1 if (/[LO]_TARGET.*:=\s+(\S+)/);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
diff -Nurp linux-2.6.37/Documentation/3rdparty.txt linux-2.6.37.3rdparty/Documentation/3rdparty.txt
|
||||||
|
--- linux-2.6.37/Documentation/3rdparty.txt 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/Documentation/3rdparty.txt 2003-11-22 01:07:26.000000000 +0200
|
||||||
|
@@ -0,0 +1,76 @@
|
||||||
|
+
|
||||||
|
+Third-Party Kernel Source Module Support, or
|
||||||
|
+an easy way to add modules to your kernel build.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Vendors quite often add additional drivers and features to the kernel
|
||||||
|
+which require nothing more than modifying Kconfig, Makefile, and
|
||||||
|
+adding one or more files to a sub-directory. As a single discrete task,
|
||||||
|
+this is not a problem. However, using patches to add modules to the
|
||||||
|
+kernel very often results in patch conflicts, resulting in needless time
|
||||||
|
+wastage as developers regenerate an otherwise working kernel patch.
|
||||||
|
+
|
||||||
|
+This is designed as a solution to these problems. It is NOT designed as
|
||||||
|
+a replacement for the kernel build system, but merely as a tool for
|
||||||
|
+vendors and system administrators to ease the pain of patch management.
|
||||||
|
+
|
||||||
|
+The key feature of this system is the distinct lack of patches. Drivers
|
||||||
|
+are installed via unpacking a tarball.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Adding a directory to the build (usually from a tarball)
|
||||||
|
+--------------------------------------------------------
|
||||||
|
+If a directory exists inside the 3rdparty sub-directory that contains a
|
||||||
|
+proper Makefile, it can be added to the build. It also needs a
|
||||||
|
+Kconfig file.
|
||||||
|
+
|
||||||
|
+ cd /usr/src/linux-2.4.3/3rdparty
|
||||||
|
+ bzcat /tmp/my-driver2.tar.bz2 | tar xf - # creates "my2" dir
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Limitations
|
||||||
|
+-----------
|
||||||
|
+There are some limitations to this system. This system is only
|
||||||
|
+designed to support a very common case. If you find yourself running
|
||||||
|
+into limitations (kernel build experts can spot them right off),
|
||||||
|
+then you should probably be patching the kernel instead of using
|
||||||
|
+mkbuild.pl for that particular module.
|
||||||
|
+
|
||||||
|
+FIXME: actually list the limitations
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+Other notes
|
||||||
|
+-----------
|
||||||
|
+Link order is controlled by the order of mkbuild.pl executions.
|
||||||
|
+
|
||||||
|
+"make mrproper" will erase Makefile.meta, and empty Kconfig, Makefile,
|
||||||
|
+and Makefile.drivers.
|
||||||
|
+
|
||||||
|
+IMPORTANT NOTE: Because this feature modifies the kernel's makefiles and
|
||||||
|
+configuration system, you MUST complete all mkbuild.pl runs before
|
||||||
|
+running any "make" command.
|
||||||
|
+
|
||||||
|
+Building in the 3rdparty dir
|
||||||
|
+----------------------------
|
||||||
|
+
|
||||||
|
+If you use modules that:
|
||||||
|
+ - are contained in one subdir with the name of the module
|
||||||
|
+ - has a Makefile
|
||||||
|
+ - has a Kconfig file
|
||||||
|
+
|
||||||
|
+The system calls the ./mkbuild.pl script. It will search for
|
||||||
|
+subdirectories, and will try to build each of them as a module.
|
||||||
|
+Things to note:
|
||||||
|
+
|
||||||
|
+ The dependencies will be done in a module called:
|
||||||
|
+
|
||||||
|
+ 3rdparty/<module_dir_name>/<module_name>
|
||||||
|
+
|
||||||
|
+depending of CONFIG_<module_name_in_uppercase>.
|
||||||
|
+
|
||||||
|
+<module_name> is the value of O_TARGET/L_TARGET.
|
||||||
|
+
|
||||||
|
+
|
||||||
@@ -0,0 +1,175 @@
|
|||||||
|
|
||||||
|
Include 3rdparty directory into the main build-system.
|
||||||
|
|
||||||
|
Original author is unknown.
|
||||||
|
(Was either Juan Quintela or Jeff Garzik)
|
||||||
|
|
||||||
|
Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
Makefile | 2 +-
|
||||||
|
arch/alpha/Kconfig | 1 +
|
||||||
|
arch/ia64/Kconfig | 2 ++
|
||||||
|
arch/mips/Kconfig | 2 ++
|
||||||
|
arch/powerpc/Kconfig | 2 ++
|
||||||
|
arch/sparc/Kconfig | 2 ++
|
||||||
|
arch/x86/Kconfig | 2 ++
|
||||||
|
scripts/kconfig/Makefile | 31 +++++++++++++++++--------------
|
||||||
|
8 files changed, 29 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/alpha/Kconfig linux-3.18-rc6-3rdparty/arch/alpha/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/alpha/Kconfig 2014-10-05 22:23:04.000000000 +0300
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/alpha/Kconfig 2014-11-29 21:42:38.015594440 +0200
|
||||||
|
@@ -746,3 +746,4 @@ source "crypto/Kconfig"
|
||||||
|
|
||||||
|
source "lib/Kconfig"
|
||||||
|
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/ia64/Kconfig linux-3.18-rc6-3rdparty/arch/ia64/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/ia64/Kconfig 2014-10-05 22:23:04.000000000 +0300
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/ia64/Kconfig 2014-11-29 21:42:38.015594440 +0200
|
||||||
|
@@ -646,3 +646,5 @@ source "lib/Kconfig"
|
||||||
|
|
||||||
|
config IOMMU_HELPER
|
||||||
|
def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
|
||||||
|
+
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/mips/Kconfig linux-3.18-rc6-3rdparty/arch/mips/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/mips/Kconfig 2014-11-29 21:37:34.434802374 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/mips/Kconfig 2014-11-29 21:42:38.015594440 +0200
|
||||||
|
@@ -2709,3 +2709,5 @@ source "crypto/Kconfig"
|
||||||
|
source "lib/Kconfig"
|
||||||
|
|
||||||
|
source "arch/mips/kvm/Kconfig"
|
||||||
|
+
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/powerpc/Kconfig linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/powerpc/Kconfig 2014-11-29 21:37:34.446802445 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig 2014-11-29 21:42:38.016594446 +0200
|
||||||
|
@@ -1081,3 +1081,5 @@ config PPC_LIB_RHEAP
|
||||||
|
bool
|
||||||
|
|
||||||
|
source "arch/powerpc/kvm/Kconfig"
|
||||||
|
+
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/sparc/Kconfig linux-3.18-rc6-3rdparty/arch/sparc/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/sparc/Kconfig 2014-11-29 21:37:34.478802634 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/sparc/Kconfig 2014-11-29 21:42:38.016594446 +0200
|
||||||
|
@@ -562,3 +562,5 @@ source "security/Kconfig"
|
||||||
|
source "crypto/Kconfig"
|
||||||
|
|
||||||
|
source "lib/Kconfig"
|
||||||
|
+
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/arch/x86/Kconfig linux-3.18-rc6-3rdparty/arch/x86/Kconfig
|
||||||
|
--- linux-3.18-rc6/arch/x86/Kconfig 2014-11-29 21:37:34.488802693 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/arch/x86/Kconfig 2014-11-29 21:42:38.016594446 +0200
|
||||||
|
@@ -2509,3 +2509,5 @@ source "crypto/Kconfig"
|
||||||
|
source "arch/x86/kvm/Kconfig"
|
||||||
|
|
||||||
|
source "lib/Kconfig"
|
||||||
|
+
|
||||||
|
+source "3rdparty/Kconfig"
|
||||||
|
diff -Nurp linux-3.18-rc6/Makefile linux-3.18-rc6-3rdparty/Makefile
|
||||||
|
--- linux-3.18-rc6/Makefile 2014-11-29 21:37:34.352801890 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/Makefile 2014-11-29 21:42:38.016594446 +0200
|
||||||
|
@@ -556,7 +556,7 @@ scripts: scripts_basic include/config/au
|
||||||
|
|
||||||
|
# Objects we will link into vmlinux / subdirs we need to visit
|
||||||
|
init-y := init/
|
||||||
|
-drivers-y := drivers/ sound/ firmware/
|
||||||
|
+drivers-y := drivers/ sound/ firmware/ 3rdparty/
|
||||||
|
net-y := net/
|
||||||
|
libs-y := lib/
|
||||||
|
core-y := usr/
|
||||||
|
diff -Nurp linux-3.18-rc6/scripts/kconfig/Makefile linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile
|
||||||
|
--- linux-3.18-rc6/scripts/kconfig/Makefile 2014-11-29 21:37:35.487808590 +0200
|
||||||
|
+++ linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile 2014-11-29 21:46:48.227071462 +0200
|
||||||
|
@@ -14,29 +14,29 @@ endif
|
||||||
|
# We need this, in case the user has it in its environment
|
||||||
|
unexport CONFIG_
|
||||||
|
|
||||||
|
-xconfig: $(obj)/qconf
|
||||||
|
+xconfig: $(obj)/qconf 3rdparty/Makefile
|
||||||
|
$< $(Kconfig)
|
||||||
|
|
||||||
|
-gconfig: $(obj)/gconf
|
||||||
|
+gconfig: $(obj)/gconf 3rdparty/Makefile
|
||||||
|
$< $(Kconfig)
|
||||||
|
|
||||||
|
-menuconfig: $(obj)/mconf
|
||||||
|
+menuconfig: $(obj)/mconf 3rdparty/Makefile
|
||||||
|
$< $(Kconfig)
|
||||||
|
|
||||||
|
-config: $(obj)/conf
|
||||||
|
+config: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --oldaskconfig $(Kconfig)
|
||||||
|
|
||||||
|
-nconfig: $(obj)/nconf
|
||||||
|
+nconfig: $(obj)/nconf 3rdparty/Makefile
|
||||||
|
$< $(Kconfig)
|
||||||
|
|
||||||
|
-oldconfig: $(obj)/conf
|
||||||
|
+oldconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --$@ $(Kconfig)
|
||||||
|
|
||||||
|
-silentoldconfig: $(obj)/conf
|
||||||
|
+silentoldconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$(Q)mkdir -p include/config include/generated
|
||||||
|
$< --$@ $(Kconfig)
|
||||||
|
|
||||||
|
-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
|
||||||
|
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
|
||||||
|
$(Q)mkdir -p include/config include/generated
|
||||||
|
$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
|
||||||
|
$(Q)if [ -f .config ]; then \
|
||||||
|
@@ -76,24 +76,24 @@ update-po-config: $(obj)/kxgettext $(obj
|
||||||
|
|
||||||
|
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
|
||||||
|
|
||||||
|
-allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
|
||||||
|
+allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --$@ $(Kconfig)
|
||||||
|
|
||||||
|
PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
|
||||||
|
|
||||||
|
-listnewconfig olddefconfig: $(obj)/conf
|
||||||
|
+listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --$@ $(Kconfig)
|
||||||
|
|
||||||
|
# oldnoconfig is an alias of olddefconfig, because people already are dependent
|
||||||
|
# on its behavior(sets new symbols to their default value but not 'n') with the
|
||||||
|
# counter-intuitive name.
|
||||||
|
-oldnoconfig: $(obj)/conf
|
||||||
|
+oldnoconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --olddefconfig $(Kconfig)
|
||||||
|
|
||||||
|
-savedefconfig: $(obj)/conf
|
||||||
|
+savedefconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$< --$@=defconfig $(Kconfig)
|
||||||
|
|
||||||
|
-defconfig: $(obj)/conf
|
||||||
|
+defconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
ifeq ($(KBUILD_DEFCONFIG),)
|
||||||
|
$< --defconfig $(Kconfig)
|
||||||
|
else
|
||||||
|
@@ -101,7 +101,7 @@ else
|
||||||
|
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
|
||||||
|
endif
|
||||||
|
|
||||||
|
-%_defconfig: $(obj)/conf
|
||||||
|
+%_defconfig: $(obj)/conf 3rdparty/Makefile
|
||||||
|
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
||||||
|
|
||||||
|
configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)
|
||||||
|
@@ -178,6 +178,9 @@ gconf-objs := gconf.o zconf.tab.o
|
||||||
|
|
||||||
|
hostprogs-y := conf nconf mconf kxgettext qconf gconf
|
||||||
|
|
||||||
|
+3rdparty/Makefile:
|
||||||
|
+ pushd $(srctree)/3rdparty ; $(PERL) ./mkbuild.pl ; popd
|
||||||
|
+
|
||||||
|
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
|
||||||
|
clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
|
||||||
|
clean-files += config.pot linux.pot
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,20 @@
|
|||||||
|
--- linux-2.6.35/3rdparty/acerhk/acerhk.c.orig 2010-10-03 12:50:33.000000000 +0000
|
||||||
|
+++ linux-2.6.35/3rdparty/acerhk/acerhk.c 2010-10-03 13:13:22.093868410 +0000
|
||||||
|
@@ -2730,7 +2730,7 @@ static void acerhk_proc_cleanup(void)
|
||||||
|
|
||||||
|
/* {{{ file operations */
|
||||||
|
|
||||||
|
-static int acerhk_ioctl( struct inode *inode, struct file *file,
|
||||||
|
+static long acerhk_ioctl( struct inode *inode, struct file *file,
|
||||||
|
unsigned int cmd, unsigned long arg )
|
||||||
|
{
|
||||||
|
int retval;
|
||||||
|
@@ -2827,7 +2827,7 @@ static int acerhk_release( struct inode
|
||||||
|
|
||||||
|
static struct file_operations acerhk_fops = {
|
||||||
|
owner: THIS_MODULE,
|
||||||
|
- ioctl: acerhk_ioctl,
|
||||||
|
+ unlocked_ioctl: acerhk_ioctl,
|
||||||
|
open: acerhk_open,
|
||||||
|
#ifdef ACERDEBUG
|
||||||
|
write: acerhk_write,
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
CFLAGS use isn't allowed anymore with 2.6.24, we must use EXTRA_CFLAGS
|
||||||
|
in its place
|
||||||
|
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
|
||||||
|
|
||||||
|
--- linux-2.6.23/3rdparty/acerhk/Makefile.orig 2007-11-08 21:32:43.000000000 -0200
|
||||||
|
+++ linux-2.6.23/3rdparty/acerhk/Makefile 2007-11-08 21:33:28.000000000 -0200
|
||||||
|
@@ -14,7 +14,7 @@
|
||||||
|
CONFIG_ACERHK?=m
|
||||||
|
obj-$(CONFIG_ACERHK) += acerhk.o
|
||||||
|
|
||||||
|
-CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
|
||||||
|
+EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
|
||||||
|
INCLUDE=-I$(KERNELSRC)/include
|
||||||
|
|
||||||
|
ifeq ($(KERNELMAJOR), 2.6)
|
||||||
|
@@ -41,13 +41,13 @@ acerhk.ko: $(SOURCE) acerhk.h
|
||||||
|
$(MAKE) -C $(KERNELSRC) SUBDIRS=$(PWD) modules
|
||||||
|
|
||||||
|
acerhk.o: $(SOURCE) acerhk.h
|
||||||
|
- $(CC) $(INCLUDE) $(CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE)
|
||||||
|
+ $(CC) $(INCLUDE) $(EXTRA_CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE)
|
||||||
|
|
||||||
|
asm: $(SOURCE)
|
||||||
|
ifeq ($(KERNELMAJOR), 2.6)
|
||||||
|
- $(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
|
||||||
|
+ $(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
|
||||||
|
else
|
||||||
|
- $(CC) $(INCLUDE) $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
|
||||||
|
+ $(CC) $(INCLUDE) $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
clean:
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
Fix acerhk build with FUNCTION_TRACER enabled.
|
||||||
|
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
|
||||||
|
---
|
||||||
|
3rdparty/acerhk/Makefile | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff -p -up linux-2.6.31/3rdparty/acerhk/Makefile.orig linux-2.6.31/3rdparty/acerhk/Makefile
|
||||||
|
--- linux-2.6.31/3rdparty/acerhk/Makefile.orig 2009-10-02 16:39:06.000000000 -0300
|
||||||
|
+++ linux-2.6.31/3rdparty/acerhk/Makefile 2009-10-02 16:45:13.000000000 -0300
|
||||||
|
@@ -14,7 +14,10 @@
|
||||||
|
CONFIG_ACERHK?=m
|
||||||
|
obj-$(CONFIG_ACERHK) += acerhk.o
|
||||||
|
|
||||||
|
-EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
|
||||||
|
+CFLAGS_acerhk.o += -c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
|
||||||
|
+ifdef CONFIG_FUNCTION_TRACER
|
||||||
|
+CFLAGS_REMOVE_acerhk.o = -pg
|
||||||
|
+endif
|
||||||
|
INCLUDE=-I$(KERNELSRC)/include
|
||||||
|
|
||||||
|
ifeq ($(KERNELMAJOR), 2.6)
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
|
||||||
|
AUTOCONF_INCLUDED is not defined anymore in 2.6.38, so old include got exposed.
|
||||||
|
|
||||||
|
Fix by removing the offending bits.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
3rdparty/acerhk/acerhk.c | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
--- linux-2.6.38/3rdparty/acerhk/acerhk.c.orig 2011-03-20 13:57:32.000000000 +0200
|
||||||
|
+++ linux-2.6.38/3rdparty/acerhk/acerhk.c 2011-03-20 15:00:45.768659568 +0200
|
||||||
|
@@ -35,10 +35,6 @@
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifndef AUTOCONF_INCLUDED
|
||||||
|
-#include <linux/config.h>
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
/* This driver is heavily dependent on the architecture, don't let
|
||||||
|
* anyone without an X86 machine use it. On laptops with AMD64
|
||||||
|
* architecture this driver is only useable in 32 bit mode.
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
Fix Makefile and add Kconfig for the acerhk driver
|
||||||
|
---
|
||||||
|
3rdparty/acerhk/Kconfig | 8 8 + 0 - 0 !
|
||||||
|
3rdparty/acerhk/Makefile | 6 3 + 3 - 0 !
|
||||||
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
Index: linux-2.6.21/3rdparty/acerhk/Makefile
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.21.orig/3rdparty/acerhk/Makefile 2007-05-15 15:34:48.000000000 +0200
|
||||||
|
+++ linux-2.6.21/3rdparty/acerhk/Makefile 2007-05-15 15:37:17.000000000 +0200
|
||||||
|
@@ -1,10 +1,10 @@
|
||||||
|
# change KERNELSRC to the location of your kernel build tree only if
|
||||||
|
# autodetection does not work
|
||||||
|
#KERNELSRC=/usr/src/linux
|
||||||
|
-KERNELSRC?=/lib/modules/`uname -r`/build
|
||||||
|
+#KERNELSRC?=/lib/modules/`uname -r`/build
|
||||||
|
# Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases
|
||||||
|
-KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
|
||||||
|
-KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
|
||||||
|
+#KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
|
||||||
|
+#KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
|
||||||
|
|
||||||
|
# next line is for kernel 2.6, if you integrate the driver in the kernel tree
|
||||||
|
# /usr/src/linux/drivers/acerhk - or something similar
|
||||||
|
Index: linux-2.6.21/3rdparty/acerhk/Kconfig
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
|
+++ linux-2.6.21/3rdparty/acerhk/Kconfig 2007-05-15 15:39:30.000000000 +0200
|
||||||
|
@@ -0,0 +1,8 @@
|
||||||
|
+config ACERHK
|
||||||
|
+ tristate "Acerhk driver"
|
||||||
|
+ depends on EXPERIMENTAL && X86
|
||||||
|
+ ---help---
|
||||||
|
+ This is an experimental acer keyboard driver for
|
||||||
|
+ acer laptops. If you have a notebook with a ipw2X00
|
||||||
|
+ wireless card, it allows you to turn off the rf_kill
|
||||||
|
+
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
Updated for owner removal from struct proc_dir_entry (2.6.30)
|
||||||
|
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
|
||||||
|
|
||||||
|
---
|
||||||
|
3rdparty/acerhk/acerhk.c | 7 -------
|
||||||
|
1 file changed, 7 deletions(-)
|
||||||
|
|
||||||
|
diff -p -up linux-2.6.29/3rdparty/acerhk/acerhk.c.orig linux-2.6.29/3rdparty/acerhk/acerhk.c
|
||||||
|
--- linux-2.6.29/3rdparty/acerhk/acerhk.c.orig 2009-05-22 02:42:44.000000000 -0300
|
||||||
|
+++ linux-2.6.29/3rdparty/acerhk/acerhk.c 2009-05-22 02:43:45.000000000 -0300
|
||||||
|
@@ -2626,7 +2626,6 @@ static int acerhk_proc_init(void)
|
||||||
|
printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
- proc_acer_dir->owner = THIS_MODULE;
|
||||||
|
/* now create several files, first general info ... */
|
||||||
|
entry = create_proc_read_entry("info",
|
||||||
|
0444, proc_acer_dir, acerhk_proc_info, NULL);
|
||||||
|
@@ -2635,7 +2634,6 @@ static int acerhk_proc_init(void)
|
||||||
|
remove_proc_entry("driver/acerhk", NULL);
|
||||||
|
retval = 0;
|
||||||
|
} else {
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
/* ... last pressed key ... */
|
||||||
|
entry = create_proc_read_entry("key",
|
||||||
|
0444, proc_acer_dir, acerhk_proc_key, NULL);
|
||||||
|
@@ -2645,7 +2643,6 @@ static int acerhk_proc_init(void)
|
||||||
|
remove_proc_entry("driver/acerhk", NULL);
|
||||||
|
retval = 0;
|
||||||
|
} else {
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
/* ... and led control file */
|
||||||
|
entry = create_proc_entry("led", 0222, proc_acer_dir);
|
||||||
|
if (entry == NULL) {
|
||||||
|
@@ -2657,7 +2654,6 @@ static int acerhk_proc_init(void)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
entry->write_proc = acerhk_proc_led;
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
/* ... and wireless led controll file */
|
||||||
|
entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
|
||||||
|
if (entry == NULL) {
|
||||||
|
@@ -2670,7 +2666,6 @@ static int acerhk_proc_init(void)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
entry->write_proc = acerhk_proc_wirelessled;
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
/* ... and bluetooth led controll file */
|
||||||
|
entry = create_proc_entry("blueled", 0222, proc_acer_dir);
|
||||||
|
if (entry == NULL) {
|
||||||
|
@@ -2683,7 +2678,6 @@ static int acerhk_proc_init(void)
|
||||||
|
retval = 0;
|
||||||
|
} else {
|
||||||
|
entry->write_proc = acerhk_proc_blueled;
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
retval = 1;
|
||||||
|
#ifdef ACERDEBUG
|
||||||
|
/* add extra file for debugging purposes */
|
||||||
|
@@ -2700,7 +2694,6 @@ static int acerhk_proc_init(void)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
entry->write_proc = acerhk_proc_debug;
|
||||||
|
- entry->owner = THIS_MODULE;
|
||||||
|
retval = 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
Fix Makefile and add Kconfig for the aes2501 driver.
|
||||||
|
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
linux-2.6.23/3rdparty/aes2501/Kconfig | 10 ++++++++++
|
||||||
|
linux-2.6.23/3rdparty/aes2501/Makefile | 19 +------------------
|
||||||
|
2 files changed, 11 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff -p -up linux-2.6.23/3rdparty/aes2501/Kconfig.orig linux-2.6.23/3rdparty/aes2501/Kconfig
|
||||||
|
--- linux-2.6.23/3rdparty/aes2501/Kconfig.orig 2008-01-13 23:14:47.000000000 -0200
|
||||||
|
+++ linux-2.6.23/3rdparty/aes2501/Kconfig 2008-01-13 23:35:21.000000000 -0200
|
||||||
|
@@ -0,0 +1,10 @@
|
||||||
|
+config AES2501
|
||||||
|
+ tristate "AuthenTec AES2501 Fingerprint Sensor Driver"
|
||||||
|
+ depends on USB
|
||||||
|
+ default m
|
||||||
|
+ ---help---
|
||||||
|
+ Say Y here if you have a AuthenTec AES2501 Fingerprint
|
||||||
|
+ Sensor device.
|
||||||
|
+
|
||||||
|
+ To compile this driver as a module, choose M here: the
|
||||||
|
+ module will be called aes2501.
|
||||||
|
diff -p -up linux-2.6.23/3rdparty/aes2501/Makefile.orig linux-2.6.23/3rdparty/aes2501/Makefile
|
||||||
|
--- linux-2.6.23/3rdparty/aes2501/Makefile.orig 2008-01-13 23:14:36.000000000 -0200
|
||||||
|
+++ linux-2.6.23/3rdparty/aes2501/Makefile 2008-01-13 23:21:33.000000000 -0200
|
||||||
|
@@ -1,19 +1,2 @@
|
||||||
|
-
|
||||||
|
-obj-m := aes2501.o
|
||||||
|
-
|
||||||
|
-KERNELDIR ?= /lib/modules/$(shell uname -r)/build
|
||||||
|
-
|
||||||
|
-PWD := $(shell pwd)
|
||||||
|
-
|
||||||
|
-all: usertest
|
||||||
|
- $(MAKE) -C $(KERNELDIR) M=$(PWD)
|
||||||
|
-
|
||||||
|
-usertest:
|
||||||
|
- gcc -I. -o usertest usertest.c
|
||||||
|
-
|
||||||
|
-clean:
|
||||||
|
- rm -f *.o *~ aes2501.ko aes2501.mod.c Module.symvers usertest
|
||||||
|
- rm -rf .tmp_versions
|
||||||
|
- rm -f .*.cmd
|
||||||
|
-
|
||||||
|
+obj-$(CONFIG_AES2501) := aes2501.o
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,21 @@
|
|||||||
|
Prevent oops on module removal when we don't have the device available.
|
||||||
|
|
||||||
|
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
linux-2.6.23/3rdparty/aes2501/aes2501.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff -p -up linux-2.6.23/3rdparty/aes2501/aes2501.c.orig linux-2.6.23/3rdparty/aes2501/aes2501.c
|
||||||
|
--- linux-2.6.23/3rdparty/aes2501/aes2501.c.orig 2008-01-13 23:37:38.000000000 -0200
|
||||||
|
+++ linux-2.6.23/3rdparty/aes2501/aes2501.c 2008-01-13 23:38:26.000000000 -0200
|
||||||
|
@@ -1616,7 +1616,8 @@ static int __init aes2501_init(void)
|
||||||
|
|
||||||
|
static void __exit aes2501_exit(void)
|
||||||
|
{
|
||||||
|
- _dev->stop_scan = 1;
|
||||||
|
+ if (_dev)
|
||||||
|
+ _dev->stop_scan = 1;
|
||||||
|
destroy_workqueue(comm_queue);
|
||||||
|
usb_deregister(&aes2501_driver);
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
--- linux-2.6.24.orig/3rdparty/ndiswrapper/Kconfig 1969-12-31 21:00:00.000000000 -0300
|
||||||
|
+++ linux-2.6.24/3rdparty/ndiswrapper/Kconfig 2007-11-26 15:11:31.000000000 -0200
|
||||||
|
@@ -0,0 +1,4 @@
|
||||||
|
+
|
||||||
|
+config NDISWRAPPER
|
||||||
|
+ tristate "NDIS driver wrapper support"
|
||||||
|
+ depends on PCI && USB && !X86_64_XEN
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
--- linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile.orig 2013-11-28 21:42:10.000000000 +0200
|
||||||
|
+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile 2013-11-30 21:41:19.550504380 +0200
|
||||||
|
@@ -9,24 +9,10 @@ DISTFILES = \
|
||||||
|
winnt_types.h workqueue.c wrapmem.c wrapmem.h wrapndis.c wrapndis.h \
|
||||||
|
wrapper.c wrapper.h
|
||||||
|
|
||||||
|
-# By default, we try to compile the modules for the currently running
|
||||||
|
-# kernel. But it's the first approximation, as we will re-read the
|
||||||
|
-# version from the kernel sources.
|
||||||
|
-KVERS_UNAME ?= $(shell uname -r)
|
||||||
|
-
|
||||||
|
# KBUILD is the path to the Linux kernel build tree. It is usually the
|
||||||
|
# same as the kernel source tree, except when the kernel was compiled in
|
||||||
|
# a separate directory.
|
||||||
|
-KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build)
|
||||||
|
-
|
||||||
|
-ifeq (,$(KBUILD))
|
||||||
|
-$(error Kernel build tree not found - please set KBUILD to configured kernel)
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-KCONFIG := $(KBUILD)/.config
|
||||||
|
-ifeq (,$(wildcard $(KCONFIG)))
|
||||||
|
-$(error No .config found in $(KBUILD), please set KBUILD to configured kernel)
|
||||||
|
-endif
|
||||||
|
+KBUILD ?= $(srctree)
|
||||||
|
|
||||||
|
ifneq (,$(wildcard $(KBUILD)/include/linux/version.h))
|
||||||
|
ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
|
||||||
|
@@ -43,16 +29,9 @@ endif
|
||||||
|
ifeq (,$(wildcard $(VERSION_H)))
|
||||||
|
VERSION_H := $(KBUILD)/include/linux/version.h
|
||||||
|
endif
|
||||||
|
-ifeq (,$(wildcard $(VERSION_H)))
|
||||||
|
-$(error Please run 'make modules_prepare' in $(KBUILD))
|
||||||
|
-endif
|
||||||
|
|
||||||
|
KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H))
|
||||||
|
|
||||||
|
-ifeq (,$(KVERS))
|
||||||
|
-$(error Cannot find UTS_RELEASE in $(VERSION_H), please report)
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
INST_DIR = /lib/modules/$(KVERS)/misc
|
||||||
|
|
||||||
|
SRC_DIR=$(shell pwd)
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
Fix build with kernel-3.14
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
3rdparty/ndiswrapper/crt.c | 2 +-
|
||||||
|
3rdparty/ndiswrapper/ntoskernel.h | 3 +--
|
||||||
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
--- linux/3rdparty/ndiswrapper/crt.c.orig 2014-04-26 19:10:55.000000000 +0300
|
||||||
|
+++ linux/3rdparty/ndiswrapper/crt.c 2014-04-26 19:25:27.766116082 +0300
|
||||||
|
@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3)
|
||||||
|
noregparm void WIN_FUNC(_win_srand,1)
|
||||||
|
(UINT seed)
|
||||||
|
{
|
||||||
|
- net_srandom(seed);
|
||||||
|
+ prandom_seed((__force u32) seed);
|
||||||
|
}
|
||||||
|
|
||||||
|
noregparm int WIN_FUNC(rand,0)
|
||||||
|
--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig 2014-04-26 19:42:32.000000000 +0300
|
||||||
|
+++ linux/3rdparty/ndiswrapper/ntoskernel.h 2014-04-26 19:59:13.662522942 +0300
|
||||||
|
@@ -798,9 +798,8 @@ do { \
|
||||||
|
#define nt_spin_unlock_irqrestore(lock, flags) \
|
||||||
|
do { \
|
||||||
|
nt_spin_unlock(lock); \
|
||||||
|
- preempt_enable_no_resched(); \
|
||||||
|
+ preempt_enable(); \
|
||||||
|
local_irq_restore(flags); \
|
||||||
|
- preempt_check_resched(); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
|
||||||
@@ -0,0 +1,978 @@
|
|||||||
|
3rdparty/rfswitch/FILES | 6
|
||||||
|
3rdparty/rfswitch/ISSUES | 28 +++
|
||||||
|
3rdparty/rfswitch/Kconfig | 22 ++
|
||||||
|
3rdparty/rfswitch/LICENSE | 339 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
3rdparty/rfswitch/Makefile | 119 +++++++++++++++
|
||||||
|
3rdparty/rfswitch/README | 44 +++++
|
||||||
|
3rdparty/rfswitch/av5100.c | 174 +++++++++++++++++++++++
|
||||||
|
3rdparty/rfswitch/pbe5.c | 205 +++++++++++++++++++++++++++
|
||||||
|
8 files changed, 937 insertions(+)
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/av5100.c linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/av5100.c 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c 2008-03-28 05:25:28.000000000 +0200
|
||||||
|
@@ -0,0 +1,174 @@
|
||||||
|
+/*******************************************************************************
|
||||||
|
+
|
||||||
|
+ Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
|
||||||
|
+
|
||||||
|
+ This program is free software; you can redistribute it and/or modify it
|
||||||
|
+ under the terms of version 2 of the GNU General Public License as
|
||||||
|
+ published by the Free Software Foundation.
|
||||||
|
+
|
||||||
|
+ This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
+ more details.
|
||||||
|
+
|
||||||
|
+ You should have received a copy of the GNU General Public License along with
|
||||||
|
+ this program; if not, write to the Free Software Foundation, Inc., 59
|
||||||
|
+ Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
+
|
||||||
|
+ The full GNU General Public License is included in this distribution in the
|
||||||
|
+ file called LICENSE.
|
||||||
|
+
|
||||||
|
+ Contact Information:
|
||||||
|
+ James P. Ketrenos <ipw2100-admin@linux.intel.com>
|
||||||
|
+ Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
||||||
|
+
|
||||||
|
+*******************************************************************************/
|
||||||
|
+#include <linux/compiler.h>
|
||||||
|
+#include <linux/errno.h>
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/types.h>
|
||||||
|
+#include <linux/netdevice.h>
|
||||||
|
+#include <linux/version.h>
|
||||||
|
+#include <linux/proc_fs.h>
|
||||||
|
+#include <linux/ioport.h>
|
||||||
|
+#include <asm/uaccess.h>
|
||||||
|
+#include <asm/io.h>
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#define DRV_NAME "av5100"
|
||||||
|
+#define DRV_VERSION "1.3"
|
||||||
|
+#define DRV_DESCRIPTION "SW RF kill switch for Averatec 5100P"
|
||||||
|
+#define DRV_COPYRIGHT "Copyright(c) 2003-2004 Intel Corporation"
|
||||||
|
+
|
||||||
|
+static int radio = 1;
|
||||||
|
+
|
||||||
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
|
||||||
|
+
|
||||||
|
+MODULE_PARM(radio, "i");
|
||||||
|
+
|
||||||
|
+#else /* LINUX_VERSION_CODE < 2.6.0 */
|
||||||
|
+
|
||||||
|
+#include <linux/moduleparam.h>
|
||||||
|
+module_param(radio, int, 1);
|
||||||
|
+
|
||||||
|
+#endif /* LINUX_VERSION_CODE < 2.6.0 */
|
||||||
|
+
|
||||||
|
+MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)");
|
||||||
|
+
|
||||||
|
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
|
||||||
|
+MODULE_AUTHOR(DRV_COPYRIGHT);
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
+
|
||||||
|
+#define AV5100_RADIO_ON (0xe0)
|
||||||
|
+#define AV5100_RADIO_OFF (0xe1)
|
||||||
|
+
|
||||||
|
+static int av5100_radio = AV5100_RADIO_OFF;
|
||||||
|
+
|
||||||
|
+static void av5100_set_radio(int state)
|
||||||
|
+{
|
||||||
|
+ printk(KERN_INFO DRV_NAME ": Radio being turned %s\n",
|
||||||
|
+ (state == AV5100_RADIO_ON) ? "ON" : "OFF");
|
||||||
|
+ outl(0x80020800, 0xcf8);
|
||||||
|
+ outb(0x6f, 0x0072);
|
||||||
|
+ outl(0x1800ffff, 0x1184);
|
||||||
|
+ outb(state, 0x00b2);
|
||||||
|
+ av5100_radio = state;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * proc stuff
|
||||||
|
+ */
|
||||||
|
+static struct proc_dir_entry *dir_base = NULL;
|
||||||
|
+
|
||||||
|
+static int proc_set_radio(struct file *file, const char *buffer,
|
||||||
|
+ unsigned long count, void *data)
|
||||||
|
+{
|
||||||
|
+ av5100_set_radio(buffer[0] == '0' ? AV5100_RADIO_OFF : AV5100_RADIO_ON);
|
||||||
|
+
|
||||||
|
+ return count;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int proc_get_radio(char *page, char **start, off_t offset,
|
||||||
|
+ int count, int *eof, void *data)
|
||||||
|
+{
|
||||||
|
+ int len = 0;
|
||||||
|
+
|
||||||
|
+ len += snprintf(page, count, DRV_NAME ": %d\n",
|
||||||
|
+ av5100_radio == AV5100_RADIO_OFF ? 0 : 1);
|
||||||
|
+
|
||||||
|
+ *eof = 1;
|
||||||
|
+ return len;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static void av5100_proc_cleanup(void)
|
||||||
|
+{
|
||||||
|
+ if (dir_base) {
|
||||||
|
+ remove_proc_entry("radio", dir_base);
|
||||||
|
+ remove_proc_entry(DRV_NAME, &proc_root);
|
||||||
|
+ dir_base = NULL;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static int av5100_proc_init(void)
|
||||||
|
+{
|
||||||
|
+ struct proc_dir_entry *ent;
|
||||||
|
+ int err = 0;
|
||||||
|
+
|
||||||
|
+ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
|
||||||
|
+ if (dir_base == NULL) {
|
||||||
|
+ printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/"
|
||||||
|
+ DRV_NAME "\n");
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR,
|
||||||
|
+ dir_base);
|
||||||
|
+ if (ent) {
|
||||||
|
+ ent->read_proc = proc_get_radio;
|
||||||
|
+ ent->write_proc = proc_set_radio;
|
||||||
|
+ } else {
|
||||||
|
+ printk(KERN_ERR
|
||||||
|
+ "Unable to initialize /proc/" DRV_NAME "/radio\n");
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ fail:
|
||||||
|
+ av5100_proc_cleanup();
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * module stuff
|
||||||
|
+ */
|
||||||
|
+static int __init av5100_init(void)
|
||||||
|
+{
|
||||||
|
+ av5100_proc_init();
|
||||||
|
+
|
||||||
|
+ av5100_set_radio((radio == 1) ? AV5100_RADIO_ON : AV5100_RADIO_OFF);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void __exit av5100_exit(void)
|
||||||
|
+{
|
||||||
|
+ av5100_set_radio(AV5100_RADIO_OFF);
|
||||||
|
+
|
||||||
|
+ av5100_proc_cleanup();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+module_init(av5100_init);
|
||||||
|
+module_exit(av5100_exit);
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ 1 2 3 4 5 6 7
|
||||||
|
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||||
|
+*/
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/FILES linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/FILES 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES 2004-07-09 07:44:19.000000000 +0300
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+Makefile Used for building on 2.4, 2.6, internally and exteranlly
|
||||||
|
+
|
||||||
|
+FILES This file
|
||||||
|
+
|
||||||
|
+av5100.c Averatec 5100P SW Switch Module
|
||||||
|
+pbe5.c Packard Bell Easynote SW Switch Module
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/ISSUES linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/ISSUES 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES 2004-07-09 07:43:22.000000000 +0300
|
||||||
|
@@ -0,0 +1,28 @@
|
||||||
|
+
|
||||||
|
+ISSUES
|
||||||
|
+------------ ----- ----- ---- --- -- -
|
||||||
|
+
|
||||||
|
+No packets! - RF kill switch
|
||||||
|
+
|
||||||
|
+If the module loads, but no packets are transferred you may have a SW based
|
||||||
|
+radio kill switch. All laptops have some capability to disable the radio
|
||||||
|
+via a button or switch. On some laptops that switch is physically tied to the
|
||||||
|
+IPW2100; simply toggling the switch should enable the radio.
|
||||||
|
+
|
||||||
|
+On other laptops, the switch is a button that when pressed requires some
|
||||||
|
+software driver to send some hardware command to some other piece of hardware
|
||||||
|
+on the laptop, that then controls the radio. The driver currently has support
|
||||||
|
+for the Averatec 5100P laptop's SW switch. Support will be added for other
|
||||||
|
+laptop vendors as we become aware of them and figure out how to enable the
|
||||||
|
+radio.
|
||||||
|
+
|
||||||
|
+To know if the radio is being disabled via the RF switch, perform the following:
|
||||||
|
+
|
||||||
|
+% cat /proc/net/ipw2100/eth1/state
|
||||||
|
+Radio is disabled by RF switch
|
||||||
|
+
|
||||||
|
+If it says that, then your RF switch is currently disabling the radio. The
|
||||||
|
+driver doesn't currently support switching back to the on state if you have a
|
||||||
|
+physical RF switch (the radio may turn on and packets will work, but the proc
|
||||||
|
+entry won't be updated)
|
||||||
|
+
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/Kconfig linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/Kconfig 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig 2008-05-27 23:39:10.000000000 +0300
|
||||||
|
@@ -0,0 +1,22 @@
|
||||||
|
+menu "RF Switch"
|
||||||
|
+ depends on EXPERIMENTAL
|
||||||
|
+
|
||||||
|
+config RFSWITCH
|
||||||
|
+ tristate "RF Switch"
|
||||||
|
+ depends on EXPERIMENTAL
|
||||||
|
+
|
||||||
|
+config AVERATEC_5100P
|
||||||
|
+ tristate "averatec 5100P driver"
|
||||||
|
+ depends on RFSWITCH
|
||||||
|
+ ---help---
|
||||||
|
+ This is an experimental driver for the wireless switch
|
||||||
|
+ of some laptops (usefull with some ipw2x00 cards)
|
||||||
|
+
|
||||||
|
+config PACKARDBELL_E5
|
||||||
|
+ tristate "pbe5 driver"
|
||||||
|
+ depends on RFSWITCH
|
||||||
|
+ ---help---
|
||||||
|
+ This is an experimental driver for the wireless switch
|
||||||
|
+ of some laptops (usefull with some ipw2x00 cards)
|
||||||
|
+
|
||||||
|
+endmenu
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/LICENSE linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/LICENSE 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE 2004-07-09 07:43:22.000000000 +0300
|
||||||
|
@@ -0,0 +1,339 @@
|
||||||
|
+
|
||||||
|
+"This software program is licensed subject to the GNU General Public License
|
||||||
|
+(GPL). Version 2, June 1991, available at
|
||||||
|
+<http://www.fsf.org/copyleft/gpl.html>"
|
||||||
|
+
|
||||||
|
+GNU General Public License
|
||||||
|
+
|
||||||
|
+Version 2, June 1991
|
||||||
|
+
|
||||||
|
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||||
|
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
+
|
||||||
|
+Everyone is permitted to copy and distribute verbatim copies of this license
|
||||||
|
+document, but changing it is not allowed.
|
||||||
|
+
|
||||||
|
+Preamble
|
||||||
|
+
|
||||||
|
+The licenses for most software are designed to take away your freedom to
|
||||||
|
+share and change it. By contrast, the GNU General Public License is intended
|
||||||
|
+to guarantee your freedom to share and change free software--to make sure
|
||||||
|
+the software is free for all its users. This General Public License applies
|
||||||
|
+to most of the Free Software Foundation's software and to any other program
|
||||||
|
+whose authors commit to using it. (Some other Free Software Foundation
|
||||||
|
+software is covered by the GNU Library General Public License instead.) You
|
||||||
|
+can apply it to your programs, too.
|
||||||
|
+
|
||||||
|
+When we speak of free software, we are referring to freedom, not price. Our
|
||||||
|
+General Public Licenses are designed to make sure that you have the freedom
|
||||||
|
+to distribute copies of free software (and charge for this service if you
|
||||||
|
+wish), that you receive source code or can get it if you want it, that you
|
||||||
|
+can change the software or use pieces of it in new free programs; and that
|
||||||
|
+you know you can do these things.
|
||||||
|
+
|
||||||
|
+To protect your rights, we need to make restrictions that forbid anyone to
|
||||||
|
+deny you these rights or to ask you to surrender the rights. These
|
||||||
|
+restrictions translate to certain responsibilities for you if you distribute
|
||||||
|
+copies of the software, or if you modify it.
|
||||||
|
+
|
||||||
|
+For example, if you distribute copies of such a program, whether gratis or
|
||||||
|
+for a fee, you must give the recipients all the rights that you have. You
|
||||||
|
+must make sure that they, too, receive or can get the source code. And you
|
||||||
|
+must show them these terms so they know their rights.
|
||||||
|
+
|
||||||
|
+We protect your rights with two steps: (1) copyright the software, and (2)
|
||||||
|
+offer you this license which gives you legal permission to copy, distribute
|
||||||
|
+and/or modify the software.
|
||||||
|
+
|
||||||
|
+Also, for each author's protection and ours, we want to make certain that
|
||||||
|
+everyone understands that there is no warranty for this free software. If
|
||||||
|
+the software is modified by someone else and passed on, we want its
|
||||||
|
+recipients to know that what they have is not the original, so that any
|
||||||
|
+problems introduced by others will not reflect on the original authors'
|
||||||
|
+reputations.
|
||||||
|
+
|
||||||
|
+Finally, any free program is threatened constantly by software patents. We
|
||||||
|
+wish to avoid the danger that redistributors of a free program will
|
||||||
|
+individually obtain patent licenses, in effect making the program
|
||||||
|
+proprietary. To prevent this, we have made it clear that any patent must be
|
||||||
|
+licensed for everyone's free use or not licensed at all.
|
||||||
|
+
|
||||||
|
+The precise terms and conditions for copying, distribution and modification
|
||||||
|
+follow.
|
||||||
|
+
|
||||||
|
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
+
|
||||||
|
+0. This License applies to any program or other work which contains a notice
|
||||||
|
+ placed by the copyright holder saying it may be distributed under the
|
||||||
|
+ terms of this General Public License. The "Program", below, refers to any
|
||||||
|
+ such program or work, and a "work based on the Program" means either the
|
||||||
|
+ Program or any derivative work under copyright law: that is to say, a
|
||||||
|
+ work containing the Program or a portion of it, either verbatim or with
|
||||||
|
+ modifications and/or translated into another language. (Hereinafter,
|
||||||
|
+ translation is included without limitation in the term "modification".)
|
||||||
|
+ Each licensee is addressed as "you".
|
||||||
|
+
|
||||||
|
+ Activities other than copying, distribution and modification are not
|
||||||
|
+ covered by this License; they are outside its scope. The act of running
|
||||||
|
+ the Program is not restricted, and the output from the Program is covered
|
||||||
|
+ only if its contents constitute a work based on the Program (independent
|
||||||
|
+ of having been made by running the Program). Whether that is true depends
|
||||||
|
+ on what the Program does.
|
||||||
|
+
|
||||||
|
+1. You may copy and distribute verbatim copies of the Program's source code
|
||||||
|
+ as you receive it, in any medium, provided that you conspicuously and
|
||||||
|
+ appropriately publish on each copy an appropriate copyright notice and
|
||||||
|
+ disclaimer of warranty; keep intact all the notices that refer to this
|
||||||
|
+ License and to the absence of any warranty; and give any other recipients
|
||||||
|
+ of the Program a copy of this License along with the Program.
|
||||||
|
+
|
||||||
|
+ You may charge a fee for the physical act of transferring a copy, and you
|
||||||
|
+ may at your option offer warranty protection in exchange for a fee.
|
||||||
|
+
|
||||||
|
+2. You may modify your copy or copies of the Program or any portion of it,
|
||||||
|
+ thus forming a work based on the Program, and copy and distribute such
|
||||||
|
+ modifications or work under the terms of Section 1 above, provided that
|
||||||
|
+ you also meet all of these conditions:
|
||||||
|
+
|
||||||
|
+ * a) You must cause the modified files to carry prominent notices stating
|
||||||
|
+ that you changed the files and the date of any change.
|
||||||
|
+
|
||||||
|
+ * b) You must cause any work that you distribute or publish, that in
|
||||||
|
+ whole or in part contains or is derived from the Program or any part
|
||||||
|
+ thereof, to be licensed as a whole at no charge to all third parties
|
||||||
|
+ under the terms of this License.
|
||||||
|
+
|
||||||
|
+ * c) If the modified program normally reads commands interactively when
|
||||||
|
+ run, you must cause it, when started running for such interactive
|
||||||
|
+ use in the most ordinary way, to print or display an announcement
|
||||||
|
+ including an appropriate copyright notice and a notice that there is
|
||||||
|
+ no warranty (or else, saying that you provide a warranty) and that
|
||||||
|
+ users may redistribute the program under these conditions, and
|
||||||
|
+ telling the user how to view a copy of this License. (Exception: if
|
||||||
|
+ the Program itself is interactive but does not normally print such
|
||||||
|
+ an announcement, your work based on the Program is not required to
|
||||||
|
+ print an announcement.)
|
||||||
|
+
|
||||||
|
+ These requirements apply to the modified work as a whole. If identifiable
|
||||||
|
+ sections of that work are not derived from the Program, and can be
|
||||||
|
+ reasonably considered independent and separate works in themselves, then
|
||||||
|
+ this License, and its terms, do not apply to those sections when you
|
||||||
|
+ distribute them as separate works. But when you distribute the same
|
||||||
|
+ sections as part of a whole which is a work based on the Program, the
|
||||||
|
+ distribution of the whole must be on the terms of this License, whose
|
||||||
|
+ permissions for other licensees extend to the entire whole, and thus to
|
||||||
|
+ each and every part regardless of who wrote it.
|
||||||
|
+
|
||||||
|
+ Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
+ your rights to work written entirely by you; rather, the intent is to
|
||||||
|
+ exercise the right to control the distribution of derivative or
|
||||||
|
+ collective works based on the Program.
|
||||||
|
+
|
||||||
|
+ In addition, mere aggregation of another work not based on the Program
|
||||||
|
+ with the Program (or with a work based on the Program) on a volume of a
|
||||||
|
+ storage or distribution medium does not bring the other work under the
|
||||||
|
+ scope of this License.
|
||||||
|
+
|
||||||
|
+3. You may copy and distribute the Program (or a work based on it, under
|
||||||
|
+ Section 2) in object code or executable form under the terms of Sections
|
||||||
|
+ 1 and 2 above provided that you also do one of the following:
|
||||||
|
+
|
||||||
|
+ * a) Accompany it with the complete corresponding machine-readable source
|
||||||
|
+ code, which must be distributed under the terms of Sections 1 and 2
|
||||||
|
+ above on a medium customarily used for software interchange; or,
|
||||||
|
+
|
||||||
|
+ * b) Accompany it with a written offer, valid for at least three years,
|
||||||
|
+ to give any third party, for a charge no more than your cost of
|
||||||
|
+ physically performing source distribution, a complete machine-
|
||||||
|
+ readable copy of the corresponding source code, to be distributed
|
||||||
|
+ under the terms of Sections 1 and 2 above on a medium customarily
|
||||||
|
+ used for software interchange; or,
|
||||||
|
+
|
||||||
|
+ * c) Accompany it with the information you received as to the offer to
|
||||||
|
+ distribute corresponding source code. (This alternative is allowed
|
||||||
|
+ only for noncommercial distribution and only if you received the
|
||||||
|
+ program in object code or executable form with such an offer, in
|
||||||
|
+ accord with Subsection b above.)
|
||||||
|
+
|
||||||
|
+ The source code for a work means the preferred form of the work for
|
||||||
|
+ making modifications to it. For an executable work, complete source code
|
||||||
|
+ means all the source code for all modules it contains, plus any
|
||||||
|
+ associated interface definition files, plus the scripts used to control
|
||||||
|
+ compilation and installation of the executable. However, as a special
|
||||||
|
+ exception, the source code distributed need not include anything that is
|
||||||
|
+ normally distributed (in either source or binary form) with the major
|
||||||
|
+ components (compiler, kernel, and so on) of the operating system on which
|
||||||
|
+ the executable runs, unless that component itself accompanies the
|
||||||
|
+ executable.
|
||||||
|
+
|
||||||
|
+ If distribution of executable or object code is made by offering access
|
||||||
|
+ to copy from a designated place, then offering equivalent access to copy
|
||||||
|
+ the source code from the same place counts as distribution of the source
|
||||||
|
+ code, even though third parties are not compelled to copy the source
|
||||||
|
+ along with the object code.
|
||||||
|
+
|
||||||
|
+4. You may not copy, modify, sublicense, or distribute the Program except as
|
||||||
|
+ expressly provided under this License. Any attempt otherwise to copy,
|
||||||
|
+ modify, sublicense or distribute the Program is void, and will
|
||||||
|
+ automatically terminate your rights under this License. However, parties
|
||||||
|
+ who have received copies, or rights, from you under this License will not
|
||||||
|
+ have their licenses terminated so long as such parties remain in full
|
||||||
|
+ compliance.
|
||||||
|
+
|
||||||
|
+5. You are not required to accept this License, since you have not signed
|
||||||
|
+ it. However, nothing else grants you permission to modify or distribute
|
||||||
|
+ the Program or its derivative works. These actions are prohibited by law
|
||||||
|
+ if you do not accept this License. Therefore, by modifying or
|
||||||
|
+ distributing the Program (or any work based on the Program), you
|
||||||
|
+ indicate your acceptance of this License to do so, and all its terms and
|
||||||
|
+ conditions for copying, distributing or modifying the Program or works
|
||||||
|
+ based on it.
|
||||||
|
+
|
||||||
|
+6. Each time you redistribute the Program (or any work based on the
|
||||||
|
+ Program), the recipient automatically receives a license from the
|
||||||
|
+ original licensor to copy, distribute or modify the Program subject to
|
||||||
|
+ these terms and conditions. You may not impose any further restrictions
|
||||||
|
+ on the recipients' exercise of the rights granted herein. You are not
|
||||||
|
+ responsible for enforcing compliance by third parties to this License.
|
||||||
|
+
|
||||||
|
+7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
+ infringement or for any other reason (not limited to patent issues),
|
||||||
|
+ conditions are imposed on you (whether by court order, agreement or
|
||||||
|
+ otherwise) that contradict the conditions of this License, they do not
|
||||||
|
+ excuse you from the conditions of this License. If you cannot distribute
|
||||||
|
+ so as to satisfy simultaneously your obligations under this License and
|
||||||
|
+ any other pertinent obligations, then as a consequence you may not
|
||||||
|
+ distribute the Program at all. For example, if a patent license would
|
||||||
|
+ not permit royalty-free redistribution of the Program by all those who
|
||||||
|
+ receive copies directly or indirectly through you, then the only way you
|
||||||
|
+ could satisfy both it and this License would be to refrain entirely from
|
||||||
|
+ distribution of the Program.
|
||||||
|
+
|
||||||
|
+ If any portion of this section is held invalid or unenforceable under any
|
||||||
|
+ particular circumstance, the balance of the section is intended to apply
|
||||||
|
+ and the section as a whole is intended to apply in other circumstances.
|
||||||
|
+
|
||||||
|
+ It is not the purpose of this section to induce you to infringe any
|
||||||
|
+ patents or other property right claims or to contest validity of any
|
||||||
|
+ such claims; this section has the sole purpose of protecting the
|
||||||
|
+ integrity of the free software distribution system, which is implemented
|
||||||
|
+ by public license practices. Many people have made generous contributions
|
||||||
|
+ to the wide range of software distributed through that system in
|
||||||
|
+ reliance on consistent application of that system; it is up to the
|
||||||
|
+ author/donor to decide if he or she is willing to distribute software
|
||||||
|
+ through any other system and a licensee cannot impose that choice.
|
||||||
|
+
|
||||||
|
+ This section is intended to make thoroughly clear what is believed to be
|
||||||
|
+ a consequence of the rest of this License.
|
||||||
|
+
|
||||||
|
+8. If the distribution and/or use of the Program is restricted in certain
|
||||||
|
+ countries either by patents or by copyrighted interfaces, the original
|
||||||
|
+ copyright holder who places the Program under this License may add an
|
||||||
|
+ explicit geographical distribution limitation excluding those countries,
|
||||||
|
+ so that distribution is permitted only in or among countries not thus
|
||||||
|
+ excluded. In such case, this License incorporates the limitation as if
|
||||||
|
+ written in the body of this License.
|
||||||
|
+
|
||||||
|
+9. The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
+ the General Public License from time to time. Such new versions will be
|
||||||
|
+ similar in spirit to the present version, but may differ in detail to
|
||||||
|
+ address new problems or concerns.
|
||||||
|
+
|
||||||
|
+ Each version is given a distinguishing version number. If the Program
|
||||||
|
+ specifies a version number of this License which applies to it and "any
|
||||||
|
+ later version", you have the option of following the terms and
|
||||||
|
+ conditions either of that version or of any later version published by
|
||||||
|
+ the Free Software Foundation. If the Program does not specify a version
|
||||||
|
+ number of this License, you may choose any version ever published by the
|
||||||
|
+ Free Software Foundation.
|
||||||
|
+
|
||||||
|
+10. If you wish to incorporate parts of the Program into other free programs
|
||||||
|
+ whose distribution conditions are different, write to the author to ask
|
||||||
|
+ for permission. For software which is copyrighted by the Free Software
|
||||||
|
+ Foundation, write to the Free Software Foundation; we sometimes make
|
||||||
|
+ exceptions for this. Our decision will be guided by the two goals of
|
||||||
|
+ preserving the free status of all derivatives of our free software and
|
||||||
|
+ of promoting the sharing and reuse of software generally.
|
||||||
|
+
|
||||||
|
+ NO WARRANTY
|
||||||
|
+
|
||||||
|
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
|
||||||
|
+ EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
|
||||||
|
+ ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
|
||||||
|
+ YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
|
||||||
|
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
+
|
||||||
|
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
|
||||||
|
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
|
||||||
|
+ DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
|
||||||
|
+ (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
|
||||||
|
+ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
|
||||||
|
+ THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
|
||||||
|
+ OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
+
|
||||||
|
+END OF TERMS AND CONDITIONS
|
||||||
|
+
|
||||||
|
+How to Apply These Terms to Your New Programs
|
||||||
|
+
|
||||||
|
+If you develop a new program, and you want it to be of the greatest
|
||||||
|
+possible use to the public, the best way to achieve this is to make it free
|
||||||
|
+software which everyone can redistribute and change under these terms.
|
||||||
|
+
|
||||||
|
+To do so, attach the following notices to the program. It is safest to
|
||||||
|
+attach them to the start of each source file to most effectively convey the
|
||||||
|
+exclusion of warranty; and each file should have at least the "copyright"
|
||||||
|
+line and a pointer to where the full notice is found.
|
||||||
|
+
|
||||||
|
+one line to give the program's name and an idea of what it does.
|
||||||
|
+Copyright (C) yyyy name of author
|
||||||
|
+
|
||||||
|
+This program is free software; you can redistribute it and/or modify it
|
||||||
|
+under the terms of the GNU General Public License as published by the Free
|
||||||
|
+Software Foundation; either version 2 of the License, or (at your option)
|
||||||
|
+any later version.
|
||||||
|
+
|
||||||
|
+This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
+more details.
|
||||||
|
+
|
||||||
|
+You should have received a copy of the GNU General Public License along with
|
||||||
|
+this program; if not, write to the Free Software Foundation, Inc., 59
|
||||||
|
+Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
+
|
||||||
|
+Also add information on how to contact you by electronic and paper mail.
|
||||||
|
+
|
||||||
|
+If the program is interactive, make it output a short notice like this when
|
||||||
|
+it starts in an interactive mode:
|
||||||
|
+
|
||||||
|
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
|
||||||
|
+with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free
|
||||||
|
+software, and you are welcome to redistribute it under certain conditions;
|
||||||
|
+type 'show c' for details.
|
||||||
|
+
|
||||||
|
+The hypothetical commands 'show w' and 'show c' should show the appropriate
|
||||||
|
+parts of the General Public License. Of course, the commands you use may be
|
||||||
|
+called something other than 'show w' and 'show c'; they could even be
|
||||||
|
+mouse-clicks or menu items--whatever suits your program.
|
||||||
|
+
|
||||||
|
+You should also get your employer (if you work as a programmer) or your
|
||||||
|
+school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
+necessary. Here is a sample; alter the names:
|
||||||
|
+
|
||||||
|
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
+'Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
+
|
||||||
|
+signature of Ty Coon, 1 April 1989
|
||||||
|
+Ty Coon, President of Vice
|
||||||
|
+
|
||||||
|
+This General Public License does not permit incorporating your program into
|
||||||
|
+proprietary programs. If your program is a subroutine library, you may
|
||||||
|
+consider it more useful to permit linking proprietary applications with the
|
||||||
|
+library. If this is what you want to do, use the GNU Library General Public
|
||||||
|
+License instead of this License.
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/Makefile linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/Makefile 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile 2008-03-28 05:17:16.000000000 +0200
|
||||||
|
@@ -0,0 +1,119 @@
|
||||||
|
+#
|
||||||
|
+# Makefile for the SW RF Switch kernel modules
|
||||||
|
+#
|
||||||
|
+# NOTE: This make file can serve as both an external Makefile (launched
|
||||||
|
+# directly by the user), or as the sub-dir Makefile used by the kernel
|
||||||
|
+# build system.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+CONFIG_AVERATEC_5100P=m
|
||||||
|
+CONFIG_PACKARDBELL_E5=m
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+list-m :=
|
||||||
|
+list-$(CONFIG_AVERATEC_5100P) += av5100
|
||||||
|
+list-$(CONFIG_PACKARDBELL_E5) += pbe5
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+obj-$(CONFIG_AVERATEC_5100P) += av5100.o
|
||||||
|
+obj-$(CONFIG_PACKARDBELL_E5) += pbe5.o
|
||||||
|
+
|
||||||
|
+#
|
||||||
|
+# Begin dual Makefile mode here. First we provide support for when we
|
||||||
|
+# are being invoked by the kernel build system
|
||||||
|
+#
|
||||||
|
+ifneq ($(KERNELRELEASE),)
|
||||||
|
+
|
||||||
|
+ifneq ($(PATCHLEVEL),6) # If we are not on a 2.6, then do 2.4 specific things
|
||||||
|
+
|
||||||
|
+O_TARGET := rfswitch.o
|
||||||
|
+
|
||||||
|
+include $(TOPDIR)/Rules.make
|
||||||
|
+
|
||||||
|
+endif # End if 2.4 specific settings
|
||||||
|
+
|
||||||
|
+else
|
||||||
|
+# Here we begin the portion that is executed if the user invoked this Makefile
|
||||||
|
+# directly.
|
||||||
|
+
|
||||||
|
+# KSRC should be set to the path to your sources
|
||||||
|
+# modules are installed into KMISC
|
||||||
|
+KVER := $(shell uname -r)
|
||||||
|
+KSRC := /lib/modules/$(KVER)/build
|
||||||
|
+KMISC := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
|
||||||
|
+
|
||||||
|
+# KSRC_OUTPUT should be overridden if you are using a 2.6 kernel that
|
||||||
|
+# has it's output sent elsewhere via KBUILD_OUTPUT= or O=
|
||||||
|
+KSRC_OUTPUT := $(KSRC)
|
||||||
|
+
|
||||||
|
+# If we find Rules.make, we can assume we're using the old 2.4 style building
|
||||||
|
+OLDMAKE=$(wildcard $(KSRC)/Rules.make)
|
||||||
|
+PWD=$(shell pwd)
|
||||||
|
+
|
||||||
|
+VERFILE := $(KSRC_OUTPUT)/include/linux/version.h
|
||||||
|
+KERNELRELEASE := $(shell \
|
||||||
|
+ if [ -r $(VERFILE) ]; then \
|
||||||
|
+ (cat $(VERFILE); echo UTS_RELEASE) | \
|
||||||
|
+ $(CC) -I$(KSRC_OUTPUT) $(CFLAGS) -E - | \
|
||||||
|
+ tail -n 1 | \
|
||||||
|
+ xargs echo; \
|
||||||
|
+ else \
|
||||||
|
+ uname -r; \
|
||||||
|
+ fi)
|
||||||
|
+
|
||||||
|
+MODPATH := $(DESTDIR)/lib/modules/$(KERNELRELEASE)
|
||||||
|
+
|
||||||
|
+all: modules
|
||||||
|
+
|
||||||
|
+clean:
|
||||||
|
+ rm -f *.mod.c *.mod *.o *.ko .*.cmd .*.flags Modules.symvers
|
||||||
|
+ rm -rf $(PWD)/tmp
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ifeq ($(OLDMAKE),)
|
||||||
|
+
|
||||||
|
+TMP=$(PWD)/tmp
|
||||||
|
+MODVERDIR=$(TMP)/.tmp_versions
|
||||||
|
+
|
||||||
|
+modules:
|
||||||
|
+ifdef ($(KSRC_OUTPUT)/.tmp_versions)
|
||||||
|
+ mkdir -p $(MODVERDIR)
|
||||||
|
+ -cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
|
||||||
|
+endif
|
||||||
|
+ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
|
||||||
|
+ifdef ($(KSRC)/.tmp_versions)
|
||||||
|
+ -cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
|
||||||
|
+endif
|
||||||
|
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) modules
|
||||||
|
+else # We've got a kernel with seperate output, copy the config, and use O=
|
||||||
|
+ mkdir -p $(TMP)
|
||||||
|
+ cp $(KSRC_OUTPUT)/.config $(TMP)
|
||||||
|
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) O=$(PWD)/tmp modules
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+install: modules
|
||||||
|
+ install -d $(KMISC)
|
||||||
|
+ install -m 644 -c $(addsuffix .ko,$(list-m)) $(KMISC)
|
||||||
|
+ /sbin/depmod -a
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+else # We're on 2.4, and things are slightly different
|
||||||
|
+
|
||||||
|
+modules:
|
||||||
|
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) BUILD_DIR=$(PWD) modules
|
||||||
|
+
|
||||||
|
+install: modules
|
||||||
|
+ install -d $(KMISC)
|
||||||
|
+ install -m 644 -c $(addsuffix .o,$(list-m)) $(KMISC)
|
||||||
|
+ /sbin/depmod -a
|
||||||
|
+
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+uninstall:
|
||||||
|
+ cd $(KMISC)
|
||||||
|
+ rm -rf $(addsuffix .ko,$(list-m))
|
||||||
|
+ cd -
|
||||||
|
+ /sbin/depmod -a
|
||||||
|
+
|
||||||
|
+endif
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/pbe5.c linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/pbe5.c 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c 2008-03-28 05:25:16.000000000 +0200
|
||||||
|
@@ -0,0 +1,205 @@
|
||||||
|
+/*******************************************************************************
|
||||||
|
+
|
||||||
|
+ This program is free software; you can redistribute it and/or modify it
|
||||||
|
+ under the terms of version 2 of the GNU General Public License as
|
||||||
|
+ published by the Free Software Foundation.
|
||||||
|
+
|
||||||
|
+ This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
+ more details.
|
||||||
|
+
|
||||||
|
+ You should have received a copy of the GNU General Public License along with
|
||||||
|
+ this program; if not, write to the Free Software Foundation, Inc., 59
|
||||||
|
+ Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
+
|
||||||
|
+ The full GNU General Public License is included in this distribution in the
|
||||||
|
+ file called LICENSE.
|
||||||
|
+
|
||||||
|
+ Author:
|
||||||
|
+ Pedro Ramalhais <pmr09313@students.fct.unl.pt>
|
||||||
|
+
|
||||||
|
+ Based on:
|
||||||
|
+ av5100.c from http://ipw2100.sourceforge.net/
|
||||||
|
+
|
||||||
|
+*******************************************************************************/
|
||||||
|
+
|
||||||
|
+#include <linux/compiler.h>
|
||||||
|
+#include <linux/errno.h>
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/types.h>
|
||||||
|
+#include <linux/netdevice.h>
|
||||||
|
+#include <linux/version.h>
|
||||||
|
+#include <linux/proc_fs.h>
|
||||||
|
+#include <linux/ioport.h>
|
||||||
|
+#include <asm/uaccess.h>
|
||||||
|
+#include <asm/io.h>
|
||||||
|
+
|
||||||
|
+#define DRV_NAME "pbe5"
|
||||||
|
+#define DRV_VERSION "1.3"
|
||||||
|
+#define DRV_DESCRIPTION "SW RF kill switch for Packard Bell EasyNote E5"
|
||||||
|
+#define DRV_AUTHOR "Pedro Ramalhais"
|
||||||
|
+#define DRV_LICENSE "GPL"
|
||||||
|
+
|
||||||
|
+static int radio = 1;
|
||||||
|
+
|
||||||
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
|
||||||
|
+
|
||||||
|
+MODULE_PARM(radio, "i");
|
||||||
|
+
|
||||||
|
+#else /* LINUX_VERSION_CODE < 2.6.0 */
|
||||||
|
+
|
||||||
|
+#include <linux/moduleparam.h>
|
||||||
|
+module_param(radio, int, 1);
|
||||||
|
+
|
||||||
|
+#endif /* LINUX_VERSION_CODE < 2.6.0 */
|
||||||
|
+
|
||||||
|
+MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)");
|
||||||
|
+
|
||||||
|
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
|
||||||
|
+MODULE_AUTHOR(DRV_AUTHOR);
|
||||||
|
+MODULE_LICENSE(DRV_LICENSE);
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * NOTE: These values were obtained from disassembling the Icon.exe program
|
||||||
|
+ * installed in the Packard Bell EasyNote E5 laptop. The names were guessed,
|
||||||
|
+ * so don't rely on them.
|
||||||
|
+ */
|
||||||
|
+#define PBE5_PORT_TOGGLE 0x0b3
|
||||||
|
+#define PBE5_VALUE_TOGGLE_ON 0x01
|
||||||
|
+#define PBE5_VALUE_TOGGLE_OFF 0x00
|
||||||
|
+#define PBE5_PORT_APPLY 0x0b2
|
||||||
|
+#define PBE5_VALUE_APPLY 0xef
|
||||||
|
+
|
||||||
|
+// Some "booleans" =;-)
|
||||||
|
+#define PBE5_RADIO_OFF 0
|
||||||
|
+#define PBE5_RADIO_ON 1
|
||||||
|
+
|
||||||
|
+static int pbe5_radio_status = PBE5_RADIO_ON;
|
||||||
|
+
|
||||||
|
+unsigned char pbe5_get_radio(void)
|
||||||
|
+{
|
||||||
|
+ unsigned char val = 0x00;
|
||||||
|
+
|
||||||
|
+ val = inb(PBE5_PORT_TOGGLE);
|
||||||
|
+
|
||||||
|
+ return val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void pbe5_set_radio(int state_set)
|
||||||
|
+{
|
||||||
|
+ pbe5_radio_status = pbe5_get_radio();
|
||||||
|
+
|
||||||
|
+ if (pbe5_radio_status != state_set) {
|
||||||
|
+ // Set the radio toggle register
|
||||||
|
+ outb(PBE5_VALUE_TOGGLE_ON, PBE5_PORT_TOGGLE);
|
||||||
|
+ // Commit the radio toggle register value
|
||||||
|
+ outb(PBE5_VALUE_APPLY, PBE5_PORT_APPLY);
|
||||||
|
+ // Update the radio status
|
||||||
|
+ pbe5_radio_status = pbe5_get_radio();
|
||||||
|
+
|
||||||
|
+ printk(KERN_INFO DRV_NAME ": Radio turned %s\n",
|
||||||
|
+ (state_set == PBE5_RADIO_ON) ? "ON" : "OFF");
|
||||||
|
+ } else {
|
||||||
|
+ printk(KERN_INFO DRV_NAME ": Radio already %s\n",
|
||||||
|
+ (state_set == PBE5_RADIO_ON) ? "ON" : "OFF");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * proc stuff
|
||||||
|
+ */
|
||||||
|
+static struct proc_dir_entry *dir_base = NULL;
|
||||||
|
+
|
||||||
|
+static int proc_set_radio(struct file *file, const char *buffer,
|
||||||
|
+ unsigned long count, void *data)
|
||||||
|
+{
|
||||||
|
+ pbe5_set_radio(buffer[0] == '0' ? PBE5_RADIO_OFF : PBE5_RADIO_ON);
|
||||||
|
+
|
||||||
|
+ return count;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int proc_get_radio(char *page, char **start, off_t offset,
|
||||||
|
+ int count, int *eof, void *data)
|
||||||
|
+{
|
||||||
|
+ int len = 0;
|
||||||
|
+
|
||||||
|
+ len += snprintf(page, count, DRV_NAME ": %d\n",
|
||||||
|
+ pbe5_radio_status == PBE5_RADIO_OFF ? 0 : 1);
|
||||||
|
+
|
||||||
|
+ *eof = 1;
|
||||||
|
+ return len;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static void pbe5_proc_cleanup(void)
|
||||||
|
+{
|
||||||
|
+ if (dir_base) {
|
||||||
|
+ remove_proc_entry("radio", dir_base);
|
||||||
|
+ remove_proc_entry(DRV_NAME, &proc_root);
|
||||||
|
+ dir_base = NULL;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static int pbe5_proc_init(void)
|
||||||
|
+{
|
||||||
|
+ struct proc_dir_entry *ent;
|
||||||
|
+ int err = 0;
|
||||||
|
+
|
||||||
|
+ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
|
||||||
|
+ if (dir_base == NULL) {
|
||||||
|
+ printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/"
|
||||||
|
+ DRV_NAME "\n");
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR,
|
||||||
|
+ dir_base);
|
||||||
|
+ if (ent) {
|
||||||
|
+ ent->read_proc = proc_get_radio;
|
||||||
|
+ ent->write_proc = proc_set_radio;
|
||||||
|
+ } else {
|
||||||
|
+ printk(KERN_ERR
|
||||||
|
+ "Unable to initialize /proc/" DRV_NAME "/radio\n");
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ fail:
|
||||||
|
+ pbe5_proc_cleanup();
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * module stuff
|
||||||
|
+ */
|
||||||
|
+static int __init pbe5_init(void)
|
||||||
|
+{
|
||||||
|
+ pbe5_proc_init();
|
||||||
|
+
|
||||||
|
+ pbe5_set_radio((radio == 1) ? PBE5_RADIO_ON : PBE5_RADIO_OFF);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void __exit pbe5_exit(void)
|
||||||
|
+{
|
||||||
|
+ pbe5_set_radio(PBE5_RADIO_OFF);
|
||||||
|
+
|
||||||
|
+ pbe5_proc_cleanup();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+module_init(pbe5_init);
|
||||||
|
+module_exit(pbe5_exit);
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ 1 2 3 4 5 6 7
|
||||||
|
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||||
|
+*/
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/rfswitch/README linux-2.6.37.3rdparty/3rdparty/rfswitch/README
|
||||||
|
--- linux-2.6.37/3rdparty/rfswitch/README 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/README 2004-07-09 17:26:20.000000000 +0300
|
||||||
|
@@ -0,0 +1,44 @@
|
||||||
|
+Radio Kill Switch
|
||||||
|
+------------ ----- ----- ---- --- -- -
|
||||||
|
+Most laptops provide the ability for the user to physically disable the radio.
|
||||||
|
+Some vendors have implemented this as a physical switch that requires no
|
||||||
|
+software to turn the radio off and on. On other laptops, however, the switch
|
||||||
|
+is controlled through a button being pressed and a software driver then making
|
||||||
|
+calls to turn the radio off and on. This is referred to as a "software based
|
||||||
|
+RF kill switch"
|
||||||
|
+
|
||||||
|
+Currently this project provides modules for controlling the software RF kill
|
||||||
|
+switch on the Averatec 5100P and Packard Bell EasyNote E5. The code may work
|
||||||
|
+on other laptops, but these are the only models on which it has been tested.
|
||||||
|
+
|
||||||
|
+To determine if you have a system that might be compatible with one of the
|
||||||
|
+provided SW RF Kill switch modules, you can run:
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ To check for the Packard Bell (to use module pbe) --
|
||||||
|
+
|
||||||
|
+ % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "NEW-PC|Insyde Software MobilePRO BIOS"
|
||||||
|
+
|
||||||
|
+ To check for the Averatec (to use module av5100) --
|
||||||
|
+
|
||||||
|
+ % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "AVERATEC"
|
||||||
|
+
|
||||||
|
+If you have one of those laptop models you can imply loading the av5100/pbe5
|
||||||
|
+module and the radio will be toggled on and off. In addition, you can turn
|
||||||
|
+the driver on and off by writing either a 1 or 0 to /proc/av5100/radio or
|
||||||
|
+/proc/pbe5/radio. If you automatically load the av5100/pbe5 module when your
|
||||||
|
+system boots, you may wish to use the radio module parameter to control the
|
||||||
|
+state of the radio upon loading:
|
||||||
|
+
|
||||||
|
+ modprobe av5100 radio=0
|
||||||
|
+ modprobe pbe5 radio=0
|
||||||
|
+
|
||||||
|
+results in the module loading with the radio turned off. You can then turn the
|
||||||
|
+radio on by:
|
||||||
|
+
|
||||||
|
+ echo 1 > /proc/av5100/radio
|
||||||
|
+ echo 1 > /proc/pbe5/radio
|
||||||
|
+
|
||||||
|
+If you have a SW RF kill switch and can not use one of the above modules,
|
||||||
|
+please join us on IRC (irc.freenode.net) on channel #ipw2100 and someone may
|
||||||
|
+be able to help.
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
fix build with 3.0
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
3rdparty/rfswitch/Makefile | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
--- a/3rdparty/rfswitch/Makefile.orig 2011-07-15 02:37:27.000000000 +0300
|
||||||
|
+++ a/3rdparty/rfswitch/Makefile 2011-07-15 13:47:10.463914526 +0300
|
||||||
|
@@ -29,8 +29,6 @@ ifneq ($(PATCHLEVEL),6) # If we are not
|
||||||
|
|
||||||
|
O_TARGET := rfswitch.o
|
||||||
|
|
||||||
|
-include $(TOPDIR)/Rules.make
|
||||||
|
-
|
||||||
|
endif # End if 2.4 specific settings
|
||||||
|
|
||||||
|
else
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
Remove 'proc_root' usage
|
||||||
|
|
||||||
|
Commit c74c120a21d87b0b6925ada5830d8cac21e852d9 (Linus's tree) removed
|
||||||
|
the export of 'proc_root' variable, because you can create on the proc's
|
||||||
|
root directory by passing NULL where you would pass 'proc_root'.
|
||||||
|
|
||||||
|
Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
|
||||||
|
Index: linux-2.6.25/3rdparty/rfswitch/av5100.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.25.orig/3rdparty/rfswitch/av5100.c
|
||||||
|
+++ linux-2.6.25/3rdparty/rfswitch/av5100.c
|
||||||
|
@@ -107,7 +107,7 @@ static void av5100_proc_cleanup(void)
|
||||||
|
{
|
||||||
|
if (dir_base) {
|
||||||
|
remove_proc_entry("radio", dir_base);
|
||||||
|
- remove_proc_entry(DRV_NAME, &proc_root);
|
||||||
|
+ remove_proc_entry(DRV_NAME, NULL);
|
||||||
|
dir_base = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -118,7 +118,7 @@ static int av5100_proc_init(void)
|
||||||
|
struct proc_dir_entry *ent;
|
||||||
|
int err = 0;
|
||||||
|
|
||||||
|
- dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
|
||||||
|
+ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL);
|
||||||
|
if (dir_base == NULL) {
|
||||||
|
printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/"
|
||||||
|
DRV_NAME "\n");
|
||||||
|
Index: linux-2.6.25/3rdparty/rfswitch/pbe5.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.25.orig/3rdparty/rfswitch/pbe5.c
|
||||||
|
+++ linux-2.6.25/3rdparty/rfswitch/pbe5.c
|
||||||
|
@@ -138,7 +138,7 @@ static void pbe5_proc_cleanup(void)
|
||||||
|
{
|
||||||
|
if (dir_base) {
|
||||||
|
remove_proc_entry("radio", dir_base);
|
||||||
|
- remove_proc_entry(DRV_NAME, &proc_root);
|
||||||
|
+ remove_proc_entry(DRV_NAME, NULL);
|
||||||
|
dir_base = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -149,7 +149,7 @@ static int pbe5_proc_init(void)
|
||||||
|
struct proc_dir_entry *ent;
|
||||||
|
int err = 0;
|
||||||
|
|
||||||
|
- dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
|
||||||
|
+ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL);
|
||||||
|
if (dir_base == NULL) {
|
||||||
|
printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/"
|
||||||
|
DRV_NAME "\n");
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
From 842e61cb85813b1ed8a1646cbe6739950c0c9822 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Larry Finger <Larry.Finger@lwfinger.net>
|
||||||
|
Date: Thu, 7 May 2015 19:08:17 +0000
|
||||||
|
Subject: [PATCH] rtl8723bs: Fix Makefile to allow warnings
|
||||||
|
|
||||||
|
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git linux.old/3rdparty/rtl8723bs/Makefile linux/3rdparty/rtl8723bs/Makefile
|
||||||
|
index a4d9f45..4da73fa 100644
|
||||||
|
--- linux.old/3rdparty/rtl8723bs/Makefile
|
||||||
|
+++ linux/3rdparty/rtl8723bs/Makefile
|
||||||
|
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -O1
|
||||||
|
#EXTRA_CFLAGS += -O3
|
||||||
|
#EXTRA_CFLAGS += -Wall
|
||||||
|
#EXTRA_CFLAGS += -Wextra
|
||||||
|
-EXTRA_CFLAGS += -Werror
|
||||||
|
+#EXTRA_CFLAGS += -Werror
|
||||||
|
#EXTRA_CFLAGS += -pedantic
|
||||||
|
#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
|
||||||
|
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
|
||||||
|
This reverts the parts of:
|
||||||
|
|
||||||
|
commit 86fe2db84ba7b9a83b60323cd805198ff43136ec
|
||||||
|
Author: Bastien Nocera <hadess@hadess.net>
|
||||||
|
Date: Fri Mar 20 18:28:08 2015 +0100
|
||||||
|
|
||||||
|
cfg80211: Update for newest mac80211 API
|
||||||
|
|
||||||
|
|
||||||
|
that breaks building with 3.19 series kernels.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
|
||||||
|
diff -Nurp linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h
|
||||||
|
--- linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h 2015-05-07 17:46:55.000000000 +0300
|
||||||
|
+++ linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h 2015-05-10 14:55:44.744038033 +0300
|
||||||
|
@@ -22,10 +22,6 @@
|
||||||
|
|
||||||
|
#include <linux/version.h>
|
||||||
|
|
||||||
|
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0))
|
||||||
|
-#error This driver only works with kernel 4.0
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
struct rtw_wdev_invit_info {
|
||||||
|
u8 state; /* 0: req, 1:rep */
|
||||||
|
u8 peer_mac[ETH_ALEN];
|
||||||
|
diff -Nurp linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
|
||||||
|
--- linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c 2015-05-10 14:54:53.241616597 +0300
|
||||||
|
+++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c 2015-05-10 14:49:42.766354711 +0300
|
||||||
|
@@ -1289,16 +1289,16 @@ static int cfg80211_rtw_get_station(stru
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
- sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
|
||||||
|
+ sinfo->filled |= STATION_INFO_SIGNAL;
|
||||||
|
sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
|
||||||
|
|
||||||
|
- sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
|
||||||
|
+ sinfo->filled |= STATION_INFO_TX_BITRATE;
|
||||||
|
sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter);
|
||||||
|
|
||||||
|
- sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
|
||||||
|
+ sinfo->filled |= STATION_INFO_RX_PACKETS;
|
||||||
|
sinfo->rx_packets = sta_rx_data_pkts(psta);
|
||||||
|
|
||||||
|
- sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
|
||||||
|
+ sinfo->filled |= STATION_INFO_TX_PACKETS;
|
||||||
|
sinfo->tx_packets = psta->sta_stats.tx_pkts;
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -2473,6 +2473,7 @@ void rtw_cfg80211_indicate_sta_assoc(_ad
|
||||||
|
ie_offset = _REASOCREQ_IE_OFFSET_;
|
||||||
|
|
||||||
|
sinfo.filled = 0;
|
||||||
|
+ sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
|
||||||
|
sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
|
||||||
|
sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;
|
||||||
|
cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC);
|
||||||
|
@@ -3078,7 +3079,8 @@ static int cfg80211_rtw_dump_station(str
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
memcpy(mac, psta->hwaddr, ETH_ALEN);
|
||||||
|
- sinfo->filled = BIT(NL80211_STA_INFO_SIGNAL);
|
||||||
|
+ sinfo->filled = 0;
|
||||||
|
+ sinfo->filled |= STATION_INFO_SIGNAL;
|
||||||
|
sinfo->signal = psta->rssi;
|
||||||
|
|
||||||
|
exit:
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,189 @@
|
|||||||
|
3rdparty/viahss/Kconfig | 14 +++++++
|
||||||
|
3rdparty/viahss/Makefile | 3 +
|
||||||
|
3rdparty/viahss/README.html | 68 ++++++++++++++++++++++++++++++++++++
|
||||||
|
3rdparty/viahss/viahss.c | 83 ++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
4 files changed, 168 insertions(+)
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/viahss/Kconfig linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig
|
||||||
|
--- linux-2.6.37/3rdparty/viahss/Kconfig 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig 2003-12-01 01:53:51.000000000 +0200
|
||||||
|
@@ -0,0 +1,14 @@
|
||||||
|
+config VIAHSS
|
||||||
|
+ tristate "VIA High Speed Serial"
|
||||||
|
+ depends on SERIAL_CORE && m
|
||||||
|
+ ---help---
|
||||||
|
+ VIA High Speed Serial is a little kernel module (1 KB) which enables
|
||||||
|
+ high speed serial port modes of VIA VT82C686A or VT82C686B
|
||||||
|
+ southbridge-equipped motherboards. With this module, you can use the
|
||||||
|
+ serial port at 230400 bit/s so that you can get the full 128000 bit/s
|
||||||
|
+ from ISDN-TA. The module has been tested with both 686A and 686B
|
||||||
|
+ chipsets.
|
||||||
|
+
|
||||||
|
+ To compile this driver as a module, choose M here: the
|
||||||
|
+ module will be called viahss.
|
||||||
|
+
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/viahss/Makefile linux-2.6.37.3rdparty/3rdparty/viahss/Makefile
|
||||||
|
--- linux-2.6.37/3rdparty/viahss/Makefile 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Makefile 2003-12-01 01:43:23.000000000 +0200
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+
|
||||||
|
+obj-$(CONFIG_VIAHSS) += viahss.o
|
||||||
|
+
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/viahss/README.html linux-2.6.37.3rdparty/3rdparty/viahss/README.html
|
||||||
|
--- linux-2.6.37/3rdparty/viahss/README.html 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/viahss/README.html 2003-12-01 01:58:23.000000000 +0200
|
||||||
|
@@ -0,0 +1,68 @@
|
||||||
|
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||||
|
+<html>
|
||||||
|
+<head>
|
||||||
|
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
|
||||||
|
+ <title>High speed serial port for VIA VT82C686 chipsets for linux</title>
|
||||||
|
+</head>
|
||||||
|
+<body>
|
||||||
|
+<H3>Setting the serial port speed over 115,200bps</H3>
|
||||||
|
+<br>
|
||||||
|
+If you have motherboard which has VIA VT82C686A or VT82C686B chipset
|
||||||
|
+you can set serial ports in high speed mode with this kernel module.
|
||||||
|
+I use module with external ISDN-TA and haven't had any problems
|
||||||
|
+so far but I cannot guarantee that you won't have buffer overflows if
|
||||||
|
+you use full 230K or 460K speed all the time (FIFO's are still 16550A size).
|
||||||
|
+ISDN with two channels maxes out at 128 Kb which means that it doesn't
|
||||||
|
+really stress serial ports at 230400. Unlike SHSMOD-patches you don't have
|
||||||
|
+to patch serial driver and module takes only 1KB of memory when it's
|
||||||
|
+loaded which should leave enough room for other programs. It should
|
||||||
|
+be also possible to make this work from userspace but accessing
|
||||||
|
+pci devices is so much easier from kernel.
|
||||||
|
+
|
||||||
|
+<H3>How to use module</H3>
|
||||||
|
+Get the <A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>package</A>
|
||||||
|
+and compile it using included makefiles.
|
||||||
|
+<H3>For 2.4</H3>
|
||||||
|
+If you have kernel in some other location than /usr/src/linux edit Makefile
|
||||||
|
+before compiling. You can also install module with "make install". After
|
||||||
|
+you have loaded module in kernel (use modprobe or insmod) you can set serial
|
||||||
|
+ports to use high speed modes with setserial.<br>
|
||||||
|
+<H3>For 2.5/2.6</H3>
|
||||||
|
+Copy Makefile-2.6 on top of Makefile and do make. After loading module set
|
||||||
|
+serial speed with setserial. (NOTE: This gives a warning on depracated
|
||||||
|
+method).
|
||||||
|
+
|
||||||
|
+<br>
|
||||||
|
+# setserial /dev/ttyS0 spd_cust divisor 0x8002
|
||||||
|
+<br><br>
|
||||||
|
+which sets COM1: speed to 230400. With 0x8001 you should get 460800
|
||||||
|
+but I haven't tested it. If you want to use COM2: use ttyS1 instead of ttyS0.
|
||||||
|
+
|
||||||
|
+After this you should set program which you are using to use 38400 bps
|
||||||
|
+speed which is now actually 230K or 460K. For more information check
|
||||||
|
+setserial man page (spd_cust).
|
||||||
|
+
|
||||||
|
+You can use serial port work as normal if you do<br>
|
||||||
|
+<br>
|
||||||
|
+# setserial /dev/ttyS0 spd_normal <br><br>
|
||||||
|
+After this you can also remove viahss module with rmmod if you need to. Module doesn't intefere with normal serial port usage so you can leave
|
||||||
|
+it loaded if you don't need that extra 1KB which module uses.
|
||||||
|
+<H3>Download</H3>
|
||||||
|
+<A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>viahss-0.92.tar.gz</A>
|
||||||
|
+
|
||||||
|
+<H3>Acknowledgments</H3>
|
||||||
|
+
|
||||||
|
+Thanks to Kimmo Rintala for help with divisor settings.<br>
|
||||||
|
+I also like to thank Jeff Garzik for help with VIA datasheets.<br>
|
||||||
|
+Port to 2.5/2.6 by Kingsly John with the help of <A href=http://lwn.net>LWN</A>
|
||||||
|
+
|
||||||
|
+<H3>Version History</H3>
|
||||||
|
+0.90 First release<br>
|
||||||
|
+0.91 Fixed Makefile <br>
|
||||||
|
+0.92 Fixed for 2.5/2.6<br>
|
||||||
|
+
|
||||||
|
+<H3>Contact</H3>
|
||||||
|
+
|
||||||
|
+You can reach me by email: <A href=mailto:jrauti@iki.fi>jrauti@iki.fi</A>
|
||||||
|
+</body>
|
||||||
|
+</html>
|
||||||
|
diff -Nurp linux-2.6.37/3rdparty/viahss/viahss.c linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c
|
||||||
|
--- linux-2.6.37/3rdparty/viahss/viahss.c 1970-01-01 02:00:00.000000000 +0200
|
||||||
|
+++ linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c 2003-07-17 09:49:59.000000000 +0300
|
||||||
|
@@ -0,0 +1,83 @@
|
||||||
|
+/*
|
||||||
|
+ * VIA VT 82c686[AB] high speed serial port enabler
|
||||||
|
+ * Version 0.92
|
||||||
|
+ * Copyright (c) 2000-2001 Juhani Rautiainen <jrauti@iki.fi>
|
||||||
|
+ *
|
||||||
|
+ * 0.92:
|
||||||
|
+ * Ported to 2.5/2.6 by Kingsly John
|
||||||
|
+ * - Corrected locking (no more cli() and sti())
|
||||||
|
+ * - New makefile
|
||||||
|
+ *
|
||||||
|
+ * Can be freely distributed and used under the terms of the GNU GPL.
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/config.h>
|
||||||
|
+#include <linux/version.h>
|
||||||
|
+#include <linux/init.h>
|
||||||
|
+#include <linux/pci.h>
|
||||||
|
+
|
||||||
|
+const unsigned short confindex=0x3F0,confdata=0x3F1;
|
||||||
|
+const unsigned char spcidx=0xEE;
|
||||||
|
+
|
||||||
|
+spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
|
||||||
|
+
|
||||||
|
+static int __init viahss_init(void)
|
||||||
|
+{
|
||||||
|
+ struct pci_dev *pcidev = NULL;
|
||||||
|
+ unsigned char confval,val;
|
||||||
|
+ pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
+ if (pcidev) {
|
||||||
|
+ spin_lock_irq(&driver_lock);
|
||||||
|
+ /* start config */
|
||||||
|
+ pci_read_config_byte(pcidev,0x85,&confval);
|
||||||
|
+ confval |= 0x2;
|
||||||
|
+ pci_write_config_byte (pcidev, 0x85,confval);
|
||||||
|
+ /* activate high speed bits */
|
||||||
|
+ outb(spcidx,confindex); /* set index */
|
||||||
|
+ val = (unsigned char) inb(confdata);
|
||||||
|
+ val |= 0xC0; /* both ports on high speed*/
|
||||||
|
+ outb (spcidx,confindex);
|
||||||
|
+ outb (val,confdata);
|
||||||
|
+ /*stop config*/
|
||||||
|
+ confval &= ~0x2;
|
||||||
|
+ pci_write_config_byte(pcidev, 0x85, confval);
|
||||||
|
+ spin_unlock_irq(&driver_lock);
|
||||||
|
+ printk (KERN_INFO "VIA VT82C686[AB] serial port high speed enabled\n");
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ printk (KERN_INFO "Couldn't locate VIA chipset\n");
|
||||||
|
+ return -ENODEV;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void __exit viahss_exit(void)
|
||||||
|
+{
|
||||||
|
+ struct pci_dev *pcidev = NULL;
|
||||||
|
+ unsigned char confval,val;
|
||||||
|
+ pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
+ if (pcidev) {
|
||||||
|
+ spin_lock_irq(&driver_lock);
|
||||||
|
+ /* start config */
|
||||||
|
+ pci_read_config_byte(pcidev,0x85,&confval);
|
||||||
|
+ confval |= 0x2;
|
||||||
|
+ pci_write_config_byte (pcidev, 0x85,confval);
|
||||||
|
+ /* activate high speed bits */
|
||||||
|
+ outb(spcidx,confindex); /* set index */
|
||||||
|
+ val = (unsigned char) inb(confdata);
|
||||||
|
+ val &= ~0xC0; /* both ports off high speed*/
|
||||||
|
+ outb (spcidx,confindex);
|
||||||
|
+ outb (val,confdata);
|
||||||
|
+ /*stop config*/
|
||||||
|
+ confval &= ~0x2;
|
||||||
|
+ pci_write_config_byte(pcidev, 0x85, confval);
|
||||||
|
+ spin_unlock_irq(&driver_lock);
|
||||||
|
+ printk (KERN_INFO "VIA VT82C686[AB] serial port high speed disabled\n");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+module_init(viahss_init);
|
||||||
|
+module_exit(viahss_exit);
|
||||||
|
+MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
|
||||||
|
+MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c.orig 2010-07-30 21:17:30.000000000 +0300
|
||||||
|
+++ linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c 2010-07-30 23:10:21.324978822 +0300
|
||||||
|
@@ -25,7 +25,7 @@ static int __init viahss_init(void)
|
||||||
|
{
|
||||||
|
struct pci_dev *pcidev = NULL;
|
||||||
|
unsigned char confval,val;
|
||||||
|
- pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
+ pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
if (pcidev) {
|
||||||
|
spin_lock_irq(&driver_lock);
|
||||||
|
/* start config */
|
||||||
|
@@ -55,7 +55,7 @@ static void __exit viahss_exit(void)
|
||||||
|
{
|
||||||
|
struct pci_dev *pcidev = NULL;
|
||||||
|
unsigned char confval,val;
|
||||||
|
- pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
+ pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
|
||||||
|
if (pcidev) {
|
||||||
|
spin_lock_irq(&driver_lock);
|
||||||
|
/* start config */
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
fix build with 3.0
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||||
|
|
||||||
|
3rdparty/viahss/viahss.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/3rdparty/viahss/viahss.c.orig 2011-07-15 02:37:27.000000000 +0300
|
||||||
|
+++ a/3rdparty/viahss/viahss.c 2011-07-15 13:48:13.204291256 +0300
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
const unsigned short confindex=0x3F0,confdata=0x3F1;
|
||||||
|
const unsigned char spcidx=0xEE;
|
||||||
|
|
||||||
|
-spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
|
||||||
|
+DEFINE_SPINLOCK(driver_lock);
|
||||||
|
|
||||||
|
static int __init viahss_init(void)
|
||||||
|
{
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
linux/config.h is gone in 2.6.21
|
||||||
|
|
||||||
|
---
|
||||||
|
3rdparty/viahss/viahss.c | 1 0 + 1 - 0 !
|
||||||
|
1 files changed, 1 deletion(-)
|
||||||
|
|
||||||
|
Index: linux-2.6.21/3rdparty/viahss/viahss.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.21.orig/3rdparty/viahss/viahss.c 2003-07-17 08:49:59.000000000 +0200
|
||||||
|
+++ linux-2.6.21/3rdparty/viahss/viahss.c 2007-05-14 17:06:56.000000000 +0200
|
||||||
|
@@ -12,7 +12,6 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
|
-#include <linux/config.h>
|
||||||
|
#include <linux/version.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/pci.h>
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
--- linux-2.6.25/3rdparty/viahss/viahss.c.orig 2008-06-28 22:50:05.000000000 +0300
|
||||||
|
+++ linux-2.6.25/3rdparty/viahss/viahss.c 2008-06-29 14:26:55.000000000 +0300
|
||||||
|
@@ -80,3 +80,4 @@ module_init(viahss_init);
|
||||||
|
module_exit(viahss_exit);
|
||||||
|
MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
|
||||||
|
MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user