mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
Core cleanup
This commit is contained in:
Mike Staszel
parent
78023b9bd8
commit
ec80ace66c
103 changed files with 39 additions and 37004 deletions
|
|
@ -5,7 +5,7 @@ pkgrel=3
|
|||
pkgdesc="Tunnels IPv6 connections for IPv4-only applications"
|
||||
url="http://toxygen.net/6tunnel/"
|
||||
license=('GPL')
|
||||
arch=('i686' 'x86_64')
|
||||
arch=('i686' 'x86_64' 'arm')
|
||||
source=(http://toxygen.net/6tunnel/$pkgname-$pkgver.tar.gz)
|
||||
md5sums=('74e02d4f0704b3083a01feda66033449')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
# $Id: PKGBUILD 2913 2009-09-23 11:43:45Z cbrannon $
|
||||
# Maintainer: Jeff Mickey <j@codemac.net>
|
||||
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
|
||||
# Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
|
||||
|
|
@ -17,7 +16,7 @@ md5sums=('af10410542ea6b6875a71e06fdc12c66'
|
|||
'62a9e52043d9c32967fcae9018fffb56')
|
||||
conflicts=('plan9port' '9rc-devel')
|
||||
provides=('plan9')
|
||||
arch=('i686' 'x86_64')
|
||||
arch=('i686' 'x86_64' 'arm')
|
||||
license=('custom')
|
||||
|
||||
build()
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $
|
||||
# Maintainer: Roman Kyrylych <roman@archlinux.org>
|
||||
# Contributor: Roman Kyrylych <roman@archlinux.org>
|
||||
|
||||
pkgname=abyssws
|
||||
pkgver=2.5
|
||||
pkgrel=2
|
||||
pkgdesc="Abyss Web Server X1 - a compact full-featured web server"
|
||||
arch=('i686') # don't work on x86_64: closed source app
|
||||
url="http://www.aprelium.com/abyssws/"
|
||||
license=('custom')
|
||||
depends=('glibc')
|
||||
backup=(opt/abyssws/abyss.conf etc/conf.d/abyssws)
|
||||
_lurl=http://www.aprelium.com/abyssws/languages/a/
|
||||
source=(http://www.aprelium.com/data/abwsx1.tgz \
|
||||
$_lurl/ar.lng $_lurl/bg.lng $_lurl/cz.lng $_lurl/de.lng $_lurl/en.lng \
|
||||
$_lurl/es.lng $_lurl/fr.lng $_lurl/gr.lng $_lurl/hr.lng $_lurl/hu.lng \
|
||||
$_lurl/id.lng $_lurl/it.lng $_lurl/jp.lng $_lurl/mk.lng $_lurl/ms.lng \
|
||||
$_lurl/nl.lng $_lurl/nn-no.lng $_lurl/no.lng $_lurl/pl.lng \
|
||||
$_lurl/pt-br.lng $_lurl/pt.lng $_lurl/ru.lng $_lurl/sl.lng \
|
||||
$_lurl/sv.lng $_lurl/tr.lng $_lurl/zh-cn.lng $_lurl/zh-tw.lng \
|
||||
abyss.conf abyssws.rc.d abyssws.conf.d)
|
||||
md5sums=('8bbd0f96fdfdb2055b43eeaef24a8211' '7b845eede148d452e93e58dd91deefe8'\
|
||||
'7d0d16ef1329271af6669e497dd010aa' 'b7545f4fdbbe2962919c499e9258b446'\
|
||||
'ff562d8113c393728b4f80a4be004d61' 'd8d08b8173b04fbb793372565cd02469'\
|
||||
'e1b2cd53d79fdfb46e430cd9f98b4a41' '2c2f3881e9ec46369b1cdd0b7b223c0e'\
|
||||
'843ee1cfb181f2c498c41323b4a98a6f' 'ca7f4b91670994bd2181dcb658f45c81'\
|
||||
'd30ecd91414b2a6129aae5730fbfb64e' '3c9fd8471ca043335fb7b3cbdac0ef40'\
|
||||
'4bea9393c9ba1a8a7245f13537b7a860' '790dd350c94719a1948d1ce8bbb658e8'\
|
||||
'0b52c44befcf96a7b9eb14683c967b4d' '1644464141ab4b690e640dfef2f9b56f'\
|
||||
'd4aa13cb1527bc3fba9ef145ce5c03e6' 'adbe02b4f298f28278c5f344c9480f27'\
|
||||
'dc732eac9a34b23b6c71714cf4d0b54e' '98754405ca34d509b54c1ee2cb9cd54a'\
|
||||
'77fc3de4e178af4c256b6c11116db602' 'adbdec30b1b804545b79b439f52b7a0e'\
|
||||
'fcd4dd62155723baee40885ec3c32c50' '9c6c569b114e4919f6e84fbd7f663d54'\
|
||||
'f3a3ac32f4ce49ccd01ef5cabe9ae319' 'b9309f3458f15d84c8485715e27ad679'\
|
||||
'b9a4567de4433ddbbc3767f0175f4448' 'ff3bb82cb25e14c34647de72b1992f64'\
|
||||
'45fd09afccbb429da271145c41d31769' '8e294c6a190323d73658e21bab0aca8e'\
|
||||
'92c9079247c1ea79506361c82216bbdb')
|
||||
|
||||
build() {
|
||||
cd $startdir/src
|
||||
mkdir $startdir/pkg/opt
|
||||
cp -Rp abyssws $startdir/pkg/opt
|
||||
install -m644 abyss.conf $startdir/pkg/opt/abyssws/abyss.conf
|
||||
install -D -m755 abyssws.rc.d $startdir/pkg/etc/rc.d/abyssws
|
||||
install -D -m644 abyssws.conf.d $startdir/pkg/etc/conf.d/abyssws
|
||||
cp -af *.lng $startdir/pkg/opt/abyssws/lang/
|
||||
cd $startdir/pkg/opt/abyssws
|
||||
install -D -m644 license.txt $startdir/pkg/usr/share/licenses/abyssws/license.txt
|
||||
rm *.html *.txt
|
||||
}
|
||||
|
|
@ -1,900 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<root>
|
||||
<server>
|
||||
<parameters>
|
||||
<root>
|
||||
/opt/abyssws/
|
||||
</root>
|
||||
<timeout>
|
||||
30
|
||||
</timeout>
|
||||
<maxconn>
|
||||
20
|
||||
</maxconn>
|
||||
<keepalive>
|
||||
10
|
||||
</keepalive>
|
||||
<opsys>
|
||||
<pidfile>
|
||||
log/abyssws.pid
|
||||
</pidfile>
|
||||
<sysuser>
|
||||
nobody
|
||||
</sysuser>
|
||||
</opsys>
|
||||
</parameters>
|
||||
<host>
|
||||
<names/>
|
||||
<path>
|
||||
htdocs/
|
||||
</path>
|
||||
<running>
|
||||
yes
|
||||
</running>
|
||||
<id>
|
||||
1
|
||||
</id>
|
||||
<scripting>
|
||||
<enabled>
|
||||
yes
|
||||
</enabled>
|
||||
<cgi>
|
||||
<timeout>
|
||||
30
|
||||
</timeout>
|
||||
<useregistry>
|
||||
no
|
||||
</useregistry>
|
||||
<useshebang>
|
||||
yes
|
||||
</useshebang>
|
||||
<errorfile>
|
||||
log/cgi.log
|
||||
</errorfile>
|
||||
</cgi>
|
||||
<isapi>
|
||||
<ext>
|
||||
dll
|
||||
</ext>
|
||||
<errorfile>
|
||||
log/isapi.log
|
||||
</errorfile>
|
||||
<debuglevel>
|
||||
0
|
||||
</debuglevel>
|
||||
</isapi>
|
||||
<fastcgi>
|
||||
<errorfile>
|
||||
log/fastcgi.log
|
||||
</errorfile>
|
||||
<timeout>
|
||||
240
|
||||
</timeout>
|
||||
<debuglevel>
|
||||
1
|
||||
</debuglevel>
|
||||
</fastcgi>
|
||||
</scripting>
|
||||
<ssi>
|
||||
<extensions>
|
||||
<ext>
|
||||
shtml
|
||||
</ext>
|
||||
<ext>
|
||||
shtm
|
||||
</ext>
|
||||
<ext>
|
||||
stm
|
||||
</ext>
|
||||
</extensions>
|
||||
<enabled>
|
||||
yes
|
||||
</enabled>
|
||||
<errormessage/>
|
||||
<timeformat/>
|
||||
<abbreviatesize>
|
||||
yes
|
||||
</abbreviatesize>
|
||||
<execcmd>
|
||||
no
|
||||
</execcmd>
|
||||
</ssi>
|
||||
<log>
|
||||
<file>
|
||||
log/access.log
|
||||
</file>
|
||||
<extendedformat>
|
||||
yes
|
||||
</extendedformat>
|
||||
<denied/>
|
||||
</log>
|
||||
<indexes>
|
||||
<index>
|
||||
index.html
|
||||
</index>
|
||||
<index>
|
||||
index.htm
|
||||
</index>
|
||||
</indexes>
|
||||
<antileech>
|
||||
<paths/>
|
||||
<redirect/>
|
||||
<strict>
|
||||
no
|
||||
</strict>
|
||||
<allowed/>
|
||||
</antileech>
|
||||
<bindip>
|
||||
*
|
||||
</bindip>
|
||||
<dirlist>
|
||||
<type>
|
||||
1
|
||||
</type>
|
||||
<scope>
|
||||
<order>
|
||||
ad
|
||||
</order>
|
||||
<allow>
|
||||
<path>
|
||||
/
|
||||
</path>
|
||||
</allow>
|
||||
</scope>
|
||||
<hidden>
|
||||
<file>
|
||||
.*
|
||||
</file>
|
||||
</hidden>
|
||||
</dirlist>
|
||||
<port>
|
||||
8000
|
||||
</port>
|
||||
</host>
|
||||
<throttle>
|
||||
<maxspeed/>
|
||||
<maxspeedperip/>
|
||||
</throttle>
|
||||
<antihack>
|
||||
<enabled>
|
||||
no
|
||||
</enabled>
|
||||
<threshold>
|
||||
20
|
||||
</threshold>
|
||||
<monitorperiod>
|
||||
20
|
||||
</monitorperiod>
|
||||
<banperiod>
|
||||
60
|
||||
</banperiod>
|
||||
<logfile/>
|
||||
<denied>
|
||||
<ip>
|
||||
127.0.0.1
|
||||
</ip>
|
||||
</denied>
|
||||
</antihack>
|
||||
<mimes>
|
||||
<mime>
|
||||
<type>
|
||||
application/mac-binhex40
|
||||
</type>
|
||||
<ext>
|
||||
hqx
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/msword
|
||||
</type>
|
||||
<ext>
|
||||
doc
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/octet-stream
|
||||
</type>
|
||||
<ext>
|
||||
bin
|
||||
</ext>
|
||||
<ext>
|
||||
dms
|
||||
</ext>
|
||||
<ext>
|
||||
lha
|
||||
</ext>
|
||||
<ext>
|
||||
lzh
|
||||
</ext>
|
||||
<ext>
|
||||
exe
|
||||
</ext>
|
||||
<ext>
|
||||
class
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/pdf
|
||||
</type>
|
||||
<ext>
|
||||
pdf
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/postscript
|
||||
</type>
|
||||
<ext>
|
||||
ai
|
||||
</ext>
|
||||
<ext>
|
||||
eps
|
||||
</ext>
|
||||
<ext>
|
||||
ps
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/smil
|
||||
</type>
|
||||
<ext>
|
||||
smi
|
||||
</ext>
|
||||
<ext>
|
||||
smil
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/vnd.mif
|
||||
</type>
|
||||
<ext>
|
||||
mif
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/vnd.ms-asf
|
||||
</type>
|
||||
<ext>
|
||||
asf
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/vnd.ms-excel
|
||||
</type>
|
||||
<ext>
|
||||
xls
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/vnd.ms-powerpoint
|
||||
</type>
|
||||
<ext>
|
||||
ppt
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-cdlink
|
||||
</type>
|
||||
<ext>
|
||||
vcd
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-compress
|
||||
</type>
|
||||
<ext>
|
||||
Z
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-cpio
|
||||
</type>
|
||||
<ext>
|
||||
cpio
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-csh
|
||||
</type>
|
||||
<ext>
|
||||
csh
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-director
|
||||
</type>
|
||||
<ext>
|
||||
dcr
|
||||
</ext>
|
||||
<ext>
|
||||
dir
|
||||
</ext>
|
||||
<ext>
|
||||
dxr
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-dvi
|
||||
</type>
|
||||
<ext>
|
||||
dvi
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-gtar
|
||||
</type>
|
||||
<ext>
|
||||
gtar
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-gzip
|
||||
</type>
|
||||
<ext>
|
||||
gz
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-javascript
|
||||
</type>
|
||||
<ext>
|
||||
js
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-latex
|
||||
</type>
|
||||
<ext>
|
||||
latex
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-sh
|
||||
</type>
|
||||
<ext>
|
||||
sh
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-shar
|
||||
</type>
|
||||
<ext>
|
||||
shar
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-shockwave-flash
|
||||
</type>
|
||||
<ext>
|
||||
swf
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-stuffit
|
||||
</type>
|
||||
<ext>
|
||||
sit
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-tar
|
||||
</type>
|
||||
<ext>
|
||||
tar
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-tcl
|
||||
</type>
|
||||
<ext>
|
||||
tcl
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-tex
|
||||
</type>
|
||||
<ext>
|
||||
tex
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-texinfo
|
||||
</type>
|
||||
<ext>
|
||||
texinfo
|
||||
</ext>
|
||||
<ext>
|
||||
texi
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-troff
|
||||
</type>
|
||||
<ext>
|
||||
t
|
||||
</ext>
|
||||
<ext>
|
||||
tr
|
||||
</ext>
|
||||
<ext>
|
||||
roff
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-troff-man
|
||||
</type>
|
||||
<ext>
|
||||
man
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-troff-me
|
||||
</type>
|
||||
<ext>
|
||||
me
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/x-troff-ms
|
||||
</type>
|
||||
<ext>
|
||||
ms
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/zip
|
||||
</type>
|
||||
<ext>
|
||||
zip
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
application/vnd.wap.wmlc
|
||||
</type>
|
||||
<ext>
|
||||
wmlc
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/basic
|
||||
</type>
|
||||
<ext>
|
||||
au
|
||||
</ext>
|
||||
<ext>
|
||||
snd
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/midi
|
||||
</type>
|
||||
<ext>
|
||||
mid
|
||||
</ext>
|
||||
<ext>
|
||||
midi
|
||||
</ext>
|
||||
<ext>
|
||||
kar
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/mpeg
|
||||
</type>
|
||||
<ext>
|
||||
mpga
|
||||
</ext>
|
||||
<ext>
|
||||
mp2
|
||||
</ext>
|
||||
<ext>
|
||||
mp3
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/x-aiff
|
||||
</type>
|
||||
<ext>
|
||||
aif
|
||||
</ext>
|
||||
<ext>
|
||||
aiff
|
||||
</ext>
|
||||
<ext>
|
||||
aifc
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/x-pn-realaudio
|
||||
</type>
|
||||
<ext>
|
||||
ram
|
||||
</ext>
|
||||
<ext>
|
||||
rm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/x-realaudio
|
||||
</type>
|
||||
<ext>
|
||||
ra
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
audio/x-wav
|
||||
</type>
|
||||
<ext>
|
||||
wav
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/bmp
|
||||
</type>
|
||||
<ext>
|
||||
bmp
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/gif
|
||||
</type>
|
||||
<ext>
|
||||
gif
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/ief
|
||||
</type>
|
||||
<ext>
|
||||
ief
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/jpeg
|
||||
</type>
|
||||
<ext>
|
||||
jpeg
|
||||
</ext>
|
||||
<ext>
|
||||
jpg
|
||||
</ext>
|
||||
<ext>
|
||||
jpe
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/png
|
||||
</type>
|
||||
<ext>
|
||||
png
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/tiff
|
||||
</type>
|
||||
<ext>
|
||||
tiff
|
||||
</ext>
|
||||
<ext>
|
||||
tif
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/vnd.wap.wbmp
|
||||
</type>
|
||||
<ext>
|
||||
wbmp
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-cmu-raster
|
||||
</type>
|
||||
<ext>
|
||||
ras
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-portable-anymap
|
||||
</type>
|
||||
<ext>
|
||||
pnm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-portable-bitmap
|
||||
</type>
|
||||
<ext>
|
||||
pbm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-portable-graymap
|
||||
</type>
|
||||
<ext>
|
||||
pgm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-portable-pixmap
|
||||
</type>
|
||||
<ext>
|
||||
ppm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-rgb
|
||||
</type>
|
||||
<ext>
|
||||
rgb
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-xbitmap
|
||||
</type>
|
||||
<ext>
|
||||
xbm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-xpixmap
|
||||
</type>
|
||||
<ext>
|
||||
xpm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-xwindowdump
|
||||
</type>
|
||||
<ext>
|
||||
xwd
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
image/x-icon
|
||||
</type>
|
||||
<ext>
|
||||
ico
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
model/iges
|
||||
</type>
|
||||
<ext>
|
||||
igs
|
||||
</ext>
|
||||
<ext>
|
||||
iges
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
model/mesh
|
||||
</type>
|
||||
<ext>
|
||||
msh
|
||||
</ext>
|
||||
<ext>
|
||||
mesh
|
||||
</ext>
|
||||
<ext>
|
||||
silo
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
model/vrml
|
||||
</type>
|
||||
<ext>
|
||||
wrl
|
||||
</ext>
|
||||
<ext>
|
||||
vrml
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/css
|
||||
</type>
|
||||
<ext>
|
||||
css
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/html
|
||||
</type>
|
||||
<ext>
|
||||
html
|
||||
</ext>
|
||||
<ext>
|
||||
htm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/plain
|
||||
</type>
|
||||
<ext>
|
||||
asc
|
||||
</ext>
|
||||
<ext>
|
||||
txt
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/richtext
|
||||
</type>
|
||||
<ext>
|
||||
rtx
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/rtf
|
||||
</type>
|
||||
<ext>
|
||||
rtf
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/sgml
|
||||
</type>
|
||||
<ext>
|
||||
sgml
|
||||
</ext>
|
||||
<ext>
|
||||
sgm
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/tab-separated-values
|
||||
</type>
|
||||
<ext>
|
||||
tsv
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/xml
|
||||
</type>
|
||||
<ext>
|
||||
xml
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/vnd.wap.wml
|
||||
</type>
|
||||
<ext>
|
||||
wml
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
text/vnd.wap.wmlscript
|
||||
</type>
|
||||
<ext>
|
||||
wmls
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
video/mpeg
|
||||
</type>
|
||||
<ext>
|
||||
mpeg
|
||||
</ext>
|
||||
<ext>
|
||||
mpg
|
||||
</ext>
|
||||
<ext>
|
||||
mpe
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
video/quicktime
|
||||
</type>
|
||||
<ext>
|
||||
qt
|
||||
</ext>
|
||||
<ext>
|
||||
mov
|
||||
</ext>
|
||||
</mime>
|
||||
<mime>
|
||||
<type>
|
||||
video/x-msvideo
|
||||
</type>
|
||||
<ext>
|
||||
avi
|
||||
</ext>
|
||||
</mime>
|
||||
</mimes>
|
||||
</server>
|
||||
<version>
|
||||
2.3.2
|
||||
</version>
|
||||
<console>
|
||||
<port>
|
||||
9999
|
||||
</port>
|
||||
<bindip>
|
||||
*
|
||||
</bindip>
|
||||
<ipcontrol>
|
||||
<order>
|
||||
ad
|
||||
</order>
|
||||
<allow>
|
||||
192.168.0.1-192.168.255.254
|
||||
</allow>
|
||||
<allow>
|
||||
172.16.0.1-172.31.255.254
|
||||
</allow>
|
||||
<allow>
|
||||
10.0.0.1-10.255.255.254
|
||||
</allow>
|
||||
</ipcontrol>
|
||||
</console>
|
||||
</root>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
OPTIONS=""
|
||||
# -c Specify an alternate configuration file.
|
||||
# If the file does not exist, it is created and filled
|
||||
# with the default options values.
|
||||
#
|
||||
# -p Specify an alternate console port.
|
||||
# It overrides the console port value in the configuration file.
|
||||
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
[ -f /etc/conf.d/abyssws ] && . /etc/conf.d/abyssws
|
||||
|
||||
. /etc/rc.conf
|
||||
. /etc/rc.d/functions
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
stat_busy "Starting Abyss Web Server X1"
|
||||
/opt/abyssws/abyssws -d $OPTIONS
|
||||
if [ $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
add_daemon abyssws
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
stat_busy "Stopping Abyss Web Server X1"
|
||||
/opt/abyssws/abyssws --stop
|
||||
if [ $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
rm_daemon abyssws
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
stat_busy "Restarting Abyss Web Server X1"
|
||||
/opt/abyssws/abyssws --restart
|
||||
if [ $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 {start|stop|restart}"
|
||||
esac
|
||||
exit 0
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
--- a/acerhk.c
|
||||
+++ b/acerhk.c
|
||||
@@ -2668,7 +2668,9 @@ static int acerhk_proc_init(void)
|
||||
printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
|
||||
}
|
||||
else {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
proc_acer_dir->owner = THIS_MODULE;
|
||||
+#endif
|
||||
/* now create several files, first general info ... */
|
||||
entry = create_proc_read_entry("info",
|
||||
0444, proc_acer_dir, acerhk_proc_info, NULL);
|
||||
@@ -2677,7 +2679,9 @@ static int acerhk_proc_init(void)
|
||||
remove_proc_entry("driver/acerhk", NULL);
|
||||
retval = 0;
|
||||
} else {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
/* ... last pressed key ... */
|
||||
entry = create_proc_read_entry("key",
|
||||
0444, proc_acer_dir, acerhk_proc_key, NULL);
|
||||
@@ -2687,7 +2691,9 @@ static int acerhk_proc_init(void)
|
||||
remove_proc_entry("driver/acerhk", NULL);
|
||||
retval = 0;
|
||||
} else {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
/* ... and led control file */
|
||||
entry = create_proc_entry("led", 0222, proc_acer_dir);
|
||||
if (entry == NULL) {
|
||||
@@ -2699,7 +2705,9 @@ static int acerhk_proc_init(void)
|
||||
}
|
||||
else {
|
||||
entry->write_proc = acerhk_proc_led;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
/* ... and wireless led controll file */
|
||||
entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
|
||||
if (entry == NULL) {
|
||||
@@ -2712,7 +2720,9 @@ static int acerhk_proc_init(void)
|
||||
}
|
||||
else {
|
||||
entry->write_proc = acerhk_proc_wirelessled;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
/* ... and bluetooth led controll file */
|
||||
entry = create_proc_entry("blueled", 0222, proc_acer_dir);
|
||||
if (entry == NULL) {
|
||||
@@ -2725,7 +2735,9 @@ static int acerhk_proc_init(void)
|
||||
retval = 0;
|
||||
} else {
|
||||
entry->write_proc = acerhk_proc_blueled;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
retval = 1;
|
||||
#ifdef ACERDEBUG
|
||||
/* add extra file for debugging purposes */
|
||||
@@ -2742,7 +2754,9 @@ static int acerhk_proc_init(void)
|
||||
}
|
||||
else {
|
||||
entry->write_proc = acerhk_proc_debug;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
entry->owner = THIS_MODULE;
|
||||
+#endif
|
||||
retval = 1;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
2009-06-24 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 14
|
||||
|
||||
* PKGBUILD: updated for the 2.6.30 kernel, added compilation patch
|
||||
|
||||
* 2.6.30.patch: added
|
||||
|
||||
2009-04-09 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 13
|
||||
|
||||
* PKGBUILD: updated for the 2.6.29 kernel
|
||||
|
||||
2009-01-16 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 12
|
||||
|
||||
* PKGBUILD: updated for the 2.6.28 kernel
|
||||
|
||||
2008-10-16 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 11
|
||||
|
||||
* PKGBUILD: updated for the 2.6.27 kernel
|
||||
|
||||
2008-08-12 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 10
|
||||
|
||||
* PKGBUILD: updated for the 2.6.26 kernel, moved to $srcdir/$pkgdir
|
||||
|
||||
2008-05-27 Corrado Primier <bardo@aur.archlinux.org>
|
||||
|
||||
* Release bump: 9
|
||||
|
||||
* PKGBUILD: updated for the 2.6.25 kernel
|
||||
|
||||
* ChangeLog: added
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $
|
||||
# Maintainer: Corrado Primier <bardo@aur.archlinux.org>
|
||||
# Contributor: Marco Fister <marco@rda26.net>
|
||||
|
||||
pkgname=acerhk
|
||||
pkgver=0.5.35
|
||||
pkgrel=14
|
||||
pkgdesc="Acer hotkey driver"
|
||||
url="http://www.cakey.de/acerhk/"
|
||||
arch=('i686') # Unavailable for x86_64
|
||||
license=('GPL')
|
||||
depends=('kernel26>=2.6.30' 'kernel26<2.6.31')
|
||||
source=(http://www.cakey.de/acerhk/archives/${pkgname}-${pkgver}.tgz acerhk.rc
|
||||
2.6.30.patch)
|
||||
install=acerhk.install
|
||||
md5sums=('05255919f312cb76af473a760c284433' '935584b3e4bfbb3af8460558e5b98bb5'
|
||||
'2a0bc99e5b12e25096441df4d53d7df7')
|
||||
_kernver=2.6.30-ARCH
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
sed -i 's/CFLAGS/EXTRA_CFLAGS/' Makefile
|
||||
patch -Np1 -i ${srcdir}/2.6.30.patch || return 1
|
||||
make acerhk.ko || return 1
|
||||
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/acerhk.ko \
|
||||
${pkgdir}/lib/modules/${_kernver}/kernel/drivers/block/acerhk.ko
|
||||
install -Dm755 ${srcdir}/acerhk.rc ${pkgdir}/etc/rc.d/acerhk
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
post_install() {
|
||||
cat << EOM
|
||||
>>> PLEASE ADD PROPER OPTIONS IN /etc/modprobe.conf IF NEEDED
|
||||
>>> e.g. for Series 290:
|
||||
>>> echo "options acerhk force_series=290 usedritek=1 verbose=0" >> /etc/modprobe.conf
|
||||
EOM
|
||||
depmod -a
|
||||
}
|
||||
|
||||
|
||||
post_upgrade() {
|
||||
depmod -a
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
depmod -a
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
. /etc/rc.conf
|
||||
. /etc/rc.d/functions
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
stat_busy "Starting Acer Hotkey Wireless LED"
|
||||
if [ ! -f /proc/driver/acerhk/wirelessled ]; then
|
||||
stat_fail
|
||||
else
|
||||
echo 1 > /proc/driver/acerhk/wirelessled
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
stat_busy "Stopping Acer Hotkey Wireless LED"
|
||||
if [ ! -f /proc/driver/acerhk/wirelessled ]; then
|
||||
stat_fail
|
||||
else
|
||||
echo 0 > /proc/driver/acerhk/wirelessled
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 {start|stop|restart}"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
|
||||
pkgname=autoconf
|
||||
pkgver=2.63
|
||||
pkgrel=2
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(autoconf.info)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -4,7 +4,7 @@ pkgname=automake
|
|||
pkgver=1.11
|
||||
pkgrel=1
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://www.gnu.org/software/automake"
|
||||
groups=('base-devel')
|
||||
|
|
@ -19,5 +19,3 @@ build() {
|
|||
make || return 1
|
||||
make DESTDIR=$pkgdir install || return 1
|
||||
}
|
||||
|
||||
# vim: set ft=sh ts=2 sw=2 et:
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(automake.info automake.info-1 automake.info-2)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
# Maintainer: Aaron Griffin <aaron@archlinux.org>
|
||||
# arm Maintainer: Philipp Scholl <pscholl@bawue.de>
|
||||
# ARM Maintainer: Philipp Scholl <pscholl@bawue.de>
|
||||
|
||||
pkgname=bash
|
||||
_patchlevel=028
|
||||
pkgver=4.0.$_patchlevel
|
||||
pkgrel=1
|
||||
pkgdesc="The GNU Bourne Again shell"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://www.gnu.org/software/bash/bash.html"
|
||||
groups=('base')
|
||||
|
|
@ -45,6 +45,7 @@ build() {
|
|||
|
||||
rm -rf ${pkgdir}/usr/share/{info,man}
|
||||
}
|
||||
|
||||
md5sums=('a90a1b5a6db4838483f05438e05e8eb9'
|
||||
'c2fae355facefcac8a732cce877da194'
|
||||
'3d2837e84645eac9bde399b58014bafa'
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
info_dir=/usr/share/info
|
||||
info_files=(bash.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for f in ${info_files[@]}; do
|
||||
usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for f in ${info_files[@]}; do
|
||||
usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
|
||||
pkgname=bc
|
||||
pkgver=1.06
|
||||
pkgrel=1
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
# Maintainer: Alexander Foremny <alexanderforemny@gmail.com>
|
||||
|
||||
# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
|
||||
|
||||
pkgname=binutils
|
||||
pkgver=2.19.1
|
||||
pkgrel=3
|
||||
|
|
@ -43,4 +41,3 @@ build() {
|
|||
# Programs should compile static to the .a file.
|
||||
rm -f ${startdir}/pkg/usr/lib/lib{bfd,opcodes}.so
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
2008-12-11 Eric Belanger <eric@archlinux.org>
|
||||
|
||||
* bison 2.4.1-1
|
||||
* Upstream update
|
||||
|
||||
2008-11-08 Eric Belanger <eric@archlinux.org>
|
||||
|
||||
* bison 2.4-1
|
||||
* Upstream update
|
||||
* Added info file support
|
||||
* Added ChangeLog
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
# Maintainer: Philipp Scholl <pscholl@bawue.de>
|
||||
|
||||
pkgname=bison
|
||||
pkgver=2.4.1
|
||||
pkgrel=1
|
||||
|
|
@ -10,7 +11,6 @@ depends=('glibc' 'm4' 'texinfo')
|
|||
groups=('base-devel')
|
||||
source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.gz)
|
||||
md5sums=('c58aa1da418dc9704070872489e89bf5')
|
||||
sha1sums=('ecc4139bbd45b73f42f2b04482d77c16534fea28')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(bison.info.gz)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
|
@ -17,7 +17,8 @@ provides=('coreutils' 'e2fsprogs' 'vi' 'findutils' 'procps' 'bash' \
|
|||
'which' 'ncurses' 'kbd' 'shadow' 'module-init-tools' 'util-linux-ng' \
|
||||
'util-linunx' 'dosfstools' 'dcron' 'less' 'net-tools')
|
||||
source=(http://www.busybox.net/downloads/${pkgname}-${pkgver}.tar.bz2 config)
|
||||
md5sums=('c13b09b4125688d5fca5c95a79bf814a' 'eec47462d123479897f405f31089c65d')
|
||||
md5sums=('c13b09b4125688d5fca5c95a79bf814a'
|
||||
'eec47462d123479897f405f31089c65d')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}/
|
||||
|
|
|
|||
|
|
@ -42,4 +42,3 @@ build() {
|
|||
install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
|
||||
$pkgdir/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ pkgname=cloog-ppl
|
|||
pkgver=0.15.3
|
||||
pkgrel=1
|
||||
pkgdesc='Library that generates loops for scanning polyhedra'
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
url='http://www.cloog.org/'
|
||||
license=(GPL)
|
||||
depends=('ppl>=0.10.2')
|
||||
|
|
@ -22,5 +22,3 @@ build() {
|
|||
make || return 1
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
|
||||
# vim: set ft=sh ts=2 sw=2 et:
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ replaces=('sh-utils' 'fileutils' 'textutils' 'mktemp')
|
|||
backup=('etc/pam.d/su')
|
||||
options=('!emptydirs')
|
||||
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
|
||||
su)
|
||||
su)
|
||||
md5sums=('c52f4f64dda9a245c38e74c09fdd86d2'
|
||||
'fa85e5cce5d723275b14365ba71a8aad')
|
||||
'fa85e5cce5d723275b14365ba71a8aad')
|
||||
|
||||
build() {
|
||||
cd "$srcdir/coreutils-$pkgver"
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
|
||||
--- coreutils-7.2-orig/gnulib-tests/gnulib.mk 2009-03-31 14:28:30.000000000 +0200
|
||||
+++ coreutils-7.2/gnulib-tests/gnulib.mk 2009-04-01 12:37:00.000000000 +0200
|
||||
@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
|
||||
|
||||
## begin gnulib module memchr-tests
|
||||
|
||||
-TESTS += test-memchr
|
||||
-check_PROGRAMS += test-memchr
|
||||
-EXTRA_DIST += test-memchr.c zerosize-ptr.h
|
||||
+#TESTS += test-memchr
|
||||
+#check_PROGRAMS += test-memchr
|
||||
+#EXTRA_DIST += test-memchr.c zerosize-ptr.h
|
||||
|
||||
## end gnulib module memchr-tests
|
||||
|
||||
@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
|
||||
|
||||
## begin gnulib module strverscmp-tests
|
||||
|
||||
-TESTS += test-strverscmp
|
||||
-check_PROGRAMS += test-strverscmp
|
||||
-EXTRA_DIST += test-strverscmp.c
|
||||
+#TESTS += test-strverscmp
|
||||
+#check_PROGRAMS += test-strverscmp
|
||||
+#EXTRA_DIST += test-strverscmp.c
|
||||
|
||||
## end gnulib module strverscmp-tests
|
||||
|
||||
diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
|
||||
--- coreutils-6.11-orig/tests/test-lib.sh 2008-04-19 23:34:23.000000000 +0200
|
||||
+++ coreutils-6.11/tests/test-lib.sh 2008-04-24 14:18:59.000000000 +0200
|
||||
@@ -97,8 +97,8 @@ skip_if_()
|
||||
|
||||
require_selinux_()
|
||||
{
|
||||
- case `ls -Zd .` in
|
||||
- '? .'|'unlabeled .')
|
||||
+ case `ls --scontext -d . | cut -f1 -d" "` in
|
||||
+ '?'|'unlabeled')
|
||||
skip_test_ "this system (or maybe just" \
|
||||
"the current file system) lacks SELinux support"
|
||||
;;
|
||||
diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
|
||||
--- coreutils-7.1-orig/src/ls.c 2009-02-25 13:23:59.000000000 +0100
|
||||
+++ coreutils-7.1/src/ls.c 2009-02-25 13:25:20.000000000 +0100
|
||||
@@ -38,10 +38,6 @@
|
||||
#include <config.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
-#ifdef HAVE_CAP
|
||||
-# include <sys/capability.h>
|
||||
-#endif
|
||||
-
|
||||
#if HAVE_TERMIOS_H
|
||||
# include <termios.h>
|
||||
#endif
|
||||
@@ -84,6 +80,10 @@
|
||||
#include "system.h"
|
||||
#include <fnmatch.h>
|
||||
|
||||
+#ifdef HAVE_CAP
|
||||
+# include <sys/capability.h>
|
||||
+#endif
|
||||
+
|
||||
#include "acl.h"
|
||||
#include "argmatch.h"
|
||||
#include "dev-ino.h"
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,422 +0,0 @@
|
|||
--- coreutils-6.7/src/Makefile.am.pam 2006-11-24 21:28:10.000000000 +0000
|
||||
+++ coreutils-6.7/src/Makefile.am 2007-01-09 17:00:01.000000000 +0000
|
||||
@@ -103,7 +103,7 @@
|
||||
# If necessary, add -lm to resolve use of pow in lib/strtod.c.
|
||||
uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
|
||||
|
||||
-su_LDADD = $(LDADD) $(LIB_CRYPT)
|
||||
+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
|
||||
|
||||
dir_LDADD += $(LIB_ACL)
|
||||
ls_LDADD += $(LIB_ACL)
|
||||
--- coreutils-6.7/src/su.c.pam 2007-01-09 17:00:01.000000000 +0000
|
||||
+++ coreutils-6.7/src/su.c 2007-01-09 17:16:43.000000000 +0000
|
||||
@@ -38,6 +38,16 @@
|
||||
restricts who can su to UID 0 accounts. RMS considers that to
|
||||
be fascist.
|
||||
|
||||
+#ifdef USE_PAM
|
||||
+
|
||||
+ Actually, with PAM, su has nothing to do with whether or not a
|
||||
+ wheel group is enforced by su. RMS tries to restrict your access
|
||||
+ to a su which implements the wheel group, but PAM considers that
|
||||
+ to be fascist, and gives the user/sysadmin the opportunity to
|
||||
+ enforce a wheel group by proper editing of /etc/pam.conf
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
Compile-time options:
|
||||
-DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog.
|
||||
-DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog.
|
||||
@@ -59,6 +69,15 @@
|
||||
prototype (returning `int') in <unistd.h>. */
|
||||
#define getusershell _getusershell_sys_proto_
|
||||
|
||||
+#ifdef USE_PAM
|
||||
+# include <signal.h>
|
||||
+# include <sys/wait.h>
|
||||
+# include <sys/fsuid.h>
|
||||
+# include <unistd.h>
|
||||
+# include <security/pam_appl.h>
|
||||
+# include <security/pam_misc.h>
|
||||
+#endif /* USE_PAM */
|
||||
+
|
||||
#include "system.h"
|
||||
#include "getpass.h"
|
||||
|
||||
@@ -128,15 +147,22 @@
|
||||
/* The user to become if none is specified. */
|
||||
#define DEFAULT_USER "root"
|
||||
|
||||
+#ifndef USE_PAM
|
||||
char *crypt (char const *key, char const *salt);
|
||||
+#endif
|
||||
char *getusershell (void);
|
||||
void endusershell (void);
|
||||
void setusershell (void);
|
||||
|
||||
extern char **environ;
|
||||
|
||||
-static void run_shell (char const *, char const *, char **, size_t)
|
||||
+static void run_shell (char const *, char const *, char **, size_t,
|
||||
+ const struct passwd *)
|
||||
+#ifdef USE_PAM
|
||||
+ ;
|
||||
+#else
|
||||
ATTRIBUTE_NORETURN;
|
||||
+#endif
|
||||
|
||||
/* If true, pass the `-f' option to the subshell. */
|
||||
static bool fast_startup;
|
||||
@@ -225,7 +251,26 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef USE_PAM
|
||||
+static pam_handle_t *pamh = NULL;
|
||||
+static int retval;
|
||||
+static struct pam_conv conv = {
|
||||
+ misc_conv,
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+#define PAM_BAIL_P if (retval) { \
|
||||
+ pam_end(pamh, PAM_SUCCESS); \
|
||||
+ return 0; \
|
||||
+}
|
||||
+#define PAM_BAIL_P_VOID if (retval) { \
|
||||
+ pam_end(pamh, PAM_SUCCESS); \
|
||||
+return; \
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/* Ask the user for a password.
|
||||
+ If PAM is in use, let PAM ask for the password if necessary.
|
||||
Return true if the user gives the correct password for entry PW,
|
||||
false if not. Return true without asking for a password if run by UID 0
|
||||
or if PW has an empty password. */
|
||||
@@ -233,6 +278,44 @@
|
||||
static bool
|
||||
correct_password (const struct passwd *pw)
|
||||
{
|
||||
+#ifdef USE_PAM
|
||||
+ struct passwd *caller;
|
||||
+ char *tty_name, *ttyn;
|
||||
+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
|
||||
+ PAM_BAIL_P;
|
||||
+
|
||||
+ if (getuid() != 0 && !isatty(0)) {
|
||||
+ fprintf(stderr, "standard in must be a tty\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ caller = getpwuid(getuid());
|
||||
+ if(caller != NULL && caller->pw_name != NULL) {
|
||||
+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
|
||||
+ PAM_BAIL_P;
|
||||
+ }
|
||||
+
|
||||
+ ttyn = ttyname(0);
|
||||
+ if (ttyn) {
|
||||
+ if (strncmp(ttyn, "/dev/", 5) == 0)
|
||||
+ tty_name = ttyn+5;
|
||||
+ else
|
||||
+ tty_name = ttyn;
|
||||
+ retval = pam_set_item(pamh, PAM_TTY, tty_name);
|
||||
+ PAM_BAIL_P;
|
||||
+ }
|
||||
+ retval = pam_authenticate(pamh, 0);
|
||||
+ PAM_BAIL_P;
|
||||
+ retval = pam_acct_mgmt(pamh, 0);
|
||||
+ if (retval == PAM_NEW_AUTHTOK_REQD) {
|
||||
+ /* password has expired. Offer option to change it. */
|
||||
+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
|
||||
+ PAM_BAIL_P;
|
||||
+ }
|
||||
+ PAM_BAIL_P;
|
||||
+ /* must be authenticated if this point was reached */
|
||||
+ return 1;
|
||||
+#else /* !USE_PAM */
|
||||
char *unencrypted, *encrypted, *correct;
|
||||
#if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
|
||||
/* Shadow passwd stuff for SVR3 and maybe other systems. */
|
||||
@@ -257,6 +340,7 @@
|
||||
encrypted = crypt (unencrypted, correct);
|
||||
memset (unencrypted, 0, strlen (unencrypted));
|
||||
return STREQ (encrypted, correct);
|
||||
+#endif /* !USE_PAM */
|
||||
}
|
||||
|
||||
/* Update `environ' for the new shell based on PW, with SHELL being
|
||||
@@ -270,12 +354,18 @@
|
||||
/* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
|
||||
Unset all other environment variables. */
|
||||
char const *term = getenv ("TERM");
|
||||
+ char const *display = getenv ("DISPLAY");
|
||||
+ char const *xauthority = getenv ("XAUTHORITY");
|
||||
if (term)
|
||||
term = xstrdup (term);
|
||||
environ = xmalloc ((6 + !!term) * sizeof (char *));
|
||||
environ[0] = NULL;
|
||||
if (term)
|
||||
xsetenv ("TERM", term);
|
||||
+ if (display)
|
||||
+ xsetenv ("DISPLAY", display);
|
||||
+ if (xauthority)
|
||||
+ xsetenv ("XAUTHORITY", xauthority);
|
||||
xsetenv ("HOME", pw->pw_dir);
|
||||
xsetenv ("SHELL", shell);
|
||||
xsetenv ("USER", pw->pw_name);
|
||||
@@ -308,8 +398,13 @@
|
||||
{
|
||||
#ifdef HAVE_INITGROUPS
|
||||
errno = 0;
|
||||
- if (initgroups (pw->pw_name, pw->pw_gid) == -1)
|
||||
+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
|
||||
+#ifdef USE_PAM
|
||||
+ pam_close_session(pamh, 0);
|
||||
+ pam_end(pamh, PAM_ABORT);
|
||||
+#endif
|
||||
error (EXIT_FAILURE, errno, _("cannot set groups"));
|
||||
+ }
|
||||
endgrent ();
|
||||
#endif
|
||||
if (setgid (pw->pw_gid))
|
||||
@@ -318,6 +413,31 @@
|
||||
error (EXIT_FAILURE, errno, _("cannot set user id"));
|
||||
}
|
||||
|
||||
+#ifdef USE_PAM
|
||||
+static int caught=0;
|
||||
+/* Signal handler for parent process later */
|
||||
+static void su_catch_sig(int sig)
|
||||
+{
|
||||
+ ++caught;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+pam_copyenv (pam_handle_t *pamh)
|
||||
+{
|
||||
+ char **env;
|
||||
+
|
||||
+ env = pam_getenvlist(pamh);
|
||||
+ if(env) {
|
||||
+ while(*env) {
|
||||
+ if (putenv (*env))
|
||||
+ xalloc_die ();
|
||||
+ env++;
|
||||
+ }
|
||||
+ }
|
||||
+ return(0);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
|
||||
If COMMAND is nonzero, pass it to the shell with the -c option.
|
||||
Pass ADDITIONAL_ARGS to the shell as more arguments; there
|
||||
@@ -325,17 +445,49 @@
|
||||
|
||||
static void
|
||||
run_shell (char const *shell, char const *command, char **additional_args,
|
||||
- size_t n_additional_args)
|
||||
+ size_t n_additional_args, const struct passwd *pw)
|
||||
{
|
||||
size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
|
||||
char const **args = xnmalloc (n_args, sizeof *args);
|
||||
size_t argno = 1;
|
||||
+#ifdef USE_PAM
|
||||
+ int child;
|
||||
+ sigset_t ourset;
|
||||
+ int status;
|
||||
+
|
||||
+ retval = pam_open_session(pamh,0);
|
||||
+ if (retval != PAM_SUCCESS) {
|
||||
+ fprintf (stderr, "could not open session\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+/* do this at the last possible moment, because environment variables may
|
||||
+ be passed even in the session phase
|
||||
+*/
|
||||
+ if(pam_copyenv(pamh) != PAM_SUCCESS)
|
||||
+ fprintf (stderr, "error copying PAM environment\n");
|
||||
+
|
||||
+ /* Credentials should be set in the parent */
|
||||
+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
|
||||
+ pam_close_session(pamh, 0);
|
||||
+ fprintf(stderr, "could not set PAM credentials\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ child = fork();
|
||||
+ if (child == 0) { /* child shell */
|
||||
+ change_identity (pw);
|
||||
+ pam_end(pamh, 0);
|
||||
+#endif
|
||||
|
||||
if (simulate_login)
|
||||
{
|
||||
char *arg0;
|
||||
char *shell_basename;
|
||||
|
||||
+ if(chdir(pw->pw_dir))
|
||||
+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
|
||||
+
|
||||
shell_basename = last_component (shell);
|
||||
arg0 = xmalloc (strlen (shell_basename) + 2);
|
||||
arg0[0] = '-';
|
||||
@@ -360,6 +512,66 @@
|
||||
error (0, errno, "%s", shell);
|
||||
exit (exit_status);
|
||||
}
|
||||
+#ifdef USE_PAM
|
||||
+ } else if (child == -1) {
|
||||
+ fprintf(stderr, "can not fork user shell: %s", strerror(errno));
|
||||
+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
|
||||
+ pam_close_session(pamh, 0);
|
||||
+ pam_end(pamh, PAM_ABORT);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ /* parent only */
|
||||
+ sigfillset(&ourset);
|
||||
+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
|
||||
+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
|
||||
+ caught = 1;
|
||||
+ }
|
||||
+ if (!caught) {
|
||||
+ struct sigaction action;
|
||||
+ action.sa_handler = su_catch_sig;
|
||||
+ sigemptyset(&action.sa_mask);
|
||||
+ action.sa_flags = 0;
|
||||
+ sigemptyset(&ourset);
|
||||
+ if (sigaddset(&ourset, SIGTERM)
|
||||
+ || sigaddset(&ourset, SIGALRM)
|
||||
+ || sigaction(SIGTERM, &action, NULL)
|
||||
+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
|
||||
+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
|
||||
+ caught = 1;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!caught) {
|
||||
+ do {
|
||||
+ int pid;
|
||||
+
|
||||
+ pid = waitpid(-1, &status, WUNTRACED);
|
||||
+
|
||||
+ if (WIFSTOPPED(status)) {
|
||||
+ kill(getpid(), SIGSTOP);
|
||||
+ /* once we get here, we must have resumed */
|
||||
+ kill(pid, SIGCONT);
|
||||
+ }
|
||||
+ } while (WIFSTOPPED(status));
|
||||
+ }
|
||||
+
|
||||
+ if (caught) {
|
||||
+ fprintf(stderr, "\nSession terminated, killing shell...");
|
||||
+ kill (child, SIGTERM);
|
||||
+ }
|
||||
+ /* Not checking retval on this because we need to call close session */
|
||||
+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
|
||||
+ retval = pam_close_session(pamh, 0);
|
||||
+ PAM_BAIL_P_VOID;
|
||||
+ retval = pam_end(pamh, PAM_SUCCESS);
|
||||
+ PAM_BAIL_P_VOID;
|
||||
+ if (caught) {
|
||||
+ sleep(2);
|
||||
+ kill(child, SIGKILL);
|
||||
+ fprintf(stderr, " ...killed.\n");
|
||||
+ exit(-1);
|
||||
+ }
|
||||
+ exit (WEXITSTATUS(status));
|
||||
+#endif /* USE_PAM */
|
||||
}
|
||||
|
||||
/* Return true if SHELL is a restricted shell (one not returned by
|
||||
@@ -527,9 +739,9 @@
|
||||
shell = xstrdup (shell ? shell : pw->pw_shell);
|
||||
modify_environment (pw, shell);
|
||||
|
||||
+#ifndef USE_PAM
|
||||
change_identity (pw);
|
||||
- if (simulate_login && chdir (pw->pw_dir) != 0)
|
||||
- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
|
||||
+#endif
|
||||
|
||||
- run_shell (shell, command, argv + optind, MAX (0, argc - optind));
|
||||
+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
|
||||
}
|
||||
--- coreutils-6.7/doc/coreutils.texi.pam 2006-10-27 15:30:48.000000000 +0100
|
||||
+++ coreutils-6.7/doc/coreutils.texi 2007-01-09 17:00:01.000000000 +0000
|
||||
@@ -13395,8 +13395,11 @@
|
||||
@findex syslog
|
||||
@command{su} can optionally be compiled to use @code{syslog} to report
|
||||
failed, and optionally successful, @command{su} attempts. (If the system
|
||||
-supports @code{syslog}.) However, GNU @command{su} does not check if the
|
||||
-user is a member of the @code{wheel} group; see below.
|
||||
+supports @code{syslog}.)
|
||||
+
|
||||
+This version of @command{su} has support for using PAM for
|
||||
+authentication. You can edit @file{/etc/pam.d/su} to customize its
|
||||
+behaviour.
|
||||
|
||||
The program accepts the following options. Also see @ref{Common options}.
|
||||
|
||||
@@ -12815,6 +12815,8 @@
|
||||
@env{PATH} to a compiled-in default value. Change to @var{user}'s home
|
||||
directory. Prepend @samp{-} to the shell's name, intended to make it
|
||||
read its login startup file(s).
|
||||
+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables
|
||||
+are preserved as well for PAM functionality.
|
||||
|
||||
@item -m
|
||||
@itemx -p
|
||||
@@ -13477,33 +13480,6 @@
|
||||
the exit status of the subshell otherwise
|
||||
@end display
|
||||
|
||||
-@cindex wheel group, not supported
|
||||
-@cindex group wheel, not supported
|
||||
-@cindex fascism
|
||||
-@subsection Why GNU @command{su} does not support the @samp{wheel} group
|
||||
-
|
||||
-(This section is by Richard Stallman.)
|
||||
-
|
||||
-@cindex Twenex
|
||||
-@cindex MIT AI lab
|
||||
-Sometimes a few of the users try to hold total power over all the
|
||||
-rest. For example, in 1984, a few users at the MIT AI lab decided to
|
||||
-seize power by changing the operator password on the Twenex system and
|
||||
-keeping it secret from everyone else. (I was able to thwart this coup
|
||||
-and give power back to the users by patching the kernel, but I
|
||||
-wouldn't know how to do that in Unix.)
|
||||
-
|
||||
-However, occasionally the rulers do tell someone. Under the usual
|
||||
-@command{su} mechanism, once someone learns the root password who
|
||||
-sympathizes with the ordinary users, he or she can tell the rest. The
|
||||
-``wheel group'' feature would make this impossible, and thus cement the
|
||||
-power of the rulers.
|
||||
-
|
||||
-I'm on the side of the masses, not that of the rulers. If you are
|
||||
-used to supporting the bosses and sysadmins in whatever they do, you
|
||||
-might find this idea strange at first.
|
||||
-
|
||||
-
|
||||
@node timeout invocation
|
||||
@section @command{timeout}: Run a command with a time limit
|
||||
|
||||
--- coreutils-7.1/configure.ac.pam
|
||||
+++ coreutils-7.1/configure.ac
|
||||
@@ -44,6 +44,13 @@
|
||||
AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
|
||||
fi
|
||||
|
||||
+dnl Give the chance to enable PAM
|
||||
+AC_ARG_ENABLE(pam, dnl
|
||||
+[ --enable-pam Enable use of the PAM libraries],
|
||||
+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
|
||||
+LIB_PAM="-ldl -lpam -lpam_misc"
|
||||
+AC_SUBST(LIB_PAM)])
|
||||
+
|
||||
AC_FUNC_FORK
|
||||
|
||||
optional_bin_progs=
|
||||
|
|
@ -1,174 +0,0 @@
|
|||
On linux platforms, grok /proc/cpuinfo for the CPU/vendor info.
|
||||
|
||||
Prob not suitable for upstream seeing as how it's 100% linux-specific
|
||||
http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
|
||||
|
||||
Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but
|
||||
heavily reworked to suck less.
|
||||
|
||||
To add support for additional platforms, check out the show_cpuinfo()
|
||||
func in the linux/arch/<ARCH>/ source tree of the kernel.
|
||||
|
||||
diff -Naur coreutils-7.6-orig/src/uname.c coreutils-7.6/src/uname.c
|
||||
--- coreutils-7.6-orig/src/uname.c 2009-09-01 21:01:16.000000000 +1000
|
||||
+++ coreutils-7.6/src/uname.c 2009-09-13 22:30:19.000000000 +1000
|
||||
@@ -50,6 +50,11 @@
|
||||
# include <mach-o/arch.h>
|
||||
#endif
|
||||
|
||||
+#if defined (__linux__)
|
||||
+# define USE_PROCINFO
|
||||
+# define UNAME_HARDWARE_PLATFORM
|
||||
+#endif
|
||||
+
|
||||
#include "system.h"
|
||||
#include "error.h"
|
||||
#include "quote.h"
|
||||
@@ -155,6 +160,117 @@
|
||||
exit (status);
|
||||
}
|
||||
|
||||
+#if defined(USE_PROCINFO)
|
||||
+
|
||||
+# if defined(__s390__) || defined(__s390x__)
|
||||
+# define CPUINFO_FILE "/proc/sysinfo"
|
||||
+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c"
|
||||
+# else
|
||||
+# define CPUINFO_FILE "/proc/cpuinfo"
|
||||
+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c"
|
||||
+# endif
|
||||
+
|
||||
+# define PROCINFO_PROCESSOR 0
|
||||
+# define PROCINFO_HARDWARE_PLATFORM 1
|
||||
+
|
||||
+static void __eat_cpuinfo_space(char *buf)
|
||||
+{
|
||||
+ /* first eat trailing space */
|
||||
+ char *tmp = buf + strlen(buf) - 1;
|
||||
+ while (tmp > buf && isspace(*tmp))
|
||||
+ *tmp-- = '\0';
|
||||
+ /* then eat leading space */
|
||||
+ tmp = buf;
|
||||
+ while (*tmp && isspace(*tmp))
|
||||
+ tmp++;
|
||||
+ if (tmp != buf)
|
||||
+ memmove(buf, tmp, strlen(tmp)+1);
|
||||
+ /* finally collapse whitespace */
|
||||
+ tmp = buf;
|
||||
+ while (tmp[0] && tmp[1]) {
|
||||
+ if (isspace(tmp[0]) && isspace(tmp[1])) {
|
||||
+ memmove(tmp, tmp+1, strlen(tmp));
|
||||
+ continue;
|
||||
+ }
|
||||
+ ++tmp;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static int __linux_procinfo (int x, char *fstr, size_t s)
|
||||
+{
|
||||
+ FILE *fp;
|
||||
+
|
||||
+ char *procinfo_keys[] = {
|
||||
+ /* --processor --hardware-platform */
|
||||
+ #if defined(__alpha__)
|
||||
+ "cpu model", "system type"
|
||||
+ #elif defined(__arm__)
|
||||
+ "Processor", "Hardware"
|
||||
+ #elif defined(__avr32__)
|
||||
+ "processor", "cpu family"
|
||||
+ #elif defined(__bfin__)
|
||||
+ "CPU", "BOARD Name"
|
||||
+ #elif defined(__cris__)
|
||||
+ "cpu", "cpu model"
|
||||
+ #elif defined(__frv__)
|
||||
+ "CPU-Core", "System"
|
||||
+ #elif defined(__i386__) || defined(__x86_64__)
|
||||
+ "model name", "vendor_id"
|
||||
+ #elif defined(__ia64__)
|
||||
+ "family", "vendor"
|
||||
+ #elif defined(__hppa__)
|
||||
+ "cpu", "model"
|
||||
+ #elif defined(__m68k__)
|
||||
+ "CPU", "MMU"
|
||||
+ #elif defined(__mips__)
|
||||
+ "cpu model", "system type"
|
||||
+ #elif defined(__powerpc__) || defined(__powerpc64__)
|
||||
+ "cpu", "machine"
|
||||
+ #elif defined(__s390__) || defined(__s390x__)
|
||||
+ "Type", "Manufacturer"
|
||||
+ #elif defined(__sh__)
|
||||
+ "cpu type", "machine"
|
||||
+ #elif defined(sparc) || defined(__sparc__)
|
||||
+ "type", "cpu"
|
||||
+ #elif defined(__vax__)
|
||||
+ "cpu type", "cpu"
|
||||
+ #else
|
||||
+ "unknown", "unknown"
|
||||
+ #endif
|
||||
+ };
|
||||
+
|
||||
+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
|
||||
+ char key[65], value[257], eol, *ret = NULL;
|
||||
+
|
||||
+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
|
||||
+ __eat_cpuinfo_space(key);
|
||||
+ if (!strcmp(key, procinfo_keys[x])) {
|
||||
+ __eat_cpuinfo_space(value);
|
||||
+ ret = value;
|
||||
+ break;
|
||||
+ }
|
||||
+ if (eol != '\n') {
|
||||
+ /* we need two fscanf's here in case the previous
|
||||
+ * length limit caused us to read right up to the
|
||||
+ * newline ... doing "%*[^\n]\n" wont eat the newline
|
||||
+ */
|
||||
+ fscanf(fp, "%*[^\n]");
|
||||
+ fscanf(fp, "\n");
|
||||
+ }
|
||||
+ }
|
||||
+ fclose(fp);
|
||||
+
|
||||
+ if (ret) {
|
||||
+ strncpy(fstr, ret, s);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
/* Print ELEMENT, preceded by a space if something has already been
|
||||
printed. */
|
||||
|
||||
@@ -302,10 +418,14 @@
|
||||
if (toprint & PRINT_PROCESSOR)
|
||||
{
|
||||
char const *element = unknown;
|
||||
-#if HAVE_SYSINFO && defined SI_ARCHITECTURE
|
||||
+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
|
||||
{
|
||||
static char processor[257];
|
||||
+#if defined(USE_PROCINFO)
|
||||
+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
|
||||
+#else
|
||||
if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
|
||||
+#endif
|
||||
element = processor;
|
||||
}
|
||||
#endif
|
||||
@@ -358,9 +478,13 @@
|
||||
if (element == unknown)
|
||||
{
|
||||
static char hardware_platform[257];
|
||||
+#if defined(USE_PROCINFO)
|
||||
+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
|
||||
+#else
|
||||
size_t s = sizeof hardware_platform;
|
||||
static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
|
||||
if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
|
||||
+#endif
|
||||
element = hardware_platform;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(coreutils.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -1,16 +1,15 @@
|
|||
# $Id: PKGBUILD 48163 2009-07-31 20:55:39Z tpowa $
|
||||
# Maintainer: judd <jvinet@zeroflux.org>
|
||||
|
||||
pkgname=cpio
|
||||
pkgver=2.10
|
||||
pkgrel=1
|
||||
pkgdesc="A tool to copy files into or out of a cpio or tar archive"
|
||||
arch=(i686 x86_64)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://www.gnu.org/software/cpio"
|
||||
groups=('base')
|
||||
depends=('glibc')
|
||||
source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz)
|
||||
install=cpio.install
|
||||
md5sums=('351ab3d38d8949913e478cc23b9d6ad4')
|
||||
|
||||
build() {
|
||||
|
|
@ -21,9 +20,6 @@ build() {
|
|||
rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1
|
||||
mv ${pkgdir}/usr/bin ${pkgdir}/bin
|
||||
rm -rf ${pkgdir}/usr/libexec
|
||||
# remove mt manpage it conflicts with mt-st from extra
|
||||
rm $pkgdir/usr/share/man/man1/mt.1 || return 1
|
||||
# remove infodir
|
||||
rm $pkgdir/usr/share/info/dir
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
http://bugs.gentoo.org/198817
|
||||
|
||||
from upstream gnulib for "extern inline" changes
|
||||
|
||||
diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h
|
||||
index 93fa651..50f1387 100644
|
||||
--- a/lib/argp-fmtstream.h
|
||||
+++ b/lib/argp-fmtstream.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Word-wrapping and line-truncating streams.
|
||||
- Copyright (C) 1997, 2006 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 1997, 2006-2007 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||||
|
||||
@@ -134,6 +134,7 @@ extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs,
|
||||
const char *__fmt, ...)
|
||||
__attribute__ ((__format__ (printf, 2, 3)));
|
||||
|
||||
+#if _LIBC || !defined __OPTIMIZE__
|
||||
extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
|
||||
extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
|
||||
|
||||
@@ -144,6 +145,7 @@ extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
|
||||
const char *__str, size_t __len);
|
||||
extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
|
||||
const char *__str, size_t __len);
|
||||
+#endif
|
||||
|
||||
/* Access macros for various bits of state. */
|
||||
#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
|
||||
@@ -153,6 +155,7 @@ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
|
||||
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
|
||||
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
|
||||
|
||||
+#if _LIBC || !defined __OPTIMIZE__
|
||||
/* Set __FS's left margin to LMARGIN and return the old value. */
|
||||
extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
|
||||
size_t __lmargin);
|
||||
@@ -174,6 +177,7 @@ extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
|
||||
/* Return the column number of the current output point in __FS. */
|
||||
extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
|
||||
extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
|
||||
+#endif
|
||||
|
||||
/* Internal routines. */
|
||||
extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
|
||||
@@ -197,7 +201,28 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
|
||||
#endif
|
||||
|
||||
#ifndef ARGP_FS_EI
|
||||
-#define ARGP_FS_EI extern inline
|
||||
+# ifdef __GNUC__
|
||||
+ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
|
||||
+ inline semantics, unless -fgnu89-inline is used. It defines a macro
|
||||
+ __GNUC_STDC_INLINE__ to indicate this situation or a macro
|
||||
+ __GNUC_GNU_INLINE__ to indicate the opposite situation.
|
||||
+ GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
|
||||
+ semantics but warns, unless -fgnu89-inline is used:
|
||||
+ warning: C99 inline functions are not supported; using GNU89
|
||||
+ warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
|
||||
+ It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */
|
||||
+# if defined __GNUC_STDC_INLINE__
|
||||
+# define ARGP_FS_EI inline
|
||||
+# elif defined __GNUC_GNU_INLINE__
|
||||
+# define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
|
||||
+# else
|
||||
+# define ARGP_FS_EI extern inline
|
||||
+# endif
|
||||
+# else
|
||||
+ /* With other compilers, assume the ISO C99 meaning of 'inline', if
|
||||
+ the compiler supports 'inline' at all. */
|
||||
+# define ARGP_FS_EI inline
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
ARGP_FS_EI size_t
|
||||
diff --git a/lib/argp.h b/lib/argp.h
|
||||
index fb11de6..aa76eb4 100644
|
||||
--- a/lib/argp.h
|
||||
+++ b/lib/argp.h
|
||||
@@ -520,9 +520,11 @@ extern void __argp_state_help (const struct argp_state *__restrict __state,
|
||||
FILE *__restrict __stream,
|
||||
unsigned int __flags);
|
||||
|
||||
+#if _LIBC || !defined __USE_EXTERN_INLINES
|
||||
/* Possibly output the standard usage message for ARGP to stderr and exit. */
|
||||
extern void argp_usage (const struct argp_state *__state);
|
||||
extern void __argp_usage (const struct argp_state *__state);
|
||||
+#endif
|
||||
|
||||
/* If appropriate, print the printf string FMT and following args, preceded
|
||||
by the program name and `:', to stderr, and followed by a `Try ... --help'
|
||||
@@ -551,6 +553,7 @@ extern void __argp_failure (const struct argp_state *__restrict __state,
|
||||
const char *__restrict __fmt, ...)
|
||||
__attribute__ ((__format__ (__printf__, 4, 5)));
|
||||
|
||||
+#if _LIBC || !defined __USE_EXTERN_INLINES
|
||||
/* Returns true if the option OPT is a valid short option. */
|
||||
extern int _option_is_short (const struct argp_option *__opt) __THROW;
|
||||
extern int __option_is_short (const struct argp_option *__opt) __THROW;
|
||||
@@ -559,6 +562,7 @@ extern int __option_is_short (const struct argp_option *__opt) __THROW;
|
||||
options array. */
|
||||
extern int _option_is_end (const struct argp_option *__opt) __THROW;
|
||||
extern int __option_is_end (const struct argp_option *__opt) __THROW;
|
||||
+#endif
|
||||
|
||||
/* Return the input field for ARGP in the parser corresponding to STATE; used
|
||||
by the help routines. */
|
||||
@@ -579,7 +583,28 @@ extern void *__argp_input (const struct argp *__restrict __argp,
|
||||
# endif
|
||||
|
||||
# ifndef ARGP_EI
|
||||
-# define ARGP_EI extern __inline__
|
||||
+# ifdef __GNUC__
|
||||
+ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
|
||||
+ inline semantics, unless -fgnu89-inline is used. It defines a macro
|
||||
+ __GNUC_STDC_INLINE__ to indicate this situation or a macro
|
||||
+ __GNUC_GNU_INLINE__ to indicate the opposite situation.
|
||||
+ GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
|
||||
+ semantics but warns, unless -fgnu89-inline is used:
|
||||
+ warning: C99 inline functions are not supported; using GNU89
|
||||
+ warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
|
||||
+ It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */
|
||||
+# if defined __GNUC_STDC_INLINE__
|
||||
+# define ARGP_EI __inline__
|
||||
+# elif defined __GNUC_GNU_INLINE__
|
||||
+# define ARGP_EI extern __inline__ __attribute__ ((__gnu_inline__))
|
||||
+# else
|
||||
+# define ARGP_EI extern __inline__
|
||||
+# endif
|
||||
+# else
|
||||
+ /* With other compilers, assume the ISO C99 meaning of 'inline', if
|
||||
+ the compiler supports 'inline' at all. */
|
||||
+# define ARGP_EI inline
|
||||
+# endif
|
||||
# endif
|
||||
|
||||
ARGP_EI void
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(cpio.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
|
||||
pkgname=cracklib
|
||||
pkgver=2.8.13
|
||||
pkgrel=1
|
||||
pkgdesc="Password Checking Library"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://sourceforge.net/projects/cracklib"
|
||||
groups=('base')
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $Id: PKGBUILD 31190 2009-03-25 02:19:41Z dan $
|
||||
# Maintainer: Dan McGee <dan@archlinux.org>
|
||||
|
||||
pkgname=dash
|
||||
pkgver=0.5.5.1
|
||||
pkgrel=2
|
||||
pkgdesc="A POSIX compliant shell that aims to be as small as possible"
|
||||
arch=('i686' 'x86_64')
|
||||
arch=('arm')
|
||||
url="http://gondor.apana.org.au/~herbert/dash/"
|
||||
license=('BSD')
|
||||
groups=('base')
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=db
|
|||
pkgver=4.7.25
|
||||
pkgrel=1
|
||||
pkgdesc="The Berkeley DB embedded database system"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('custom')
|
||||
url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
|
||||
groups=('base')
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ post_upgrade() {
|
|||
echo "ATTENTION DB PACKAGE:"
|
||||
echo "Please consider to run db_upgrade on Berkeley DB databases with a major db version number update."
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
||||
# Contributor: Link Dupont <link@subpop.net>
|
||||
#
|
||||
|
||||
pkgname=dbus-core
|
||||
pkgver=1.2.14
|
||||
pkgrel=1
|
||||
pkgdesc="Freedesktop.org message bus system"
|
||||
url="http://www.freedesktop.org/Software/dbus"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL' 'custom')
|
||||
depends=('expat>=2.0' 'coreutils' 'filesystem')
|
||||
conflicts=('dbus<1.2.3-2')
|
||||
|
|
@ -14,7 +14,7 @@ options=(!libtool)
|
|||
groups=('base')
|
||||
install=dbus.install
|
||||
source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
|
||||
dbus)
|
||||
dbus)
|
||||
md5sums=('2c267ccd45d0b18db8c9edacad63ec98'
|
||||
'08f93dd19cffd1b45ab05c1fd4efb560')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# $Id: PKGBUILD 39021 2009-05-11 07:16:44Z tpowa $
|
||||
# Maintainer: judd <jvinet@zeroflux.org>
|
||||
|
||||
pkgname=dcron
|
||||
pkgver=3.2
|
||||
pkgrel=4
|
||||
pkgdesc="Dillon's Cron Daemon"
|
||||
arch=(i686 x86_64)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
groups=('base')
|
||||
url="http://apollo.backplane.com/FreeSrc/"
|
||||
|
|
@ -42,4 +42,3 @@ build() {
|
|||
install -D -m644 ../crond.logrotate $pkgdir/etc/logrotate.d/crond
|
||||
install -D -m755 ../run-cron $pkgdir/usr/sbin/run-cron
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pkgver=5.0.4
|
|||
pkgrel=1
|
||||
pkgdesc="RFC2131 compliant DHCP client daemon"
|
||||
url="http://roy.marples.name/dhcpcd/"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('BSD')
|
||||
#groups=('base')
|
||||
depends=('glibc' 'bash')
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
# $Id: PKGBUILD 41639 2009-06-06 06:27:06Z allan $
|
||||
# Maintainer: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
|
|
@ -7,7 +6,7 @@ pkgver=1.1_20080819
|
|||
_pkgver=1.1-20080819
|
||||
pkgrel=2
|
||||
pkgdesc="A tool to display dialog boxes from shell scripts"
|
||||
arch=('i686' 'x86_64')
|
||||
arch=('arm')
|
||||
url="http://invisible-island.net/dialog/"
|
||||
license=('GPL')
|
||||
groups=('base')
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=diffutils
|
|||
pkgver=2.8.1
|
||||
pkgrel=2
|
||||
pkgdesc="Utility programs used for creating patch files"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
groups=('base')
|
||||
url="http://www.gnu.org/software/diffutils"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(diff.info)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
# $Id: PKGBUILD 46313 2009-07-15 13:47:44Z tpowa $
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
|
||||
# Contributor: Urs Wolfer <uwolfer @ fwo.ch>
|
||||
|
||||
pkgname=dmraid
|
||||
pkgver=1.0.0.rc15
|
||||
|
|
@ -8,7 +7,7 @@ pkgrel=8
|
|||
pkgdesc="Device mapper RAID interface"
|
||||
url="http://people.redhat.com/~heinzm/sw/dmraid/"
|
||||
depends=(device-mapper)
|
||||
arch=('i686' 'x86_64')
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
source=(http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-$pkgver.tar.bz2
|
||||
dmraid-1.0.0.rc15-isw-raid10.patch
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=dropbear
|
|||
pkgver=0.52
|
||||
pkgrel=1
|
||||
pkgdesc="A small SSH Server/Client"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
url="http://matt.ucc.asn.au/dropbear/"
|
||||
license=('custom')
|
||||
groups=('small-base')
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu>
|
||||
Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
|
||||
Copyright (c) 2001 Alcove <http://www.alcove.com/>
|
||||
Copyright (c) 1997 Klee Dienes
|
||||
Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject
|
||||
to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
|
||||
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
|
||||
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
||||
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(libext2fs.info.gz)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
[defaults]
|
||||
base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
|
||||
blocksize = 4096
|
||||
inode_size = 128
|
||||
inode_ratio = 16384
|
||||
|
||||
[fs_types]
|
||||
small = {
|
||||
blocksize = 1024
|
||||
inode_size = 128
|
||||
inode_ratio = 4096
|
||||
}
|
||||
floppy = {
|
||||
blocksize = 1024
|
||||
inode_size = 128
|
||||
inode_ratio = 8192
|
||||
}
|
||||
news = {
|
||||
inode_ratio = 4096
|
||||
}
|
||||
largefile = {
|
||||
inode_ratio = 1048576
|
||||
}
|
||||
largefile4 = {
|
||||
inode_ratio = 4194304
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
2009-01-03 Eric Belanger <eric@archlinux.org>
|
||||
|
||||
* eventlog 0.2.9-1
|
||||
* Upstream update
|
||||
* Added ChangeLog
|
||||
|
|
@ -4,7 +4,7 @@ pkgname=eventlog
|
|||
pkgver=0.2.9
|
||||
pkgrel=1
|
||||
pkgdesc="A new API to format and send structured log messages"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
url="http://www.balabit.com/support/community/products/"
|
||||
license=('BSD')
|
||||
depends=('glibc')
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pkgname=expat
|
|||
pkgver=2.0.1
|
||||
pkgrel=2
|
||||
pkgdesc="An XML Parser library written in C"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('custom')
|
||||
depends=('glibc')
|
||||
options=('!libtool')
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=fakeroot
|
|||
pkgver=1.12.4
|
||||
pkgrel=1
|
||||
pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://packages.debian.org/fakeroot"
|
||||
groups=('base-devel')
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# arg 1: the new package version
|
||||
post_install() {
|
||||
if [ ! "`grep /usr/lib/libfakeroot etc/ld.so.conf`" ]; then
|
||||
echo -n "updating /etc/ld.so.conf... "
|
||||
echo "/usr/lib/libfakeroot" >>etc/ld.so.conf
|
||||
sbin/ldconfig -r .
|
||||
echo "done."
|
||||
fi
|
||||
echo "The package is built using sysv ipc. If this causes segfaults"
|
||||
echo "see included README file and rebuild the pkg --with-ipc=tcp"
|
||||
}
|
||||
|
||||
# arg 1: the new package version
|
||||
# arg 2: the old package version
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
# arg 1: the old package version
|
||||
pre_remove() {
|
||||
echo -ne "\nupdating /etc/ld.so.conf... "
|
||||
sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
|
||||
sbin/ldconfig -r .
|
||||
echo "done."
|
||||
}
|
||||
|
||||
op=$1
|
||||
shift
|
||||
|
||||
$op $*
|
||||
|
|
@ -19,6 +19,5 @@ build() {
|
|||
./configure --prefix=/usr --datadir=/usr/share/misc
|
||||
make || return 1
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ pkgname=filesystem
|
|||
pkgver=2009.01
|
||||
pkgrel=3
|
||||
pkgdesc="Base filesystem"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL')
|
||||
url="http://www.archlinux.org"
|
||||
groups=('base')
|
||||
install=filesystem.install
|
||||
#depends=('sh' 'coreutils')
|
||||
depends=('coreutils')
|
||||
backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
|
||||
etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf
|
||||
etc/shells etc/host.conf etc/securetty etc/profile etc/issue)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=findutils
|
|||
pkgver=4.4.0
|
||||
pkgrel=1
|
||||
pkgdesc="GNU utilities to locate files"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
license=('GPL3')
|
||||
groups=('base')
|
||||
depends=('glibc>=2.8')
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(find-maint.info find.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -4,7 +4,7 @@ pkgname=gettext
|
|||
pkgver=0.17
|
||||
pkgrel=4
|
||||
pkgdesc="GNU internationalization library"
|
||||
arch=(arm)
|
||||
arch=('arm')
|
||||
url="http://www.gnu.org/software/gettext"
|
||||
license=('GPL')
|
||||
groups=('base')
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
infodir=/usr/share/info
|
||||
filelist=(gettext.info.gz autosprintf.info.gz)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# $Id: PKGBUILD 37476 2009-05-02 05:13:41Z eric $
|
||||
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
pkgname=ipw2100-fw
|
||||
pkgver=1.3
|
||||
pkgrel=3
|
||||
pkgdesc="Intel Centrino Drivers firmware for IPW2100"
|
||||
arch=(i686 x86_64)
|
||||
url="http://ipw2100.sourceforge.net/"
|
||||
license=('custom')
|
||||
depends=('wireless_tools')
|
||||
replaces=('ipw2100')
|
||||
install=ipw2100-fw.install
|
||||
#source=(ipw2100-fw-1.3.tgz http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz)
|
||||
source=(http://bughost.org/firmware/$pkgname-$pkgver.tgz)
|
||||
|
||||
build() {
|
||||
#cd $startdir/src/$pkgname-$pkgver
|
||||
#make
|
||||
#Install kernel modules
|
||||
#for i in *.ko
|
||||
#do
|
||||
#install -D -m 644 $i $startdir/pkg/lib/modules/$(uname -r)/kernel/drivers/net/wireless/ipw2100/$i
|
||||
#done
|
||||
|
||||
cd $srcdir
|
||||
|
||||
# Install firmware
|
||||
for i in *.fw
|
||||
do
|
||||
install -D -m 644 $i $pkgdir/lib/firmware/$i || return 1
|
||||
done
|
||||
|
||||
# Install firmware license
|
||||
#install -D -m 644 LICENSE $startdir/pkg/lib/firmware/LICENSE.ipw2100-fw
|
||||
install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
md5sums=('46aa75bcda1a00efa841f9707bbbd113')
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# arg 1: the new package version
|
||||
post_install() {
|
||||
cat << EOF
|
||||
IMPORTANT
|
||||
==> In order to use the firmware you have to agree to Intel's license located in
|
||||
==> /usr/share/licenses/ipw2100-fw/LICENSE else please remove this package
|
||||
EOF
|
||||
}
|
||||
|
||||
# arg 1: the new package version
|
||||
# arg 2: the old package version
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
# $Id: PKGBUILD 34061 2009-04-06 11:36:21Z pierre $
|
||||
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
pkgname=ipw2200-fw
|
||||
pkgver=3.1
|
||||
pkgrel=1
|
||||
pkgdesc='firmware for the Intel PRO/Wireless 2200BG'
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://ipw2200.sourceforge.net/'
|
||||
license=('custom')
|
||||
depends=('wireless_tools')
|
||||
source=("http://bughost.org/firmware/${pkgname}-${pkgver}.tgz")
|
||||
install=ipw2200-fw.install
|
||||
replaces=('ipw2200')
|
||||
md5sums=('eaba788643c7cc7483dd67ace70f6e99')
|
||||
|
||||
build() {
|
||||
cd $srcdir/ipw2200-fw-$pkgver
|
||||
|
||||
for i in ipw*.fw; do
|
||||
install -D -m 644 $i $pkgdir/lib/firmware/$i
|
||||
done
|
||||
install -D -m 644 LICENSE.ipw2200-fw $pkgdir/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
post_install() {
|
||||
cat << EOF
|
||||
IMPORTANT
|
||||
==> In order to use the firmware you have to agree to Intel's license located in
|
||||
==> /usr/share/licenses/ipw2200-fw/LICENSE else please remove this package.
|
||||
EOF
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# $Id: PKGBUILD 31126 2009-03-24 13:01:52Z allan $
|
||||
# Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org>
|
||||
# Maintainer: dorphell <dorphell@archlinux.org>
|
||||
pkgname=isdn4k-utils
|
||||
pkgver=3.2p1
|
||||
pkgrel=5
|
||||
pkgdesc="User space administration programs and tools for ISDN"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.isdn4linux.de/"
|
||||
license=('GPL')
|
||||
depends=('ncurses')
|
||||
backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options})
|
||||
source=(ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${pkgname}.v${pkgver}.tar.bz2 \
|
||||
config gcc3.3-slashdev.patch gcc34.patch \
|
||||
http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/~checkout~/SPECS/isdn4k-utils/isdn4k-utils-gcc4.patch)
|
||||
md5sums=('d347afa462e46eccfd1284aebae227b6' '3429894039f33c114fef5ef9f866920e'\
|
||||
'32f94ab17f6c2a1d5ab72b8b07a175ea' 'd90d56e1ecfb9329ff09d651b85f5c55'\
|
||||
'7993f27b8d7239a35374da7d8f358cb9')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname
|
||||
export MAKEFLAGS="j1"
|
||||
patch -Np1 -i ../gcc3.3-slashdev.patch
|
||||
patch -Np1 -i ../gcc34.patch
|
||||
patch -Np1 -i ../isdn4k-utils-gcc4.patch
|
||||
cp ../config ./.config
|
||||
make subconfig || return 1
|
||||
make || return 1
|
||||
mkdir -p $pkgdir/sbin
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
#
|
||||
# Automatically generated by make menuconfig: don't edit
|
||||
#
|
||||
|
||||
#
|
||||
# Code maturity level options
|
||||
#
|
||||
# CONFIG_EXPERIMENTAL is not set
|
||||
|
||||
#
|
||||
# General configuration
|
||||
#
|
||||
# CONFIG_BUILDX11 is not set
|
||||
CONFIG_KERNELDIR='/usr/src/linux'
|
||||
CONFIG_BINDIR='/usr/bin'
|
||||
CONFIG_SBINDIR='/sbin'
|
||||
CONFIG_MANDIR='/usr/share/man'
|
||||
CONFIG_RUNDIR='/var/run'
|
||||
CONFIG_LOCKDIR='/var/lock'
|
||||
CONFIG_LOCKFILE='LCK..'
|
||||
CONFIG_I4LCONFDIR='/etc/isdn'
|
||||
CONFIG_CONFFILE='isdn.conf'
|
||||
CONFIG_CALLERIDFILE='callerid.conf'
|
||||
CONFIG_USERCONFFILE='~/.isdn'
|
||||
CONFIG_COUNTRYCODE='49'
|
||||
CONFIG_AREACODE=''
|
||||
CONFIG_COUNTRY_PREFIX='+'
|
||||
CONFIG_AREA_PREFIX='0'
|
||||
CONFIG_DATADIR='/usr/lib/isdn'
|
||||
|
||||
#
|
||||
# Runtime configuration tools
|
||||
#
|
||||
CONFIG_ISDNCTRL=y
|
||||
CONFIG_ISDNCTRL_CONF=y
|
||||
# CONFIG_ISDNCTRL_TIMRU is not set
|
||||
# CONFIG_IPROFD is not set
|
||||
# CONFIG_DIVERTCTRL is not set
|
||||
|
||||
#
|
||||
# Card configuration tools
|
||||
#
|
||||
CONFIG_HISAXCTRL=y
|
||||
CONFIG_ICNCTRL=y
|
||||
# CONFIG_ICNCTRL_DEBUG is not set
|
||||
CONFIG_PCBITCTL=y
|
||||
# CONFIG_AVMCAPICTRL is not set
|
||||
# CONFIG_EICONCTRL is not set
|
||||
|
||||
#
|
||||
# Tools for monitoring activity
|
||||
#
|
||||
CONFIG_IMON=y
|
||||
CONFIG_IMONTTY=y
|
||||
CONFIG_ISDNLOG=y
|
||||
|
||||
#
|
||||
# Options for isdnlog package
|
||||
#
|
||||
CONFIG_ISDNLOG_SERV_PORT=20011
|
||||
CONFIG_ISDNLOG_USERFILE='isdnlog.users'
|
||||
CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
|
||||
CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
|
||||
CONFIG_ISDNLOG_RELOADCMD='reload'
|
||||
CONFIG_ISDNLOG_STOPCMD='stop'
|
||||
CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
|
||||
CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
|
||||
CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
|
||||
# CONFIG_ISDNLOG_POSTGRES is not set
|
||||
# CONFIG_ISDNLOG_MYSQLDB is not set
|
||||
# CONFIG_ISDNLOG_ORACLE is not set
|
||||
CONFIG_ISDN_LOG_DE=y
|
||||
CONFIG_ISDN_LOG_CC_DE=y
|
||||
CONFIG_ISDN_LOG_DEST_DE=y
|
||||
CONFIG_ISDN_LOG_DEST_AT=y
|
||||
CONFIG_ISDN_LOG_DEST_NL=y
|
||||
CONFIG_ISDN_LOG_DEST_CH=y
|
||||
CONFIG_IPPPSTATS=y
|
||||
# CONFIG_XISDNLOAD is not set
|
||||
# CONFIG_XMONISDN is not set
|
||||
|
||||
#
|
||||
# Applications
|
||||
#
|
||||
# CONFIG_VBOX is not set
|
||||
CONFIG_IPPPD=y
|
||||
|
||||
#
|
||||
# Options for ipppd
|
||||
#
|
||||
# CONFIG_IPPPD_MSCHAP is not set
|
||||
# CONFIG_IPPPD_RADIUS is not set
|
||||
# CONFIG_RADIUS_WTMP_LOGGING is not set
|
||||
RADIUS_CLIENT_CONFIG_FILE=''
|
||||
|
||||
#
|
||||
# Documentation
|
||||
#
|
||||
CONFIG_GENMAN=y
|
||||
# CONFIG_FAQ is not set
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
diff -urN isdn4k-utils.orig/Makefile isdn4k-utils/Makefile
|
||||
--- isdn4k-utils.orig/Makefile 2003-07-11 14:13:04.000000000 +0200
|
||||
+++ isdn4k-utils/Makefile 2003-07-11 14:19:00.000000000 +0200
|
||||
@@ -132,12 +132,6 @@
|
||||
|
||||
install: rootperm
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
|
||||
- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
|
||||
- then \
|
||||
- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
|
||||
- else \
|
||||
- sh scripts/makedev.sh $(DESTDIR) ; \
|
||||
- fi
|
||||
|
||||
uninstall: rootperm
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
|
||||
diff -urN isdn4k-utils.orig/ipppd/options.c isdn4k-utils/ipppd/options.c
|
||||
--- isdn4k-utils.orig/ipppd/options.c 2003-07-11 14:13:05.000000000 +0200
|
||||
+++ isdn4k-utils/ipppd/options.c 2003-07-11 14:19:13.000000000 +0200
|
||||
@@ -479,26 +479,24 @@
|
||||
#define IMPLEMENTATION ""
|
||||
#endif
|
||||
|
||||
-static char *usage_string = "\
|
||||
-ipppd version %s patch level %d%s\n\
|
||||
-Usage: %s [ options ], where options are:\n\
|
||||
-\t<device> Communicate over the named device\n\
|
||||
+static char *usage_string = "ipppd version %s patch level %d%s\n"
|
||||
+"Usage: %s [ options ], where options are:\n"
|
||||
+"\t<device> Communicate over the named device\n"
|
||||
#ifdef INCLUDE_OBSOLETE_FEATURES
|
||||
-\tcrtscts Use hardware RTS/CTS flow control\n\
|
||||
-\t<speed> Set the baud rate to <speed>\n\
|
||||
-\tmodem Use modem control lines\n\
|
||||
+"\tcrtscts Use hardware RTS/CTS flow control\n"
|
||||
+"\t<speed> Set the baud rate to <speed>\n"
|
||||
+"\tmodem Use modem control lines\n"
|
||||
#endif
|
||||
-\t<loc>:<rem> Set the local and/or remote interface IP\n\
|
||||
-\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\
|
||||
-\tasyncmap <n> Set the desired async map to hex <n>\n\
|
||||
-\tauth Require authentication from peer\n\
|
||||
-\tconnect <p> Invoke shell command <p> to set up the serial line\n\
|
||||
-\tdefaultroute Add default route through interface\n\
|
||||
-\tfile <f> Take options from file <f>\n\
|
||||
-\tmru <n> Set MRU value to <n> for negotiation\n\
|
||||
-\tnetmask <n> Set interface netmask to <n>\n\
|
||||
-See ipppd(8) for more options.\n\
|
||||
-";
|
||||
+"\t<loc>:<rem> Set the local and/or remote interface IP\n"
|
||||
+"\t\t\taddresses. (you also may use the option 'useifip' to get IPs).\n"
|
||||
+"\tasyncmap <n> Set the desired async map to hex <n>\n"
|
||||
+"\tauth Require authentication from peer\n"
|
||||
+"\tconnect <p> Invoke shell command <p> to set up the serial line\n"
|
||||
+"\tdefaultroute Add default route through interface\n"
|
||||
+"\tfile <f> Take options from file <f>\n"
|
||||
+"\tmru <n> Set MRU value to <n> for negotiation\n"
|
||||
+"\tnetmask <n> Set interface netmask to <n>\n"
|
||||
+"See ipppd(8) for more options.\n";
|
||||
|
||||
static char *current_option; /* the name of the option being parsed */
|
||||
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
diff -Naur isdn4k-utils-orig/hisax/Makefile.in isdn4k-utils/hisax/Makefile.in
|
||||
--- isdn4k-utils-orig/hisax/Makefile.in 2002-07-19 12:03:51.000000000 -0700
|
||||
+++ isdn4k-utils/hisax/Makefile.in 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -30,7 +30,7 @@
|
||||
#.SUFFIXES:
|
||||
#.SUFFIXES: .c .o
|
||||
|
||||
-%.8: %.man
|
||||
+%.8: %.man.in
|
||||
cp $< $@
|
||||
|
||||
all: $(PROGRAMS) $(MANPAGES)
|
||||
diff -Naur isdn4k-utils-orig/isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in
|
||||
--- isdn4k-utils-orig/isdnlog/Makefile.in 2002-07-19 12:03:55.000000000 -0700
|
||||
+++ isdn4k-utils/isdnlog/Makefile.in 2004-07-11 10:55:47.000000000 -0700
|
||||
@@ -1842,9 +1842,6 @@
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
|
||||
echo Installing $(DESTDIR)$(DATADIR)/$$f; \
|
||||
done
|
||||
- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \
|
||||
- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \
|
||||
- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE))
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \
|
||||
diff -Naur isdn4k-utils-orig/isdnlog/isdnlog/isdnlog.h isdn4k-utils/isdnlog/isdnlog/isdnlog.h
|
||||
--- isdn4k-utils-orig/isdnlog/isdnlog/isdnlog.h 2001-06-21 09:34:56.000000000 -0700
|
||||
+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.h 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -460,7 +460,7 @@
|
||||
|
||||
_EXTERN void dotrace(void);
|
||||
_EXTERN int morectrl(int card);
|
||||
-_EXTERN void moreinfo(void);
|
||||
+extern void moreinfo(void);
|
||||
_EXTERN void morekbd(void);
|
||||
_EXTERN void processcint(void);
|
||||
_EXTERN void processflow(void);
|
||||
diff -Naur isdn4k-utils-orig/isdnlog/isdnlog/processor.c isdn4k-utils/isdnlog/isdnlog/processor.c
|
||||
--- isdn4k-utils-orig/isdnlog/isdnlog/processor.c 2002-04-01 10:06:10.000000000 -0800
|
||||
+++ isdn4k-utils/isdnlog/isdnlog/processor.c 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -5293,7 +5293,7 @@
|
||||
tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */
|
||||
|
||||
if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */
|
||||
- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */
|
||||
+ /*static void moreinfo(); */ /* soviel zu Objektorientiertem Denken ;-) */
|
||||
moreinfo();
|
||||
} /* if */
|
||||
|
||||
diff -Naur isdn4k-utils-orig/isdnlog/tools/cdb/cdbmake.c isdn4k-utils/isdnlog/tools/cdb/cdbmake.c
|
||||
--- isdn4k-utils-orig/isdnlog/tools/cdb/cdbmake.c 2002-02-22 03:10:25.000000000 -0800
|
||||
+++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -3,8 +3,6 @@
|
||||
#include "freecdbmake.h"
|
||||
#include <unistd.h>
|
||||
|
||||
-extern char *malloc();
|
||||
-
|
||||
void diesys(why) char *why; { perror(why); exit(111); }
|
||||
|
||||
void writeerror() { diesys("cdbmake: fatal: unable to write"); }
|
||||
diff -Naur isdn4k-utils-orig/isdnlog/tools/rate.c isdn4k-utils/isdnlog/tools/rate.c
|
||||
--- isdn4k-utils-orig/isdnlog/tools/rate.c 2002-07-05 16:22:33.000000000 -0700
|
||||
+++ isdn4k-utils/isdnlog/tools/rate.c 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -1773,6 +1773,7 @@
|
||||
number=realloc(number, numbers*sizeof(int));
|
||||
number[numbers-1]=i;
|
||||
skip:
|
||||
+ ;
|
||||
}
|
||||
|
||||
while (isblank(*s)) s++;
|
||||
@@ -2344,6 +2345,7 @@
|
||||
}
|
||||
return UNKNOWN;
|
||||
done:
|
||||
+ ;
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -Naur isdn4k-utils-orig/lib/libtools.c isdn4k-utils/lib/libtools.c
|
||||
--- isdn4k-utils-orig/lib/libtools.c 1999-11-03 08:13:36.000000000 -0800
|
||||
+++ isdn4k-utils/lib/libtools.c 2004-07-11 10:55:34.000000000 -0700
|
||||
@@ -711,6 +711,7 @@
|
||||
case 'r': _mode |= R_OK;
|
||||
break;
|
||||
default :
|
||||
+ ;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
--- ./eicon/eiconctrl.c.gcc4 2001-03-01 15:59:12.000000000 +0100
|
||||
+++ ./eicon/eiconctrl.c 2005-07-21 19:37:33.000000000 +0200
|
||||
@@ -1970,7 +1970,7 @@
|
||||
val = strtol(p, &q, 16);
|
||||
p = q;
|
||||
val = strtol(p, &q, 16);
|
||||
- (unsigned short) *buffer = (unsigned short) val;
|
||||
+ *buffer = (unsigned short) val;
|
||||
pos = 2;
|
||||
while ((p != q) && (*q != 0)) {
|
||||
p = q;
|
||||
--- ./hisax/hisaxctrl.c.gcc4 2000-06-29 19:38:26.000000000 +0200
|
||||
+++ ./hisax/hisaxctrl.c 2005-07-21 19:21:41.000000000 +0200
|
||||
@@ -43,7 +43,8 @@
|
||||
fprintf(stderr, "cannot open file %s\n", fname);
|
||||
exit(-1);
|
||||
}
|
||||
- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4);
|
||||
+ buffer = (unsigned char *) malloc(MAX_SIZE+4);
|
||||
+ p = (int *) buffer;
|
||||
if (!buffer) {
|
||||
fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4);
|
||||
exit(-1);
|
||||
--- ./ipppd/main.c.gcc4 2002-07-18 02:06:21.000000000 +0200
|
||||
+++ ./ipppd/main.c 2005-07-21 19:39:38.000000000 +0200
|
||||
@@ -1041,9 +1041,14 @@
|
||||
static char line[256]; /* line to be logged accumulated here */
|
||||
static char *linep;
|
||||
|
||||
+#ifdef __STDC__
|
||||
+static void pr_log(void *arg, char *fmt, ...);
|
||||
+#else /* __STDC__ */
|
||||
+static void pr_log(arg, fmt, va_alist);
|
||||
+#endif
|
||||
+
|
||||
void log_packet(u_char *p,int len,char *prefix,int linkunit)
|
||||
{
|
||||
- static void pr_log __P((void *, char *, ...));
|
||||
|
||||
int i, n;
|
||||
u_short proto;
|
||||
--- ./isdnlog/tools/isdnrate.c.gcc4 2002-08-15 19:22:43.000000000 +0200
|
||||
+++ ./isdnlog/tools/isdnrate.c 2005-07-21 19:14:24.000000000 +0200
|
||||
@@ -309,7 +309,7 @@
|
||||
|
||||
static void print_header(void);
|
||||
|
||||
-static char *myname, *myshortname;
|
||||
+char *myname, *myshortname;
|
||||
static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z";
|
||||
static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n";
|
||||
|
||||
@@ -318,7 +318,7 @@
|
||||
static int usestat = 0;
|
||||
static int duration = LCR_DURATION;
|
||||
static time_t start;
|
||||
-static int day, month, year, hour, min, sec;
|
||||
+int day, month, year, hour, min, sec;
|
||||
static char ignore[MAXPROVIDER];
|
||||
static char *fromarea = 0;
|
||||
static char wanted_day;
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# $Id: PKGBUILD 45393 2009-07-10 22:23:58Z thomas $
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgname=iw
|
||||
pkgver=0.9.15
|
||||
pkgrel=1
|
||||
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
|
||||
arch=("i686" "x86_64")
|
||||
url="http://wireless.kernel.org/en/users/Documentation/iw"
|
||||
license=("GPL")
|
||||
depends=("libnl")
|
||||
makedepends=("kernel-headers")
|
||||
source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
|
||||
md5sums=('98ba12eceec5a4ae8aa2d51abd56fa14')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
make || return 1
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# $Id: PKGBUILD 39416 2009-05-16 12:09:55Z thomas $
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgname=iwlwifi-3945-ucode
|
||||
pkgver=15.32.2.9
|
||||
pkgrel=1
|
||||
pkgdesc="Intel wireless firmware for Intel PRO/Wireless 3945ABG/BG"
|
||||
arch=(i686 x86_64)
|
||||
url="http://intellinuxwireless.org/?p=iwlwifi"
|
||||
license=('custom')
|
||||
depends=()
|
||||
source=(http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-$pkgver.tgz)
|
||||
md5sums=('d99a75ab1305d1532a09471b2f9a547a')
|
||||
|
||||
build() {
|
||||
cd $startdir/src/$pkgname-$pkgver
|
||||
# Install API version 2 firmware
|
||||
install -D -m 644 iwlwifi-3945-2.ucode $startdir/pkg/lib/firmware/iwlwifi-3945-2.ucode || return 1
|
||||
# Install license
|
||||
install -D -m 644 LICENSE.iwlwifi-3945-ucode $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# $Id: PKGBUILD 45370 2009-07-10 08:57:42Z thomas $
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgname=iwlwifi-4965-ucode
|
||||
pkgver=228.61.2.24
|
||||
pkgrel=1
|
||||
pkgdesc="Intel wireless firmware for IPW4965 (iwlwifi driver)"
|
||||
arch=(i686 x86_64)
|
||||
url="http://intellinuxwireless.org/?p=iwlwifi"
|
||||
license=('custom')
|
||||
depends=()
|
||||
source=(http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-$pkgver.tgz)
|
||||
md5sums=('2531028773cfc22aca5539c734f2a241')
|
||||
|
||||
build() {
|
||||
cd $startdir/src/$pkgname-$pkgver
|
||||
# Install firmware (ABI version 2, for future versions of iwl4965)
|
||||
install -D -m 644 iwlwifi-4965-2.ucode $startdir/pkg/lib/firmware/iwlwifi-4965-2.ucode || return 1
|
||||
# Install license
|
||||
install -D -m 644 LICENSE.iwlwifi-4965-ucode $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# $Id: PKGBUILD 4445 2008-07-07 12:03:31Z thomas $
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgname=iwlwifi-5000-ucode
|
||||
pkgver=8.24.2.12
|
||||
_old_pkgver=5.4.A.11
|
||||
pkgrel=1
|
||||
pkgdesc="Intel wireless firmware for Intel's 5100BG, 5100ABG, 5100AGN, 5300AGN and 5350AGN wireless devices"
|
||||
arch=(i686 x86_64)
|
||||
url="http://intellinuxwireless.org/?p=iwlwifi"
|
||||
license=('custom')
|
||||
depends=()
|
||||
source=(http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-$pkgver.tgz
|
||||
http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-${_old_pkgver}.tar.gz)
|
||||
md5sums=('45f74d052d52f6f473dc7a8d412f2274'
|
||||
'748860c5079dde1a1313e72511b9322a')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-${_old_pkgver}
|
||||
# Install API version 1 firmware
|
||||
install -D -m 644 iwlwifi-5000-1.ucode $pkgdir/lib/firmware/iwlwifi-5000-1.ucode || return 1
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
# Install firmware
|
||||
install -D -m 644 iwlwifi-5000-2.ucode $pkgdir/lib/firmware/iwlwifi-5000-2.ucode || return 1
|
||||
# Install license
|
||||
install -D -m 644 LICENSE.iwlwifi-5000-ucode $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# $Id: PKGBUILD 4445 2008-07-07 12:03:31Z thomas $
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgname=iwlwifi-5150-ucode
|
||||
pkgver=8.24.2.2
|
||||
pkgrel=1
|
||||
pkgdesc="Intel wireless firmware for Intel Wireless WiFi 5150AGN"
|
||||
arch=(i686 x86_64)
|
||||
url="http://intellinuxwireless.org/?p=iwlwifi"
|
||||
license=('custom')
|
||||
depends=()
|
||||
source=(http://intellinuxwireless.org/iwlwifi/downloads/${pkgname}-${pkgver}.tgz)
|
||||
md5sums=('f9cee16e455e8046b1bf62c93f882d5d')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
# Install firmware
|
||||
install -D -m 644 iwlwifi-5150-2.ucode ${pkgdir}/lib/firmware/iwlwifi-5150-2.ucode || return 1
|
||||
# Install license
|
||||
install -D -m 644 LICENSE.iwlwifi-5150-ucode ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# $Id: PKGBUILD 42104 2009-06-11 10:03:49Z tpowa $
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Maintainer: Thomas Baechler <thomas@archlinux.org>
|
||||
pkgname=kernel26-firmware
|
||||
pkgver=2.6.30
|
||||
pkgrel=1
|
||||
pkgdesc="The included firmware files of the Linux Kernel"
|
||||
arch=(i686 x86_64)
|
||||
license=('GPL2')
|
||||
groups=('base')
|
||||
url="http://www.kernel.org"
|
||||
depends=()
|
||||
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver.tar.bz2
|
||||
config
|
||||
config.x86_64)
|
||||
options=(!makeflags)
|
||||
md5sums=('7a80058a6382e5108cdb5554d1609615'
|
||||
'aa331c2ce467437e7cc39006bc1bb6e5'
|
||||
'8563d05c70dcc44a954215984087a517')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/linux-$pkgver
|
||||
if [ "$CARCH" = "x86_64" ]; then
|
||||
cat ../config.x86_64 >./.config
|
||||
else
|
||||
cat ../config >./.config
|
||||
fi
|
||||
make firmware || return 1
|
||||
make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,180 +0,0 @@
|
|||
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
|
||||
|
||||
pkgname=kernel26-lts
|
||||
_kernelname=${pkgname#kernel26}
|
||||
_basekernel=2.6.27
|
||||
pkgver=${_basekernel}.35
|
||||
pkgrel=1
|
||||
pkgdesc="The Linux Kernel and modules - stable longtime supported kernel package suitable for servers"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL2')
|
||||
url="http://www.kernel.org"
|
||||
backup=(etc/mkinitcpio.d/${pkgname}.preset)
|
||||
depends=('coreutils' 'kernel26-firmware>=2.6.27' 'module-init-tools' 'mkinitcpio>=0.5.20')
|
||||
install=${pkgname}.install
|
||||
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
|
||||
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
|
||||
# the main kernel config files
|
||||
config config.x86_64
|
||||
# standard config files for mkinitcpio ramdisk
|
||||
${pkgname}.preset
|
||||
# ext4 patches from Fedora
|
||||
#http://cvs.fedoraproject.org/viewvc/rpms/kernel/F-10/?pathrev=kernel-2_6_27_29-170_2_79_fc10
|
||||
linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
|
||||
linux-2.6.27.9-ext4-cap-check-delay.patch)
|
||||
md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
|
||||
'6d49b54ff6ed54896db5d9e2ab7a6c0c'
|
||||
'4e11657846beba397a004e81fa70ec9d'
|
||||
'8390d0e61bbe4873cc690160b1e0a346'
|
||||
'a13338958d1b241f8dfd4c6014cad3d4'
|
||||
'659953c9c437d311bf93eff505ef8e67'
|
||||
'8cd12e9727d9221aacfa52ad9b9a42f9')
|
||||
|
||||
build() {
|
||||
KARCH=x86
|
||||
|
||||
cd ${srcdir}/linux-$_basekernel
|
||||
if [ "$_basekernel" != "$pkgver" ]; then
|
||||
# add latest kernel stable patch
|
||||
patch -Np1 -i ${srcdir}/patch-$pkgver
|
||||
fi
|
||||
|
||||
# add full ext4 support
|
||||
patch -Np1 -i ${srcdir}/linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/linux-2.6.27.9-ext4-cap-check-delay.patch || return 1
|
||||
|
||||
if [ "$CARCH" = "x86_64" ]; then
|
||||
cat ../config.x86_64 >./.config
|
||||
else
|
||||
cat ../config >./.config
|
||||
fi
|
||||
if [ "${_kernelname}" != "" ]; then
|
||||
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
|
||||
fi
|
||||
# get kernel version
|
||||
make prepare
|
||||
_kernver="$(make kernelrelease)"
|
||||
# load configuration
|
||||
# Configure the kernel. Replace the line below with one of your choice.
|
||||
#make menuconfig # CLI menu for configuration
|
||||
#make xconfig # X-based configuration
|
||||
#make oldconfig # using old config from previous kernel version
|
||||
# ... or manually edit .config
|
||||
####################
|
||||
# stop here
|
||||
# this is useful to configure the kernel
|
||||
#msg "Stopping build"
|
||||
# return 1
|
||||
####################
|
||||
yes "" | make config
|
||||
# build!
|
||||
make bzImage modules || return 1
|
||||
mkdir -p ${pkgdir}/{lib/modules,boot}
|
||||
make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
|
||||
cp System.map ${pkgdir}/boot/System.map26${_kernelname}
|
||||
cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
|
||||
install -D -m644 Makefile \
|
||||
${pkgdir}/usr/src/linux-${_kernver}/Makefile
|
||||
install -D -m644 kernel/Makefile \
|
||||
${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile
|
||||
install -D -m644 .config \
|
||||
${pkgdir}/usr/src/linux-${_kernver}/.config
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
|
||||
|
||||
for i in acpi asm-{generic,x86} config linux math-emu media net pcmcia scsi sound video; do
|
||||
cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
|
||||
done
|
||||
|
||||
# copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver}
|
||||
cp -a scripts ${pkgdir}/usr/src/linux-${_kernver}
|
||||
# fix permissions on scripts dir
|
||||
chmod og-w -R ${pkgdir}/usr/src/linux-${_kernver}/scripts
|
||||
#mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions
|
||||
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel
|
||||
|
||||
cp arch/$KARCH/Makefile ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
||||
if [ "$CARCH" = "i686" ]; then
|
||||
cp arch/$KARCH/Makefile_32.cpu ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
||||
fi
|
||||
cp arch/$KARCH/kernel/asm-offsets.s ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
|
||||
|
||||
# add headers for lirc package
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video
|
||||
cp drivers/media/video/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/
|
||||
for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo zc0301; do
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
|
||||
cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
|
||||
done
|
||||
# add docbook makefile
|
||||
install -D -m644 Documentation/DocBook/Makefile \
|
||||
${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile
|
||||
# add dm headers
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
|
||||
cp drivers/md/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
|
||||
# add inotify.h
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/linux
|
||||
cp include/linux/inotify.h ${pkgdir}/usr/src/linux-${_kernver}/include/linux/
|
||||
# add wireless headers
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
|
||||
cp net/mac80211/*.h ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
|
||||
# add dvb headers for external modules
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/9912
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core
|
||||
cp drivers/media/dvb/dvb-core/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/
|
||||
# add dvb headers for external modules
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/11194
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/13146
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
|
||||
cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
|
||||
cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
|
||||
# add xfs and shmem for aufs building
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
|
||||
cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
|
||||
# add headers vor virtualbox
|
||||
# in reference to:
|
||||
# http://bugs.archlinux.org/task/14568
|
||||
cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
|
||||
|
||||
|
||||
# add vmlinux
|
||||
cp vmlinux ${pkgdir}/usr/src/linux-${_kernver}
|
||||
# copy in Kconfig files
|
||||
for i in `find . -name "Kconfig*"`; do
|
||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
|
||||
cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i
|
||||
done
|
||||
|
||||
cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
|
||||
|
||||
chown -R root.root ${pkgdir}/usr/src/linux-${_kernver}
|
||||
find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
|
||||
cd ${pkgdir}/lib/modules/${_kernver} && \
|
||||
(rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
|
||||
# install fallback mkinitcpio.conf file and preset file for kernel
|
||||
install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset || return 1
|
||||
# set correct depmod command for install
|
||||
sed \
|
||||
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
|
||||
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
|
||||
-i $startdir/${pkgname}.install
|
||||
sed \
|
||||
-e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \
|
||||
-e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \
|
||||
-e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \
|
||||
-i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
|
||||
|
||||
echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.kver
|
||||
# remove unneeded architectures
|
||||
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
|
||||
# remove the firmware
|
||||
rm -rf ${pkgdir}/lib/firmware
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,142 +0,0 @@
|
|||
# arg 1: the new package version
|
||||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-lts
|
||||
KERNEL_VERSION=2.6.27.35-lts
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod $KERNEL_VERSION
|
||||
# generate init ramdisks
|
||||
echo ">>> MKINITCPIO SETUP"
|
||||
echo ">>> ----------------"
|
||||
echo ">>> If you use LVM2, Encrypted root or software RAID,"
|
||||
echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ."
|
||||
echo ">>> More information about mkinitcpio setup can be found here:"
|
||||
echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio"
|
||||
echo ""
|
||||
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME}
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
pacman -Q grub &>/dev/null
|
||||
hasgrub=$?
|
||||
pacman -Q grub2 &>/dev/null
|
||||
hasgrub2=$?
|
||||
pacman -Q lilo &>/dev/null
|
||||
haslilo=$?
|
||||
# reminder notices
|
||||
if [ $haslilo -eq 0 ]; then
|
||||
echo ">>>"
|
||||
if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
|
||||
echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
|
||||
else
|
||||
echo ">>> You appear to be using the LILO bootloader. You should run"
|
||||
echo ">>> 'lilo' before rebooting."
|
||||
fi
|
||||
echo ">>>"
|
||||
fi
|
||||
|
||||
if grep "/boot" /etc/fstab 2>&1 >/dev/null; then
|
||||
if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then
|
||||
echo "WARNING: /boot appears to be a seperate partition but is not mounted"
|
||||
echo " This is most likely not what you want. Please mount your /boot"
|
||||
echo " partition and reinstall the kernel unless you are sure this is OK"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "`vercmp $2 2.6.13`" -lt 0 ]; then
|
||||
# important upgrade notice
|
||||
echo ">>>"
|
||||
echo ">>> IMPORTANT KERNEL UPGRADE NOTICE"
|
||||
echo ">>> -------------------------------"
|
||||
echo ">>> As of kernel 2.6.13, DevFS is NO LONGER AVAILABLE!"
|
||||
echo ">>> If you still use DevFS, please make the transition to uDev before"
|
||||
echo ">>> rebooting. If you really need to stay with DevFS for some reason,"
|
||||
echo ">>> then you can manually downgrade to an older version:"
|
||||
echo ">>>"
|
||||
echo ">>> # pacman -U http://archlinux.org/~judd/kernel/kernel26-scsi-2.6.12.2-1.pkg.tar.gz"
|
||||
echo ">>>"
|
||||
echo ">>> If you choose to downgrade, don't forget to add kernel26-scsi to your"
|
||||
echo ">>> IgnorePkg list in /etc/pacman.conf"
|
||||
echo ">>>"
|
||||
echo ">>> (NOTE: The following portion applies to uDev users as well!)"
|
||||
echo ">>>"
|
||||
echo ">>> If you use any DevFS paths in your GRUB menu.lst, then you will not"
|
||||
echo ">>> be able to boot! Change your root= parameter to use the classic"
|
||||
echo ">>> naming scheme."
|
||||
echo ">>>"
|
||||
echo ">>> EXAMPLES:"
|
||||
echo ">>> - change root=/dev/discs/disc0/part3 to root=/dev/sda3"
|
||||
echo ">>> - change root=/dev/md/0 to root=/dev/md0"
|
||||
echo ">>>"
|
||||
fi
|
||||
# generate new init ramdisk
|
||||
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
|
||||
echo ">>> --------------------------------------------------------------"
|
||||
echo ">>> | WARNING: |"
|
||||
echo ">>> |mkinitrd is not supported anymore in kernel >=2.6.18 series!|"
|
||||
echo ">>> | Please change to Mkinitcpio setup. |"
|
||||
echo ">>> --------------------------------------------------------------"
|
||||
echo ">>>"
|
||||
fi
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod $KERNEL_VERSION
|
||||
echo ">>> MKINITCPIO SETUP"
|
||||
echo ">>> ----------------"
|
||||
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
|
||||
echo ">>> Please change your bootloader config files:"
|
||||
echo ">>> Grub: /boot/grub/menu.lst | Lilo: /etc/lilo.conf"
|
||||
echo "------------------------------------------------"
|
||||
echo "| - initrd26.img to kernel26${KERNEL_NAME}.img |"
|
||||
echo "| - initrd26-full.img to kernel26${KERNEL_NAME}-fallback.img |"
|
||||
echo "------------------------------------------------"
|
||||
fi
|
||||
if [ "`vercmp $2 2.6.19`" -lt 0 ]; then
|
||||
echo ""
|
||||
echo ">>> New PATA/IDE subsystem - EXPERIMENTAL"
|
||||
echo ">>> ----------"
|
||||
echo ">>> To use the new pata drivers, change the 'ide' hook "
|
||||
echo ">>> to 'pata' in /etc/mkinicpio.conf HOOKS="
|
||||
echo ">>> The new system changes: /dev/hd? to /dev/sd?"
|
||||
echo ">>> Don't forget to modify GRUB, LILO and fstab to the"
|
||||
echo ">>> new naming system. "
|
||||
echo ">>> eg: hda3 --> sda3, hdc8 --> sdc8"
|
||||
echo ""
|
||||
echo ">>> piix/ata_piix (Intel chipsets) - IMPORTANT"
|
||||
echo "----------"
|
||||
echo ">>> If you have enabled ide/pata/sata HOOKs in /etc/mkinitcpio.conf"
|
||||
echo ">>> the 'ata_piix' module will be used."
|
||||
echo ">>> This may cause your devices to shift names, eg:"
|
||||
echo ">>> - IDE: devices from hd? to sd?"
|
||||
echo ">>> - SATA: sda might shift to sdc if you have 2 other disks on a PIIX IDE port."
|
||||
echo ">>> To check if this will affect you, check 'mkinitcpio -M' for piix/ata_piix"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echo ">>> If you use LVM2, Encrypted root or software RAID,"
|
||||
echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ."
|
||||
echo ">>> More information about mkinitcpio setup can be found here:"
|
||||
echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio"
|
||||
echo ""
|
||||
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
|
||||
if [ "`vercmp $2 2.6.19`" -lt 0 ]; then
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME} -m "ATTENTION:\nIf you get a kernel panic below
|
||||
and are using an Intel chipset, append 'earlymodules=piix' to the
|
||||
kernel commandline"
|
||||
else
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME}
|
||||
fi
|
||||
if [ "`vercmp $2 2.6.21`" -lt 0 ]; then
|
||||
echo ""
|
||||
echo "Important ACPI Information:"
|
||||
echo ">>> Since 2.6.20.7 all possible ACPI parts are modularized."
|
||||
echo ">>> The modules are located at:"
|
||||
echo ">>> /lib/modules/$(uname -r)/kernel/drivers/acpi"
|
||||
echo ">>> For more information about ACPI modules check this wiki page:"
|
||||
echo ">>> 'http://wiki.archlinux.org/index.php/ACPI_modules'"
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
# mkinitcpio preset file for kernel26
|
||||
|
||||
########################################
|
||||
# DO NOT EDIT THIS LINE:
|
||||
source /etc/mkinitcpio.d/kernel26-lts.kver
|
||||
########################################
|
||||
ALL_config="/etc/mkinitcpio.conf"
|
||||
|
||||
PRESETS=('default' 'fallback')
|
||||
|
||||
#default_config="/etc/mkinitcpio.conf"
|
||||
default_image="/boot/kernel26-lts.img"
|
||||
#default_options=""
|
||||
|
||||
#fallback_config="/etc/mkinitcpio.conf"
|
||||
fallback_image="/boot/kernel26--lts-fallback.img"
|
||||
fallback_options="-S autodetect"
|
||||
|
|
@ -1,595 +0,0 @@
|
|||
From: Theodore Ts'o <tytso@mit.edu>
|
||||
Date: Sat, 11 Oct 2008 00:02:48 +0000 (-0400)
|
||||
Subject: ext4: Rename ext4dev to ext4
|
||||
X-Git-Tag: v2.6.28-rc1~709^2
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=03010a3350301baac2154fa66de925ae2981b7e3
|
||||
|
||||
ext4: Rename ext4dev to ext4
|
||||
|
||||
The ext4 filesystem is getting stable enough that it's time to drop
|
||||
the "dev" prefix. Also remove the requirement for the TEST_FILESYS
|
||||
flag.
|
||||
|
||||
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
||||
---
|
||||
|
||||
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
|
||||
index 2890579..74484e6 100644
|
||||
--- a/Documentation/filesystems/ext4.txt
|
||||
+++ b/Documentation/filesystems/ext4.txt
|
||||
@@ -32,9 +32,9 @@ Mailing list: linux-ext4@vger.kernel.org
|
||||
you will need to merge your changes with the version from e2fsprogs
|
||||
1.41.x.
|
||||
|
||||
- - Create a new filesystem using the ext4dev filesystem type:
|
||||
+ - Create a new filesystem using the ext4 filesystem type:
|
||||
|
||||
- # mke2fs -t ext4dev /dev/hda1
|
||||
+ # mke2fs -t ext4 /dev/hda1
|
||||
|
||||
Or configure an existing ext3 filesystem to support extents and set
|
||||
the test_fs flag to indicate that it's ok for an in-development
|
||||
@@ -47,13 +47,13 @@ Mailing list: linux-ext4@vger.kernel.org
|
||||
|
||||
# tune2fs -I 256 /dev/hda1
|
||||
|
||||
- (Note: we currently do not have tools to convert an ext4dev
|
||||
+ (Note: we currently do not have tools to convert an ext4
|
||||
filesystem back to ext3; so please do not do try this on production
|
||||
filesystems.)
|
||||
|
||||
- Mounting:
|
||||
|
||||
- # mount -t ext4dev /dev/hda1 /wherever
|
||||
+ # mount -t ext4 /dev/hda1 /wherever
|
||||
|
||||
- When comparing performance with other filesystems, remember that
|
||||
ext3/4 by default offers higher data integrity guarantees than most.
|
||||
diff --git a/fs/Kconfig b/fs/Kconfig
|
||||
index abccb5d..40183d9 100644
|
||||
--- a/fs/Kconfig
|
||||
+++ b/fs/Kconfig
|
||||
@@ -136,37 +136,51 @@ config EXT3_FS_SECURITY
|
||||
If you are not using a security module that requires using
|
||||
extended attributes for file security labels, say N.
|
||||
|
||||
-config EXT4DEV_FS
|
||||
- tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
|
||||
- depends on EXPERIMENTAL
|
||||
+config EXT4_FS
|
||||
+ tristate "The Extended 4 (ext4) filesystem"
|
||||
select JBD2
|
||||
select CRC16
|
||||
help
|
||||
- Ext4dev is a predecessor filesystem of the next generation
|
||||
- extended fs ext4, based on ext3 filesystem code. It will be
|
||||
- renamed ext4 fs later, once ext4dev is mature and stabilized.
|
||||
+ This is the next generation of the ext3 filesystem.
|
||||
|
||||
Unlike the change from ext2 filesystem to ext3 filesystem,
|
||||
- the on-disk format of ext4dev is not the same as ext3 any more:
|
||||
- it is based on extent maps and it supports 48-bit physical block
|
||||
- numbers. These combined on-disk format changes will allow
|
||||
- ext4dev/ext4 to handle more than 16 TB filesystem volumes --
|
||||
- a hard limit that ext3 cannot overcome without changing the
|
||||
- on-disk format.
|
||||
-
|
||||
- Other than extent maps and 48-bit block numbers, ext4dev also is
|
||||
- likely to have other new features such as persistent preallocation,
|
||||
- high resolution time stamps, and larger file support etc. These
|
||||
- features will be added to ext4dev gradually.
|
||||
+ the on-disk format of ext4 is not forwards compatible with
|
||||
+ ext3; it is based on extent maps and it supports 48-bit
|
||||
+ physical block numbers. The ext4 filesystem also supports delayed
|
||||
+ allocation, persistent preallocation, high resolution time stamps,
|
||||
+ and a number of other features to improve performance and speed
|
||||
+ up fsck time. For more information, please see the web pages at
|
||||
+ http://ext4.wiki.kernel.org.
|
||||
+
|
||||
+ The ext4 filesystem will support mounting an ext3
|
||||
+ filesystem; while there will be some performance gains from
|
||||
+ the delayed allocation and inode table readahead, the best
|
||||
+ performance gains will require enabling ext4 features in the
|
||||
+ filesystem, or formating a new filesystem as an ext4
|
||||
+ filesystem initially.
|
||||
|
||||
To compile this file system support as a module, choose M here. The
|
||||
module will be called ext4dev.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
-config EXT4DEV_FS_XATTR
|
||||
- bool "Ext4dev extended attributes"
|
||||
- depends on EXT4DEV_FS
|
||||
+config EXT4DEV_COMPAT
|
||||
+ bool "Enable ext4dev compatibility"
|
||||
+ depends on EXT4_FS
|
||||
+ help
|
||||
+ Starting with 2.6.28, the name of the ext4 filesystem was
|
||||
+ renamed from ext4dev to ext4. Unfortunately there are some
|
||||
+ lagecy userspace programs (such as klibc's fstype) have
|
||||
+ "ext4dev" hardcoded.
|
||||
+
|
||||
+ To enable backwards compatibility so that systems that are
|
||||
+ still expecting to mount ext4 filesystems using ext4dev,
|
||||
+ chose Y here. This feature will go away by 2.6.31, so
|
||||
+ please arrange to get your userspace programs fixed!
|
||||
+
|
||||
+config EXT4_FS_XATTR
|
||||
+ bool "Ext4 extended attributes"
|
||||
+ depends on EXT4_FS
|
||||
default y
|
||||
help
|
||||
Extended attributes are name:value pairs associated with inodes by
|
||||
@@ -175,11 +189,11 @@ config EXT4DEV_FS_XATTR
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
- You need this for POSIX ACL support on ext4dev/ext4.
|
||||
+ You need this for POSIX ACL support on ext4.
|
||||
|
||||
-config EXT4DEV_FS_POSIX_ACL
|
||||
- bool "Ext4dev POSIX Access Control Lists"
|
||||
- depends on EXT4DEV_FS_XATTR
|
||||
+config EXT4_FS_POSIX_ACL
|
||||
+ bool "Ext4 POSIX Access Control Lists"
|
||||
+ depends on EXT4_FS_XATTR
|
||||
select FS_POSIX_ACL
|
||||
help
|
||||
POSIX Access Control Lists (ACLs) support permissions for users and
|
||||
@@ -190,14 +204,14 @@ config EXT4DEV_FS_POSIX_ACL
|
||||
|
||||
If you don't know what Access Control Lists are, say N
|
||||
|
||||
-config EXT4DEV_FS_SECURITY
|
||||
- bool "Ext4dev Security Labels"
|
||||
- depends on EXT4DEV_FS_XATTR
|
||||
+config EXT4_FS_SECURITY
|
||||
+ bool "Ext4 Security Labels"
|
||||
+ depends on EXT4_FS_XATTR
|
||||
help
|
||||
Security labels support alternative access control models
|
||||
implemented by security modules like SELinux. This option
|
||||
enables an extended attribute handler for file security
|
||||
- labels in the ext4dev/ext4 filesystem.
|
||||
+ labels in the ext4 filesystem.
|
||||
|
||||
If you are not using a security module that requires using
|
||||
extended attributes for file security labels, say N.
|
||||
@@ -240,22 +254,22 @@ config JBD2
|
||||
help
|
||||
This is a generic journaling layer for block devices that support
|
||||
both 32-bit and 64-bit block numbers. It is currently used by
|
||||
- the ext4dev/ext4 filesystem, but it could also be used to add
|
||||
+ the ext4 filesystem, but it could also be used to add
|
||||
journal support to other file systems or block devices such
|
||||
as RAID or LVM.
|
||||
|
||||
- If you are using ext4dev/ext4, you need to say Y here. If you are not
|
||||
- using ext4dev/ext4 then you will probably want to say N.
|
||||
+ If you are using ext4, you need to say Y here. If you are not
|
||||
+ using ext4 then you will probably want to say N.
|
||||
|
||||
To compile this device as a module, choose M here. The module will be
|
||||
- called jbd2. If you are compiling ext4dev/ext4 into the kernel,
|
||||
+ called jbd2. If you are compiling ext4 into the kernel,
|
||||
you cannot compile this code as a module.
|
||||
|
||||
config JBD2_DEBUG
|
||||
- bool "JBD2 (ext4dev/ext4) debugging support"
|
||||
+ bool "JBD2 (ext4) debugging support"
|
||||
depends on JBD2 && DEBUG_FS
|
||||
help
|
||||
- If you are using the ext4dev/ext4 journaled file system (or
|
||||
+ If you are using the ext4 journaled file system (or
|
||||
potentially any other filesystem/device using JBD2), this option
|
||||
allows you to enable debugging output while the system is running,
|
||||
in order to help track down any problems you are having.
|
||||
@@ -270,9 +284,9 @@ config JBD2_DEBUG
|
||||
config FS_MBCACHE
|
||||
# Meta block cache for Extended Attributes (ext2/ext3/ext4)
|
||||
tristate
|
||||
- depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR
|
||||
- default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
|
||||
- default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
|
||||
+ depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
|
||||
+ default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y
|
||||
+ default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m
|
||||
|
||||
config REISERFS_FS
|
||||
tristate "Reiserfs support"
|
||||
diff --git a/fs/Makefile b/fs/Makefile
|
||||
index a1482a5..de404b0 100644
|
||||
--- a/fs/Makefile
|
||||
+++ b/fs/Makefile
|
||||
@@ -69,7 +69,7 @@ obj-$(CONFIG_DLM) += dlm/
|
||||
# Do not add any filesystems before this line
|
||||
obj-$(CONFIG_REISERFS_FS) += reiserfs/
|
||||
obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
|
||||
-obj-$(CONFIG_EXT4DEV_FS) += ext4/ # Before ext2 so root fs can be ext4dev
|
||||
+obj-$(CONFIG_EXT4_FS) += ext4/ # Before ext2 so root fs can be ext4dev
|
||||
obj-$(CONFIG_JBD) += jbd/
|
||||
obj-$(CONFIG_JBD2) += jbd2/
|
||||
obj-$(CONFIG_EXT2_FS) += ext2/
|
||||
diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile
|
||||
index ac6fa8c..a8ff003 100644
|
||||
--- a/fs/ext4/Makefile
|
||||
+++ b/fs/ext4/Makefile
|
||||
@@ -2,12 +2,12 @@
|
||||
# Makefile for the linux ext4-filesystem routines.
|
||||
#
|
||||
|
||||
-obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o
|
||||
+obj-$(CONFIG_EXT4_FS) += ext4.o
|
||||
|
||||
-ext4dev-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
|
||||
+ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
|
||||
ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \
|
||||
ext4_jbd2.o migrate.o mballoc.o
|
||||
|
||||
-ext4dev-$(CONFIG_EXT4DEV_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
|
||||
-ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL) += acl.o
|
||||
-ext4dev-$(CONFIG_EXT4DEV_FS_SECURITY) += xattr_security.o
|
||||
+ext4-$(CONFIG_EXT4_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
|
||||
+ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o
|
||||
+ext4-$(CONFIG_EXT4_FS_SECURITY) += xattr_security.o
|
||||
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
|
||||
index 4c9948f..cb45257 100644
|
||||
--- a/fs/ext4/acl.h
|
||||
+++ b/fs/ext4/acl.h
|
||||
@@ -51,7 +51,7 @@ static inline int ext4_acl_count(size_t size)
|
||||
}
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
|
||||
/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
|
||||
if the ACL has not been cached */
|
||||
@@ -62,7 +62,7 @@ extern int ext4_permission(struct inode *, int);
|
||||
extern int ext4_acl_chmod (struct inode *);
|
||||
extern int ext4_init_acl (handle_t *, struct inode *, struct inode *);
|
||||
|
||||
-#else /* CONFIG_EXT4DEV_FS_POSIX_ACL */
|
||||
+#else /* CONFIG_EXT4_FS_POSIX_ACL */
|
||||
#include <linux/sched.h>
|
||||
#define ext4_permission NULL
|
||||
|
||||
@@ -77,5 +77,5 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
-#endif /* CONFIG_EXT4DEV_FS_POSIX_ACL */
|
||||
+#endif /* CONFIG_EXT4_FS_POSIX_ACL */
|
||||
|
||||
diff --git a/fs/ext4/ext4_i.h b/fs/ext4/ext4_i.h
|
||||
index 2875eec..5c124c0 100644
|
||||
--- a/fs/ext4/ext4_i.h
|
||||
+++ b/fs/ext4/ext4_i.h
|
||||
@@ -66,7 +66,7 @@ struct ext4_inode_info {
|
||||
__u32 i_state; /* Dynamic state flags for ext4 */
|
||||
|
||||
ext4_lblk_t i_dir_start_lookup;
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
/*
|
||||
* Extended attributes can be read independently of the main file
|
||||
* data. Taking i_mutex even when reading would cause contention
|
||||
@@ -76,7 +76,7 @@ struct ext4_inode_info {
|
||||
*/
|
||||
struct rw_semaphore xattr_sem;
|
||||
#endif
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
struct posix_acl *i_acl;
|
||||
struct posix_acl *i_default_acl;
|
||||
#endif
|
||||
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
|
||||
index 6d5be15..6bd11fb 100644
|
||||
--- a/fs/ext4/file.c
|
||||
+++ b/fs/ext4/file.c
|
||||
@@ -165,7 +165,7 @@ const struct inode_operations ext4_file_inode_operations = {
|
||||
.truncate = ext4_truncate,
|
||||
.setattr = ext4_setattr,
|
||||
.getattr = ext4_getattr,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
.setxattr = generic_setxattr,
|
||||
.getxattr = generic_getxattr,
|
||||
.listxattr = ext4_listxattr,
|
||||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
|
||||
index a474786..9b4ec9d 100644
|
||||
--- a/fs/ext4/inode.c
|
||||
+++ b/fs/ext4/inode.c
|
||||
@@ -4041,7 +4041,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
||||
return inode;
|
||||
|
||||
ei = EXT4_I(inode);
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
ei->i_acl = EXT4_ACL_NOT_CACHED;
|
||||
ei->i_default_acl = EXT4_ACL_NOT_CACHED;
|
||||
#endif
|
||||
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
|
||||
index 5295a92..92db9e9 100644
|
||||
--- a/fs/ext4/namei.c
|
||||
+++ b/fs/ext4/namei.c
|
||||
@@ -1773,7 +1773,7 @@ retry:
|
||||
err = PTR_ERR(inode);
|
||||
if (!IS_ERR(inode)) {
|
||||
init_special_inode(inode, inode->i_mode, rdev);
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
inode->i_op = &ext4_special_inode_operations;
|
||||
#endif
|
||||
err = ext4_add_nondir(handle, dentry, inode);
|
||||
@@ -2456,7 +2456,7 @@ const struct inode_operations ext4_dir_inode_operations = {
|
||||
.mknod = ext4_mknod,
|
||||
.rename = ext4_rename,
|
||||
.setattr = ext4_setattr,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
.setxattr = generic_setxattr,
|
||||
.getxattr = generic_getxattr,
|
||||
.listxattr = ext4_listxattr,
|
||||
@@ -2467,7 +2467,7 @@ const struct inode_operations ext4_dir_inode_operations = {
|
||||
|
||||
const struct inode_operations ext4_special_inode_operations = {
|
||||
.setattr = ext4_setattr,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
.setxattr = generic_setxattr,
|
||||
.getxattr = generic_getxattr,
|
||||
.listxattr = ext4_listxattr,
|
||||
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
|
||||
index 7d86560..0e661c5 100644
|
||||
--- a/fs/ext4/super.c
|
||||
+++ b/fs/ext4/super.c
|
||||
@@ -569,7 +569,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
|
||||
ei = kmem_cache_alloc(ext4_inode_cachep, GFP_NOFS);
|
||||
if (!ei)
|
||||
return NULL;
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
ei->i_acl = EXT4_ACL_NOT_CACHED;
|
||||
ei->i_default_acl = EXT4_ACL_NOT_CACHED;
|
||||
#endif
|
||||
@@ -605,7 +605,7 @@ static void init_once(void *foo)
|
||||
struct ext4_inode_info *ei = (struct ext4_inode_info *) foo;
|
||||
|
||||
INIT_LIST_HEAD(&ei->i_orphan);
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
init_rwsem(&ei->xattr_sem);
|
||||
#endif
|
||||
init_rwsem(&ei->i_data_sem);
|
||||
@@ -631,7 +631,7 @@ static void destroy_inodecache(void)
|
||||
static void ext4_clear_inode(struct inode *inode)
|
||||
{
|
||||
struct ext4_block_alloc_info *rsv = EXT4_I(inode)->i_block_alloc_info;
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
if (EXT4_I(inode)->i_acl &&
|
||||
EXT4_I(inode)->i_acl != EXT4_ACL_NOT_CACHED) {
|
||||
posix_acl_release(EXT4_I(inode)->i_acl);
|
||||
@@ -720,7 +720,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
||||
seq_puts(seq, ",debug");
|
||||
if (test_opt(sb, OLDALLOC))
|
||||
seq_puts(seq, ",oldalloc");
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
if (test_opt(sb, XATTR_USER) &&
|
||||
!(def_mount_opts & EXT4_DEFM_XATTR_USER))
|
||||
seq_puts(seq, ",user_xattr");
|
||||
@@ -729,7 +729,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
||||
seq_puts(seq, ",nouser_xattr");
|
||||
}
|
||||
#endif
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))
|
||||
seq_puts(seq, ",acl");
|
||||
if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))
|
||||
@@ -1078,7 +1078,7 @@ static int parse_options(char *options, struct super_block *sb,
|
||||
case Opt_orlov:
|
||||
clear_opt(sbi->s_mount_opt, OLDALLOC);
|
||||
break;
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
case Opt_user_xattr:
|
||||
set_opt(sbi->s_mount_opt, XATTR_USER);
|
||||
break;
|
||||
@@ -1092,7 +1092,7 @@ static int parse_options(char *options, struct super_block *sb,
|
||||
"not supported\n");
|
||||
break;
|
||||
#endif
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
case Opt_acl:
|
||||
set_opt(sbi->s_mount_opt, POSIX_ACL);
|
||||
break;
|
||||
@@ -1987,11 +1987,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
||||
set_opt(sbi->s_mount_opt, GRPID);
|
||||
if (def_mount_opts & EXT4_DEFM_UID16)
|
||||
set_opt(sbi->s_mount_opt, NO_UID32);
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
if (def_mount_opts & EXT4_DEFM_XATTR_USER)
|
||||
set_opt(sbi->s_mount_opt, XATTR_USER);
|
||||
#endif
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
if (def_mount_opts & EXT4_DEFM_ACL)
|
||||
set_opt(sbi->s_mount_opt, POSIX_ACL);
|
||||
#endif
|
||||
@@ -2050,16 +2050,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
||||
"running e2fsck is recommended\n");
|
||||
|
||||
/*
|
||||
- * Since ext4 is still considered development code, we require
|
||||
- * that the TEST_FILESYS flag in s->flags be set.
|
||||
- */
|
||||
- if (!(le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS)) {
|
||||
- printk(KERN_WARNING "EXT4-fs: %s: not marked "
|
||||
- "OK to use with test code.\n", sb->s_id);
|
||||
- goto failed_mount;
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
* Check feature flags regardless of the revision level, since we
|
||||
* previously didn't change the revision level when setting the flags,
|
||||
* so there is a chance incompat flags are set on a rev 0 filesystem.
|
||||
@@ -3580,13 +3570,34 @@ const struct file_operations ext4_ui_proc_fops = {
|
||||
return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super, mnt);
|
||||
}
|
||||
|
||||
+static struct file_system_type ext4_fs_type = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .name = "ext4",
|
||||
+ .get_sb = ext4_get_sb,
|
||||
+ .kill_sb = kill_block_super,
|
||||
+ .fs_flags = FS_REQUIRES_DEV,
|
||||
+};
|
||||
+
|
||||
+#ifdef CONFIG_EXT4DEV_COMPAT
|
||||
+static int ext4dev_get_sb(struct file_system_type *fs_type,
|
||||
+ int flags, const char *dev_name, void *data, struct vfsmount *mnt)
|
||||
+{
|
||||
+ printk(KERN_WARNING "EXT4-fs: Update your userspace programs "
|
||||
+ "to mount using ext4\n");
|
||||
+ printk(KERN_WARNING "EXT4-fs: ext4dev backwards compatibility "
|
||||
+ "will go away by 2.6.31\n");
|
||||
+ return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super, mnt);
|
||||
+}
|
||||
+
|
||||
static struct file_system_type ext4dev_fs_type = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ext4dev",
|
||||
- .get_sb = ext4_get_sb,
|
||||
+ .get_sb = ext4dev_get_sb,
|
||||
.kill_sb = kill_block_super,
|
||||
.fs_flags = FS_REQUIRES_DEV,
|
||||
};
|
||||
+MODULE_ALIAS("ext4dev");
|
||||
+#endif
|
||||
|
||||
static int __init init_ext4_fs(void)
|
||||
{
|
||||
@@ -3603,9 +3614,16 @@ static int __init init_ext4_fs(void)
|
||||
err = init_inodecache();
|
||||
if (err)
|
||||
goto out1;
|
||||
- err = register_filesystem(&ext4dev_fs_type);
|
||||
+ err = register_filesystem(&ext4_fs_type);
|
||||
if (err)
|
||||
goto out;
|
||||
+#ifdef CONFIG_EXT4DEV_COMPAT
|
||||
+ err = register_filesystem(&ext4dev_fs_type);
|
||||
+ if (err) {
|
||||
+ unregister_filesystem(&ext4_fs_type);
|
||||
+ goto out;
|
||||
+ }
|
||||
+#endif
|
||||
return 0;
|
||||
out:
|
||||
destroy_inodecache();
|
||||
@@ -3618,7 +3636,10 @@ out2:
|
||||
|
||||
static void __exit exit_ext4_fs(void)
|
||||
{
|
||||
+ unregister_filesystem(&ext4_fs_type);
|
||||
+#ifdef CONFIG_EXT4DEV_COMPAT
|
||||
unregister_filesystem(&ext4dev_fs_type);
|
||||
+#endif
|
||||
destroy_inodecache();
|
||||
exit_ext4_xattr();
|
||||
exit_ext4_mballoc();
|
||||
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
|
||||
index 0013d52..00740cb 100644
|
||||
--- a/fs/ext4/symlink.c
|
||||
+++ b/fs/ext4/symlink.c
|
||||
@@ -34,7 +34,7 @@ const struct inode_operations ext4_symlink_inode_operations = {
|
||||
.readlink = generic_readlink,
|
||||
.follow_link = page_follow_link_light,
|
||||
.put_link = page_put_link,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
.setxattr = generic_setxattr,
|
||||
.getxattr = generic_getxattr,
|
||||
.listxattr = ext4_listxattr,
|
||||
@@ -45,7 +45,7 @@ const struct inode_operations ext4_symlink_inode_operations = {
|
||||
const struct inode_operations ext4_fast_symlink_inode_operations = {
|
||||
.readlink = generic_readlink,
|
||||
.follow_link = ext4_follow_link,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+#ifdef CONFIG_EXT4_FS_XATTR
|
||||
.setxattr = generic_setxattr,
|
||||
.getxattr = generic_getxattr,
|
||||
.listxattr = ext4_listxattr,
|
||||
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
|
||||
index 362b0ed..80626d5 100644
|
||||
--- a/fs/ext4/xattr.c
|
||||
+++ b/fs/ext4/xattr.c
|
||||
@@ -99,12 +99,12 @@ static struct mb_cache *ext4_xattr_cache;
|
||||
|
||||
static struct xattr_handler *ext4_xattr_handler_map[] = {
|
||||
[EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext4_xattr_acl_access_handler,
|
||||
[EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext4_xattr_acl_default_handler,
|
||||
#endif
|
||||
[EXT4_XATTR_INDEX_TRUSTED] = &ext4_xattr_trusted_handler,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_SECURITY
|
||||
+#ifdef CONFIG_EXT4_FS_SECURITY
|
||||
[EXT4_XATTR_INDEX_SECURITY] = &ext4_xattr_security_handler,
|
||||
#endif
|
||||
};
|
||||
@@ -112,11 +112,11 @@ static struct xattr_handler *ext4_xattr_handler_map[] = {
|
||||
struct xattr_handler *ext4_xattr_handlers[] = {
|
||||
&ext4_xattr_user_handler,
|
||||
&ext4_xattr_trusted_handler,
|
||||
-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
|
||||
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
||||
&ext4_xattr_acl_access_handler,
|
||||
&ext4_xattr_acl_default_handler,
|
||||
#endif
|
||||
-#ifdef CONFIG_EXT4DEV_FS_SECURITY
|
||||
+#ifdef CONFIG_EXT4_FS_SECURITY
|
||||
&ext4_xattr_security_handler,
|
||||
#endif
|
||||
NULL
|
||||
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
|
||||
index 814ea58..8ede88b 100644
|
||||
--- a/fs/ext4/xattr.h
|
||||
+++ b/fs/ext4/xattr.h
|
||||
@@ -63,7 +63,7 @@ struct ext4_xattr_entry {
|
||||
EXT4_I(inode)->i_extra_isize))
|
||||
#define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
|
||||
|
||||
-# ifdef CONFIG_EXT4DEV_FS_XATTR
|
||||
+# ifdef CONFIG_EXT4_FS_XATTR
|
||||
|
||||
extern struct xattr_handler ext4_xattr_user_handler;
|
||||
extern struct xattr_handler ext4_xattr_trusted_handler;
|
||||
@@ -88,7 +88,7 @@ extern void exit_ext4_xattr(void);
|
||||
|
||||
extern struct xattr_handler *ext4_xattr_handlers[];
|
||||
|
||||
-# else /* CONFIG_EXT4DEV_FS_XATTR */
|
||||
+# else /* CONFIG_EXT4_FS_XATTR */
|
||||
|
||||
static inline int
|
||||
ext4_xattr_get(struct inode *inode, int name_index, const char *name,
|
||||
@@ -141,9 +141,9 @@ ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
|
||||
|
||||
#define ext4_xattr_handlers NULL
|
||||
|
||||
-# endif /* CONFIG_EXT4DEV_FS_XATTR */
|
||||
+# endif /* CONFIG_EXT4_FS_XATTR */
|
||||
|
||||
-#ifdef CONFIG_EXT4DEV_FS_SECURITY
|
||||
+#ifdef CONFIG_EXT4_FS_SECURITY
|
||||
extern int ext4_init_security(handle_t *handle, struct inode *inode,
|
||||
struct inode *dir);
|
||||
#else
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
Safer version of upstream commit a996031c87e093017c0763326a08896a3a4817f4
|
||||
|
||||
Delay capable() checks to avoid (most) AVC denials when checking free blocks
|
||||
(Bug 478299 - AVC denials on kernel 2.6.27.9-159.fc10.x86_64)
|
||||
|
||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||||
---
|
||||
|
||||
Index: linux-2.6.27.noarch/fs/ext4/balloc.c
|
||||
===================================================================
|
||||
--- linux-2.6.27.noarch.orig/fs/ext4/balloc.c 2009-01-06 14:49:05.625574969 -0600
|
||||
+++ linux-2.6.27.noarch/fs/ext4/balloc.c 2009-01-06 14:49:19.181637281 -0600
|
||||
@@ -1612,15 +1612,15 @@ out:
|
||||
ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,
|
||||
ext4_fsblk_t nblocks)
|
||||
{
|
||||
- ext4_fsblk_t free_blocks;
|
||||
- ext4_fsblk_t root_blocks = 0;
|
||||
+ ext4_fsblk_t free_blocks, root_blocks;
|
||||
|
||||
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
|
||||
+ root_blocks = ext4_r_blocks_count(sbi->s_es);
|
||||
|
||||
- if (!capable(CAP_SYS_RESOURCE) &&
|
||||
- sbi->s_resuid != current->fsuid &&
|
||||
- (sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid)))
|
||||
- root_blocks = ext4_r_blocks_count(sbi->s_es);
|
||||
+ if (sbi->s_resuid == current->fsuid ||
|
||||
+ ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
|
||||
+ capable(CAP_SYS_RESOURCE))
|
||||
+ root_blocks = 0;
|
||||
#ifdef CONFIG_SMP
|
||||
if (free_blocks - root_blocks < FBC_BATCH)
|
||||
free_blocks =
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
|
||||
pkgname=kernel26-openmoko
|
||||
pkgver=2.6.29
|
||||
_gitver=dcd90798cdab0ab1e7c1fb56af8841bb225b5fdc
|
||||
pkgrel=4
|
||||
pkgdesc="The Linux Kernel and modules"
|
||||
arch=(arm)
|
||||
license=('GPL2')
|
||||
url="http://wiki.openmoko.org/wiki/Kernel"
|
||||
depends=('coreutils')
|
||||
makedepends=('git' 'uboot-mkimage-native')
|
||||
replaces=('kernel26')
|
||||
conflicts=('kernel26')
|
||||
provides=('kernel26')
|
||||
source=('append-GTA02' 'ppoll.patch' 'gcc-4.4.patch' 'aufs2-29.patch' 'config')
|
||||
|
||||
md5sums=('ad1cb2f0a3000f5285c58b22fe8f4de3'
|
||||
'54b7414a29b007cfb58de8dae9398021'
|
||||
'e47d7b36a921ecdf913bdd3f9af08a0a'
|
||||
'd41d8cd98f00b204e9800998ecf8427e'
|
||||
'b70b0eae868962745d06f6cfe56b417e')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}
|
||||
|
||||
# make this build clean
|
||||
if [ -x linux-2.6 ]; then
|
||||
cd linux-2.6
|
||||
else
|
||||
git clone --depth 1 -n git://git.openmoko.org/git/kernel.git linux-2.6
|
||||
cd linux-2.6
|
||||
git checkout --track -b andy-tracking origin/andy-tracking
|
||||
|
||||
# include ppoll.patch needed by klibc
|
||||
# gathered from arm linux kernel tree, should be merged in official
|
||||
patch -p1 < ${srcdir}/ppoll.patch
|
||||
|
||||
# without this patch modules are unloadable
|
||||
patch -p0 < ${srcdir}/gcc-4.4.patch
|
||||
|
||||
# add aufs2 support to kernel
|
||||
patch -p1 < ${srcdir}/aufs2-29.patch
|
||||
fi
|
||||
|
||||
cp ${srcdir}/config .config
|
||||
make -j4 ARCH=arm
|
||||
|
||||
mkdir ${pkgdir}/boot
|
||||
|
||||
# these are copied from build sh in andy-tracking
|
||||
objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
|
||||
mkimage -A arm -O linux -T kernel -C none -a 30008000 -n "OM GTA02 andy-tracking" -d linux.bin ${pkgdir}/boot/uImage-moredrivers-GTA02.bin
|
||||
|
||||
make INSTALL_MOD_PATH=${pkgdir} ARCH=arm modules_install
|
||||
|
||||
cd ${pkgdir}/boot
|
||||
ln -s uImage-moredrivers-*.bin uImage-GTA02.bin
|
||||
cp ${srcdir}/append-GTA02 ${pkgdir}/boot
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
console=tty0
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,14 +0,0 @@
|
|||
--- Makefile.orig 2009-09-02 23:49:06.000000000 +0000
|
||||
+++ Makefile 2009-09-02 23:49:40.000000000 +0000
|
||||
@@ -565,6 +565,11 @@
|
||||
# disable pointer signed / unsigned warnings in gcc 4.0
|
||||
KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
|
||||
|
||||
+# gcc-4.4 defaults to generating .eh_frame sections, but we aren't
|
||||
+# interested in those currently. additionally, it causes issues on some
|
||||
+# architectures.
|
||||
+KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm)
|
||||
+
|
||||
# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
|
||||
# But warn user when we do so
|
||||
warn-assign = \
|
||||
|
|
@ -1,365 +0,0 @@
|
|||
From 369842658a36bcea28ecb643ba4bdb53919330dd Mon Sep 17 00:00:00 2001
|
||||
From: Mikael Pettersson <mikpe@it.uu.se>
|
||||
Date: Sat, 15 Aug 2009 12:58:11 +0100
|
||||
Subject: [PATCH] ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait
|
||||
|
||||
This patch adds support for TIF_RESTORE_SIGMASK to ARM's
|
||||
signal handling, which allows to hook up the pselect6, ppoll,
|
||||
and epoll_pwait syscalls on ARM.
|
||||
|
||||
Tested here with eabi userspace and a test program with a
|
||||
deliberate race between a child's exit and the parent's
|
||||
sigprocmask/select sequence. Using sys_pselect6() instead
|
||||
of sigprocmask/select reliably prevents the race.
|
||||
|
||||
The other arch's support for TIF_RESTORE_SIGMASK has evolved
|
||||
over time:
|
||||
|
||||
In 2.6.16:
|
||||
- add TIF_RESTORE_SIGMASK which parallels TIF_SIGPENDING
|
||||
- test both when checking for pending signal [changed later]
|
||||
- reimplement sys_sigsuspend() to use current->saved_sigmask,
|
||||
TIF_RESTORE_SIGMASK [changed later], and -ERESTARTNOHAND;
|
||||
ditto for sys_rt_sigsuspend(), but drop private code and
|
||||
use common code via __ARCH_WANT_SYS_RT_SIGSUSPEND;
|
||||
- there are now no "extra" calls to do_signal() so its oldset
|
||||
parameter is always ¤t->blocked so need not be passed,
|
||||
also its return value is changed to void
|
||||
- change handle_signal() to return 0/-errno
|
||||
- change do_signal() to honor TIF_RESTORE_SIGMASK:
|
||||
+ get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
|
||||
is set
|
||||
+ if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
|
||||
+ if no signal was delivered and TIF_RESTORE_SIGMASK is set then
|
||||
clear it and restore the sigmask
|
||||
- hook up sys_pselect6() and sys_ppoll()
|
||||
|
||||
In 2.6.19:
|
||||
- hook up sys_epoll_pwait()
|
||||
|
||||
In 2.6.26:
|
||||
- allow archs to override how TIF_RESTORE_SIGMASK is implemented;
|
||||
default set_restore_sigmask() sets both TIF_RESTORE_SIGMASK and
|
||||
TIF_SIGPENDING; archs need now just test TIF_SIGPENDING again
|
||||
when checking for pending signal work; some archs now implement
|
||||
TIF_RESTORE_SIGMASK as a secondary/non-atomic thread flag bit
|
||||
- call set_restore_sigmask() in sys_sigsuspend() instead of setting
|
||||
TIF_RESTORE_SIGMASK
|
||||
|
||||
In 2.6.29-rc:
|
||||
- kill sys_pselect7() which no arch wanted
|
||||
|
||||
So for 2.6.31-rc6/ARM this patch does the following:
|
||||
- Add TIF_RESTORE_SIGMASK. Use the generic set_restore_sigmask()
|
||||
which sets both TIF_SIGPENDING and TIF_RESTORE_SIGMASK, so
|
||||
TIF_RESTORE_SIGMASK need not claim one of the scarce low thread
|
||||
flags, and existing TIF_SIGPENDING and _TIF_WORK_MASK tests need
|
||||
not be extended for TIF_RESTORE_SIGMASK.
|
||||
- sys_sigsuspend() is reimplemented to use current->saved_sigmask
|
||||
and set_restore_sigmask(), making it identical to most other archs
|
||||
- The private code for sys_rt_sigsuspend() is removed, instead
|
||||
generic code supplies it via __ARCH_WANT_SYS_RT_SIGSUSPEND.
|
||||
- sys_sigsuspend() and sys_rt_sigsuspend() no longer need a pt_regs
|
||||
parameter, so their assembly code wrappers are removed.
|
||||
- handle_signal() is changed to return 0 on success or -errno.
|
||||
- The oldset parameter to do_signal() is now redundant and removed,
|
||||
and the return value is now also redundant and changed to void.
|
||||
- do_signal() is changed to honor TIF_RESTORE_SIGMASK:
|
||||
+ get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
|
||||
is set
|
||||
+ if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
|
||||
+ if no signal was delivered and TIF_RESTORE_SIGMASK is set then
|
||||
clear it and restore the sigmask
|
||||
- Hook up sys_pselect6, sys_ppoll, and sys_epoll_pwait.
|
||||
|
||||
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
|
||||
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||||
---
|
||||
arch/arm/include/asm/thread_info.h | 2 +
|
||||
arch/arm/include/asm/unistd.h | 7 ++-
|
||||
arch/arm/kernel/calls.S | 10 ++--
|
||||
arch/arm/kernel/entry-common.S | 10 ----
|
||||
arch/arm/kernel/signal.c | 86 +++++++++++++++--------------------
|
||||
5 files changed, 48 insertions(+), 67 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
|
||||
index 73394e5..e20d805 100644
|
||||
--- a/arch/arm/include/asm/thread_info.h
|
||||
+++ b/arch/arm/include/asm/thread_info.h
|
||||
@@ -140,6 +140,7 @@ extern void vfp_sync_state(struct thread_info *thread);
|
||||
#define TIF_USING_IWMMXT 17
|
||||
#define TIF_MEMDIE 18
|
||||
#define TIF_FREEZE 19
|
||||
+#define TIF_RESTORE_SIGMASK 20
|
||||
|
||||
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
|
||||
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
|
||||
@@ -147,6 +148,7 @@ extern void vfp_sync_state(struct thread_info *thread);
|
||||
#define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
|
||||
#define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
|
||||
#define _TIF_FREEZE (1 << TIF_FREEZE)
|
||||
+#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
|
||||
|
||||
/*
|
||||
* Change these and you break ASM code in entry-common.S
|
||||
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
|
||||
index 0e97b8c..9122c9e 100644
|
||||
--- a/arch/arm/include/asm/unistd.h
|
||||
+++ b/arch/arm/include/asm/unistd.h
|
||||
@@ -360,8 +360,8 @@
|
||||
#define __NR_readlinkat (__NR_SYSCALL_BASE+332)
|
||||
#define __NR_fchmodat (__NR_SYSCALL_BASE+333)
|
||||
#define __NR_faccessat (__NR_SYSCALL_BASE+334)
|
||||
- /* 335 for pselect6 */
|
||||
- /* 336 for ppoll */
|
||||
+#define __NR_pselect6 (__NR_SYSCALL_BASE+335)
|
||||
+#define __NR_ppoll (__NR_SYSCALL_BASE+336)
|
||||
#define __NR_unshare (__NR_SYSCALL_BASE+337)
|
||||
#define __NR_set_robust_list (__NR_SYSCALL_BASE+338)
|
||||
#define __NR_get_robust_list (__NR_SYSCALL_BASE+339)
|
||||
@@ -372,7 +372,7 @@
|
||||
#define __NR_vmsplice (__NR_SYSCALL_BASE+343)
|
||||
#define __NR_move_pages (__NR_SYSCALL_BASE+344)
|
||||
#define __NR_getcpu (__NR_SYSCALL_BASE+345)
|
||||
- /* 346 for epoll_pwait */
|
||||
+#define __NR_epoll_pwait (__NR_SYSCALL_BASE+346)
|
||||
#define __NR_kexec_load (__NR_SYSCALL_BASE+347)
|
||||
#define __NR_utimensat (__NR_SYSCALL_BASE+348)
|
||||
#define __NR_signalfd (__NR_SYSCALL_BASE+349)
|
||||
@@ -432,6 +432,7 @@
|
||||
#define __ARCH_WANT_SYS_SIGPENDING
|
||||
#define __ARCH_WANT_SYS_SIGPROCMASK
|
||||
#define __ARCH_WANT_SYS_RT_SIGACTION
|
||||
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
||||
|
||||
#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
|
||||
#define __ARCH_WANT_SYS_TIME
|
||||
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
|
||||
index f776e72..ecfa989 100644
|
||||
--- a/arch/arm/kernel/calls.S
|
||||
+++ b/arch/arm/kernel/calls.S
|
||||
@@ -81,7 +81,7 @@
|
||||
CALL(sys_ni_syscall) /* was sys_ssetmask */
|
||||
/* 70 */ CALL(sys_setreuid16)
|
||||
CALL(sys_setregid16)
|
||||
- CALL(sys_sigsuspend_wrapper)
|
||||
+ CALL(sys_sigsuspend)
|
||||
CALL(sys_sigpending)
|
||||
CALL(sys_sethostname)
|
||||
/* 75 */ CALL(sys_setrlimit)
|
||||
@@ -188,7 +188,7 @@
|
||||
CALL(sys_rt_sigpending)
|
||||
CALL(sys_rt_sigtimedwait)
|
||||
CALL(sys_rt_sigqueueinfo)
|
||||
- CALL(sys_rt_sigsuspend_wrapper)
|
||||
+ CALL(sys_rt_sigsuspend)
|
||||
/* 180 */ CALL(ABI(sys_pread64, sys_oabi_pread64))
|
||||
CALL(ABI(sys_pwrite64, sys_oabi_pwrite64))
|
||||
CALL(sys_chown16)
|
||||
@@ -344,8 +344,8 @@
|
||||
CALL(sys_readlinkat)
|
||||
CALL(sys_fchmodat)
|
||||
CALL(sys_faccessat)
|
||||
-/* 335 */ CALL(sys_ni_syscall) /* eventually pselect6 */
|
||||
- CALL(sys_ni_syscall) /* eventually ppoll */
|
||||
+/* 335 */ CALL(sys_pselect6)
|
||||
+ CALL(sys_ppoll)
|
||||
CALL(sys_unshare)
|
||||
CALL(sys_set_robust_list)
|
||||
CALL(sys_get_robust_list)
|
||||
@@ -355,7 +355,7 @@
|
||||
CALL(sys_vmsplice)
|
||||
CALL(sys_move_pages)
|
||||
/* 345 */ CALL(sys_getcpu)
|
||||
- CALL(sys_ni_syscall) /* eventually epoll_pwait */
|
||||
+ CALL(sys_epoll_pwait)
|
||||
CALL(sys_kexec_load)
|
||||
CALL(sys_utimensat)
|
||||
CALL(sys_signalfd)
|
||||
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
|
||||
index 366e509..bfa7f0a 100644
|
||||
--- a/arch/arm/kernel/entry-common.S
|
||||
+++ b/arch/arm/kernel/entry-common.S
|
||||
@@ -373,16 +373,6 @@ sys_clone_wrapper:
|
||||
b sys_clone
|
||||
ENDPROC(sys_clone_wrapper)
|
||||
|
||||
-sys_sigsuspend_wrapper:
|
||||
- add r3, sp, #S_OFF
|
||||
- b sys_sigsuspend
|
||||
-ENDPROC(sys_sigsuspend_wrapper)
|
||||
-
|
||||
-sys_rt_sigsuspend_wrapper:
|
||||
- add r2, sp, #S_OFF
|
||||
- b sys_rt_sigsuspend
|
||||
-ENDPROC(sys_rt_sigsuspend_wrapper)
|
||||
-
|
||||
sys_sigreturn_wrapper:
|
||||
add r0, sp, #S_OFF
|
||||
b sys_sigreturn
|
||||
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
|
||||
index 93bb424..e27ee1f 100644
|
||||
--- a/arch/arm/kernel/signal.c
|
||||
+++ b/arch/arm/kernel/signal.c
|
||||
@@ -47,57 +47,22 @@ const unsigned long sigreturn_codes[7] = {
|
||||
MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
|
||||
};
|
||||
|
||||
-static int do_signal(sigset_t *oldset, struct pt_regs * regs, int syscall);
|
||||
-
|
||||
/*
|
||||
* atomically swap in the new signal mask, and wait for a signal.
|
||||
*/
|
||||
-asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask, struct pt_regs *regs)
|
||||
+asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask)
|
||||
{
|
||||
- sigset_t saveset;
|
||||
-
|
||||
mask &= _BLOCKABLE;
|
||||
spin_lock_irq(¤t->sighand->siglock);
|
||||
- saveset = current->blocked;
|
||||
+ current->saved_sigmask = current->blocked;
|
||||
siginitset(¤t->blocked, mask);
|
||||
recalc_sigpending();
|
||||
spin_unlock_irq(¤t->sighand->siglock);
|
||||
- regs->ARM_r0 = -EINTR;
|
||||
-
|
||||
- while (1) {
|
||||
- current->state = TASK_INTERRUPTIBLE;
|
||||
- schedule();
|
||||
- if (do_signal(&saveset, regs, 0))
|
||||
- return regs->ARM_r0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-asmlinkage int
|
||||
-sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *regs)
|
||||
-{
|
||||
- sigset_t saveset, newset;
|
||||
-
|
||||
- /* XXX: Don't preclude handling different sized sigset_t's. */
|
||||
- if (sigsetsize != sizeof(sigset_t))
|
||||
- return -EINVAL;
|
||||
-
|
||||
- if (copy_from_user(&newset, unewset, sizeof(newset)))
|
||||
- return -EFAULT;
|
||||
- sigdelsetmask(&newset, ~_BLOCKABLE);
|
||||
-
|
||||
- spin_lock_irq(¤t->sighand->siglock);
|
||||
- saveset = current->blocked;
|
||||
- current->blocked = newset;
|
||||
- recalc_sigpending();
|
||||
- spin_unlock_irq(¤t->sighand->siglock);
|
||||
- regs->ARM_r0 = -EINTR;
|
||||
|
||||
- while (1) {
|
||||
- current->state = TASK_INTERRUPTIBLE;
|
||||
- schedule();
|
||||
- if (do_signal(&saveset, regs, 0))
|
||||
- return regs->ARM_r0;
|
||||
- }
|
||||
+ current->state = TASK_INTERRUPTIBLE;
|
||||
+ schedule();
|
||||
+ set_restore_sigmask();
|
||||
+ return -ERESTARTNOHAND;
|
||||
}
|
||||
|
||||
asmlinkage int
|
||||
@@ -545,7 +510,7 @@ static inline void setup_syscall_restart(struct pt_regs *regs)
|
||||
/*
|
||||
* OK, we're invoking a handler
|
||||
*/
|
||||
-static void
|
||||
+static int
|
||||
handle_signal(unsigned long sig, struct k_sigaction *ka,
|
||||
siginfo_t *info, sigset_t *oldset,
|
||||
struct pt_regs * regs, int syscall)
|
||||
@@ -596,7 +561,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
|
||||
|
||||
if (ret != 0) {
|
||||
force_sigsegv(sig, tsk);
|
||||
- return;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -610,6 +575,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
|
||||
recalc_sigpending();
|
||||
spin_unlock_irq(&tsk->sighand->siglock);
|
||||
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -621,7 +587,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
|
||||
* the kernel can handle, and then we build all the user-level signal handling
|
||||
* stack-frames in one go after that.
|
||||
*/
|
||||
-static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
|
||||
+static void do_signal(struct pt_regs *regs, int syscall)
|
||||
{
|
||||
struct k_sigaction ka;
|
||||
siginfo_t info;
|
||||
@@ -634,7 +600,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
|
||||
* if so.
|
||||
*/
|
||||
if (!user_mode(regs))
|
||||
- return 0;
|
||||
+ return;
|
||||
|
||||
if (try_to_freeze())
|
||||
goto no_signal;
|
||||
@@ -643,9 +609,24 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
|
||||
|
||||
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
||||
if (signr > 0) {
|
||||
- handle_signal(signr, &ka, &info, oldset, regs, syscall);
|
||||
+ sigset_t *oldset;
|
||||
+
|
||||
+ if (test_thread_flag(TIF_RESTORE_SIGMASK))
|
||||
+ oldset = ¤t->saved_sigmask;
|
||||
+ else
|
||||
+ oldset = ¤t->blocked;
|
||||
+ if (handle_signal(signr, &ka, &info, oldset, regs, syscall) == 0) {
|
||||
+ /*
|
||||
+ * A signal was successfully delivered; the saved
|
||||
+ * sigmask will have been stored in the signal frame,
|
||||
+ * and will be restored by sigreturn, so we can simply
|
||||
+ * clear the TIF_RESTORE_SIGMASK flag.
|
||||
+ */
|
||||
+ if (test_thread_flag(TIF_RESTORE_SIGMASK))
|
||||
+ clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
+ }
|
||||
single_step_set(current);
|
||||
- return 1;
|
||||
+ return;
|
||||
}
|
||||
|
||||
no_signal:
|
||||
@@ -697,14 +678,21 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
|
||||
regs->ARM_r0 == -ERESTARTNOINTR) {
|
||||
setup_syscall_restart(regs);
|
||||
}
|
||||
+
|
||||
+ /* If there's no signal to deliver, we just put the saved sigmask
|
||||
+ * back.
|
||||
+ */
|
||||
+ if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
|
||||
+ clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
+ sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
|
||||
+ }
|
||||
}
|
||||
single_step_set(current);
|
||||
- return 0;
|
||||
}
|
||||
|
||||
asmlinkage void
|
||||
do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
|
||||
{
|
||||
if (thread_flags & _TIF_SIGPENDING)
|
||||
- do_signal(¤t->blocked, regs, syscall);
|
||||
+ do_signal(regs, syscall);
|
||||
}
|
||||
--
|
||||
1.6.4
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
pkgname=kernel26-qemu
|
||||
pkgver=2.6.30
|
||||
pkgrel=4
|
||||
_patchname="patch-${pkgver}-${pkgrel}-ARCH"
|
||||
groups=() #see #96
|
||||
pkgdesc="The Linux Kernel (without modules support) - for qemu-system-arm / ARM Integrator/CP"
|
||||
arch=('arm')
|
||||
license=('GPL2')
|
||||
url="http://kernel.org/"
|
||||
depends=('coreutils')
|
||||
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${pkgver}.tar.bz2
|
||||
ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
|
||||
config)
|
||||
md5sums=('7a80058a6382e5108cdb5554d1609615'
|
||||
'8a9575026bf6c8f8117a4832e0031d84'
|
||||
'3b4b0ba57d7634d6678110afb58dc71a')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/linux-${pkgver}
|
||||
# Add -ARCH patches
|
||||
patch -Np1 -i ${srcdir}/${_patchname} || return 1
|
||||
|
||||
cat ../config > .config
|
||||
yes "" | make config || return 1
|
||||
make prepare #this can fail, I don't know why...
|
||||
make bzImage || return 1
|
||||
|
||||
mkdir -p ${pkgdir}/boot/
|
||||
cp arch/arm/boot/zImage ${pkgdir}/boot/zImage-qemu
|
||||
}
|
||||
|
|
@ -1,900 +0,0 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.17-rc3
|
||||
# Thu May 4 15:05:06 2006
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
CONFIG_GENERIC_HWEIGHT=y
|
||||
CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
|
||||
#
|
||||
# Code maturity level options
|
||||
#
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
CONFIG_BROKEN_ON_SMP=y
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||
|
||||
#
|
||||
# General setup
|
||||
#
|
||||
CONFIG_LOCALVERSION=""
|
||||
CONFIG_LOCALVERSION_AUTO=y
|
||||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
# CONFIG_POSIX_MQUEUE is not set
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
CONFIG_SYSCTL=y
|
||||
# CONFIG_AUDIT is not set
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
# CONFIG_RELAY is not set
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_UID16=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_ALL is not set
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
CONFIG_PRINTK=y
|
||||
CONFIG_BUG=y
|
||||
CONFIG_ELF_CORE=y
|
||||
CONFIG_BASE_FULL=y
|
||||
CONFIG_FUTEX=y
|
||||
CONFIG_EPOLL=y
|
||||
CONFIG_SHMEM=y
|
||||
CONFIG_SLAB=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
CONFIG_BASE_SMALL=0
|
||||
# CONFIG_SLOB is not set
|
||||
|
||||
#
|
||||
# Loadable module support
|
||||
#
|
||||
# CONFIG_MODULES is not set
|
||||
|
||||
#
|
||||
# Block layer
|
||||
#
|
||||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
#
|
||||
CONFIG_IOSCHED_NOOP=y
|
||||
CONFIG_IOSCHED_AS=y
|
||||
CONFIG_IOSCHED_DEADLINE=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
CONFIG_DEFAULT_AS=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
# CONFIG_DEFAULT_CFQ is not set
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="anticipatory"
|
||||
|
||||
#
|
||||
# System Type
|
||||
#
|
||||
# CONFIG_ARCH_CLPS7500 is not set
|
||||
# CONFIG_ARCH_CLPS711X is not set
|
||||
# CONFIG_ARCH_CO285 is not set
|
||||
# CONFIG_ARCH_EBSA110 is not set
|
||||
# CONFIG_ARCH_EP93XX is not set
|
||||
# CONFIG_ARCH_FOOTBRIDGE is not set
|
||||
CONFIG_ARCH_INTEGRATOR=y
|
||||
# CONFIG_ARCH_IOP3XX is not set
|
||||
# CONFIG_ARCH_IXP4XX is not set
|
||||
# CONFIG_ARCH_IXP2000 is not set
|
||||
# CONFIG_ARCH_IXP23XX is not set
|
||||
# CONFIG_ARCH_L7200 is not set
|
||||
# CONFIG_ARCH_PXA is not set
|
||||
# CONFIG_ARCH_RPC is not set
|
||||
# CONFIG_ARCH_SA1100 is not set
|
||||
# CONFIG_ARCH_S3C2410 is not set
|
||||
# CONFIG_ARCH_SHARK is not set
|
||||
# CONFIG_ARCH_LH7A40X is not set
|
||||
# CONFIG_ARCH_OMAP is not set
|
||||
# CONFIG_ARCH_VERSATILE is not set
|
||||
# CONFIG_ARCH_REALVIEW is not set
|
||||
# CONFIG_ARCH_IMX is not set
|
||||
# CONFIG_ARCH_H720X is not set
|
||||
# CONFIG_ARCH_AAEC2000 is not set
|
||||
# CONFIG_ARCH_AT91RM9200 is not set
|
||||
|
||||
#
|
||||
# Integrator Options
|
||||
#
|
||||
# CONFIG_ARCH_INTEGRATOR_AP is not set
|
||||
CONFIG_ARCH_INTEGRATOR_CP=y
|
||||
CONFIG_ARCH_CINTEGRATOR=y
|
||||
|
||||
#
|
||||
# Processor Type
|
||||
#
|
||||
CONFIG_CPU_32=y
|
||||
# CONFIG_CPU_ARM720T is not set
|
||||
# CONFIG_CPU_ARM920T is not set
|
||||
# CONFIG_CPU_ARM922T is not set
|
||||
CONFIG_CPU_ARM926T=y
|
||||
# CONFIG_CPU_ARM1020 is not set
|
||||
# CONFIG_CPU_ARM1022 is not set
|
||||
CONFIG_CPU_ARM1026=y
|
||||
# CONFIG_CPU_V6 is not set
|
||||
CONFIG_CPU_32v5=y
|
||||
CONFIG_CPU_ABRT_EV5T=y
|
||||
CONFIG_CPU_ABRT_EV5TJ=y
|
||||
CONFIG_CPU_CACHE_VIVT=y
|
||||
CONFIG_CPU_COPY_V4WB=y
|
||||
CONFIG_CPU_TLB_V4WBI=y
|
||||
|
||||
#
|
||||
# Processor Features
|
||||
#
|
||||
CONFIG_ARM_THUMB=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
||||
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
|
||||
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
|
||||
CONFIG_ICST525=y
|
||||
|
||||
#
|
||||
# Bus support
|
||||
#
|
||||
CONFIG_ARM_AMBA=y
|
||||
|
||||
#
|
||||
# PCCARD (PCMCIA/CardBus) support
|
||||
#
|
||||
# CONFIG_PCCARD is not set
|
||||
|
||||
#
|
||||
# Kernel Features
|
||||
#
|
||||
# CONFIG_PREEMPT is not set
|
||||
# CONFIG_NO_IDLE_HZ is not set
|
||||
CONFIG_HZ=100
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_OABI_COMPAT=y
|
||||
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
|
||||
CONFIG_SELECT_MEMORY_MODEL=y
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
CONFIG_FLATMEM=y
|
||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4096
|
||||
CONFIG_LEDS=y
|
||||
CONFIG_LEDS_TIMER=y
|
||||
CONFIG_LEDS_CPU=y
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
|
||||
#
|
||||
# Boot options
|
||||
#
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_CMDLINE=""
|
||||
# CONFIG_XIP_KERNEL is not set
|
||||
|
||||
#
|
||||
# CPU Frequency scaling
|
||||
#
|
||||
CONFIG_CPU_FREQ=y
|
||||
CONFIG_CPU_FREQ_TABLE=y
|
||||
# CONFIG_CPU_FREQ_DEBUG is not set
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
CONFIG_CPU_FREQ_GOV_USERSPACE=y
|
||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||
# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
|
||||
CONFIG_CPU_FREQ_INTEGRATOR=y
|
||||
|
||||
#
|
||||
# Floating point emulation
|
||||
#
|
||||
|
||||
#
|
||||
# At least one emulation must be selected
|
||||
#
|
||||
CONFIG_FPE_NWFPE=y
|
||||
# CONFIG_FPE_NWFPE_XP is not set
|
||||
# CONFIG_FPE_FASTFPE is not set
|
||||
CONFIG_VFP=y
|
||||
|
||||
#
|
||||
# Userspace binary formats
|
||||
#
|
||||
CONFIG_BINFMT_ELF=y
|
||||
# CONFIG_BINFMT_AOUT is not set
|
||||
CONFIG_BINFMT_MISC=y
|
||||
|
||||
#
|
||||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
CONFIG_PM_LEGACY=y
|
||||
# CONFIG_PM_DEBUG is not set
|
||||
CONFIG_APM=y
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
# Networking options
|
||||
#
|
||||
# CONFIG_NETDEBUG is not set
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_MMAP=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_XFRM=y
|
||||
# CONFIG_XFRM_USER is not set
|
||||
# CONFIG_NET_KEY is not set
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
# CONFIG_IP_ADVANCED_ROUTER is not set
|
||||
CONFIG_IP_FIB_HASH=y
|
||||
CONFIG_IP_PNP=y
|
||||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_IP_PNP_BOOTP=y
|
||||
# CONFIG_IP_PNP_RARP is not set
|
||||
CONFIG_NET_IPIP=y
|
||||
CONFIG_NET_IPGRE=y
|
||||
CONFIG_NET_IPGRE_BROADCAST=y
|
||||
CONFIG_IP_MROUTE=y
|
||||
CONFIG_IP_PIMSM_V1=y
|
||||
CONFIG_IP_PIMSM_V2=y
|
||||
CONFIG_ARPD=y
|
||||
CONFIG_SYN_COOKIES=y
|
||||
CONFIG_INET_AH=y
|
||||
CONFIG_INET_ESP=y
|
||||
CONFIG_INET_IPCOMP=y
|
||||
CONFIG_INET_XFRM_TUNNEL=y
|
||||
CONFIG_INET_TUNNEL=y
|
||||
CONFIG_INET_DIAG=y
|
||||
CONFIG_INET_TCP_DIAG=y
|
||||
# CONFIG_TCP_CONG_ADVANCED is not set
|
||||
CONFIG_TCP_CONG_BIC=y
|
||||
# CONFIG_IPV6 is not set
|
||||
# CONFIG_INET6_XFRM_TUNNEL is not set
|
||||
# CONFIG_INET6_TUNNEL is not set
|
||||
# CONFIG_NETFILTER is not set
|
||||
|
||||
#
|
||||
# DCCP Configuration (EXPERIMENTAL)
|
||||
#
|
||||
# CONFIG_IP_DCCP is not set
|
||||
|
||||
#
|
||||
# SCTP Configuration (EXPERIMENTAL)
|
||||
#
|
||||
# CONFIG_IP_SCTP is not set
|
||||
|
||||
#
|
||||
# TIPC Configuration (EXPERIMENTAL)
|
||||
#
|
||||
# CONFIG_TIPC is not set
|
||||
# CONFIG_ATM is not set
|
||||
CONFIG_BRIDGE=y
|
||||
CONFIG_VLAN_8021Q=y
|
||||
# CONFIG_DECNET is not set
|
||||
CONFIG_LLC=y
|
||||
# CONFIG_LLC2 is not set
|
||||
# CONFIG_IPX is not set
|
||||
# CONFIG_ATALK is not set
|
||||
# CONFIG_X25 is not set
|
||||
# CONFIG_LAPB is not set
|
||||
# CONFIG_NET_DIVERT is not set
|
||||
# CONFIG_ECONET is not set
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
|
||||
#
|
||||
# QoS and/or fair queueing
|
||||
#
|
||||
# CONFIG_NET_SCHED is not set
|
||||
|
||||
#
|
||||
# Network testing
|
||||
#
|
||||
# CONFIG_NET_PKTGEN is not set
|
||||
# CONFIG_HAMRADIO is not set
|
||||
# CONFIG_IRDA is not set
|
||||
# CONFIG_BT is not set
|
||||
# CONFIG_IEEE80211 is not set
|
||||
|
||||
#
|
||||
# Device Drivers
|
||||
#
|
||||
|
||||
#
|
||||
# Generic Driver Options
|
||||
#
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
# CONFIG_FW_LOADER is not set
|
||||
# CONFIG_DEBUG_DRIVER is not set
|
||||
|
||||
#
|
||||
# Connector - unified userspace <-> kernelspace linker
|
||||
#
|
||||
CONFIG_CONNECTOR=y
|
||||
CONFIG_PROC_EVENTS=y
|
||||
|
||||
#
|
||||
# Memory Technology Devices (MTD)
|
||||
#
|
||||
# CONFIG_MTD is not set
|
||||
|
||||
#
|
||||
# Parallel port support
|
||||
#
|
||||
# CONFIG_PARPORT is not set
|
||||
|
||||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
|
||||
#
|
||||
# Block devices
|
||||
#
|
||||
# CONFIG_BLK_DEV_COW_COMMON is not set
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
|
||||
CONFIG_BLK_DEV_NBD=y
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=8192
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
#
|
||||
# CONFIG_RAID_ATTRS is not set
|
||||
# CONFIG_SCSI is not set
|
||||
|
||||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
#
|
||||
# CONFIG_FUSION is not set
|
||||
|
||||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
|
||||
#
|
||||
# I2O device support
|
||||
#
|
||||
|
||||
#
|
||||
# Network device support
|
||||
#
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_DUMMY is not set
|
||||
# CONFIG_BONDING is not set
|
||||
# CONFIG_EQUALIZER is not set
|
||||
# CONFIG_TUN is not set
|
||||
|
||||
#
|
||||
# PHY device support
|
||||
#
|
||||
# CONFIG_PHYLIB is not set
|
||||
|
||||
#
|
||||
# Ethernet (10 or 100Mbit)
|
||||
#
|
||||
CONFIG_NET_ETHERNET=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_SMC91X=y
|
||||
# CONFIG_DM9000 is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
#
|
||||
|
||||
#
|
||||
# Ethernet (10000 Mbit)
|
||||
#
|
||||
|
||||
#
|
||||
# Token Ring devices
|
||||
#
|
||||
|
||||
#
|
||||
# Wireless LAN (non-hamradio)
|
||||
#
|
||||
# CONFIG_NET_RADIO is not set
|
||||
|
||||
#
|
||||
# Wan interfaces
|
||||
#
|
||||
# CONFIG_WAN is not set
|
||||
# CONFIG_PPP is not set
|
||||
# CONFIG_SLIP is not set
|
||||
# CONFIG_SHAPER is not set
|
||||
# CONFIG_NETCONSOLE is not set
|
||||
# CONFIG_NETPOLL is not set
|
||||
# CONFIG_NET_POLL_CONTROLLER is not set
|
||||
|
||||
#
|
||||
# ISDN subsystem
|
||||
#
|
||||
# CONFIG_ISDN is not set
|
||||
|
||||
#
|
||||
# Input device support
|
||||
#
|
||||
CONFIG_INPUT=y
|
||||
|
||||
#
|
||||
# Userland interfaces
|
||||
#
|
||||
CONFIG_INPUT_MOUSEDEV=y
|
||||
CONFIG_INPUT_MOUSEDEV_PSAUX=y
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
|
||||
# CONFIG_INPUT_JOYDEV is not set
|
||||
# CONFIG_INPUT_TSDEV is not set
|
||||
# CONFIG_INPUT_EVDEV is not set
|
||||
# CONFIG_INPUT_EVBUG is not set
|
||||
|
||||
#
|
||||
# Input Device Drivers
|
||||
#
|
||||
CONFIG_INPUT_KEYBOARD=y
|
||||
CONFIG_KEYBOARD_ATKBD=y
|
||||
# CONFIG_KEYBOARD_SUNKBD is not set
|
||||
# CONFIG_KEYBOARD_LKKBD is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
# CONFIG_KEYBOARD_NEWTON is not set
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=y
|
||||
# CONFIG_MOUSE_SERIAL is not set
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
# CONFIG_INPUT_JOYSTICK is not set
|
||||
# CONFIG_INPUT_TOUCHSCREEN is not set
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_UINPUT is not set
|
||||
|
||||
#
|
||||
# Hardware I/O ports
|
||||
#
|
||||
CONFIG_SERIO=y
|
||||
# CONFIG_SERIO_SERPORT is not set
|
||||
CONFIG_SERIO_AMBAKMI=y
|
||||
CONFIG_SERIO_LIBPS2=y
|
||||
# CONFIG_SERIO_RAW is not set
|
||||
# CONFIG_GAMEPORT is not set
|
||||
|
||||
#
|
||||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
# CONFIG_SERIAL_NONSTANDARD is not set
|
||||
|
||||
#
|
||||
# Serial drivers
|
||||
#
|
||||
# CONFIG_SERIAL_8250 is not set
|
||||
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
#
|
||||
# CONFIG_SERIAL_AMBA_PL010 is not set
|
||||
CONFIG_SERIAL_AMBA_PL011=y
|
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_CORE=y
|
||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
CONFIG_UNIX98_PTYS=y
|
||||
CONFIG_LEGACY_PTYS=y
|
||||
CONFIG_LEGACY_PTY_COUNT=256
|
||||
|
||||
#
|
||||
# IPMI
|
||||
#
|
||||
# CONFIG_IPMI_HANDLER is not set
|
||||
|
||||
#
|
||||
# Watchdog Cards
|
||||
#
|
||||
# CONFIG_WATCHDOG is not set
|
||||
# CONFIG_NVRAM is not set
|
||||
# CONFIG_DTLK is not set
|
||||
# CONFIG_R3964 is not set
|
||||
|
||||
#
|
||||
# Ftape, the floppy tape device driver
|
||||
#
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
|
||||
#
|
||||
# TPM devices
|
||||
#
|
||||
# CONFIG_TCG_TPM is not set
|
||||
# CONFIG_TELCLOCK is not set
|
||||
|
||||
#
|
||||
# I2C support
|
||||
#
|
||||
# CONFIG_I2C is not set
|
||||
|
||||
#
|
||||
# SPI support
|
||||
#
|
||||
# CONFIG_SPI is not set
|
||||
# CONFIG_SPI_MASTER is not set
|
||||
|
||||
#
|
||||
# Dallas's 1-wire bus
|
||||
#
|
||||
# CONFIG_W1 is not set
|
||||
|
||||
#
|
||||
# Hardware Monitoring support
|
||||
#
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_HWMON_VID is not set
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
#
|
||||
|
||||
#
|
||||
# LED devices
|
||||
#
|
||||
# CONFIG_NEW_LEDS is not set
|
||||
|
||||
#
|
||||
# LED drivers
|
||||
#
|
||||
|
||||
#
|
||||
# LED Triggers
|
||||
#
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
#
|
||||
# CONFIG_VIDEO_DEV is not set
|
||||
|
||||
#
|
||||
# Digital Video Broadcasting Devices
|
||||
#
|
||||
# CONFIG_DVB is not set
|
||||
|
||||
#
|
||||
# Graphics support
|
||||
#
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_CFB_FILLRECT=y
|
||||
CONFIG_FB_CFB_COPYAREA=y
|
||||
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||
# CONFIG_FB_MACMODES is not set
|
||||
# CONFIG_FB_FIRMWARE_EDID is not set
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
CONFIG_FB_TILEBLITTING=y
|
||||
CONFIG_FB_ARMCLCD=y
|
||||
# CONFIG_FB_S1D13XXX is not set
|
||||
# CONFIG_FB_VIRTUAL is not set
|
||||
|
||||
#
|
||||
# Console display driver support
|
||||
#
|
||||
# CONFIG_VGA_CONSOLE is not set
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
|
||||
# CONFIG_FONTS is not set
|
||||
CONFIG_FONT_8x8=y
|
||||
CONFIG_FONT_8x16=y
|
||||
|
||||
#
|
||||
# Logo configuration
|
||||
#
|
||||
CONFIG_LOGO=y
|
||||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
#
|
||||
CONFIG_USB_ARCH_HAS_HCD=y
|
||||
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||
# CONFIG_USB is not set
|
||||
|
||||
#
|
||||
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
|
||||
#
|
||||
|
||||
#
|
||||
# USB Gadget Support
|
||||
#
|
||||
# CONFIG_USB_GADGET is not set
|
||||
|
||||
#
|
||||
# MMC/SD Card support
|
||||
#
|
||||
CONFIG_MMC=y
|
||||
# CONFIG_MMC_DEBUG is not set
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_ARMMMCI=y
|
||||
|
||||
#
|
||||
# Real Time Clock
|
||||
#
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
# CONFIG_RTC_HCTOSYS is not set
|
||||
|
||||
#
|
||||
# RTC interfaces
|
||||
#
|
||||
CONFIG_RTC_INTF_SYSFS=y
|
||||
CONFIG_RTC_INTF_PROC=y
|
||||
CONFIG_RTC_INTF_DEV=y
|
||||
|
||||
#
|
||||
# RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_M48T86 is not set
|
||||
# CONFIG_RTC_DRV_TEST is not set
|
||||
|
||||
#
|
||||
# File systems
|
||||
#
|
||||
CONFIG_EXT2_FS=y
|
||||
# CONFIG_EXT2_FS_XATTR is not set
|
||||
# CONFIG_EXT2_FS_XIP is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
# CONFIG_REISERFS_FS is not set
|
||||
# CONFIG_JFS_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
# CONFIG_XFS_FS is not set
|
||||
# CONFIG_OCFS2_FS is not set
|
||||
# CONFIG_MINIX_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
CONFIG_INOTIFY=y
|
||||
# CONFIG_QUOTA is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
# CONFIG_AUTOFS_FS is not set
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
# CONFIG_FUSE_FS is not set
|
||||
|
||||
#
|
||||
# CD-ROM/DVD Filesystems
|
||||
#
|
||||
# CONFIG_ISO9660_FS is not set
|
||||
# CONFIG_UDF_FS is not set
|
||||
|
||||
#
|
||||
# DOS/FAT/NT Filesystems
|
||||
#
|
||||
# CONFIG_MSDOS_FS is not set
|
||||
# CONFIG_VFAT_FS is not set
|
||||
# CONFIG_NTFS_FS is not set
|
||||
|
||||
#
|
||||
# Pseudo filesystems
|
||||
#
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_SYSFS=y
|
||||
CONFIG_TMPFS=y
|
||||
# CONFIG_HUGETLB_PAGE is not set
|
||||
CONFIG_RAMFS=y
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
|
||||
#
|
||||
# Miscellaneous filesystems
|
||||
#
|
||||
# CONFIG_ADFS_FS is not set
|
||||
# CONFIG_AFFS_FS is not set
|
||||
# CONFIG_HFS_FS is not set
|
||||
# CONFIG_HFSPLUS_FS is not set
|
||||
# CONFIG_BEFS_FS is not set
|
||||
# CONFIG_BFS_FS is not set
|
||||
# CONFIG_EFS_FS is not set
|
||||
CONFIG_CRAMFS=y
|
||||
# CONFIG_VXFS_FS is not set
|
||||
# CONFIG_HPFS_FS is not set
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_SYSV_FS is not set
|
||||
# CONFIG_UFS_FS is not set
|
||||
|
||||
#
|
||||
# Network File Systems
|
||||
#
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
# CONFIG_NFS_V4 is not set
|
||||
# CONFIG_NFS_DIRECTIO is not set
|
||||
CONFIG_NFSD=y
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
# CONFIG_NFSD_TCP is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=y
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
# CONFIG_RPCSEC_GSS_KRB5 is not set
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=y
|
||||
# CONFIG_SMB_NLS_DEFAULT is not set
|
||||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
# CONFIG_CODA_FS is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
# CONFIG_9P_FS is not set
|
||||
|
||||
#
|
||||
# Partition Types
|
||||
#
|
||||
CONFIG_PARTITION_ADVANCED=y
|
||||
# CONFIG_ACORN_PARTITION is not set
|
||||
# CONFIG_OSF_PARTITION is not set
|
||||
# CONFIG_AMIGA_PARTITION is not set
|
||||
# CONFIG_ATARI_PARTITION is not set
|
||||
# CONFIG_MAC_PARTITION is not set
|
||||
CONFIG_MSDOS_PARTITION=y
|
||||
# CONFIG_BSD_DISKLABEL is not set
|
||||
# CONFIG_MINIX_SUBPARTITION is not set
|
||||
# CONFIG_SOLARIS_X86_PARTITION is not set
|
||||
# CONFIG_UNIXWARE_DISKLABEL is not set
|
||||
# CONFIG_LDM_PARTITION is not set
|
||||
# CONFIG_SGI_PARTITION is not set
|
||||
# CONFIG_ULTRIX_PARTITION is not set
|
||||
# CONFIG_SUN_PARTITION is not set
|
||||
# CONFIG_KARMA_PARTITION is not set
|
||||
# CONFIG_EFI_PARTITION is not set
|
||||
|
||||
#
|
||||
# Native Language Support
|
||||
#
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NLS_DEFAULT="iso8859-1"
|
||||
# CONFIG_NLS_CODEPAGE_437 is not set
|
||||
# CONFIG_NLS_CODEPAGE_737 is not set
|
||||
# CONFIG_NLS_CODEPAGE_775 is not set
|
||||
# CONFIG_NLS_CODEPAGE_850 is not set
|
||||
# CONFIG_NLS_CODEPAGE_852 is not set
|
||||
# CONFIG_NLS_CODEPAGE_855 is not set
|
||||
# CONFIG_NLS_CODEPAGE_857 is not set
|
||||
# CONFIG_NLS_CODEPAGE_860 is not set
|
||||
# CONFIG_NLS_CODEPAGE_861 is not set
|
||||
# CONFIG_NLS_CODEPAGE_862 is not set
|
||||
# CONFIG_NLS_CODEPAGE_863 is not set
|
||||
# CONFIG_NLS_CODEPAGE_864 is not set
|
||||
# CONFIG_NLS_CODEPAGE_865 is not set
|
||||
# CONFIG_NLS_CODEPAGE_866 is not set
|
||||
# CONFIG_NLS_CODEPAGE_869 is not set
|
||||
# CONFIG_NLS_CODEPAGE_936 is not set
|
||||
# CONFIG_NLS_CODEPAGE_950 is not set
|
||||
# CONFIG_NLS_CODEPAGE_932 is not set
|
||||
# CONFIG_NLS_CODEPAGE_949 is not set
|
||||
# CONFIG_NLS_CODEPAGE_874 is not set
|
||||
# CONFIG_NLS_ISO8859_8 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1250 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1251 is not set
|
||||
# CONFIG_NLS_ASCII is not set
|
||||
# CONFIG_NLS_ISO8859_1 is not set
|
||||
# CONFIG_NLS_ISO8859_2 is not set
|
||||
# CONFIG_NLS_ISO8859_3 is not set
|
||||
# CONFIG_NLS_ISO8859_4 is not set
|
||||
# CONFIG_NLS_ISO8859_5 is not set
|
||||
# CONFIG_NLS_ISO8859_6 is not set
|
||||
# CONFIG_NLS_ISO8859_7 is not set
|
||||
# CONFIG_NLS_ISO8859_9 is not set
|
||||
# CONFIG_NLS_ISO8859_13 is not set
|
||||
# CONFIG_NLS_ISO8859_14 is not set
|
||||
# CONFIG_NLS_ISO8859_15 is not set
|
||||
# CONFIG_NLS_KOI8_R is not set
|
||||
# CONFIG_NLS_KOI8_U is not set
|
||||
# CONFIG_NLS_UTF8 is not set
|
||||
|
||||
#
|
||||
# Profiling support
|
||||
#
|
||||
# CONFIG_PROFILING is not set
|
||||
|
||||
#
|
||||
# Kernel hacking
|
||||
#
|
||||
# CONFIG_PRINTK_TIME is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_DEBUG_KERNEL=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_DETECT_SOFTLOCKUP=y
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_DEBUG_SLAB is not set
|
||||
CONFIG_DEBUG_MUTEXES=y
|
||||
# CONFIG_DEBUG_SPINLOCK is not set
|
||||
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
||||
# CONFIG_DEBUG_KOBJECT is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
# CONFIG_DEBUG_VM is not set
|
||||
CONFIG_FRAME_POINTER=y
|
||||
# CONFIG_UNWIND_INFO is not set
|
||||
CONFIG_FORCED_INLINING=y
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_DEBUG_USER is not set
|
||||
# CONFIG_DEBUG_WAITQ is not set
|
||||
CONFIG_DEBUG_ERRORS=y
|
||||
# CONFIG_DEBUG_LL is not set
|
||||
|
||||
#
|
||||
# Security options
|
||||
#
|
||||
# CONFIG_KEYS is not set
|
||||
# CONFIG_SECURITY is not set
|
||||
|
||||
#
|
||||
# Cryptographic options
|
||||
#
|
||||
CONFIG_CRYPTO=y
|
||||
CONFIG_CRYPTO_HMAC=y
|
||||
# CONFIG_CRYPTO_NULL is not set
|
||||
# CONFIG_CRYPTO_MD4 is not set
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
# CONFIG_CRYPTO_SHA256 is not set
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
CONFIG_CRYPTO_DES=y
|
||||
# CONFIG_CRYPTO_BLOWFISH is not set
|
||||
# CONFIG_CRYPTO_TWOFISH is not set
|
||||
# CONFIG_CRYPTO_SERPENT is not set
|
||||
# CONFIG_CRYPTO_AES is not set
|
||||
# CONFIG_CRYPTO_CAST5 is not set
|
||||
# CONFIG_CRYPTO_CAST6 is not set
|
||||
# CONFIG_CRYPTO_TEA is not set
|
||||
# CONFIG_CRYPTO_ARC4 is not set
|
||||
# CONFIG_CRYPTO_KHAZAD is not set
|
||||
# CONFIG_CRYPTO_ANUBIS is not set
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
# CONFIG_CRYPTO_MICHAEL_MIC is not set
|
||||
# CONFIG_CRYPTO_CRC32C is not set
|
||||
# CONFIG_CRYPTO_TEST is not set
|
||||
|
||||
#
|
||||
# Hardware crypto devices
|
||||
#
|
||||
|
||||
#
|
||||
# Library routines
|
||||
#
|
||||
# CONFIG_CRC_CCITT is not set
|
||||
# CONFIG_CRC16 is not set
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
|
||||
|
||||
pkgname=kernel26
|
||||
pkgver=2.6.29
|
||||
_gitver=f19f259d3c1afde8eae53983fd19f61831927413
|
||||
groups=('base' 'small-base')
|
||||
pkgrel=4
|
||||
pkgdesc="The Linux Kernel and modules"
|
||||
arch=(arm)
|
||||
license=('GPL2')
|
||||
url="http://wiki.openmoko.org/wiki/Kernel"
|
||||
depends=('coreutils')
|
||||
makedepends=('git' 'uboot-mkimage-native')
|
||||
source=('build' 'append-GTA02')
|
||||
md5sums=('6a8b9286ac61ba7d4593da23ca21cf0e'
|
||||
'ad1cb2f0a3000f5285c58b22fe8f4de3')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}
|
||||
# make this build clean
|
||||
if [ -x linux-2.6 ]; then
|
||||
cd linux-2.6
|
||||
git reset --hard ORIG_HEAD
|
||||
else
|
||||
git clone git://git.openmoko.org/git/kernel.git linux-2.6
|
||||
cd linux-2.6
|
||||
git checkout --track -b andy-tracking origin/andy-tracking
|
||||
fi
|
||||
git checkout ${_gitver}
|
||||
rm -rf GTA02
|
||||
mkdir GTA02
|
||||
cp ./arch/arm/configs/gta02_moredrivers_defconfig GTA02/.config
|
||||
|
||||
sh ${srcdir}/build GTA02 with_modules
|
||||
|
||||
mkdir -p ${pkgdir}/boot
|
||||
|
||||
cp -a GTA02/staging/lib ${pkgdir}
|
||||
cp GTA02/uImage-moredrivers-*.bin ${pkgdir}/boot
|
||||
cd ${pkgdir}/boot
|
||||
ln -s uImage-moredrivers-*.bin uImage-GTA02.bin
|
||||
cp ${srcdir}/append-GTA02 ${pkgdir}/boot
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
console=tty0
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Kernel building helper script (C)2008 Openmoko, Inc
|
||||
# Andy Green <andy@openmoko.org>
|
||||
#
|
||||
# Licensed under GPLv3 or later
|
||||
#
|
||||
#
|
||||
# you need to run this from the top level source dir, but it creates all
|
||||
# object files into a subdir given in the first argument, eg
|
||||
#
|
||||
# ./build GTA02
|
||||
#
|
||||
# this radically speeds up swapping between build contexts. Note the config
|
||||
# for each build lives in the subdir.
|
||||
|
||||
PARALLEL=16
|
||||
|
||||
if [ -z "$1" ] ; then
|
||||
echo "Specify the build subdir, eg, GTA02 which contains the .config"
|
||||
echo "and will hold the object files"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p $1
|
||||
|
||||
#export CROSS_COMPILE=/usr/local/openmoko/arm/bin/arm-angstrom-linux-gnueabi-
|
||||
make O=$1 ARCH=arm silentoldconfig
|
||||
|
||||
#
|
||||
# figure out what we are building
|
||||
#
|
||||
|
||||
PRODUCT=
|
||||
|
||||
if [ ! -z "`grep CONFIG_MACH_NEO1973_GTA01=y $1/.config`" ] ; then
|
||||
START=30008000
|
||||
PRODUCT=GTA01
|
||||
fi
|
||||
|
||||
if [ ! -z "`grep CONFIG_MACH_NEO1973_GTA02=y $1/.config`" ] ; then
|
||||
START=30008000
|
||||
PRODUCT=GTA02
|
||||
fi
|
||||
|
||||
if [ ! -z "`grep CONFIG_MACH_OPENMOKO_GTA03=y $1/.config`" ] ; then
|
||||
START=50008000
|
||||
PRODUCT=GTA03
|
||||
fi
|
||||
|
||||
if [ ! -z "`grep CONFIG_MACH_SMDK6410=y $1/.config`" ] ; then
|
||||
START=50008000
|
||||
PRODUCT=SMDK6410
|
||||
fi
|
||||
|
||||
if [ ! -z "`grep CONFIG_MACH_M800=y $1/.config`" ] ; then
|
||||
START=30008000
|
||||
PRODUCT=M800
|
||||
fi
|
||||
|
||||
if [ -z "$PRODUCT" ] ; then
|
||||
echo "Unable to figure out what we are building from the config"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# get the branch and head hash for the version we are building to
|
||||
# allow source tracability
|
||||
#
|
||||
|
||||
VERSION=
|
||||
if [ -d .git ] ; then
|
||||
HEAD=`git show --pretty=oneline | head -n1 | cut -d' ' -f1 | cut -b1-16`
|
||||
BRANCH=andy-tracking
|
||||
VERSION=-$PRODUCT\_$BRANCH
|
||||
fi
|
||||
|
||||
|
||||
echo $MKIMAGECMD
|
||||
|
||||
#
|
||||
# actually make it
|
||||
#
|
||||
|
||||
echo make -j$PARALLEL O=$1 ARCH=arm CONFIG_DEBUG_SECTION_MISMATCH=y EXTRAVERSION=$VERSION;
|
||||
|
||||
if make -j$PARALLEL O=$1 ARCH=arm CONFIG_DEBUG_SECTION_MISMATCH=y EXTRAVERSION=$VERSION; then
|
||||
|
||||
#
|
||||
# if the build is happy, postprocess it by strip and with U-Boot header wrapper
|
||||
# you can get mkimage from U-Boot or Qi build
|
||||
#
|
||||
|
||||
${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S $1/arch/arm/boot/compressed/vmlinux $1/linux.bin
|
||||
mkimage -A arm -O linux -T kernel -C none -a $START -e $START -n "OM $PRODUCT $BRANCH""_$HEAD" -d $1/linux.bin $1/uImage-$PRODUCT.bin
|
||||
|
||||
# we can see if it is an "moredrivers" build by looking for USB Eth gadget
|
||||
# if it is then keep a stamped copy of last build
|
||||
|
||||
if [ ! -z "`grep CONFIG_USB_USBNET=y $1/.config`" ] ; then
|
||||
rm -f $1/uImage-moredrivers-$PRODUCT*.bin $1/modules-$PRODUCT*.tar.gz
|
||||
cp $1/uImage-$PRODUCT.bin $1/uImage-moredrivers$VERSION-$HEAD.bin
|
||||
rm -rf $1/staging
|
||||
mkdir -p $1/staging
|
||||
if [ ! -z "$2" ] ; then
|
||||
make O=$1 ARCH=arm modules_install INSTALL_MOD_PATH=staging
|
||||
cd $1/staging
|
||||
tar czf ../modules$VERSION-$HEAD.tar.gz .
|
||||
cd ../..
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
4461
core/kernel26/config
4461
core/kernel26/config
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,142 +0,0 @@
|
|||
# arg 1: the new package version
|
||||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=
|
||||
KERNEL_VERSION=2.6.30-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod $KERNEL_VERSION
|
||||
# generate init ramdisks
|
||||
echo ">>> MKINITCPIO SETUP"
|
||||
echo ">>> ----------------"
|
||||
echo ">>> If you use LVM2, Encrypted root or software RAID,"
|
||||
echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ."
|
||||
echo ">>> More information about mkinitcpio setup can be found here:"
|
||||
echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio"
|
||||
echo ""
|
||||
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME}
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
pacman -Q grub &>/dev/null
|
||||
hasgrub=$?
|
||||
pacman -Q grub2 &>/dev/null
|
||||
hasgrub2=$?
|
||||
pacman -Q lilo &>/dev/null
|
||||
haslilo=$?
|
||||
# reminder notices
|
||||
if [ $haslilo -eq 0 ]; then
|
||||
echo ">>>"
|
||||
if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
|
||||
echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
|
||||
else
|
||||
echo ">>> You appear to be using the LILO bootloader. You should run"
|
||||
echo ">>> 'lilo' before rebooting."
|
||||
fi
|
||||
echo ">>>"
|
||||
fi
|
||||
|
||||
if grep "/boot" /etc/fstab 2>&1 >/dev/null; then
|
||||
if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then
|
||||
echo "WARNING: /boot appears to be a seperate partition but is not mounted"
|
||||
echo " This is most likely not what you want. Please mount your /boot"
|
||||
echo " partition and reinstall the kernel unless you are sure this is OK"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "`vercmp $2 2.6.13`" -lt 0 ]; then
|
||||
# important upgrade notice
|
||||
echo ">>>"
|
||||
echo ">>> IMPORTANT KERNEL UPGRADE NOTICE"
|
||||
echo ">>> -------------------------------"
|
||||
echo ">>> As of kernel 2.6.13, DevFS is NO LONGER AVAILABLE!"
|
||||
echo ">>> If you still use DevFS, please make the transition to uDev before"
|
||||
echo ">>> rebooting. If you really need to stay with DevFS for some reason,"
|
||||
echo ">>> then you can manually downgrade to an older version:"
|
||||
echo ">>>"
|
||||
echo ">>> # pacman -U http://archlinux.org/~judd/kernel/kernel26-scsi-2.6.12.2-1.pkg.tar.gz"
|
||||
echo ">>>"
|
||||
echo ">>> If you choose to downgrade, don't forget to add kernel26-scsi to your"
|
||||
echo ">>> IgnorePkg list in /etc/pacman.conf"
|
||||
echo ">>>"
|
||||
echo ">>> (NOTE: The following portion applies to uDev users as well!)"
|
||||
echo ">>>"
|
||||
echo ">>> If you use any DevFS paths in your GRUB menu.lst, then you will not"
|
||||
echo ">>> be able to boot! Change your root= parameter to use the classic"
|
||||
echo ">>> naming scheme."
|
||||
echo ">>>"
|
||||
echo ">>> EXAMPLES:"
|
||||
echo ">>> - change root=/dev/discs/disc0/part3 to root=/dev/sda3"
|
||||
echo ">>> - change root=/dev/md/0 to root=/dev/md0"
|
||||
echo ">>>"
|
||||
fi
|
||||
# generate new init ramdisk
|
||||
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
|
||||
echo ">>> --------------------------------------------------------------"
|
||||
echo ">>> | WARNING: |"
|
||||
echo ">>> |mkinitrd is not supported anymore in kernel >=2.6.18 series!|"
|
||||
echo ">>> | Please change to Mkinitcpio setup. |"
|
||||
echo ">>> --------------------------------------------------------------"
|
||||
echo ">>>"
|
||||
fi
|
||||
# updating module dependencies
|
||||
echo ">>> Updating module dependencies. Please wait ..."
|
||||
depmod $KERNEL_VERSION
|
||||
echo ">>> MKINITCPIO SETUP"
|
||||
echo ">>> ----------------"
|
||||
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
|
||||
echo ">>> Please change your bootloader config files:"
|
||||
echo ">>> Grub: /boot/grub/menu.lst | Lilo: /etc/lilo.conf"
|
||||
echo "------------------------------------------------"
|
||||
echo "| - initrd26.img to kernel26${KERNEL_NAME}.img |"
|
||||
echo "| - initrd26-full.img to kernel26${KERNEL_NAME}-fallback.img |"
|
||||
echo "------------------------------------------------"
|
||||
fi
|
||||
if [ "`vercmp $2 2.6.19`" -lt 0 ]; then
|
||||
echo ""
|
||||
echo ">>> New PATA/IDE subsystem - EXPERIMENTAL"
|
||||
echo ">>> ----------"
|
||||
echo ">>> To use the new pata drivers, change the 'ide' hook "
|
||||
echo ">>> to 'pata' in /etc/mkinicpio.conf HOOKS="
|
||||
echo ">>> The new system changes: /dev/hd? to /dev/sd?"
|
||||
echo ">>> Don't forget to modify GRUB, LILO and fstab to the"
|
||||
echo ">>> new naming system. "
|
||||
echo ">>> eg: hda3 --> sda3, hdc8 --> sdc8"
|
||||
echo ""
|
||||
echo ">>> piix/ata_piix (Intel chipsets) - IMPORTANT"
|
||||
echo "----------"
|
||||
echo ">>> If you have enabled ide/pata/sata HOOKs in /etc/mkinitcpio.conf"
|
||||
echo ">>> the 'ata_piix' module will be used."
|
||||
echo ">>> This may cause your devices to shift names, eg:"
|
||||
echo ">>> - IDE: devices from hd? to sd?"
|
||||
echo ">>> - SATA: sda might shift to sdc if you have 2 other disks on a PIIX IDE port."
|
||||
echo ">>> To check if this will affect you, check 'mkinitcpio -M' for piix/ata_piix"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echo ">>> If you use LVM2, Encrypted root or software RAID,"
|
||||
echo ">>> Ensure you enable support in /etc/mkinitcpio.conf ."
|
||||
echo ">>> More information about mkinitcpio setup can be found here:"
|
||||
echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio"
|
||||
echo ""
|
||||
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
|
||||
if [ "`vercmp $2 2.6.19`" -lt 0 ]; then
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME} -m "ATTENTION:\nIf you get a kernel panic below
|
||||
and are using an Intel chipset, append 'earlymodules=piix' to the
|
||||
kernel commandline"
|
||||
else
|
||||
/sbin/mkinitcpio -p kernel26${KERNEL_NAME}
|
||||
fi
|
||||
if [ "`vercmp $2 2.6.21`" -lt 0 ]; then
|
||||
echo ""
|
||||
echo "Important ACPI Information:"
|
||||
echo ">>> Since 2.6.20.7 all possible ACPI parts are modularized."
|
||||
echo ">>> The modules are located at:"
|
||||
echo ">>> /lib/modules/$(uname -r)/kernel/drivers/acpi"
|
||||
echo ">>> For more information about ACPI modules check this wiki page:"
|
||||
echo ">>> 'http://wiki.archlinux.org/index.php/ACPI_modules'"
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
# mkinitcpio preset file for kernel26
|
||||
|
||||
########################################
|
||||
# DO NOT EDIT THIS LINE:
|
||||
source /etc/mkinitcpio.d/kernel26.kver
|
||||
########################################
|
||||
ALL_config="/etc/mkinitcpio.conf"
|
||||
|
||||
PRESETS=('default' 'fallback')
|
||||
|
||||
#default_config="/etc/mkinitcpio.conf"
|
||||
default_image="/boot/kernel26.img"
|
||||
#default_options=""
|
||||
|
||||
#fallback_config="/etc/mkinitcpio.conf"
|
||||
fallback_image="/boot/kernel26-fallback.img"
|
||||
fallback_options="-S autodetect"
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue