mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-31 05:22:24 +01:00
*/*-vanilla: remove linux-vanilla. replaced by linux-lts
Users should use linux-lts. We remove linux-vanilla to reduce reduce the maintenance burden.
This commit is contained in:
Natanael Copa
parent
93a228295b
commit
eba4f554cc
@ -1,95 +0,0 @@
|
||||
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
|
||||
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
|
||||
|
||||
# Jool version
|
||||
# Keep _ver in sync with community/jool-tools!
|
||||
# When changing _ver we *must* bump _rel!
|
||||
_name=jool-modules
|
||||
_ver=4.0.6
|
||||
_rel=0
|
||||
|
||||
# For custom kernels set $FLAVOR.
|
||||
_flavor="$FLAVOR"
|
||||
_extra_flavors=""
|
||||
if [ -z "$FLAVOR" ]; then
|
||||
_flavor=vanilla
|
||||
case $CARCH in
|
||||
x86 | x86_64) _extra_flavors="virt";;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Kernel version
|
||||
# Keep in sync with main/linux-vanilla!
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
pkgdesc="SIIT and NAT64 for Linux (kernel modules for linux-$_flavor)"
|
||||
url="https://jool.mx"
|
||||
arch="all"
|
||||
license="GPL-2.0-or-later"
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
makedepends="$_kpkg-dev=$_kpkgver linux-headers"
|
||||
install_if="$_kpkg=$_kpkgver jool-tools"
|
||||
subpackages=""
|
||||
source="https://github.com/NICMx/Jool/releases/download/v$_ver/jool-$_ver.tar.gz"
|
||||
builddir="$srcdir/jool-$_ver"
|
||||
options="!check" # no tests provided
|
||||
|
||||
for _f in $_extra_flavors; do
|
||||
makedepends="$makedepends linux-$_f-dev=$_kpkgver"
|
||||
subpackages="$subpackages $_name-$_f:_extra"
|
||||
done
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
if [ -z "$FLAVOR" ]; then
|
||||
( . "$startdir"/../../main/linux-$_flavor/APKBUILD
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
|
||||
local flavor; for flavor in $_flavor $_extra_flavors; do
|
||||
cp -r "$builddir" "$srcdir"/$flavor
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
|
||||
local flavor; for flavor in $_flavor $_extra_flavors; do
|
||||
make -C "$srcdir"/"$flavor"/src/mod \
|
||||
MODULES_DIR="/lib/modules/$_kver-$_krel-$flavor"
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
_modules_install "$_flavor" "$pkgdir"
|
||||
}
|
||||
|
||||
_extra() {
|
||||
local flavor=${subpkgname##*-}
|
||||
depends="linux-$flavor=$_kpkgver"
|
||||
install_if="linux-$flavor=$_kpkgver jool-tools"
|
||||
pkgdesc="SIIT and NAT64 for Linux (kernel modules for linux-$flavor)"
|
||||
|
||||
_modules_install "$flavor" "$subpkgdir"
|
||||
}
|
||||
|
||||
_modules_install() {
|
||||
local flavor="$1"
|
||||
local destdir="$2"
|
||||
|
||||
make -C "$srcdir"/$flavor/src/mod modules_install \
|
||||
MODULES_DIR=/lib/modules/$_kver-$_krel-$flavor \
|
||||
INSTALL_MOD_PATH="$destdir"
|
||||
}
|
||||
|
||||
sha512sums="8648cc876d801b34c4bc9616da642727d1e49ed2937daa7fdca58c0fd80dbd1c432018af410c44c1d24224aba5289f726f43adc259cdf8193832d39a86d0f6a6 jool-4.0.6.tar.gz"
|
||||
@ -1,96 +0,0 @@
|
||||
# Maintainer: Ben Allen <bensallen@me.com>
|
||||
# Contributor: Ben Allen <bensallen@me.com>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=virtualbox-guest-modules
|
||||
_ver=6.0.14
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi=$_kver-$_krel-$_flavor
|
||||
_kabi_virt=$_kver-$_krel-virt
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(($_krel + $_rel))
|
||||
|
||||
pkgdesc="VirtualBox Additions guest kernel modules for $_flavor"
|
||||
arch='x86_64' # seems to fail on x86: https://github.com/alpinelinux/aports/pull/8215#issuecomment-496630776
|
||||
url='https://virtualbox.org/'
|
||||
license="GPL-2.0 custom"
|
||||
makedepends="linux-vanilla-dev=$_kpkgver linux-virt-dev=$_kpkgver sed coreutils"
|
||||
subpackages="$_name-virt:virt"
|
||||
source="https://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2
|
||||
"
|
||||
install_if="linux-$_flavor=$_kpkgver virtualbox-guest-additions"
|
||||
builddir="$srcdir"/VirtualBox-$_ver
|
||||
|
||||
prepare() {
|
||||
local i
|
||||
|
||||
cd "$builddir"
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
KERN_VER=$_kabi "$builddir"/src/VBox/Additions/linux/export_modules.sh \
|
||||
"$srcdir/vbox-kmod-$_ver.tar.gz"
|
||||
|
||||
for i in $_kabi $_kabi_virt; do
|
||||
mkdir -p "$srcdir/$i"
|
||||
tar -C "$srcdir/$i" -zxf "$srcdir"/vbox-kmod-$_ver.tar.gz
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
local i
|
||||
for i in $_kabi $_kabi_virt; do
|
||||
cd "$srcdir/$i"
|
||||
# Build Kernel Modules
|
||||
msg "Build for $i"
|
||||
make KERN_DIR=/lib/modules/${i}/build all
|
||||
done
|
||||
}
|
||||
|
||||
check() {
|
||||
local i
|
||||
for i in $_kabi $_kabi_virt; do
|
||||
cd "$srcdir/$i"
|
||||
make KERN_DIR=/lib/modules/${i}/build check
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
local i module=
|
||||
for i in $_kabi $_kabi_virt; do
|
||||
cd "$srcdir/$i"
|
||||
for module in *.ko; do
|
||||
install -v -D -m644 ${module} \
|
||||
"$pkgdir/lib/modules/$i/misc/${module}"
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
virt() {
|
||||
pkgdesc="VirtualBox Additions kernel modules for virt"
|
||||
install_if="linux-virt=$_kpkgver virtualbox-guest-additions"
|
||||
mkdir -p "$subpkgdir"/lib/modules/
|
||||
# vboxvideo.ko won't load with virt kernel as it doesn't have DRM
|
||||
rm "$pkgdir"/lib/modules/$_kabi_virt/misc/vboxvideo.ko
|
||||
mv "$pkgdir"/lib/modules/$_kabi_virt \
|
||||
"$subpkgdir"/lib/modules/
|
||||
}
|
||||
|
||||
sha512sums="e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d VirtualBox-6.0.14.tar.bz2"
|
||||
@ -1,76 +0,0 @@
|
||||
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||
index bd81000..aa9d6b0 100644
|
||||
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||
@@ -958,7 +958,7 @@ EXPORT_SYMBOL(VBoxGuestIDCCall);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
|
||||
|
||||
/** log and dbg_log parameter setter. */
|
||||
-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
|
||||
{
|
||||
if (g_fLoggerCreated)
|
||||
{
|
||||
@@ -973,7 +973,7 @@ static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *p
|
||||
}
|
||||
|
||||
/** log and dbg_log parameter getter. */
|
||||
-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
|
||||
{
|
||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||
*pszBuf = '\0';
|
||||
@@ -984,7 +984,7 @@ static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
|
||||
|
||||
|
||||
/** log and dbg_log_flags parameter setter. */
|
||||
-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
|
||||
{
|
||||
if (g_fLoggerCreated)
|
||||
{
|
||||
@@ -998,7 +998,7 @@ static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param
|
||||
}
|
||||
|
||||
/** log and dbg_log_flags parameter getter. */
|
||||
-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
|
||||
{
|
||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||
*pszBuf = '\0';
|
||||
@@ -1009,7 +1009,7 @@ static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
|
||||
|
||||
|
||||
/** log and dbg_log_dest parameter setter. */
|
||||
-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
|
||||
{
|
||||
if (g_fLoggerCreated)
|
||||
{
|
||||
@@ -1023,7 +1023,7 @@ static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *p
|
||||
}
|
||||
|
||||
/** log and dbg_log_dest parameter getter. */
|
||||
-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
|
||||
{
|
||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||
*pszBuf = '\0';
|
||||
@@ -1034,7 +1034,7 @@ static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
|
||||
|
||||
|
||||
/** r3_log_to_host parameter setter. */
|
||||
-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
|
||||
{
|
||||
if ( pszValue == NULL
|
||||
|| *pszValue == '\0'
|
||||
@@ -1052,7 +1052,7 @@ static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_par
|
||||
}
|
||||
|
||||
/** r3_log_to_host parameter getter. */
|
||||
-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
|
||||
+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
|
||||
{
|
||||
strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
|
||||
return strlen(pszBuf);
|
||||
@ -1,91 +0,0 @@
|
||||
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
|
||||
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
|
||||
|
||||
# wireguard version
|
||||
_ver=0.0.20191212
|
||||
_rel=0
|
||||
|
||||
# kernel version
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
|
||||
# for custom kernels set $FLAVOR
|
||||
_extra_flavors=
|
||||
if [ -z "$FLAVOR" ]; then
|
||||
_flavor=vanilla
|
||||
case $CARCH in
|
||||
x86|x86_64) _extra_flavors="virt";;
|
||||
esac
|
||||
else
|
||||
_flavor=$FLAVOR
|
||||
fi
|
||||
_kpkg=linux-$_flavor
|
||||
|
||||
pkgname=wireguard-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_rel + $_krel))
|
||||
|
||||
pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
|
||||
arch="all"
|
||||
url="https://www.wireguard.com"
|
||||
license="GPL-2.0"
|
||||
depends="linux-$_flavor=$_kpkgver"
|
||||
makedepends="
|
||||
libmnl-dev
|
||||
linux-$_flavor-dev=$_kpkgver
|
||||
linux-firmware-none
|
||||
"
|
||||
install_if="wireguard-tools-wg=$_ver-r$_rel linux-$_flavor=$_kpkgver"
|
||||
options="!check"
|
||||
source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz"
|
||||
builddir="$srcdir"/WireGuard-$_ver
|
||||
|
||||
for f in $_extra_flavors; do
|
||||
makedepends="$makedepends linux-$f-dev=$_kpkgver"
|
||||
subpackages="$subpackages wireguard-$f:_extra"
|
||||
done
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
if [ -z "$FLAVOR" ]; then
|
||||
( . "$startdir"/../../main/linux-$_flavor/APKBUILD
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
local flavor=
|
||||
for flavor in $_flavor $_extra_flavors; do
|
||||
cp -r "$builddir" "$srcdir"/$flavor
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
local flavor= kabi=
|
||||
for flavor in $_flavor $_extra_flavors; do
|
||||
kabi="$_kver-$_krel-$flavor"
|
||||
make -C "$srcdir/$flavor"/src \
|
||||
KERNELDIR=/lib/modules/$kabi/build module
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
local kabi="$_kver-$_krel-$_flavor"
|
||||
install -Dm644 "$srcdir"/$_flavor/src/wireguard.ko \
|
||||
"$pkgdir/lib/modules/$kabi/extra/wireguard.ko"
|
||||
}
|
||||
|
||||
_extra() {
|
||||
flavor=${subpkgname##*-}
|
||||
depends="linux-$flavor=$_kpkgver"
|
||||
install_if="wireguard-tools-wg=$_ver-r$_rel linux-$flavor=$_kpkgver"
|
||||
pkgdesc="Next generation secure network tunnel: kernel modules for $flavor"
|
||||
local kabi="$_kver-$_krel-$flavor"
|
||||
install -Dm644 "$srcdir"/virt/src/wireguard.ko \
|
||||
"$subpkgdir/lib/modules/$kabi/extra/wireguard.ko"
|
||||
}
|
||||
|
||||
sha512sums="3e6b3841c72f0b30dab6e61ba07a865c5601617047f90a228cefc4ed6eb0511b9c76d745df9a89dfc71791937e1268bbc0b1cfa6f7291b77a4db0f2fb14d272a WireGuard-0.0.20191212.tar.xz"
|
||||
@ -1,94 +0,0 @@
|
||||
# Contributor: Timo Teras <timo.teras@iki.fi>
|
||||
# Maintainer: Timo Teras <timo.teras@iki.fi>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=dahdi-linux
|
||||
_ver=3.0.0
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="Digium Asterisk Hardware Device Interface drivers $_ver"
|
||||
url="http://www.asterisk.org"
|
||||
arch="x86 x86_64"
|
||||
license="GPL-2.0"
|
||||
depends="dahdi-linux $_kpkg=$_kpkgver"
|
||||
# we need wget and tar because make install downloads firmware and uses fancy
|
||||
# options for tar and wget.
|
||||
makedepends="$_kpkg-dev=$_kpkgver wget tar perl"
|
||||
subpackages="$pkgname-dev"
|
||||
options="net"
|
||||
#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
|
||||
source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-$_ver.tar.gz
|
||||
dahdi-depmod.patch
|
||||
dahdi-bri_dchan.patch
|
||||
dahdi-zaphfc.patch
|
||||
zaphfc-dahdi-flortz.patch
|
||||
zaphfc-dahdi-2.4.0.patch
|
||||
zaphfc-dahdi-2.5.0.patch
|
||||
zaphfc-dahdi-2.6.0.patch
|
||||
zaphfc-dahdi-2.7.0.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir/$_name-$_ver"
|
||||
|
||||
# grsec legacy
|
||||
[ "$_flavor" = "hardened" ] && provides="$_name-grsec=$pkgver-r$pkgrel"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_flavor/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$_name-$_ver"
|
||||
make KVERS="${_kabi}" DYNFS="yes" MODULES_EXTRA="zaphfc"
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$_name-$_ver"
|
||||
make KVERS="${_kabi}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
|
||||
DESTDIR="$pkgdir" install-modules
|
||||
rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \
|
||||
"$pkgdir"/usr/include || true
|
||||
}
|
||||
|
||||
# since we sourced the APKBUILD above we got the dev() function there to
|
||||
# so we override it again.
|
||||
depends_dev="dahdi-linux-dev"
|
||||
dev() {
|
||||
default_dev
|
||||
local dir="$subpkgdir"/usr/src/dahdi-headers-${_kabi}
|
||||
install -D "$srcdir"/$_name-$_ver/drivers/dahdi/Module.symvers \
|
||||
"$dir"/drivers/dahdi/Module.symvers
|
||||
ln -s /usr/include "$dir"/include
|
||||
}
|
||||
|
||||
sha512sums="7c281059f4c8faf3733f7790dc184d810a4a2839ceaa79d6190128bea182db38bc293f04a996254950531abea5532cb030d50265cd044e0847f1e8ece7b15395 dahdi-linux-3.0.0.tar.gz
|
||||
aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch
|
||||
fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch
|
||||
8ef31c9723237da83954832df5aee1f5daa23f8fefe07a1a191a2c5da2c2308001d68cee83500f7ef43166bfc0d65552b0ca5362789c5c82a7217e09362fd5fe dahdi-zaphfc.patch
|
||||
f18043fd18a05be7e49daa9d8c96c8a8c45936b14e82e30523e4d88b1620a73147f765d24d2038c4ec0855901e36e8e2b188d596f94437dfb80f6d76ab699d9d zaphfc-dahdi-flortz.patch
|
||||
8068fcbba81b819bbd14a1a324457d0febd5350d16c6443be035c50f7759010376bd92d3c7ea69b47309e02603e587387b643f64663652e162853515371a6da5 zaphfc-dahdi-2.4.0.patch
|
||||
95811d56f5567bbab1e6fac89fdc7a4d78252a54a416e884903ae2709f8922f5cd02c492de0bad5c35fdfd52250ec231ed11457e36ba33f8747c3226491882de zaphfc-dahdi-2.5.0.patch
|
||||
7533c640817f71789c922bb9a5a3b6132b5b47958770929b1c9a50a1e2e6de914e278f466a85ef99759e291e5907c56d60926c74075f4e731a9910a46c1be3ea zaphfc-dahdi-2.6.0.patch
|
||||
daca74da31c655265164a854987d45ca5ee3af1defbe2d49a9f1a70a48a43dc2bc3ceba724781ae29e3a9078b827f641d2e29809fb25101986f2f69c767d1382 zaphfc-dahdi-2.7.0.patch"
|
||||
@ -1,22 +0,0 @@
|
||||
--- ./drivers/dahdi/voicebus/voicebus.h.orig
|
||||
+++ ./drivers/dahdi/voicebus/voicebus.h
|
||||
@@ -89,7 +89,7 @@
|
||||
void (*handle_receive)(struct voicebus *vb, struct list_head *buffers);
|
||||
void (*handle_transmit)(struct voicebus *vb, struct list_head *buffers);
|
||||
void (*handle_error)(struct voicebus *vb);
|
||||
-};
|
||||
+} __no_const;
|
||||
|
||||
/**
|
||||
* struct voicebus_descriptor_list - A single descriptor list.
|
||||
--- ./drivers/dahdi/wctc4xxp/base.c.orig
|
||||
+++ ./drivers/dahdi/wctc4xxp/base.c
|
||||
@@ -3193,7 +3193,7 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static void wctc4xxp_setup_file_operations(struct file_operations *fops)
|
||||
+static void wctc4xxp_setup_file_operations(file_operations_no_const *fops)
|
||||
{
|
||||
fops->owner = THIS_MODULE;
|
||||
fops->read = wctc4xxp_read;
|
||||
@ -1,327 +0,0 @@
|
||||
Index: dahdi-linux-2.5.0/drivers/dahdi/xpp/card_bri.c
|
||||
===================================================================
|
||||
--- dahdi-linux-2.5.0.orig/drivers/dahdi/xpp/card_bri.c 2011-08-15 14:42:29.000000000 +0300
|
||||
+++ dahdi-linux-2.5.0/drivers/dahdi/xpp/card_bri.c 2011-08-15 14:51:37.000000000 +0300
|
||||
@@ -274,7 +274,6 @@
|
||||
int frame_begin;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(transmit) {
|
||||
direction = "TX";
|
||||
frame_begin = priv->txframe_begin;
|
||||
@@ -312,9 +311,7 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(priv->dchan_alive == up)
|
||||
return;
|
||||
if(up) {
|
||||
@@ -332,9 +329,7 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(priv->layer1_up == up)
|
||||
return;
|
||||
priv->layer1_up = up;
|
||||
@@ -348,9 +343,7 @@
|
||||
struct BRI_priv_data *priv;
|
||||
byte curr_state;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
curr_state = priv->state_register.bits.v_su_sta;
|
||||
XPD_DBG(SIGNAL, xpd, "%s\n", (on)?"ON":"OFF");
|
||||
if(on) {
|
||||
@@ -391,9 +384,7 @@
|
||||
struct BRI_priv_data *priv;
|
||||
byte curr_state;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
curr_state = priv->state_register.bits.v_su_sta;
|
||||
XPD_DBG(SIGNAL, xpd, "%s\n", (on)?"ON":"OFF");
|
||||
if(on) {
|
||||
@@ -443,7 +434,6 @@
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
if(debug & DBG_COMMANDS)
|
||||
dump_hex_buf(xpd, "D-Chan(abort) RX: dchan_rbuf",
|
||||
@@ -460,7 +450,6 @@
|
||||
byte status;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
if(priv->dchan_r_idx < 4) {
|
||||
XPD_NOTICE(xpd, "D-Chan RX short frame (dchan_r_idx=%d)\n",
|
||||
@@ -503,7 +492,6 @@
|
||||
int idx;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
dchan_buf = dchan->readchunk;
|
||||
idx = priv->dchan_r_idx;
|
||||
if(idx + len >= DCHAN_BUFSIZE) {
|
||||
@@ -527,7 +515,6 @@
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
dchan->bytes2receive = priv->dchan_r_idx - 1;
|
||||
dchan->eofrx = 1;
|
||||
@@ -556,10 +543,7 @@
|
||||
return 0;
|
||||
if(!SPAN_REGISTERED(xpd)) /* Nowhere to copy data */
|
||||
return 0;
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
- xbus = xpd->xbus;
|
||||
dchan = XPD_CHAN(xpd, 2);
|
||||
if(!IS_OFFHOOK(xpd, 2)) { /* D-chan is used? */
|
||||
static int rate_limit;
|
||||
@@ -629,9 +613,7 @@
|
||||
return 0;
|
||||
if(!SPAN_REGISTERED(xpd)) /* Nowhere to copy data */
|
||||
return 0;
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
dchan = XPD_CHAN(xpd, 2);
|
||||
if(!IS_OFFHOOK(xpd, 2)) { /* D-chan is used? */
|
||||
static int rate_limit;
|
||||
@@ -677,7 +659,6 @@
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
dchan = XPD_CHAN(xpd, 2);
|
||||
if (dchan == chan) {
|
||||
atomic_inc(&priv->hdlc_pending);
|
||||
@@ -716,7 +697,6 @@
|
||||
int ret;
|
||||
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
#ifndef CONFIG_DAHDI_BRI_DCHANS
|
||||
if(atomic_read(&priv->hdlc_pending) == 0)
|
||||
return 0;
|
||||
@@ -769,7 +749,6 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
XPD_DBG(PROC, xpd, "\n");
|
||||
#ifdef CONFIG_PROC_FS
|
||||
@@ -784,7 +763,6 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
XPD_DBG(PROC, xpd, "\n");
|
||||
#ifdef CONFIG_PROC_FS
|
||||
@@ -828,7 +806,6 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
XPD_DBG(GENERAL, xpd, "\n");
|
||||
priv = xpd->priv;
|
||||
DO_LED(xpd, GREEN_LED, BRI_LED_OFF);
|
||||
@@ -841,7 +818,6 @@
|
||||
|
||||
static int BRI_card_remove(xbus_t *xbus, xpd_t *xpd)
|
||||
{
|
||||
- BUG_ON(!xpd);
|
||||
XPD_DBG(GENERAL, xpd, "\n");
|
||||
bri_proc_remove(xbus, xpd);
|
||||
return 0;
|
||||
@@ -877,10 +853,8 @@
|
||||
struct BRI_priv_data *priv;
|
||||
int i;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
xbus = xpd->xbus;
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!xbus);
|
||||
XPD_DBG(GENERAL, xpd, "%s\n", (on)?"on":"off");
|
||||
if(!on) {
|
||||
/* Nothing to do yet */
|
||||
@@ -927,11 +901,6 @@
|
||||
|
||||
static int BRI_card_dahdi_postregistration(xpd_t *xpd, bool on)
|
||||
{
|
||||
- xbus_t *xbus;
|
||||
-
|
||||
- BUG_ON(!xpd);
|
||||
- xbus = xpd->xbus;
|
||||
- BUG_ON(!xbus);
|
||||
XPD_DBG(GENERAL, xpd, "%s\n", (on)?"on":"off");
|
||||
return(0);
|
||||
}
|
||||
@@ -956,7 +925,6 @@
|
||||
int other_led;
|
||||
int mod;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
if(IS_NT(xpd)) {
|
||||
which_led = RED_LED;
|
||||
other_led = GREEN_LED;
|
||||
@@ -965,7 +933,6 @@
|
||||
other_led = RED_LED;
|
||||
}
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
timer_count = xpd->timer_count;
|
||||
if(xpd->blink_mode) {
|
||||
if((timer_count % DEFAULT_LED_PERIOD) == 0) {
|
||||
@@ -1014,9 +981,7 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(IS_NT(xpd)) {
|
||||
if (priv->t1 > HFC_TIMER_OFF) {
|
||||
if (--priv->t1 == 0) {
|
||||
@@ -1053,9 +1018,7 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(!priv->initialized || !xbus->self_ticking)
|
||||
return 0;
|
||||
if(poll_interval != 0 && (priv->tick_counter % poll_interval) == 0) {
|
||||
@@ -1111,7 +1074,6 @@
|
||||
|
||||
static int BRI_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
- BUG_ON(!xpd);
|
||||
if(!XBUS_IS(xpd->xbus, READY))
|
||||
return -ENODEV;
|
||||
switch (cmd) {
|
||||
@@ -1131,7 +1093,6 @@
|
||||
|
||||
static int BRI_card_open(xpd_t *xpd, lineno_t pos)
|
||||
{
|
||||
- BUG_ON(!xpd);
|
||||
if(pos == 2) {
|
||||
LINE_DBG(SIGNAL, xpd, pos, "OFFHOOK the whole span\n");
|
||||
BIT_SET(PHONEDEV(xpd).offhook_state, 0);
|
||||
@@ -1230,12 +1191,8 @@
|
||||
{
|
||||
struct phonedev *phonedev = container_of(span, struct phonedev, span);
|
||||
xpd_t *xpd = container_of(phonedev, struct xpd, phonedev);
|
||||
- struct BRI_priv_data *priv;
|
||||
struct dahdi_chan *dchan;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
- priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(!XBUS_IS(xpd->xbus, READY)) {
|
||||
XPD_DBG(GENERAL, xpd, "Startup called by dahdi. No Hardware. Ignored\n");
|
||||
return -ENODEV;
|
||||
@@ -1267,11 +1224,7 @@
|
||||
{
|
||||
struct phonedev *phonedev = container_of(span, struct phonedev, span);
|
||||
xpd_t *xpd = container_of(phonedev, struct xpd, phonedev);
|
||||
- struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
- priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(!XBUS_IS(xpd->xbus, READY)) {
|
||||
XPD_DBG(GENERAL, xpd, "Shutdown called by dahdi. No Hardware. Ignored\n");
|
||||
return -ENODEV;
|
||||
@@ -1292,7 +1245,6 @@
|
||||
xpd_t *main_xpd;
|
||||
unsigned long flags;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
main_xpd = xpd_byaddr(xpd->xbus, xpd->addr.unit, 0);
|
||||
if(!main_xpd) {
|
||||
XPD_DBG(DEVICES, xpd, "Unit 0 is already gone. Ignore request\n");
|
||||
@@ -1350,8 +1302,6 @@
|
||||
xpp_line_t wanted_lines;
|
||||
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
- BUG_ON(!pack);
|
||||
pcm = RPACKET_FIELD(pack, GLOBAL, PCM_WRITE, pcm);
|
||||
for(subunit = 0; subunit < MAX_SUBUNIT; subunit++) {
|
||||
xpd_t *tmp_xpd;
|
||||
@@ -1435,12 +1385,8 @@
|
||||
|
||||
static int BRI_echocancel_setmask(xpd_t *xpd, xpp_line_t ec_mask)
|
||||
{
|
||||
- struct BRI_priv_data *priv;
|
||||
int i;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
- priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
XPD_DBG(GENERAL, xpd, "0x%8X\n", ec_mask);
|
||||
if (!ECHOOPS(xpd->xbus)) {
|
||||
XPD_DBG(GENERAL, xpd,
|
||||
@@ -1466,9 +1412,7 @@
|
||||
struct bri_leds *bri_leds;
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xbus);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
XPD_DBG(LEDS, xpd, "%s -> %d\n",
|
||||
(which_led)?"RED":"GREEN",
|
||||
to_led_state);
|
||||
@@ -1507,9 +1451,7 @@
|
||||
struct BRI_priv_data *priv;
|
||||
su_rd_sta_t new_state;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(!priv->initialized) {
|
||||
XPD_ERR(xpd, "%s called on uninitialized AB\n", __FUNCTION__);
|
||||
return;
|
||||
@@ -1621,7 +1563,6 @@
|
||||
}
|
||||
spin_lock_irqsave(&xpd->lock, flags);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
if(REG_FIELD(info, do_subreg)) {
|
||||
XPD_DBG(REGS, xpd, "RI %02X %02X %02X\n",
|
||||
REG_FIELD(info, regnum), REG_FIELD(info, subreg), REG_FIELD(info, data_low));
|
||||
@@ -1665,7 +1606,6 @@
|
||||
{
|
||||
struct BRI_priv_data *priv;
|
||||
|
||||
- BUG_ON(!xpd);
|
||||
priv = xpd->priv;
|
||||
XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF");
|
||||
if(on) {
|
||||
@@ -1745,7 +1685,6 @@
|
||||
return -ENODEV;
|
||||
spin_lock_irqsave(&xpd->lock, flags);
|
||||
priv = xpd->priv;
|
||||
- BUG_ON(!priv);
|
||||
len += sprintf(page + len, "%05d Layer 1: ", priv->poll_counter);
|
||||
if(priv->reg30_good) {
|
||||
len += sprintf(page + len, "%-5s ", (priv->layer1_up) ? "UP" : "DOWN");
|
||||
@ -1,167 +0,0 @@
|
||||
# Translate the D channels to a standard channel data.
|
||||
# The HFC chipset provides us the D channel as data, but
|
||||
# Zaptel expects it as a standard channel with 1000 samples
|
||||
# per second.
|
||||
|
||||
Index: dahdi-linux-2.5.0/include/dahdi/kernel.h
|
||||
===================================================================
|
||||
--- dahdi-linux-2.5.0.orig/include/dahdi/kernel.h 2011-06-29 18:32:40.000000000 +0300
|
||||
+++ dahdi-linux-2.5.0/include/dahdi/kernel.h 2011-08-15 14:14:26.000000000 +0300
|
||||
@@ -413,6 +413,13 @@
|
||||
int statcount;
|
||||
int lastnumbufs;
|
||||
#endif
|
||||
+#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
+ int bytes2receive;
|
||||
+ int maxbytes2transmit; /* size of the tx buffer in the card driver */
|
||||
+ int bytes2transmit;
|
||||
+ int eofrx;
|
||||
+ int eoftx;
|
||||
+#endif
|
||||
spinlock_t lock;
|
||||
char name[40];
|
||||
/* Specified by DAHDI */
|
||||
@@ -723,6 +730,9 @@
|
||||
DAHDI_FLAGBIT_TXUNDERRUN = 22, /*!< Transmit underrun condition */
|
||||
DAHDI_FLAGBIT_RXOVERRUN = 23, /*!< Receive overrun condition */
|
||||
DAHDI_FLAGBIT_DEVFILE = 25, /*!< Channel has a sysfs dev file */
|
||||
+#if defined(CONFIG_DAHDI_BRI_DCHANS)
|
||||
+ DAHDI_FLAGBIT_BRIDCHAN = 26, /*!< hardhdlc-like handling of the D channel */
|
||||
+#endif
|
||||
};
|
||||
|
||||
#ifdef CONFIG_DAHDI_NET
|
||||
@@ -789,6 +799,7 @@
|
||||
#define DAHDI_FLAG_BUFEVENTS DAHDI_FLAG(BUFEVENTS)
|
||||
#define DAHDI_FLAG_TXUNDERRUN DAHDI_FLAG(TXUNDERRUN)
|
||||
#define DAHDI_FLAG_RXOVERRUN DAHDI_FLAG(RXOVERRUN)
|
||||
+#define DAHDI_FLAG_BRIDCHAN DAHDI_FLAG(BRIDCHAN)
|
||||
|
||||
struct file;
|
||||
|
||||
Index: dahdi-linux-2.5.0/include/dahdi/dahdi_config.h
|
||||
===================================================================
|
||||
--- dahdi-linux-2.5.0.orig/include/dahdi/dahdi_config.h 2011-01-05 17:52:03.000000000 +0200
|
||||
+++ dahdi-linux-2.5.0/include/dahdi/dahdi_config.h 2011-08-15 14:13:01.000000000 +0300
|
||||
@@ -195,4 +195,10 @@
|
||||
*/
|
||||
/* #define CONFIG_DAHDI_MIRROR */
|
||||
|
||||
+/*
|
||||
+ * Uncomment the following for BRI D channels
|
||||
+ *
|
||||
+ */
|
||||
+#define CONFIG_DAHDI_BRI_DCHANS
|
||||
+
|
||||
#endif
|
||||
Index: dahdi-linux-2.5.0/drivers/dahdi/dahdi-base.c
|
||||
===================================================================
|
||||
--- dahdi-linux-2.5.0.orig/drivers/dahdi/dahdi-base.c 2011-07-21 19:26:31.000000000 +0300
|
||||
+++ dahdi-linux-2.5.0/drivers/dahdi/dahdi-base.c 2011-08-15 14:13:01.000000000 +0300
|
||||
@@ -7224,11 +7224,40 @@
|
||||
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
|
||||
}
|
||||
bytes -= left;
|
||||
+#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
|
||||
+ /*
|
||||
+ * Let's get this right, we want to transmit complete frames only.
|
||||
+ * The card driver will do the dirty HDLC work for us.
|
||||
+ * txb (transmit buffer) is supposed to be big enough to store one frame
|
||||
+ * we will make this as big as the D fifo (1KB or 2KB)
|
||||
+ */
|
||||
+
|
||||
+ /* there are 'left' bytes in the user buffer left to transmit */
|
||||
+ left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
|
||||
+ if (left > ms->maxbytes2transmit) {
|
||||
+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
|
||||
+ ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
|
||||
+ txb += ms->maxbytes2transmit;
|
||||
+ ms->bytes2transmit = ms->maxbytes2transmit;
|
||||
+ ms->eoftx = 0;
|
||||
+ } else {
|
||||
+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
|
||||
+ ms->writeidx[ms->outwritebuf] += left + 2;
|
||||
+ txb += left + 2;
|
||||
+ ms->bytes2transmit = left;
|
||||
+ ms->eoftx = 1;
|
||||
+ }
|
||||
+ bytes = 0;
|
||||
+#endif
|
||||
} else {
|
||||
memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
|
||||
ms->writeidx[ms->outwritebuf]+=left;
|
||||
txb += left;
|
||||
bytes -= left;
|
||||
+#if defined(CONFIG_DAHDI_BRI_DCHANS)
|
||||
+ ms->bytes2transmit=DAHDI_CHUNKSIZE;
|
||||
+#endif
|
||||
}
|
||||
/* Check buffer status */
|
||||
if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
|
||||
@@ -7285,6 +7314,17 @@
|
||||
/* Transmit a flag if this is an HDLC channel */
|
||||
if (ms->flags & DAHDI_FLAG_HDLC)
|
||||
fasthdlc_tx_frame_nocheck(&ms->txhdlc);
|
||||
+#if defined(CONFIG_DAHDI_BRI_DCHANS)
|
||||
+ if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
|
||||
+ // if (ms->bytes2transmit > 0) {
|
||||
+ // txb += 2;
|
||||
+ // ms->bytes2transmit -= 2;
|
||||
+ bytes=0;
|
||||
+ ms->eoftx = 1;
|
||||
+// printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
|
||||
+ // }
|
||||
+ }
|
||||
+#endif
|
||||
#ifdef CONFIG_DAHDI_NET
|
||||
if (dahdi_have_netdev(ms))
|
||||
netif_wake_queue(chan_to_netdev(ms));
|
||||
@@ -7346,6 +7386,12 @@
|
||||
}
|
||||
needtxunderrun += bytes;
|
||||
bytes = 0;
|
||||
+#if defined(CONFIG_DAHDI_BRI_DCHANS)
|
||||
+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
|
||||
+ ms->bytes2transmit = 0;
|
||||
+ ms->eoftx = 0;
|
||||
+ bytes = 0;
|
||||
+#endif
|
||||
} else {
|
||||
memset(txb, DAHDI_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
|
||||
needtxunderrun += bytes;
|
||||
@@ -8267,6 +8313,14 @@
|
||||
int res;
|
||||
int left, x;
|
||||
|
||||
+#if defined(CONFIG_DAHDI_BRI_DCHANS)
|
||||
+ if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
|
||||
+ bytes = ms->bytes2receive;
|
||||
+ if (bytes < 1) return;
|
||||
+// printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
while(bytes) {
|
||||
#if defined(CONFIG_DAHDI_NET) || defined(CONFIG_DAHDI_PPP)
|
||||
skb = NULL;
|
||||
@@ -8324,6 +8378,19 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+#ifdef CONFIG_DAHDI_BRI_DCHANS
|
||||
+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
|
||||
+ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
|
||||
+ rxb += left;
|
||||
+ ms->readidx[ms->inreadbuf] += left;
|
||||
+ bytes -= left;
|
||||
+ if (ms->eofrx == 1) {
|
||||
+ eof=1;
|
||||
+ }
|
||||
+// printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
|
||||
+ ms->bytes2receive = 0;
|
||||
+ ms->eofrx = 0;
|
||||
+#endif
|
||||
} else {
|
||||
/* Not HDLC */
|
||||
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
|
||||
@ -1,22 +0,0 @@
|
||||
Index: dahdi-linux-2.0.0-rc4/Makefile
|
||||
===================================================================
|
||||
--- dahdi-linux-2.0.0-rc4.orig/Makefile 2008-09-09 14:07:23.000000000 +0300
|
||||
+++ dahdi-linux-2.0.0-rc4/Makefile 2008-09-09 14:12:31.000000000 +0300
|
||||
@@ -190,7 +190,7 @@
|
||||
build_tools/uninstall-modules dahdi $(KVERS)
|
||||
endif
|
||||
$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
|
||||
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
|
||||
+ [ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
|
||||
|
||||
uninstall-modules:
|
||||
ifdef DESTDIR
|
||||
@@ -203,7 +203,7 @@
|
||||
rm -rf /lib/modules/$(KVERS)/dahdi; \
|
||||
echo "done."; \
|
||||
fi
|
||||
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
|
||||
+ [ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
|
||||
endif
|
||||
|
||||
update:
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,58 +0,0 @@
|
||||
Index: dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c
|
||||
===================================================================
|
||||
--- dahdi-linux-2.4.0.orig/drivers/dahdi/zaphfc.c 2010-10-26 14:41:21.000000000 +0300
|
||||
+++ dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c 2010-10-26 14:50:14.000000000 +0300
|
||||
@@ -617,7 +617,7 @@
|
||||
}
|
||||
|
||||
static int zthfc_startup(struct dahdi_span *span) {
|
||||
- struct dahdi_hfc *zthfc = span->pvt;
|
||||
+ struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
|
||||
struct hfc_card *hfctmp = zthfc->card;
|
||||
int alreadyrunning;
|
||||
|
||||
@@ -663,6 +663,19 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const struct dahdi_span_ops zaphfc_span_ops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .spanconfig = zthfc_spanconfig,
|
||||
+ .chanconfig = zthfc_chanconfig,
|
||||
+ .startup = zthfc_startup,
|
||||
+ .shutdown = zthfc_shutdown,
|
||||
+ .maint = zthfc_maint,
|
||||
+ .rbsbits = zthfc_rbsbits,
|
||||
+ .open = zthfc_open,
|
||||
+ .close = zthfc_close,
|
||||
+ .ioctl = zthfc_ioctl,
|
||||
+};
|
||||
+
|
||||
static int zthfc_initialize(struct dahdi_hfc *zthfc) {
|
||||
struct hfc_card *hfctmp = zthfc->card;
|
||||
int i;
|
||||
@@ -676,15 +689,7 @@
|
||||
sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1);
|
||||
}
|
||||
|
||||
- zthfc->span.spanconfig = zthfc_spanconfig;
|
||||
- zthfc->span.chanconfig = zthfc_chanconfig;
|
||||
- zthfc->span.startup = zthfc_startup;
|
||||
- zthfc->span.shutdown = zthfc_shutdown;
|
||||
- zthfc->span.maint = zthfc_maint;
|
||||
- zthfc->span.rbsbits = zthfc_rbsbits;
|
||||
- zthfc->span.open = zthfc_open;
|
||||
- zthfc->span.close = zthfc_close;
|
||||
- zthfc->span.ioctl = zthfc_ioctl;
|
||||
+ zthfc->span.ops = &zaphfc_span_ops;
|
||||
|
||||
zthfc->span.channels = 3;
|
||||
zthfc->span.chans = zthfc->_chans;
|
||||
@@ -695,7 +700,6 @@
|
||||
zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
|
||||
zthfc->span.offset = 0;
|
||||
init_waitqueue_head(&zthfc->span.maintq);
|
||||
- zthfc->span.pvt = zthfc;
|
||||
|
||||
for (i = 0; i < zthfc->span.channels; i++) {
|
||||
memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan));
|
||||
@ -1,36 +0,0 @@
|
||||
Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c
|
||||
===================================================================
|
||||
--- dahdi-linux-2.5.0.orig/drivers/dahdi/zaphfc.c 2011-08-15 14:29:51.000000000 +0300
|
||||
+++ dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c 2011-08-15 14:30:11.000000000 +0300
|
||||
@@ -616,7 +616,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int zthfc_startup(struct dahdi_span *span) {
|
||||
+static int zthfc_startup(struct file *file, struct dahdi_span *span) {
|
||||
struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
|
||||
struct hfc_card *hfctmp = zthfc->card;
|
||||
int alreadyrunning;
|
||||
@@ -653,12 +653,12 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int zthfc_chanconfig(struct dahdi_chan *chan, int sigtype) {
|
||||
+static int zthfc_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) {
|
||||
// printk(KERN_CRIT "chan_config sigtype=%d\n", sigtype);
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int zthfc_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) {
|
||||
+static int zthfc_spanconfig(struct file *file, struct dahdi_span *span, struct dahdi_lineconfig *lc) {
|
||||
span->lineconfig = lc->lineconfig;
|
||||
return 0;
|
||||
}
|
||||
@@ -699,7 +699,6 @@
|
||||
zthfc->span.deflaw = DAHDI_LAW_ALAW;
|
||||
zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
|
||||
zthfc->span.offset = 0;
|
||||
- init_waitqueue_head(&zthfc->span.maintq);
|
||||
|
||||
for (i = 0; i < zthfc->span.channels; i++) {
|
||||
memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan));
|
||||
@ -1,58 +0,0 @@
|
||||
--- dahdi-linux-2.6.0/drivers/dahdi/zaphfc.c.orig 2012-01-25 14:08:58.000000000 +0200
|
||||
+++ dahdi-linux-2.6.0/drivers/dahdi/zaphfc.c 2012-01-25 14:29:26.000000000 +0200
|
||||
@@ -122,7 +122,10 @@
|
||||
}
|
||||
spin_unlock_irqrestore(&hfctmp->lock,flags);
|
||||
if (hfctmp->ztdev != NULL) {
|
||||
- dahdi_unregister(&hfctmp->ztdev->span);
|
||||
+ if (hfctmp->ztdev->ddev) {
|
||||
+ dahdi_unregister_device(hfctmp->ztdev->ddev);
|
||||
+ dahdi_free_device(hfctmp->ztdev->ddev);
|
||||
+ }
|
||||
vfree(hfctmp->ztdev);
|
||||
printk(KERN_INFO "unregistered from DAHDI.\n");
|
||||
}
|
||||
@@ -680,9 +683,15 @@
|
||||
struct hfc_card *hfctmp = zthfc->card;
|
||||
int i;
|
||||
|
||||
+ zthfc->ddev = dahdi_create_device();
|
||||
+ if (!zthfc->ddev)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ zthfc->ddev->manufacturer = "HFC";
|
||||
+
|
||||
memset(&zthfc->span, 0x0, sizeof(struct dahdi_span)); // you never can tell...
|
||||
|
||||
- sprintf(zthfc->span.name, "ZTHFC%d", hfc_dev_count + 1);
|
||||
+ sprintf(zthfc->span.name, "ZTHFC/%d", hfc_dev_count + 1);
|
||||
if (hfctmp->regs.nt_mode == 1) {
|
||||
sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [NT]", hfc_dev_count + 1);
|
||||
} else {
|
||||
@@ -702,13 +711,14 @@
|
||||
|
||||
for (i = 0; i < zthfc->span.channels; i++) {
|
||||
memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan));
|
||||
- sprintf(zthfc->chans[i].name, "ZTHFC%d/%d/%d", hfc_dev_count + 1,0,i + 1);
|
||||
+ sprintf(zthfc->chans[i].name, "ZTHFC/%d/%d/%d", hfc_dev_count + 1,0,i + 1);
|
||||
zthfc->chans[i].pvt = zthfc;
|
||||
zthfc->chans[i].sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_FXSLS | DAHDI_SIG_FXSGS | DAHDI_SIG_FXSKS | DAHDI_SIG_FXOLS | DAHDI_SIG_FXOGS | DAHDI_SIG_FXOKS | DAHDI_SIG_CAS | DAHDI_SIG_SF;
|
||||
zthfc->chans[i].chanpos = i + 1;
|
||||
}
|
||||
|
||||
- if (dahdi_register(&zthfc->span,0)) {
|
||||
+ list_add_tail(&zthfc->span.device_node, &zthfc->ddev->spans);
|
||||
+ if (dahdi_register_device(zthfc->ddev, &zthfc->card->pcidev->dev)) {
|
||||
printk(KERN_CRIT "unable to register DAHDI device!\n");
|
||||
return -1;
|
||||
}
|
||||
--- dahdi-linux-2.6.0/drivers/dahdi/zaphfc.h.orig 2012-01-25 14:23:37.000000000 +0200
|
||||
+++ dahdi-linux-2.6.0/drivers/dahdi/zaphfc.h 2012-01-25 14:24:33.000000000 +0200
|
||||
@@ -339,6 +339,7 @@
|
||||
struct dahdi_span span;
|
||||
struct dahdi_chan chans[3];
|
||||
struct dahdi_chan *_chans[3];
|
||||
+ struct dahdi_device *ddev;
|
||||
struct hfc_card *card;
|
||||
} dahdi_hfc;
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c.orig 2013-11-13 14:47:31.772140792 +0200
|
||||
+++ dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c 2013-11-13 14:55:20.136270113 +0200
|
||||
@@ -687,19 +687,18 @@
|
||||
if (!zthfc->ddev)
|
||||
return -ENOMEM;
|
||||
|
||||
- zthfc->ddev->manufacturer = "HFC";
|
||||
-
|
||||
+ zthfc->ddev->manufacturer = "Cologne Chips";
|
||||
+ zthfc->ddev->devicetype = "HFC-S PCI-A ISDN";
|
||||
+ zthfc->ddev->location = kasprintf(GFP_KERNEL,
|
||||
+ "PCI Bus %02d Slot %02d",
|
||||
+ hfctmp->pcidev->bus->number,
|
||||
+ PCI_SLOT(hfctmp->pcidev->devfn) + 1);
|
||||
memset(&zthfc->span, 0x0, sizeof(struct dahdi_span)); // you never can tell...
|
||||
-
|
||||
sprintf(zthfc->span.name, "ZTHFC/%d", hfc_dev_count + 1);
|
||||
- if (hfctmp->regs.nt_mode == 1) {
|
||||
- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [NT]", hfc_dev_count + 1);
|
||||
- } else {
|
||||
- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1);
|
||||
- }
|
||||
-
|
||||
+ sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [%s]",
|
||||
+ hfc_dev_count + 1, hfctmp->regs.nt_mode ? "NT" : "TE");
|
||||
+ zthfc->span.spantype = hfctmp->regs.nt_mode ? SPANTYPE_DIGITAL_BRI_NT : SPANTYPE_DIGITAL_BRI_TE;
|
||||
zthfc->span.ops = &zaphfc_span_ops;
|
||||
-
|
||||
zthfc->span.channels = 3;
|
||||
zthfc->span.chans = zthfc->_chans;
|
||||
for (i = 0; i < zthfc->span.channels; i++)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,59 +0,0 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=devicemaster-linux
|
||||
_ver=7.34
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="NS-Link Device Drivers $_ver for $_kpkg"
|
||||
url="http://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
|
||||
arch="x86 x86_64 armhf armv7"
|
||||
license="GPL-2.0"
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
makedepends="$_kpkg-dev=$_kpkgver linux-headers"
|
||||
install_if="$_kpkg=$_kpkgver $_name"
|
||||
# http://downloads.comtrol.com/html/DM_PRO_RTS_SERIALHUB_drivers.htm
|
||||
source="https://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$_ver.tar.gz"
|
||||
builddir="$srcdir"/$_name-$_ver
|
||||
|
||||
# grsec legacy
|
||||
[ "$_flavor" = "hardened" ] && provides="$_name-grsec=$pkgver-r$pkgrel"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_flavor/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$_name-$_ver"
|
||||
make -C /lib/modules/$_kabi/build SUBDIRS="$PWD" modules V=1
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$_name-$_ver"
|
||||
mkdir -p "$pkgdir/lib/modules/$_kabi/misc/"
|
||||
cp *.ko "$pkgdir/lib/modules/$_kabi/misc/"
|
||||
}
|
||||
|
||||
sha512sums="a7af54fde5812256b4a04f13d41c064dcb7f702cac18e4929d1a9669c49294eb62fc6e55e7b873bae63a795c3148dbca74ab39f337e26962bdee021f5fb2119c devicemaster-linux-7.34.tar.gz"
|
||||
@ -1,55 +0,0 @@
|
||||
# Contributor: Roland Kammerer <roland.kammerer@linbit.com>
|
||||
# Maintainer: Roland Kammerer <roland.kammerer@linbit.com>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=drbd
|
||||
_ver=9.0.19-1
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="Network-based RAID 1 version 9"
|
||||
url="https://www.linbit.com/en/drbd-community/drbd-download/"
|
||||
arch="all"
|
||||
license="GPL-2.0-or-later"
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
makedepends="$_kpkg-dev=$_kpkgver bash"
|
||||
source="http://www.linbit.com/downloads/drbd/${_ver%.*}/drbd-$_ver.tar.gz"
|
||||
|
||||
builddir=$srcdir/$_name-$_ver
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_flavor/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
unset LDFLAGS
|
||||
make KVER=$_kabi
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
sha512sums="0151027af889623f7ba756204b3f78e950e94fc9151679acbac8c9e75d2679b76449b7638fdfe8d7cd805a009c850e6e6ce642566cce3acd83879266fe59b663 drbd-9.0.19-1.tar.gz"
|
||||
@ -1,234 +0,0 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
|
||||
_flavor=vanilla
|
||||
pkgname=linux-${_flavor}
|
||||
pkgver=4.19.90
|
||||
case $pkgver in
|
||||
*.*.*) _kernver=${pkgver%.*};;
|
||||
*.*) _kernver=$pkgver;;
|
||||
esac
|
||||
pkgrel=0
|
||||
pkgdesc="Linux vanilla kernel"
|
||||
url="http://kernel.org"
|
||||
depends="mkinitfs"
|
||||
_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
|
||||
makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev"
|
||||
options="!strip"
|
||||
_config=${config:-config-vanilla.${CARCH}}
|
||||
install=
|
||||
source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
|
||||
config-vanilla.aarch64
|
||||
config-vanilla.armhf
|
||||
config-vanilla.armv7
|
||||
config-vanilla.x86
|
||||
config-vanilla.x86_64
|
||||
config-vanilla.ppc64le
|
||||
config-vanilla.s390x
|
||||
|
||||
config-virt.aarch64
|
||||
config-virt.x86
|
||||
config-virt.x86_64
|
||||
"
|
||||
subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
|
||||
_flavors=
|
||||
for _i in $source; do
|
||||
case $_i in
|
||||
config-*.$CARCH)
|
||||
_f=${_i%.$CARCH}
|
||||
_f=${_f#config-}
|
||||
_flavors="$_flavors ${_f}"
|
||||
if [ "linux-$_f" != "$pkgname" ]; then
|
||||
subpackages="$subpackages linux-${_f}::$CBUILD_ARCH linux-${_f}-dev:_dev:$CBUILD_ARCH"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "${pkgver%.0}" = "$pkgver" ]; then
|
||||
source="$source
|
||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
|
||||
fi
|
||||
arch="all"
|
||||
license="GPL-2.0"
|
||||
|
||||
_carch=${CARCH}
|
||||
case "$_carch" in
|
||||
aarch64*) _carch="arm64" ;;
|
||||
arm*) _carch="arm" ;;
|
||||
mips*) _carch="mips" ;;
|
||||
ppc*) _carch="powerpc" ;;
|
||||
s390*) _carch="s390" ;;
|
||||
esac
|
||||
|
||||
HOSTCC="${CC:-gcc}"
|
||||
HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
|
||||
|
||||
prepare() {
|
||||
local _patch_failed=
|
||||
cd "$srcdir"/linux-$_kernver
|
||||
if [ "$_kernver" != "$pkgver" ]; then
|
||||
msg "Applying patch-$pkgver.xz"
|
||||
unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
|
||||
fi
|
||||
|
||||
# first apply patches in specified order
|
||||
for i in $source; do
|
||||
case $i in
|
||||
*.patch)
|
||||
msg "Applying $i..."
|
||||
if ! patch -s -p1 -N -i "$srcdir"/$i; then
|
||||
echo $i >>failed
|
||||
_patch_failed=1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if ! [ -z "$_patch_failed" ]; then
|
||||
error "The following patches failed:"
|
||||
cat failed
|
||||
return 1
|
||||
fi
|
||||
|
||||
# remove localversion from patch if any
|
||||
rm -f localversion*
|
||||
oldconfig
|
||||
}
|
||||
|
||||
oldconfig() {
|
||||
for i in $_flavors; do
|
||||
local _config=config-$i.${CARCH}
|
||||
local _builddir="$srcdir"/build-$i.$CARCH
|
||||
mkdir -p "$_builddir"
|
||||
echo "-$pkgrel-$i" > "$_builddir"/localversion-alpine \
|
||||
|| return 1
|
||||
|
||||
cp "$srcdir"/$_config "$_builddir"/.config
|
||||
make -C "$srcdir"/linux-$_kernver \
|
||||
O="$_builddir" \
|
||||
ARCH="$_carch" HOSTCC="$HOSTCC" \
|
||||
listnewconfig oldconfig
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
for i in $_flavors; do
|
||||
cd "$srcdir"/build-$i.$CARCH
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
|
||||
done
|
||||
}
|
||||
|
||||
_package() {
|
||||
local _buildflavor="$1" _outdir="$2"
|
||||
local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
|
||||
|
||||
cd "$srcdir"/build-$_buildflavor.$CARCH
|
||||
|
||||
mkdir -p "$_outdir"/boot "$_outdir"/lib/modules
|
||||
|
||||
local _install
|
||||
case "$CARCH" in
|
||||
arm*)
|
||||
local _dtbdir="$_outdir"/boot/dtbs-$_flavor
|
||||
mkdir -p "$_dtbdir"
|
||||
for i in arch/arm/boot/dts/*.dtb ; do
|
||||
install -m644 "$i" "$_dtbdir"
|
||||
done
|
||||
|
||||
_install=zinstall
|
||||
;;
|
||||
*)
|
||||
_install=install
|
||||
;;
|
||||
esac
|
||||
|
||||
make -j1 modules_install $_install \
|
||||
ARCH="$_carch" \
|
||||
INSTALL_MOD_PATH="$_outdir" \
|
||||
INSTALL_PATH="$_outdir"/boot \
|
||||
|| return 1
|
||||
|
||||
rm -f "$_outdir"/lib/modules/${_abi_release}/build \
|
||||
"$_outdir"/lib/modules/${_abi_release}/source
|
||||
rm -rf "$_outdir"/lib/firmware
|
||||
|
||||
install -D include/config/kernel.release \
|
||||
"$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
|
||||
}
|
||||
|
||||
# main flavor installs in $pkgdir
|
||||
package() {
|
||||
depends="$depends linux-firmware-any"
|
||||
|
||||
_package vanilla "$pkgdir"
|
||||
}
|
||||
|
||||
# subflavors install in $subpkgdir
|
||||
virt() {
|
||||
_package virt "$subpkgdir"
|
||||
}
|
||||
|
||||
_dev() {
|
||||
local _flavor=$(echo $subpkgname | sed -E 's/(^linux-|-dev$)//g')
|
||||
local _abi_release=${pkgver}-${pkgrel}-$_flavor
|
||||
# copy the only the parts that we really need for build 3rd party
|
||||
# kernel modules and install those as /usr/src/linux-headers,
|
||||
# simlar to what ubuntu does
|
||||
#
|
||||
# this way you dont need to install the 300-400 kernel sources to
|
||||
# build a tiny kernel module
|
||||
#
|
||||
pkgdesc="Headers and script for third party modules for $_flavor kernel"
|
||||
depends="$_depends_dev"
|
||||
local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
|
||||
|
||||
# first we import config, run prepare to set up for building
|
||||
# external modules, and create the scripts
|
||||
mkdir -p "$dir"
|
||||
cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config
|
||||
echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine \
|
||||
|| return 1
|
||||
make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" HOSTCC="$HOSTCC" \
|
||||
silentoldconfig prepare modules_prepare scripts
|
||||
|
||||
# remove the stuff that points to real sources. we want 3rd party
|
||||
# modules to believe this is the soruces
|
||||
rm "$dir"/Makefile "$dir"/source
|
||||
|
||||
# copy the needed stuff from real sources
|
||||
#
|
||||
# this is taken from ubuntu kernel build script
|
||||
# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
|
||||
cd "$srcdir"/linux-$_kernver
|
||||
find . -path './include/*' -prune \
|
||||
-o -path './scripts/*' -prune -o -type f \
|
||||
\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
|
||||
-name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \
|
||||
-print | cpio -pdm "$dir" || return 1
|
||||
|
||||
cp -a scripts include "$dir" || return 1
|
||||
find $(find arch -name include -type d -print) -type f \
|
||||
| cpio -pdm "$dir"
|
||||
|
||||
install -Dm644 "$srcdir"/build-$_flavor.$CARCH/Module.symvers \
|
||||
"$dir"/Module.symvers
|
||||
|
||||
mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
|
||||
ln -sf /usr/src/linux-headers-${_abi_release} \
|
||||
"$subpkgdir"/lib/modules/${_abi_release}/build
|
||||
}
|
||||
|
||||
sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 linux-4.19.tar.xz
|
||||
9bf8def53b13ce774f5da270e4296f587de3e3332cbe41ca54fb59f1c37dc0377c29aab4f13c5b198bb41b1d92971a3eb13896dba4ecb22b39cff07dcc427571 config-vanilla.aarch64
|
||||
d174f936ce89738e3f804635576a77154b9b841ce9f34f60e41ed7e3acd8ef9da68b7cf6138f0b46e51406a283156af592e927ea95947428dbe1679a7c746c3b config-vanilla.armhf
|
||||
d174f936ce89738e3f804635576a77154b9b841ce9f34f60e41ed7e3acd8ef9da68b7cf6138f0b46e51406a283156af592e927ea95947428dbe1679a7c746c3b config-vanilla.armv7
|
||||
89c3622c75f401a8cd7678b57de0435fc94e8ee758ebab87344ecedf553208c0f8bb888086cde3969a5647a6bb40d0fd80cb5f6deaa1187622b38168a87d09a7 config-vanilla.x86
|
||||
b6cff165897ae851e9336dcad8555aa62b3c7402a0ea56868926357ceb56e6b2546442bc5f657a192b0b19d35aab9119d212b5ad5522880119567af451513d7e config-vanilla.x86_64
|
||||
c6b1dbbd2376c644f511b6933e130914e88a50278b9bb80b473285e109e0b07a0ebb07ea7f478fa704be854269e51dbb473b7535d3a70a4a3f83754963409156 config-vanilla.ppc64le
|
||||
1068b4cb17ec62035a557ee55765b5ee0a24c808d64a9701ae439fe128321f4207b9a54470f0e6cf00015e4a640f3f4f2064c7ba6b74cf31ad9175e1d2614964 config-vanilla.s390x
|
||||
8058b4085af5594ea17bb867ba14ff4f7ba59e891c164c888aca40eba72131480faa650e75958f41aef0a99e465f4cf47af6c8b7649d1869947d6706523006e4 config-virt.aarch64
|
||||
6629092ea10b9bd87bbbd34f00181abca268e3bd64717a5a9beb652167095b545505f795c0330919b61e5e0bfcf8f1d6ce52a403072112cbfc22828f913d5afb config-virt.x86
|
||||
53ef85f1181222269696629be5a4c494af45ef360473259469e68c0073ee18a68d2ae780142209fef857e63d70dbf40231e2b0f02bd89c38bca1a67d9440a5e1 config-virt.x86_64
|
||||
7f5cfe7dd4d17fedc5d9de9db672820f01cc534a9ecfcb2aae04e74036ecdb20b0a52187e0befebc1ce2709ee48b92d49a897db597b5e6e174b7046ca677bf32 patch-4.19.90.xz"
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
config-vanilla.armhf
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,65 +0,0 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=xtables-addons
|
||||
_ver=3.7
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="Iptables extensions kernel modules"
|
||||
url="http://xtables-addons.sourceforge.net/"
|
||||
arch="all"
|
||||
license="GPL-2.0"
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers"
|
||||
install_if="$_kpkg=$_kpkgver $_name"
|
||||
source="https://downloads.sourceforge.net/$_name/$_name-$_ver.tar.xz"
|
||||
# temporary disable the provides til hardened is fully removed
|
||||
#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
|
||||
#replaces="$_name-hardened"
|
||||
builddir="$srcdir/$_name-$_ver"
|
||||
options="!check"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
local _kapkbuild=../../main/linux-$_flavor/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
unset LDFLAGS
|
||||
./configure \
|
||||
--build=$CBUILD \
|
||||
--host=$CHOST \
|
||||
--prefix=/usr \
|
||||
--with-kbuild=/usr/src/linux-headers-$_kabi
|
||||
|
||||
cd extensions
|
||||
make modules
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir/extensions"
|
||||
make DESTDIR="$pkgdir" modules_install
|
||||
}
|
||||
|
||||
sha512sums="336f19596251507a88d7c399f9a3e6f517e4b72787ff7e7108e20e42e68932bca0eed79c54ddfa92112daae73a94a7349a874bcf993bd4abea1d875d7f2b8565 xtables-addons-3.7.tar.xz"
|
||||
@ -1,75 +0,0 @@
|
||||
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
|
||||
# when changing _ver we *must* bump _rel
|
||||
_name=zfs
|
||||
_ver=0.8.2
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="ZFS for Linux"
|
||||
url="http://zfsonlinux.org"
|
||||
arch="x86 x86_64 aarch64 ppc64le"
|
||||
license="CDDL-1.0"
|
||||
provides="spl-vanilla" # Mitigate upgrade conflicts
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
|
||||
$_kpkg-dev=$_kpkgver"
|
||||
makedepends="$depends_dev automake autoconf libtool linux-headers"
|
||||
install_if="zfs $_kpkg=$_kpkgver"
|
||||
subpackages="$pkgname-dev"
|
||||
source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz"
|
||||
builddir="$srcdir/$_name-$_ver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
autoreconf -vif
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
./configure --prefix=/usr \
|
||||
--with-tirpc \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--localstatedir=/var \
|
||||
--with-config=kernel \
|
||||
--with-linux=/usr/src/linux-headers-${_kabi}
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
dev() {
|
||||
mkdir -p "$subpkgdir"/usr
|
||||
mv "$pkgdir"/usr/src "$subpkgdir"/usr
|
||||
default_dev
|
||||
}
|
||||
|
||||
sha512sums="1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496 zfs-0.8.2.tar.gz"
|
||||
@ -1,56 +0,0 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
|
||||
# when chaning _ver we *must* bump _rel
|
||||
_name=ipt-netflow
|
||||
_ver=2.3
|
||||
_rel=0
|
||||
|
||||
_flavor=${FLAVOR:-vanilla}
|
||||
_kpkg=linux-$_flavor
|
||||
_kver=4.19.90
|
||||
_krel=0
|
||||
|
||||
_kpkgver="$_kver-r$_krel"
|
||||
_kabi="$_kver-$_krel-$_flavor"
|
||||
|
||||
pkgname=$_name-$_flavor
|
||||
pkgver=$_kver
|
||||
pkgrel=$(( $_krel + $_rel ))
|
||||
|
||||
pkgdesc="Linux kernel netflow sensor module"
|
||||
url="http://ipt-netflow.sourceforge.net/"
|
||||
arch="x86 x86_64 armhf armv7"
|
||||
license="GPL-3.0-or-later"
|
||||
depends="$_kpkg=$_kpkgver"
|
||||
makedepends="$_kpkg-dev=$_kpkgver iptables-dev bash"
|
||||
install_if="$_kpkg=$_kpkgver ipt-netflow"
|
||||
#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/aabc/ipt-netflow/archive/v$_ver.tar.gz"
|
||||
builddir="$srcdir/$_name-$_ver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
# verify the kernel version
|
||||
local _kapkbuild=../../main/linux-$_pkgver/APKBUILD
|
||||
if [ -f $_kapkbuild ]; then
|
||||
( . $_kapkbuild
|
||||
pkgname=$_name-$_flavor
|
||||
[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
|
||||
[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
|
||||
return 0
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
./configure --kver=$_kabi --ipt-inc=/usr/include/libiptc
|
||||
make ipt_NETFLOW.ko
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make -j1 minstall DEPMOD=: DESTDIR="$pkgdir"
|
||||
}
|
||||
|
||||
sha512sums="e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc ipt-netflow-vanilla-4.19.90.tar.gz"
|
||||
Loading…
x
Reference in New Issue
Block a user