mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
core/linux-raspberrypi bringing back our own config
This commit is contained in:
pepedog
parent
f57bee35ce
commit
aa60a3fd5a
13 changed files with 482 additions and 965 deletions
|
|
@ -1,34 +0,0 @@
|
||||||
buildarch=16
|
|
||||||
|
|
||||||
pkgname=raspberrypi-firmware-next
|
|
||||||
pkgver=20121221
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc="Firmware files for Raspberry Pi"
|
|
||||||
arch=('any')
|
|
||||||
url="https://github.com/raspberrypi/firmware"
|
|
||||||
makedepends=('git')
|
|
||||||
license=('custom')
|
|
||||||
options=(!strip)
|
|
||||||
#install=${pkgname}.install
|
|
||||||
_gitroot=git://github.com/raspberrypi/firmware.git
|
|
||||||
_gitname=firmware
|
|
||||||
provides=('raspberrypi-firmware')
|
|
||||||
conflicts=('raspberrypi-firmware')
|
|
||||||
#install=${pkgname}.install
|
|
||||||
build() {
|
|
||||||
msg "Connecting to GIT server...."
|
|
||||||
git clone --depth 1 -b next "$_gitroot"
|
|
||||||
|
|
||||||
rm -f "${srcdir}"/firmware/boot/kernel.img
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cp -R "${srcdir}"/firmware/boot "${pkgdir}"/boot
|
|
||||||
mkdir -p "${pkgdir}"/opt/vc
|
|
||||||
|
|
||||||
if [[ $CARCH == "arm" ]]; then
|
|
||||||
cp -R "${srcdir}"/firmware/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
|
|
||||||
elif [[ $CARCH == "armv6h" ]]; then
|
|
||||||
cp -R "${srcdir}"/firmware/hardfp/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
@ -1,102 +0,0 @@
|
||||||
# Contributor tomasgroth at yahoo.dk
|
|
||||||
# Contributor WarheadsSE <max@warheads.net>
|
|
||||||
pkgname=xbmc-rbp-git-next
|
|
||||||
pkgver=20121221
|
|
||||||
pkgrel=1
|
|
||||||
buildarch=16
|
|
||||||
|
|
||||||
pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
|
|
||||||
arch=('armv6h')
|
|
||||||
url="http://xbmc.org"
|
|
||||||
license=('GPL' 'custom')
|
|
||||||
depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'tinyxml' 'raspberrypi-firmware-next' 'libcec-rpi' 'libplist' 'swig' 'taglib' 'ffmpeg')
|
|
||||||
|
|
||||||
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'zip' 'udisks' 'upower' 'bluez' 'git' 'autoconf' 'openjdk6' 'raspberrypi-firmware-next')
|
|
||||||
optdepends=(
|
|
||||||
'lirc: remote controller support'
|
|
||||||
'udisks: automount external drives'
|
|
||||||
'upower: used to trigger suspend functionality'
|
|
||||||
'unrar: access compressed files without unpacking them'
|
|
||||||
)
|
|
||||||
source=(xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch)
|
|
||||||
|
|
||||||
md5sums=('fc6a925a09ba1b13d84daf1121b42ab9')
|
|
||||||
|
|
||||||
_gitroot="git://github.com/xbmc"
|
|
||||||
_gitname="xbmc"
|
|
||||||
|
|
||||||
_prefix=/usr
|
|
||||||
|
|
||||||
provides=('xbmc-rbp-git')
|
|
||||||
conflicts=('xbmc-rbp-git')
|
|
||||||
build() {
|
|
||||||
cd "${srcdir}"
|
|
||||||
|
|
||||||
msg2 "Connecting to GIT server..."
|
|
||||||
if [[ -d "${_gitname}" ]]; then
|
|
||||||
cd "${_gitname}" && git pull origin
|
|
||||||
msg2 "The local files are updated."
|
|
||||||
else
|
|
||||||
git clone --depth 1 "${_gitroot}/${_gitname}"
|
|
||||||
fi
|
|
||||||
msg2 "GIT checkout done or server timeout."
|
|
||||||
|
|
||||||
cd "${srcdir}/${_gitname}"
|
|
||||||
|
|
||||||
# fix lsb_release dependency
|
|
||||||
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
|
|
||||||
|
|
||||||
# Patch to fix TexturePacker build.
|
|
||||||
patch -i ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch -p1
|
|
||||||
|
|
||||||
# Bootstrapping XBMC
|
|
||||||
./bootstrap
|
|
||||||
|
|
||||||
# Configuring XBMC
|
|
||||||
export PYTHON_VERSION=2 # external python v2
|
|
||||||
# we need to compile for armv6 instead of armv5 to avoid problems compiling assembler code
|
|
||||||
export CFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux/"
|
|
||||||
export CXXFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux/"
|
|
||||||
export LDFLAGS="$LDFLAGS -L/opt/vc/lib"
|
|
||||||
# export MAKEFLAGS="-j1"
|
|
||||||
./configure --prefix=$_prefix --exec-prefix=$_prefix \
|
|
||||||
--enable-gles --disable-sdl --disable-x11 --disable-xrandr --disable-openmax \
|
|
||||||
--disable-optical-drive --disable-dvdcss --disable-joystick --disable-debug \
|
|
||||||
--disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
|
|
||||||
--disable-pulse --disable-projectm --with-platform=raspberry-pi --enable-optimizations \
|
|
||||||
--enable-libcec --enable-player=omxplayer --enable-external-ffmpeg
|
|
||||||
|
|
||||||
make
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd "${srcdir}/${_gitname}"
|
|
||||||
# Running make install
|
|
||||||
make DESTDIR="${pkgdir}" install
|
|
||||||
|
|
||||||
# run feh with python2
|
|
||||||
sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
|
|
||||||
|
|
||||||
# Remove checks that doesn't apply to the raspberry pi
|
|
||||||
head -n 171 "${pkgdir}${_prefix}/share/xbmc/FEH.py" > "${pkgdir}${_prefix}/share/xbmc/FEH.py.new"
|
|
||||||
mv "${pkgdir}${_prefix}/share/xbmc/FEH.py.new" "${pkgdir}${_prefix}/share/xbmc/FEH.py"
|
|
||||||
|
|
||||||
# lsb_release fix
|
|
||||||
sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
|
|
||||||
sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
|
|
||||||
|
|
||||||
# Tools
|
|
||||||
install -D -m 0755 "${srcdir}/${_gitname}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
|
|
||||||
|
|
||||||
# Licenses
|
|
||||||
install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
|
|
||||||
for licensef in LICENSE.GPL copying.txt; do
|
|
||||||
mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Create lib links
|
|
||||||
mkdir -p "${pkgdir}"/etc/ld.so.conf.d/
|
|
||||||
|
|
||||||
# ensure we can load libs
|
|
||||||
echo "/opt/vc/lib/" > "${pkgdir}"/etc/ld.so.conf.d/xbmc-rbp-git.conf
|
|
||||||
}
|
|
||||||
|
|
@ -1,169 +0,0 @@
|
||||||
diff -Naur xbmc-frodo-0ff0d2e/configure.in xbmc-frodo-0ff0d2e.patch/configure.in
|
|
||||||
--- xbmc-frodo-0ff0d2e/configure.in 2012-10-11 15:45:44.000000000 +0200
|
|
||||||
+++ xbmc-frodo-0ff0d2e.patch/configure.in 2012-10-11 16:49:08.872850880 +0200
|
|
||||||
@@ -452,6 +452,12 @@
|
|
||||||
[use_texturepacker=$enableval],
|
|
||||||
[use_texturepacker=auto])
|
|
||||||
|
|
||||||
+AC_ARG_WITH([texturepacker-root],
|
|
||||||
+ [AS_HELP_STRING([--with-texturepacker-root],
|
|
||||||
+ [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])],
|
|
||||||
+ [use_texturepacker_root=$withval],
|
|
||||||
+ [use_texturepacker_root=$prefix])
|
|
||||||
+
|
|
||||||
AC_ARG_WITH([lirc-device],
|
|
||||||
[AS_HELP_STRING([--with-lirc-device=file],
|
|
||||||
[specify the default LIRC device (default is /dev/lircd)])],
|
|
||||||
@@ -2000,13 +2006,13 @@
|
|
||||||
|
|
||||||
USE_TEXTUREPACKER_NATIVE=0
|
|
||||||
if test "x$use_texturepacker" != "xno"; then
|
|
||||||
- final_message="$final_message\n TexturePacker:Yes"
|
|
||||||
USE_TEXTUREPACKER=1
|
|
||||||
- if test "x$use_texturepacker_native" = "xyes"; then
|
|
||||||
+ if test "x$cross_compiling" = "xyes"; then
|
|
||||||
USE_TEXTUREPACKER_NATIVE=1
|
|
||||||
- if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then
|
|
||||||
- USE_TEXTUREPACKER_NATIVE_ROOT=
|
|
||||||
- fi
|
|
||||||
+ USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root"
|
|
||||||
+ final_message="$final_message\n TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)"
|
|
||||||
+ else
|
|
||||||
+ final_message="$final_message\n TexturePacker:Yes"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
final_message="$final_message\n TexturePacker:No"
|
|
||||||
diff -Naur xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in
|
|
||||||
--- xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in 2012-10-11 15:47:26.000000000 +0200
|
|
||||||
+++ xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in 2012-10-11 16:49:08.873850900 +0200
|
|
||||||
@@ -11,26 +11,25 @@
|
|
||||||
singlecolourfit.cpp \
|
|
||||||
squish.cpp
|
|
||||||
|
|
||||||
-CXXFLAGS+=-I.
|
|
||||||
-
|
|
||||||
-LIB=libsquish.a
|
|
||||||
-
|
|
||||||
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
|
|
||||||
-NATIVE_LIB=libsquish-native.so
|
|
||||||
-CLEAN_FILES+=$(NATIVE_LIB)
|
|
||||||
+LIB = libsquish.a
|
|
||||||
+NATIVE_LIB = libsquish-native.so
|
|
||||||
+CLEAN_FILES += $(NATIVE_LIB)
|
|
||||||
+
|
|
||||||
+HOST_CXX ?= g++
|
|
||||||
+CXXFLAGS += -I.
|
|
||||||
+HOST_CXXFLAGS += -I.
|
|
||||||
|
|
||||||
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
|
|
||||||
-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
|
|
||||||
+ HOST_CXXFLAGS += @DARWIN_NATIVE_ARCH@
|
|
||||||
endif
|
|
||||||
|
|
||||||
-all: $(LIB) $(NATIVE_LIB)
|
|
||||||
+$(LIB): $(SRCS)
|
|
||||||
# TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
|
|
||||||
$(NATIVE_LIB): $(SRCS)
|
|
||||||
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
|
|
||||||
- g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
|
|
||||||
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
|
|
||||||
else
|
|
||||||
- g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
|
|
||||||
-endif
|
|
||||||
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
include ../../Makefile.include
|
|
||||||
diff -Naur xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in
|
|
||||||
--- xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in 2012-10-11 15:47:05.000000000 +0200
|
|
||||||
+++ xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in 2012-10-11 16:49:08.874850920 +0200
|
|
||||||
@@ -1,56 +1,54 @@
|
|
||||||
-DEFINES += -D_LINUX -DUSE_LZO_PACKING
|
|
||||||
+DEFINES += -D_LINUX -DUSE_LZO_PACKING
|
|
||||||
ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
|
|
||||||
-DEFINES += -DHOST_BIGENDIAN
|
|
||||||
+DEFINES += -DHOST_BIGENDIAN
|
|
||||||
endif
|
|
||||||
|
|
||||||
-CXXFLAGS+= \
|
|
||||||
+SRCS = \
|
|
||||||
+ md5.cpp \
|
|
||||||
+ SDL_anigif.cpp \
|
|
||||||
+ XBTFWriter.cpp \
|
|
||||||
+ XBMCTex.cpp \
|
|
||||||
+ @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
|
|
||||||
+
|
|
||||||
+TARGET = TexturePacker
|
|
||||||
+CLEAN_FILES = $(TARGET)
|
|
||||||
+
|
|
||||||
+all: $(TARGET)
|
|
||||||
+
|
|
||||||
+HOST_CXX ?= g++
|
|
||||||
+HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@
|
|
||||||
+
|
|
||||||
+LIBS += -lSDL_image -lSDL -llzo2
|
|
||||||
+LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
|
|
||||||
+HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2
|
|
||||||
+HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
|
|
||||||
+
|
|
||||||
+CXXFLAGS += \
|
|
||||||
-I. \
|
|
||||||
-I@abs_top_srcdir@/lib \
|
|
||||||
-I@abs_top_srcdir@/xbmc \
|
|
||||||
-I@abs_top_srcdir@/xbmc/linux
|
|
||||||
|
|
||||||
-RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
|
|
||||||
+HOST_CXXFLAGS += \
|
|
||||||
+ -I. \
|
|
||||||
+ -I@abs_top_srcdir@/lib \
|
|
||||||
+ -I@abs_top_srcdir@/xbmc \
|
|
||||||
+ -I@abs_top_srcdir@/xbmc/linux \
|
|
||||||
+ -I$(HOST_ROOT_PATH)/include
|
|
||||||
+
|
|
||||||
+RPATH=-Wl,-rpath=$(HOST_ROOT_PATH)/lib
|
|
||||||
|
|
||||||
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
|
|
||||||
-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
|
|
||||||
-ifdef NATIVE_ROOT_PATH
|
|
||||||
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
|
|
||||||
DEFINES += -DTARGET_DARWIN
|
|
||||||
NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
|
|
||||||
RPATH=
|
|
||||||
endif
|
|
||||||
-NATIVE_CXXFLAGS+= -I. \
|
|
||||||
- -I$(NATIVE_ROOT_PATH)/include \
|
|
||||||
- -I@abs_top_srcdir@/lib \
|
|
||||||
- -I@abs_top_srcdir@/xbmc \
|
|
||||||
- -I@abs_top_srcdir@/xbmc/linux
|
|
||||||
-NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib
|
|
||||||
-endif
|
|
||||||
-NATIVE_LIBS += -lSDL_image -lSDL -llzo2
|
|
||||||
-NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
|
|
||||||
-else
|
|
||||||
-LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
-LIBS += -lSDL_image -lSDL -llzo2
|
|
||||||
-
|
|
||||||
-SRCS = \
|
|
||||||
- md5.cpp \
|
|
||||||
- SDL_anigif.cpp \
|
|
||||||
- XBTFWriter.cpp \
|
|
||||||
- XBMCTex.cpp \
|
|
||||||
- @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-TARGET = TexturePacker
|
|
||||||
-CLEAN_FILES=$(TARGET)
|
|
||||||
-
|
|
||||||
-all: $(TARGET)
|
|
||||||
|
|
||||||
ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
|
|
||||||
# TexturePacker run native on build system, build it with native tools
|
|
||||||
$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
|
|
||||||
- g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
|
|
||||||
+ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
|
|
||||||
+ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET)
|
|
||||||
clean:
|
|
||||||
rm -f $(TARGET)
|
|
||||||
else
|
|
||||||
|
|
@ -1,266 +0,0 @@
|
||||||
# Maintainer: Dave Higham <pepedog@archlinuxarm.org>
|
|
||||||
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
||||||
|
|
||||||
buildarch=16
|
|
||||||
|
|
||||||
pkgbase=linux-raspberrypi-next
|
|
||||||
pkgname=('linux-raspberrypi-next' 'linux-headers-raspberrypi-next')
|
|
||||||
# pkgname=linux-custom # Build kernel with a different name
|
|
||||||
_kernelname=${pkgname#linux}
|
|
||||||
_basekernel=3.6
|
|
||||||
pkgver=${_basekernel}.11
|
|
||||||
pkgrel=1
|
|
||||||
arch=('arm armv6h')
|
|
||||||
url="http://www.kernel.org/"
|
|
||||||
license=('GPL2')
|
|
||||||
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2')
|
|
||||||
options=('!strip')
|
|
||||||
source=('config'
|
|
||||||
'change-default-console-loglevel.patch'
|
|
||||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
|
||||||
'args-uncompressed.txt'
|
|
||||||
'boot-uncompressed.txt'
|
|
||||||
'imagetool-uncompressed.py'
|
|
||||||
)
|
|
||||||
|
|
||||||
md5sums=('9d0decd3cbd2e515944bd103d60c19f3'
|
|
||||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
|
||||||
'd00814b57448895e65fbbc800e8a58ba'
|
|
||||||
'9335d1263fd426215db69841a380ea26'
|
|
||||||
'a00e424e2fbb8c5a5f77ba2c4871bed4'
|
|
||||||
'2f82dbe5752af65ff409d737caf11954')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
|
|
||||||
git clone --depth 1 -b rpi-3.6.y git://github.com/raspberrypi/linux.git
|
|
||||||
cd "${srcdir}/linux"
|
|
||||||
|
|
||||||
# add upstream patch
|
|
||||||
#patch -p1 -i "${srcdir}/patch-${pkgver}"
|
|
||||||
|
|
||||||
# Add the USB_QUIRK_RESET_RESUME for several webcams
|
|
||||||
# FS#26528
|
|
||||||
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
|
||||||
|
|
||||||
# add latest fixes from stable queue, if needed
|
|
||||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
|
||||||
|
|
||||||
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
|
||||||
# remove this when a Kconfig knob is made available by upstream
|
|
||||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
|
||||||
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
|
||||||
cp ${srcdir}/args-uncompressed.txt arch/arm/boot/
|
|
||||||
cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
|
|
||||||
cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
|
|
||||||
|
|
||||||
make bcmrpi_defconfig
|
|
||||||
sed -ri "s|^(CONFIG_LOCALVERSION=\").*|\1\-ARCH\"|" .config
|
|
||||||
|
|
||||||
# set extraversion to pkgrel
|
|
||||||
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
|
|
||||||
|
|
||||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
|
||||||
sed -i '2iexit 0' scripts/depmod.sh
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
make prepare
|
|
||||||
|
|
||||||
# load configuration
|
|
||||||
# Configure the kernel. Replace the line below with one of your choice.
|
|
||||||
#make menuconfig # CLI menu for configuration
|
|
||||||
#make nconfig # new CLI menu for configuration
|
|
||||||
#make xconfig # X-based configuration
|
|
||||||
#make oldconfig # using old config from previous kernel version
|
|
||||||
# ... or manually edit .config
|
|
||||||
|
|
||||||
# Copy back our configuration (use with new kernel version)
|
|
||||||
#cp ./.config ../${pkgver}.config
|
|
||||||
|
|
||||||
####################
|
|
||||||
# stop here
|
|
||||||
# this is useful to configure the kernel
|
|
||||||
#msg "Stopping build"
|
|
||||||
#return 1
|
|
||||||
####################
|
|
||||||
|
|
||||||
#yes "" | make config
|
|
||||||
|
|
||||||
# build!
|
|
||||||
make ${MAKEFLAGS} modules uImage
|
|
||||||
}
|
|
||||||
|
|
||||||
package_linux-raspberrypi-next() {
|
|
||||||
pkgdesc="The Linux Kernel and modules for Raspberry Pi"
|
|
||||||
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
|
|
||||||
optdepends=('crda: to set the correct wireless channels of your country')
|
|
||||||
provides=('kernel26' "linux=${pkgver}")
|
|
||||||
conflicts=('kernel26' 'linux')
|
|
||||||
install=${pkgname}.install
|
|
||||||
|
|
||||||
cd "${srcdir}/linux"
|
|
||||||
|
|
||||||
KARCH=arm
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
_kernver="$(make kernelrelease)"
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
|
|
||||||
make INSTALL_MOD_PATH="${pkgdir}" modules_install
|
|
||||||
cd arch/$KARCH/boot/
|
|
||||||
/usr/bin/python2 imagetool-uncompressed.py
|
|
||||||
cd "${srcdir}/linux"
|
|
||||||
cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
|
|
||||||
#cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
|
|
||||||
|
|
||||||
# set correct depmod command for install
|
|
||||||
sed \
|
|
||||||
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
|
|
||||||
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
|
|
||||||
-i "${startdir}/${pkgname}.install"
|
|
||||||
|
|
||||||
# remove build and source links
|
|
||||||
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
|
|
||||||
# remove the firmware
|
|
||||||
rm -rf "${pkgdir}/lib/firmware"
|
|
||||||
# gzip -9 all modules to save 100MB of space
|
|
||||||
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
|
|
||||||
# make room for external modules
|
|
||||||
ln -s "../extramodules-${pkgver}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
|
|
||||||
# add real version for building modules and running depmod from post_install/upgrade
|
|
||||||
mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
|
|
||||||
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
|
|
||||||
|
|
||||||
# Now we call depmod...
|
|
||||||
depmod -b "$pkgdir" -F System.map "$_kernver"
|
|
||||||
|
|
||||||
# move module tree /lib -> /usr/lib
|
|
||||||
mkdir -p "${pkgdir}/usr"
|
|
||||||
mv "$pkgdir/lib" "$pkgdir/usr"
|
|
||||||
}
|
|
||||||
|
|
||||||
package_linux-headers-raspberrypi-next() {
|
|
||||||
pkgdesc="Header files and scripts for building modules for linux kernel for Raspberry Pi"
|
|
||||||
provides=('kernel26-headers' "linux-headers=${pkgver}")
|
|
||||||
conflicts=('kernel26-headers')
|
|
||||||
|
|
||||||
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
|
|
||||||
|
|
||||||
cd "${pkgdir}/usr/lib/modules/${_kernver}"
|
|
||||||
ln -sf ../../../src/linux-${_kernver} build
|
|
||||||
|
|
||||||
cd "${srcdir}/linux"
|
|
||||||
install -D -m644 Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
|
|
||||||
install -D -m644 kernel/Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
|
|
||||||
install -D -m644 .config \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/.config"
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
|
|
||||||
|
|
||||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
|
||||||
media net pcmcia scsi sound trace video xen; do
|
|
||||||
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
|
|
||||||
done
|
|
||||||
|
|
||||||
# copy arch includes for external modules
|
|
||||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
|
|
||||||
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
|
||||||
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708
|
|
||||||
cp -a arch/$KARCH/mach-bcm2708/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708/
|
|
||||||
|
|
||||||
# copy files necessary for later builds, like nvidia and vmware
|
|
||||||
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
|
|
||||||
# fix permissions on scripts dir
|
|
||||||
chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
|
|
||||||
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
|
|
||||||
|
|
||||||
cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
|
||||||
|
|
||||||
if [ "${CARCH}" = "i686" ]; then
|
|
||||||
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
|
|
||||||
|
|
||||||
# add headers for lirc package
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
|
|
||||||
|
|
||||||
cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
|
|
||||||
|
|
||||||
for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
|
|
||||||
cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# add docbook makefile
|
|
||||||
install -D -m644 Documentation/DocBook/Makefile \
|
|
||||||
"${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
|
|
||||||
|
|
||||||
# add dm headers
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
|
||||||
cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
|
||||||
|
|
||||||
# add inotify.h
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
|
|
||||||
cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
|
|
||||||
|
|
||||||
# add wireless headers
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
|
||||||
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
|
||||||
|
|
||||||
# add dvb headers for external modules
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/9912
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
|
|
||||||
cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
|
|
||||||
# and...
|
|
||||||
# http://bugs.archlinux.org/task/11194
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
|
||||||
cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
|
||||||
|
|
||||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/13146
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
|
|
||||||
# add dvb headers
|
|
||||||
# in reference to:
|
|
||||||
# http://bugs.archlinux.org/task/20402
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
|
|
||||||
cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
|
|
||||||
cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
|
|
||||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
|
|
||||||
cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
|
|
||||||
|
|
||||||
# copy in Kconfig files
|
|
||||||
for i in `find . -name "Kconfig*"`; do
|
|
||||||
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
|
|
||||||
cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
|
|
||||||
done
|
|
||||||
|
|
||||||
chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
|
|
||||||
find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
|
|
||||||
|
|
||||||
# strip scripts directory
|
|
||||||
find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
|
|
||||||
case "$(file -bi "${binary}")" in
|
|
||||||
*application/x-sharedlib*) # Libraries (.so)
|
|
||||||
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
|
|
||||||
*application/x-archive*) # Libraries (.a)
|
|
||||||
/usr/bin/strip ${STRIP_STATIC} "${binary}";;
|
|
||||||
*application/x-executable*) # Binaries
|
|
||||||
/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# remove unneeded architectures
|
|
||||||
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
; kernel args (place at 0x00000100)
|
|
||||||
0x00000005
|
|
||||||
0x54410001
|
|
||||||
0x00000001
|
|
||||||
0x00001000
|
|
||||||
0x00000000
|
|
||||||
0x00000004
|
|
||||||
0x54410002
|
|
||||||
0x08000000
|
|
||||||
0x00000000
|
|
||||||
0x00000000
|
|
||||||
0x00000000
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
; bootloader (place at 0x00000000)
|
|
||||||
0xea000006
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
0xe1a00000
|
|
||||||
|
|
||||||
0xe3a00000
|
|
||||||
0xe3a01042
|
|
||||||
0xe3811c0c
|
|
||||||
0xe59f2000
|
|
||||||
0xe59ff000
|
|
||||||
0x00000100
|
|
||||||
0x00008000
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
|
|
||||||
--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
|
|
||||||
+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
|
|
||||||
@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
|
|
||||||
|
|
||||||
/* We show everything that is MORE important than this.. */
|
|
||||||
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
|
|
||||||
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
|
|
||||||
+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
|
|
||||||
|
|
||||||
DECLARE_WAIT_QUEUE_HEAD(log_wait);
|
|
||||||
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
There is no real config here, it comes from
|
|
||||||
https://github.com/raspberrypi/linux/blob/rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig
|
|
||||||
|
|
||||||
Please report bugs and config requests to
|
|
||||||
https://github.com/raspberrypi/linux/issues
|
|
||||||
|
|
||||||
Essentially config is same as raspbian except for -ARCH tag
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
#!/usr/bin/python2
|
|
||||||
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
|
|
||||||
try:
|
|
||||||
linuxdir = sys.argv[1]
|
|
||||||
except:
|
|
||||||
linuxdir = "linux"
|
|
||||||
|
|
||||||
re_line = re.compile(r"0x(?P<value>[0-9a-f]{8})")
|
|
||||||
|
|
||||||
mem = [0 for i in range(32768)]
|
|
||||||
|
|
||||||
def load_to_mem(name, addr):
|
|
||||||
f = open(name)
|
|
||||||
|
|
||||||
for l in f.readlines():
|
|
||||||
m = re_line.match(l)
|
|
||||||
|
|
||||||
if m:
|
|
||||||
value = int(m.group("value"), 16)
|
|
||||||
|
|
||||||
for i in range(4):
|
|
||||||
mem[addr] = int(value >> i * 8 & 0xff)
|
|
||||||
addr += 1
|
|
||||||
|
|
||||||
f.close()
|
|
||||||
|
|
||||||
load_to_mem("boot-uncompressed.txt", 0x00000000)
|
|
||||||
load_to_mem("args-uncompressed.txt", 0x00000100)
|
|
||||||
|
|
||||||
f = open("first32k.bin", "wb")
|
|
||||||
|
|
||||||
for m in mem:
|
|
||||||
f.write(chr(m))
|
|
||||||
|
|
||||||
f.close()
|
|
||||||
|
|
||||||
os.system("cat first32k.bin Image > kernel.img")
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
# arg 1: the new package version
|
|
||||||
# arg 2: the old package version
|
|
||||||
|
|
||||||
KERNEL_NAME=-raspberrypi-next
|
|
||||||
KERNEL_VERSION=3.6.7-3-ARCH+
|
|
||||||
|
|
||||||
post_install () {
|
|
||||||
# updating module dependencies
|
|
||||||
echo ">>> Updating module dependencies. Please wait ..."
|
|
||||||
depmod ${KERNEL_VERSION}
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
|
|
||||||
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
|
|
||||||
echo "WARNING: /boot appears to be a seperate partition but is not mounted."
|
|
||||||
echo " You probably just broke your system. Congratulations."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# updating module dependencies
|
|
||||||
echo ">>> Updating module dependencies. Please wait ..."
|
|
||||||
depmod ${KERNEL_VERSION}
|
|
||||||
}
|
|
||||||
|
|
@ -1,98 +0,0 @@
|
||||||
commit 2394d67e446bf616a0885167d5f0d397bdacfdfc
|
|
||||||
Author: Oliver Neukum <oneukum@suse.de>
|
|
||||||
Date: Tue Sep 13 08:42:21 2011 +0200
|
|
||||||
|
|
||||||
USB: add RESET_RESUME for webcams shown to be quirky
|
|
||||||
|
|
||||||
The new runtime PM code has shown that many webcams suffer
|
|
||||||
from a race condition that may crash them upon resume.
|
|
||||||
Runtime PM is especially prone to show the problem because
|
|
||||||
it retains power to the cameras at all times. However
|
|
||||||
system suspension may also crash the devices and retain
|
|
||||||
power to the devices.
|
|
||||||
The only way to solve this problem without races is in
|
|
||||||
usbcore with the RESET_RESUME quirk.
|
|
||||||
|
|
||||||
Signed-off-by: Oliver Neukum <oneukum@suse.de>
|
|
||||||
Signed-off-by: stable <stable@kernel.org>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
|
||||||
index 81ce6a8..38f0510 100644
|
|
||||||
--- a/drivers/usb/core/quirks.c
|
|
||||||
+++ b/drivers/usb/core/quirks.c
|
|
||||||
@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
||||||
/* Creative SB Audigy 2 NX */
|
|
||||||
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
||||||
+ /* Logitech Webcam C200 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
+ /* Logitech Webcam C250 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
+ /* Logitech Webcam B/C500 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
+ /* Logitech Webcam Pro 9000 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
+ /* Logitech Webcam C310 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
+ /* Logitech Webcam C270 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
/* Logitech Harmony 700-series */
|
|
||||||
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
|
|
||||||
|
|
||||||
@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
||||||
{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
|
|
||||||
USB_QUIRK_CONFIG_INTF_STRINGS },
|
|
||||||
|
|
||||||
+ /* Guillemot Webcam Hercules Dualpix Exchange*/
|
|
||||||
+ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
/* M-Systems Flash Disk Pioneers */
|
|
||||||
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
||||||
commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc
|
|
||||||
Author: Jon Levell <linuxusb@coralbark.net>
|
|
||||||
Date: Thu Sep 29 20:42:52 2011 +0100
|
|
||||||
|
|
||||||
USB: add quirk for Logitech C300 web cam
|
|
||||||
|
|
||||||
My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound.
|
|
||||||
The following trivial patch fixes it.
|
|
||||||
|
|
||||||
Signed-off-by: Jon Levell <linuxusb@coralbark.net>
|
|
||||||
Cc: stable <stable@kernel.org>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
||||||
|
|
||||||
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
|
||||||
index 38f0510..d6a8d82 100644
|
|
||||||
--- a/drivers/usb/core/quirks.c
|
|
||||||
+++ b/drivers/usb/core/quirks.c
|
|
||||||
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
||||||
/* Logitech Webcam C250 */
|
|
||||||
{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
||||||
+ /* Logitech Webcam C300 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
/* Logitech Webcam B/C500 */
|
|
||||||
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
||||||
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
|
||||||
index d6a8d82..caa1991 100644
|
|
||||||
--- a/drivers/usb/core/quirks.c
|
|
||||||
+++ b/drivers/usb/core/quirks.c
|
|
||||||
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
||||||
/* Logitech Webcam B/C500 */
|
|
||||||
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
||||||
+ /* Logitech Webcam C600 */
|
|
||||||
+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
+
|
|
||||||
/* Logitech Webcam Pro 9000 */
|
|
||||||
{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
||||||
|
|
@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
|
||||||
_kernelname=${pkgname#linux}
|
_kernelname=${pkgname#linux}
|
||||||
_basekernel=3.6
|
_basekernel=3.6
|
||||||
pkgver=${_basekernel}.11
|
pkgver=${_basekernel}.11
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
arch=('arm armv6h')
|
arch=('arm armv6h')
|
||||||
url="http://www.kernel.org/"
|
url="http://www.kernel.org/"
|
||||||
license=('GPL2')
|
license=('GPL2')
|
||||||
|
|
@ -44,8 +44,9 @@ build() {
|
||||||
cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
|
cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
|
||||||
cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
|
cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
|
||||||
|
|
||||||
make bcmrpi_defconfig
|
#make bcmrpi_defconfig
|
||||||
sed -ri "s|^(CONFIG_LOCALVERSION=\").*|\1\-ARCH\"|" .config
|
#sed -ri "s|^(CONFIG_LOCALVERSION=\").*|\1\-ARCH\"|" .config
|
||||||
|
cat "${srcdir}/config" > ./.config
|
||||||
|
|
||||||
# set extraversion to pkgrel
|
# set extraversion to pkgrel
|
||||||
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
|
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue