Merge branch 'master' into linux4.14
This commit is contained in:
commit
48e2ccf032
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'MEGAsdk'
|
||||
pkgname=MEGAsdk
|
||||
version=3.4.1
|
||||
version=3.4.2
|
||||
revision=1
|
||||
wrksrc=sdk-${version}
|
||||
build_style=gnu-configure
|
||||
|
@ -16,7 +16,7 @@ maintainer="John <johnz@posteo.net>"
|
|||
license="BSD-2-Clause"
|
||||
homepage="https://mega.nz"
|
||||
distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
|
||||
checksum=94dfa5ac6e9cfea70d0a4f2a3e5577e718343f569309f39163167f1874def150
|
||||
checksum=c9ebc3ad9a9787fd2da8e740816bf87482233ec5fbab3acc5029ad1e40e0f984
|
||||
replaces="libmega>=0"
|
||||
|
||||
build_options="libuv mediainfo"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'acpica-utils'
|
||||
pkgname=acpica-utils
|
||||
version=20180927
|
||||
version=20181003
|
||||
revision=1
|
||||
wrksrc="acpica-unix-${version}"
|
||||
hostmakedepends="flex"
|
||||
|
@ -9,7 +9,7 @@ license="GPL-2.0-only, BSD-3-Clause"
|
|||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="https://www.acpica.org/"
|
||||
distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
|
||||
checksum=dc408d11889bcbedcfe9cc5b7ed23f65e857ca8fd5125f8c7a9e075e0b282db1
|
||||
checksum=4c40014ef582665f87e4278f34a60b725bc99cb94341c900621780d6d5a708d1
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
|
||||
|
||||
do_build() {
|
||||
|
|
|
@ -1,27 +1,19 @@
|
|||
# Template file for 'alacritty'
|
||||
pkgname=alacritty
|
||||
version=0.2.0
|
||||
version=0.2.1
|
||||
revision=1
|
||||
hostmakedepends="cargo cmake pkg-config"
|
||||
makedepends="freetype-devel fontconfig-devel"
|
||||
depends="libXxf86vm xclip ncurses"
|
||||
depends="libXxf86vm xclip ncurses alacritty-terminfo-${version}_${revision}"
|
||||
short_desc="Cross-platform, GPU-accelerated terminal emulator"
|
||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
||||
license="Apache-2.0"
|
||||
homepage="https://github.com/jwilm/${pkgname}"
|
||||
changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGELOG.md"
|
||||
distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
|
||||
checksum=b45c3cb26b529b381593ca99712e31b4cf88f438c2435434062408462611e501
|
||||
checksum=d335f09ba914faf8d8b2ba91a67672aab3acd1a3bb1528ec3d9339381697f6a1
|
||||
nocross=yes
|
||||
|
||||
case "${XBPS_TARGET_MACHINE}" in
|
||||
i686)
|
||||
broken="Alacritty v0.2.0 is broken on i686
|
||||
Build log: https://travis-ci.org/void-linux/void-packages/jobs/429814888
|
||||
Issue: https://github.com/jwilm/alacritty/issues/1552";
|
||||
;;
|
||||
esac
|
||||
|
||||
do_build() {
|
||||
cargo build --release ${makejobs}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'amp'
|
||||
pkgname=amp
|
||||
version=0.5.0
|
||||
revision=2
|
||||
version=0.5.1
|
||||
revision=1
|
||||
hostmakedepends="cargo cmake git perl pkg-config python3"
|
||||
makedepends="libcurl-devel libgit2-devel libxcb-devel"
|
||||
short_desc="A complete text editor for your terminal"
|
||||
|
@ -10,11 +10,10 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://amp.rs"
|
||||
changelog="https://raw.githubusercontent.com/jmacdonald/amp/master/CHANGELOG.md"
|
||||
distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz"
|
||||
checksum=364c389967e9fc40490f66ffc7c80d1fc8c54fe792d2e60b1da05e68cf91a061
|
||||
checksum=c4090ca66be597c833c29578a69457087d9f17236d1c8bf430d14a9e7d3cb50b
|
||||
nocross=yes
|
||||
|
||||
do_build() {
|
||||
cargo update --package openssl-sys --precise 0.9.28
|
||||
export LIBGIT2_SYS_USE_PKG_CONFIG=1
|
||||
cargo build --release ${makejobs}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'ansible'
|
||||
pkgname=ansible
|
||||
version=2.6.5
|
||||
version=2.7.0
|
||||
revision=1
|
||||
noarch=yes
|
||||
build_style=python3-module
|
||||
|
@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
|
|||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.ansible.com/"
|
||||
distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz"
|
||||
checksum=b33beec86e74bb4b9161260b73ed83c31018eff10929bdcbf28028af70fe4143
|
||||
checksum=a1ab8e0f13e79a20661ad6546f45a142afeaeb664deb2c290e32362d8ae5b618
|
||||
|
||||
post_install() {
|
||||
for f in examples/*; do
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'antibody'
|
||||
pkgname=antibody
|
||||
version=3.6.1
|
||||
revision=2
|
||||
version=3.7.0
|
||||
revision=1
|
||||
build_style=go
|
||||
go_import_path=github.com/getantibody/antibody
|
||||
hostmakedepends="git"
|
||||
|
@ -10,7 +10,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
|
|||
license="MIT"
|
||||
homepage="https://getantibody.github.io/"
|
||||
distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
|
||||
checksum=5971c251c43375ea5de9334cdbb1e4a1da500e03ecd63372c1c11f68f0364fe2
|
||||
checksum=750adac224b19a0f4ef8429219f0b53daba3a95c1cbff887678474c1a33c71dd
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE.md
|
||||
|
|
|
@ -1,21 +1,16 @@
|
|||
# Template file for 'brillo'
|
||||
pkgname=brillo
|
||||
version=1.2.1
|
||||
version=1.3.1
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
wrksrc="$pkgname-v$version"
|
||||
wrksrc="${pkgname}-v${version}"
|
||||
make_build_target="dist"
|
||||
make_install_args="install-dist"
|
||||
hostmakedepends="help2man"
|
||||
hostmakedepends="go-md2man"
|
||||
conf_files="/etc/apparmor.d/bin.brillo"
|
||||
short_desc="Keyboard and LED Backlight Control Tool"
|
||||
short_desc="Backlight and Keyboard LED control tool"
|
||||
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://gitlab.com/cameronnemo/brillo"
|
||||
distfiles="$homepage/-/archive/v$version/$wrksrc.tar.gz"
|
||||
checksum=08507fccd745b0c371dec33944182f4f11bd637c8b6d49d8d28e702f4c271834
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
make_build_args+=" MANPROG=/usr/bin/brillo"
|
||||
hostmakedepends+=" brillo"
|
||||
fi
|
||||
distfiles="${homepage}/-/archive/v${version}/${wrksrc}.tar.gz"
|
||||
checksum=5dc1ca0b29109daa27759be6aee0dcd05defbf09f4434f0136f13462d5b56792
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'courier-unicode'
|
||||
pkgname=courier-unicode
|
||||
version=2.0
|
||||
version=2.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="perl"
|
||||
short_desc="Courier Unicode Library"
|
||||
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||
license="GPL-3"
|
||||
license="GPL-3.0-only"
|
||||
homepage="http://www.courier-mta.org/unicode/"
|
||||
distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=6b46011d465918af7d0ed41fbf21d918449820bd3ef7e651dbc56eb2933a8711
|
||||
checksum=684cba7fe722b084ae1ffb0a7f71999756409d5ad4c84bce0efeb8887943ea21
|
||||
|
||||
courier-unicode-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
# Template file for 'eolie'
|
||||
pkgname=eolie
|
||||
version=0.9.40
|
||||
revision=1
|
||||
revision=2
|
||||
_eolie_hash=648fab861dcca8390c13d7677d2bd2c6
|
||||
build_style=meson
|
||||
hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config"
|
||||
makedepends="gobject-introspection gtk+3-devel libglib-devel python3
|
||||
python-gobject-devel webkit2gtk-devel"
|
||||
# deps for firefox sync missing (e.g. python3-PyFxA)
|
||||
depends="gobject-introspection gtkspell3 python3-cairo python3-dateutil
|
||||
python3-gobject webkit2gtk"
|
||||
python3-gobject webkit2gtk python3-PyFxA"
|
||||
short_desc="Web browser for GNOME"
|
||||
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'fio'
|
||||
pkgname=fio
|
||||
version=3.10
|
||||
version=3.11
|
||||
revision=1
|
||||
wrksrc="${pkgname}-${pkgname}-${version}"
|
||||
build_style=configure
|
||||
|
@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="GPL-2.0-only"
|
||||
homepage="https://github.com/axboe/fio"
|
||||
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
|
||||
checksum=efe43d3e74038245d5c3283ec8bd01f19ef85de18e83b104f4075389eff28e57
|
||||
checksum=cd67be8e09d969ed22928f0ec3b0a20895ebedbcd2d62bcf02a1dd60f9a9437b
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*|x86_64*) makedepends+=" libnuma-devel"
|
||||
|
|
|
@ -1 +1 @@
|
|||
ignore="*rc*"
|
||||
ignore="*rc* *a"
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
# Template build file for 'guile'
|
||||
# Template file for 'guile'
|
||||
pkgname=guile
|
||||
version=2.0.14
|
||||
revision=4
|
||||
revision=5
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-error-on-warning"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="gmp-devel libltdl-devel libunistring-devel libffi-devel gc-devel ncurses-devel"
|
||||
makedepends="gmp-devel libltdl-devel libunistring-devel libffi-devel gc-devel
|
||||
ncurses-devel readline-devel"
|
||||
short_desc="A portable, embeddable Scheme implementation written in C"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-3, LGPL-3"
|
||||
|
@ -29,7 +30,7 @@ libguile_package() {
|
|||
|
||||
guile-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="gmp-devel libguile>=${version}_${revision}"
|
||||
depends="gmp-devel gc-devel guile>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/bin/guile-config
|
||||
vmove usr/include
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
--- configure.ac.orig 2017-09-30 10:01:44.000000000 +0000
|
||||
+++ configure.ac 2017-10-05 07:45:00.636956940 +0000
|
||||
@@ -106,7 +106,4 @@
|
||||
--- configure.ac.orig 2018-10-04 11:22:39.253662649 +0200
|
||||
+++ configure.ac 2018-10-04 11:23:27.646660149 +0200
|
||||
@@ -116,9 +116,6 @@
|
||||
AC_FUNC_MALLOC
|
||||
AC_CHECK_FUNCS([memset strdup strstr])
|
||||
|
||||
-# Bash@Ubuntu@Windows
|
||||
-AC_CHECK_FILE(/tmp/hh-ms-wsl,AC_DEFINE(__MS_WSL__), [])
|
||||
-AC_CHECK_FILE(/tmp/hstr-ms-wsl,AC_DEFINE(__MS_WSL__), [])
|
||||
-
|
||||
AC_OUTPUT
|
||||
# Bash CLI autocomplete
|
||||
AC_ARG_WITH([bash-completion-dir],
|
||||
AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
# Template file for 'hstr'
|
||||
pkgname=hstr
|
||||
version=1.27
|
||||
version=2.0.0
|
||||
revision=1
|
||||
wrksrc="hstr"
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake pkg-config"
|
||||
makedepends="readline-devel"
|
||||
|
@ -10,8 +11,8 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
|
|||
license="Apache-2.0"
|
||||
homepage="https://github.com/dvorka/hstr"
|
||||
changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
|
||||
distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
|
||||
checksum=b13b517f91b80d4e75d162b2045ca2563d852051f7f189270ed6ceecaf735dfd
|
||||
distfiles="${homepage}/releases/download/${version%.*}/hstr-${version}-tarball.tgz"
|
||||
checksum=9844587d4e91daa8a78eeeac13e995995fff36616fda5f374da7301c9bce15e4
|
||||
|
||||
pre_configure() {
|
||||
grep -rli '#include <ncursesw/curses.h>' src | xargs -i@ sed -i 's|ncursesw/curses.h|curses.h|g' @
|
||||
|
@ -19,7 +20,3 @@ pre_configure() {
|
|||
automake --force-missing --add-missing
|
||||
autoconf
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
# Template file for 'libshout-idjc'
|
||||
pkgname=libshout-idjc
|
||||
version=2.4.2
|
||||
version=2.4.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake libtool pkg-config"
|
||||
makedepends="libtheora-devel libvorbis-devel libogg-devel speex-devel"
|
||||
short_desc="Libshout plus some extensions for IDJC"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="LGPL-2.1"
|
||||
license="LGPL-2.0-or-later"
|
||||
homepage="http://idjc.sourceforge.net"
|
||||
distfiles="${SOURCEFORGE_SITE}/libshoutidjc.idjc.p/${pkgname}-${version}.tar.gz"
|
||||
checksum=b072acab07d542849e6b9edb7d5b094b83c327ea14e5e7e55bd74ebb61246e77
|
||||
checksum=3bb1b9b2c2bbb8936556e92c5099cfa5b691be3e22d0ff1b8e1251ec929e960c
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
libshout-idjc-devel_package() {
|
||||
depends="libtheora-devel libogg-devel libvorbis-devel speex-devel ${sourcepkg}>=${version}_${revision}"
|
||||
depends="libtheora-devel libogg-devel libvorbis-devel speex-devel
|
||||
${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
linux4.1
|
|
@ -1 +0,0 @@
|
|||
linux4.1
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +0,0 @@
|
|||
#!/bin/sh
|
||||
mod=$1
|
||||
mkdir -p usr/lib/debug/${mod%/*}
|
||||
$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod
|
||||
$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod
|
||||
/usr/bin/$STRIP --strip-debug $mod
|
||||
gzip -9 $mod
|
File diff suppressed because it is too large
Load Diff
|
@ -1,283 +0,0 @@
|
|||
# Template file for 'linux4.1'
|
||||
pkgname=linux4.1
|
||||
version=4.1.43
|
||||
revision=1
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="https://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (${version%.*} series)"
|
||||
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
|
||||
checksum=2c018c3f499fab25f8854734665dd44c56adcfba4291999f0aa31ca83110398a
|
||||
|
||||
nocross=yes
|
||||
nodebug=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
preserve=yes
|
||||
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl armv7l armv7l-musl aarch64 aarch64-musl"
|
||||
hostmakedepends="bc perl kmod uboot-mkimage"
|
||||
triggers="kernel-hooks"
|
||||
|
||||
_kernver="${version}_${revision}"
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.builtin.bin
|
||||
/usr/lib/modules/${_kernver}/modules.softdep
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
|
||||
export CCACHE_DISABLE=1
|
||||
|
||||
do_configure() {
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=i386;;
|
||||
x86_64*) arch=x86_64;;
|
||||
armv7*) arch=arm
|
||||
$XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x2/patch-${version}-armv7-x2.diff.gz
|
||||
gunzip patch-${version}-armv7-x2.diff.gz
|
||||
patch -Np1 -i patch-${version}-armv7-x2.diff
|
||||
;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} ARCH=$arch ${_args} defconfig
|
||||
make ${makejobs} ARCH=$arch ${_args} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
do_build() {
|
||||
local arch _cross _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) _args="bzImage modules"; arch=i386;;
|
||||
x86_64*) _args="bzImage modules"; arch=x86_64;;
|
||||
armv7*) _args="zImage modules dtbs"; arch=arm;;
|
||||
aarch64*) _args="Image modules dtbs"; arch=arm64;;
|
||||
esac
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
|
||||
export LDFLAGS=
|
||||
make ARCH=$arch ${_cross} ${makejobs} prepare
|
||||
make ARCH=$arch ${_cross} ${makejobs} ${_args}
|
||||
}
|
||||
do_install() {
|
||||
local arch subarch _args hdrdest
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=x86; subarch=i386;;
|
||||
x86_64*) arch=x86; subarch=x86_64;;
|
||||
armv7*) arch=arm;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make ${makejobs} INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
vinstall .config 644 boot config-${_kernver}
|
||||
vinstall System.map 644 boot System.map-${_kernver}
|
||||
|
||||
case "$arch" in
|
||||
x86)
|
||||
vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
|
||||
;;
|
||||
arm)
|
||||
vinstall arch/arm/boot/zImage 644 boot
|
||||
vmkdir boot/dtbs
|
||||
cp arch/arm/boot/dts/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
arm64)
|
||||
vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
|
||||
# vmkdir boot/dtbs
|
||||
# cp arch/arm64/boot/dts/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
esac
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/${arch}
|
||||
cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/${arch}/kernel
|
||||
cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
|
||||
if [ "$subarch" = "i386" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
if [ "$arch" = "x86" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
fi
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-core
|
||||
cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs/libxfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
case "$arch" in
|
||||
i386|x86_64) _args="arm*";;
|
||||
arm|arm64) _args="x86*";;
|
||||
esac
|
||||
for arch in alpha avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa ${_args}; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Extract debugging symbols
|
||||
msg_normal "$pkgver: extracting debug info, please wait...\n"
|
||||
install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
|
||||
(
|
||||
cd ${DESTDIR}
|
||||
export DESTDIR
|
||||
find ./ -name '*.ko' -print0 | \
|
||||
xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
|
||||
)
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
|
||||
linux4.1-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
linux4.1-dbg_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
repository=debug
|
||||
short_desc+=" - debugging symbols"
|
||||
pkg_install() {
|
||||
vmove usr/lib/debug
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
pattern='linux-\K4\.1\.[\d.]+(?=\.tar\.xz)'
|
|
@ -1 +0,0 @@
|
|||
linux4.15
|
|
@ -1 +0,0 @@
|
|||
linux4.15
|
|
@ -1,282 +0,0 @@
|
|||
###
|
||||
# This makefile is used to generate the kernel documentation,
|
||||
# primarily based on in-line comments in various source files.
|
||||
# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
|
||||
# to document the SRC - and how to read it.
|
||||
# To add a new book the only step required is to add the book to the
|
||||
# list of DOCBOOKS.
|
||||
|
||||
DOCBOOKS := z8530book.xml \
|
||||
kernel-hacking.xml kernel-locking.xml \
|
||||
networking.xml \
|
||||
filesystems.xml lsm.xml kgdb.xml \
|
||||
libata.xml mtdnand.xml librs.xml rapidio.xml \
|
||||
s390-drivers.xml scsi.xml \
|
||||
sh.xml w1.xml
|
||||
|
||||
ifeq ($(DOCBOOKS),)
|
||||
|
||||
# Skip DocBook build if the user explicitly requested no DOCBOOKS.
|
||||
.DEFAULT:
|
||||
@echo " SKIP DocBook $@ target (DOCBOOKS=\"\" specified)."
|
||||
else
|
||||
ifneq ($(SPHINXDIRS),)
|
||||
|
||||
# Skip DocBook build if the user explicitly requested a sphinx dir
|
||||
.DEFAULT:
|
||||
@echo " SKIP DocBook $@ target (SPHINXDIRS specified)."
|
||||
else
|
||||
|
||||
|
||||
###
|
||||
# The build process is as follows (targets):
|
||||
# (xmldocs) [by docproc]
|
||||
# file.tmpl --> file.xml +--> file.ps (psdocs) [by db2ps or xmlto]
|
||||
# +--> file.pdf (pdfdocs) [by db2pdf or xmlto]
|
||||
# +--> DIR=file (htmldocs) [by xmlto]
|
||||
# +--> man/ (mandocs) [by xmlto]
|
||||
|
||||
|
||||
# for PDF and PS output you can choose between xmlto and docbook-utils tools
|
||||
PDF_METHOD = $(prefer-db2x)
|
||||
PS_METHOD = $(prefer-db2x)
|
||||
|
||||
|
||||
targets += $(DOCBOOKS)
|
||||
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
|
||||
xmldocs: $(BOOKS)
|
||||
sgmldocs: xmldocs
|
||||
|
||||
PS := $(patsubst %.xml, %.ps, $(BOOKS))
|
||||
psdocs: $(PS)
|
||||
|
||||
PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
|
||||
pdfdocs: $(PDF)
|
||||
|
||||
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
|
||||
htmldocs: $(HTML)
|
||||
$(call cmd,build_main_index)
|
||||
|
||||
MAN := $(patsubst %.xml, %.9, $(BOOKS))
|
||||
mandocs: $(MAN)
|
||||
find $(obj)/man -name '*.9' | xargs gzip -nf
|
||||
|
||||
# Default location for installed man pages
|
||||
export INSTALL_MAN_PATH = $(objtree)/usr
|
||||
|
||||
installmandocs: mandocs
|
||||
mkdir -p $(INSTALL_MAN_PATH)/man/man9/
|
||||
find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
|
||||
sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
|
||||
xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
|
||||
|
||||
# no-op for the DocBook toolchain
|
||||
epubdocs:
|
||||
latexdocs:
|
||||
linkcheckdocs:
|
||||
|
||||
###
|
||||
#External programs used
|
||||
KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
|
||||
KERNELDOC = $(srctree)/scripts/kernel-doc
|
||||
DOCPROC = $(objtree)/scripts/docproc
|
||||
CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
|
||||
|
||||
# Use a fixed encoding - UTF-8 if the C library has support built-in
|
||||
# or ASCII if not
|
||||
LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
|
||||
export LC_CTYPE
|
||||
|
||||
XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
|
||||
XMLTOFLAGS += --skip-validation
|
||||
|
||||
###
|
||||
# DOCPROC is used for two purposes:
|
||||
# 1) To generate a dependency list for a .tmpl file
|
||||
# 2) To preprocess a .tmpl file and call kernel-doc with
|
||||
# appropriate parameters.
|
||||
# The following rules are used to generate the .xml documentation
|
||||
# required to generate the final targets. (ps, pdf, html).
|
||||
quiet_cmd_docproc = DOCPROC $@
|
||||
cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
|
||||
define rule_docproc
|
||||
set -e; \
|
||||
$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
|
||||
$(cmd_$(1)); \
|
||||
( \
|
||||
echo 'cmd_$@ := $(cmd_$(1))'; \
|
||||
echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; \
|
||||
) > $(dir $@).$(notdir $@).cmd
|
||||
endef
|
||||
|
||||
%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
|
||||
$(call if_changed_rule,docproc)
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
|
||||
notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
|
||||
exit 1
|
||||
db2xtemplate = db2TYPE -o $(dir $@) $<
|
||||
xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
|
||||
|
||||
# determine which methods are available
|
||||
ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
|
||||
use-db2x = db2x
|
||||
prefer-db2x = db2x
|
||||
else
|
||||
use-db2x = notfound
|
||||
prefer-db2x = $(use-xmlto)
|
||||
endif
|
||||
ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
|
||||
use-xmlto = xmlto
|
||||
prefer-xmlto = xmlto
|
||||
else
|
||||
use-xmlto = notfound
|
||||
prefer-xmlto = $(use-db2x)
|
||||
endif
|
||||
|
||||
# the commands, generated from the chosen template
|
||||
quiet_cmd_db2ps = PS $@
|
||||
cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
|
||||
%.ps : %.xml
|
||||
$(call cmd,db2ps)
|
||||
|
||||
quiet_cmd_db2pdf = PDF $@
|
||||
cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
|
||||
%.pdf : %.xml
|
||||
$(call cmd,db2pdf)
|
||||
|
||||
|
||||
index = index.html
|
||||
main_idx = $(obj)/$(index)
|
||||
quiet_cmd_build_main_index = HTML $(main_idx)
|
||||
cmd_build_main_index = rm -rf $(main_idx); \
|
||||
echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
|
||||
echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
|
||||
cat $(HTML) >> $(main_idx)
|
||||
|
||||
quiet_cmd_db2html = HTML $@
|
||||
cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
|
||||
echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
|
||||
$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
|
||||
|
||||
###
|
||||
# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
|
||||
# to fill internal hyperlinks
|
||||
gen_aux_xml = :
|
||||
quiet_gen_aux_xml = echo ' XMLREF $@'
|
||||
silent_gen_aux_xml = :
|
||||
%.aux.xml: %.xml
|
||||
@$($(quiet)gen_aux_xml)
|
||||
@rm -rf $@
|
||||
@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
|
||||
@$(KERNELDOCXMLREF) -db $<.db $< > $@
|
||||
.PRECIOUS: %.aux.xml
|
||||
|
||||
%.html: %.aux.xml
|
||||
@(which xmlto > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install xmlto ***"; \
|
||||
exit 1)
|
||||
@rm -rf $@ $(patsubst %.html,%,$@)
|
||||
$(call cmd,db2html)
|
||||
@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
|
||||
cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
|
||||
|
||||
quiet_cmd_db2man = MAN $@
|
||||
cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
|
||||
%.9 : %.xml
|
||||
@(which xmlto > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install xmlto ***"; \
|
||||
exit 1)
|
||||
$(Q)mkdir -p $(obj)/man/$(*F)
|
||||
$(call cmd,db2man)
|
||||
@touch $@
|
||||
|
||||
###
|
||||
# Rules to generate postscripts and PNG images from .fig format files
|
||||
quiet_cmd_fig2eps = FIG2EPS $@
|
||||
cmd_fig2eps = fig2dev -Leps $< $@
|
||||
|
||||
%.eps: %.fig
|
||||
@(which fig2dev > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install transfig ***"; \
|
||||
exit 1)
|
||||
$(call cmd,fig2eps)
|
||||
|
||||
quiet_cmd_fig2png = FIG2PNG $@
|
||||
cmd_fig2png = fig2dev -Lpng $< $@
|
||||
|
||||
%.png: %.fig
|
||||
@(which fig2dev > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install transfig ***"; \
|
||||
exit 1)
|
||||
$(call cmd,fig2png)
|
||||
|
||||
###
|
||||
# Rule to convert a .c file to inline XML documentation
|
||||
gen_xml = :
|
||||
quiet_gen_xml = echo ' GEN $@'
|
||||
silent_gen_xml = :
|
||||
%.xml: %.c
|
||||
@$($(quiet)gen_xml)
|
||||
@( \
|
||||
echo "<programlisting>"; \
|
||||
expand --tabs=8 < $< | \
|
||||
sed -e "s/&/\\&/g" \
|
||||
-e "s/</\\</g" \
|
||||
-e "s/>/\\>/g"; \
|
||||
echo "</programlisting>") > $@
|
||||
|
||||
endif # DOCBOOKS=""
|
||||
endif # SPHINDIR=...
|
||||
|
||||
###
|
||||
# Help targets as used by the top-level makefile
|
||||
dochelp:
|
||||
@echo ' Linux kernel internal documentation in different formats (DocBook):'
|
||||
@echo ' htmldocs - HTML'
|
||||
@echo ' pdfdocs - PDF'
|
||||
@echo ' psdocs - Postscript'
|
||||
@echo ' xmldocs - XML DocBook'
|
||||
@echo ' mandocs - man pages'
|
||||
@echo ' installmandocs - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
|
||||
echo ' (default: $(INSTALL_MAN_PATH))'; \
|
||||
echo ''
|
||||
@echo ' cleandocs - clean all generated DocBook files'
|
||||
@echo
|
||||
@echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
|
||||
@echo ' valid values for DOCBOOKS are: $(DOCBOOKS)'
|
||||
@echo
|
||||
@echo " make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
|
||||
@echo ' This is useful to generate only the ReST docs (Sphinx)'
|
||||
|
||||
|
||||
###
|
||||
# Temporary files left by various tools
|
||||
clean-files := $(DOCBOOKS) \
|
||||
$(patsubst %.xml, %.dvi, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.aux, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.tex, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.log, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.out, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.ps, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.pdf, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.html, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.9, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.xml.db, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.xml, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
|
||||
$(index)
|
||||
|
||||
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
|
||||
|
||||
cleandocs:
|
||||
$(Q)rm -f $(call objectify, $(clean-files))
|
||||
$(Q)rm -rf $(call objectify, $(clean-dirs))
|
||||
|
||||
# Declare the contents of the .PHONY variable as phony. We keep that
|
||||
# information in a variable so we can use it in if_changed and friends.
|
||||
|
||||
.PHONY: $(PHONY)
|
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,7 +0,0 @@
|
|||
#!/bin/sh
|
||||
mod=$1
|
||||
mkdir -p usr/lib/debug/${mod%/*}
|
||||
$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod
|
||||
$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod
|
||||
/usr/bin/$STRIP --strip-debug $mod
|
||||
gzip -9 $mod
|
File diff suppressed because it is too large
Load Diff
|
@ -1,95 +0,0 @@
|
|||
From e36d607d56dc5c0cbf2cb600e7686b559ea77b44 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Tue, 18 Feb 2014 01:43:50 -0300
|
||||
Subject: [PATCH] net/smsc95xx: Allow mac address to be set as a parameter
|
||||
|
||||
---
|
||||
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 56 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
||||
index dc989a8..912be75 100644
|
||||
--- a/drivers/net/usb/smsc95xx.c
|
||||
+++ b/drivers/net/usb/smsc95xx.c
|
||||
@@ -60,6 +60,7 @@
|
||||
#define SUSPEND_SUSPEND3 (0x08)
|
||||
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
|
||||
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
|
||||
+#define MAC_ADDR_LEN (6)
|
||||
|
||||
#define CARRIER_CHECK_DELAY (2 * HZ)
|
||||
|
||||
@@ -80,6 +81,10 @@ static bool turbo_mode = true;
|
||||
module_param(turbo_mode, bool, 0644);
|
||||
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
|
||||
|
||||
+static char *macaddr = ":";
|
||||
+module_param(macaddr, charp, 0);
|
||||
+MODULE_PARM_DESC(macaddr, "MAC address");
|
||||
+
|
||||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||
u32 *data, int in_pm)
|
||||
{
|
||||
@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
|
||||
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
|
||||
}
|
||||
|
||||
+/* Check the macaddr module parameter for a MAC address */
|
||||
+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
|
||||
+{
|
||||
+ int i, j, got_num, num;
|
||||
+ u8 mtbl[MAC_ADDR_LEN];
|
||||
+
|
||||
+ if (macaddr[0] == ':')
|
||||
+ return 0;
|
||||
+
|
||||
+ i = 0;
|
||||
+ j = 0;
|
||||
+ num = 0;
|
||||
+ got_num = 0;
|
||||
+ while (j < MAC_ADDR_LEN) {
|
||||
+ if (macaddr[i] && macaddr[i] != ':') {
|
||||
+ got_num++;
|
||||
+ if ('0' <= macaddr[i] && macaddr[i] <= '9')
|
||||
+ num = num * 16 + macaddr[i] - '0';
|
||||
+ else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
|
||||
+ num = num * 16 + 10 + macaddr[i] - 'A';
|
||||
+ else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
|
||||
+ num = num * 16 + 10 + macaddr[i] - 'a';
|
||||
+ else
|
||||
+ break;
|
||||
+ i++;
|
||||
+ } else if (got_num == 2) {
|
||||
+ mtbl[j++] = (u8) num;
|
||||
+ num = 0;
|
||||
+ got_num = 0;
|
||||
+ i++;
|
||||
+ } else {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (j == MAC_ADDR_LEN) {
|
||||
+ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
|
||||
+ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
|
||||
+ mtbl[3], mtbl[4], mtbl[5]);
|
||||
+ for (i = 0; i < MAC_ADDR_LEN; i++)
|
||||
+ dev_mac[i] = mtbl[i];
|
||||
+ return 1;
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void smsc95xx_init_mac_address(struct usbnet *dev)
|
||||
{
|
||||
+ /* Check module parameters */
|
||||
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
|
||||
+ return;
|
||||
+
|
||||
const u8 *mac_addr;
|
||||
|
||||
/* maybe the boot loader passed the MAC address in devicetree */
|
||||
--
|
||||
2.10.2
|
||||
|
|
@ -1,294 +0,0 @@
|
|||
# Template file for 'linux4.15'
|
||||
pkgname=linux4.15
|
||||
version=4.15.15
|
||||
revision=3
|
||||
patch_args="-Np1"
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (${version%.*} series)"
|
||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
|
||||
checksum=0b56e8ef7e6fee6a995bfe0eeb3631c2e145cc2ca205861dd301f4c0d803dadf
|
||||
|
||||
nodebug=yes # -dbg package is generated below manually
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
preserve=yes
|
||||
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl armv5tel armv5tel-musl armv7l armv7l-musl aarch64 aarch64-musl"
|
||||
hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
|
||||
|
||||
_kernver="${version}_${revision}"
|
||||
triggers="kernel-hooks"
|
||||
kernel_hooks_version="${_kernver}"
|
||||
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.builtin.bin
|
||||
/usr/lib/modules/${_kernver}/modules.softdep
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
|
||||
do_configure() {
|
||||
# 4.15 misses Documentation/DocBook. We ship the directory from 4.12 here.
|
||||
cp -a $FILESDIR/DocBook -t Documentation
|
||||
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=i386;;
|
||||
x86_64*) arch=x86_64;;
|
||||
armv5*|armv7*) arch=arm;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your cpu family, using it.\n"
|
||||
cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} ARCH=$arch ${_args} defconfig
|
||||
make ${makejobs} ARCH=$arch ${_args} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
do_build() {
|
||||
local arch _cross _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) _args="bzImage modules"; arch=i386;;
|
||||
x86_64*) _args="bzImage modules"; arch=x86_64;;
|
||||
armv5*|armv7*) _args="zImage modules dtbs"; arch=arm;;
|
||||
aarch64*) _args="Image modules dtbs"; arch=arm64;;
|
||||
esac
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
if [ "${_patchver}" ]; then
|
||||
_version="EXTRAVERSION=${_patchver}"
|
||||
fi
|
||||
export LDFLAGS=
|
||||
make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
|
||||
make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
|
||||
}
|
||||
do_install() {
|
||||
local arch subarch _args hdrdest
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=x86; subarch=i386;;
|
||||
x86_64*) arch=x86; subarch=x86_64;;
|
||||
armv5*|armv7*) arch=arm;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make ${makejobs} INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
vinstall .config 644 boot config-${_kernver}
|
||||
vinstall System.map 644 boot System.map-${_kernver}
|
||||
|
||||
case "$arch" in
|
||||
x86)
|
||||
vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
|
||||
;;
|
||||
arm)
|
||||
vinstall arch/arm/boot/zImage 644 boot
|
||||
vmkdir boot/dtbs
|
||||
cp arch/arm/boot/dts/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
arm64)
|
||||
vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
|
||||
vmkdir boot/dtbs
|
||||
cp arch/arm64/boot/dts/*/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
esac
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/${arch}
|
||||
cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/${arch}/kernel
|
||||
cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
|
||||
if [ "$subarch" = "i386" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
if [ "$arch" = "x86" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
fi
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-core
|
||||
cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs/libxfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
|
||||
|
||||
# Add objtool binary, needed to build external modules with dkms
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64*)
|
||||
mkdir -p ${hdrdest}/tools/objtool
|
||||
cp tools/objtool/objtool ${hdrdest}/tools/objtool
|
||||
;;
|
||||
esac
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
case "$arch" in
|
||||
i386|x86_64) _args="arm*";;
|
||||
arm|arm64) _args="x86*";;
|
||||
esac
|
||||
for arch in alpha avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa ${_args}; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Extract debugging symbols
|
||||
msg_normal "$pkgver: extracting debug info, please wait...\n"
|
||||
install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
|
||||
(
|
||||
cd ${DESTDIR}
|
||||
export DESTDIR
|
||||
find ./ -name '*.ko' -print0 | \
|
||||
xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
|
||||
)
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
linux4.15-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noshlibprovides=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
linux4.15-dbg_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
repository=debug
|
||||
short_desc+=" - debugging symbols"
|
||||
pkg_install() {
|
||||
vmove usr/lib/debug
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
linux4.16
|
|
@ -1 +0,0 @@
|
|||
linux4.16
|
|
@ -1,282 +0,0 @@
|
|||
###
|
||||
# This makefile is used to generate the kernel documentation,
|
||||
# primarily based on in-line comments in various source files.
|
||||
# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
|
||||
# to document the SRC - and how to read it.
|
||||
# To add a new book the only step required is to add the book to the
|
||||
# list of DOCBOOKS.
|
||||
|
||||
DOCBOOKS := z8530book.xml \
|
||||
kernel-hacking.xml kernel-locking.xml \
|
||||
networking.xml \
|
||||
filesystems.xml lsm.xml kgdb.xml \
|
||||
libata.xml mtdnand.xml librs.xml rapidio.xml \
|
||||
s390-drivers.xml scsi.xml \
|
||||
sh.xml w1.xml
|
||||
|
||||
ifeq ($(DOCBOOKS),)
|
||||
|
||||
# Skip DocBook build if the user explicitly requested no DOCBOOKS.
|
||||
.DEFAULT:
|
||||
@echo " SKIP DocBook $@ target (DOCBOOKS=\"\" specified)."
|
||||
else
|
||||
ifneq ($(SPHINXDIRS),)
|
||||
|
||||
# Skip DocBook build if the user explicitly requested a sphinx dir
|
||||
.DEFAULT:
|
||||
@echo " SKIP DocBook $@ target (SPHINXDIRS specified)."
|
||||
else
|
||||
|
||||
|
||||
###
|
||||
# The build process is as follows (targets):
|
||||
# (xmldocs) [by docproc]
|
||||
# file.tmpl --> file.xml +--> file.ps (psdocs) [by db2ps or xmlto]
|
||||
# +--> file.pdf (pdfdocs) [by db2pdf or xmlto]
|
||||
# +--> DIR=file (htmldocs) [by xmlto]
|
||||
# +--> man/ (mandocs) [by xmlto]
|
||||
|
||||
|
||||
# for PDF and PS output you can choose between xmlto and docbook-utils tools
|
||||
PDF_METHOD = $(prefer-db2x)
|
||||
PS_METHOD = $(prefer-db2x)
|
||||
|
||||
|
||||
targets += $(DOCBOOKS)
|
||||
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
|
||||
xmldocs: $(BOOKS)
|
||||
sgmldocs: xmldocs
|
||||
|
||||
PS := $(patsubst %.xml, %.ps, $(BOOKS))
|
||||
psdocs: $(PS)
|
||||
|
||||
PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
|
||||
pdfdocs: $(PDF)
|
||||
|
||||
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
|
||||
htmldocs: $(HTML)
|
||||
$(call cmd,build_main_index)
|
||||
|
||||
MAN := $(patsubst %.xml, %.9, $(BOOKS))
|
||||
mandocs: $(MAN)
|
||||
find $(obj)/man -name '*.9' | xargs gzip -nf
|
||||
|
||||
# Default location for installed man pages
|
||||
export INSTALL_MAN_PATH = $(objtree)/usr
|
||||
|
||||
installmandocs: mandocs
|
||||
mkdir -p $(INSTALL_MAN_PATH)/man/man9/
|
||||
find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
|
||||
sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
|
||||
xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
|
||||
|
||||
# no-op for the DocBook toolchain
|
||||
epubdocs:
|
||||
latexdocs:
|
||||
linkcheckdocs:
|
||||
|
||||
###
|
||||
#External programs used
|
||||
KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
|
||||
KERNELDOC = $(srctree)/scripts/kernel-doc
|
||||
DOCPROC = $(objtree)/scripts/docproc
|
||||
CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
|
||||
|
||||
# Use a fixed encoding - UTF-8 if the C library has support built-in
|
||||
# or ASCII if not
|
||||
LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
|
||||
export LC_CTYPE
|
||||
|
||||
XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
|
||||
XMLTOFLAGS += --skip-validation
|
||||
|
||||
###
|
||||
# DOCPROC is used for two purposes:
|
||||
# 1) To generate a dependency list for a .tmpl file
|
||||
# 2) To preprocess a .tmpl file and call kernel-doc with
|
||||
# appropriate parameters.
|
||||
# The following rules are used to generate the .xml documentation
|
||||
# required to generate the final targets. (ps, pdf, html).
|
||||
quiet_cmd_docproc = DOCPROC $@
|
||||
cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
|
||||
define rule_docproc
|
||||
set -e; \
|
||||
$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
|
||||
$(cmd_$(1)); \
|
||||
( \
|
||||
echo 'cmd_$@ := $(cmd_$(1))'; \
|
||||
echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; \
|
||||
) > $(dir $@).$(notdir $@).cmd
|
||||
endef
|
||||
|
||||
%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
|
||||
$(call if_changed_rule,docproc)
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
|
||||
notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
|
||||
exit 1
|
||||
db2xtemplate = db2TYPE -o $(dir $@) $<
|
||||
xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
|
||||
|
||||
# determine which methods are available
|
||||
ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
|
||||
use-db2x = db2x
|
||||
prefer-db2x = db2x
|
||||
else
|
||||
use-db2x = notfound
|
||||
prefer-db2x = $(use-xmlto)
|
||||
endif
|
||||
ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
|
||||
use-xmlto = xmlto
|
||||
prefer-xmlto = xmlto
|
||||
else
|
||||
use-xmlto = notfound
|
||||
prefer-xmlto = $(use-db2x)
|
||||
endif
|
||||
|
||||
# the commands, generated from the chosen template
|
||||
quiet_cmd_db2ps = PS $@
|
||||
cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
|
||||
%.ps : %.xml
|
||||
$(call cmd,db2ps)
|
||||
|
||||
quiet_cmd_db2pdf = PDF $@
|
||||
cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
|
||||
%.pdf : %.xml
|
||||
$(call cmd,db2pdf)
|
||||
|
||||
|
||||
index = index.html
|
||||
main_idx = $(obj)/$(index)
|
||||
quiet_cmd_build_main_index = HTML $(main_idx)
|
||||
cmd_build_main_index = rm -rf $(main_idx); \
|
||||
echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
|
||||
echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
|
||||
cat $(HTML) >> $(main_idx)
|
||||
|
||||
quiet_cmd_db2html = HTML $@
|
||||
cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
|
||||
echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
|
||||
$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
|
||||
|
||||
###
|
||||
# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
|
||||
# to fill internal hyperlinks
|
||||
gen_aux_xml = :
|
||||
quiet_gen_aux_xml = echo ' XMLREF $@'
|
||||
silent_gen_aux_xml = :
|
||||
%.aux.xml: %.xml
|
||||
@$($(quiet)gen_aux_xml)
|
||||
@rm -rf $@
|
||||
@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
|
||||
@$(KERNELDOCXMLREF) -db $<.db $< > $@
|
||||
.PRECIOUS: %.aux.xml
|
||||
|
||||
%.html: %.aux.xml
|
||||
@(which xmlto > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install xmlto ***"; \
|
||||
exit 1)
|
||||
@rm -rf $@ $(patsubst %.html,%,$@)
|
||||
$(call cmd,db2html)
|
||||
@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
|
||||
cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
|
||||
|
||||
quiet_cmd_db2man = MAN $@
|
||||
cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
|
||||
%.9 : %.xml
|
||||
@(which xmlto > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install xmlto ***"; \
|
||||
exit 1)
|
||||
$(Q)mkdir -p $(obj)/man/$(*F)
|
||||
$(call cmd,db2man)
|
||||
@touch $@
|
||||
|
||||
###
|
||||
# Rules to generate postscripts and PNG images from .fig format files
|
||||
quiet_cmd_fig2eps = FIG2EPS $@
|
||||
cmd_fig2eps = fig2dev -Leps $< $@
|
||||
|
||||
%.eps: %.fig
|
||||
@(which fig2dev > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install transfig ***"; \
|
||||
exit 1)
|
||||
$(call cmd,fig2eps)
|
||||
|
||||
quiet_cmd_fig2png = FIG2PNG $@
|
||||
cmd_fig2png = fig2dev -Lpng $< $@
|
||||
|
||||
%.png: %.fig
|
||||
@(which fig2dev > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install transfig ***"; \
|
||||
exit 1)
|
||||
$(call cmd,fig2png)
|
||||
|
||||
###
|
||||
# Rule to convert a .c file to inline XML documentation
|
||||
gen_xml = :
|
||||
quiet_gen_xml = echo ' GEN $@'
|
||||
silent_gen_xml = :
|
||||
%.xml: %.c
|
||||
@$($(quiet)gen_xml)
|
||||
@( \
|
||||
echo "<programlisting>"; \
|
||||
expand --tabs=8 < $< | \
|
||||
sed -e "s/&/\\&/g" \
|
||||
-e "s/</\\</g" \
|
||||
-e "s/>/\\>/g"; \
|
||||
echo "</programlisting>") > $@
|
||||
|
||||
endif # DOCBOOKS=""
|
||||
endif # SPHINDIR=...
|
||||
|
||||
###
|
||||
# Help targets as used by the top-level makefile
|
||||
dochelp:
|
||||
@echo ' Linux kernel internal documentation in different formats (DocBook):'
|
||||
@echo ' htmldocs - HTML'
|
||||
@echo ' pdfdocs - PDF'
|
||||
@echo ' psdocs - Postscript'
|
||||
@echo ' xmldocs - XML DocBook'
|
||||
@echo ' mandocs - man pages'
|
||||
@echo ' installmandocs - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
|
||||
echo ' (default: $(INSTALL_MAN_PATH))'; \
|
||||
echo ''
|
||||
@echo ' cleandocs - clean all generated DocBook files'
|
||||
@echo
|
||||
@echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
|
||||
@echo ' valid values for DOCBOOKS are: $(DOCBOOKS)'
|
||||
@echo
|
||||
@echo " make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
|
||||
@echo ' This is useful to generate only the ReST docs (Sphinx)'
|
||||
|
||||
|
||||
###
|
||||
# Temporary files left by various tools
|
||||
clean-files := $(DOCBOOKS) \
|
||||
$(patsubst %.xml, %.dvi, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.aux, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.tex, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.log, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.out, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.ps, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.pdf, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.html, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.9, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.xml.db, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, %.xml, $(DOCBOOKS)) \
|
||||
$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
|
||||
$(index)
|
||||
|
||||
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
|
||||
|
||||
cleandocs:
|
||||
$(Q)rm -f $(call objectify, $(clean-files))
|
||||
$(Q)rm -rf $(call objectify, $(clean-dirs))
|
||||
|
||||
# Declare the contents of the .PHONY variable as phony. We keep that
|
||||
# information in a variable so we can use it in if_changed and friends.
|
||||
|
||||
.PHONY: $(PHONY)
|
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,7 +0,0 @@
|
|||
#!/bin/sh
|
||||
mod=$1
|
||||
mkdir -p usr/lib/debug/${mod%/*}
|
||||
$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod
|
||||
$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod
|
||||
/usr/bin/$STRIP --strip-debug $mod
|
||||
gzip -9 $mod
|
File diff suppressed because it is too large
Load Diff
|
@ -1,95 +0,0 @@
|
|||
From e36d607d56dc5c0cbf2cb600e7686b559ea77b44 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Tue, 18 Feb 2014 01:43:50 -0300
|
||||
Subject: [PATCH] net/smsc95xx: Allow mac address to be set as a parameter
|
||||
|
||||
---
|
||||
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 56 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
||||
index dc989a8..912be75 100644
|
||||
--- a/drivers/net/usb/smsc95xx.c
|
||||
+++ b/drivers/net/usb/smsc95xx.c
|
||||
@@ -60,6 +60,7 @@
|
||||
#define SUSPEND_SUSPEND3 (0x08)
|
||||
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
|
||||
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
|
||||
+#define MAC_ADDR_LEN (6)
|
||||
|
||||
#define CARRIER_CHECK_DELAY (2 * HZ)
|
||||
|
||||
@@ -80,6 +81,10 @@ static bool turbo_mode = true;
|
||||
module_param(turbo_mode, bool, 0644);
|
||||
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
|
||||
|
||||
+static char *macaddr = ":";
|
||||
+module_param(macaddr, charp, 0);
|
||||
+MODULE_PARM_DESC(macaddr, "MAC address");
|
||||
+
|
||||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||
u32 *data, int in_pm)
|
||||
{
|
||||
@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
|
||||
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
|
||||
}
|
||||
|
||||
+/* Check the macaddr module parameter for a MAC address */
|
||||
+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
|
||||
+{
|
||||
+ int i, j, got_num, num;
|
||||
+ u8 mtbl[MAC_ADDR_LEN];
|
||||
+
|
||||
+ if (macaddr[0] == ':')
|
||||
+ return 0;
|
||||
+
|
||||
+ i = 0;
|
||||
+ j = 0;
|
||||
+ num = 0;
|
||||
+ got_num = 0;
|
||||
+ while (j < MAC_ADDR_LEN) {
|
||||
+ if (macaddr[i] && macaddr[i] != ':') {
|
||||
+ got_num++;
|
||||
+ if ('0' <= macaddr[i] && macaddr[i] <= '9')
|
||||
+ num = num * 16 + macaddr[i] - '0';
|
||||
+ else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
|
||||
+ num = num * 16 + 10 + macaddr[i] - 'A';
|
||||
+ else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
|
||||
+ num = num * 16 + 10 + macaddr[i] - 'a';
|
||||
+ else
|
||||
+ break;
|
||||
+ i++;
|
||||
+ } else if (got_num == 2) {
|
||||
+ mtbl[j++] = (u8) num;
|
||||
+ num = 0;
|
||||
+ got_num = 0;
|
||||
+ i++;
|
||||
+ } else {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (j == MAC_ADDR_LEN) {
|
||||
+ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
|
||||
+ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
|
||||
+ mtbl[3], mtbl[4], mtbl[5]);
|
||||
+ for (i = 0; i < MAC_ADDR_LEN; i++)
|
||||
+ dev_mac[i] = mtbl[i];
|
||||
+ return 1;
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void smsc95xx_init_mac_address(struct usbnet *dev)
|
||||
{
|
||||
+ /* Check module parameters */
|
||||
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
|
||||
+ return;
|
||||
+
|
||||
const u8 *mac_addr;
|
||||
|
||||
/* maybe the boot loader passed the MAC address in devicetree */
|
||||
--
|
||||
2.10.2
|
||||
|
|
@ -1,292 +0,0 @@
|
|||
# Template file for 'linux4.16'
|
||||
pkgname=linux4.16
|
||||
version=4.16.18
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="https://www.kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
short_desc="The Linux kernel and modules (${version%.*} series)"
|
||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
|
||||
checksum=41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021
|
||||
|
||||
nodebug=yes # -dbg package is generated below manually
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
preserve=yes
|
||||
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl armv5tel armv5tel-musl armv7l armv7l-musl aarch64 aarch64-musl"
|
||||
hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel libressl-devel perl uboot-mkimage"
|
||||
|
||||
_kernver="${version}_${revision}"
|
||||
triggers="kernel-hooks"
|
||||
kernel_hooks_version="${_kernver}"
|
||||
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.builtin.bin
|
||||
/usr/lib/modules/${_kernver}/modules.softdep
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
|
||||
do_configure() {
|
||||
# 4.16 misses Documentation/DocBook. We ship the directory from 4.12 here.
|
||||
cp -a $FILESDIR/DocBook -t Documentation
|
||||
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=i386;;
|
||||
x86_64*) arch=x86_64;;
|
||||
armv5*|armv7*) arch=arm;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your cpu family, using it.\n"
|
||||
cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
|
||||
make ${makejobs} ARCH=$arch ${_args} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} ARCH=$arch ${_args} defconfig
|
||||
make ${makejobs} ARCH=$arch ${_args} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
do_build() {
|
||||
local arch _cross _args
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) _args="bzImage modules"; arch=i386;;
|
||||
x86_64*) _args="bzImage modules"; arch=x86_64;;
|
||||
armv5*|armv7*) _args="zImage modules dtbs"; arch=arm;;
|
||||
aarch64*) _args="Image modules dtbs"; arch=arm64;;
|
||||
esac
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
fi
|
||||
if [ "${_patchver}" ]; then
|
||||
_version="EXTRAVERSION=${_patchver}"
|
||||
fi
|
||||
export LDFLAGS=
|
||||
make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
|
||||
make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
|
||||
}
|
||||
do_install() {
|
||||
local arch subarch _args hdrdest
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) arch=x86; subarch=i386;;
|
||||
x86_64*) arch=x86; subarch=x86_64;;
|
||||
armv5*|armv7*) arch=arm;;
|
||||
aarch64*) arch=arm64;;
|
||||
esac
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make ${makejobs} ARCH=$arch INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
vinstall .config 644 boot config-${_kernver}
|
||||
vinstall System.map 644 boot System.map-${_kernver}
|
||||
|
||||
case "$arch" in
|
||||
x86)
|
||||
vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
|
||||
;;
|
||||
arm)
|
||||
vinstall arch/arm/boot/zImage 644 boot
|
||||
vmkdir boot/dtbs
|
||||
cp arch/arm/boot/dts/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
arm64)
|
||||
vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
|
||||
vmkdir boot/dtbs
|
||||
cp arch/arm64/boot/dts/*/*.dtb ${DESTDIR}/boot/dtbs
|
||||
;;
|
||||
esac
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/${arch}
|
||||
cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/${arch}/kernel
|
||||
cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
|
||||
if [ "$subarch" = "i386" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
if [ "$arch" = "x86" ]; then
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
fi
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs/libxfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
|
||||
|
||||
# Add objtool binary, needed to build external modules with dkms
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64*)
|
||||
mkdir -p ${hdrdest}/tools/objtool
|
||||
cp tools/objtool/objtool ${hdrdest}/tools/objtool
|
||||
;;
|
||||
esac
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
case "$arch" in
|
||||
i386|x86_64) _args="arm*";;
|
||||
arm|arm64) _args="x86*";;
|
||||
esac
|
||||
for arch in alpha avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa ${_args}; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Extract debugging symbols
|
||||
msg_normal "$pkgver: extracting debug info, please wait...\n"
|
||||
install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
|
||||
(
|
||||
cd ${DESTDIR}
|
||||
export DESTDIR
|
||||
find ./ -name '*.ko' -print0 | \
|
||||
xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
|
||||
)
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
linux4.16-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noshlibprovides=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
linux4.16-dbg_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
repository=debug
|
||||
short_desc+=" - debugging symbols"
|
||||
pkg_install() {
|
||||
vmove usr/lib/debug
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'linux4.17'
|
||||
pkgname=linux4.17
|
||||
version=4.17.19
|
||||
revision=1
|
||||
revision=2
|
||||
patch_args="-Np1"
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'linux4.18'
|
||||
pkgname=linux4.18
|
||||
version=4.18.12
|
||||
revision=1
|
||||
revision=2
|
||||
patch_args="-Np1"
|
||||
wrksrc="linux-${version}"
|
||||
short_desc="The Linux kernel and modules (${version%.*} series)"
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
# Template file for 'maildrop'
|
||||
pkgname=maildrop
|
||||
version=2.9.3
|
||||
revision=3
|
||||
version=3.0.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-maildrop-uid= --enable-maildrop-gid=
|
||||
--enable-use-dotlock=1 --enable-use-flock=1 --with-locking-method=flock
|
||||
--enable-sendmail=/usr/sbin/sendmail"
|
||||
makedepends="courier-unicode-devel gdbm-devel pcre-devel"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="courier-unicode-devel gdbm-devel libidn-devel pcre-devel"
|
||||
short_desc="Mail delivery agent with filtering abilities"
|
||||
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||
license="GPL-3.0-or-later"
|
||||
license="GPL-3.0-only"
|
||||
homepage="http://www.courier-mta.org/maildrop/"
|
||||
distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=fceae3b85dd9caf4d769d76e5d1179c4065b7f3af88623008ad44f9e08299794
|
||||
checksum=48e91a4a101e276a131fbd3afb94e98401a0cece751961c6d9c2e422d661413c
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
# Template file for 'metacity'
|
||||
pkgname=metacity
|
||||
version=3.30.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
|
||||
makedepends="gsettings-desktop-schemas-devel gtk+3-devel libcanberra-devel
|
||||
libglib-devel libgtop-devel libSM-devel libXcomposite-devel libXdamage-devel
|
||||
libXfixes-devel libXinerama-devel libXrender-devel libX11-devel pango-devel
|
||||
startup-notification-devel Vulkan-Headers vulkan-loader"
|
||||
depends="zenity"
|
||||
short_desc="Window Manager for the GNOME environment"
|
||||
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://gitlab.gnome.org/GNOME/metacity"
|
||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
checksum=0f1311b7aa38de71c66080bd2b744de2cd9580afcaee9c6097a7d3f5c421798a
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'netpbm'
|
||||
pkgname=netpbm
|
||||
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
|
||||
version=10.84.00
|
||||
version=10.84.01
|
||||
revision=1
|
||||
_githash=e227331a6b5626e100705fcff3269fd8479ea988
|
||||
_githash_guide=5408ddffce12d78a1993fec42960f24941fab6a5
|
||||
_githash=7fc46bb79f04fd0ba77284382c0ce4a74f34f2a3
|
||||
_githash_guide=ea4ccc82bcaf4fdf8154567808ddf1c71bf983d8
|
||||
create_wrksrc=yes
|
||||
build_wrksrc="netpbm-mirror-${_githash}"
|
||||
hostmakedepends="pkg-config perl python flex"
|
||||
|
@ -17,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/"
|
|||
nocross=yes
|
||||
distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
|
||||
https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
|
||||
checksum="6baaf79e0c7858868c047e9d0c902960a78e12ad0f8a580327e616d51d031394
|
||||
74ff13c8d152c0ea04e10d895d827a84d2ac83ea40cc1e2ba8849aaa30c14cb9"
|
||||
checksum="083dd85d64f64418bcfbd278bf8b9c46df9c0d9c4f0d1508520adcaa644f5376
|
||||
684eef89dbaa5976b31ad563ea30e51c16444cbe235a014953fd10ce7c534a49"
|
||||
|
||||
post_extract() {
|
||||
cd $build_wrksrc
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'nghttp2'
|
||||
pkgname=nghttp2
|
||||
version=1.33.0
|
||||
version=1.34.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-libxml2 --without-jemalloc --without-spdylay"
|
||||
|
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="MIT"
|
||||
homepage="https://nghttp2.org"
|
||||
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
|
||||
checksum=4879ce9ff3320f5344b910ee1c46ed5e366edc2272620cf17d8e762724d7df1e
|
||||
checksum=ecb0c013141495e24bd6deca022b5a92097a7848a0c17c4e5af1243a97fa622e
|
||||
|
||||
post_install() {
|
||||
rm -rf ${DESTDIR}/usr/share/man
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- builtin-date.c.orig
|
||||
+++ builtin-date.c
|
||||
@@ -143,7 +143,7 @@
|
||||
time_t seconds;
|
||||
|
||||
from_date(v, &tm);
|
||||
- seconds = timelocal(&tm);
|
||||
+ seconds = mktime(&tm);
|
||||
RETURN(Reduce(NewSignedDigitInteger((signed_digit) seconds)));
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'nickle'
|
||||
pkgname=nickle
|
||||
version=2.81
|
||||
revision=2
|
||||
version=2.82
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
makedepends="readline-devel"
|
||||
short_desc="Powerful desk calculator language"
|
||||
|
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="MIT"
|
||||
homepage="https://nickle.org/"
|
||||
distfiles="https://nickle.org/release/${pkgname}-${version}.tar.gz"
|
||||
checksum=99a9331489e290fb768bf8d88e8b03e76f25485d7636c30d9eee616ca9d358b5
|
||||
checksum=403f34b397deb0621a06a2a0657a6cb804438272b558eeb3ae362f1cc037c94b
|
||||
|
||||
post_install() {
|
||||
vmkdir usr/share/examples
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Template file for 'opendoas'
|
||||
# Template file for 'opendoas'.
|
||||
pkgname=opendoas
|
||||
version=6.0
|
||||
revision=1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'perl-Mojolicious'
|
||||
pkgname=perl-Mojolicious
|
||||
version=8.01
|
||||
version=8.02
|
||||
revision=1
|
||||
noarch=yes
|
||||
wrksrc="${pkgname//perl-/}-${version}"
|
||||
|
@ -12,5 +12,5 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
|
|||
license="Artistic-1.0-Perl, GPL-1.0-or-later"
|
||||
homepage="https://metacpan.org/release/Mojolicious"
|
||||
distfiles="${CPAN_SITE}/${pkgname//perl-/}/${pkgname//perl-/}-${version}.tar.gz"
|
||||
checksum=2c7d02a2cc49fa2a5323ae1d0b89e69c48ae06965c095523708eae6d74218ebf
|
||||
checksum=f70be0d9990408ec6022170d8fc050cfe49ce13471f9344be07c2f5420fd6654
|
||||
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
# Template file for 'python3-PyBrowserID'
|
||||
pkgname=python3-PyBrowserID
|
||||
version=0.14.0
|
||||
revision=1
|
||||
noarch=yes
|
||||
wrksrc="PyBrowserID-${version}"
|
||||
build_style=python3-module
|
||||
pycompile_module="browserid"
|
||||
hostmakedepends="python3-setuptools"
|
||||
depends="python3-requests"
|
||||
checkdepends="python3-requests"
|
||||
short_desc="Python3 library for the BrowserID Protocol"
|
||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||
license="MPL-2.0"
|
||||
homepage="https://github.com/mozilla/PyBrowserID"
|
||||
distfiles="${PYPI_SITE}/P/PyBrowserID/PyBrowserID-${version}.tar.gz"
|
||||
checksum=6c227669e87cc25796ae76f6a0ef65025528c8ad82d352679fa9a3e5663a71e3
|
||||
|
||||
do_check() {
|
||||
python3 setup.py test
|
||||
}
|
|
@ -0,0 +1,24 @@
|
|||
# Template file for 'python3-PyFxA'
|
||||
pkgname=python3-PyFxA
|
||||
version=0.6.0
|
||||
revision=1
|
||||
noarch=yes
|
||||
wrksrc="PyFxA-${version}"
|
||||
build_style=python3-module
|
||||
pycompile_module="fxa"
|
||||
hostmakedepends="python3-setuptools"
|
||||
depends="python3-cryptography python3-six python3-requests python3-hawkauthlib
|
||||
python3-PyBrowserID"
|
||||
# Missing packages from dev-requirements.txt
|
||||
# grequests pyotp responses
|
||||
checkdepends="$depends python3-requests python3-greenlet python3-pbr"
|
||||
short_desc="Firefox Accounts client library for Python3"
|
||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||
license="MPL-2.0"
|
||||
homepage="https://github.com/mozilla/PyFxA"
|
||||
distfiles="${PYPI_SITE}/P/PyFxA/PyFxA-${version}.tar.gz"
|
||||
checksum=d511b6f43a9445587c609a138636d378de76661561116e1f4259fcec9d09b42b
|
||||
|
||||
do_check() {
|
||||
python3 setup.py test
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
# Template file for 'python3-WebOb'
|
||||
pkgname=python3-WebOb
|
||||
version=1.8.2
|
||||
revision=1
|
||||
noarch=yes
|
||||
wrksrc="WebOb-${version}"
|
||||
build_style=python3-module
|
||||
pycompile_module="webob"
|
||||
hostmakedepends="python3-setuptools"
|
||||
depends="python3"
|
||||
short_desc="WSGI request and response object for python3"
|
||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||
license="MIT"
|
||||
homepage="https://webob.org"
|
||||
distfiles="${PYPI_SITE}/W/WebOb/WebOb-${version}.tar.gz"
|
||||
checksum=1fe722f2ab857685fc96edec567dc40b1875b21219b3b348e58cd8c4d5ea7df3
|
|
@ -0,0 +1,21 @@
|
|||
# Template file for 'python3-hawkauthlib'
|
||||
pkgname=python3-hawkauthlib
|
||||
version=2.0.0
|
||||
revision=1
|
||||
noarch=yes
|
||||
wrksrc="hawkauthlib-${version}"
|
||||
build_style=python3-module
|
||||
pycompile_module="hawkauthlib"
|
||||
hostmakedepends="python3-setuptools"
|
||||
depends="python3-WebOb"
|
||||
checkdepends="python3-requests"
|
||||
short_desc="Hawk Acess Authentication protocol library for Python3"
|
||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||
license="MPL-2.0"
|
||||
homepage="https://github.com/mozilla-services/hawkauthlib"
|
||||
distfiles="${PYPI_SITE}/h/hawkauthlib/hawkauthlib-${version}.tar.gz"
|
||||
checksum=effd64a2572e3c0d9090b55ad2180b36ad50e7760bea225cb6ce2248f421510d
|
||||
|
||||
do_check() {
|
||||
python3 setup.py test
|
||||
}
|
|
@ -1,17 +1,19 @@
|
|||
# Template file for 'qxkb'
|
||||
pkgname=qxkb
|
||||
version=0.4.6
|
||||
revision=2
|
||||
wrksrc=$pkgname-$pkgname-${version}
|
||||
version=0.5.1
|
||||
revision=1
|
||||
_githash=d7474a06055108c833bbb55b6cdef47e0edfb17d
|
||||
wrksrc="${pkgname}-${_githash}"
|
||||
build_style=cmake
|
||||
makedepends="qt-devel libxkbfile-devel"
|
||||
makedepends="qt5-devel libxkbfile-devel qt5-svg-devel qt5-x11extras-devel
|
||||
qt5-tools-devel"
|
||||
short_desc="Qt based keyboard layout switcher"
|
||||
maintainer="Duncaen <duncaen@voidlinux.eu>"
|
||||
license="GPL-2"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://github.com/disels/qxkb"
|
||||
distfiles="https://github.com/disels/qxkb/archive/qxkb-${version}.tar.gz"
|
||||
checksum=1ca093b568c5461a08e3fff8e17e1d9add1c22a65efdf4afa5ff1a098a482110
|
||||
distfiles="https://github.com/disels/qxkb/archive/${_githash}.tar.gz"
|
||||
checksum=b6adb516dc5dd7f1966160cada981cc8ddc5ddfb22a4b038cc05eccb81d36f8a
|
||||
|
||||
if [ -n "${CROSS_BUILD}" ]; then
|
||||
hostmakedepends+=" qt-devel"
|
||||
if [ "${CROSS_BUILD}" ]; then
|
||||
hostmakedepends+=" qt5-host-tools qt5-qmake"
|
||||
fi
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
From: Andrew Starr-Bochicchio <a.starr.b@gmail.com>
|
||||
Date: Sat, 6 Sep 2014 17:36:23 -0400
|
||||
Subject: [PATCH] Add Keywords field to desktop file.
|
||||
|
||||
---
|
||||
sakura.desktop | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/sakura.desktop b/sakura.desktop
|
||||
index fb3f5b3..b91fa32 100644
|
||||
--- a/sakura.desktop
|
||||
+++ b/sakura.desktop
|
||||
@@ -95,5 +95,6 @@ Exec=sakura
|
||||
Icon=terminal-tango
|
||||
Type=Application
|
||||
Categories=GTK;Utility;TerminalEmulator;System;
|
||||
+Keywords=terminal;
|
||||
StartupNotify=true
|
||||
X-Ubuntu-Gettext-Domain=sakura
|
|
@ -0,0 +1,69 @@
|
|||
From: Egmont Kobingler <egmont@gmail.com>
|
||||
Date: Thu, 27 Sep 2018 16:21:28 +0200
|
||||
Subject: * Bug #1790317 fixed: Crash with vte 0.54
|
||||
|
||||
---
|
||||
src/sakura.c | 29 +++--------------------------
|
||||
1 file changed, 3 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/src/sakura.c b/src/sakura.c
|
||||
index e72a9aa..5eab95a 100644
|
||||
--- a/src/sakura.c
|
||||
+++ b/src/sakura.c
|
||||
@@ -339,6 +339,7 @@ struct terminal {
|
||||
bool label_set_byuser;
|
||||
GtkBorder padding; /* inner-property data */
|
||||
int colorset;
|
||||
+ gulong exit_handler_id;
|
||||
};
|
||||
|
||||
|
||||
@@ -984,31 +985,6 @@ sakura_eof (GtkWidget *widget, void *data)
|
||||
if (npages==1) {
|
||||
sakura_config_done();
|
||||
}
|
||||
-
|
||||
- /* Workaround for libvte strange behaviour. There is not child-exited signal for
|
||||
- the last terminal, so we need to kill it here. Check with libvte authors about
|
||||
- child-exited/eof signals */
|
||||
- if (gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook))==0) {
|
||||
-
|
||||
- term = sakura_get_page_term(sakura, 0);
|
||||
-
|
||||
- if (option_hold==TRUE) {
|
||||
- SAY("hold option has been activated");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- //SAY("waiting for terminal pid (in eof) %d", term->pid);
|
||||
- //waitpid(term->pid, &status, WNOHANG);
|
||||
- /* TODO: check wait return */
|
||||
- /* Child should be automatically reaped because we don't use G_SPAWN_DO_NOT_REAP_CHILD flag */
|
||||
- g_spawn_close_pid(term->pid);
|
||||
-
|
||||
- sakura_del_tab(0);
|
||||
-
|
||||
- npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook));
|
||||
- if (npages==0)
|
||||
- sakura_destroy();
|
||||
- }
|
||||
}
|
||||
|
||||
/* This handler is called when window title changes, and is used to change window and notebook pages titles */
|
||||
@@ -3167,7 +3143,7 @@ sakura_add_tab()
|
||||
g_signal_connect(G_OBJECT(term->vte), "bell", G_CALLBACK(sakura_beep), NULL);
|
||||
g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL);
|
||||
g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL);
|
||||
- g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
|
||||
+ term->exit_handler_id = g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
|
||||
g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL);
|
||||
g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL);
|
||||
g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu);
|
||||
@@ -3366,6 +3342,7 @@ sakura_del_tab(gint page)
|
||||
}
|
||||
|
||||
gtk_widget_hide(term->hbox);
|
||||
+ g_signal_handler_disconnect (term->vte, term->exit_handler_id);
|
||||
gtk_notebook_remove_page(GTK_NOTEBOOK(sakura.notebook), page);
|
||||
|
||||
/* Find the next page, if it exists, and grab focus */
|
|
@ -1,7 +1,8 @@
|
|||
# Template file for 'sakura'
|
||||
pkgname=sakura
|
||||
version=3.6.0
|
||||
revision=1
|
||||
revision=2
|
||||
patch_args="-Np1"
|
||||
build_style=cmake
|
||||
hostmakedepends="perl pkg-config"
|
||||
makedepends="vte3-devel"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'scite'
|
||||
pkgname=scite
|
||||
version=4.1.1
|
||||
version=4.1.2
|
||||
revision=1
|
||||
create_wrksrc=yes
|
||||
hostmakedepends="pkg-config"
|
||||
|
@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="MIT"
|
||||
homepage="http://www.scintilla.org/SciTEDownload.html"
|
||||
distfiles="http://www.scintilla.org/scite${version//./}.tgz"
|
||||
checksum=d2a41fda8ca696e3fd6ea004840812311659f206989a45c4d9937292ffba7688
|
||||
checksum=01eceecb4cfe80415bd1488900ada32340850cf3bba80f25f004da4811e3fcc8
|
||||
|
||||
post_extract() {
|
||||
sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'shotcut'
|
||||
pkgname=shotcut
|
||||
version=18.09.16
|
||||
version=18.10.01
|
||||
revision=1
|
||||
build_style=qmake
|
||||
configure_args="SHOTCUT_VERSION=$version"
|
||||
|
@ -15,7 +15,7 @@ maintainer="Linux CompITech <linuxcompitech@gmail.com>"
|
|||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.shotcut.org"
|
||||
distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
|
||||
checksum=699e155c9b174999742ddff004c54acbc165d7943f48774dfee9893299634277
|
||||
checksum=0d07246e2903d4a9ad226611a17bb9b2c03638c880b3970045700e8ce2e55a97
|
||||
|
||||
CXXFLAGS="-DHAVE_LOCALE_H=1"
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
site=https://github.com/tesseract-ocr/tesseract/releases
|
||||
pattern='tesseract/tree/\K[0-9]+\.[0-9]+\.[0-9]+(-beta\.[0-9]+)?'
|
||||
ignore="*-beta.[0-9]"
|
||||
pattern='tesseract/tree/\K[0-9]+\.[0-9]+\.[0-9]+((-beta\.[0-9]+)|(-rc[0-9]+))?'
|
||||
ignore="*-beta.[0-9] *-rc[0-9]"
|
||||
|
|
Loading…
Reference in New Issue